summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenkat Moganty <vmoganty@nvidia.com>2010-03-11 16:07:03 +0530
committerGary King <gking@nvidia.com>2010-03-17 08:03:17 -0800
commit930347bdf016fa78e10d9aacb855f7727d2cf0a6 (patch)
tree215994d58d2c00b66fc5129eff1e7066af791afb
parent4ebbdfd395bbe8a47bc547550f51724117430002 (diff)
tegra regulator: Enable regulator for USB charging
Enabling CONFIG_REGULATOR_TEGRA on whistler for USB charging support. Bug 631316 USB charging support in Android Tested on: whistler/Android Change-Id: If13169d7bb7321cf1b2806c80966e1050e39fed0 Reviewed-on: http://git-master/r/840 Reviewed-by: Ramachandrudu Kandhala <rkandhala@nvidia.com> Tested-by: Ramachandrudu Kandhala <rkandhala@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig
index e202eb92221d..f80120cf0e76 100644
--- a/arch/arm/configs/tegra_whistler_android_defconfig
+++ b/arch/arm/configs/tegra_whistler_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29
-# Fri Feb 5 19:16:55 2010
+# Thu Mar 11 16:02:59 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1296,7 +1296,12 @@ CONFIG_RTC_INTF_ALARM=y
#
CONFIG_RTC_DRV_TEGRA_ODM=y
# CONFIG_DMADEVICES is not set
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+CONFIG_REGULATOR_TEGRA=y
# CONFIG_UIO is not set
CONFIG_STAGING=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set