diff options
author | Roger Quadros <rogerq@ti.com> | 2013-05-08 19:48:00 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-05-08 19:48:00 -0400 |
commit | cf7dd65811401e3d13fe662f2713860bd8cdb499 (patch) | |
tree | 58004b10007817f76d5ed764eb94ab8a5f4f2133 /arch/arm | |
parent | 956e46efb2478ebff7a871138458fa8124fd18dd (diff) |
ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx
On Beagle xM Rev. Ax/Bx, the USB power enable GPIO logic is
reversed when compared to other revisions i.e. it is
active high instead of active low.
Use the beagle_config.usb_pwr_level flag correctly so that
the power regulator can be configured at runtime.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 6de78605c0af..04c116555412 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -112,13 +112,13 @@ static u8 omap3_beagle_version; | |||
112 | */ | 112 | */ |
113 | static struct { | 113 | static struct { |
114 | int mmc1_gpio_wp; | 114 | int mmc1_gpio_wp; |
115 | int usb_pwr_level; | 115 | bool usb_pwr_level; /* 0 - Active Low, 1 - Active High */ |
116 | int dvi_pd_gpio; | 116 | int dvi_pd_gpio; |
117 | int usr_button_gpio; | 117 | int usr_button_gpio; |
118 | int mmc_caps; | 118 | int mmc_caps; |
119 | } beagle_config = { | 119 | } beagle_config = { |
120 | .mmc1_gpio_wp = -EINVAL, | 120 | .mmc1_gpio_wp = -EINVAL, |
121 | .usb_pwr_level = GPIOF_OUT_INIT_LOW, | 121 | .usb_pwr_level = 0, |
122 | .dvi_pd_gpio = -EINVAL, | 122 | .dvi_pd_gpio = -EINVAL, |
123 | .usr_button_gpio = 4, | 123 | .usr_button_gpio = 4, |
124 | .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, | 124 | .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, |
@@ -178,7 +178,7 @@ static void __init omap3_beagle_init_rev(void) | |||
178 | case 0: | 178 | case 0: |
179 | printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx\n"); | 179 | printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx\n"); |
180 | omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; | 180 | omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; |
181 | beagle_config.usb_pwr_level = GPIOF_OUT_INIT_HIGH; | 181 | beagle_config.usb_pwr_level = 1; |
182 | beagle_config.mmc_caps &= ~MMC_CAP_8_BIT_DATA; | 182 | beagle_config.mmc_caps &= ~MMC_CAP_8_BIT_DATA; |
183 | break; | 183 | break; |
184 | case 2: | 184 | case 2: |