From: 黄涛 <huangtao@rock-chips.com>
Date: Sun, 25 Mar 2012 01:57:13 +0000 (+0800)
Subject: rk30: sdk: defconfig: enable USB_GADGET, USB20_OTG, disable TSADC_RK30
X-Git-Tag: firefly_0821_release~9595^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=edfc03fa32853ee0a3c8d64a1a6d0c23c1669645;p=firefly-linux-kernel-4.4.55.git

rk30: sdk: defconfig: enable USB_GADGET, USB20_OTG, disable TSADC_RK30
---

diff --git a/arch/arm/configs/rk30_sdk_defconfig b/arch/arm/configs/rk30_sdk_defconfig
index 6a91e8b83612..03d30a85b38e 100644
--- a/arch/arm/configs/rk30_sdk_defconfig
+++ b/arch/arm/configs/rk30_sdk_defconfig
@@ -247,7 +247,6 @@ CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
 CONFIG_I2C3_CONTROLLER_RK30=y
 CONFIG_I2C4_CONTROLLER_RK30=y
-CONFIG_TSADC_RK30=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
 CONFIG_SPI_FPGA_GPIO_NUM=0
@@ -283,7 +282,8 @@ CONFIG_HID_APPLE=y
 CONFIG_HID_ELECOM=y
 CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_WACOM=y
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB_GADGET=y
+CONFIG_USB20_OTG=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y