diff options
27 files changed, 75 insertions, 46 deletions
diff --git a/arch/arm/mach-imx/ehci-imx25.c b/arch/arm/mach-imx/ehci-imx25.c index 134c190e3003..42a5a3d14c5f 100644 --- a/arch/arm/mach-imx/ehci-imx25.c +++ b/arch/arm/mach-imx/ehci-imx25.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/platform_data/usb-ehci-mxc.h> | 18 | #include <linux/platform_data/usb-ehci-mxc.h> |
19 | 19 | ||
20 | #include "ehci.h" | ||
20 | #include "hardware.h" | 21 | #include "hardware.h" |
21 | 22 | ||
22 | #define USBCTRL_OTGBASE_OFFSET 0x600 | 23 | #define USBCTRL_OTGBASE_OFFSET 0x600 |
diff --git a/arch/arm/mach-imx/ehci-imx27.c b/arch/arm/mach-imx/ehci-imx27.c index 448d9115539d..c56974346c16 100644 --- a/arch/arm/mach-imx/ehci-imx27.c +++ b/arch/arm/mach-imx/ehci-imx27.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/platform_data/usb-ehci-mxc.h> | 18 | #include <linux/platform_data/usb-ehci-mxc.h> |
19 | 19 | ||
20 | #include "ehci.h" | ||
20 | #include "hardware.h" | 21 | #include "hardware.h" |
21 | 22 | ||
22 | #define USBCTRL_OTGBASE_OFFSET 0x600 | 23 | #define USBCTRL_OTGBASE_OFFSET 0x600 |
diff --git a/arch/arm/mach-imx/ehci-imx31.c b/arch/arm/mach-imx/ehci-imx31.c index 05de4e1e39d7..bede21d9b981 100644 --- a/arch/arm/mach-imx/ehci-imx31.c +++ b/arch/arm/mach-imx/ehci-imx31.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/platform_data/usb-ehci-mxc.h> | 18 | #include <linux/platform_data/usb-ehci-mxc.h> |
19 | 19 | ||
20 | #include "ehci.h" | ||
20 | #include "hardware.h" | 21 | #include "hardware.h" |
21 | 22 | ||
22 | #define USBCTRL_OTGBASE_OFFSET 0x600 | 23 | #define USBCTRL_OTGBASE_OFFSET 0x600 |
diff --git a/arch/arm/mach-imx/ehci-imx35.c b/arch/arm/mach-imx/ehci-imx35.c index 554e7cccff53..f424a543755c 100644 --- a/arch/arm/mach-imx/ehci-imx35.c +++ b/arch/arm/mach-imx/ehci-imx35.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/platform_data/usb-ehci-mxc.h> | 18 | #include <linux/platform_data/usb-ehci-mxc.h> |
19 | 19 | ||
20 | #include "ehci.h" | ||
20 | #include "hardware.h" | 21 | #include "hardware.h" |
21 | 22 | ||
22 | #define USBCTRL_OTGBASE_OFFSET 0x600 | 23 | #define USBCTRL_OTGBASE_OFFSET 0x600 |
diff --git a/arch/arm/mach-imx/ehci-imx5.c b/arch/arm/mach-imx/ehci-imx5.c index e49710b10c68..74bfdd970bfe 100644 --- a/arch/arm/mach-imx/ehci-imx5.c +++ b/arch/arm/mach-imx/ehci-imx5.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/platform_data/usb-ehci-mxc.h> | 18 | #include <linux/platform_data/usb-ehci-mxc.h> |
19 | 19 | ||
20 | #include "ehci.h" | ||
20 | #include "hardware.h" | 21 | #include "hardware.h" |
21 | 22 | ||
22 | #define MXC_OTG_OFFSET 0 | 23 | #define MXC_OTG_OFFSET 0 |
diff --git a/arch/arm/mach-imx/ehci.h b/arch/arm/mach-imx/ehci.h new file mode 100644 index 000000000000..4f42ca380b26 --- /dev/null +++ b/arch/arm/mach-imx/ehci.h | |||
@@ -0,0 +1,50 @@ | |||
1 | #ifndef __MACH_IMX_EHCI_H | ||
2 | #define __MACH_IMX_EHCI_H | ||
3 | |||
4 | /* values for portsc field */ | ||
5 | #define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23) | ||
6 | #define MXC_EHCI_FORCE_FS (1 << 24) | ||
7 | #define MXC_EHCI_UTMI_8BIT (0 << 28) | ||
8 | #define MXC_EHCI_UTMI_16BIT (1 << 28) | ||
9 | #define MXC_EHCI_SERIAL (1 << 29) | ||
10 | #define MXC_EHCI_MODE_UTMI (0 << 30) | ||
11 | #define MXC_EHCI_MODE_PHILIPS (1 << 30) | ||
12 | #define MXC_EHCI_MODE_ULPI (2 << 30) | ||
13 | #define MXC_EHCI_MODE_SERIAL (3 << 30) | ||
14 | |||
15 | /* values for flags field */ | ||
16 | #define MXC_EHCI_INTERFACE_DIFF_UNI (0 << 0) | ||
17 | #define MXC_EHCI_INTERFACE_DIFF_BI (1 << 0) | ||
18 | #define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) | ||
19 | #define MXC_EHCI_INTERFACE_SINGLE_BI (3 << 0) | ||
20 | #define MXC_EHCI_INTERFACE_MASK (0xf) | ||
21 | |||
22 | #define MXC_EHCI_POWER_PINS_ENABLED (1 << 5) | ||
23 | #define MXC_EHCI_PWR_PIN_ACTIVE_HIGH (1 << 6) | ||
24 | #define MXC_EHCI_OC_PIN_ACTIVE_LOW (1 << 7) | ||
25 | #define MXC_EHCI_TTL_ENABLED (1 << 8) | ||
26 | |||
27 | #define MXC_EHCI_INTERNAL_PHY (1 << 9) | ||
28 | #define MXC_EHCI_IPPUE_DOWN (1 << 10) | ||
29 | #define MXC_EHCI_IPPUE_UP (1 << 11) | ||
30 | #define MXC_EHCI_WAKEUP_ENABLED (1 << 12) | ||
31 | #define MXC_EHCI_ITC_NO_THRESHOLD (1 << 13) | ||
32 | |||
33 | #define MXC_USBCTRL_OFFSET 0 | ||
34 | #define MXC_USB_PHY_CTR_FUNC_OFFSET 0x8 | ||
35 | #define MXC_USB_PHY_CTR_FUNC2_OFFSET 0xc | ||
36 | #define MXC_USBH2CTRL_OFFSET 0x14 | ||
37 | |||
38 | #define MX5_USBOTHER_REGS_OFFSET 0x800 | ||
39 | |||
40 | /* USB_PHY_CTRL_FUNC2*/ | ||
41 | #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3 | ||
42 | #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_SHIFT 0 | ||
43 | |||
44 | int mx51_initialize_usb_hw(int port, unsigned int flags); | ||
45 | int mx25_initialize_usb_hw(int port, unsigned int flags); | ||
46 | int mx31_initialize_usb_hw(int port, unsigned int flags); | ||
47 | int mx35_initialize_usb_hw(int port, unsigned int flags); | ||
48 | int mx27_initialize_usb_hw(int port, unsigned int flags); | ||
49 | |||
50 | #endif /* __MACH_IMX_EHCI_H */ | ||
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index 39406b7e3228..a7e9bd26a552 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include "common.h" | 50 | #include "common.h" |
51 | #include "devices-imx31.h" | 51 | #include "devices-imx31.h" |
52 | #include "crmregs-imx3.h" | 52 | #include "crmregs-imx3.h" |
53 | #include "ehci.h" | ||
53 | #include "hardware.h" | 54 | #include "hardware.h" |
54 | #include "iomux-mx3.h" | 55 | #include "iomux-mx3.h" |
55 | #include "ulpi.h" | 56 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 75b7b6aa2720..e6d4b9929571 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | #include "common.h" | 37 | #include "common.h" |
38 | #include "devices-imx27.h" | 38 | #include "devices-imx27.h" |
39 | #include "ehci.h" | ||
39 | #include "eukrea-baseboards.h" | 40 | #include "eukrea-baseboards.h" |
40 | #include "hardware.h" | 41 | #include "hardware.h" |
41 | #include "iomux-mx27.h" | 42 | #include "iomux-mx27.h" |
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c index 1ffa27169045..62a6e02f4763 100644 --- a/arch/arm/mach-imx/mach-cpuimx35.c +++ b/arch/arm/mach-imx/mach-cpuimx35.c | |||
@@ -39,6 +39,7 @@ | |||
39 | 39 | ||
40 | #include "common.h" | 40 | #include "common.h" |
41 | #include "devices-imx35.h" | 41 | #include "devices-imx35.h" |
42 | #include "ehci.h" | ||
42 | #include "eukrea-baseboards.h" | 43 | #include "eukrea-baseboards.h" |
43 | #include "hardware.h" | 44 | #include "hardware.h" |
44 | #include "iomux-mx35.h" | 45 | #include "iomux-mx35.h" |
diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c index e978dda1434c..b2ee6e009fe4 100644 --- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c +++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c | |||
@@ -35,6 +35,7 @@ | |||
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "devices-imx25.h" | 37 | #include "devices-imx25.h" |
38 | #include "ehci.h" | ||
38 | #include "eukrea-baseboards.h" | 39 | #include "eukrea-baseboards.h" |
39 | #include "hardware.h" | 40 | #include "hardware.h" |
40 | #include "iomux-mx25.h" | 41 | #include "iomux-mx25.h" |
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index b61bd8ed5568..ede2bdbb5dd5 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c | |||
@@ -43,6 +43,7 @@ | |||
43 | 43 | ||
44 | #include "common.h" | 44 | #include "common.h" |
45 | #include "devices-imx27.h" | 45 | #include "devices-imx27.h" |
46 | #include "ehci.h" | ||
46 | #include "hardware.h" | 47 | #include "hardware.h" |
47 | #include "iomux-mx27.h" | 48 | #include "iomux-mx27.h" |
48 | 49 | ||
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index ea1fa199c148..0d01e367b062 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c | |||
@@ -39,6 +39,7 @@ | |||
39 | 39 | ||
40 | #include "common.h" | 40 | #include "common.h" |
41 | #include "devices-imx25.h" | 41 | #include "devices-imx25.h" |
42 | #include "ehci.h" | ||
42 | #include "hardware.h" | 43 | #include "hardware.h" |
43 | #include "iomux-mx25.h" | 44 | #include "iomux-mx25.h" |
44 | #include "mx25.h" | 45 | #include "mx25.h" |
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 435a5428a678..9ef4640f3660 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include "3ds_debugboard.h" | 40 | #include "3ds_debugboard.h" |
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include "devices-imx27.h" | 42 | #include "devices-imx27.h" |
43 | #include "ehci.h" | ||
43 | #include "hardware.h" | 44 | #include "hardware.h" |
44 | #include "iomux-mx27.h" | 45 | #include "iomux-mx27.h" |
45 | #include "ulpi.h" | 46 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 4217871a9653..453f41a2c5a9 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include "3ds_debugboard.h" | 40 | #include "3ds_debugboard.h" |
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include "devices-imx31.h" | 42 | #include "devices-imx31.h" |
43 | #include "ehci.h" | ||
43 | #include "hardware.h" | 44 | #include "hardware.h" |
44 | #include "iomux-mx3.h" | 45 | #include "iomux-mx3.h" |
45 | #include "ulpi.h" | 46 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index eee042fa2768..e9549a3c0223 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include "board-mx31lilly.h" | 45 | #include "board-mx31lilly.h" |
46 | #include "common.h" | 46 | #include "common.h" |
47 | #include "devices-imx31.h" | 47 | #include "devices-imx31.h" |
48 | #include "ehci.h" | ||
48 | #include "hardware.h" | 49 | #include "hardware.h" |
49 | #include "iomux-mx3.h" | 50 | #include "iomux-mx3.h" |
50 | #include "ulpi.h" | 51 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index fa15d0b6118d..57eac6f45fab 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include "board-mx31lite.h" | 42 | #include "board-mx31lite.h" |
43 | #include "common.h" | 43 | #include "common.h" |
44 | #include "devices-imx31.h" | 44 | #include "devices-imx31.h" |
45 | #include "ehci.h" | ||
45 | #include "hardware.h" | 46 | #include "hardware.h" |
46 | #include "iomux-mx3.h" | 47 | #include "iomux-mx3.h" |
47 | #include "ulpi.h" | 48 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index 08730f238449..6bed57040973 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include "board-mx31moboard.h" | 47 | #include "board-mx31moboard.h" |
48 | #include "common.h" | 48 | #include "common.h" |
49 | #include "devices-imx31.h" | 49 | #include "devices-imx31.h" |
50 | #include "ehci.h" | ||
50 | #include "hardware.h" | 51 | #include "hardware.h" |
51 | #include "iomux-mx3.h" | 52 | #include "iomux-mx3.h" |
52 | #include "ulpi.h" | 53 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c index 4e8b184d773b..72cd77d21f63 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include "3ds_debugboard.h" | 50 | #include "3ds_debugboard.h" |
51 | #include "common.h" | 51 | #include "common.h" |
52 | #include "devices-imx35.h" | 52 | #include "devices-imx35.h" |
53 | #include "ehci.h" | ||
53 | #include "hardware.h" | 54 | #include "hardware.h" |
54 | #include "iomux-mx35.h" | 55 | #include "iomux-mx35.h" |
55 | 56 | ||
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 12212378c672..2d1c50bd8bdf 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | #include "common.h" | 37 | #include "common.h" |
38 | #include "devices-imx27.h" | 38 | #include "devices-imx27.h" |
39 | #include "ehci.h" | ||
39 | #include "hardware.h" | 40 | #include "hardware.h" |
40 | #include "iomux-mx27.h" | 41 | #include "iomux-mx27.h" |
41 | #include "ulpi.h" | 42 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c index 81b8affb9448..8eb1570f7851 100644 --- a/arch/arm/mach-imx/mach-pcm037.c +++ b/arch/arm/mach-imx/mach-pcm037.c | |||
@@ -45,6 +45,7 @@ | |||
45 | 45 | ||
46 | #include "common.h" | 46 | #include "common.h" |
47 | #include "devices-imx31.h" | 47 | #include "devices-imx31.h" |
48 | #include "ehci.h" | ||
48 | #include "hardware.h" | 49 | #include "hardware.h" |
49 | #include "iomux-mx3.h" | 50 | #include "iomux-mx3.h" |
50 | #include "pcm037.h" | 51 | #include "pcm037.h" |
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 6c56fb5553c7..ee862ad6b6fc 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "board-pcm038.h" | 36 | #include "board-pcm038.h" |
37 | #include "common.h" | 37 | #include "common.h" |
38 | #include "devices-imx27.h" | 38 | #include "devices-imx27.h" |
39 | #include "ehci.h" | ||
39 | #include "hardware.h" | 40 | #include "hardware.h" |
40 | #include "iomux-mx27.h" | 41 | #include "iomux-mx27.h" |
41 | #include "ulpi.h" | 42 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c index c62b5d261345..b623bcaca76c 100644 --- a/arch/arm/mach-imx/mach-pcm043.c +++ b/arch/arm/mach-imx/mach-pcm043.c | |||
@@ -35,6 +35,7 @@ | |||
35 | 35 | ||
36 | #include "common.h" | 36 | #include "common.h" |
37 | #include "devices-imx35.h" | 37 | #include "devices-imx35.h" |
38 | #include "ehci.h" | ||
38 | #include "hardware.h" | 39 | #include "hardware.h" |
39 | #include "iomux-mx35.h" | 40 | #include "iomux-mx35.h" |
40 | #include "ulpi.h" | 41 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c index 872b3c6ba408..97836e94451c 100644 --- a/arch/arm/mach-imx/mach-vpr200.c +++ b/arch/arm/mach-imx/mach-vpr200.c | |||
@@ -34,6 +34,7 @@ | |||
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | #include "devices-imx35.h" | 36 | #include "devices-imx35.h" |
37 | #include "ehci.h" | ||
37 | #include "hardware.h" | 38 | #include "hardware.h" |
38 | #include "iomux-mx35.h" | 39 | #include "iomux-mx35.h" |
39 | 40 | ||
diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c index 52d5b1574721..1e4ea1640a2a 100644 --- a/arch/arm/mach-imx/mx31moboard-devboard.c +++ b/arch/arm/mach-imx/mx31moboard-devboard.c | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include "common.h" | 25 | #include "common.h" |
26 | #include "devices-imx31.h" | 26 | #include "devices-imx31.h" |
27 | #include "ehci.h" | ||
27 | #include "hardware.h" | 28 | #include "hardware.h" |
28 | #include "iomux-mx3.h" | 29 | #include "iomux-mx3.h" |
29 | #include "ulpi.h" | 30 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c index a4f43e90f3c1..699d01a4fef8 100644 --- a/arch/arm/mach-imx/mx31moboard-marxbot.c +++ b/arch/arm/mach-imx/mx31moboard-marxbot.c | |||
@@ -28,6 +28,7 @@ | |||
28 | 28 | ||
29 | #include "common.h" | 29 | #include "common.h" |
30 | #include "devices-imx31.h" | 30 | #include "devices-imx31.h" |
31 | #include "ehci.h" | ||
31 | #include "hardware.h" | 32 | #include "hardware.h" |
32 | #include "iomux-mx3.h" | 33 | #include "iomux-mx3.h" |
33 | #include "ulpi.h" | 34 | #include "ulpi.h" |
diff --git a/arch/arm/mach-imx/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c index 04ae45dbfaa7..4b3d66eb8d34 100644 --- a/arch/arm/mach-imx/mx31moboard-smartbot.c +++ b/arch/arm/mach-imx/mx31moboard-smartbot.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "board-mx31moboard.h" | 28 | #include "board-mx31moboard.h" |
29 | #include "common.h" | 29 | #include "common.h" |
30 | #include "devices-imx31.h" | 30 | #include "devices-imx31.h" |
31 | #include "ehci.h" | ||
31 | #include "hardware.h" | 32 | #include "hardware.h" |
32 | #include "iomux-mx3.h" | 33 | #include "iomux-mx3.h" |
33 | #include "ulpi.h" | 34 | #include "ulpi.h" |
diff --git a/include/linux/platform_data/usb-ehci-mxc.h b/include/linux/platform_data/usb-ehci-mxc.h index 7eb9d1329671..157e71f79f99 100644 --- a/include/linux/platform_data/usb-ehci-mxc.h +++ b/include/linux/platform_data/usb-ehci-mxc.h | |||
@@ -1,46 +1,6 @@ | |||
1 | #ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H | 1 | #ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H |
2 | #define __INCLUDE_ASM_ARCH_MXC_EHCI_H | 2 | #define __INCLUDE_ASM_ARCH_MXC_EHCI_H |
3 | 3 | ||
4 | /* values for portsc field */ | ||
5 | #define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23) | ||
6 | #define MXC_EHCI_FORCE_FS (1 << 24) | ||
7 | #define MXC_EHCI_UTMI_8BIT (0 << 28) | ||
8 | #define MXC_EHCI_UTMI_16BIT (1 << 28) | ||
9 | #define MXC_EHCI_SERIAL (1 << 29) | ||
10 | #define MXC_EHCI_MODE_UTMI (0 << 30) | ||
11 | #define MXC_EHCI_MODE_PHILIPS (1 << 30) | ||
12 | #define MXC_EHCI_MODE_ULPI (2 << 30) | ||
13 | #define MXC_EHCI_MODE_SERIAL (3 << 30) | ||
14 | |||
15 | /* values for flags field */ | ||
16 | #define MXC_EHCI_INTERFACE_DIFF_UNI (0 << 0) | ||
17 | #define MXC_EHCI_INTERFACE_DIFF_BI (1 << 0) | ||
18 | #define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) | ||
19 | #define MXC_EHCI_INTERFACE_SINGLE_BI (3 << 0) | ||
20 | #define MXC_EHCI_INTERFACE_MASK (0xf) | ||
21 | |||
22 | #define MXC_EHCI_POWER_PINS_ENABLED (1 << 5) | ||
23 | #define MXC_EHCI_PWR_PIN_ACTIVE_HIGH (1 << 6) | ||
24 | #define MXC_EHCI_OC_PIN_ACTIVE_LOW (1 << 7) | ||
25 | #define MXC_EHCI_TTL_ENABLED (1 << 8) | ||
26 | |||
27 | #define MXC_EHCI_INTERNAL_PHY (1 << 9) | ||
28 | #define MXC_EHCI_IPPUE_DOWN (1 << 10) | ||
29 | #define MXC_EHCI_IPPUE_UP (1 << 11) | ||
30 | #define MXC_EHCI_WAKEUP_ENABLED (1 << 12) | ||
31 | #define MXC_EHCI_ITC_NO_THRESHOLD (1 << 13) | ||
32 | |||
33 | #define MXC_USBCTRL_OFFSET 0 | ||
34 | #define MXC_USB_PHY_CTR_FUNC_OFFSET 0x8 | ||
35 | #define MXC_USB_PHY_CTR_FUNC2_OFFSET 0xc | ||
36 | #define MXC_USBH2CTRL_OFFSET 0x14 | ||
37 | |||
38 | #define MX5_USBOTHER_REGS_OFFSET 0x800 | ||
39 | |||
40 | /* USB_PHY_CTRL_FUNC2*/ | ||
41 | #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3 | ||
42 | #define MX5_USB_UTMI_PHYCTRL1_PLLDIV_SHIFT 0 | ||
43 | |||
44 | struct mxc_usbh_platform_data { | 4 | struct mxc_usbh_platform_data { |
45 | int (*init)(struct platform_device *pdev); | 5 | int (*init)(struct platform_device *pdev); |
46 | int (*exit)(struct platform_device *pdev); | 6 | int (*exit)(struct platform_device *pdev); |
@@ -49,11 +9,5 @@ struct mxc_usbh_platform_data { | |||
49 | struct usb_phy *otg; | 9 | struct usb_phy *otg; |
50 | }; | 10 | }; |
51 | 11 | ||
52 | int mx51_initialize_usb_hw(int port, unsigned int flags); | ||
53 | int mx25_initialize_usb_hw(int port, unsigned int flags); | ||
54 | int mx31_initialize_usb_hw(int port, unsigned int flags); | ||
55 | int mx35_initialize_usb_hw(int port, unsigned int flags); | ||
56 | int mx27_initialize_usb_hw(int port, unsigned int flags); | ||
57 | |||
58 | #endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */ | 12 | #endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */ |
59 | 13 | ||