From: tony.lin@freescale.com (Tony Lin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 4/6] ARM: mxs: make ehci-mxc more flexible to be used on different platforms
Date: Wed, 27 Jul 2011 13:29:32 +0800 [thread overview]
Message-ID: <1311744574-3610-5-git-send-email-tony.lin@freescale.com> (raw)
In-Reply-To: <1311744574-3610-1-git-send-email-tony.lin@freescale.com>
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 <tony.lin@freescale.com>
---
arch/arm/mach-mxs/include/mach/hardware.h | 2 ++
arch/arm/mach-mxs/include/mach/mxs.h | 12 +++++++++++-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ehci-mxc.c | 15 ++++++++++++++-
include/linux/fsl_devices.h | 2 ++
5 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-mxs/include/mach/hardware.h b/arch/arm/mach-mxs/include/mach/hardware.h
index 53e89a0..affa72b 100644
--- a/arch/arm/mach-mxs/include/mach/hardware.h
+++ b/arch/arm/mach-mxs/include/mach/hardware.h
@@ -26,4 +26,6 @@
#define IOMEM(addr) ((void __force __iomem *)(addr))
#endif
+#include "mxs.h"
+
#endif /* __MACH_MXS_HARDWARE_H__ */
diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h
index 35a89dd..0661e90 100644
--- a/arch/arm/mach-mxs/include/mach/mxs.h
+++ b/arch/arm/mach-mxs/include/mach/mxs.h
@@ -35,7 +35,17 @@
machine_is_mx28evk() || \
machine_is_tx28() || \
0)
-
+#define cpu_is_mx1() 0
+#define cpu_is_mx21() 0
+#define cpu_is_mx25() 0
+#define cpu_is_mx27() 0
+#define cpu_is_mx31() 0
+#define cpu_is_mx35() 0
+#define cpu_is_mx50() 0
+#define cpu_is_mx51() 0
+#define cpu_is_mx53() 0
+#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35())
+#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27())
/*
* IO addresses common to MXS-based
*/
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..c93f9ae 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -64,6 +64,19 @@ 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 == NULL)
+ goto out;
+ pdata->plt_irq_handler(pdata);
+
+out:
+ 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 +85,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..cf441e8 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 *ppriv;
};
struct spi_device;
--
1.7.0.4
next prev parent reply other threads:[~2011-07-27 5:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 5:29 [PATCH v3 0/6] ARM: mx28: add usb host function Tony Lin
2011-07-27 5:29 ` [PATCH v3 1/6] ARM: mxs: ehci: consolidate definitions and structures to share among platforms Tony Lin
2011-07-27 5:29 ` [PATCH v3 2/6] ARM: mxs: enable usb1 phy power supply Tony Lin
2011-07-27 5:29 ` [PATCH v3 3/6] ARM: mxs: add usb clocks to clock tree Tony Lin
2011-07-27 5:29 ` Tony Lin [this message]
2011-07-27 8:19 ` [PATCH v3 4/6] ARM: mxs: make ehci-mxc more flexible to be used on different platforms Marc Kleine-Budde
2011-07-27 5:29 ` [PATCH v3 5/6] ARM: mxs: add usb phy operations Tony Lin
2011-07-27 8:03 ` Sascha Hauer
2011-07-27 8:16 ` Lin Tony-B19295
2011-07-28 7:39 ` Lin Tony-B19295
2011-07-28 11:27 ` Russell King - ARM Linux
2011-07-27 8:48 ` Lothar Waßmann
2011-07-27 9:10 ` Lin Tony-B19295
2011-07-27 9:24 ` Lothar Waßmann
2011-07-27 8:57 ` Marc Kleine-Budde
2011-07-27 5:29 ` [PATCH v3 6/6] ARM: mxs: add usb host function to default config Tony Lin
2011-07-27 9:01 ` [PATCH v3 0/6] ARM: mx28: add usb host function Marc Kleine-Budde
2011-07-27 9:15 ` Lin Tony-B19295
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311744574-3610-5-git-send-email-tony.lin@freescale.com \
--to=tony.lin@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.