From patchwork Tue Aug 2 08:39:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lin X-Patchwork-Id: 1028342 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p728XH99023140 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 2 Aug 2011 08:33:39 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoAPN-0002Uz-NY; Tue, 02 Aug 2011 08:33:02 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QoAPN-0007sH-26; Tue, 02 Aug 2011 08:33:01 +0000 Received: from db3ehsobe002.messaging.microsoft.com ([213.199.154.140] helo=DB3EHSOBE002.bigfish.com) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoAP3-0007oM-81 for linux-arm-kernel@lists.infradead.org; Tue, 02 Aug 2011 08:32:42 +0000 Received: from mail118-db3-R.bigfish.com (10.3.81.248) by DB3EHSOBE002.bigfish.com (10.3.84.22) with Microsoft SMTP Server id 14.1.225.22; Tue, 2 Aug 2011 08:32:39 +0000 Received: from mail118-db3 (localhost.localdomain [127.0.0.1]) by mail118-db3-R.bigfish.com (Postfix) with ESMTP id 2F1BA1B38101; Tue, 2 Aug 2011 08:32:39 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail118-db3 (localhost.localdomain [127.0.0.1]) by mail118-db3 (MessageSwitch) id 131227395932858_4167; Tue, 2 Aug 2011 08:32:39 +0000 (UTC) Received: from DB3EHSMHS001.bigfish.com (unknown [10.3.81.252]) by mail118-db3.bigfish.com (Postfix) with ESMTP id E864816B804F; Tue, 2 Aug 2011 08:32:38 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS001.bigfish.com (10.3.87.101) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 2 Aug 2011 08:32:38 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Tue, 2 Aug 2011 03:32:37 -0500 Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p728WUAT002387; Tue, 2 Aug 2011 03:32:35 -0500 (CDT) From: Tony Lin To: Subject: [PATCH v4 2/7] ARM: mxs: make ehci-mxc more flexible to be used on different platforms Date: Tue, 2 Aug 2011 16:39:41 +0800 Message-ID: <1312274386-6833-3-git-send-email-tony.lin@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1312274386-6833-1-git-send-email-tony.lin@freescale.com> References: <1312274386-6833-1-git-send-email-tony.lin@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110802_043241_523205_BCE70611 X-CRM114-Status: GOOD ( 17.51 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [213.199.154.140 listed in list.dnswl.org] Cc: s.hauer@pengutronix.de, stern@rowland.harvard.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 02 Aug 2011 08:33:44 +0000 (UTC) change ehci_irq to mxc_ehci_irq to give chance do some platform specific actions in irq handler for different platforms. add void pointer in the last of mxc_usbh_platform_data structure so that additional information could be added to that field if needed. Signed-off-by: Tony Lin --- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/ehci-mxc.c | 13 ++++++++++++- include/linux/fsl_devices.h | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index ab085f1..6a5905b 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -139,7 +139,7 @@ config USB_EHCI_FSL config USB_EHCI_MXC bool "Support for Freescale on-chip EHCI USB controller" - depends on USB_EHCI_HCD && ARCH_MXC + depends on USB_EHCI_HCD && (ARCH_MXC || ARCH_MXS) select USB_EHCI_ROOT_HUB_TT ---help--- Variation of ARC USB block used in some Freescale chips. diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index cbf60a6..6d3c53c 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -64,6 +64,17 @@ static int ehci_mxc_setup(struct usb_hcd *hcd) return 0; } +static irqreturn_t mxc_ehci_irq(struct usb_hcd *hcd) +{ + struct mxc_usbh_platform_data *pdata; + + pdata = hcd->self.controller->platform_data; + if (pdata->plt_irq_handler) + pdata->plt_irq_handler(pdata); + + return ehci_irq(hcd); +} + static const struct hc_driver ehci_mxc_hc_driver = { .description = hcd_name, .product_desc = "Freescale On-Chip EHCI Host Controller", @@ -72,7 +83,7 @@ static const struct hc_driver ehci_mxc_hc_driver = { /* * generic hardware linkage */ - .irq = ehci_irq, + .irq = mxc_ehci_irq, .flags = HCD_USB2 | HCD_MEMORY, /* diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index cb19260..d94e9e5 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -120,6 +120,8 @@ struct mxc_usbh_platform_data { unsigned int portsc; struct otg_transceiver *otg; + void (*plt_irq_handler)(struct mxc_usbh_platform_data *pdata); + void *priv; }; struct spi_device;