summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2011-05-12 23:10:44 +0530
committerVarun Colbert <vcolbert@nvidia.com>2011-05-17 12:04:28 -0700
commitdbad3b2b9d5c5e766cfe2c7aa5379d13125f245e (patch)
treebcb2012a256561c207072296d99d08611648011d
parentaa75aa10d1eb24686b86f923e434746ce04f68da (diff)
ARM: config: cardhu: Enabling REGULATOR_TPS6236X
Enabling the config variable CONFIG_REGULATOR_TPS6236X to support DC-DC converter device TPS6236x. bug 821295 Change-Id: Ibbab5f44d3d29517b4e5928a7a585887925afa22 Reviewed-on: http://git-master/r/31387 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_cardhu_android_defconfig5
-rw-r--r--arch/arm/configs/tegra_cardhu_gnu_linux_defconfig1
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_cardhu_android_defconfig b/arch/arm/configs/tegra_cardhu_android_defconfig
index 92c5d84e0b35..3129ded514f8 100644
--- a/arch/arm/configs/tegra_cardhu_android_defconfig
+++ b/arch/arm/configs/tegra_cardhu_android_defconfig
@@ -191,6 +191,7 @@ CONFIG_BCM4329=m
CONFIG_BCM4329_FW_PATH="/system/vendor/firmware/fw_bcm4329.bin"
CONFIG_BCM4329_NVRAM_PATH="/system/etc/nvram.txt"
CONFIG_BCM4329_WIFI_CONTROL_FUNC=y
+CONFIG_USB_USBNET=y
CONFIG_PPP=y
CONFIG_PPP_ASYNC=y
CONFIG_PPP_DEFLATE=y
@@ -234,6 +235,7 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
CONFIG_REGULATOR_TPS6591X=y
+CONFIG_REGULATOR_TPS6236X=y
CONFIG_REGULATOR_GPIO_SWITCH=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y
@@ -277,8 +279,6 @@ CONFIG_USB_ACM=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
CONFIG_USB_SERIAL=y
-CONFIG_USB_USBNET=y
-CONFIG_USB_NET_CDCETHER=y
CONFIG_USB_GADGET=y
CONFIG_USB_ANDROID=y
CONFIG_USB_ANDROID_ADB=y
@@ -296,7 +296,6 @@ CONFIG_MMC_TEGRA_TAP_DELAY=y
CONFIG_MMC_SDHCI_TEGRA=y
CONFIG_SWITCH=y
CONFIG_RTC_CLASS=y
-# CONFIG_RTC_DRV_TEGRA is not set
CONFIG_RTC_DRV_TPS6591x=y
CONFIG_STAGING=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set
diff --git a/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig b/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig
index 20984a473048..f73514059d64 100644
--- a/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_cardhu_gnu_linux_defconfig
@@ -128,6 +128,7 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
CONFIG_REGULATOR_TPS6591X=y
+CONFIG_REGULATOR_TPS6236X=y
CONFIG_REGULATOR_GPIO_SWITCH=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y