Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752333AbbL1K44 (ORCPT ); Mon, 28 Dec 2015 05:56:56 -0500 Received: from mail-bl2on0131.outbound.protection.outlook.com ([65.55.169.131]:65152 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751982AbbL1Kzl (ORCPT ); Mon, 28 Dec 2015 05:55:41 -0500 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none;freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; From: Ramneek Mehresh To: CC: , , , , Ramneek Mehresh Subject: [PATCH 6/7][v5]usb:fsl:otg: Combine host/gadget start/resume for ID change Date: Mon, 28 Dec 2015 16:42:33 +0530 Message-ID: <1451301154-14422-7-git-send-email-ramneek.mehresh@freescale.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1451301154-14422-1-git-send-email-ramneek.mehresh@freescale.com> References: <1451301154-14422-1-git-send-email-ramneek.mehresh@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC008;1:HEBC+iXROcULZDSIjlXdrqmRmghQN2gZVk1aKp2ZdhsSouLe2AXuLVePYjzKsPYZz2HHYV9gsHo9fK9pFkxhrWOufSiQeL5KdWwtQG7/nmP8FBhvLK9INLehcVabui9jOyOaiA34izZe76kYfpOTSG8atLAm8At19qJNnUnY6GXBVaNxydF8tzDTHVdzw8e/F7TEtcLDh87yqOkOip1NYfwAMcZxJiUuTuAhTWdOVpzNtfQaZYuc5BI2NUU7fAsbIdMR6y5pQ5y/XzXBTHsohV7k+ONi+OReePFMjDDiJ8LCAt/l486I1JqlBt2rcds4OvGXskbrstbEpcGMaIXuR5f+ED42y8ww1u4i0+9mxTzMeSGfOj8xCkY4BIzdMYjkwWGjQK8AJplR5Z8JSNzxoMxbhw40ysD3lIFE0Paky84= X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(189998001)(48376002)(586003)(77096005)(76176999)(81156007)(11100500001)(50466002)(104016004)(19580395003)(69596002)(110136002)(1096002)(19580405001)(1220700001)(2950100001)(97736004)(87936001)(5001960100002)(107886002)(33646002)(106466001)(5003940100001)(50986999)(86362001)(2351001)(92566002)(76506005)(85326001)(47776003)(229853001)(6806005)(5008740100001)(4001430100002)(50226001)(36756003);DIR:OUT;SFP:1102;SCL:1;SRVR:SN1PR0301MB1581;H:az84smr01.freescale.net;FPR:;SPF:PermError;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1581;2:gAPaEX0bOi9uPO/eiF3MUscf8XoHomvT6QePEUnlID9GenxUWuhIyrYcTZ7vfU5f6PC5/TCccTGrCu4gB0LsUUm4wF3b4TwfVIy7ZLpP/agP2zqjIvJQxVqeIX64ttLDvrhFVeyNDa60i+O2HsnSlg==;3:/slEf0UZadHgk09KoTrb3O8/AVl2EqMU3FWy6URPKyJuAxDX3CWKefToQoT+xhqV64Bz/DdJUj52ZALCFtx8JSDdSOTR2KOtRyuCopec/i4xXJ6BUCVsvUG1n4ym8k0+U8VZI8k+PXAoU9nXNT3+C9zuS3AK10u0qIiSdKedBtSWT+DFLLuBuq69/LXMSUV1G+y4G2RitVhipUT8XGpLGhZCK44k1tDnh9+CxZiR8xw=;25:hfiex+5olPMpKy/7QU1viRG1ZJkwVNxk/CKRGIbkP4cCUL6Zc161iCZJM0QzX8ENtdQJP7F76J+FEiKKb3G7wOZ0F5slankp0MO+vLvZ1zF+QK+OiuyT9X7GIYKZlujhKHhI3myTuyKu/zLi2XcQdQbMfhgY/e6UPLipjNt5yu3twxitld1mbTS1+6edFN/syiiF/tB5cAzW3CuiDGgkmVHScKER3Lj/FCi+V4jC+ybVolw1ywCrKS/fZnFJns25dRMT8teRfXVKskIGAp4KsA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1581; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1581;20:yos0jvkjbr7qgWGAHgoGapvQB/3gfEaHsKfwgAgI6CafyhuYyDXiRObADENrcLrqDflBNirmtb5RiL7lDKFA/T8GtfI0vHdcrJHV756g6Lsx83wCTyYWKKWNOrK3vh15KyTbcQD4z7eZp9zWX9vPNdWyPkbSm4R/TsWxILor9ygO9qd8pEx2Ji4m7h8Hlzou0cNADuMFC6axQtIxyzDeMDEpugMlUB9x66V3ELNQg+TtANDng5UODo1QIbmsDeX4jhWId+cgfJTMlkHuMYY5C5sMw2khHziSB6ecOeZ0id++ej5eoSe4/M8tIuHf5J6ig0mRKeBAvojWCLLs1PO13WJ/Saj4G2MTRYhMhSYmzaQ=;4:j79rUhWXiHSwIxT8llj52oMWsHacSblnLCIuVTmEt79C7JLX2+skG+AGWH0Ici2zi8hwmswoWNVe6YE2VUK4GZJ4fvxyfEOrTwDgVxIRtbz3BReddo5UZIa5/m/zPc+MfxyMUvHfx+ER1Ki77UPD+1wF5MyMjVqd//Nwe0mPMzIZ+xGQrjAoWap5c4D1IYupkY3lQ81L5OHFLgs/JmIlK4ujIzDhDdsjOD3L0gyzl2JooS7s7xZwXdhdHr5MdjY1rJiyadRDYJuTO98quJaBcpkmEq+Ivi0fclgkT5rWS3FaT2WbYJ56whbfo3slrTAs4u/KRA+y8Vf5+W+DRO+wkSwFprPtS1i/oJHjV4EygG80auWtNRElrimYw+/3Rd3wPLbM8gpd/Wo29pJQVCLWM4XD76Z71KiKJIUNJhWkWGckvcRjv5FJTmu8lRTbpBFJ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001);SRVR:SN1PR0301MB1581;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1581; X-Forefront-PRVS: 08041D247D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR0301MB1581;23:j5aaYyCP3iLbi7WAGhEM2PZGktA4MIr8s5478sP?= =?us-ascii?Q?1nTOg+GBjxPYWzR1vHJ5+AE6xHwcNTA8un3adsLEUUqxjTiad/PlrDIXTHMk?= =?us-ascii?Q?vUxSrPg4esX8QqpJbImOdsgRvjv+mU8HQFlklzbAKRidJJCHWDo4QALnSJ0r?= =?us-ascii?Q?E6d2Ked/Gi2cuPkvv6oFmaeGJ0M4+r207msQDSU0mW7SKkkI0XkHsUYoYaFe?= =?us-ascii?Q?MwXj22IFlfsBxGAWROuZK4XEhvqmTmQJHMCtpCI5/bMKnXa6VNGo+3oXH3Rp?= =?us-ascii?Q?t6aBniadEjpptMspQfny5OVc4b1wYqZMANiyberPp0TonHxuUUbe7yF3Mcsi?= =?us-ascii?Q?kS6nkkdQiMeAC9Xt0CPggz4Q/BXKksPMNW+5H9XQXVrKLaRIXyhFnXkKhV2k?= =?us-ascii?Q?j7SLxPs2QdPmPnkDSAkK8Bp2JjPtvNMw31fqvZ8avaPjLdL1Ykh0jgBqrW7E?= =?us-ascii?Q?5u3/Js89PbUvuhGNuZmt1AdjdKb1ku/Gowj8bxcU8bGR4og5/XkF9xHMIKEh?= =?us-ascii?Q?dtFCrazmkn2oauS+CIASI1Wu2k9cpz4jR+EvznSg9cRWMO3f8wry+GNAxlqA?= =?us-ascii?Q?cRBBmkJz9JSsGk/Pj+lD4HRR2MRi0NwK47mNx6bImgYf3+BTKRIkbD4zkFum?= =?us-ascii?Q?F/Azx6+cO30jA/G70PsVhYSZgHmZO8hQfmquwJhl7z4JBBgmAPFkT0yeTq7V?= =?us-ascii?Q?1o3VX6MRocwSsoNI221k46c/RJk2S9JDEMI5pnzq+nYEcyH/fKE1lDsBXHIn?= =?us-ascii?Q?JAou4bgnKbrsHD6KcnSmdm7NHWdyNzU1IwwtUjOuKPNZXBemOKZwI9TVw2dd?= =?us-ascii?Q?qcuSgLlmWPZ08mW6C+2UcgwQT3aXTILuJzUxv/Acqlj796qIvJGea4BUpb+3?= =?us-ascii?Q?PVG8Ll8sNpL6rfZhOGc2hbe06NwMkwrTVuZUEhQ1o6TcEEj4NagHgfUgVfSY?= =?us-ascii?Q?QGhfZ4fiHkHpm1l1kl4f0S9BOJwmVCyt03ZB+x7Fk9UtSQ1VqbsWKIoBsOOM?= =?us-ascii?Q?lJkMxSmzuN6Gfnh+zciQjUlwO//OHR0VhvXrkPcdQgAWk9YSo0e7ibswewx8?= =?us-ascii?Q?aXKG+hlYi/LQ+f1QM/JlECXFQdztlxCqjpBsR0Wh9EPSv+4KLVw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1581;5:fP2gJlyBx5Zlbz+0s6SSyRYREMov2huGMqgPNNauXmEdMSM0aOPkhAPlmjc4fK++2iVRKOkMu00LqLHAz+SMJIRNxvPe7BX4yBh1dTob5eM8V4mO9vY+vCyf+sGRyB2d8/HB8byJBrDFCwSaHv7+Fg==;24:NDitAP/umUE5Pd1TRUWyYq5kqZBu9g5fbMh7UGmwoXLzWL7kh9o8PF6t1W3v6l3PoFxKXxMQ4PFRh3ci3SrhAVWWrOzZhYDMzase2Jc2zNA= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2015 10:55:37.6706 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1581 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1676 Lines: 50 Make call to fsl_otg_event for each id change even. Signed-off-by: Ramneek Mehresh Reviewed-by: Fleming Andrew-AFLEMING Tested-by: Fleming Andrew-AFLEMING --- drivers/usb/phy/phy-fsl-usb.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c index 3b8a9e5..689516d 100644 --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c @@ -733,6 +733,7 @@ irqreturn_t fsl_otg_isr(int irq, void *dev_id) { struct otg_fsm *fsm = &((struct fsl_otg *)dev_id)->fsm; struct usb_otg *otg = ((struct fsl_otg *)dev_id)->phy.otg; + struct fsl_otg *otg_dev = dev_id; u32 otg_int_src, otg_sc; otg_sc = fsl_readl(&usb_dr_regs->otgsc); @@ -762,18 +763,8 @@ irqreturn_t fsl_otg_isr(int irq, void *dev_id) otg->gadget->is_a_peripheral = !fsm->id; VDBG("ID int (ID is %d)\n", fsm->id); - if (fsm->id) { /* switch to gadget */ - schedule_delayed_work( - &((struct fsl_otg *)dev_id)->otg_event, - 100); - } else { /* switch to host */ - cancel_delayed_work(& - ((struct fsl_otg *)dev_id)-> - otg_event); - fsl_otg_start_gadget(fsm, 0); - otg_drv_vbus(fsm, 1); - fsl_otg_start_host(fsm, 1); - } + schedule_delayed_work(&otg_dev->otg_event, 100); + return IRQ_HANDLED; } } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/