aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2014-01-07 03:39:59 -0500
committerStephen Warren <swarren@nvidia.com>2014-03-03 12:41:24 -0500
commitd1c912c1001fb97c1233d0ce3379d0c3f25b8312 (patch)
tree5f811d1d06ad9bcee361f4f38c255922981324e6
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
ARM: tegra: defconfig updates
- ams AS3722 is used as system PMIC for Tegra124 based Venice2. - NXP PCA9546 is used in Cardhu Tegra30 board to connect to 3 cameras. - GSPCA to support the webcam on Venice2. - Allocate 64 MiB for CMA by default; the default 16MiB is not enough for the majority of use-cases. This can still be overridden by the cma command-line option. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Bryan Wu <pengw@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_defconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 00fe9e9710fd..bd7f6dd95cd3 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -86,6 +86,7 @@ CONFIG_DEVTMPFS=y
86CONFIG_DEVTMPFS_MOUNT=y 86CONFIG_DEVTMPFS_MOUNT=y
87# CONFIG_FIRMWARE_IN_KERNEL is not set 87# CONFIG_FIRMWARE_IN_KERNEL is not set
88CONFIG_DMA_CMA=y 88CONFIG_DMA_CMA=y
89CONFIG_CMA_SIZE_MBYTES=64
89CONFIG_MTD=y 90CONFIG_MTD=y
90CONFIG_MTD_M25P80=y 91CONFIG_MTD_M25P80=y
91CONFIG_PROC_DEVICETREE=y 92CONFIG_PROC_DEVICETREE=y
@@ -125,6 +126,7 @@ CONFIG_SERIAL_TEGRA=y
125CONFIG_SERIAL_OF_PLATFORM=y 126CONFIG_SERIAL_OF_PLATFORM=y
126# CONFIG_HW_RANDOM is not set 127# CONFIG_HW_RANDOM is not set
127# CONFIG_I2C_COMPAT is not set 128# CONFIG_I2C_COMPAT is not set
129CONFIG_I2C_MUX_PCA954x=y
128CONFIG_I2C_MUX_PINCTRL=y 130CONFIG_I2C_MUX_PINCTRL=y
129CONFIG_I2C_TEGRA=y 131CONFIG_I2C_TEGRA=y
130CONFIG_SPI=y 132CONFIG_SPI=y
@@ -141,6 +143,7 @@ CONFIG_POWER_SUPPLY=y
141CONFIG_BATTERY_SBS=y 143CONFIG_BATTERY_SBS=y
142CONFIG_CHARGER_TPS65090=y 144CONFIG_CHARGER_TPS65090=y
143CONFIG_POWER_RESET=y 145CONFIG_POWER_RESET=y
146CONFIG_POWER_RESET_AS3722=y
144CONFIG_POWER_RESET_GPIO=y 147CONFIG_POWER_RESET_GPIO=y
145CONFIG_SENSORS_LM90=y 148CONFIG_SENSORS_LM90=y
146CONFIG_MFD_AS3722=y 149CONFIG_MFD_AS3722=y
@@ -166,7 +169,8 @@ CONFIG_REGULATOR_TPS65910=y
166CONFIG_MEDIA_SUPPORT=y 169CONFIG_MEDIA_SUPPORT=y
167CONFIG_MEDIA_CAMERA_SUPPORT=y 170CONFIG_MEDIA_CAMERA_SUPPORT=y
168CONFIG_MEDIA_USB_SUPPORT=y 171CONFIG_MEDIA_USB_SUPPORT=y
169CONFIG_USB_VIDEO_CLASS=m 172CONFIG_USB_VIDEO_CLASS=y
173CONFIG_USB_GSPCA=y
170CONFIG_DRM=y 174CONFIG_DRM=y
171CONFIG_DRM_TEGRA=y 175CONFIG_DRM_TEGRA=y
172CONFIG_DRM_PANEL_SIMPLE=y 176CONFIG_DRM_PANEL_SIMPLE=y