summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinyu Chen <xinyu.chen@freescale.com>2012-04-05 13:34:29 +0800
committerXinyu Chen <xinyu.chen@freescale.com>2012-04-05 13:34:29 +0800
commitb87d56be86dedc507163d9f9a49f1e9fa2e65228 (patch)
tree2e4942af51a17a63c7517c11efb0c233efc4db2e
parent3c089d4f7af65b5d021555b94778b564a9db3fbc (diff)
ENGR00178938 defconfig: enable usb otg function
Enable USB otg function in android default configure Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
-rw-r--r--arch/arm/configs/imx6_android_defconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig
index 68e176b03a86..a7fe67a17995 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -1982,6 +1982,7 @@ CONFIG_SND_SOC_MXC_HDMI=y
CONFIG_SND_SOC_MXC_SPDIF=y
CONFIG_SND_SOC_SGTL5000=y
CONFIG_SND_SOC_CS42888=y
+CONFIG_SND_SOC_WM8962=y
CONFIG_SND_SOC_WM8994=y
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=y
@@ -2066,7 +2067,7 @@ CONFIG_USB=y
# CONFIG_USB_DEVICE_CLASS is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
+CONFIG_USB_OTG=y
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_MON is not set
@@ -2079,7 +2080,7 @@ CONFIG_USB_SUSPEND=y
# CONFIG_USB_C67X00_HCD is not set
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ARC=y
-# CONFIG_USB_EHCI_ARC_OTG is not set
+CONFIG_USB_EHCI_ARC_OTG=y
# CONFIG_USB_EHCI_ARC_HSIC is not set
# CONFIG_USB_STATIC_IRAM is not set
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -2253,7 +2254,7 @@ CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_ULPI is not set
# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_MXC_OTG is not set
+CONFIG_MXC_OTG=y
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_UNSAFE_RESUME=y