[ /opt/tx1/imx224_0_emerge_configs.patch ]

--- sources/kernel/drivers/media/i2c/Makefile.old   2016-11-10 06:37:19.000000000 +0300
+++ sources/kernel/drivers/media/i2c/Makefile   2017-03-17 18:34:24.122347683 +0300
@@ -61,6 +61,7 @@
 obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
 obj-$(CONFIG_VIDEO_IMX219) += imx219.o
 obj-$(CONFIG_VIDEO_IMX274) += imx274.o
+obj-$(CONFIG_VIDEO_IMX224) += imx224.o
 obj-$(CONFIG_VIDEO_IMX185) += imx185.o
 obj-$(CONFIG_I2C_IOEXPANDER_PCA9570) += pca9570.o
 obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o

--- sources/kernel/drivers/media/i2c/Kconfig.old    2016-11-10 06:37:19.000000000 +0300
+++ sources/kernel/drivers/media/i2c/Kconfig    2017-03-17 18:35:50.418349082 +0300
@@ -536,6 +536,16 @@
    To compile this driver as a module, choose M here: the module
    will be called imx274.

+config VIDEO_IMX224
+   tristate "IMX224 camera sensor support"
+   depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+   ---help---
+   This is a Video4Linux2 sensor-level driver for the Sony
+   IMX224 camera sensor
+
+   To compile this driver as a module, choose M here: the module
+   will be called imx224.
+
 config VIDEO_IMX185
    tristate "IMX185 camera sensor support"
    depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API

--- sources/kernel/arch/arm64/boot/dts/Makefile.old 2016-11-10 06:37:16.000000000 +0300
+++ sources/kernel/arch/arm64/boot/dts/Makefile 2017-03-20 11:30:32.312842256 +0300
@@ -1,125 +1,5 @@
-dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
-
 targets += dtbs
-dtb-$(CONFIG_MACH_EXUMA) += tegra132-exuma.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-norrin-pm374-0001-a00-00.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-norrin-pm374-0001-a01-00.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-norrin-trim-0001.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-norrin-trim-0001-smp.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-laguna.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-bowmore-e1973-1000-a01-00.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-bowmore-e1971-1100-a00-00.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-bowmore-e1971-1100-a00-00-pcie.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-bowmore-e1971-1100-a00-00-powerconfig.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-tn8-p1761-1270-a03.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-interposer-e2141-1100-a00-00.dtb
-dtb-$(CONFIG_MACH_T132REF) += tegra132-interposer-e2141-1100-a00-00-cboot.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-grenada.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-e2190-1100-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-e2220-1170-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-e2220-1170-a00-dp-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-e2220-1170-a00-01.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-l4t-ers-e2220-1170-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-e2220-1180-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-l4t-ers-e2220-1180-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-e2220-1199-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-p2143-1170-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-p2143-1170-a00-01.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-p2143-1199-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-ers-p2143-1180-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-p2530-0930-e00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-p2530-0930-e01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-p2530-0930-e02-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-hdd-p2530-0932-e00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-hdd-p2530-0932-e01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-hdd-p2530-0932-e02-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-hdd-cpc-p2530-0933-e03-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-darcy-p2894-0000-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-darcy-p2894-0050-a04-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-darcy-p2894-0150-a04-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-proto-darcy-hdd-p2892-0030-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-proto-darcy-p2892-0130-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0031-e00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0031-e01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0031-e02-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0031-e03-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0030-e00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0030-e01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0030-e02-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0030-e03-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0131-e00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0131-e01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-p2530-0131-e02-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-vcm30t210.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-vcm30t210.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-vcm31-e2580-0631-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-vcm31-e2580-0631-a00-00-vm.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-vcm31-e2379.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-e2581-0930-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-foster-e-e2581-0930-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0030-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0030-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0031-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0031-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0131-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-loki-e-e2581-0131-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-cv-p2597-2180-a00-auo-1080p-edp.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-cv-base-p2597-2180-a00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-cv-p2597-2180-a00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-tx1-p2597-2180-a02-android-devkit-24x7.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-tx1-p2597-2180-a02-devkit-24x7.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-cv-p2597-2180-a00-sharp-4k-edp.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-tx1-p2597-2180-a01-android-devkit.dtb
 dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-tx1-p2597-2180-a01-devkit.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-e-base-p2595-0000-a00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-e-p2595-0000-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-e-p2595-0000-a00-00-24x7.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-a00-wifi-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2302-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3302-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3303-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2303-a01-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2306-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a01-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3303-a02-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2303-a02-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a02-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2306-a02-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-ffpb-e2295-a00-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3324-a03-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2324-a03-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3326-a03-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2326-a03-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-a00-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2302-a01-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2306-a01-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3302-a01-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3303-a01-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a01-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3303-a02-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a02-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3324-a03-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3326-a03-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3304-a03-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3304-a03-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2304-a03-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a03-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a03-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2306-a03-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3304-a04-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3304-a04-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a04-00-base.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a04-00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3304-a04-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-3306-a04-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2305-a05-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2306-a05-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-hawkeye-p2290-2307-a05-00-wifi.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-p4573-2180.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-cv-p2597-2180-a00-imx274.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-cv-camera-li-mipi-adpt-a00.dtb
-dtb-$(CONFIG_ARCH_TEGRA_21x_SOC) += tegra210-jetson-cv-camera-li-mipi-adpt-a01-devkit.dtb
 targets += $(dtb-y)

 DTC_FLAGS := -i $(srctree)/arch/arm/boot/dts

--- sources/kernel/arch/arm64/boot/dts/tegra210-plugin-manager/tegra210-jetson-cv-plugin-manager.dtsi.old   2016-11-10 06:37:16.000000000 +0300
+++ sources/kernel/arch/arm64/boot/dts/tegra210-plugin-manager/tegra210-jetson-cv-plugin-manager.dtsi   2017-03-17 19:00:19.326372895 +0300
@@ -11,7 +11,6 @@
  * more details.
  *
  */
-#include "tegra210-jetson-cv-camera-plugin-manager.dtsi"

 / {
    plugin-manager {

--- sources/kernel/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts.old   2016-11-10 06:37:16.000000000 +0300
+++ sources/kernel/arch/arm64/boot/dts/tegra210-jetson-cv-base-p2597-2180-a00.dts   2017-03-17 19:00:49.854373390 +0300
@@ -23,7 +23,7 @@
 #include "tegra210-platforms/tegra210-pinmux-drive-sdmmc-common.dtsi"
 #include "tegra210-platforms/tegra210-jetson-cv-prods.dtsi"
 #include "tegra210-platforms/tegra210-comms-p2530-0930.dtsi"
-#include "tegra210-platforms/tegra210-jetson-cv-camera-modules.dtsi"
+#include "tegra210-platforms/imx224.dtsi"
 #include "tegra210-platforms/tegra210-pwm-fan-p2530-0930.dtsi"
 #include "panel-a-wuxga-8-0.dtsi"
 #include "panel-a-edp-1080p-14-0.dtsi"