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/usb/musb | |
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/usb/musb')
-rw-r--r-- | drivers/usb/musb/am35x.c | 3 | ||||
-rw-r--r-- | drivers/usb/musb/musb_dsps.c | 3 | ||||
-rw-r--r-- | drivers/usb/musb/omap2430.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index c964d6af178b..a87cdd2387cf 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c | |||
@@ -34,8 +34,7 @@ | |||
34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
35 | #include <linux/dma-mapping.h> | 35 | #include <linux/dma-mapping.h> |
36 | #include <linux/usb/nop-usb-xceiv.h> | 36 | #include <linux/usb/nop-usb-xceiv.h> |
37 | 37 | #include <linux/platform_data/usb-omap.h> | |
38 | #include <plat/usb.h> | ||
39 | 38 | ||
40 | #include "musb_core.h" | 39 | #include "musb_core.h" |
41 | 40 | ||
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index 444346e1e10d..a67af21c1460 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c | |||
@@ -38,13 +38,12 @@ | |||
38 | #include <linux/pm_runtime.h> | 38 | #include <linux/pm_runtime.h> |
39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
40 | #include <linux/usb/nop-usb-xceiv.h> | 40 | #include <linux/usb/nop-usb-xceiv.h> |
41 | #include <linux/platform_data/usb-omap.h> | ||
41 | 42 | ||
42 | #include <linux/of.h> | 43 | #include <linux/of.h> |
43 | #include <linux/of_device.h> | 44 | #include <linux/of_device.h> |
44 | #include <linux/of_address.h> | 45 | #include <linux/of_address.h> |
45 | 46 | ||
46 | #include <plat/usb.h> | ||
47 | |||
48 | #include "musb_core.h" | 47 | #include "musb_core.h" |
49 | 48 | ||
50 | #ifdef CONFIG_OF | 49 | #ifdef CONFIG_OF |
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h index b85f3973e78c..8ef656659fcb 100644 --- a/drivers/usb/musb/omap2430.h +++ b/drivers/usb/musb/omap2430.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #ifndef __MUSB_OMAP243X_H__ | 10 | #ifndef __MUSB_OMAP243X_H__ |
11 | #define __MUSB_OMAP243X_H__ | 11 | #define __MUSB_OMAP243X_H__ |
12 | 12 | ||
13 | #include <plat/usb.h> | 13 | #include <linux/platform_data/usb-omap.h> |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * OMAP2430-specific definitions | 16 | * OMAP2430-specific definitions |