Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cf7dd65811401e3d13fe662f2713860bd8cdb499

Authored by Roger Quadros
Committed by Tony Lindgren
1 parent 956e46efb2
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

arch/arm/mach-omap2/board-omap3beagle.c
Diff comments   View file @ cf7dd65
... ... @@ -112,13 +112,13 @@
112 112 */
113 113 static struct {
114 114 int mmc1_gpio_wp;
115   - int usb_pwr_level;
  115 + bool usb_pwr_level; /* 0 - Active Low, 1 - Active High */
116 116 int dvi_pd_gpio;
117 117 int usr_button_gpio;
118 118 int mmc_caps;
119 119 } beagle_config = {
120 120 .mmc1_gpio_wp = -EINVAL,
121   - .usb_pwr_level = GPIOF_OUT_INIT_LOW,
  121 + .usb_pwr_level = 0,
122 122 .dvi_pd_gpio = -EINVAL,
123 123 .usr_button_gpio = 4,
124 124 .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
... ... @@ -178,7 +178,7 @@
178 178 case 0:
179 179 printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx\n");
180 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 182 beagle_config.mmc_caps &= ~MMC_CAP_8_BIT_DATA;
183 183 break;
184 184 case 2: