summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pandya <apandya@nvidia.com>2011-10-04 18:17:34 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-15 12:09:40 +0530
commite79602a83fcf33c655a16b6a96bc79b396e157be (patch)
treeac957c08d7bf0864936bec64bfcbb30ec8ad8277
parentea3439b44aa972add474ed00e29252c0b31ad00e (diff)
ARM: tegra: config: Enable camera sensor devices
Add kernel config flags in "tegra_defconfig" & "tegra3_defconfig" to enable camera sensor,focuser & torch devices. This is to enable Camera capture on L4T with T20 Ventana & T30 Cardhu. Bug 869132 & 880107 Change-Id: Ib81908881c8936e7b3dd7ebdcfd9bba006aa343f Cherry-picked From : f09adb0d15f0991d0e7116f7a1092339bf92f9e9 Reviewed-on: http://git-master/r/55977 Signed-off-by: Amit Pandya <apandya@nvidia.com> Reviewed-on: http://git-master/r/68165 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
-rw-r--r--arch/arm/configs/tegra3_defconfig11
-rw-r--r--arch/arm/configs/tegra_defconfig35
2 files changed, 44 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index 2bf651a67854..fa32cf5b7653 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -142,8 +142,15 @@ CONFIG_INPUT_ALPS_GPIO_SCROLLWHEEL=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_HW_RANDOM is not set
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_OV5650=m
+CONFIG_VIDEO_OV2710=m
+CONFIG_TORCH_SSL3250A=y
+CONFIG_VIDEO_SH532U=m
+CONFIG_TORCH_TPS61050=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
CONFIG_I2C_TEGRA=y
CONFIG_SENSORS_LM90=y
CONFIG_MFD_MAX8907C=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index d5052d4916ea..ae8c3ec10467 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -151,6 +151,41 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_MAX8907C=y
CONFIG_REGULATOR_TPS6586X=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_VIDEO_DEV=m
+# CONFIG_VGA_ARB is not set
+# CONFIG_VIDEO_ALLOW_V4L1 is not set
+# CONFIG_VIDEO_V4L1_COMPAT is not set
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+# CONFIG_MEDIA_TUNER_MC44S803 is not set
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_OV5650=m
+CONFIG_VIDEO_OV2710=m
+CONFIG_TORCH_SSL3250A=y
+CONFIG_VIDEO_SH532U=m
+CONFIG_GPIO_PCA953X=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+# CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
CONFIG_TEGRA_GRHOST=y
CONFIG_TEGRA_DC=y