diff options
author | Felipe Balbi <balbi@ti.com> | 2012-10-24 17:26:19 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-24 17:26:55 -0400 |
commit | e8c4a7acc9ec0ee82feedcdc3c6d0ee44d67918a (patch) | |
tree | aac78f4e5855a3e1790b76d07d406665318ab05b /drivers/mfd | |
parent | 54db6eee06b51278a79e007765151fb5e71c370c (diff) |
ARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
In order to make single zImage work for ARM architecture,
we need to make sure we don't depend on private headers.
Move USB platform_data to <linux/platform_data/omap-usb.h>
and add a minimal drivers/mfd/usb-omap.h.
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Partha Basak <parthab@india.ti.com>
Cc: Keshava Munegowda <keshava_mgowda@ti.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Felipe Balbi <balbi@ti.com>
[tony@atomide.com: updated for local mfd/usb-omap.h]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/omap-usb-host.c | 5 | ||||
-rw-r--r-- | drivers/mfd/omap-usb-tll.c | 2 | ||||
-rw-r--r-- | drivers/mfd/omap-usb.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 23cec57c02ba..cebfe0a68aa7 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c | |||
@@ -26,9 +26,12 @@ | |||
26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
29 | #include <plat/usb.h> | 29 | #include <linux/platform_device.h> |
30 | #include <linux/platform_data/usb-omap.h> | ||
30 | #include <linux/pm_runtime.h> | 31 | #include <linux/pm_runtime.h> |
31 | 32 | ||
33 | #include "omap-usb.h" | ||
34 | |||
32 | #define USBHS_DRIVER_NAME "usbhs_omap" | 35 | #define USBHS_DRIVER_NAME "usbhs_omap" |
33 | #define OMAP_EHCI_DEVICE "ehci-omap" | 36 | #define OMAP_EHCI_DEVICE "ehci-omap" |
34 | #define OMAP_OHCI_DEVICE "ohci-omap3" | 37 | #define OMAP_OHCI_DEVICE "ohci-omap3" |
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c index 4b7757b84301..0db0dfa3d08c 100644 --- a/drivers/mfd/omap-usb-tll.c +++ b/drivers/mfd/omap-usb-tll.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
28 | #include <plat/usb.h> | ||
29 | #include <linux/pm_runtime.h> | 28 | #include <linux/pm_runtime.h> |
29 | #include <linux/platform_data/usb-omap.h> | ||
30 | 30 | ||
31 | #define USBTLL_DRIVER_NAME "usbhs_tll" | 31 | #define USBTLL_DRIVER_NAME "usbhs_tll" |
32 | 32 | ||
diff --git a/drivers/mfd/omap-usb.h b/drivers/mfd/omap-usb.h new file mode 100644 index 000000000000..972aa961b064 --- /dev/null +++ b/drivers/mfd/omap-usb.h | |||
@@ -0,0 +1,2 @@ | |||
1 | extern int omap_tll_enable(void); | ||
2 | extern int omap_tll_disable(void); | ||