diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-07-05 15:31:38 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 15:31:38 +0200 |
| commit | 0d600ff6fe06d99e56166a41521e120ce37e1dd4 (patch) | |
| tree | b78372b2609ee969a0dd8039e5f068234d4a670a | |
| parent | omap: mux: Select POP package for 2430SDP (diff) | |
| download | linux-0d600ff6fe06d99e56166a41521e120ce37e1dd4.tar.xz linux-0d600ff6fe06d99e56166a41521e120ce37e1dd4.zip | |
omap: mux: Make omap2 FS USB code use new mux functions
Make omap2 FS USB code use new mux functions. Do not mux usb2_tllse0
as it has multiple options.
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/usb-fs.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/usb-fs.c b/arch/arm/mach-omap2/usb-fs.c index a4455190b216..a216d88b04b5 100644 --- a/arch/arm/mach-omap2/usb-fs.c +++ b/arch/arm/mach-omap2/usb-fs.c @@ -30,7 +30,6 @@ #include <asm/irq.h> #include <plat/control.h> -#include <plat/mux.h> #include <plat/usb.h> #include <plat/board.h> @@ -40,6 +39,8 @@ #define INT_USB_IRQ_HGEN INT_24XX_USB_IRQ_HGEN #define INT_USB_IRQ_OTG INT_24XX_USB_IRQ_OTG +#include "mux.h" + #if defined(CONFIG_ARCH_OMAP2) #ifdef CONFIG_USB_GADGET_OMAP @@ -209,13 +210,13 @@ static u32 __init omap2_usb0_init(unsigned nwires, unsigned is_device) return 0; if (is_device) - omap_cfg_reg(J20_24XX_USB0_PUEN); + omap_mux_init_signal("usb0_puen", 0); - omap_cfg_reg(K18_24XX_USB0_DAT); - omap_cfg_reg(K19_24XX_USB0_TXEN); - omap_cfg_reg(J14_24XX_USB0_SE0); + omap_mux_init_signal("usb0_dat", 0); + omap_mux_init_signal("usb0_txen", 0); + omap_mux_init_signal("usb0_se0", 0); if (nwires != 3) - omap_cfg_reg(J18_24XX_USB0_RCV); + omap_mux_init_signal("usb0_rcv", 0); switch (nwires) { case 3: @@ -228,8 +229,8 @@ static u32 __init omap2_usb0_init(unsigned nwires, unsigned is_device) break; case 6: syscon1 = 3; - omap_cfg_reg(J19_24XX_USB0_VP); - omap_cfg_reg(K20_24XX_USB0_VM); + omap_mux_init_signal("usb0_vp", 0); + omap_mux_init_signal("usb0_vm", 0); omap2_usb_devconf_set(0, USB_UNIDIR); break; default: @@ -289,12 +290,12 @@ static u32 __init omap2_usb2_init(unsigned nwires, unsigned alt_pingroup) if (alt_pingroup || nwires == 0) return 0; - omap_cfg_reg(Y11_24XX_USB2_DAT); - omap_cfg_reg(AA10_24XX_USB2_SE0); + omap_mux_init_signal("usb2_dat", 0); + omap_mux_init_signal("usb2_se0", 0); if (nwires > 2) - omap_cfg_reg(AA12_24XX_USB2_TXEN); + omap_mux_init_signal("usb2_txen", 0); if (nwires > 3) - omap_cfg_reg(AA6_24XX_USB2_RCV); + omap_mux_init_signal("usb2_rcv", 0); switch (nwires) { case 2: @@ -313,11 +314,13 @@ static u32 __init omap2_usb2_init(unsigned nwires, unsigned alt_pingroup) omap2_usb_devconf_set(2, USB_BIDIR); break; case 5: - omap_cfg_reg(AA4_24XX_USB2_TLLSE0); - /* NOTE: board-specific code must override this setting if - * this TLL link is not using DP/DM. Something must also + /* NOTE: board-specific code must mux this setting depending + * on TLL link using DP/DM. Something must also * set up OTG_SYSCON2.HMC_TLL{ATTACH,SPEED} + * 2420: hdq_sio.usb2_tllse0 or vlynq_rx0.usb2_tllse0 + * 2430: hdq_sio.usb2_tllse0 or sdmmc2_dat0.usb2_tllse0 */ + syscon1 = 3; omap2_usb2_enable_5pinunitll(); break; |