Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754538AbbH0Qap (ORCPT ); Thu, 27 Aug 2015 12:30:45 -0400 Received: from mail-bn1bbn0107.outbound.protection.outlook.com ([157.56.111.107]:21226 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754471AbbH0Qal (ORCPT ); Thu, 27 Aug 2015 12:30:41 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) 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][v4]usb:fsl:otg: Combine host/gadget start/resume for ID change Date: Thu, 27 Aug 2015 22:13:06 +0530 Message-ID: <1440693787-7339-7-git-send-email-ramneek.mehresh@freescale.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1440693787-7339-1-git-send-email-ramneek.mehresh@freescale.com> References: <1440693787-7339-1-git-send-email-ramneek.mehresh@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD013;1:NAqOsWHTeXO+mIazeX3I+UtD3JAPImYUO940eQFiJ2o48dMjL3f0Ql40dUYaky+deihFKKFM9z+VtMNg2aDbMJQVx4LSEHRwMYzzYB8gZQILljXggw5PgpIx5g460iPYTM4ivquLK9fWN3+lYbXb5VjYsaEGvuDI37UIR9tdlEN+2ZASjCKgnH/MImRDwE7UHRW7M28zEH9dFg+aOGp2+ETKWFsKL9WhyfpoRE76NOIUHRnCfq7A1GWwSYkOdiqLBXTBwvvDFCkw7EDUM+8hzMlCds3zPzn1T4sXtlCHCtco8qIvSLY7moWQ7r5RXYL7SRaHcv0RaUwqbMYCLJmQhfe/bBJid+RIqoSoHcylbbU6XBW1byw53cA3a2Sq2B0WlolqOD9aH3SDnoFo0oTU1A== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(339900001)(3050300001)(199003)(189002)(50226001)(76506005)(5001830100001)(189998001)(85426001)(5001860100001)(4001540100001)(81156007)(97736004)(6806004)(19580405001)(77096005)(19580395003)(105606002)(5001960100002)(92566002)(107886002)(110136002)(50466002)(229853001)(48376002)(86362001)(87936001)(2351001)(106466001)(50986999)(76176999)(2950100001)(68736005)(62966003)(104016003)(46102003)(77156002)(33646002)(5003940100001)(5007970100001)(36756003)(47776003)(64706001)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:SN1PR0301MB1582;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1582;2:ir1CBUOLPEKXliwmKqPLdUGdVdoX1UbT6Ix+pWTw36yd2OSy0mVWjTrmshQTgJOZYbDzpvNWK1u5nXR6ohgatULtPwJ22Sk5HYfWI2gMFFuJkIzoCNEtYvadFxf/7RF/Qr9BXH0cVMjGtC2E2UBE8m9CVUdjGDgc6o99Xs2CYKc=;3:yV2IYL3EFMVGHmkN3QvZtIsCOBHUjbG0BqfIjccVB5vGvAMYB9SNqtJh4eaB5bwEKk0spreGfqu39ONQ9irOlWd4OaViOsvuP7sI0w9vJch0Ux07R9ffijTncIS+04C/t8aAGILrA/L5eP2btanbu5dYjFNosajIY9UKg9i4VcG1qGnj5jmwmU1KOqQIQu9t6e6W1b9t0+9xjPllWCgqtRnkp9dd2J4YRJdWjn7Slfw=;25:SsW7ZE1clSOYfZX0+wxPO4muU99G/Stb6BLwbVxoRQA6zXa9hb0r57O7smwsLb6hLgqR7KBpcr7OvrfJoKPSSL6udOLeXPOWgbh8i95h5o7quz/0YMD/o/ZiSv6XtDyulAUGWFl9lrdh42clCEcKGC1HiuNLw2LeRhow6D70uhiYaosjFiANOCAbZPMDruf8FKD8pZ6rp7evUJ3OIqJsow05OUcahL9D7DxqWTJtU17s1pj2vW0GLoLXyNPgXb84NV0xCDF71yetSRKZDLhVhw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1582; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1582;20:UuWwEi6xQYqfsGtMFD98xUf2uHwcJp/eAUgZXLVsWw78NFkGL+qu3LQ6BYip0JfsOBuffLuCSFR1vduXaglsc0zltmOiDrmA66nWcGylk20T1V4YtrI0g4JkNiHVkGJznztwcF5FFatR2Gy+nhPvaFIzSRv+eL6UTc4nNxoUgIDlqKVBWeLPmm7b3AD8BX56lFPrD7/Gb1hnGzWfGwWgjg4qdUOg2MZLBrSjnmB928HYaaVK3bIxy/TzMH7IdFt6xiUfrXvxWKcHSqhEuVlQFnyOy6A4vCfBfmpgvE33coRYgket8ZvEe6+4xdlwLlMOWkukR4kwd05L24jjh9VkxxysY9hKWB2Fs/wXYvG385k=;4:lGYZzKgPyYrKpNHqxNbm2T9fe/6Q3IWjqa5yRc9aWSZSFJXz2BAPgb3nNdVT0Vx6w7AK/eVl/lTZqsMDJT0SD4PNgzK/ldyBw4QLV+TXDI/lQsY7jWsIEhoiCSFy/djBUjGsaiqT+iAiDYiTZcxCvo96AZ024dwNwc8h5q3DMvxeTXJUKgnPXfyLPjbYsaoao8P/xo8sVK59NmGdNEnKfKPtwCNUBS9I3Fwu4DJhvlRBDcF2F67tjqKACa/axun8LzJOxUfOulabtoCC8If4rjmuMX1BQr6OOMrY6GvseCH0m3rarpMX9o30VW4ojawEf0RuG7dml/78RVdaDenEZg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(8121501046)(5005006)(3002001);SRVR:SN1PR0301MB1582;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1582; X-Forefront-PRVS: 06818431B9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR0301MB1582;23:CjD1y7/K/jtuNIa1frYhytHHH5GG5Ebk0F/P/bx?= =?us-ascii?Q?AqEwcF11QNmbhXokPQai4BXllNhCfZviu7MJGrlxEKNVMYdhfnkQLPNUhj4Z?= =?us-ascii?Q?pGSgTgF+r7Pas4T6xnhb9LuW1itP7T9u86PuKQJd7GI1gDtp69LfSuNlK+Rb?= =?us-ascii?Q?uIWRi7fFPBam4rOW2nZnnFB2Ty3bA6h+9gMPfhUucUeC3K9be1tXZto7qCIU?= =?us-ascii?Q?LYxTDl+DJVnf7KStHnqf/f9QHoUwpIDxiWCCcVrtMQP5oM8b2ayfLxLBVNKr?= =?us-ascii?Q?NxqAg6lywWyAMnODUqCsyceJC4bSXAgFEfI55IkiKoBGrxiu8G2yjHw7Ki6w?= =?us-ascii?Q?gRBVb033OQIFFRZdAG7hWbUaw7hgr0VNmORET325VBzpLC5LpDuAHDlsLQ+Z?= =?us-ascii?Q?FiJ2P9e3iD6OxGPwmbjUkwyOD4/QJGYPvKkbitzi1O3B81PbYa0JgzAO/p0g?= =?us-ascii?Q?BIUsFWtk9A7ef+Kz2MDsvVYwTPrBouyIrl0ctSdz7zJL6w4yKh+Qzk49kGpp?= =?us-ascii?Q?njgqkdldwCup7PFr8c7rYfxLKrpSkN5Y3mV6MYNpm/1F2fr63uFzttqy6E/0?= =?us-ascii?Q?sBWvEQ9+unDRtukXJK3yhaekQY+AICIyoCxkw+IGdXcfeu0sICDoLuarkbq4?= =?us-ascii?Q?7kj01KEptr9NunWyTjiQzL1aos0N392PB0G01zpqfOQFVTkgWjkSY7GJCose?= =?us-ascii?Q?4gIX8X1aiJ2DHfLN+kzPheWPZ/Za/gR5D5Yn2/Q0T9ZmCGYF1CrNUUOdFipA?= =?us-ascii?Q?dRclkGYENII1kjC+hVpu1xOYzhHPpzbigrK1QIlfOcvt80sypLM7V83nGc2L?= =?us-ascii?Q?VQgPuEROeRki4AwcA/IQiNMTbdJqOnP7kiQ89nA+4wJAckatgmHi/IDwNOVR?= =?us-ascii?Q?bhsxw4BZ6KBxUAYM/gF3kqgmP+6CIkJ3uRxh6bOdSDuiJHCwL/IBe6Ohyabj?= =?us-ascii?Q?kyMOr3FMUhkkxHk+1SMha01jM2C05CGuY1EREC+N8mob0lu025cgusV4YNGj?= =?us-ascii?Q?stgPaL75bZqNhAZNzd3WsDxCeYHvetLoVlztbBbjJY2uWyylx+7rJKu7PJ4I?= =?us-ascii?Q?8AeBeZBaq/ApXW4Wxxgofn1MQjViTvMHBtNwjCKQH52pXa/hiRhTswvSngj3?= =?us-ascii?Q?qfkHsb4Lu0kIlK0IYjTnN4sC3NK8eM69w04Tj4lhVc8xUB7h3HknIUoiWTo/?= =?us-ascii?Q?kHIQyKWdhfcw7eyfxI92dNPeuT5i8J0eQlQ3kcYJhwUw7Av/mAzQOCLFttcb?= =?us-ascii?Q?jsMqpx6rhEZGyi8L4sJA=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1582;5:su1duC5ulm65V+7DlmH+zQxtG7jkAsHVpnG0FsesdXtdTOQspq2pj1/Q4CviPfXj/dITTgANJyQ8Dh6aTfaFNhKoaoFpPNGOS4WeGc2uf4S3Slf9aFbQ2KBui7B4Kx5c4US05JA3/VSrqW6eF0NrEw==;24:GOuK5r7RS/QcaTDr8nSfhRTL6jbiSYs0p1qiEikeX9iVIHHUxGYPu4VmmGrKimkDef/z8WVJyCVLTyzUiYQ78CCHx8jLckZ8VCRFTbyyzOA=;20:NBZ/5WZveRmmSILPZ4ok3ViVOhUe4Td0oJ6hWIAoAiPuYnKKs3gPvkfqHzxQoD9/QSI+cWe0mwHzs678B7bkzQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2015 16:30:38.1085 (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.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1582 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/