diff options
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/include/plat/mux.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/usb.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/mux.h b/arch/arm/plat-omap/include/plat/mux.h index 6067cf79f088..8ed5f25ab0fd 100644 --- a/arch/arm/plat-omap/include/plat/mux.h +++ b/arch/arm/plat-omap/include/plat/mux.h | |||
@@ -172,6 +172,8 @@ enum omap7xx_index { | |||
172 | AA17_7XX_USB_DM, | 172 | AA17_7XX_USB_DM, |
173 | W16_7XX_USB_PU_EN, | 173 | W16_7XX_USB_PU_EN, |
174 | W17_7XX_USB_VBUSI, | 174 | W17_7XX_USB_VBUSI, |
175 | W18_7XX_USB_DMCK_OUT, | ||
176 | W19_7XX_USB_DCRST, | ||
175 | 177 | ||
176 | /* MMC */ | 178 | /* MMC */ |
177 | MMC_7XX_CMD, | 179 | MMC_7XX_CMD, |
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 51033a4503c3..d3bf17cd36f3 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
@@ -137,7 +137,13 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) | |||
137 | if (is_device) { | 137 | if (is_device) { |
138 | if (cpu_is_omap24xx()) | 138 | if (cpu_is_omap24xx()) |
139 | omap_cfg_reg(J20_24XX_USB0_PUEN); | 139 | omap_cfg_reg(J20_24XX_USB0_PUEN); |
140 | else | 140 | else if (cpu_is_omap7xx()) { |
141 | omap_cfg_reg(AA17_7XX_USB_DM); | ||
142 | omap_cfg_reg(W16_7XX_USB_PU_EN); | ||
143 | omap_cfg_reg(W17_7XX_USB_VBUSI); | ||
144 | omap_cfg_reg(W18_7XX_USB_DMCK_OUT); | ||
145 | omap_cfg_reg(W19_7XX_USB_DCRST); | ||
146 | } else | ||
141 | omap_cfg_reg(W4_USB_PUEN); | 147 | omap_cfg_reg(W4_USB_PUEN); |
142 | } | 148 | } |
143 | 149 | ||