diff options
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-apalis_imx6.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 99cd2ee76c35..34f1099c7db1 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -234,7 +234,7 @@ CONFIG_USB_SERIAL_PL2303=y CONFIG_USB_SERIAL_QUALCOMM=y CONFIG_USB_SERIAL_OPTION=y CONFIG_USB_GADGET=y -#CONFIG_USB_ETH is not set +CONFIG_USB_ETH=y #CONFIG_USB_FILE_STORAGE is not set #CONFIG_USB_G_SERIAL is not set #CONFIG_USB_CDC_COMPOSITE is not set diff --git a/arch/arm/mach-mx6/board-apalis_imx6.c b/arch/arm/mach-mx6/board-apalis_imx6.c index 5a93d55c15ff..8c18c99f093a 100644 --- a/arch/arm/mach-mx6/board-apalis_imx6.c +++ b/arch/arm/mach-mx6/board-apalis_imx6.c @@ -723,7 +723,8 @@ static void __init init_usb_otg(void) return; } gpio_direction_output(GP_USB_OTG_PWR, 0); - mxc_iomux_set_gpr_register(1, 13, 1, 1); + /* USB OTG ID pin, daisy chain from ENET_RX_ER */ + mxc_iomux_set_gpr_register(1, 13, 1, 0); mx6_set_otghost_vbus_func(usbotg_vbus); } |