summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorAshwin Joshi <asjoshi@nvidia.com>2014-07-02 13:23:59 +0530
committerMandar Padmawar <mpadmawar@nvidia.com>2014-07-04 06:14:06 -0700
commit90847b42d8ae22940787debfc4aca786ecffdc52 (patch)
treefac88dd24dff4aff214230b2f9ea4414f9826d39 /arch/arm/configs
parentc0e0ba01f19ee1d6c0202b277a18607b7f43f32b (diff)
ARM: tegra12: vcm30t124: Update android defconfig
- Enable CONFIG_TEGRA_PLLCX_FIXED option for vcm30t124 android defconfig - Disable CONFIG_TEGRA_CORE_CAP Bug 200017463 Bug 200000521 Signed-off-by: Ashwin Joshi <asjoshi@nvidia.com> Reviewed-on: http://git-master/r/433532 (cherry picked from commit 7a44550e38c258e2b8805d8538797bb45f654d8d) Change-Id: I2e6ee25cd45b1d2a514519cb7fcf84b6c2992d24 Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com> Reviewed-on: http://git-master/r/433890 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/tegra_vcm30t124_android_defconfig10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/configs/tegra_vcm30t124_android_defconfig b/arch/arm/configs/tegra_vcm30t124_android_defconfig
index 078dc39ad704..a1e75bc7f1ca 100644
--- a/arch/arm/configs/tegra_vcm30t124_android_defconfig
+++ b/arch/arm/configs/tegra_vcm30t124_android_defconfig
@@ -29,11 +29,12 @@ CONFIG_MACH_VCM30_T124=y
# CONFIG_TEGRA_CPU_DVFS is not set
# CONFIG_TEGRA_GPU_DVFS is not set
CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
+# CONFIG_TEGRA_CORE_CAP is not set
CONFIG_TEGRA_DYNAMIC_PWRDET=y
CONFIG_TEGRA_WAKEUP_MONITOR=y
CONFIG_TEGRA_PREPOWER_WIFI=y
CONFIG_TEGRA_PLLM_SCALED=y
-CONFIG_TEGRA_MC_DOMAINS=y
+CONFIG_TEGRA_PLLCX_FIXED=y
CONFIG_TEGRA_USE_NCT=y
CONFIG_TEGRA_HDMI_PRIMARY=y
CONFIG_ARM_LPAE=y
@@ -330,7 +331,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
@@ -344,6 +344,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
@@ -353,8 +354,6 @@ CONFIG_TEGRA_DSI2EDP_SN65DSI86=y
CONFIG_TEGRA_DP=y
CONFIG_TEGRA_NVHDCP=y
# CONFIG_TEGRA_CAMERA is not set
-CONFIG_GK20A_PMU=y
-CONFIG_GK20A_DEVFREQ=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
@@ -499,6 +498,7 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ANDROID_INTF_ALARM_DEV=y
CONFIG_USB_WPAN_HCD=y
CONFIG_PASR=y
+CONFIG_TEGRA_MC_DOMAINS=y
CONFIG_CLK_PALMAS=y
CONFIG_CLK_AS3722=y
CONFIG_TEGRA_IOMMU_SMMU=y
@@ -508,6 +508,8 @@ CONFIG_EXTCON_PALMAS=y
CONFIG_IIO=y
CONFIG_PWM=y
CONFIG_PWM_TEGRA=y
+CONFIG_GK20A_PMU=y
+CONFIG_GK20A_DEVFREQ=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y