redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

omap: mux: Make omap2 FS USB code use new mux functions

Browse source 
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>
This commit is contained in:
Tony Lindgren 2010-07-05 16:31:38 +03:00
parent 369ed78fc9
commit 0d600ff6fe
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
arch/arm/mach-omap2/usb-fs.c
View file

@ -30,7 +30,6 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/control.h> #include <plat/control.h>
#include <plat/mux.h>
#include <plat/usb.h> #include <plat/usb.h>
#include <plat/board.h> #include <plat/board.h>
@ -40,6 +39,8 @@
#define INT_USB_IRQ_HGEN INT_24XX_USB_IRQ_HGEN #define INT_USB_IRQ_HGEN INT_24XX_USB_IRQ_HGEN
#define INT_USB_IRQ_OTG INT_24XX_USB_IRQ_OTG #define INT_USB_IRQ_OTG INT_24XX_USB_IRQ_OTG
#include "mux.h"
#if defined(CONFIG_ARCH_OMAP2) #if defined(CONFIG_ARCH_OMAP2)
#ifdef CONFIG_USB_GADGET_OMAP #ifdef CONFIG_USB_GADGET_OMAP
@ -209,13 +210,13 @@ static u32 __init omap2_usb0_init(unsigned nwires, unsigned is_device)
return 0; return 0;
if (is_device) 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_mux_init_signal("usb0_dat", 0);
omap_cfg_reg(K19_24XX_USB0_TXEN); omap_mux_init_signal("usb0_txen", 0);
omap_cfg_reg(J14_24XX_USB0_SE0); omap_mux_init_signal("usb0_se0", 0);
if (nwires != 3) if (nwires != 3)
omap_cfg_reg(J18_24XX_USB0_RCV); omap_mux_init_signal("usb0_rcv", 0);
switch (nwires) { switch (nwires) {
case 3: case 3:
@ -228,8 +229,8 @@ static u32 __init omap2_usb0_init(unsigned nwires, unsigned is_device)
break; break;
case 6: case 6:
syscon1 = 3; syscon1 = 3;
omap_cfg_reg(J19_24XX_USB0_VP); omap_mux_init_signal("usb0_vp", 0);
omap_cfg_reg(K20_24XX_USB0_VM); omap_mux_init_signal("usb0_vm", 0);
omap2_usb_devconf_set(0, USB_UNIDIR); omap2_usb_devconf_set(0, USB_UNIDIR);
break; break;
default: default:
@ -289,12 +290,12 @@ static u32 __init omap2_usb2_init(unsigned nwires, unsigned alt_pingroup)
if (alt_pingroup || nwires == 0) if (alt_pingroup || nwires == 0)
return 0; return 0;
omap_cfg_reg(Y11_24XX_USB2_DAT); omap_mux_init_signal("usb2_dat", 0);
omap_cfg_reg(AA10_24XX_USB2_SE0); omap_mux_init_signal("usb2_se0", 0);
if (nwires > 2) if (nwires > 2)
omap_cfg_reg(AA12_24XX_USB2_TXEN); omap_mux_init_signal("usb2_txen", 0);
if (nwires > 3) if (nwires > 3)
omap_cfg_reg(AA6_24XX_USB2_RCV); omap_mux_init_signal("usb2_rcv", 0);
switch (nwires) { switch (nwires) {
case 2: case 2:
@ -313,11 +314,13 @@ static u32 __init omap2_usb2_init(unsigned nwires, unsigned alt_pingroup)
omap2_usb_devconf_set(2, USB_BIDIR); omap2_usb_devconf_set(2, USB_BIDIR);
break; break;
case 5: case 5:
omap_cfg_reg(AA4_24XX_USB2_TLLSE0); /* NOTE: board-specific code must mux this setting depending
/* NOTE: board-specific code must override this setting if * on TLL link using DP/DM. Something must also
* this TLL link is not using DP/DM. Something must also
* set up OTG_SYSCON2.HMC_TLL{ATTACH,SPEED} * 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; syscon1 = 3;
omap2_usb2_enable_5pinunitll(); omap2_usb2_enable_5pinunitll();
break; break;