From 7ff1459764c8800043277a73d96dc7160c10086a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 31 Jan 2014 12:39:10 -0600
Subject: [PATCH] merge to:
https://github.com/RobertCNelson/linux/commit/b399c46ea0070671f3abbe1915d26076101a42f2
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patches/defconfig | 110 +++++++++++++++++++++++++++-
patches/example_imx_v6_v7_defconfig | 16 +++-
tools/config-checker.sh | 14 ++++
version.sh | 4 +-
4 files changed, 137 insertions(+), 7 deletions(-)
diff --git a/patches/defconfig b/patches/defconfig
index 135010c45..e200062ad 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1543,7 +1543,16 @@ CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=y
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ALGOBIT=y
@@ -2066,7 +2075,94 @@ CONFIG_REGULATOR_TPS65217=y
CONFIG_REGULATOR_TPS65910=y
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_VEXPRESS=y
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
+# CONFIG_TTPCI_EEPROM is not set
+
+#
+# Media drivers
+#
+# CONFIG_MEDIA_USB_SUPPORT is not set
+# CONFIG_MEDIA_PCI_SUPPORT is not set
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+# CONFIG_CYPRESS_FIRMWARE is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Audio decoders, processors and mixers
+#
+
+#
+# RDS decoders
+#
+
+#
+# Video decoders
+#
+
+#
+# Video and audio decoders
+#
+
+#
+# Video encoders
+#
+
+#
+# Camera sensor devices
+#
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+
+#
+# Audio/Video compression chips
+#
+
+#
+# Miscellaneous helper chips
+#
+
+#
+# Sensors used on soc_camera driver
+#
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
#
# Graphics support
@@ -2643,6 +2739,7 @@ CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_G_MULTI is not set
# CONFIG_USB_G_HID is not set
# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
# CONFIG_UWB is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
@@ -2893,7 +2990,14 @@ CONFIG_STAGING=y
# CONFIG_SPEAKUP is not set
# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_STAGING_MEDIA is not set
+CONFIG_STAGING_MEDIA=y
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_USB_MSI3101 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_SOLO6X10 is not set
+CONFIG_VIDEO_OMAP4=y
+# CONFIG_VIDEO_OMAP4_DEBUG is not set
#
# Android
diff --git a/patches/example_imx_v6_v7_defconfig b/patches/example_imx_v6_v7_defconfig
index 66f9aa91f..41b3a12dc 100644
--- a/patches/example_imx_v6_v7_defconfig
+++ b/patches/example_imx_v6_v7_defconfig
@@ -1440,7 +1440,16 @@ CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=y
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
# CONFIG_I2C_HELPER_AUTO is not set
# CONFIG_I2C_SMBUS is not set
@@ -1788,7 +1797,6 @@ CONFIG_VIDEOBUF_GEN=y
CONFIG_VIDEOBUF2_CORE=y
CONFIG_VIDEOBUF2_MEMOPS=y
CONFIG_VIDEOBUF2_DMA_CONTIG=y
-# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
# CONFIG_TTPCI_EEPROM is not set
#
@@ -1874,6 +1882,10 @@ CONFIG_VIDEO_IR_I2C=y
# Video improvement chips
#
+#
+# Audio/Video compression chips
+#
+
#
# Miscellaneous helper chips
#
diff --git a/tools/config-checker.sh b/tools/config-checker.sh
index 3e5065af0..9e46b0e77 100755
--- a/tools/config-checker.sh
+++ b/tools/config-checker.sh
@@ -377,6 +377,18 @@ config="CONFIG_TWL6040_CORE"
check_if_set_then_set
config="CONFIG_OMAP4_THERMAL"
check_if_set_then_set
+config="CONFIG_MEDIA_SUPPORT"
+check_if_set_then_set
+config="CONFIG_MEDIA_CAMERA_SUPPORT"
+check_if_set_then_set
+config="CONFIG_MEDIA_CONTROLLER"
+check_if_set_then_set
+config="CONFIG_VIDEO_V4L2_SUBDEV_API"
+check_if_set_then_set
+config="CONFIG_STAGING_MEDIA"
+check_if_set_then_set
+config="CONFIG_VIDEO_OMAP4"
+check_if_set_then_set
#omap5:
if_config="CONFIG_SOC_OMAP5"
@@ -544,6 +556,8 @@ check_config_builtin
#Useful
config="CONFIG_I2C_CHARDEV"
check_config_builtin
+config="CONFIG_I2C_MUX"
+check_config_builtin
config="CONFIG_DEBUG_GPIO"
check_config_builtin
config="CONFIG_GPIO_SYSFS"
diff --git a/version.sh b/version.sh
index acecabf35..4faa4849d 100644
--- a/version.sh
+++ b/version.sh
@@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8"
#Kernel/Build
KERNEL_REL=3.13
KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-devel-r39
+BUILD=armv7-devel-r40
#v3.X-rcX + upto SHA
-KERNEL_SHA="e7651b819e90da924991d727d3c007200a18670d"
+KERNEL_SHA="b399c46ea0070671f3abbe1915d26076101a42f2"
#git branch
#BRANCH="v3.13.x"
--
GitLab