Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754116AbbHMSMn (ORCPT ); Thu, 13 Aug 2015 14:12:43 -0400 Received: from mail-bl2on0116.outbound.protection.outlook.com ([65.55.169.116]:46725 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754101AbbHMSMf (ORCPT ); Thu, 13 Aug 2015 14:12:35 -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: Thu, 13 Aug 2015 23:55:03 +0530 Message-ID: <1439490305-29215-16-git-send-email-ramneek.mehresh@freescale.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1439490305-29215-1-git-send-email-ramneek.mehresh@freescale.com> References: <1439490305-29215-1-git-send-email-ramneek.mehresh@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD030;1:12FYMESOeeoQV6v0ZyrFM7BCM7DZQtm00eNwFftKwIbBiNbO+WduZgc0U/AZLyBLz/F5gwC+1E+I8GSqJhKFGoA3nuI8C+IfubCfz14Tv/kEByEuEsOI4T/3rMNIAeyptFVsvxUxPXL6Ziri2eiOViYsIiJiL4reU9Jb84lD20vzl3VgbYt72KSMPLuJi6Iv7HL3+inIQ4G6oApYZvCjiSTsvg9rCbsxeWDaK47crAE85t70mt3+tZWbSiiRwDhA1Req28ypbCGqWPEVU67bjjOTW88xUmM8NfO5GWrMM0SLtxp5W+cmZFVuGqKxbJ6JLSSSU1kdZlYqXnQZWC5/n1C+DxadtWk7k0AadAUOvGE3XBWf5L6CztWTa0woimu05LCXdQyXZ6sFhIBigFR/BQ== 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)(97736004)(81156007)(5003940100001)(77156002)(5001860100001)(4001540100001)(105606002)(48376002)(106466001)(50466002)(5001830100001)(85426001)(19580395003)(6806004)(107886002)(19580405001)(76506005)(110136002)(5001960100002)(50226001)(76176999)(50986999)(86362001)(2351001)(104016003)(189998001)(229853001)(46102003)(92566002)(33646002)(68736005)(77096005)(87936001)(64706001)(2950100001)(47776003)(62966003)(36756003)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:SN1PR0301MB1584;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;SN1PR0301MB1584;2:hBRzmkzkMRqisn5Lxtt5KgnDhKS8mtL4og20nr8EqbroMwreRTfsoEp74ukzCLWufEXJZtFUdTCJJ5shrfXdsx9/8gX2pumrjN3z5ikAsj2F0TqroknxPcrBlgPMDmkuLbBIUI7y8yODeciH5hxeBxZ2eRsIBgHmuztYDEOAEi8=;3:5M/QGYHDeScLQAIC1J0L+8ZwcqN2fPavrhYaMhz+2OLT/yDcZ+5miTHlsBZrT/CdfDJF/hDe2wxPAMUeQibsXgmoowy2HX/A1Q0F+Gl8YS5T0KWZODts2She1yDiCK25tO9zhGeNLPJ7b4AhwziYsIJbhC7+ow2IbWxfQ5fr6RTEpnBplTxu4XLIQynZGpbIo1/zFoeWwTO7uhg/BZ7BFsTauAcqHEFZeTWSYwzkbnA=;25:L1Jkd0y1TLRdAD1mLsrCZHRxWLBpR0x3Waa64pT6NJyKBOSvzAqADbA7PLLx2yjh5mR5U8UpsZZKyXmteR3ye4RMic9pXBQz7fR+sLP1SkI+JKDp5i69Sr1n5SOhJHRFSaTfHZGNzztLul6rE0C0MCp+AV2dRFzlw4ZvyNeKZjSmtGRtP403foBCwRloM2x55sGZz9Jkv7/GK9yITOrQ+qN3o6OKapSxS7HCeVSNUTxmq8aUjMx26W4Luc2bTC1cD6wigz2kuKkHohsPXNxJ9w== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1584; X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1584;20:siaLeWbmox3Sin5mpFcAG4fPJoPw4KDGO5leZhDWXc9dkjijLAlDfx50DBHPTxMMGzwZ0f/TpB2fG1VeU3G3yvUlXRx/C/JuY1CclsLAHWuZoDxSqH6cIzCZ9FCRkA+CrueuL4Sqag+nNOO1us8mFXgg0jUxHT0wUwF9zZ1EeFhXmZz+pnm70RgFnaHfRv5UG8VyrU3GTeMYR5Bc3n5qapawpJKAJz1FoUGeqovsVAeVegBVtj4eSDfgmaJLFqpInHTpgpxo5vfKN85PsAxBKHAeE24quVa5YrmfBoOwf+GULZHGwtLerv8pkvjKx24oAvoQbSbi9d9ATYIbk8tt2HHmX9NSTVS/APJZjCE/sQA=;4:j0NXzz2UuULnvi391LS/Op7chGaDNXFJ5QcgYV5fGEHKqjQIhdWk/OPrLJQwiH4BeAOkumRe3g8jJj8+QKP2t5VfI/k08rowyNuWyPGssDWbFkORlWPeJMDYZ5fKhMr/PdgkbMfuJEr0fLNqvQvayQ1ZHVRIdQXNxx7g4++zMrMyAF2yDs9vN5XR5z8SXo8WY2IiDOT1nZF2HNw1IMVcc6cMMcyZy0IEva6X1KDnVyxVAilYaKjI1QB324/xVVzd3pGHK8i4k+WinoQCtUur2iyMmz9gKXI0n5/uXP35DG8= 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:SN1PR0301MB1584;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1584; X-Forefront-PRVS: 0667289FF8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR0301MB1584;23:r5wqF4BgHw9g5sMkAL8fApJ0E2j3/8/wmouEYtN?= =?us-ascii?Q?Ql8D57lpsQHldyiUoY6cj3P7CHZKNtb6W1uoJnqthz5jY6uTGwbcEEo/lZVm?= =?us-ascii?Q?34u8JxL/otFEZm5LeiKzzOHdLkIbg5qTGlbFEgzQz9AJp/W29ZXS6LzPv6sN?= =?us-ascii?Q?4pqHeZxmqiw/76BB2lrYhzHbop7lpUb/QZ/bLl9dZ2Y9BTGkHsTSCydXpHhS?= =?us-ascii?Q?2UelcYS3HfD8r6y7usXyEdt4j8HmatbOtwVrnhrdqAuYLGNXjx1gGluBqfpV?= =?us-ascii?Q?U3c4Ny/opPunudbXCxLUUu3PZoUnuJR3NK01X7QSTqlCXu6AiWgPyRMVNjck?= =?us-ascii?Q?9QerOGpjbInMBS5Rv465A0cpM6/9ZL2DU69dDu61dX7DxnBT/Q4/XBuUl812?= =?us-ascii?Q?p7HPSFmBkG2UqwTBSjK1zXRRX4ZzJ5yVMihlsyGao2iWUJ/oeLaaS2PbxBx2?= =?us-ascii?Q?znKRa3TcNVlabI46HidCq5eGX+kIPpOAz7iTJ25ANT+af8LBxoD1KnAA5BdB?= =?us-ascii?Q?LMbVOtR8WhU3MHwlHQv9h3kC81HmBSuYsLAIX30N7n/CgN/IKRgHYBONUFJM?= =?us-ascii?Q?94ZzSyn4qMZGRLVSBFJOYFT55iMYsSf9q2Wk0JP5qnf1mezAbdoKQvzKfmGT?= =?us-ascii?Q?cUNtVdktSvxyxtwSdENLgRYLSBhpnz0RFiA0PrOi9JUay7//+Bw9Q/9bmE1N?= =?us-ascii?Q?yPDjuIbVDcPAykNZfXA2zQUmtEnLsifVQwC+XUsp1h3jRTLX+El+xV990jZz?= =?us-ascii?Q?pC4kqSBmwEoKOli/GJ5m0Q+/k+vNfwEJ16Iz/KtgA7FQMfF7LWNR7VjLqfJi?= =?us-ascii?Q?8NfVzscwhVVIA6aanoLDNZYPDQL19UPhrI0VnVTsTTBoAF6fVk3TDz7qaOsj?= =?us-ascii?Q?EpfBs5T9iPpmmsPID189/9vs1JfbNlYpj2mdtnHbWCx1Q5oilFrK0UZzYjyu?= =?us-ascii?Q?MkKp1wAAFlBEESniukI9ZnkHvOP/rlRgdRK40vaKctvZCLIiaManmxi2PBQW?= =?us-ascii?Q?1/Ceb+ljz7s1rid56c9GrJkzCRf/BMfWtsUn8RDmIk+ag1gPGJQPwqDAMxrj?= =?us-ascii?Q?P+vTSotvh0YuMMjPUed3xWEnXXs7TVTli6DMZ2Nn37Z5tCpSLLaFdBVsvHvw?= =?us-ascii?Q?euiz2aidQfDslhF98uI8AmM8ZnX/G0wH314gHQ2JlkbqtuiPDhodRqNuwMlX?= =?us-ascii?Q?EWOo/8uscsQpZ8lU=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1584;5:FkzSgTeHxxuBhUmkRFnAd9tBt8WkkcG/5lSqtbPOLjxNPpBOGtdZM5GRiN3/SocdfTscuCq7KYnnpbjDf6E945eZQcUqL+vt94b014L1y5IrNEhmlsD8tw+DlgKPBCwYjRSajfg0hFvl1B+YzVk1kg==;24:hzPP4490vKZjwiya3RwNceUzlquIdFEyi3jOhQ432it2YBitd+pBO1OEq/vzM9+BKberPPWYyeZWF02v/haUcn7BfvG9eVua1eijS0bowGM=;20:FMCyHjYpfo2K+pDJcEai9Zc2edGEVAxPVXOma93vaqJELXDHkGGL+8/KZWXk0GI1w0E62nIVGdvBr6YadPSoIg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2015 18:12:27.5581 (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: SN1PR0301MB1584 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/