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>
This commit is contained in:
Roger Quadros 2013-05-08 16:48:00 -07:00 committed by Tony Lindgren
parent 956e46efb2
commit cf7dd65811

View file

@ -112,13 +112,13 @@ static u8 omap3_beagle_version;
*/ */
static struct { static struct {
int mmc1_gpio_wp; int mmc1_gpio_wp;
int usb_pwr_level; bool usb_pwr_level; /* 0 - Active Low, 1 - Active High */
int dvi_pd_gpio; int dvi_pd_gpio;
int usr_button_gpio; int usr_button_gpio;
int mmc_caps; int mmc_caps;
} beagle_config = { } beagle_config = {
.mmc1_gpio_wp = -EINVAL, .mmc1_gpio_wp = -EINVAL,
.usb_pwr_level = GPIOF_OUT_INIT_LOW, .usb_pwr_level = 0,
.dvi_pd_gpio = -EINVAL, .dvi_pd_gpio = -EINVAL,
.usr_button_gpio = 4, .usr_button_gpio = 4,
.mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
@ -178,7 +178,7 @@ static void __init omap3_beagle_init_rev(void)
case 0: case 0:
printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx\n"); printk(KERN_INFO "OMAP3 Beagle Rev: xM Ax/Bx\n");
omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
beagle_config.usb_pwr_level = GPIOF_OUT_INIT_HIGH; beagle_config.usb_pwr_level = 1;
beagle_config.mmc_caps &= ~MMC_CAP_8_BIT_DATA; beagle_config.mmc_caps &= ~MMC_CAP_8_BIT_DATA;
break; break;
case 2: case 2: