diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-04 08:34:48 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-04 11:29:30 -0500 |
commit | d186f04c17d86e587e72bc402302df56a9b820f3 (patch) | |
tree | c97f5a3fc8a7870c3565f712bdd1ce38fda9c270 | |
parent | 9cf945cbef42a4524b6a58486bd8bfb96640e97f (diff) |
i.MX35: Add USB control register access support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Daniel Mack <daniel@caiaq.de>
-rw-r--r-- | arch/arm/plat-mxc/ehci.c | 55 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc_ehci.h | 4 |
2 files changed, 59 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/ehci.c b/arch/arm/plat-mxc/ehci.c index 816a9cc60e5..cb0b6387448 100644 --- a/arch/arm/plat-mxc/ehci.c +++ b/arch/arm/plat-mxc/ehci.c | |||
@@ -38,6 +38,18 @@ | |||
38 | #define MX31_H1_PM_BIT (1 << 8) | 38 | #define MX31_H1_PM_BIT (1 << 8) |
39 | #define MX31_H1_DT_BIT (1 << 4) | 39 | #define MX31_H1_DT_BIT (1 << 4) |
40 | 40 | ||
41 | #define MX35_OTG_SIC_SHIFT 29 | ||
42 | #define MX35_OTG_SIC_MASK (0x3 << MX35_OTG_SIC_SHIFT) | ||
43 | #define MX35_OTG_PM_BIT (1 << 24) | ||
44 | |||
45 | #define MX35_H1_SIC_SHIFT 21 | ||
46 | #define MX35_H1_SIC_MASK (0x3 << MX35_H1_SIC_SHIFT) | ||
47 | #define MX35_H1_PM_BIT (1 << 8) | ||
48 | #define MX35_H1_IPPUE_UP_BIT (1 << 7) | ||
49 | #define MX35_H1_IPPUE_DOWN_BIT (1 << 6) | ||
50 | #define MX35_H1_TLL_BIT (1 << 5) | ||
51 | #define MX35_H1_USBTE_BIT (1 << 4) | ||
52 | |||
41 | int mxc_set_usbcontrol(int port, unsigned int flags) | 53 | int mxc_set_usbcontrol(int port, unsigned int flags) |
42 | { | 54 | { |
43 | unsigned int v; | 55 | unsigned int v; |
@@ -85,6 +97,49 @@ int mxc_set_usbcontrol(int port, unsigned int flags) | |||
85 | USBCTRL_OTGBASE_OFFSET)); | 97 | USBCTRL_OTGBASE_OFFSET)); |
86 | return 0; | 98 | return 0; |
87 | } | 99 | } |
100 | |||
101 | if (cpu_is_mx35()) { | ||
102 | v = readl(MX35_IO_ADDRESS(MX35_OTG_BASE_ADDR + | ||
103 | USBCTRL_OTGBASE_OFFSET)); | ||
104 | |||
105 | switch (port) { | ||
106 | case 0: /* OTG port */ | ||
107 | v &= ~(MX35_OTG_SIC_MASK | MX35_OTG_PM_BIT); | ||
108 | v |= (flags & MXC_EHCI_INTERFACE_MASK) | ||
109 | << MX35_OTG_SIC_SHIFT; | ||
110 | if (!(flags & MXC_EHCI_POWER_PINS_ENABLED)) | ||
111 | v |= MX35_OTG_PM_BIT; | ||
112 | |||
113 | break; | ||
114 | case 1: /* H1 port */ | ||
115 | v &= ~(MX35_H1_SIC_MASK | MX35_H1_PM_BIT | MX35_H1_TLL_BIT | | ||
116 | MX35_H1_USBTE_BIT | MX35_H1_IPPUE_DOWN_BIT | MX35_H1_IPPUE_UP_BIT); | ||
117 | v |= (flags & MXC_EHCI_INTERFACE_MASK) | ||
118 | << MX35_H1_SIC_SHIFT; | ||
119 | if (!(flags & MXC_EHCI_POWER_PINS_ENABLED)) | ||
120 | v |= MX35_H1_PM_BIT; | ||
121 | |||
122 | if (!(flags & MXC_EHCI_TTL_ENABLED)) | ||
123 | v |= MX35_H1_TLL_BIT; | ||
124 | |||
125 | if (flags & MXC_EHCI_INTERNAL_PHY) | ||
126 | v |= MX35_H1_USBTE_BIT; | ||
127 | |||
128 | if (flags & MXC_EHCI_IPPUE_DOWN) | ||
129 | v |= MX35_H1_IPPUE_DOWN_BIT; | ||
130 | |||
131 | if (flags & MXC_EHCI_IPPUE_UP) | ||
132 | v |= MX35_H1_IPPUE_UP_BIT; | ||
133 | |||
134 | break; | ||
135 | default: | ||
136 | return -EINVAL; | ||
137 | } | ||
138 | |||
139 | writel(v, MX35_IO_ADDRESS(MX35_OTG_BASE_ADDR + | ||
140 | USBCTRL_OTGBASE_OFFSET)); | ||
141 | return 0; | ||
142 | } | ||
88 | #endif /* CONFIG_ARCH_MX3 */ | 143 | #endif /* CONFIG_ARCH_MX3 */ |
89 | #ifdef CONFIG_MACH_MX27 | 144 | #ifdef CONFIG_MACH_MX27 |
90 | if (cpu_is_mx27()) { | 145 | if (cpu_is_mx27()) { |
diff --git a/arch/arm/plat-mxc/include/mach/mxc_ehci.h b/arch/arm/plat-mxc/include/mach/mxc_ehci.h index 8f796239393..4b9b8368c0c 100644 --- a/arch/arm/plat-mxc/include/mach/mxc_ehci.h +++ b/arch/arm/plat-mxc/include/mach/mxc_ehci.h | |||
@@ -22,6 +22,10 @@ | |||
22 | #define MXC_EHCI_POWER_PINS_ENABLED (1 << 5) | 22 | #define MXC_EHCI_POWER_PINS_ENABLED (1 << 5) |
23 | #define MXC_EHCI_TTL_ENABLED (1 << 6) | 23 | #define MXC_EHCI_TTL_ENABLED (1 << 6) |
24 | 24 | ||
25 | #define MXC_EHCI_INTERNAL_PHY (1 << 7) | ||
26 | #define MXC_EHCI_IPPUE_DOWN (1 << 8) | ||
27 | #define MXC_EHCI_IPPUE_UP (1 << 9) | ||
28 | |||
25 | struct mxc_usbh_platform_data { | 29 | struct mxc_usbh_platform_data { |
26 | int (*init)(struct platform_device *pdev); | 30 | int (*init)(struct platform_device *pdev); |
27 | int (*exit)(struct platform_device *pdev); | 31 | int (*exit)(struct platform_device *pdev); |