Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643AbbGOMGd (ORCPT ); Wed, 15 Jul 2015 08:06:33 -0400 Received: from mail-bn1bon0136.outbound.protection.outlook.com ([157.56.111.136]:52352 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751924AbbGOMG1 (ORCPT ); Wed, 15 Jul 2015 08:06:27 -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; From: Ramneek Mehresh To: CC: , , , , Ramneek Mehresh Subject: [PATCH 6/8][v2]usb:fsl:otg: Combine host/gadget start/resume for ID change Date: Wed, 15 Jul 2015 17:32:50 +0530 Message-ID: <1436961772-11482-7-git-send-email-ramneek.mehresh@freescale.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1436961772-11482-1-git-send-email-ramneek.mehresh@freescale.com> References: <1436961772-11482-1-git-send-email-ramneek.mehresh@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD009;1:KHG7vgKJvMfH3jMAeE2B5SgHwc85WEo0qozdRFDav3h57SXmXfCtQW49EQb8YMrkCNKoSdbn9CTMUfvMujl7axsbu1kCOmYMx6HBlvoVvPPmMEZsH5MPHX80aU6DwOz3asiQPA0dbt3ZuQEsVUQLH/Nkyr672egG+2nj3URpESHGsKp4Dch7jcJX69FUZ1GdHUFOv7Dcp1IPGYSgTmoWUpUIRD/stNAz9j6llGBgdwYg9W2jaRMGSdO7mW9KUTkVJppeVcp7f5mIsxaw+xmQZQtDRUbcMNn5n39rWpPUTL90Es8SnDCxcMB392cX19jgbbv0PZ2UYZDA9zsedoa+p17IQCed4GagEzKxi4RAhgzVbbUDwN18ldJwhxOT+Co/yiwyNvKsth2T+Q1UvFvZpYayPU6oyD3rkGOxNpbdzjCpcoXGA1thhD56wdCgIP7q X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(46102003)(87936001)(19580395003)(85426001)(2351001)(50986999)(19580405001)(76176999)(229853001)(76506005)(47776003)(86362001)(6806004)(104016003)(33646002)(36756003)(106466001)(189998001)(110136002)(77156002)(48376002)(5003940100001)(50466002)(62966003)(105606002)(50226001)(92566002)(107886002)(2950100001)(77096005)(5001960100002)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BLUPR0301MB1570;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:sfv;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB1570;2:Xk5/MdQBOGdJ027XvNQEn8S7evL2nG3HVTPLG0vC2gOq4e6WRQBgTfUVAVhpNntF;3:uOc06dlDAHb8cSHRmE8YaT7kuyxUh1FBmaxUmXCHG5tK8bw1gfWddWna7kK/of+gwcLNLtLY1kVok9AxlnOFcY8ZoBSkQJNjIJ7XlCXC8BgKSm9WzZZPJQsVwaXnBx7V68LEsLGVWcLeLdEMIQjX+qpoc/AFxahyvc9q+Znr0xZKPzUn6llYMvGBQSCZsw6UnZwtzuxK5UbrZvXa1yXcP+iOXyU4NSxW4ZQkLm37Esc=;25:/Z2HuMJU25+/SSnVoiYUAGLP9jowQQwijtUsCIPjXuO8MnnQuyF4A0g3Tl8YZUN1zUa2ZaSV8lTgmrK8UXfWdvLDMA2Gbtkkib3Uva7I46NWfqMrg4O8jspR1ZinDG9qIiS5STPBZio0fz3xfZsBdSePmyH7lSN2qZ0mjJADt11xH3gGnfUnDtzXoHvxCHe3QiWu26eHXkSw1/fYKZvOldBYOf1uBBZbMdEiYE6OZJcsM4m96kMOucOSSNkUZe6/cTBhXs4J25wjH6C8TWixng==;20:O4FifzXVVVRAOgu0zvWfC3YVo2hxYv3rKZVMj3lsp0LPsB63Lu7aXnzVab2mi/7w2u5orG+9Z1jj+rltoL/bI5G9AJZ0OymO4yg5NsbxoQqF/pZop+UFf+5Ug+s9L4DSB/wqgT5VIus5tYi3E6gM7A9pYA7n7etIMyjZzss7mi/6PWhcSAOxZAi1+29eSrnMMYbBuV2kWtjt11tGbqFhnTSUzi71J3D19Ro2nG6zykXxS0+Jnafbm9HKwwLF4hPuKPKXQxfw7nwSkHFuLAKtgBC0x0TR21v+tPDtR3Xj/B2ath59u3aI+SuDIRXVuBGvE0hWDRgbZiSLZvE6h07bsHjvGmSgo1P37e8BChHEIw8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB1570; BLUPR0301MB1570: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BLUPR0301MB1570;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB1570; X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB1570;4:+c1Zi0zKJyGfdglenu94+pTCvqJ4oVYgcbDvTOMboo33m9ytl3Ip+oCzUA/PqMS8ChEYpnScCjnXTXRWO5m4FXKG7dSDXsrmeLzVsok8/QFN1EQY3nvdH2ifa3zyPi9JfoXDVdQqhh7AfPXZE8Zpve2T36HS4IrK8Ej93Iv1S4RE8iQN4hSDRxFGzFMvudXsfSMhahjsFXRMlvEEfdGp01C62iSUaTN15dU1KCy2i9ZsRAtWw6+l9Dab2g3huFTNr5sXVkZFjUKEiQT+iHSim5tBsVGbxdjpegoB20wst6s= X-Forefront-PRVS: 0638FD5066 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR0301MB1570;23:959/jOvptZuerZNH/TCTVyaIgYCos6wT8r+QJg9?= =?us-ascii?Q?atmE9heEBMGwZaemF0KWkuAfaVFkPk6TJHQkW1K4xzA03y4Igp1488mWMBks?= =?us-ascii?Q?Ww3TTLooDvZUOXX3UzXgV30PX7ZPcmVT3nPCnRa9OyV6/egouLBJbWx7A1ay?= =?us-ascii?Q?MtZpoajx/1Z0ROBMXtRiJztcvT5B07vN4CQxlWPGU6HNnikM6+O2aYXzVlr8?= =?us-ascii?Q?CL8fIWEn5T1SdTkY9V9qWAzAalPRkqO5pX1qPvBZ8bdpLJ+1A3TpuYZSZBR7?= =?us-ascii?Q?3ZniqEY8xlhDZ/lulzfDOVvrCVGgxKI5T9IINXcps9q3OazZSTQVwz+9CVMZ?= =?us-ascii?Q?lJlQR6hv2A58M+nzM2pRZtD1qKnlnFyHpEXifTVaBS7xbagFJIoWY3Ixq6TK?= =?us-ascii?Q?bbuxFKE19zGer6WsQK0iDIJenMHcGd8PG6OnSgqYduPdeh9rB8iCfNgJkHRu?= =?us-ascii?Q?kWcMjkp0Sh9r7rUeE8SZ7MDtROgjsFcF7uR0qjEd5O3xbMhDBM38Mdfp16QD?= =?us-ascii?Q?gfOr1Gd0uoVrHMj6Q1aAQG+tG5CP79F9w0RkoYBLx36nxb0r2EVyeFcsT2aR?= =?us-ascii?Q?Bqgk4EBdTXuLyWYQHnOuY4Aw0EJMo+TFP9qOsUJzFZY8QWKJmylfUgwZWBI0?= =?us-ascii?Q?/u2KaPhJ5YWNB1mhNEpIQ2QqSED72DsbEoFqReSaaNpR983aTPyyYOZSxHt+?= =?us-ascii?Q?+vzFmK87VdVgYVAVm91G2/XJVZuS/NDxuIpXUZYRmLA9DP48ZbwnDVwzNUwU?= =?us-ascii?Q?3mmlvBOYGnsavg+EBOsYhH5AQQeStCF5sS+x5FKIiTIW/AQe5ZcQNr7q4wIq?= =?us-ascii?Q?T3A0Bhk2gEzYQGZRv5MmP1bwBRo9ybI9Jpr3MnTKhYAbgf9BbAO01p3zKW1I?= =?us-ascii?Q?o/6JB9VdCOoeJazAt7kQKs8F3Zh7K3IckdzetgZCG8Hnr+sDr02xog+szWTS?= =?us-ascii?Q?59Zh54aMceG8WaMophow8BJ7wE1XugsdKmlJnR767z3uO4B6mjdGskeR6aTt?= =?us-ascii?Q?hLkM=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR0301MB1570;5:bYrPUXpIkHgUM8AEUV/YSfIjwsfQjLW4TMsHsXnpRKX2PELqpVzDE14LFhG/J+YKyBCfn+n1DzgPqr3Z8ONE77ytr2rR9bxM9ZdV121OAJ9wQd8565f0f5DOt0mH2ACtzzmnROfZw3vFqV8Ka+umIA==;24:zAu1+5PC/UyHKSQt3eae8b7pwOQAaOEdHK3ZwtGAgGoXyG1enhuHcxa+VV4iTut6S64GepZ++Iq/IQKXwrn8lYKFCE3yI5iuFzFxRwJbNNQ=;20:nMBc2qUwe6vv0yIDrRtf2fh/0cWY2mTAEtsfQaHNzuMxCrwVEd6dZS1TaOPm1AcC5joD0G9kuDVYodg4HmfvMw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 11:50:48.0243 (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: BLUPR0301MB1570 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/