ENGR00177154 solo sabreauto: config USB pin according to board

config the USB pin and power control for ARD board

Signed-off-by: make shi <b15407@freescale.com>

diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
index 2d2eeed489a4205a2e53bf531f43fc5bb26dc9db..aa144b9c78ab3900f3254f65bb36f672b14c144c 100644 (file)
--- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
@@ -128,7 +128,7 @@
 #define SABREAUTO_CAN_STBY             SABREAUTO_IO_EXP_GPIO2(5)
 #define SABREAUTO_CAN_EN               SABREAUTO_IO_EXP_GPIO2(6)
 #define SABREAUTO_USB_HOST1_PWR                SABREAUTO_IO_EXP_GPIO2(7)
-#define SABREAUTO_USB_OTG_PWR          SABREAUTO_IO_EXP_GPIO3(2)
+#define SABREAUTO_USB_OTG_PWR          SABREAUTO_IO_EXP_GPIO3(1)
 #define BMCR_PDOWN                     0x0800 /* PHY Powerdown */
 
 static struct clk *sata_clk;
@@ -680,7 +680,7 @@ static void __init imx6q_sabreauto_init_usb(void)
        }
        gpio_direction_input(SABREAUTO_USB_HOST1_OC);
 
-       mxc_iomux_set_gpr_register(1, 13, 1, 1);
+       mxc_iomux_set_gpr_register(1, 13, 1, 0);
        mx6_set_otghost_vbus_func(imx6q_sabreauto_usbotg_vbus);
        mx6_usb_dr_init();
        mx6_set_host1_vbus_func(imx6q_sabreauto_usbhost1_vbus);

diff --git a/arch/arm/mach-mx6/board-mx6solo_sabreauto.h b/arch/arm/mach-mx6/board-mx6solo_sabreauto.h
index 06b1d01703d8e84adc5a3d907c1ea6c72140b393..ba293141ac24a6ceb02e042aed5765a7b1050e0d 100644 (file)
--- a/arch/arm/mach-mx6/board-mx6solo_sabreauto.h
+++ b/arch/arm/mach-mx6/board-mx6solo_sabreauto.h
@@ -178,7 +178,7 @@ static iomux_v3_cfg_t mx6dl_sabreauto_pads[] = {
        MX6DL_PAD_EIM_EB0__GPIO_2_28,
 
        /* USBOTG ID pin */
-       MX6DL_PAD_ENET_RX_ER__ENET_RX_ER,
+       MX6DL_PAD_ENET_RX_ER__ANATOP_USBOTG_ID,
 
        /* VIDEO adv7180 INTRQ */
        MX6DL_PAD_ENET_RXD0__GPIO_1_27,