summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorHaribabu Narayanan <hnarayanan@nvidia.com>2014-03-11 16:11:24 -0700
committerHaribabu Narayanan <hnarayanan@nvidia.com>2014-03-12 09:06:21 -0700
commitc86af9d01a10eaf645b84790eafc5533c95a5022 (patch)
treeb5e95b28bc46306079b4b70381608df1952990dd /arch/arm/configs
parentad82ee1ceb9585c8a780cd5ce765bc56eec38ca7 (diff)
arm: tegra: vcm30t124: set correct VBUS_DRAW
Setup correct USB config option VBUS_DRAW for the platform. Since this platform doesn't draw current from gadget-VBUS., keep the default VBUS draw as the suspend current (2mA). Bug 1463801 Change-Id: I5f916f1dcdc2484b272419893849f218ff7a1323 Signed-off-by: Haribabu Narayanan <hnarayanan@nvidia.com> Reviewed-on: http://git-master/r/378760 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Sumeet Gupta <sumeetg@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig b/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig
index 30986e4c64a1..5d6797d95249 100644
--- a/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig
@@ -270,7 +270,6 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
@@ -334,7 +333,6 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
# CONFIG_TEGRA_RPC is not set
CONFIG_TEGRA_NVAVP=y
CONFIG_TEGRA_NVAVP_AUDIO=y
-CONFIG_VIDEO_CAMERA=y
CONFIG_VIDEO_OV5640=y
CONFIG_VIDEO_AR0832=y
CONFIG_VIDEO_IMX091=y
@@ -348,6 +346,7 @@ CONFIG_TORCH_MAX77387=y
CONFIG_TORCH_AS364X=y
CONFIG_VIDEO_AD5816=y
CONFIG_VIDEO_DW9718=y
+CONFIG_VIDEO_CAMERA=y
CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
CONFIG_TEGRA_GRHOST=y
@@ -452,7 +451,6 @@ CONFIG_USB_SERIAL_BASEBAND=m
CONFIG_USB_RENESAS_MODEM=y
CONFIG_USB_TEGRA_OTG=y
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_USB_TEGRA=y
CONFIG_USB_G_ANDROID=y
CONFIG_MMC=y