KF: use ulcb-kf.dtsi

Use one dtsi file for both h3/m3ulcb kingfisher boards

1 files changed, 2176 insertions, 5318 deletions

diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch
index f79ab5b..7721e20 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch
@@ -23,36 +23,38 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
 ---
  arch/arm64/boot/dts/renesas/Makefile               |   15 +
  arch/arm64/boot/dts/renesas/legacy/Makefile        |    7 +
- .../renesas/legacy/r8a7795-es1-h3ulcb-kf-v0.dts    | 1717 +++++++++++++++++
+ .../renesas/legacy/r8a7795-es1-h3ulcb-kf-v0.dts    | 1717 +++++++++++++++++++
  .../renesas/legacy/r8a7795-es1-h3ulcb-kf-v1.dts    |  441 +++++
- .../dts/renesas/legacy/r8a7795-h3ulcb-kf-v0.dts    | 1724 +++++++++++++++++
+ .../dts/renesas/legacy/r8a7795-h3ulcb-kf-v0.dts    | 1724 +++++++++++++++++++
  .../dts/renesas/legacy/r8a7795-h3ulcb-kf-v1.dts    |  465 +++++
- .../dts/renesas/legacy/r8a7796-m3ulcb-kf-v0.dts    | 1214 ++++++++++++
+ .../dts/renesas/legacy/r8a7796-m3ulcb-kf-v0.dts    | 1214 +++++++++++++
  .../dts/renesas/legacy/r8a7796-m3ulcb-kf-v1.dts    |  465 +++++
+ .../boot/dts/renesas/legacy/ulcb-kf-cmos.dtsi      |   75 +
+ .../arm64/boot/dts/renesas/legacy/ulcb-kf-rpi.dtsi |   77 +
  .../dts/renesas/r8a7795-es1-h3ulcb-had-alfa.dts    |   22 +
  .../dts/renesas/r8a7795-es1-h3ulcb-had-beta.dts    |   23 +
  .../boot/dts/renesas/r8a7795-es1-h3ulcb-had.dtsi   |  225 +++
- .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts     | 1941 ++++++++++++++++++++
- .../boot/dts/renesas/r8a7795-es1-h3ulcb-vb.dts     | 1787 ++++++++++++++++++
+ .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts     |   39 +
+ .../boot/dts/renesas/r8a7795-es1-h3ulcb-vb.dts     | 1787 ++++++++++++++++++++
  .../boot/dts/renesas/r8a7795-es1-h3ulcb-view.dts   |  546 ++++++
  .../dts/renesas/r8a7795-es1-salvator-x-view.dts    |  552 ++++++
  .../boot/dts/renesas/r8a7795-h3ulcb-had-alfa.dts   |   22 +
  .../boot/dts/renesas/r8a7795-h3ulcb-had-beta.dts   |   23 +
  .../arm64/boot/dts/renesas/r8a7795-h3ulcb-had.dtsi |  219 +++
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts  | 1941 ++++++++++++++++++++
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-vb.dts  | 1787 ++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts  |   39 +
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-vb.dts  | 1787 ++++++++++++++++++++
  .../arm64/boot/dts/renesas/r8a7795-h3ulcb-view.dts |  546 ++++++
  .../boot/dts/renesas/r8a7795-salvator-x-view.dts   |  552 ++++++
- arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts  | 1431 +++++++++++++++
- .../arm64/boot/dts/renesas/r8a7796-m3ulcb-view.dts |  287 +++
+ arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts  |   36 +
+ .../arm64/boot/dts/renesas/r8a7796-m3ulcb-view.dts |  287 ++++
  .../boot/dts/renesas/r8a7796-salvator-x-view.dts   |  318 ++++
  arch/arm64/boot/dts/renesas/r8a7797-eagle.dts      |  561 ++++++
- arch/arm64/boot/dts/renesas/r8a7797-v3msk.dts      |  294 +++
- arch/arm64/boot/dts/renesas/ulcb-kf-cmos.dtsi      |   75 +
- arch/arm64/boot/dts/renesas/ulcb-kf-rpi.dtsi       |   77 +
+ arch/arm64/boot/dts/renesas/r8a7797-v3msk.dts      |  294 ++++
+ arch/arm64/boot/dts/renesas/ulcb-kf-cn11.dtsi      |  518 ++++++
  arch/arm64/boot/dts/renesas/ulcb-kf-sd3.dtsi       |   46 +
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi           | 1523 +++++++++++++++++
  arch/arm64/boot/dts/renesas/ulcb-vb-cn12.dtsi      |  515 ++++++
- 31 files changed, 19838 insertions(+)
+ 33 files changed, 16680 insertions(+)
  create mode 100644 arch/arm64/boot/dts/renesas/legacy/Makefile
  create mode 100644 arch/arm64/boot/dts/renesas/legacy/r8a7795-es1-h3ulcb-kf-v0.dts
  create mode 100644 arch/arm64/boot/dts/renesas/legacy/r8a7795-es1-h3ulcb-kf-v1.dts
@@ -60,6 +62,8 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
  create mode 100644 arch/arm64/boot/dts/renesas/legacy/r8a7795-h3ulcb-kf-v1.dts
  create mode 100644 arch/arm64/boot/dts/renesas/legacy/r8a7796-m3ulcb-kf-v0.dts
  create mode 100644 arch/arm64/boot/dts/renesas/legacy/r8a7796-m3ulcb-kf-v1.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/legacy/ulcb-kf-cmos.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/legacy/ulcb-kf-rpi.dtsi
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-had-alfa.dts
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-had-beta.dts
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-had.dtsi
@@ -79,9 +83,9 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-x-view.dts
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7797-eagle.dts
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7797-v3msk.dts
- create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-cmos.dtsi
- create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-rpi.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-cn11.dtsi
  create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-sd3.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
  create mode 100644 arch/arm64/boot/dts/renesas/ulcb-vb-cn12.dtsi
 
 diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
@@ -2294,7 +2298,7 @@ index 0000000..ac6a12b
 +};
 diff --git a/arch/arm64/boot/dts/renesas/legacy/r8a7795-h3ulcb-kf-v0.dts b/arch/arm64/boot/dts/renesas/legacy/r8a7795-h3ulcb-kf-v0.dts
 new file mode 100644
-index 0000000..15e20b1
+index 0000000..f640350
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/legacy/r8a7795-h3ulcb-kf-v0.dts
 @@ -0,0 +1,1724 @@
@@ -4019,9 +4023,9 @@ index 0000000..15e20b1
 +/* uncomment to enable CN47: SD on SDHI3 */
 +//#include "../ulcb-kf-sd3.dtsi"
 +/* CN48 (Raspberry Pi) on VIN4 */
-+//#include "../ulcb-kf-rpi.dtsi"
++//#include "ulcb-kf-rpi.dtsi"
 +/* CN29: (CMOS camera) on VIN5 */
-+//#include "../ulcb-kf-cmos.dtsi"
++//#include "ulcb-kf-cmos.dtsi"
 diff --git a/arch/arm64/boot/dts/renesas/legacy/r8a7795-h3ulcb-kf-v1.dts b/arch/arm64/boot/dts/renesas/legacy/r8a7795-h3ulcb-kf-v1.dts
 new file mode 100644
 index 0000000..14b6f52
@@ -4495,7 +4499,7 @@ index 0000000..14b6f52
 +};
 diff --git a/arch/arm64/boot/dts/renesas/legacy/r8a7796-m3ulcb-kf-v0.dts b/arch/arm64/boot/dts/renesas/legacy/r8a7796-m3ulcb-kf-v0.dts
 new file mode 100644
-index 0000000..9da289b
+index 0000000..7be2370
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/legacy/r8a7796-m3ulcb-kf-v0.dts
 @@ -0,0 +1,1214 @@
@@ -5710,9 +5714,9 @@ index 0000000..9da289b
 +/* uncomment to enable CN47: SD on SDHI3 */
 +//#include "../ulcb-kf-sd3.dtsi"
 +/* CN48 (Raspberry Pi) on VIN4 */
-+#include "../ulcb-kf-rpi.dtsi"
++#include "ulcb-kf-rpi.dtsi"
 +/* CN29: (CMOS camera) on VIN5 */
-+#include "../ulcb-kf-cmos.dtsi"
++#include "ulcb-kf-cmos.dtsi"
 diff --git a/arch/arm64/boot/dts/renesas/legacy/r8a7796-m3ulcb-kf-v1.dts b/arch/arm64/boot/dts/renesas/legacy/r8a7796-m3ulcb-kf-v1.dts
 new file mode 100644
 index 0000000..637c840
@@ -6184,6 +6188,170 @@ index 0000000..637c840
 +	pcie3v3-supply = <&mpcie_3v3>;
 +	pcie1v8-supply = <&mpcie_1v8>;
 +};
+diff --git a/arch/arm64/boot/dts/renesas/legacy/ulcb-kf-cmos.dtsi b/arch/arm64/boot/dts/renesas/legacy/ulcb-kf-cmos.dtsi
+new file mode 100644
+index 0000000..2145f5e
+--- /dev/null
++++ b/arch/arm64/boot/dts/renesas/legacy/ulcb-kf-cmos.dtsi
+@@ -0,0 +1,75 @@
++/*
++ * Device Tree Source for the H3ULCB Kingfisher board:
++ * this adding conflicting resource on VIN5 for CMOS camera
++ *
++ * Copyright (C) 2017 Renesas Electronics Corp.
++ * Copyright (C) 2017 Cogent Embedded, Inc.
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2.  This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++/ {
++	camera_clk: camera_clk {
++		compatible = "fixed-clock";
++		#clock-cells = <0>;
++		clock-frequency = <24000000>;
++		clock-output-names = "mclk";
++	};
++};
++
++&pfc {
++	vin5_pins: vin5 {
++		groups = "vin5_data8", "vin5_sync", "vin5_clk";
++		function = "vin5";
++	};
++};
++
++&i2cswitch4 {
++	i2c@5 {
++		#address-cells = <1>;
++		#size-cells = <0>;
++		reg = <5>;
++
++		cmos_camera: ov5642@3c {
++			compatible = "ovti,ov5642";
++			reg = <0x3c>;
++			clocks = <&camera_clk>;
++			clock-names = "mclk";
++
++			port@0 {
++				cmos_camera_in: endpoint {
++					remote-endpoint = <&vin5ep0>;
++				};
++			};
++		};
++	};
++};
++
++&vin5 {
++	pinctrl-0 = <&vin5_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin5ep0: endpoint@0 {
++				/delete-property/csi,select;
++				/delete-property/virtual,channel;
++				/delete-property/data-lanes;
++				bus-width = <8>;
++				/* #HSYNC, #VSYNC */
++				vsync-active = <1>;
++				hsync-active = <0>;
++				remote-endpoint = <&cmos_camera_in>;
++			};
++		};
++		port@1 {
++			/delete-node/endpoint;
++		};
++	};
++};
+diff --git a/arch/arm64/boot/dts/renesas/legacy/ulcb-kf-rpi.dtsi b/arch/arm64/boot/dts/renesas/legacy/ulcb-kf-rpi.dtsi
+new file mode 100644
+index 0000000..bcd9865
+--- /dev/null
++++ b/arch/arm64/boot/dts/renesas/legacy/ulcb-kf-rpi.dtsi
+@@ -0,0 +1,77 @@
++/*
++ * Device Tree Source for the H3ULCB Kingfisher board:
++ * this adding conflicting resource on VIN4 for Raspberry Pi camera
++ *
++ * Copyright (C) 2017 Renesas Electronics Corp.
++ * Copyright (C) 2017 Cogent Embedded, Inc.
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2.  This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++&i2cswitch4 {
++	i2c@4 {
++		#address-cells = <1>;
++		#size-cells = <0>;
++		reg = <4>;
++
++		rpi_camera: ov5647@36 {
++			compatible = "ovti,ov5647";
++			reg = <0x36>;
++
++			port@0 {
++				rpi_camera_in: endpoint {
++					clock-lanes = <0>;
++					data-lanes = <1 2>;
++					remote-endpoint = <&vin4ep0>;
++				};
++			};
++		};
++	};
++};
++
++&vin4 {
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin4ep0: endpoint {
++				csi,select = "csi20";
++				virtual,channel = <0>;
++				remote-endpoint = <&rpi_camera_in>;
++				data-lanes = <1 2>;
++			};
++		};
++		port@1 {
++			csi2ep0: endpoint {
++				remote-endpoint = <&csi2_20_ep>;
++			};
++		};
++	};
++};
++
++&csi2_20 {
++	status = "okay";
++
++	virtual,channel {
++		csi2_vc0 {
++			data,type = "raw8";
++			receive,vc = <0>;
++		};
++	};
++
++	port {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		csi2_20_ep: endpoint {
++			clock-lanes = <0>;
++			data-lanes = <1 2>;
++			csi-rate = <280>;
++		};
++	};
++};
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-had-alfa.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-had-alfa.dts
 new file mode 100644
 index 0000000..6b13f07
@@ -6474,10 +6642,10 @@ index 0000000..d50ff7a
 +};
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
 new file mode 100644
-index 0000000..f365849
+index 0000000..849afae
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
-@@ -0,0 +1,1941 @@
+@@ -0,0 +1,39 @@
 +/*
 + * Device Tree Source for the H3ULCB Kingfisher board on r8a7795 ES1.x
 + *
@@ -6490,372 +6658,13 @@ index 0000000..f365849
 + */
 +
 +#include "r8a7795-es1-h3ulcb.dts"
++#include "ulcb-kf.dtsi"
 +
 +/ {
 +	model = "Renesas H3ULCB Kingfisher board based on r8a7795";
-+
-+	aliases {
-+		serial1 = &hscif0;
-+		serial2 = &hscif1;
-+		serial3 = &scif1;
-+	};
-+
-+	snd_clk: snd_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-frequency = <24576000>;
-+		clock-output-names = "scki";
-+	};
-+
-+	wlan_en: regulator@4 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "wlan-en-regulator";
-+
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 4 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	vcc_sdhi3: regulator@41 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "SDHI3 Vcc";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio4 17 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	vccq_sdhi3: regulator@5 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "SDHI3 VccQ";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+	};
-+
-+	codec_en_reg: regulator@6 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "codec-en-regulator";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 15 0>;
-+
-+		/* delay - CHECK */
-+		startup-delay-us = <70000>;
-+		enable-active-high;
-+	};
-+
-+	amp_en_reg: regulator@7 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "amp-en-regulator";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 0 0>;
-+
-+		startup-delay-us = <0>;
-+		enable-active-high;
-+	};
-+
-+	sdio_switch: regulator@9 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "wifi_on";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_74 5 0>;
-+		enable-active-low;
-+		regulator-always-on;
-+	};
-+
-+	radio_switch: regulator@11 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "radio_on";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_74 13 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+		regulator-always-on;
-+	};
-+
-+	mpcie_3v3: regulator@12 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "mPCIe 3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_77 14 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	mpcie_1v8: regulator@13 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "mPCIe 1v8";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		gpio = <&gpio_ext_77 15 GPIO_ACTIVE_HIGH>;
-+		startup-delay-us = <200000>;
-+		enable-active-high;
-+	};
-+
-+	kim {
-+		compatible = "kim";
-+		shutdown-gpios = <&gpio_ext_74 3 GPIO_ACTIVE_HIGH>;
-+		/* serial1 */
-+		dev_name = "/dev/ttySC1";
-+		flow_cntrl = <1>;
-+		/* int div 8 hscif@26.6666656MHz */
-+		baud_rate = <3333332>;
-+	};
-+
-+	btwilink {
-+		compatible = "btwilink";
-+	};
-+
-+	sound_ext: sound@0 {
-+		pinctrl-0 = <&sound_0_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "left_j";
-+		simple-audio-card,name = "pcm3168a";
-+
-+		simple-audio-card,bitclock-master = <&sound_ext_master>;
-+		simple-audio-card,frame-master = <&sound_ext_master>;
-+		sound_ext_master: simple-audio-card,cpu@0 {
-+			sound-dai = <&rcar_sound 0>;
-+			dai-tdm-slot-num = <8>;
-+			dai-tdm-slot-width = <32>;
-+		};
-+
-+		simple-audio-card,codec@0 {
-+			sound-dai = <&pcm3168a>;
-+			dai-tdm-slot-num = <8>;
-+			dai-tdm-slot-width = <32>;
-+			system-clock-frequency = <24576000>;
-+		};
-+	};
-+
-+	/delete-node/sound;
-+
-+	rsnd_ak4613: sound@1 {
-+		pinctrl-0 = <&sound_1_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "left_j";
-+		simple-audio-card,name = "ak4613";
-+
-+		simple-audio-card,bitclock-master = <&sndcpu>;
-+		simple-audio-card,frame-master = <&sndcpu>;
-+
-+		sndcpu: simple-audio-card,cpu@1 {
-+			sound-dai = <&rcar_sound 1>;
-+		};
-+
-+		sndcodec: simple-audio-card,codec@1 {
-+			sound-dai = <&ak4613>;
-+		};
-+	};
-+
-+	sound_radio: sound@2 {
-+		pinctrl-0 = <&sound_2_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "radio";
-+
-+		simple-audio-card,bitclock-master = <&sound_radio_master>;
-+		simple-audio-card,frame-master = <&sound_radio_master>;
-+		simple-audio-card,cpu@2 {
-+			sound-dai = <&rcar_sound 2>;
-+		};
-+
-+		sound_radio_master: simple-audio-card,codec@2 {
-+			sound-dai = <&radio>;
-+			system-clock-frequency = <12288000>;
-+		};
-+	};
-+
-+	sound_wl18xx: sound@3 {
-+		pinctrl-0 = <&sound_3_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "wl18xx";
-+
-+		simple-audio-card,bitclock-master = <&sound_wl18xx_master>;
-+		simple-audio-card,frame-master = <&sound_wl18xx_master>;
-+		sound_wl18xx_master: simple-audio-card,cpu@3 {
-+			sound-dai = <&rcar_sound 3>;
-+		};
-+
-+		simple-audio-card,codec@3 {
-+			sound-dai = <&wl18xx_pcm>;
-+		};
-+	};
-+
-+	lvds-encoder {
-+		compatible = "thine,thc63lvdm83d";
-+
-+		ports {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			port@0 {
-+				reg = <0>;
-+				lvds_enc_in: endpoint {
-+					remote-endpoint = <&du_out_lvds0>;
-+				};
-+			};
-+			port@1 {
-+				reg = <1>;
-+				lvds_enc_out: endpoint {
-+					remote-endpoint = <&lvds_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	lvds {
-+		compatible = "lvds-connector";
-+
-+		width-mm = <210>;
-+		height-mm = <158>;
-+
-+		panel-timing {
-+			/* 1280x800 @60Hz */
-+			clock-frequency = <65000000>;
-+			hactive = <1280>;
-+			vactive = <800>;
-+			hsync-len = <40>;
-+			hfront-porch = <80>;
-+			hback-porch = <40>;
-+			vfront-porch = <14>;
-+			vback-porch = <14>;
-+			vsync-len = <4>;
-+		};
-+
-+		port {
-+			lvds_in: endpoint {
-+				remote-endpoint = <&lvds_enc_out>;
-+			};
-+		};
-+	};
-+
-+	hdmi-out {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con: endpoint {
-+				remote-endpoint = <&adv7513_out>;
-+			};
-+		};
-+	};
-+
-+	radio: si468x@0 {
-+		compatible = "si,si468x-pcm";
-+		status = "okay";
-+
-+		#sound-dai-cells = <0>;
-+	};
-+
-+	wl18xx_pcm: wl18xx_pcm@0 {
-+		compatible = "ti,wl18xx-pcm";
-+		status = "okay";
-+
-+		#sound-dai-cells = <0>;
-+	};
-+};
-+
-+&pfc {
-+	scif1_pins: scif1 {
-+		groups = "scif1_data_b";
-+		function = "scif1";
-+	};
-+
-+	hscif0_pins: hscif0 {
-+		groups = "hscif0_data", "hscif0_ctrl";
-+		function = "hscif0";
-+	};
-+
-+	hscif1_pins: hscif1 {
-+		groups = "hscif1_data_a", "hscif1_ctrl_a";
-+		function = "hscif1";
-+	};
-+
-+	du_pins: du {
-+		groups = "du_rgb888", "du_sync", "du_clk_out_0", "du_disp";
-+		function = "du";
-+	};
-+
-+	sdhi3_pins_3v3: sd3_3v3 {
-+		groups = "sdhi3_data4", "sdhi3_ctrl";
-+		function = "sdhi3";
-+		power-source = <3300>;
-+	};
-+
-+	sdhi3_pins_1v8: sd3_1v8 {
-+		groups = "sdhi3_data4", "sdhi3_ctrl";
-+		function = "sdhi3";
-+		power-source = <1800>;
-+	};
-+
-+	sound_0_pins: sound0 {
-+		groups = "ssi34_ctrl", "ssi3_data", "ssi4_data";
-+		function = "ssi";
-+	};
-+
-+	sound_1_pins: sound1 {
-+		groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";
-+		function = "ssi";
-+	};
-+
-+	sound_2_pins: sound2 {
-+		groups = "ssi6_ctrl", "ssi6_data";
-+		function = "ssi";
-+	};
-+
-+	sound_3_pins: sound3 {
-+		groups = "ssi78_ctrl", "ssi7_data", "ssi8_data";
-+		function = "ssi";
-+	};
-+
-+	usb0_pins: usb0 {
-+		groups = "usb0";
-+		function = "usb0";
-+	};
-+
-+	can0_pins: can0 {
-+		groups = "can0_data_a";
-+		function = "can0";
-+	};
-+
-+	can1_pins: can1 {
-+		groups = "can1_data";
-+		function = "can1";
-+	};
-+
-+	canfd0_pins: canfd0 {
-+		groups = "canfd0_data_a";
-+		function = "canfd0";
-+	};
-+
-+	canfd1_pins: canfd1 {
-+		groups = "canfd1_data";
-+		function = "canfd1";
-+	};
 +};
 +
 +&du {
-+	pinctrl-0 = <&du_pins>;
-+	pinctrl-names = "default";
-+
 +	ports {
 +		port@0 {
 +			endpoint {
@@ -6870,1555 +6679,12 @@ index 0000000..f365849
 +	};
 +};
 +
-+&gpio2 {
-+	bl_pwm {
-+		gpio-hog;
-+		gpios = <3 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+		line-name = "BL PWM 100%";
-+	};
-+};
-+
-+&gpio6 {
-+	audio_sw {
-+		gpio-hog;
-+		gpios = <21 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+		line-name = "Onboard MCh Audio";
-+	};
-+};
-+
-+&scif1 {
-+	pinctrl-0 = <&scif1_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
-+&hscif0 {
-+	pinctrl-0 = <&hscif0_pins>;
-+	pinctrl-names = "default";
-+	uart-has-rtscts;
-+
-+	status = "okay";
-+};
-+
-+&hscif1 {
-+	pinctrl-0 = <&hscif1_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
-+&i2c2 {
-+	clock-frequency = <400000>;
-+
-+	gpio_ext_74: pca9539@74 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x74>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio6>;
-+		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
-+
-+		hub_pwen {
-+			gpio-hog;
-+			gpios = <6 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "HUB pwen";
-+		};
-+		hub_rst {
-+			gpio-hog;
-+			gpios = <7 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "HUB rst";
-+		};
-+		otg_offvbus {
-+			gpio-hog;
-+			gpios = <8 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "OTG off VBUSn";
-+		};
-+		otg_extlpn {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "OTG EXTLPn";
-+		};
-+		otg_stat1 {
-+			gpio-hog;
-+			gpios = <10 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "OTG Stat1";
-+		};
-+		otg_stat2 {
-+			gpio-hog;
-+			gpios = <11 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "OTG Stat2";
-+		};
-+	};
-+
-+	gpio_ext_75: pca9539@75 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x75>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio6>;
-+		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
-+
-+		gps_rst {
-+			gpio-hog;
-+			gpios = <6 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "GPS rst";
-+		};
-+		fpdl_shdn {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "FPDLink shdn";
-+		};
-+	};
-+
-+	i2cswitch2: pca9548@74 {
-+		compatible = "nxp,pca9548";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x71>;
-+		reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
-+
-+		i2c@0 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <0>;
-+			/* BCM node(s) */
-+		};
-+
-+		i2c@1 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <1>;
-+			/* USB3.0 HUB node(s) */
-+		};
-+
-+		i2c@2 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <2>;
-+			/* Power amp node(s) */
-+		};
-+
-+		i2c@3 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <3>;
-+			/* Radio node(s) */
-+		};
-+
-+		i2c@4 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <4>;
-+
-+			hdmi@3d {
-+				compatible = "adi,adv7511w";
-+				reg = <0x3d>;
-+//				interrupt-parent = <&gpio2>;
-+//				interrupts = <0 IRQ_TYPE_EDGE_BOTH>;
-+				pd-gpios = <&gpio_ext_75 5 GPIO_ACTIVE_LOW>;
-+
-+				adi,input-depth = <8>;
-+				adi,input-colorspace = "rgb";
-+				adi,input-clock = "1x";
-+				adi,input-style = <1>;
-+				adi,input-justification = "evenly";
-+				adi,clock-delay = <1200>;
-+				adi,clock-max-rate = <100000>;
-+
-+				ports {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					port@0 {
-+						reg = <0>;
-+						adv7513_in: endpoint {
-+							remote-endpoint = <&du_out_rgb>;
-+						};
-+					};
-+
-+					port@1 {
-+						reg = <1>;
-+						adv7513_out: endpoint {
-+							remote-endpoint = <&hdmi_con>;
-+						};
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@5 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <5>;
-+			/* PCIe node(s) */
-+		};
-+
-+		i2c@6 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <6>;
-+			/* LVDS display node(s) */
-+
-+			polytouch: edt-ft5x06@38 {
-+				compatible = "edt,edt-ft5x06";
-+				reg = <0x38>;
-+				interrupt-parent = <&gpio5>;
-+				interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
-+			};
-+		};
-+
-+		i2c@7 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <7>;
-+			/* Audio, GPS and Gyro node(s) */
-+
-+			pcm3168a: audio-codec@44 {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm3168a";
-+				reg = <0x44>;
-+				clocks = <&snd_clk>;
-+				clock-names = "scki";
-+				tdm;
-+				VDD1-supply = <&codec_en_reg>;
-+				VDD2-supply = <&codec_en_reg>;
-+				VCCAD1-supply = <&codec_en_reg>;
-+				VCCAD2-supply = <&codec_en_reg>;
-+				VCCDA1-supply = <&amp_en_reg>;
-+				VCCDA2-supply = <&amp_en_reg>;
-+			};
-+
-+			lsm9ds0_acc_mag@1d {
-+				compatible = "st,lsm9ds0_accel_magn";
-+				reg = <0x1d>;
-+			};
-+
-+			lsm9ds0_gyr@6b {
-+				compatible = "st,lsm9ds0_gyro";
-+				reg = <0x6b>;
-+			};
-+
-+			/* GPS@ 0x42 */
-+		};
-+	};
-+};
-+
-+&i2c4 {
-+	gpio_ext_76: pca9539@76 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x76>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio7>;
-+		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
-+
-+		port_b_a0 {
-+			gpio-hog;
-+			gpios = <0 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "Video-B A0";
-+		};
-+		port_b_a1 {
-+			gpio-hog;
-+			gpios = <1 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "Video-B A1";
-+		};
-+		port_a_a0 {
-+			gpio-hog;
-+			gpios = <2 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "Video-A A0";
-+		};
-+		port_a_a1 {
-+			gpio-hog;
-+			gpios = <3 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "Video-A A1";
-+		};
-+		cmos_pwdn {
-+			gpio-hog;
-+			gpios = <8 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "CMOS PWDN";
-+		};
-+		cmos_rst {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "CMOS RST";
-+		};
-+		/* pin 12 - CAM_CLK */
-+		rpi_cam_io_1 {
-+			gpio-hog;
-+			gpios = <10 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "RaspB_IO1";
-+		};
-+		/* pin 11 - CAM_GPIO - assume pwdn */
-+		rpi_cam_io_0 {
-+			gpio-hog;
-+			gpios = <11 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "RaspB_IO0";
-+		};
-+		sam_rst {
-+			gpio-hog;
-+			gpios = <4 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "SAM RST";
-+		};
-+		sam_pwr {
-+			gpio-hog;
-+			gpios = <5 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "SAM PWR";
-+		};
-+		/* 0 - FPDLink output, 1 - LVDS output */
-+		lvds_vs_fpdl {
-+			gpio-hog;
-+			gpios = <14 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "LVDS switch";
-+		};
-+	};
-+
-+	gpio_ext_77: pca9539@77 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x77>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio5>;
-+		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
-+
-+		mpcie_wake {
-+			gpio-hog;
-+			gpios = <0 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "mPCIe WAKE#";
-+		};
-+		mpcie_wdisable {
-+			gpio-hog;
-+			gpios = <1 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "mPCIe W_DISABLE";
-+		};
-+		mpcie_clreq {
-+			gpio-hog;
-+			gpios = <2 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "mPCIe CLKREQ#";
-+		};
-+		mpcie_ovc {
-+			gpio-hog;
-+			gpios = <3 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "mPCIe OVC";
-+		};
-+	};
-+
-+	i2cswitch4: pca9548@74 {
-+		compatible = "nxp,pca9548";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x71>;
-+		reset-gpios= <&gpio3 15 GPIO_ACTIVE_LOW>;
-+
-+		i2c@0 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <0>;
-+			/* SAM node(s) */
-+		};
-+
-+		i2c@1 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <1>;
-+			/* Slot A (CN10) */
-+
-+			ov106xx@0 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x60>;
-+
-+				port@0 {
-+					ov106xx_in0: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin0ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep0: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep0>;
-+					};
-+					ov106xx_ti964_des0ep0: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep0>;
-+					};
-+					ov106xx_ti954_des0ep0: endpoint@2 {
-+						remote-endpoint = <&ti954_des0ep0>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@1 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x61>;
-+
-+				port@0 {
-+					ov106xx_in1: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin1ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep1: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep1>;
-+					};
-+					ov106xx_ti964_des0ep1: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep1>;
-+					};
-+					ov106xx_ti954_des0ep1: endpoint@2 {
-+						remote-endpoint = <&ti954_des0ep1>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@2 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x62>;
-+
-+				port@0 {
-+					ov106xx_in2: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin2ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep2: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep2>;
-+					};
-+					ov106xx_ti964_des0ep2: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep2>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@3 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x63>;
-+
-+				port@0 {
-+					ov106xx_in3: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin3ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep3: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep3>;
-+					};
-+					ov106xx_ti964_des0ep3: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep3>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB964 @ 0x3a */
-+			ti964-ti9x3@0 {
-+				compatible = "ti,ti964-ti9x3";
-+				reg = <0x3a>;
-+				ti,sensor_delay = <350>;
-+				ti,links = <4>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti964_des0ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					ti964_des0ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+					ti964_des0ep2: endpoint@2 {
-+						ti9x3-addr = <0x0e>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in2>;
-+					};
-+					ti964_des0ep3: endpoint@3 {
-+						ti9x3-addr = <0x0f>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in3>;
-+					};
-+				};
-+				port@1 {
-+					ti964_csi0ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB954 @ 0x38 */
-+			ti954-ti9x3@0 {
-+				compatible = "ti,ti954-ti9x3";
-+				reg = <0x38>;
-+				/* gpios = <&video_a_ext1 10 GPIO_ACTIVE_HIGH>; */
-+				ti,sensor_delay = <350>;
-+				ti,links = <2>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti954_des0ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					ti954_des0ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+				};
-+				port@1 {
-+					ti954_csi0ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+
-+			/* MAX9286 @ 0x2c */
-+			max9286-max9271@0 {
-+				compatible = "maxim,max9286-max9271";
-+				reg = <0x2c>;
-+				maxim,sensor_delay = <350>;
-+				maxim,links = <4>;
-+				maxim,lanes = <4>;
-+				maxim,resetb-gpio = <1>;
-+				maxim,fsync-mode = "automatic";
-+				maxim,timeout = <100>;
-+
-+				port@0 {
-+					max9286_des0ep0: endpoint@0 {
-+						max9271-addr = <0x50>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					max9286_des0ep1: endpoint@1 {
-+						max9271-addr = <0x51>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+					max9286_des0ep2: endpoint@2 {
-+						max9271-addr = <0x52>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in2>;
-+					};
-+					max9286_des0ep3: endpoint@3 {
-+						max9271-addr = <0x53>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in3>;
-+					};
-+				};
-+				port@1 {
-+					max9286_csi0ep0: endpoint {
-+						csi-rate = <700>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@2 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <2>;
-+			/* Slot B (CN11) */
-+
-+			ov106xx@4 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x64>;
-+
-+				port@0 {
-+					ov106xx_in4: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin4ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep0: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep0>;
-+					};
-+					ov106xx_ti964_des1ep0: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep0>;
-+					};
-+					ov106xx_ti954_des1ep0: endpoint@2 {
-+						remote-endpoint = <&ti954_des1ep0>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@5 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x65>;
-+
-+				port@0 {
-+					ov106xx_in5: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin5ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep1: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep1>;
-+					};
-+					ov106xx_ti964_des1ep1: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep1>;
-+					};
-+					ov106xx_ti954_des1ep1: endpoint@2 {
-+						remote-endpoint = <&ti954_des1ep1>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@6 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x66>;
-+
-+				port@0 {
-+					ov106xx_in6: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin6ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep2: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep2>;
-+					};
-+					ov106xx_ti964_des1ep2: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep2>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@7 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x67>;
-+
-+				port@0 {
-+					ov106xx_in7: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin7ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep3: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep3>;
-+					};
-+					ov106xx_ti964_des1ep3: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep3>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB964 @ 0x3a */
-+			ti964-ti9x3@1 {
-+				compatible = "ti,ti964-ti9x3";
-+				reg = <0x3a>;
-+				ti,sensor_delay = <350>;
-+				ti,links = <4>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti964_des1ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in4>;
-+					};
-+					ti964_des1ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in5>;
-+					};
-+					ti964_des1ep2: endpoint@2 {
-+						ti9x3-addr = <0x0e>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in6>;
-+					};
-+					ti964_des1ep3: endpoint@3 {
-+						ti9x3-addr = <0x0f>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in7>;
-+					};
-+				};
-+				port@1 {
-+					ti964_csi2ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_41_ep>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB954 @ 0x38 */
-+			ti954-ti9x3@1 {
-+				compatible = "ti,ti954-ti9x3";
-+				reg = <0x38>;
-+				/* gpios = <&video_b_ext1 10 GPIO_ACTIVE_HIGH>; */
-+				ti,sensor_delay = <350>;
-+				ti,links = <2>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti954_des1ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in4>;
-+					};
-+					ti954_des1ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in5>;
-+					};
-+				};
-+				port@1 {
-+					ti954_csi2ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_41_ep>;
-+					};
-+				};
-+			};
-+
-+			/* MAX9286 @ 0x2c */
-+			max9286-max9271@1 {
-+				compatible = "maxim,max9286-max9271";
-+				reg = <0x2c>;
-+				maxim,sensor_delay = <350>;
-+				maxim,links = <4>;
-+				maxim,lanes = <4>;
-+				maxim,resetb-gpio = <1>;
-+				maxim,fsync-mode = "automatic";
-+				maxim,timeout = <100>;
-+
-+				port@0 {
-+					max9286_des1ep0: endpoint@0 {
-+						max9271-addr = <0x50>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in4>;
-+					};
-+					max9286_des1ep1: endpoint@1 {
-+						max9271-addr = <0x51>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in5>;
-+					};
-+					max9286_des1ep2: endpoint@2 {
-+						max9271-addr = <0x52>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in6>;
-+					};
-+					max9286_des1ep3: endpoint@3 {
-+						max9271-addr = <0x53>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in7>;
-+					};
-+				};
-+				port@1 {
-+					max9286_csi2ep0: endpoint {
-+						csi-rate = <700>;
-+						remote-endpoint = <&csi2_41_ep>;
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@3 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <3>;
-+			/* MOST node(s) */
-+		};
-+
-+		i2c@6 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <6>;
-+			/* Slot B (CN11) */
-+
-+			video_b_ext0: pca9535@27 {
-+				compatible = "nxp,pca9535";
-+				reg = <0x27>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_b_des_cfg1 {
-+					gpio-hog;
-+					gpios = <5 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg1";
-+				};
-+				video_b_des_cfg0 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg0";
-+				};
-+				video_b_pwr_shdn {
-+					gpio-hog;
-+					gpios = <3 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR_SHDN";
-+				};
-+				video_b_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR0";
-+				};
-+				video_b_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR1";
-+				};
-+				video_b_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR2";
-+				};
-+				video_b_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <15 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR3";
-+				};
-+				video_b_des_shdn {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B DES_SHDN";
-+				};
-+				video_b_des_led {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-B led";
-+				};
-+			};
-+
-+			video_b_ext1: max7325@5c {
-+				compatible = "maxim,max7325";
-+				reg = <0x5c>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_b_des_cfg2 {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg2";
-+				};
-+				video_b_des_cfg1 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg1";
-+				};
-+				video_b_des_cfg0 {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg0";
-+				};
-+				video_b_pwr_shdn {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR_SHDN";
-+				};
-+				video_b_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <8 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR0";
-+				};
-+				video_b_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <9 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR1";
-+				};
-+				video_b_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <10 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR2";
-+				};
-+				video_b_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <11 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR3";
-+				};
-+				video_b_des_shdn {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B DES_SHDN";
-+				};
-+				video_b_led {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-B LED";
-+				};
-+			};
-+		};
-+
-+		i2c@7 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <7>;
-+			/* Slot A (CN10) */
-+
-+			video_a_ext0: pca9535@26 {
-+				compatible = "nxp,pca9535";
-+				reg = <0x26>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_a_des_cfg1 {
-+					gpio-hog;
-+					gpios = <5 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg1";
-+				};
-+				video_a_des_cfg0 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg0";
-+				};
-+				video_a_pwr_shdn {
-+					gpio-hog;
-+					gpios = <3 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR_SHDN";
-+				};
-+				video_a_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR0";
-+				};
-+				video_a_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR1";
-+				};
-+				video_a_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR2";
-+				};
-+				video_a_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <15 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR3";
-+				};
-+				video_a_des_shdn {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A DES_SHDN";
-+				};
-+				video_a_des_led {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-A led";
-+				};
-+			};
-+
-+			video_a_ext1: max7325@5c {
-+				compatible = "maxim,max7325";
-+				reg = <0x5c>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_a_des_cfg2 {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg2";
-+				};
-+				video_a_des_cfg1 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg1";
-+				};
-+				video_a_des_cfg0 {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg0";
-+				};
-+				video_a_pwr_shdn {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR_SHDN";
-+				};
-+				video_a_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <8 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR0";
-+				};
-+				video_a_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <9 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR1";
-+				};
-+				video_a_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <10 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR2";
-+				};
-+				video_a_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <11 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR3";
-+				};
-+				video_a_des_shdn {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A DES_SHDN";
-+				};
-+				video_a_led {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-A LED";
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&pcie_bus_clk {
-+	clock-frequency = <100000000>;
-+	status = "okay";
-+};
-+
-+&pciec0 {
-+	status = "okay";
-+};
-+
-+&pciec1 {
-+	status = "okay";
-+};
-+
-+&vin0 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin0ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <0>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in0>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep0: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin0_max9286_des0ep0: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep0>;
-+			};
-+			vin0_ti964_des0ep0: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep0>;
-+			};
-+			vin0_ti954_des0ep0: endpoint@2 {
-+				remote-endpoint = <&ti954_des0ep0>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin1 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin1ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <1>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in1>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep1: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin1_max9286_des0ep1: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep1>;
-+			};
-+			vin1_ti964_des0ep1: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep1>;
-+			};
-+			vin1_ti954_des0ep1: endpoint@2 {
-+				remote-endpoint = <&ti954_des0ep1>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin2 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin2ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <2>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in2>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep2: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin2_max9286_des0ep2: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep2>;
-+			};
-+			vin2_ti964_des0ep2: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep2>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin3 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin3ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <3>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in3>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep3: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin3_max9286_des0ep3: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep3>;
-+			};
-+			vin3_ti964_des0ep3: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep3>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin4 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin4ep0: endpoint {
-+				csi,select = "csi41";
-+				virtual,channel = <0>;
-+				remote-endpoint = <&ov106xx_in4>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep0: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin4_max9286_des1ep0: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep0>;
-+			};
-+			vin4_ti964_des1ep0: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep0>;
-+			};
-+			vin4_ti954_des1ep0: endpoint@2 {
-+				remote-endpoint = <&ti954_des1ep0>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin5 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin5ep0: endpoint@0 {
-+				csi,select = "csi41";
-+				virtual,channel = <1>;
-+				remote-endpoint = <&ov106xx_in5>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep1: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin5_max9286_des1ep1: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep1>;
-+			};
-+			vin5_ti964_des1ep1: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep1>;
-+			};
-+			vin5_ti954_des1ep1: endpoint@2 {
-+				remote-endpoint = <&ti954_des1ep1>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin6 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin6ep0: endpoint@0 {
-+				csi,select = "csi41";
-+				virtual,channel = <2>;
-+				remote-endpoint = <&ov106xx_in6>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep2: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin6_max9286_des1ep2: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep2>;
-+			};
-+			vin6_ti964_des1ep2: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep2>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin7 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin7ep0: endpoint@0 {
-+				csi,select = "csi41";
-+				virtual,channel = <3>;
-+				remote-endpoint = <&ov106xx_in7>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep3: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin7_max9286_des1ep3: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep3>;
-+			};
-+			vin7_ti964_des1ep3: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep3>;
-+			};
-+		};
-+	};
-+};
-+
-+&csi2_40 {
-+	status = "okay";
-+
-+	virtual,channel {
-+		csi2_vc0 {
-+			data,type = "ycbcr422";
-+			receive,vc = <0>;
-+		};
-+		csi2_vc1 {
-+			data,type = "ycbcr422";
-+			receive,vc = <1>;
-+		};
-+		csi2_vc2 {
-+			data,type = "ycbcr422";
-+			receive,vc = <2>;
-+		};
-+		csi2_vc3 {
-+			data,type = "ycbcr422";
-+			receive,vc = <3>;
-+		};
-+	};
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		csi2_40_ep: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2 3 4>;
-+			csi-rate = <300>;
-+		};
-+	};
-+};
-+
-+&csi2_41 {
-+	status = "okay";
-+
-+	virtual,channel {
-+		csi2_vc0 {
-+			data,type = "ycbcr422";
-+			receive,vc = <0>;
-+		};
-+		csi2_vc1 {
-+			data,type = "ycbcr422";
-+			receive,vc = <1>;
-+		};
-+		csi2_vc2 {
-+			data,type = "ycbcr422";
-+			receive,vc = <2>;
-+		};
-+		csi2_vc3 {
-+			data,type = "ycbcr422";
-+			receive,vc = <3>;
-+		};
-+	};
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		csi2_41_ep: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2 3 4>;
-+			csi-rate = <300>;
-+		};
-+	};
-+};
-+
-+&rcar_sound {
-+	pinctrl-0 = <&sound_clk_pins>;
-+	pinctrl-names = "default";
-+
-+	/* Multi DAI */
-+	#sound-dai-cells = <1>;
-+
-+	rcar_sound,dai {
-+		dai0 {
-+			playback = <&ssi3>;
-+			capture  = <&ssi4>;
-+		};
-+
-+		dai1 {
-+			playback = <&ssi0 &src0 &dvc0>;
-+			capture  = <&ssi1 &src1 &dvc1>;
-+		};
-+
-+		dai2 {
-+			capture  = <&ssi6>;
-+		};
-+
-+		dai3 {
-+			playback = <&ssi7>;
-+			capture  = <&ssi8>;
-+		};
-+	};
-+};
-+
-+&sdhi3 {
-+	pinctrl-0 = <&sdhi3_pins_3v3>;
-+	pinctrl-1 = <&sdhi3_pins_1v8>;
-+	pinctrl-names = "default", "state_uhs";
-+
-+	vmmc-supply = <&wlan_en>;
-+	vqmmc-supply = <&vccq_sdhi3>;
-+	keep-power-in-suspend;
-+	enable-sdio-wakeup;
-+	bus-width = <4>;
-+	no-1-8-v;
-+	non-removable;
-+	cap-power-off-card;
-+	max-frequency = <26000000>;
-+	status = "okay";
-+
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	wlcore: wlcore@2 {
-+		compatible = "ti,wl1837";
-+		reg = <2>;
-+		interrupt-parent = <&gpio1>;
-+		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
-+	};
-+};
-+
-+&usb2_phy0 {
-+	pinctrl-0 = <&usb0_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
 +&hsusb {
 +	status = "okay";
 +};
 +
-+&ehci0 {
-+	status = "okay";
-+};
-+
-+&ohci0 {
-+	status = "okay";
-+};
-+
-+&xhci0 {
-+	status = "okay";
-+};
-+
-+&msiof1 {
-+	status = "disabled";
-+};
-+
-+&can0 {
-+	pinctrl-0 = <&can0_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
-+
-+	renesas,can-clock-select = <0x0>;
-+};
-+
-+&can1 {
-+	pinctrl-0 = <&can1_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
-+
-+	renesas,can-clock-select = <0x0>;
-+};
-+
-+&canfd {
-+	pinctrl-0 = <&canfd0_pins &canfd1_pins>;
-+	pinctrl-names = "default";
-+	status = "disabled";
-+
-+	channel0 {
-+		status = "okay";
-+	};
-+
-+	channel1 {
-+		status = "okay";
-+	};
-+};
-+
-+&ssi4 {
-+	shared-pin;
-+};
-+
-+&ssi8 {
-+	shared-pin;
-+};
-+
-+&pciec1 {
-+	pcie3v3-supply = <&mpcie_3v3>;
-+	pcie1v8-supply = <&mpcie_1v8>;
-+};
-+
-+/* uncomment to enable CN47: SD on SDHI3 */
-+//#include "ulcb-kf-sd3.dtsi"
-+/* CN48 (Raspberry Pi) on VIN4 */
-+//#include "ulcb-kf-rpi.dtsi"
-+/* CN29: (CMOS camera) on VIN5 */
-+//#include "ulcb-kf-cmos.dtsi"
++/* use CN11 instead default CN29/CN48 (H3 only) */
++//#include "ulcb-kf-cn11.dtsi"
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-vb.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-vb.dts
 new file mode 100644
 index 0000000..e5734aa
@@ -11606,10 +9872,10 @@ index 0000000..4a00426
 +};
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
 new file mode 100644
-index 0000000..6193129
+index 0000000..4fe67f8
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
-@@ -0,0 +1,1941 @@
+@@ -0,0 +1,39 @@
 +/*
 + * Device Tree Source for the H3ULCB Kingfisher board on r8a7795
 + *
@@ -11622,372 +9888,13 @@ index 0000000..6193129
 + */
 +
 +#include "r8a7795-h3ulcb.dts"
++#include "ulcb-kf.dtsi"
 +
 +/ {
 +	model = "Renesas H3ULCB Kingfisher board based on r8a7795";
-+
-+	aliases {
-+		serial1 = &hscif0;
-+		serial2 = &hscif1;
-+		serial3 = &scif1;
-+	};
-+
-+	snd_clk: snd_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-frequency = <24576000>;
-+		clock-output-names = "scki";
-+	};
-+
-+	wlan_en: regulator@4 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "wlan-en-regulator";
-+
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 4 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	vcc_sdhi3: regulator@41 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "SDHI3 Vcc";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio4 17 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	vccq_sdhi3: regulator@5 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "SDHI3 VccQ";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+	};
-+
-+	codec_en_reg: regulator@6 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "codec-en-regulator";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 15 0>;
-+
-+		/* delay - CHECK */
-+		startup-delay-us = <70000>;
-+		enable-active-high;
-+	};
-+
-+	amp_en_reg: regulator@7 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "amp-en-regulator";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 0 0>;
-+
-+		startup-delay-us = <0>;
-+		enable-active-high;
-+	};
-+
-+	sdio_switch: regulator@9 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "wifi_on";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_74 5 0>;
-+		enable-active-low;
-+		regulator-always-on;
-+	};
-+
-+	radio_switch: regulator@11 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "radio_on";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_74 13 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+		regulator-always-on;
-+	};
-+
-+	mpcie_3v3: regulator@12 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "mPCIe 3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_77 14 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	mpcie_1v8: regulator@13 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "mPCIe 1v8";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		gpio = <&gpio_ext_77 15 GPIO_ACTIVE_HIGH>;
-+		startup-delay-us = <200000>;
-+		enable-active-high;
-+	};
-+
-+	kim {
-+		compatible = "kim";
-+		shutdown-gpios = <&gpio_ext_74 3 GPIO_ACTIVE_HIGH>;
-+		/* serial1 */
-+		dev_name = "/dev/ttySC1";
-+		flow_cntrl = <1>;
-+		/* int div 8 hscif@26.6666656MHz */
-+		baud_rate = <3333332>;
-+	};
-+
-+	btwilink {
-+		compatible = "btwilink";
-+	};
-+
-+	sound_ext: sound@0 {
-+		pinctrl-0 = <&sound_0_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "left_j";
-+		simple-audio-card,name = "pcm3168a";
-+
-+		simple-audio-card,bitclock-master = <&sound_ext_master>;
-+		simple-audio-card,frame-master = <&sound_ext_master>;
-+		sound_ext_master: simple-audio-card,cpu@0 {
-+			sound-dai = <&rcar_sound 0>;
-+			dai-tdm-slot-num = <8>;
-+			dai-tdm-slot-width = <32>;
-+		};
-+
-+		simple-audio-card,codec@0 {
-+			sound-dai = <&pcm3168a>;
-+			dai-tdm-slot-num = <8>;
-+			dai-tdm-slot-width = <32>;
-+			system-clock-frequency = <24576000>;
-+		};
-+	};
-+
-+	/delete-node/sound;
-+
-+	rsnd_ak4613: sound@1 {
-+		pinctrl-0 = <&sound_1_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "left_j";
-+		simple-audio-card,name = "ak4613";
-+
-+		simple-audio-card,bitclock-master = <&sndcpu>;
-+		simple-audio-card,frame-master = <&sndcpu>;
-+
-+		sndcpu: simple-audio-card,cpu@1 {
-+			sound-dai = <&rcar_sound 1>;
-+		};
-+
-+		sndcodec: simple-audio-card,codec@1 {
-+			sound-dai = <&ak4613>;
-+		};
-+	};
-+
-+	sound_radio: sound@2 {
-+		pinctrl-0 = <&sound_2_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "radio";
-+
-+		simple-audio-card,bitclock-master = <&sound_radio_master>;
-+		simple-audio-card,frame-master = <&sound_radio_master>;
-+		simple-audio-card,cpu@2 {
-+			sound-dai = <&rcar_sound 2>;
-+		};
-+
-+		sound_radio_master: simple-audio-card,codec@2 {
-+			sound-dai = <&radio>;
-+			system-clock-frequency = <12288000>;
-+		};
-+	};
-+
-+	sound_wl18xx: sound@3 {
-+		pinctrl-0 = <&sound_3_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "wl18xx";
-+
-+		simple-audio-card,bitclock-master = <&sound_wl18xx_master>;
-+		simple-audio-card,frame-master = <&sound_wl18xx_master>;
-+		sound_wl18xx_master: simple-audio-card,cpu@3 {
-+			sound-dai = <&rcar_sound 3>;
-+		};
-+
-+		simple-audio-card,codec@3 {
-+			sound-dai = <&wl18xx_pcm>;
-+		};
-+	};
-+
-+	lvds-encoder {
-+		compatible = "thine,thc63lvdm83d";
-+
-+		ports {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			port@0 {
-+				reg = <0>;
-+				lvds_enc_in: endpoint {
-+					remote-endpoint = <&du_out_lvds0>;
-+				};
-+			};
-+			port@1 {
-+				reg = <1>;
-+				lvds_enc_out: endpoint {
-+					remote-endpoint = <&lvds_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	lvds {
-+		compatible = "lvds-connector";
-+
-+		width-mm = <210>;
-+		height-mm = <158>;
-+
-+		panel-timing {
-+			/* 1280x800 @60Hz */
-+			clock-frequency = <65000000>;
-+			hactive = <1280>;
-+			vactive = <800>;
-+			hsync-len = <40>;
-+			hfront-porch = <80>;
-+			hback-porch = <40>;
-+			vfront-porch = <14>;
-+			vback-porch = <14>;
-+			vsync-len = <4>;
-+		};
-+
-+		port {
-+			lvds_in: endpoint {
-+				remote-endpoint = <&lvds_enc_out>;
-+			};
-+		};
-+	};
-+
-+	hdmi-out {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con: endpoint {
-+				remote-endpoint = <&adv7513_out>;
-+			};
-+		};
-+	};
-+
-+	radio: si468x@0 {
-+		compatible = "si,si468x-pcm";
-+		status = "okay";
-+
-+		#sound-dai-cells = <0>;
-+	};
-+
-+	wl18xx_pcm: wl18xx_pcm@0 {
-+		compatible = "ti,wl18xx-pcm";
-+		status = "okay";
-+
-+		#sound-dai-cells = <0>;
-+	};
-+};
-+
-+&pfc {
-+	scif1_pins: scif1 {
-+		groups = "scif1_data_b";
-+		function = "scif1";
-+	};
-+
-+	hscif0_pins: hscif0 {
-+		groups = "hscif0_data", "hscif0_ctrl";
-+		function = "hscif0";
-+	};
-+
-+	hscif1_pins: hscif1 {
-+		groups = "hscif1_data_a", "hscif1_ctrl_a";
-+		function = "hscif1";
-+	};
-+
-+	du_pins: du {
-+		groups = "du_rgb888", "du_sync", "du_clk_out_0", "du_disp";
-+		function = "du";
-+	};
-+
-+	sdhi3_pins_3v3: sd3_3v3 {
-+		groups = "sdhi3_data4", "sdhi3_ctrl";
-+		function = "sdhi3";
-+		power-source = <3300>;
-+	};
-+
-+	sdhi3_pins_1v8: sd3_1v8 {
-+		groups = "sdhi3_data4", "sdhi3_ctrl";
-+		function = "sdhi3";
-+		power-source = <1800>;
-+	};
-+
-+	sound_0_pins: sound0 {
-+		groups = "ssi34_ctrl", "ssi3_data", "ssi4_data";
-+		function = "ssi";
-+	};
-+
-+	sound_1_pins: sound1 {
-+		groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";
-+		function = "ssi";
-+	};
-+
-+	sound_2_pins: sound2 {
-+		groups = "ssi6_ctrl", "ssi6_data";
-+		function = "ssi";
-+	};
-+
-+	sound_3_pins: sound3 {
-+		groups = "ssi78_ctrl", "ssi7_data", "ssi8_data";
-+		function = "ssi";
-+	};
-+
-+	usb0_pins: usb0 {
-+		groups = "usb0";
-+		function = "usb0";
-+	};
-+
-+	can0_pins: can0 {
-+		groups = "can0_data_a";
-+		function = "can0";
-+	};
-+
-+	can1_pins: can1 {
-+		groups = "can1_data";
-+		function = "can1";
-+	};
-+
-+	canfd0_pins: canfd0 {
-+		groups = "canfd0_data_a";
-+		function = "canfd0";
-+	};
-+
-+	canfd1_pins: canfd1 {
-+		groups = "canfd1_data";
-+		function = "canfd1";
-+	};
 +};
 +
 +&du {
-+	pinctrl-0 = <&du_pins>;
-+	pinctrl-names = "default";
-+
 +	ports {
 +		port@0 {
 +			endpoint {
@@ -12002,1555 +9909,12 @@ index 0000000..6193129
 +	};
 +};
 +
-+&gpio2 {
-+	bl_pwm {
-+		gpio-hog;
-+		gpios = <3 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+		line-name = "BL PWM 100%";
-+	};
-+};
-+
-+&gpio6 {
-+	audio_sw {
-+		gpio-hog;
-+		gpios = <21 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+		line-name = "Onboard MCh Audio";
-+	};
-+};
-+
-+&scif1 {
-+	pinctrl-0 = <&scif1_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
-+&hscif0 {
-+	pinctrl-0 = <&hscif0_pins>;
-+	pinctrl-names = "default";
-+	uart-has-rtscts;
-+
-+	status = "okay";
-+};
-+
-+&hscif1 {
-+	pinctrl-0 = <&hscif1_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
-+&i2c2 {
-+	clock-frequency = <400000>;
-+
-+	gpio_ext_74: pca9539@74 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x74>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio6>;
-+		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
-+
-+		hub_pwen {
-+			gpio-hog;
-+			gpios = <6 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "HUB pwen";
-+		};
-+		hub_rst {
-+			gpio-hog;
-+			gpios = <7 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "HUB rst";
-+		};
-+		otg_offvbus {
-+			gpio-hog;
-+			gpios = <8 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "OTG off VBUSn";
-+		};
-+		otg_extlpn {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "OTG EXTLPn";
-+		};
-+		otg_stat1 {
-+			gpio-hog;
-+			gpios = <10 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "OTG Stat1";
-+		};
-+		otg_stat2 {
-+			gpio-hog;
-+			gpios = <11 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "OTG Stat2";
-+		};
-+	};
-+
-+	gpio_ext_75: pca9539@75 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x75>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio6>;
-+		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
-+
-+		gps_rst {
-+			gpio-hog;
-+			gpios = <6 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "GPS rst";
-+		};
-+		fpdl_shdn {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "FPDLink shdn";
-+		};
-+	};
-+
-+	i2cswitch2: pca9548@74 {
-+		compatible = "nxp,pca9548";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x71>;
-+		reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
-+
-+		i2c@0 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <0>;
-+			/* BCM node(s) */
-+		};
-+
-+		i2c@1 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <1>;
-+			/* USB3.0 HUB node(s) */
-+		};
-+
-+		i2c@2 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <2>;
-+			/* Power amp node(s) */
-+		};
-+
-+		i2c@3 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <3>;
-+			/* Radio node(s) */
-+		};
-+
-+		i2c@4 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <4>;
-+
-+			hdmi@3d {
-+				compatible = "adi,adv7511w";
-+				reg = <0x3d>;
-+//				interrupt-parent = <&gpio2>;
-+//				interrupts = <0 IRQ_TYPE_EDGE_BOTH>;
-+				pd-gpios = <&gpio_ext_75 5 GPIO_ACTIVE_LOW>;
-+
-+				adi,input-depth = <8>;
-+				adi,input-colorspace = "rgb";
-+				adi,input-clock = "1x";
-+				adi,input-style = <1>;
-+				adi,input-justification = "evenly";
-+				adi,clock-delay = <1200>;
-+				adi,clock-max-rate = <100000>;
-+
-+				ports {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					port@0 {
-+						reg = <0>;
-+						adv7513_in: endpoint {
-+							remote-endpoint = <&du_out_rgb>;
-+						};
-+					};
-+
-+					port@1 {
-+						reg = <1>;
-+						adv7513_out: endpoint {
-+							remote-endpoint = <&hdmi_con>;
-+						};
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@5 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <5>;
-+			/* PCIe node(s) */
-+		};
-+
-+		i2c@6 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <6>;
-+			/* LVDS display node(s) */
-+
-+			polytouch: edt-ft5x06@38 {
-+				compatible = "edt,edt-ft5x06";
-+				reg = <0x38>;
-+				interrupt-parent = <&gpio5>;
-+				interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
-+			};
-+		};
-+
-+		i2c@7 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <7>;
-+			/* Audio, GPS and Gyro node(s) */
-+
-+			pcm3168a: audio-codec@44 {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm3168a";
-+				reg = <0x44>;
-+				clocks = <&snd_clk>;
-+				clock-names = "scki";
-+				tdm;
-+				VDD1-supply = <&codec_en_reg>;
-+				VDD2-supply = <&codec_en_reg>;
-+				VCCAD1-supply = <&codec_en_reg>;
-+				VCCAD2-supply = <&codec_en_reg>;
-+				VCCDA1-supply = <&amp_en_reg>;
-+				VCCDA2-supply = <&amp_en_reg>;
-+			};
-+
-+			lsm9ds0_acc_mag@1d {
-+				compatible = "st,lsm9ds0_accel_magn";
-+				reg = <0x1d>;
-+			};
-+
-+			lsm9ds0_gyr@6b {
-+				compatible = "st,lsm9ds0_gyro";
-+				reg = <0x6b>;
-+			};
-+
-+			/* GPS@ 0x42 */
-+		};
-+	};
-+};
-+
-+&i2c4 {
-+	gpio_ext_76: pca9539@76 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x76>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio7>;
-+		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
-+
-+		port_b_a0 {
-+			gpio-hog;
-+			gpios = <0 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "Video-B A0";
-+		};
-+		port_b_a1 {
-+			gpio-hog;
-+			gpios = <1 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "Video-B A1";
-+		};
-+		port_a_a0 {
-+			gpio-hog;
-+			gpios = <2 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "Video-A A0";
-+		};
-+		port_a_a1 {
-+			gpio-hog;
-+			gpios = <3 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "Video-A A1";
-+		};
-+		cmos_pwdn {
-+			gpio-hog;
-+			gpios = <8 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "CMOS PWDN";
-+		};
-+		cmos_rst {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "CMOS RST";
-+		};
-+		/* pin 12 - CAM_CLK */
-+		rpi_cam_io_1 {
-+			gpio-hog;
-+			gpios = <10 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "RaspB_IO1";
-+		};
-+		/* pin 11 - CAM_GPIO - assume pwdn */
-+		rpi_cam_io_0 {
-+			gpio-hog;
-+			gpios = <11 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "RaspB_IO0";
-+		};
-+		sam_rst {
-+			gpio-hog;
-+			gpios = <4 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "SAM RST";
-+		};
-+		sam_pwr {
-+			gpio-hog;
-+			gpios = <5 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "SAM PWR";
-+		};
-+		/* 0 - FPDLink output, 1 - LVDS output */
-+		lvds_vs_fpdl {
-+			gpio-hog;
-+			gpios = <14 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "LVDS switch";
-+		};
-+	};
-+
-+	gpio_ext_77: pca9539@77 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x77>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio5>;
-+		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
-+
-+		mpcie_wake {
-+			gpio-hog;
-+			gpios = <0 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "mPCIe WAKE#";
-+		};
-+		mpcie_wdisable {
-+			gpio-hog;
-+			gpios = <1 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "mPCIe W_DISABLE";
-+		};
-+		mpcie_clreq {
-+			gpio-hog;
-+			gpios = <2 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "mPCIe CLKREQ#";
-+		};
-+		mpcie_ovc {
-+			gpio-hog;
-+			gpios = <3 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "mPCIe OVC";
-+		};
-+	};
-+
-+	i2cswitch4: pca9548@74 {
-+		compatible = "nxp,pca9548";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x71>;
-+		reset-gpios= <&gpio3 15 GPIO_ACTIVE_LOW>;
-+
-+		i2c@0 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <0>;
-+			/* SAM node(s) */
-+		};
-+
-+		i2c@1 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <1>;
-+			/* Slot A (CN10) */
-+
-+			ov106xx@0 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x60>;
-+
-+				port@0 {
-+					ov106xx_in0: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin0ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep0: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep0>;
-+					};
-+					ov106xx_ti964_des0ep0: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep0>;
-+					};
-+					ov106xx_ti954_des0ep0: endpoint@2 {
-+						remote-endpoint = <&ti954_des0ep0>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@1 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x61>;
-+
-+				port@0 {
-+					ov106xx_in1: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin1ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep1: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep1>;
-+					};
-+					ov106xx_ti964_des0ep1: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep1>;
-+					};
-+					ov106xx_ti954_des0ep1: endpoint@2 {
-+						remote-endpoint = <&ti954_des0ep1>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@2 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x62>;
-+
-+				port@0 {
-+					ov106xx_in2: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin2ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep2: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep2>;
-+					};
-+					ov106xx_ti964_des0ep2: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep2>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@3 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x63>;
-+
-+				port@0 {
-+					ov106xx_in3: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin3ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep3: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep3>;
-+					};
-+					ov106xx_ti964_des0ep3: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep3>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB964 @ 0x3a */
-+			ti964-ti9x3@0 {
-+				compatible = "ti,ti964-ti9x3";
-+				reg = <0x3a>;
-+				ti,sensor_delay = <350>;
-+				ti,links = <4>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti964_des0ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					ti964_des0ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+					ti964_des0ep2: endpoint@2 {
-+						ti9x3-addr = <0x0e>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in2>;
-+					};
-+					ti964_des0ep3: endpoint@3 {
-+						ti9x3-addr = <0x0f>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in3>;
-+					};
-+				};
-+				port@1 {
-+					ti964_csi0ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB954 @ 0x38 */
-+			ti954-ti9x3@0 {
-+				compatible = "ti,ti954-ti9x3";
-+				reg = <0x38>;
-+				/* gpios = <&video_a_ext1 10 GPIO_ACTIVE_HIGH>; */
-+				ti,sensor_delay = <350>;
-+				ti,links = <2>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti954_des0ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					ti954_des0ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+				};
-+				port@1 {
-+					ti954_csi0ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+
-+			/* MAX9286 @ 0x2c */
-+			max9286-max9271@0 {
-+				compatible = "maxim,max9286-max9271";
-+				reg = <0x2c>;
-+				maxim,sensor_delay = <350>;
-+				maxim,links = <4>;
-+				maxim,lanes = <4>;
-+				maxim,resetb-gpio = <1>;
-+				maxim,fsync-mode = "automatic";
-+				maxim,timeout = <100>;
-+
-+				port@0 {
-+					max9286_des0ep0: endpoint@0 {
-+						max9271-addr = <0x50>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					max9286_des0ep1: endpoint@1 {
-+						max9271-addr = <0x51>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+					max9286_des0ep2: endpoint@2 {
-+						max9271-addr = <0x52>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in2>;
-+					};
-+					max9286_des0ep3: endpoint@3 {
-+						max9271-addr = <0x53>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in3>;
-+					};
-+				};
-+				port@1 {
-+					max9286_csi0ep0: endpoint {
-+						csi-rate = <700>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@2 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <2>;
-+			/* Slot B (CN11) */
-+
-+			ov106xx@4 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x64>;
-+
-+				port@0 {
-+					ov106xx_in4: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin4ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep0: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep0>;
-+					};
-+					ov106xx_ti964_des1ep0: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep0>;
-+					};
-+					ov106xx_ti954_des1ep0: endpoint@2 {
-+						remote-endpoint = <&ti954_des1ep0>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@5 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x65>;
-+
-+				port@0 {
-+					ov106xx_in5: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin5ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep1: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep1>;
-+					};
-+					ov106xx_ti964_des1ep1: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep1>;
-+					};
-+					ov106xx_ti954_des1ep1: endpoint@2 {
-+						remote-endpoint = <&ti954_des1ep1>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@6 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x66>;
-+
-+				port@0 {
-+					ov106xx_in6: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin6ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep2: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep2>;
-+					};
-+					ov106xx_ti964_des1ep2: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep2>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@7 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x67>;
-+
-+				port@0 {
-+					ov106xx_in7: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin7ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des1ep3: endpoint@0 {
-+						remote-endpoint = <&max9286_des1ep3>;
-+					};
-+					ov106xx_ti964_des1ep3: endpoint@1 {
-+						remote-endpoint = <&ti964_des1ep3>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB964 @ 0x3a */
-+			ti964-ti9x3@1 {
-+				compatible = "ti,ti964-ti9x3";
-+				reg = <0x3a>;
-+				ti,sensor_delay = <350>;
-+				ti,links = <4>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti964_des1ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in4>;
-+					};
-+					ti964_des1ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in5>;
-+					};
-+					ti964_des1ep2: endpoint@2 {
-+						ti9x3-addr = <0x0e>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in6>;
-+					};
-+					ti964_des1ep3: endpoint@3 {
-+						ti9x3-addr = <0x0f>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in7>;
-+					};
-+				};
-+				port@1 {
-+					ti964_csi2ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_41_ep>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB954 @ 0x38 */
-+			ti954-ti9x3@1 {
-+				compatible = "ti,ti954-ti9x3";
-+				reg = <0x38>;
-+				/* gpios = <&video_b_ext1 10 GPIO_ACTIVE_HIGH>; */
-+				ti,sensor_delay = <350>;
-+				ti,links = <2>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti954_des1ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in4>;
-+					};
-+					ti954_des1ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in5>;
-+					};
-+				};
-+				port@1 {
-+					ti954_csi2ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_41_ep>;
-+					};
-+				};
-+			};
-+
-+			/* MAX9286 @ 0x2c */
-+			max9286-max9271@1 {
-+				compatible = "maxim,max9286-max9271";
-+				reg = <0x2c>;
-+				maxim,sensor_delay = <350>;
-+				maxim,links = <4>;
-+				maxim,lanes = <4>;
-+				maxim,resetb-gpio = <1>;
-+				maxim,fsync-mode = "automatic";
-+				maxim,timeout = <100>;
-+
-+				port@0 {
-+					max9286_des1ep0: endpoint@0 {
-+						max9271-addr = <0x50>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in4>;
-+					};
-+					max9286_des1ep1: endpoint@1 {
-+						max9271-addr = <0x51>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in5>;
-+					};
-+					max9286_des1ep2: endpoint@2 {
-+						max9271-addr = <0x52>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in6>;
-+					};
-+					max9286_des1ep3: endpoint@3 {
-+						max9271-addr = <0x53>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in7>;
-+					};
-+				};
-+				port@1 {
-+					max9286_csi2ep0: endpoint {
-+						csi-rate = <700>;
-+						remote-endpoint = <&csi2_41_ep>;
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@3 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <3>;
-+			/* MOST node(s) */
-+		};
-+
-+		i2c@6 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <6>;
-+			/* Slot B (CN11) */
-+
-+			video_b_ext0: pca9535@27 {
-+				compatible = "nxp,pca9535";
-+				reg = <0x27>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_b_des_cfg1 {
-+					gpio-hog;
-+					gpios = <5 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg1";
-+				};
-+				video_b_des_cfg0 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg0";
-+				};
-+				video_b_pwr_shdn {
-+					gpio-hog;
-+					gpios = <3 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR_SHDN";
-+				};
-+				video_b_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR0";
-+				};
-+				video_b_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR1";
-+				};
-+				video_b_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR2";
-+				};
-+				video_b_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <15 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR3";
-+				};
-+				video_b_des_shdn {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B DES_SHDN";
-+				};
-+				video_b_des_led {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-B led";
-+				};
-+			};
-+
-+			video_b_ext1: max7325@5c {
-+				compatible = "maxim,max7325";
-+				reg = <0x5c>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_b_des_cfg2 {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg2";
-+				};
-+				video_b_des_cfg1 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg1";
-+				};
-+				video_b_des_cfg0 {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-B cfg0";
-+				};
-+				video_b_pwr_shdn {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR_SHDN";
-+				};
-+				video_b_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <8 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR0";
-+				};
-+				video_b_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <9 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR1";
-+				};
-+				video_b_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <10 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR2";
-+				};
-+				video_b_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <11 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B PWR3";
-+				};
-+				video_b_des_shdn {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-B DES_SHDN";
-+				};
-+				video_b_led {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-B LED";
-+				};
-+			};
-+		};
-+
-+		i2c@7 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <7>;
-+			/* Slot A (CN10) */
-+
-+			video_a_ext0: pca9535@26 {
-+				compatible = "nxp,pca9535";
-+				reg = <0x26>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_a_des_cfg1 {
-+					gpio-hog;
-+					gpios = <5 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg1";
-+				};
-+				video_a_des_cfg0 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg0";
-+				};
-+				video_a_pwr_shdn {
-+					gpio-hog;
-+					gpios = <3 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR_SHDN";
-+				};
-+				video_a_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR0";
-+				};
-+				video_a_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR1";
-+				};
-+				video_a_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR2";
-+				};
-+				video_a_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <15 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR3";
-+				};
-+				video_a_des_shdn {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A DES_SHDN";
-+				};
-+				video_a_des_led {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-A led";
-+				};
-+			};
-+
-+			video_a_ext1: max7325@5c {
-+				compatible = "maxim,max7325";
-+				reg = <0x5c>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_a_des_cfg2 {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg2";
-+				};
-+				video_a_des_cfg1 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg1";
-+				};
-+				video_a_des_cfg0 {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg0";
-+				};
-+				video_a_pwr_shdn {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR_SHDN";
-+				};
-+				video_a_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <8 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR0";
-+				};
-+				video_a_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <9 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR1";
-+				};
-+				video_a_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <10 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR2";
-+				};
-+				video_a_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <11 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR3";
-+				};
-+				video_a_des_shdn {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A DES_SHDN";
-+				};
-+				video_a_led {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-A LED";
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&pcie_bus_clk {
-+	clock-frequency = <100000000>;
-+	status = "okay";
-+};
-+
-+&pciec0 {
-+	status = "okay";
-+};
-+
-+&pciec1 {
-+	status = "okay";
-+};
-+
-+&vin0 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin0ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <0>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in0>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep0: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin0_max9286_des0ep0: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep0>;
-+			};
-+			vin0_ti964_des0ep0: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep0>;
-+			};
-+			vin0_ti954_des0ep0: endpoint@2 {
-+				remote-endpoint = <&ti954_des0ep0>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin1 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin1ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <1>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in1>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep1: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin1_max9286_des0ep1: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep1>;
-+			};
-+			vin1_ti964_des0ep1: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep1>;
-+			};
-+			vin1_ti954_des0ep1: endpoint@2 {
-+				remote-endpoint = <&ti954_des0ep1>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin2 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin2ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <2>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in2>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep2: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin2_max9286_des0ep2: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep2>;
-+			};
-+			vin2_ti964_des0ep2: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep2>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin3 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin3ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <3>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in3>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep3: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin3_max9286_des0ep3: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep3>;
-+			};
-+			vin3_ti964_des0ep3: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep3>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin4 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin4ep0: endpoint {
-+				csi,select = "csi41";
-+				virtual,channel = <0>;
-+				remote-endpoint = <&ov106xx_in4>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep0: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin4_max9286_des1ep0: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep0>;
-+			};
-+			vin4_ti964_des1ep0: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep0>;
-+			};
-+			vin4_ti954_des1ep0: endpoint@2 {
-+				remote-endpoint = <&ti954_des1ep0>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin5 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin5ep0: endpoint@0 {
-+				csi,select = "csi41";
-+				virtual,channel = <1>;
-+				remote-endpoint = <&ov106xx_in5>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep1: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin5_max9286_des1ep1: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep1>;
-+			};
-+			vin5_ti964_des1ep1: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep1>;
-+			};
-+			vin5_ti954_des1ep1: endpoint@2 {
-+				remote-endpoint = <&ti954_des1ep1>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin6 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin6ep0: endpoint@0 {
-+				csi,select = "csi41";
-+				virtual,channel = <2>;
-+				remote-endpoint = <&ov106xx_in6>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep2: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin6_max9286_des1ep2: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep2>;
-+			};
-+			vin6_ti964_des1ep2: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep2>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin7 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin7ep0: endpoint@0 {
-+				csi,select = "csi41";
-+				virtual,channel = <3>;
-+				remote-endpoint = <&ov106xx_in7>;
-+				data-lanes = <1 2 3 4>;
-+			};
-+		};
-+		port@1 {
-+			csi2ep3: endpoint {
-+				remote-endpoint = <&csi2_41_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin7_max9286_des1ep3: endpoint@0 {
-+				remote-endpoint = <&max9286_des1ep3>;
-+			};
-+			vin7_ti964_des1ep3: endpoint@1 {
-+				remote-endpoint = <&ti964_des1ep3>;
-+			};
-+		};
-+	};
-+};
-+
-+&csi2_40 {
-+	status = "okay";
-+
-+	virtual,channel {
-+		csi2_vc0 {
-+			data,type = "ycbcr422";
-+			receive,vc = <0>;
-+		};
-+		csi2_vc1 {
-+			data,type = "ycbcr422";
-+			receive,vc = <1>;
-+		};
-+		csi2_vc2 {
-+			data,type = "ycbcr422";
-+			receive,vc = <2>;
-+		};
-+		csi2_vc3 {
-+			data,type = "ycbcr422";
-+			receive,vc = <3>;
-+		};
-+	};
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		csi2_40_ep: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2 3 4>;
-+			csi-rate = <300>;
-+		};
-+	};
-+};
-+
-+&csi2_41 {
-+	status = "okay";
-+
-+	virtual,channel {
-+		csi2_vc0 {
-+			data,type = "ycbcr422";
-+			receive,vc = <0>;
-+		};
-+		csi2_vc1 {
-+			data,type = "ycbcr422";
-+			receive,vc = <1>;
-+		};
-+		csi2_vc2 {
-+			data,type = "ycbcr422";
-+			receive,vc = <2>;
-+		};
-+		csi2_vc3 {
-+			data,type = "ycbcr422";
-+			receive,vc = <3>;
-+		};
-+	};
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		csi2_41_ep: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2 3 4>;
-+			csi-rate = <300>;
-+		};
-+	};
-+};
-+
-+&rcar_sound {
-+	pinctrl-0 = <&sound_clk_pins>;
-+	pinctrl-names = "default";
-+
-+	/* Multi DAI */
-+	#sound-dai-cells = <1>;
-+
-+	rcar_sound,dai {
-+		dai0 {
-+			playback = <&ssi3>;
-+			capture  = <&ssi4>;
-+		};
-+
-+		dai1 {
-+			playback = <&ssi0 &src0 &dvc0>;
-+			capture  = <&ssi1 &src1 &dvc1>;
-+		};
-+
-+		dai2 {
-+			capture  = <&ssi6>;
-+		};
-+
-+		dai3 {
-+			playback = <&ssi7>;
-+			capture  = <&ssi8>;
-+		};
-+	};
-+};
-+
-+&sdhi3 {
-+	pinctrl-0 = <&sdhi3_pins_3v3>;
-+	pinctrl-1 = <&sdhi3_pins_1v8>;
-+	pinctrl-names = "default", "state_uhs";
-+
-+	vmmc-supply = <&wlan_en>;
-+	vqmmc-supply = <&vccq_sdhi3>;
-+	keep-power-in-suspend;
-+	enable-sdio-wakeup;
-+	bus-width = <4>;
-+	no-1-8-v;
-+	non-removable;
-+	cap-power-off-card;
-+	max-frequency = <26000000>;
-+	status = "okay";
-+
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	wlcore: wlcore@2 {
-+		compatible = "ti,wl1837";
-+		reg = <2>;
-+		interrupt-parent = <&gpio1>;
-+		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
-+	};
-+};
-+
-+&usb2_phy0 {
-+	pinctrl-0 = <&usb0_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
 +&hsusb0 {
 +	status = "okay";
 +};
 +
-+&ehci0 {
-+	status = "okay";
-+};
-+
-+&ohci0 {
-+	status = "okay";
-+};
-+
-+&xhci0 {
-+	status = "okay";
-+};
-+
-+&msiof1 {
-+	status = "disabled";
-+};
-+
-+&can0 {
-+	pinctrl-0 = <&can0_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
-+
-+	renesas,can-clock-select = <0x0>;
-+};
-+
-+&can1 {
-+	pinctrl-0 = <&can1_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
-+
-+	renesas,can-clock-select = <0x0>;
-+};
-+
-+&canfd {
-+	pinctrl-0 = <&canfd0_pins &canfd1_pins>;
-+	pinctrl-names = "default";
-+	status = "disabled";
-+
-+	channel0 {
-+		status = "okay";
-+	};
-+
-+	channel1 {
-+		status = "okay";
-+	};
-+};
-+
-+&ssi4 {
-+	shared-pin;
-+};
-+
-+&ssi8 {
-+	shared-pin;
-+};
-+
-+&pciec1 {
-+	pcie3v3-supply = <&mpcie_3v3>;
-+	pcie1v8-supply = <&mpcie_1v8>;
-+};
-+
-+/* uncomment to enable CN47: SD on SDHI3 */
-+//#include "ulcb-kf-sd3.dtsi"
-+/* CN48 (Raspberry Pi) on VIN4 */
-+//#include "ulcb-kf-rpi.dtsi"
-+/* CN29: (CMOS camera) on VIN5 */
-+//#include "ulcb-kf-cmos.dtsi"
++/* use CN11 instead default CN29/CN48 (H3 only) */
++//#include "ulcb-kf-cn11.dtsi"
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-vb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-vb.dts
 new file mode 100644
 index 0000000..98b6a08
@@ -16456,10 +12820,10 @@ index 0000000..fb12a39f3
 +};
 diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
 new file mode 100644
-index 0000000..b3571f2
+index 0000000..730cd2a
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
-@@ -0,0 +1,1431 @@
+@@ -0,0 +1,36 @@
 +/*
 + * Device Tree Source for the M3ULCB Kingfisher board on r8a7796
 + *
@@ -16472,372 +12836,13 @@ index 0000000..b3571f2
 + */
 +
 +#include "r8a7796-m3ulcb.dts"
++#include "ulcb-kf.dtsi"
 +
 +/ {
 +	model = "Renesas M3ULCB Kingfisher board based on r8a7796";
-+
-+	aliases {
-+		serial1 = &hscif0;
-+		serial2 = &hscif1;
-+		serial3 = &scif1;
-+	};
-+
-+	snd_clk: snd_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-frequency = <24576000>;
-+		clock-output-names = "scki";
-+	};
-+
-+	wlan_en: regulator@4 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "wlan-en-regulator";
-+
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 4 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	vcc_sdhi3: regulator@41 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "SDHI3 Vcc";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio4 17 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	vccq_sdhi3: regulator@5 {
-+		compatible = "regulator-fixed";
-+
-+		regulator-name = "SDHI3 VccQ";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+	};
-+
-+	codec_en_reg: regulator@6 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "codec-en-regulator";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 15 0>;
-+
-+		/* delay - CHECK */
-+		startup-delay-us = <70000>;
-+		enable-active-high;
-+	};
-+
-+	amp_en_reg: regulator@7 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "amp-en-regulator";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+
-+		gpio = <&gpio_ext_74 0 0>;
-+
-+		startup-delay-us = <0>;
-+		enable-active-high;
-+	};
-+
-+	sdio_switch: regulator@9 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "wifi_on";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_74 5 0>;
-+		enable-active-low;
-+		regulator-always-on;
-+	};
-+
-+	radio_switch: regulator@11 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "radio_on";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_74 13 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+		regulator-always-on;
-+	};
-+
-+	mpcie_3v3: regulator@12 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "mPCIe 3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio_ext_77 14 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+
-+	mpcie_1v8: regulator@13 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "mPCIe 1v8";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+		gpio = <&gpio_ext_77 15 GPIO_ACTIVE_HIGH>;
-+		startup-delay-us = <200000>;
-+		enable-active-high;
-+	};
-+
-+	kim {
-+		compatible = "kim";
-+		shutdown-gpios = <&gpio_ext_74 3 GPIO_ACTIVE_HIGH>;
-+		/* serial1 */
-+		dev_name = "/dev/ttySC1";
-+		flow_cntrl = <1>;
-+		/* int div 8 hscif@26.6666656MHz */
-+		baud_rate = <3333332>;
-+	};
-+
-+	btwilink {
-+		compatible = "btwilink";
-+	};
-+
-+	sound_ext: sound@0 {
-+		pinctrl-0 = <&sound_0_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "left_j";
-+		simple-audio-card,name = "pcm3168a";
-+
-+		simple-audio-card,bitclock-master = <&sound_ext_master>;
-+		simple-audio-card,frame-master = <&sound_ext_master>;
-+		sound_ext_master: simple-audio-card,cpu@0 {
-+			sound-dai = <&rcar_sound 0>;
-+			dai-tdm-slot-num = <8>;
-+			dai-tdm-slot-width = <32>;
-+		};
-+
-+		simple-audio-card,codec@0 {
-+			sound-dai = <&pcm3168a>;
-+			dai-tdm-slot-num = <8>;
-+			dai-tdm-slot-width = <32>;
-+			system-clock-frequency = <24576000>;
-+		};
-+	};
-+
-+	/delete-node/sound;
-+
-+	rsnd_ak4613: sound@1 {
-+		pinctrl-0 = <&sound_1_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "left_j";
-+		simple-audio-card,name = "ak4613";
-+
-+		simple-audio-card,bitclock-master = <&sndcpu>;
-+		simple-audio-card,frame-master = <&sndcpu>;
-+
-+		sndcpu: simple-audio-card,cpu@1 {
-+			sound-dai = <&rcar_sound 1>;
-+		};
-+
-+		sndcodec: simple-audio-card,codec@1 {
-+			sound-dai = <&ak4613>;
-+		};
-+	};
-+
-+	sound_radio: sound@2 {
-+		pinctrl-0 = <&sound_2_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "radio";
-+
-+		simple-audio-card,bitclock-master = <&sound_radio_master>;
-+		simple-audio-card,frame-master = <&sound_radio_master>;
-+		simple-audio-card,cpu@2 {
-+			sound-dai = <&rcar_sound 2>;
-+		};
-+
-+		sound_radio_master: simple-audio-card,codec@2 {
-+			sound-dai = <&radio>;
-+			system-clock-frequency = <12288000>;
-+		};
-+	};
-+
-+	sound_wl18xx: sound@3 {
-+		pinctrl-0 = <&sound_3_pins>;
-+		pinctrl-names = "default";
-+		compatible = "simple-audio-card";
-+
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "wl18xx";
-+
-+		simple-audio-card,bitclock-master = <&sound_wl18xx_master>;
-+		simple-audio-card,frame-master = <&sound_wl18xx_master>;
-+		sound_wl18xx_master: simple-audio-card,cpu@3 {
-+			sound-dai = <&rcar_sound 3>;
-+		};
-+
-+		simple-audio-card,codec@3 {
-+			sound-dai = <&wl18xx_pcm>;
-+		};
-+	};
-+
-+	lvds-encoder {
-+		compatible = "thine,thc63lvdm83d";
-+
-+		ports {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			port@0 {
-+				reg = <0>;
-+				lvds_enc_in: endpoint {
-+					remote-endpoint = <&du_out_lvds0>;
-+				};
-+			};
-+			port@1 {
-+				reg = <1>;
-+				lvds_enc_out: endpoint {
-+					remote-endpoint = <&lvds_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	lvds {
-+		compatible = "lvds-connector";
-+
-+		width-mm = <210>;
-+		height-mm = <158>;
-+
-+		panel-timing {
-+			/* 1280x800 @60Hz */
-+			clock-frequency = <65000000>;
-+			hactive = <1280>;
-+			vactive = <800>;
-+			hsync-len = <40>;
-+			hfront-porch = <80>;
-+			hback-porch = <40>;
-+			vfront-porch = <14>;
-+			vback-porch = <14>;
-+			vsync-len = <4>;
-+		};
-+
-+		port {
-+			lvds_in: endpoint {
-+				remote-endpoint = <&lvds_enc_out>;
-+			};
-+		};
-+	};
-+
-+	hdmi-out {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con: endpoint {
-+				remote-endpoint = <&adv7513_out>;
-+			};
-+		};
-+	};
-+
-+	radio: si468x@0 {
-+		compatible = "si,si468x-pcm";
-+		status = "okay";
-+
-+		#sound-dai-cells = <0>;
-+	};
-+
-+	wl18xx_pcm: wl18xx_pcm@0 {
-+		compatible = "ti,wl18xx-pcm";
-+		status = "okay";
-+
-+		#sound-dai-cells = <0>;
-+	};
-+};
-+
-+&pfc {
-+	scif1_pins: scif1 {
-+		groups = "scif1_data_b";
-+		function = "scif1";
-+	};
-+
-+	hscif0_pins: hscif0 {
-+		groups = "hscif0_data", "hscif0_ctrl";
-+		function = "hscif0";
-+	};
-+
-+	hscif1_pins: hscif1 {
-+		groups = "hscif1_data_a", "hscif1_ctrl_a";
-+		function = "hscif1";
-+	};
-+
-+	du_pins: du {
-+		groups = "du_rgb888", "du_sync", "du_clk_out_0", "du_disp";
-+		function = "du";
-+	};
-+
-+	sdhi3_pins_3v3: sd3_3v3 {
-+		groups = "sdhi3_data4", "sdhi3_ctrl";
-+		function = "sdhi3";
-+		power-source = <3300>;
-+	};
-+
-+	sdhi3_pins_1v8: sd3_1v8 {
-+		groups = "sdhi3_data4", "sdhi3_ctrl";
-+		function = "sdhi3";
-+		power-source = <1800>;
-+	};
-+
-+	sound_0_pins: sound0 {
-+		groups = "ssi34_ctrl", "ssi3_data", "ssi4_data";
-+		function = "ssi";
-+	};
-+
-+	sound_1_pins: sound1 {
-+		groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data_a";
-+		function = "ssi";
-+	};
-+
-+	sound_2_pins: sound2 {
-+		groups = "ssi6_ctrl", "ssi6_data";
-+		function = "ssi";
-+	};
-+
-+	sound_3_pins: sound3 {
-+		groups = "ssi78_ctrl", "ssi7_data", "ssi8_data";
-+		function = "ssi";
-+	};
-+
-+	usb0_pins: usb0 {
-+		groups = "usb0";
-+		function = "usb0";
-+	};
-+
-+	can0_pins: can0 {
-+		groups = "can0_data_a";
-+		function = "can0";
-+	};
-+
-+	can1_pins: can1 {
-+		groups = "can1_data";
-+		function = "can1";
-+	};
-+
-+	canfd0_pins: canfd0 {
-+		groups = "canfd0_data_a";
-+		function = "canfd0";
-+	};
-+
-+	canfd1_pins: canfd1 {
-+		groups = "canfd1_data";
-+		function = "canfd1";
-+	};
 +};
 +
 +&du {
-+	pinctrl-0 = <&du_pins>;
-+	pinctrl-names = "default";
-+
 +	ports {
 +		port@0 {
 +			endpoint {
@@ -16852,1045 +12857,9 @@ index 0000000..b3571f2
 +	};
 +};
 +
-+&gpio2 {
-+	bl_pwm {
-+		gpio-hog;
-+		gpios = <3 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+		line-name = "BL PWM 100%";
-+	};
-+};
-+
-+&gpio6 {
-+	audio_sw {
-+		gpio-hog;
-+		gpios = <21 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+		line-name = "Onboard MCh Audio";
-+	};
-+};
-+
-+&scif1 {
-+	pinctrl-0 = <&scif1_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
-+&hscif0 {
-+	pinctrl-0 = <&hscif0_pins>;
-+	pinctrl-names = "default";
-+	uart-has-rtscts;
-+
-+	status = "okay";
-+};
-+
-+&hscif1 {
-+	pinctrl-0 = <&hscif1_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
-+&i2c2 {
-+	clock-frequency = <400000>;
-+
-+	gpio_ext_74: pca9539@74 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x74>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio6>;
-+		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
-+
-+		hub_pwen {
-+			gpio-hog;
-+			gpios = <6 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "HUB pwen";
-+		};
-+		hub_rst {
-+			gpio-hog;
-+			gpios = <7 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "HUB rst";
-+		};
-+		otg_offvbus {
-+			gpio-hog;
-+			gpios = <8 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "OTG off VBUSn";
-+		};
-+		otg_extlpn {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "OTG EXTLPn";
-+		};
-+		otg_stat1 {
-+			gpio-hog;
-+			gpios = <10 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "OTG Stat1";
-+		};
-+		otg_stat2 {
-+			gpio-hog;
-+			gpios = <11 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "OTG Stat2";
-+		};
-+	};
-+
-+	gpio_ext_75: pca9539@75 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x75>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio6>;
-+		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
-+
-+		gps_rst {
-+			gpio-hog;
-+			gpios = <6 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "GPS rst";
-+		};
-+		fpdl_shdn {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "FPDLink shdn";
-+		};
-+	};
-+
-+	i2cswitch2: pca9548@74 {
-+		compatible = "nxp,pca9548";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x71>;
-+		reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
-+
-+		i2c@0 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <0>;
-+			/* BCM node(s) */
-+		};
-+
-+		i2c@1 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <1>;
-+			/* USB3.0 HUB node(s) */
-+		};
-+
-+		i2c@2 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <2>;
-+			/* Power amp node(s) */
-+		};
-+
-+		i2c@3 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <3>;
-+			/* Radio node(s) */
-+		};
-+
-+		i2c@4 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <4>;
-+
-+			hdmi@3d {
-+				compatible = "adi,adv7511w";
-+				reg = <0x3d>;
-+//				interrupt-parent = <&gpio2>;
-+//				interrupts = <0 IRQ_TYPE_EDGE_BOTH>;
-+				pd-gpios = <&gpio_ext_75 5 GPIO_ACTIVE_LOW>;
-+
-+				adi,input-depth = <8>;
-+				adi,input-colorspace = "rgb";
-+				adi,input-clock = "1x";
-+				adi,input-style = <1>;
-+				adi,input-justification = "evenly";
-+				adi,clock-delay = <1200>;
-+				adi,clock-max-rate = <100000>;
-+
-+				ports {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					port@0 {
-+						reg = <0>;
-+						adv7513_in: endpoint {
-+							remote-endpoint = <&du_out_rgb>;
-+						};
-+					};
-+
-+					port@1 {
-+						reg = <1>;
-+						adv7513_out: endpoint {
-+							remote-endpoint = <&hdmi_con>;
-+						};
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@5 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <5>;
-+			/* PCIe node(s) */
-+		};
-+
-+		i2c@6 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <6>;
-+			/* LVDS display node(s) */
-+
-+			polytouch: edt-ft5x06@38 {
-+				compatible = "edt,edt-ft5x06";
-+				reg = <0x38>;
-+				interrupt-parent = <&gpio5>;
-+				interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
-+			};
-+		};
-+
-+		i2c@7 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <7>;
-+			/* Audio, GPS and Gyro node(s) */
-+
-+			pcm3168a: audio-codec@44 {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm3168a";
-+				reg = <0x44>;
-+				clocks = <&snd_clk>;
-+				clock-names = "scki";
-+				tdm;
-+				VDD1-supply = <&codec_en_reg>;
-+				VDD2-supply = <&codec_en_reg>;
-+				VCCAD1-supply = <&codec_en_reg>;
-+				VCCAD2-supply = <&codec_en_reg>;
-+				VCCDA1-supply = <&amp_en_reg>;
-+				VCCDA2-supply = <&amp_en_reg>;
-+			};
-+
-+			lsm9ds0_acc_mag@1d {
-+				compatible = "st,lsm9ds0_accel_magn";
-+				reg = <0x1d>;
-+			};
-+
-+			lsm9ds0_gyr@6b {
-+				compatible = "st,lsm9ds0_gyro";
-+				reg = <0x6b>;
-+			};
-+
-+			/* GPS@ 0x42 */
-+		};
-+	};
-+};
-+
-+&i2c4 {
-+	gpio_ext_76: pca9539@76 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x76>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio7>;
-+		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
-+
-+		port_b_a0 {
-+			gpio-hog;
-+			gpios = <0 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "Video-B A0";
-+		};
-+		port_b_a1 {
-+			gpio-hog;
-+			gpios = <1 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "Video-B A1";
-+		};
-+		port_a_a0 {
-+			gpio-hog;
-+			gpios = <2 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "Video-A A0";
-+		};
-+		port_a_a1 {
-+			gpio-hog;
-+			gpios = <3 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "Video-A A1";
-+		};
-+		cmos_pwdn {
-+			gpio-hog;
-+			gpios = <8 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "CMOS PWDN";
-+		};
-+		cmos_rst {
-+			gpio-hog;
-+			gpios = <9 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "CMOS RST";
-+		};
-+		/* pin 12 - CAM_CLK */
-+		rpi_cam_io_1 {
-+			gpio-hog;
-+			gpios = <10 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "RaspB_IO1";
-+		};
-+		/* pin 11 - CAM_GPIO - assume pwdn */
-+		rpi_cam_io_0 {
-+			gpio-hog;
-+			gpios = <11 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "RaspB_IO0";
-+		};
-+		sam_rst {
-+			gpio-hog;
-+			gpios = <4 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "SAM RST";
-+		};
-+		sam_pwr {
-+			gpio-hog;
-+			gpios = <5 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "SAM PWR";
-+		};
-+		/* 0 - FPDLink output, 1 - LVDS output */
-+		lvds_vs_fpdl {
-+			gpio-hog;
-+			gpios = <14 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "LVDS switch";
-+		};
-+	};
-+
-+	gpio_ext_77: pca9539@77 {
-+		compatible = "nxp,pca9539";
-+		reg = <0x77>;
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&gpio5>;
-+		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
-+
-+		mpcie_wake {
-+			gpio-hog;
-+			gpios = <0 GPIO_ACTIVE_HIGH>;
-+			output-low;
-+			line-name = "mPCIe WAKE#";
-+		};
-+		mpcie_wdisable {
-+			gpio-hog;
-+			gpios = <1 GPIO_ACTIVE_HIGH>;
-+			output-high;
-+			line-name = "mPCIe W_DISABLE";
-+		};
-+		mpcie_clreq {
-+			gpio-hog;
-+			gpios = <2 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "mPCIe CLKREQ#";
-+		};
-+		mpcie_ovc {
-+			gpio-hog;
-+			gpios = <3 GPIO_ACTIVE_HIGH>;
-+			input;
-+			line-name = "mPCIe OVC";
-+		};
-+	};
-+
-+	i2cswitch4: pca9548@74 {
-+		compatible = "nxp,pca9548";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x71>;
-+		reset-gpios= <&gpio3 15 GPIO_ACTIVE_LOW>;
-+
-+		i2c@0 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <0>;
-+			/* SAM node(s) */
-+		};
-+
-+		i2c@1 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <1>;
-+			/* Slot A (CN10) */
-+
-+			ov106xx@0 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x60>;
-+
-+				port@0 {
-+					ov106xx_in0: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin0ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep0: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep0>;
-+					};
-+					ov106xx_ti964_des0ep0: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep0>;
-+					};
-+					ov106xx_ti954_des0ep0: endpoint@2 {
-+						remote-endpoint = <&ti954_des0ep0>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@1 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x61>;
-+
-+				port@0 {
-+					ov106xx_in1: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin1ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep1: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep1>;
-+					};
-+					ov106xx_ti964_des0ep1: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep1>;
-+					};
-+					ov106xx_ti954_des0ep1: endpoint@2 {
-+						remote-endpoint = <&ti954_des0ep1>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@2 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x62>;
-+
-+				port@0 {
-+					ov106xx_in2: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin2ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep2: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep2>;
-+					};
-+					ov106xx_ti964_des0ep2: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep2>;
-+					};
-+				};
-+			};
-+
-+			ov106xx@3 {
-+				compatible = "ovti,ov106xx";
-+				reg = <0x63>;
-+
-+				port@0 {
-+					ov106xx_in3: endpoint {
-+						clock-lanes = <0>;
-+						data-lanes = <1 2 3 4>;
-+						remote-endpoint = <&vin3ep0>;
-+					};
-+				};
-+				port@1 {
-+					ov106xx_max9286_des0ep3: endpoint@0 {
-+						remote-endpoint = <&max9286_des0ep3>;
-+					};
-+					ov106xx_ti964_des0ep3: endpoint@1 {
-+						remote-endpoint = <&ti964_des0ep3>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB964 @ 0x3a */
-+			ti964-ti9x3@0 {
-+				compatible = "ti,ti964-ti9x3";
-+				reg = <0x3a>;
-+				ti,sensor_delay = <350>;
-+				ti,links = <4>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti964_des0ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					ti964_des0ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+					ti964_des0ep2: endpoint@2 {
-+						ti9x3-addr = <0x0e>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in2>;
-+					};
-+					ti964_des0ep3: endpoint@3 {
-+						ti9x3-addr = <0x0f>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in3>;
-+					};
-+				};
-+				port@1 {
-+					ti964_csi0ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+
-+			/* DS90UB954 @ 0x38 */
-+			ti954-ti9x3@0 {
-+				compatible = "ti,ti954-ti9x3";
-+				reg = <0x38>;
-+				/* gpios = <&video_a_ext1 10 GPIO_ACTIVE_HIGH>; */
-+				ti,sensor_delay = <350>;
-+				ti,links = <2>;
-+				ti,lanes = <4>;
-+				ti,forwarding-mode = "round-robin";
-+				ti,cable-mode = "coax";
-+
-+				port@0 {
-+					ti954_des0ep0: endpoint@0 {
-+						ti9x3-addr = <0x0c>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					ti954_des0ep1: endpoint@1 {
-+						ti9x3-addr = <0x0d>;
-+						dvp-order = <0>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+				};
-+				port@1 {
-+					ti954_csi0ep0: endpoint {
-+						csi-rate = <1450>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+
-+			/* MAX9286 @ 0x2c */
-+			max9286-max9271@0 {
-+				compatible = "maxim,max9286-max9271";
-+				reg = <0x2c>;
-+				maxim,sensor_delay = <350>;
-+				maxim,links = <4>;
-+				maxim,lanes = <4>;
-+				maxim,resetb-gpio = <1>;
-+				maxim,fsync-mode = "automatic";
-+				maxim,timeout = <100>;
-+
-+				port@0 {
-+					max9286_des0ep0: endpoint@0 {
-+						max9271-addr = <0x50>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in0>;
-+					};
-+					max9286_des0ep1: endpoint@1 {
-+						max9271-addr = <0x51>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in1>;
-+					};
-+					max9286_des0ep2: endpoint@2 {
-+						max9271-addr = <0x52>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in2>;
-+					};
-+					max9286_des0ep3: endpoint@3 {
-+						max9271-addr = <0x53>;
-+						dvp-order = <1>;
-+						remote-endpoint = <&ov106xx_in3>;
-+					};
-+				};
-+				port@1 {
-+					max9286_csi0ep0: endpoint {
-+						csi-rate = <700>;
-+						remote-endpoint = <&csi2_40_ep>;
-+					};
-+				};
-+			};
-+		};
-+
-+		i2c@3 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <3>;
-+			/* MOST node(s) */
-+		};
-+
-+		i2c@7 {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			reg = <7>;
-+			/* Slot A (CN10) */
-+
-+			video_a_ext0: pca9535@26 {
-+				compatible = "nxp,pca9535";
-+				reg = <0x26>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_a_des_cfg1 {
-+					gpio-hog;
-+					gpios = <5 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg1";
-+				};
-+				video_a_des_cfg0 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg0";
-+				};
-+				video_a_pwr_shdn {
-+					gpio-hog;
-+					gpios = <3 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR_SHDN";
-+				};
-+				video_a_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR0";
-+				};
-+				video_a_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR1";
-+				};
-+				video_a_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR2";
-+				};
-+				video_a_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <15 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR3";
-+				};
-+				video_a_des_shdn {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A DES_SHDN";
-+				};
-+				video_a_des_led {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-A led";
-+				};
-+			};
-+
-+			video_a_ext1: max7325@5c {
-+				compatible = "maxim,max7325";
-+				reg = <0x5c>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				video_a_des_cfg2 {
-+					gpio-hog;
-+					gpios = <4 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg2";
-+				};
-+				video_a_des_cfg1 {
-+					gpio-hog;
-+					gpios = <6 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg1";
-+				};
-+				video_a_des_cfg0 {
-+					gpio-hog;
-+					gpios = <7 GPIO_ACTIVE_HIGH>;
-+					input;
-+					line-name = "Video-A cfg0";
-+				};
-+				video_a_pwr_shdn {
-+					gpio-hog;
-+					gpios = <14 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR_SHDN";
-+				};
-+				video_a_cam_pwr0 {
-+					gpio-hog;
-+					gpios = <8 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR0";
-+				};
-+				video_a_cam_pwr1 {
-+					gpio-hog;
-+					gpios = <9 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR1";
-+				};
-+				video_a_cam_pwr2 {
-+					gpio-hog;
-+					gpios = <10 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR2";
-+				};
-+				video_a_cam_pwr3 {
-+					gpio-hog;
-+					gpios = <11 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A PWR3";
-+				};
-+				video_a_des_shdn {
-+					gpio-hog;
-+					gpios = <13 GPIO_ACTIVE_HIGH>;
-+					output-high;
-+					line-name = "Video-A DES_SHDN";
-+				};
-+				video_a_led {
-+					gpio-hog;
-+					gpios = <12 GPIO_ACTIVE_HIGH>;
-+					output-low;
-+					line-name = "Video-A LED";
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&pcie_bus_clk {
-+	clock-frequency = <100000000>;
-+	status = "okay";
-+};
-+
-+&pciec0 {
-+	status = "okay";
-+};
-+
-+&pciec1 {
-+	status = "okay";
-+};
-+
-+&vin0 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin0ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <0>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in0>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep0: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin0_max9286_des0ep0: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep0>;
-+			};
-+			vin0_ti964_des0ep0: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep0>;
-+			};
-+			vin0_ti954_des0ep0: endpoint@2 {
-+				remote-endpoint = <&ti954_des0ep0>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin1 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin1ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <1>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in1>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep1: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin1_max9286_des0ep1: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep1>;
-+			};
-+			vin1_ti964_des0ep1: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep1>;
-+			};
-+			vin1_ti954_des0ep1: endpoint@2 {
-+				remote-endpoint = <&ti954_des0ep1>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin2 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin2ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <2>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in2>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep2: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin2_max9286_des0ep2: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep2>;
-+			};
-+			vin2_ti964_des0ep2: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep2>;
-+			};
-+		};
-+	};
-+};
-+
-+&vin3 {
-+	status = "okay";
-+
-+	ports {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		port@0 {
-+			vin3ep0: endpoint {
-+				csi,select = "csi40";
-+				virtual,channel = <3>;
-+				data-lanes = <1 2 3 4>;
-+				remote-endpoint = <&ov106xx_in3>;
-+			};
-+		};
-+		port@1 {
-+			csi0ep3: endpoint {
-+				remote-endpoint = <&csi2_40_ep>;
-+			};
-+		};
-+		port@2 {
-+			vin3_max9286_des0ep3: endpoint@0 {
-+				remote-endpoint = <&max9286_des0ep3>;
-+			};
-+			vin3_ti964_des0ep3: endpoint@1 {
-+				remote-endpoint = <&ti964_des0ep3>;
-+			};
-+		};
-+	};
-+};
-+
-+&csi2_40 {
-+	status = "okay";
-+
-+	virtual,channel {
-+		csi2_vc0 {
-+			data,type = "ycbcr422";
-+			receive,vc = <0>;
-+		};
-+		csi2_vc1 {
-+			data,type = "ycbcr422";
-+			receive,vc = <1>;
-+		};
-+		csi2_vc2 {
-+			data,type = "ycbcr422";
-+			receive,vc = <2>;
-+		};
-+		csi2_vc3 {
-+			data,type = "ycbcr422";
-+			receive,vc = <3>;
-+		};
-+	};
-+
-+	port {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		csi2_40_ep: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2 3 4>;
-+			csi-rate = <300>;
-+		};
-+	};
-+};
-+
-+&rcar_sound {
-+	pinctrl-0 = <&sound_clk_pins>;
-+	pinctrl-names = "default";
-+
-+	/* Multi DAI */
-+	#sound-dai-cells = <1>;
-+
-+	rcar_sound,dai {
-+		dai0 {
-+			playback = <&ssi3>;
-+			capture  = <&ssi4>;
-+		};
-+
-+		dai1 {
-+			playback = <&ssi0 &src0 &dvc0>;
-+			capture  = <&ssi1 &src1 &dvc1>;
-+		};
-+
-+		dai2 {
-+			capture  = <&ssi6>;
-+		};
-+
-+		dai3 {
-+			playback = <&ssi7>;
-+			capture  = <&ssi8>;
-+		};
-+	};
-+};
-+
-+&sdhi3 {
-+	pinctrl-0 = <&sdhi3_pins_3v3>;
-+	pinctrl-1 = <&sdhi3_pins_1v8>;
-+	pinctrl-names = "default", "state_uhs";
-+
-+	vmmc-supply = <&wlan_en>;
-+	vqmmc-supply = <&vccq_sdhi3>;
-+	keep-power-in-suspend;
-+	enable-sdio-wakeup;
-+	bus-width = <4>;
-+	no-1-8-v;
-+	non-removable;
-+	cap-power-off-card;
-+	max-frequency = <26000000>;
-+	status = "okay";
-+
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	wlcore: wlcore@2 {
-+		compatible = "ti,wl1837";
-+		reg = <2>;
-+		interrupt-parent = <&gpio1>;
-+		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
-+	};
-+};
-+
-+&usb2_phy0 {
-+	pinctrl-0 = <&usb0_pins>;
-+	pinctrl-names = "default";
-+
-+	status = "okay";
-+};
-+
 +&hsusb {
 +	status = "okay";
 +};
-+
-+&ehci0 {
-+	status = "okay";
-+};
-+
-+&ohci0 {
-+	status = "okay";
-+};
-+
-+&xhci0 {
-+	status = "okay";
-+};
-+
-+&msiof1 {
-+	status = "disabled";
-+};
-+
-+&can0 {
-+	pinctrl-0 = <&can0_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
-+
-+	renesas,can-clock-select = <0x0>;
-+};
-+
-+&can1 {
-+	pinctrl-0 = <&can1_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
-+
-+	renesas,can-clock-select = <0x0>;
-+};
-+
-+&canfd {
-+	pinctrl-0 = <&canfd0_pins &canfd1_pins>;
-+	pinctrl-names = "default";
-+	status = "disabled";
-+
-+	channel0 {
-+		status = "okay";
-+	};
-+
-+	channel1 {
-+		status = "okay";
-+	};
-+};
-+
-+&ssi4 {
-+	shared-pin;
-+};
-+
-+&ssi8 {
-+	shared-pin;
-+};
-+
-+&pciec1 {
-+	pcie3v3-supply = <&mpcie_3v3>;
-+	pcie1v8-supply = <&mpcie_1v8>;
-+};
-+
-+/* uncomment to enable CN47: SD on SDHI3 */
-+//#include "ulcb-kf-sd3.dtsi"
-+/* CN48 (Raspberry Pi) on VIN4 */
-+#include "ulcb-kf-rpi.dtsi"
-+/* CN29: (CMOS camera) on VIN5 */
-+#include "ulcb-kf-cmos.dtsi"
 diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-view.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-view.dts
 new file mode 100644
 index 0000000..1ac0041
@@ -19375,15 +14344,16 @@ index 0000000..61f7e8b
 +		max-speed = <1000>;
 +	};
 +};
-diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-cmos.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-cmos.dtsi
+diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-cn11.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-cn11.dtsi
 new file mode 100644
-index 0000000..2145f5e
+index 0000000..4ca502f
 --- /dev/null
-+++ b/arch/arm64/boot/dts/renesas/ulcb-kf-cmos.dtsi
-@@ -0,0 +1,75 @@
++++ b/arch/arm64/boot/dts/renesas/ulcb-kf-cn11.dtsi
+@@ -0,0 +1,518 @@
 +/*
 + * Device Tree Source for the H3ULCB Kingfisher board:
-+ * this adding conflicting resource on VIN5 for CMOS camera
++ *  this adding conflicting resource on VIN4/VIN5/VIN6/VIN7 for CN11
++ *  use CN11 instead default CN29/CN48
 + *
 + * Copyright (C) 2017 Renesas Electronics Corp.
 + * Copyright (C) 2017 Cogent Embedded, Inc.
@@ -19393,109 +14363,448 @@ index 0000000..2145f5e
 + * kind, whether express or implied.
 + */
 +
-+/ {
-+	camera_clk: camera_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-frequency = <24000000>;
-+		clock-output-names = "mclk";
-+	};
-+};
-+
-+&pfc {
-+	vin5_pins: vin5 {
-+		groups = "vin5_data8", "vin5_sync", "vin5_clk";
-+		function = "vin5";
-+	};
-+};
-+
 +&i2cswitch4 {
-+	i2c@5 {
++	i2c@2 {
 +		#address-cells = <1>;
 +		#size-cells = <0>;
-+		reg = <5>;
++		reg = <2>;
++		/* Slot B (CN11) */
 +
-+		cmos_camera: ov5642@3c {
-+			compatible = "ovti,ov5642";
-+			reg = <0x3c>;
-+			clocks = <&camera_clk>;
-+			clock-names = "mclk";
++		ov106xx@4 {
++			compatible = "ovti,ov106xx";
++			reg = <0x64>;
 +
 +			port@0 {
-+				cmos_camera_in: endpoint {
++				ov106xx_in4: endpoint {
++					clock-lanes = <0>;
++					data-lanes = <1 2 3 4>;
++					remote-endpoint = <&vin4ep0>;
++				};
++			};
++			port@1 {
++				ov106xx_max9286_des1ep0: endpoint@0 {
++					remote-endpoint = <&max9286_des1ep0>;
++				};
++				ov106xx_ti964_des1ep0: endpoint@1 {
++					remote-endpoint = <&ti964_des1ep0>;
++				};
++				ov106xx_ti954_des1ep0: endpoint@2 {
++					remote-endpoint = <&ti954_des1ep0>;
++				};
++			};
++		};
++
++		ov106xx@5 {
++			compatible = "ovti,ov106xx";
++			reg = <0x65>;
++
++			port@0 {
++				ov106xx_in5: endpoint {
++					clock-lanes = <0>;
++					data-lanes = <1 2 3 4>;
 +					remote-endpoint = <&vin5ep0>;
 +				};
 +			};
++			port@1 {
++				ov106xx_max9286_des1ep1: endpoint@0 {
++					remote-endpoint = <&max9286_des1ep1>;
++				};
++				ov106xx_ti964_des1ep1: endpoint@1 {
++					remote-endpoint = <&ti964_des1ep1>;
++				};
++				ov106xx_ti954_des1ep1: endpoint@2 {
++					remote-endpoint = <&ti954_des1ep1>;
++				};
++			};
++		};
++
++		ov106xx@6 {
++			compatible = "ovti,ov106xx";
++			reg = <0x66>;
++				port@0 {
++				ov106xx_in6: endpoint {
++					clock-lanes = <0>;
++					data-lanes = <1 2 3 4>;
++					remote-endpoint = <&vin6ep0>;
++				};
++			};
++			port@1 {
++				ov106xx_max9286_des1ep2: endpoint@0 {
++					remote-endpoint = <&max9286_des1ep2>;
++				};
++				ov106xx_ti964_des1ep2: endpoint@1 {
++					remote-endpoint = <&ti964_des1ep2>;
++				};
++			};
++		};
++
++		ov106xx@7 {
++			compatible = "ovti,ov106xx";
++			reg = <0x67>;
++				port@0 {
++				ov106xx_in7: endpoint {
++					clock-lanes = <0>;
++					data-lanes = <1 2 3 4>;
++					remote-endpoint = <&vin7ep0>;
++				};
++			};
++			port@1 {
++				ov106xx_max9286_des1ep3: endpoint@0 {
++					remote-endpoint = <&max9286_des1ep3>;
++				};
++				ov106xx_ti964_des1ep3: endpoint@1 {
++					remote-endpoint = <&ti964_des1ep3>;
++				};
++			};
++		};
++
++		/* DS90UB964 @ 0x3a */
++		ti964-ti9x3@1 {
++			compatible = "ti,ti964-ti9x3";
++			reg = <0x3a>;
++			ti,sensor_delay = <350>;
++			ti,links = <4>;
++			ti,lanes = <4>;
++			ti,forwarding-mode = "round-robin";
++			ti,cable-mode = "coax";
++
++			port@0 {
++				ti964_des1ep0: endpoint@0 {
++					ti9x3-addr = <0x0c>;
++					dvp-order = <0>;
++					remote-endpoint = <&ov106xx_in4>;
++				};
++				ti964_des1ep1: endpoint@1 {
++					ti9x3-addr = <0x0d>;
++					dvp-order = <0>;
++					remote-endpoint = <&ov106xx_in5>;
++				};
++				ti964_des1ep2: endpoint@2 {
++					ti9x3-addr = <0x0e>;
++					dvp-order = <0>;
++					remote-endpoint = <&ov106xx_in6>;
++				};
++				ti964_des1ep3: endpoint@3 {
++					ti9x3-addr = <0x0f>;
++					dvp-order = <0>;
++					remote-endpoint = <&ov106xx_in7>;
++				};
++			};
++			port@1 {
++				ti964_csi2ep0: endpoint {
++					csi-rate = <1450>;
++					remote-endpoint = <&csi2_41_ep>;
++				};
++			};
++		};
++
++		/* DS90UB954 @ 0x38 */
++		ti954-ti9x3@1 {
++			compatible = "ti,ti954-ti9x3";
++			reg = <0x38>;
++			/* gpios = <&video_b_ext1 10 GPIO_ACTIVE_HIGH>; */
++			ti,sensor_delay = <350>;
++			ti,links = <2>;
++			ti,lanes = <4>;
++			ti,forwarding-mode = "round-robin";
++			ti,cable-mode = "coax";
++
++			port@0 {
++				ti954_des1ep0: endpoint@0 {
++					ti9x3-addr = <0x0c>;
++					dvp-order = <0>;
++					remote-endpoint = <&ov106xx_in4>;
++				};
++				ti954_des1ep1: endpoint@1 {
++					ti9x3-addr = <0x0d>;
++					dvp-order = <0>;
++					remote-endpoint = <&ov106xx_in5>;
++				};
++			};
++			port@1 {
++				ti954_csi2ep0: endpoint {
++					csi-rate = <1450>;
++					remote-endpoint = <&csi2_41_ep>;
++				};
++			};
++		};
++
++		/* MAX9286 @ 0x2c */
++		max9286-max9271@1 {
++			compatible = "maxim,max9286-max9271";
++			reg = <0x2c>;
++			maxim,sensor_delay = <350>;
++			maxim,links = <4>;
++			maxim,lanes = <4>;
++			maxim,resetb-gpio = <1>;
++			maxim,fsync-mode = "automatic";
++			maxim,timeout = <100>;
++
++			port@0 {
++				max9286_des1ep0: endpoint@0 {
++					max9271-addr = <0x50>;
++					dvp-order = <1>;
++					remote-endpoint = <&ov106xx_in4>;
++				};
++				max9286_des1ep1: endpoint@1 {
++					max9271-addr = <0x51>;
++					dvp-order = <1>;
++					remote-endpoint = <&ov106xx_in5>;
++				};
++				max9286_des1ep2: endpoint@2 {
++					max9271-addr = <0x52>;
++					dvp-order = <1>;
++					remote-endpoint = <&ov106xx_in6>;
++				};
++				max9286_des1ep3: endpoint@3 {
++					max9271-addr = <0x53>;
++					dvp-order = <1>;
++					remote-endpoint = <&ov106xx_in7>;
++				};
++			};
++			port@1 {
++				max9286_csi2ep0: endpoint {
++					csi-rate = <700>;
++					remote-endpoint = <&csi2_41_ep>;
++				};
++			};
++		};
++	};
++
++	i2c@6 {
++		#address-cells = <1>;
++		#size-cells = <0>;
++		reg = <6>;
++		/* Slot B (CN11) */
++
++		video_b_ext0: pca9535@27 {
++			compatible = "nxp,pca9535";
++			reg = <0x27>;
++			gpio-controller;
++			#gpio-cells = <2>;
++
++			video_b_des_cfg1 {
++				gpio-hog;
++				gpios = <5 GPIO_ACTIVE_HIGH>;
++				input;
++				line-name = "Video-B cfg1";
++			};
++			video_b_des_cfg0 {
++				gpio-hog;
++				gpios = <6 GPIO_ACTIVE_HIGH>;
++				input;
++				line-name = "Video-B cfg0";
++			};
++			video_b_pwr_shdn {
++				gpio-hog;
++				gpios = <3 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR_SHDN";
++			};
++			video_b_cam_pwr0 {
++				gpio-hog;
++				gpios = <12 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR0";
++			};
++			video_b_cam_pwr1 {
++				gpio-hog;
++				gpios = <13 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR1";
++			};
++			video_b_cam_pwr2 {
++				gpio-hog;
++				gpios = <14 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR2";
++			};
++			video_b_cam_pwr3 {
++				gpio-hog;
++				gpios = <15 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR3";
++			};
++			video_b_des_shdn {
++				gpio-hog;
++				gpios = <4 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B DES_SHDN";
++			};
++			video_b_des_led {
++				gpio-hog;
++				gpios = <7 GPIO_ACTIVE_HIGH>;
++				output-low;
++				line-name = "Video-B led";
++			};
++		};
++
++		video_b_ext1: max7325@5c {
++			compatible = "maxim,max7325";
++			reg = <0x5c>;
++			gpio-controller;
++			#gpio-cells = <2>;
++
++			video_b_des_cfg2 {
++				gpio-hog;
++				gpios = <4 GPIO_ACTIVE_HIGH>;
++				input;
++				line-name = "Video-B cfg2";
++			};
++			video_b_des_cfg1 {
++				gpio-hog;
++				gpios = <6 GPIO_ACTIVE_HIGH>;
++				input;
++				line-name = "Video-B cfg1";
++			};
++			video_b_des_cfg0 {
++				gpio-hog;
++				gpios = <7 GPIO_ACTIVE_HIGH>;
++				input;
++				line-name = "Video-B cfg0";
++			};
++			video_b_pwr_shdn {
++				gpio-hog;
++				gpios = <14 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR_SHDN";
++			};
++			video_b_cam_pwr0 {
++				gpio-hog;
++				gpios = <8 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR0";
++			};
++			video_b_cam_pwr1 {
++				gpio-hog;
++				gpios = <9 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR1";
++			};
++			video_b_cam_pwr2 {
++				gpio-hog;
++				gpios = <10 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR2";
++			};
++			video_b_cam_pwr3 {
++				gpio-hog;
++				gpios = <11 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B PWR3";
++			};
++			video_b_des_shdn {
++				gpio-hog;
++				gpios = <13 GPIO_ACTIVE_HIGH>;
++				output-high;
++				line-name = "Video-B DES_SHDN";
++			};
++			video_b_led {
++				gpio-hog;
++				gpios = <12 GPIO_ACTIVE_HIGH>;
++				output-low;
++				line-name = "Video-B LED";
++			};
 +		};
 +	};
 +};
 +
-+&vin5 {
-+	pinctrl-0 = <&vin5_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
++&vin4 {
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin4ep0: endpoint {
++				csi,select = "csi41";
++				virtual,channel = <0>;
++				remote-endpoint = <&ov106xx_in4>;
++				data-lanes = <1 2 3 4>;
++			};
++		};
++		port@1 {
++			csi2ep0: endpoint {
++				remote-endpoint = <&csi2_41_ep>;
++			};
++		};
++		port@2 {
++			vin4_max9286_des1ep0: endpoint@0 {
++				remote-endpoint = <&max9286_des1ep0>;
++			};
++			vin4_ti964_des1ep0: endpoint@1 {
++				remote-endpoint = <&ti964_des1ep0>;
++			};
++			vin4_ti954_des1ep0: endpoint@2 {
++				remote-endpoint = <&ti954_des1ep0>;
++			};
++		};
++	};
++};
 +
++&vin5 {
 +	ports {
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
 +		port@0 {
 +			vin5ep0: endpoint@0 {
-+				/delete-property/csi,select;
-+				/delete-property/virtual,channel;
-+				/delete-property/data-lanes;
-+				bus-width = <8>;
-+				/* #HSYNC, #VSYNC */
-+				vsync-active = <1>;
-+				hsync-active = <0>;
-+				remote-endpoint = <&cmos_camera_in>;
++				csi,select = "csi41";
++				virtual,channel = <1>;
++				remote-endpoint = <&ov106xx_in5>;
++				data-lanes = <1 2 3 4>;
 +			};
 +		};
 +		port@1 {
-+			/delete-node/endpoint;
++			csi2ep1: endpoint {
++				remote-endpoint = <&csi2_41_ep>;
++			};
++		};
++		port@2 {
++			vin5_max9286_des1ep1: endpoint@0 {
++				remote-endpoint = <&max9286_des1ep1>;
++			};
++			vin5_ti964_des1ep1: endpoint@1 {
++				remote-endpoint = <&ti964_des1ep1>;
++			};
++			vin5_ti954_des1ep1: endpoint@2 {
++				remote-endpoint = <&ti954_des1ep1>;
++			};
 +		};
 +	};
 +};
-diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-rpi.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-rpi.dtsi
-new file mode 100644
-index 0000000..bcd9865
---- /dev/null
-+++ b/arch/arm64/boot/dts/renesas/ulcb-kf-rpi.dtsi
-@@ -0,0 +1,77 @@
-+/*
-+ * Device Tree Source for the H3ULCB Kingfisher board:
-+ * this adding conflicting resource on VIN4 for Raspberry Pi camera
-+ *
-+ * Copyright (C) 2017 Renesas Electronics Corp.
-+ * Copyright (C) 2017 Cogent Embedded, Inc.
-+ *
-+ * This file is licensed under the terms of the GNU General Public License
-+ * version 2.  This program is licensed "as is" without any warranty of any
-+ * kind, whether express or implied.
-+ */
 +
-+&i2cswitch4 {
-+	i2c@4 {
++&vin6 {
++	status = "okay";
++
++	ports {
 +		#address-cells = <1>;
 +		#size-cells = <0>;
-+		reg = <4>;
 +
-+		rpi_camera: ov5647@36 {
-+			compatible = "ovti,ov5647";
-+			reg = <0x36>;
-+
-+			port@0 {
-+				rpi_camera_in: endpoint {
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					remote-endpoint = <&vin4ep0>;
-+				};
++		port@0 {
++			vin6ep0: endpoint@0 {
++				csi,select = "csi41";
++				virtual,channel = <2>;
++				remote-endpoint = <&ov106xx_in6>;
++				data-lanes = <1 2 3 4>;
++			};
++		};
++		port@1 {
++			csi2ep2: endpoint {
++				remote-endpoint = <&csi2_41_ep>;
++			};
++		};
++		port@2 {
++			vin6_max9286_des1ep2: endpoint@0 {
++				remote-endpoint = <&max9286_des1ep2>;
++			};
++			vin6_ti964_des1ep2: endpoint@1 {
++				remote-endpoint = <&ti964_des1ep2>;
 +			};
 +		};
 +	};
 +};
 +
-+&vin4 {
++&vin7 {
 +	status = "okay";
 +
 +	ports {
@@ -19503,39 +14812,59 @@ index 0000000..bcd9865
 +		#size-cells = <0>;
 +
 +		port@0 {
-+			vin4ep0: endpoint {
-+				csi,select = "csi20";
-+				virtual,channel = <0>;
-+				remote-endpoint = <&rpi_camera_in>;
-+				data-lanes = <1 2>;
++			vin7ep0: endpoint@0 {
++				csi,select = "csi41";
++				virtual,channel = <3>;
++				remote-endpoint = <&ov106xx_in7>;
++				data-lanes = <1 2 3 4>;
 +			};
 +		};
 +		port@1 {
-+			csi2ep0: endpoint {
-+				remote-endpoint = <&csi2_20_ep>;
++			csi2ep3: endpoint {
++				remote-endpoint = <&csi2_41_ep>;
++			};
++		};
++		port@2 {
++			vin7_max9286_des1ep3: endpoint@0 {
++				remote-endpoint = <&max9286_des1ep3>;
++			};
++			vin7_ti964_des1ep3: endpoint@1 {
++				remote-endpoint = <&ti964_des1ep3>;
 +			};
 +		};
 +	};
 +};
 +
-+&csi2_20 {
++&csi2_41 {
 +	status = "okay";
 +
 +	virtual,channel {
 +		csi2_vc0 {
-+			data,type = "raw8";
++			data,type = "ycbcr422";
 +			receive,vc = <0>;
 +		};
++		csi2_vc1 {
++			data,type = "ycbcr422";
++			receive,vc = <1>;
++		};
++		csi2_vc2 {
++			data,type = "ycbcr422";
++			receive,vc = <2>;
++		};
++		csi2_vc3 {
++			data,type = "ycbcr422";
++			receive,vc = <3>;
++		};
 +	};
 +
 +	port {
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
-+		csi2_20_ep: endpoint {
++		csi2_41_ep: endpoint {
 +			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			csi-rate = <280>;
++			data-lanes = <1 2 3 4>;
++			csi-rate = <300>;
 +		};
 +	};
 +};
@@ -19591,6 +14920,1535 @@ index 0000000..b854216
 +&wlcore {
 +	status = "disabled";
 +};
+diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+new file mode 100644
+index 0000000..b904a0d
+--- /dev/null
++++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+@@ -0,0 +1,1523 @@
++/*
++ * Device Tree Source for the ULCB Kingfisher board
++ *
++ * Copyright (C) 2017 Renesas Electronics Corp.
++ * Copyright (C) 2017 Cogent Embedded, Inc.
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2.  This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++/ {
++	aliases {
++		serial1 = &hscif0;
++		serial2 = &hscif1;
++		serial3 = &scif1;
++	};
++
++	snd_clk: snd_clk {
++		compatible = "fixed-clock";
++		#clock-cells = <0>;
++		clock-frequency = <24576000>;
++		clock-output-names = "scki";
++	};
++
++	wlan_en: regulator@4 {
++		compatible = "regulator-fixed";
++		regulator-name = "wlan-en-regulator";
++
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpio = <&gpio_ext_74 4 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++	};
++
++	vcc_sdhi3: regulator@41 {
++		compatible = "regulator-fixed";
++
++		regulator-name = "SDHI3 Vcc";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpio = <&gpio4 17 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++	};
++
++	vccq_sdhi3: regulator@5 {
++		compatible = "regulator-fixed";
++
++		regulator-name = "SDHI3 VccQ";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++	};
++
++	codec_en_reg: regulator@6 {
++		compatible = "regulator-fixed";
++		regulator-name = "codec-en-regulator";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpio = <&gpio_ext_74 15 0>;
++
++		/* delay - CHECK */
++		startup-delay-us = <70000>;
++		enable-active-high;
++	};
++
++	amp_en_reg: regulator@7 {
++		compatible = "regulator-fixed";
++		regulator-name = "amp-en-regulator";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpio = <&gpio_ext_74 0 0>;
++
++		startup-delay-us = <0>;
++		enable-active-high;
++	};
++
++	sdio_switch: regulator@9 {
++		compatible = "regulator-fixed";
++		regulator-name = "wifi_on";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		gpio = <&gpio_ext_74 5 0>;
++		enable-active-low;
++		regulator-always-on;
++	};
++
++	radio_switch: regulator@11 {
++		compatible = "regulator-fixed";
++		regulator-name = "radio_on";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		gpio = <&gpio_ext_74 13 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++		regulator-always-on;
++	};
++
++	mpcie_3v3: regulator@12 {
++		compatible = "regulator-fixed";
++		regulator-name = "mPCIe 3v3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		gpio = <&gpio_ext_77 14 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++	};
++
++	mpcie_1v8: regulator@13 {
++		compatible = "regulator-fixed";
++		regulator-name = "mPCIe 1v8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++		gpio = <&gpio_ext_77 15 GPIO_ACTIVE_HIGH>;
++		startup-delay-us = <200000>;
++		enable-active-high;
++	};
++
++	kim {
++		compatible = "kim";
++		shutdown-gpios = <&gpio_ext_74 3 GPIO_ACTIVE_HIGH>;
++		/* serial1 */
++		dev_name = "/dev/ttySC1";
++		flow_cntrl = <1>;
++		/* int div 8 hscif@26.6666656MHz */
++		baud_rate = <3333332>;
++	};
++
++	btwilink {
++		compatible = "btwilink";
++	};
++
++	sound_ext: sound@0 {
++		pinctrl-0 = <&sound_0_pins>;
++		pinctrl-names = "default";
++		compatible = "simple-audio-card";
++
++		simple-audio-card,format = "left_j";
++		simple-audio-card,name = "pcm3168a";
++
++		simple-audio-card,bitclock-master = <&sound_ext_master>;
++		simple-audio-card,frame-master = <&sound_ext_master>;
++		sound_ext_master: simple-audio-card,cpu@0 {
++			sound-dai = <&rcar_sound 0>;
++			dai-tdm-slot-num = <8>;
++			dai-tdm-slot-width = <32>;
++		};
++
++		simple-audio-card,codec@0 {
++			sound-dai = <&pcm3168a>;
++			dai-tdm-slot-num = <8>;
++			dai-tdm-slot-width = <32>;
++			system-clock-frequency = <24576000>;
++		};
++	};
++
++	/delete-node/sound;
++
++	rsnd_ak4613: sound@1 {
++		pinctrl-0 = <&sound_1_pins>;
++		pinctrl-names = "default";
++		compatible = "simple-audio-card";
++
++		simple-audio-card,format = "left_j";
++		simple-audio-card,name = "ak4613";
++
++		simple-audio-card,bitclock-master = <&sndcpu>;
++		simple-audio-card,frame-master = <&sndcpu>;
++
++		sndcpu: simple-audio-card,cpu@1 {
++			sound-dai = <&rcar_sound 1>;
++		};
++
++		sndcodec: simple-audio-card,codec@1 {
++			sound-dai = <&ak4613>;
++		};
++	};
++
++	sound_radio: sound@2 {
++		pinctrl-0 = <&sound_2_pins>;
++		pinctrl-names = "default";
++		compatible = "simple-audio-card";
++
++		simple-audio-card,format = "i2s";
++		simple-audio-card,name = "radio";
++
++		simple-audio-card,bitclock-master = <&sound_radio_master>;
++		simple-audio-card,frame-master = <&sound_radio_master>;
++		simple-audio-card,cpu@2 {
++			sound-dai = <&rcar_sound 2>;
++		};
++
++		sound_radio_master: simple-audio-card,codec@2 {
++			sound-dai = <&radio>;
++			system-clock-frequency = <12288000>;
++		};
++	};
++
++	sound_wl18xx: sound@3 {
++		pinctrl-0 = <&sound_3_pins>;
++		pinctrl-names = "default";
++		compatible = "simple-audio-card";
++
++		simple-audio-card,format = "i2s";
++		simple-audio-card,name = "wl18xx";
++
++		simple-audio-card,bitclock-master = <&sound_wl18xx_master>;
++		simple-audio-card,frame-master = <&sound_wl18xx_master>;
++		sound_wl18xx_master: simple-audio-card,cpu@3 {
++			sound-dai = <&rcar_sound 3>;
++		};
++
++		simple-audio-card,codec@3 {
++			sound-dai = <&wl18xx_pcm>;
++		};
++	};
++
++	lvds-encoder {
++		compatible = "thine,thc63lvdm83d";
++
++		ports {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			port@0 {
++				reg = <0>;
++				lvds_enc_in: endpoint {
++					remote-endpoint = <&du_out_lvds0>;
++				};
++			};
++			port@1 {
++				reg = <1>;
++				lvds_enc_out: endpoint {
++					remote-endpoint = <&lvds_in>;
++				};
++			};
++		};
++	};
++
++	lvds {
++		compatible = "lvds-connector";
++
++		width-mm = <210>;
++		height-mm = <158>;
++
++		panel-timing {
++			/* 1280x800 @60Hz */
++			clock-frequency = <65000000>;
++			hactive = <1280>;
++			vactive = <800>;
++			hsync-len = <40>;
++			hfront-porch = <80>;
++			hback-porch = <40>;
++			vfront-porch = <14>;
++			vback-porch = <14>;
++			vsync-len = <4>;
++		};
++
++		port {
++			lvds_in: endpoint {
++				remote-endpoint = <&lvds_enc_out>;
++			};
++		};
++	};
++
++	hdmi-out {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_con: endpoint {
++				remote-endpoint = <&adv7513_out>;
++			};
++		};
++	};
++
++	radio: si468x@0 {
++		compatible = "si,si468x-pcm";
++		status = "okay";
++
++		#sound-dai-cells = <0>;
++	};
++
++	wl18xx_pcm: wl18xx_pcm@0 {
++		compatible = "ti,wl18xx-pcm";
++		status = "okay";
++
++		#sound-dai-cells = <0>;
++	};
++
++	camera_clk: camera_clk {
++		compatible = "fixed-clock";
++		#clock-cells = <0>;
++		clock-frequency = <24000000>;
++		clock-output-names = "mclk";
++	};
++};
++
++&pfc {
++	scif1_pins: scif1 {
++		groups = "scif1_data_b";
++		function = "scif1";
++	};
++
++	hscif0_pins: hscif0 {
++		groups = "hscif0_data", "hscif0_ctrl";
++		function = "hscif0";
++	};
++
++	hscif1_pins: hscif1 {
++		groups = "hscif1_data_a", "hscif1_ctrl_a";
++		function = "hscif1";
++	};
++
++	du_pins: du {
++		groups = "du_rgb888", "du_sync", "du_clk_out_0", "du_disp";
++		function = "du";
++	};
++
++	sdhi3_pins_3v3: sd3_3v3 {
++		groups = "sdhi3_data4", "sdhi3_ctrl";
++		function = "sdhi3";
++		power-source = <3300>;
++	};
++
++	sdhi3_pins_1v8: sd3_1v8 {
++		groups = "sdhi3_data4", "sdhi3_ctrl";
++		function = "sdhi3";
++		power-source = <1800>;
++	};
++
++	sound_0_pins: sound0 {
++		groups = "ssi34_ctrl", "ssi3_data", "ssi4_data";
++		function = "ssi";
++	};
++
++	sound_1_pins: sound1 {
++		groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data_a";
++		function = "ssi";
++	};
++
++	sound_2_pins: sound2 {
++		groups = "ssi6_ctrl", "ssi6_data";
++		function = "ssi";
++	};
++
++	sound_3_pins: sound3 {
++		groups = "ssi78_ctrl", "ssi7_data", "ssi8_data";
++		function = "ssi";
++	};
++
++	usb0_pins: usb0 {
++		groups = "usb0";
++		function = "usb0";
++	};
++
++	can0_pins: can0 {
++		groups = "can0_data_a";
++		function = "can0";
++	};
++
++	can1_pins: can1 {
++		groups = "can1_data";
++		function = "can1";
++	};
++
++	canfd0_pins: canfd0 {
++		groups = "canfd0_data_a";
++		function = "canfd0";
++	};
++
++	canfd1_pins: canfd1 {
++		groups = "canfd1_data";
++		function = "canfd1";
++	};
++
++	vin5_pins: vin5 {
++		groups = "vin5_data8", "vin5_sync", "vin5_clk";
++		function = "vin5";
++	};
++};
++
++&du {
++	pinctrl-0 = <&du_pins>;
++	pinctrl-names = "default";
++};
++
++&gpio2 {
++	bl_pwm {
++		gpio-hog;
++		gpios = <3 GPIO_ACTIVE_HIGH>;
++		output-high;
++		line-name = "BL PWM 100%";
++	};
++};
++
++&gpio6 {
++	audio_sw {
++		gpio-hog;
++		gpios = <21 GPIO_ACTIVE_HIGH>;
++		output-high;
++		line-name = "Onboard MCh Audio";
++	};
++};
++
++&scif1 {
++	pinctrl-0 = <&scif1_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&hscif0 {
++	pinctrl-0 = <&hscif0_pins>;
++	pinctrl-names = "default";
++	uart-has-rtscts;
++
++	status = "okay";
++};
++
++&hscif1 {
++	pinctrl-0 = <&hscif1_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&i2c2 {
++	clock-frequency = <400000>;
++
++	gpio_ext_74: pca9539@74 {
++		compatible = "nxp,pca9539";
++		reg = <0x74>;
++		gpio-controller;
++		#gpio-cells = <2>;
++		interrupt-controller;
++		interrupt-parent = <&gpio6>;
++		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
++
++		hub_pwen {
++			gpio-hog;
++			gpios = <6 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "HUB pwen";
++		};
++		hub_rst {
++			gpio-hog;
++			gpios = <7 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "HUB rst";
++		};
++		otg_offvbus {
++			gpio-hog;
++			gpios = <8 GPIO_ACTIVE_HIGH>;
++			output-low;
++			line-name = "OTG off VBUSn";
++		};
++		otg_extlpn {
++			gpio-hog;
++			gpios = <9 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "OTG EXTLPn";
++		};
++		otg_stat1 {
++			gpio-hog;
++			gpios = <10 GPIO_ACTIVE_HIGH>;
++			input;
++			line-name = "OTG Stat1";
++		};
++		otg_stat2 {
++			gpio-hog;
++			gpios = <11 GPIO_ACTIVE_HIGH>;
++			input;
++			line-name = "OTG Stat2";
++		};
++	};
++
++	gpio_ext_75: pca9539@75 {
++		compatible = "nxp,pca9539";
++		reg = <0x75>;
++		gpio-controller;
++		#gpio-cells = <2>;
++		interrupt-controller;
++		interrupt-parent = <&gpio6>;
++		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
++
++		gps_rst {
++			gpio-hog;
++			gpios = <6 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "GPS rst";
++		};
++		fpdl_shdn {
++			gpio-hog;
++			gpios = <9 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "FPDLink shdn";
++		};
++	};
++
++	i2cswitch2: pca9548@74 {
++		compatible = "nxp,pca9548";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		reg = <0x71>;
++		reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
++
++		i2c@0 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <0>;
++			/* BCM node(s) */
++		};
++
++		i2c@1 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <1>;
++			/* USB3.0 HUB node(s) */
++		};
++
++		i2c@2 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <2>;
++			/* Power amp node(s) */
++		};
++
++		i2c@3 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <3>;
++			/* Radio node(s) */
++		};
++
++		i2c@4 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <4>;
++
++			hdmi@3d {
++				compatible = "adi,adv7511w";
++				reg = <0x3d>;
++//				interrupt-parent = <&gpio2>;
++//				interrupts = <0 IRQ_TYPE_EDGE_BOTH>;
++				pd-gpios = <&gpio_ext_75 5 GPIO_ACTIVE_LOW>;
++
++				adi,input-depth = <8>;
++				adi,input-colorspace = "rgb";
++				adi,input-clock = "1x";
++				adi,input-style = <1>;
++				adi,input-justification = "evenly";
++				adi,clock-delay = <1200>;
++				adi,clock-max-rate = <100000>;
++
++				ports {
++					#address-cells = <1>;
++					#size-cells = <0>;
++
++					port@0 {
++						reg = <0>;
++						adv7513_in: endpoint {
++							remote-endpoint = <&du_out_rgb>;
++						};
++					};
++
++					port@1 {
++						reg = <1>;
++						adv7513_out: endpoint {
++							remote-endpoint = <&hdmi_con>;
++						};
++					};
++				};
++			};
++		};
++
++		i2c@5 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <5>;
++			/* PCIe node(s) */
++		};
++
++		i2c@6 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <6>;
++			/* LVDS display node(s) */
++
++			polytouch: edt-ft5x06@38 {
++				compatible = "edt,edt-ft5x06";
++				reg = <0x38>;
++				interrupt-parent = <&gpio5>;
++				interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
++			};
++		};
++
++		i2c@7 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <7>;
++			/* Audio, GPS and Gyro node(s) */
++
++			pcm3168a: audio-codec@44 {
++				#sound-dai-cells = <0>;
++				compatible = "ti,pcm3168a";
++				reg = <0x44>;
++				clocks = <&snd_clk>;
++				clock-names = "scki";
++				tdm;
++				VDD1-supply = <&codec_en_reg>;
++				VDD2-supply = <&codec_en_reg>;
++				VCCAD1-supply = <&codec_en_reg>;
++				VCCAD2-supply = <&codec_en_reg>;
++				VCCDA1-supply = <&amp_en_reg>;
++				VCCDA2-supply = <&amp_en_reg>;
++			};
++
++			lsm9ds0_acc_mag@1d {
++				compatible = "st,lsm9ds0_accel_magn";
++				reg = <0x1d>;
++			};
++
++			lsm9ds0_gyr@6b {
++				compatible = "st,lsm9ds0_gyro";
++				reg = <0x6b>;
++			};
++
++			/* GPS@ 0x42 */
++		};
++	};
++};
++
++&i2c4 {
++	gpio_ext_76: pca9539@76 {
++		compatible = "nxp,pca9539";
++		reg = <0x76>;
++		gpio-controller;
++		#gpio-cells = <2>;
++		interrupt-controller;
++		interrupt-parent = <&gpio7>;
++		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
++
++		port_b_a0 {
++			gpio-hog;
++			gpios = <0 GPIO_ACTIVE_HIGH>;
++			output-low;
++			line-name = "Video-B A0";
++		};
++		port_b_a1 {
++			gpio-hog;
++			gpios = <1 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "Video-B A1";
++		};
++		port_a_a0 {
++			gpio-hog;
++			gpios = <2 GPIO_ACTIVE_HIGH>;
++			output-low;
++			line-name = "Video-A A0";
++		};
++		port_a_a1 {
++			gpio-hog;
++			gpios = <3 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "Video-A A1";
++		};
++		cmos_pwdn {
++			gpio-hog;
++			gpios = <8 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "CMOS PWDN";
++		};
++		cmos_rst {
++			gpio-hog;
++			gpios = <9 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "CMOS RST";
++		};
++		/* pin 12 - CAM_CLK */
++		rpi_cam_io_1 {
++			gpio-hog;
++			gpios = <10 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "RaspB_IO1";
++		};
++		/* pin 11 - CAM_GPIO - assume pwdn */
++		rpi_cam_io_0 {
++			gpio-hog;
++			gpios = <11 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "RaspB_IO0";
++		};
++		sam_rst {
++			gpio-hog;
++			gpios = <4 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "SAM RST";
++		};
++		sam_pwr {
++			gpio-hog;
++			gpios = <5 GPIO_ACTIVE_HIGH>;
++			output-low;
++			line-name = "SAM PWR";
++		};
++		/* 0 - FPDLink output, 1 - LVDS output */
++		lvds_vs_fpdl {
++			gpio-hog;
++			gpios = <14 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "LVDS switch";
++		};
++	};
++
++	gpio_ext_77: pca9539@77 {
++		compatible = "nxp,pca9539";
++		reg = <0x77>;
++		gpio-controller;
++		#gpio-cells = <2>;
++		interrupt-controller;
++		interrupt-parent = <&gpio5>;
++		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
++
++		mpcie_wake {
++			gpio-hog;
++			gpios = <0 GPIO_ACTIVE_HIGH>;
++			output-low;
++			line-name = "mPCIe WAKE#";
++		};
++		mpcie_wdisable {
++			gpio-hog;
++			gpios = <1 GPIO_ACTIVE_HIGH>;
++			output-high;
++			line-name = "mPCIe W_DISABLE";
++		};
++		mpcie_clreq {
++			gpio-hog;
++			gpios = <2 GPIO_ACTIVE_HIGH>;
++			input;
++			line-name = "mPCIe CLKREQ#";
++		};
++		mpcie_ovc {
++			gpio-hog;
++			gpios = <3 GPIO_ACTIVE_HIGH>;
++			input;
++			line-name = "mPCIe OVC";
++		};
++	};
++
++	i2cswitch4: pca9548@74 {
++		compatible = "nxp,pca9548";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		reg = <0x71>;
++		reset-gpios= <&gpio3 15 GPIO_ACTIVE_LOW>;
++
++		i2c@0 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <0>;
++			/* SAM node(s) */
++		};
++
++		i2c@1 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <1>;
++			/* Slot A (CN10) */
++
++			ov106xx@0 {
++				compatible = "ovti,ov106xx";
++				reg = <0x60>;
++
++				port@0 {
++					ov106xx_in0: endpoint {
++						clock-lanes = <0>;
++						data-lanes = <1 2 3 4>;
++						remote-endpoint = <&vin0ep0>;
++					};
++				};
++				port@1 {
++					ov106xx_max9286_des0ep0: endpoint@0 {
++						remote-endpoint = <&max9286_des0ep0>;
++					};
++					ov106xx_ti964_des0ep0: endpoint@1 {
++						remote-endpoint = <&ti964_des0ep0>;
++					};
++					ov106xx_ti954_des0ep0: endpoint@2 {
++						remote-endpoint = <&ti954_des0ep0>;
++					};
++				};
++			};
++
++			ov106xx@1 {
++				compatible = "ovti,ov106xx";
++				reg = <0x61>;
++
++				port@0 {
++					ov106xx_in1: endpoint {
++						clock-lanes = <0>;
++						data-lanes = <1 2 3 4>;
++						remote-endpoint = <&vin1ep0>;
++					};
++				};
++				port@1 {
++					ov106xx_max9286_des0ep1: endpoint@0 {
++						remote-endpoint = <&max9286_des0ep1>;
++					};
++					ov106xx_ti964_des0ep1: endpoint@1 {
++						remote-endpoint = <&ti964_des0ep1>;
++					};
++					ov106xx_ti954_des0ep1: endpoint@2 {
++						remote-endpoint = <&ti954_des0ep1>;
++					};
++				};
++			};
++
++			ov106xx@2 {
++				compatible = "ovti,ov106xx";
++				reg = <0x62>;
++
++				port@0 {
++					ov106xx_in2: endpoint {
++						clock-lanes = <0>;
++						data-lanes = <1 2 3 4>;
++						remote-endpoint = <&vin2ep0>;
++					};
++				};
++				port@1 {
++					ov106xx_max9286_des0ep2: endpoint@0 {
++						remote-endpoint = <&max9286_des0ep2>;
++					};
++					ov106xx_ti964_des0ep2: endpoint@1 {
++						remote-endpoint = <&ti964_des0ep2>;
++					};
++				};
++			};
++
++			ov106xx@3 {
++				compatible = "ovti,ov106xx";
++				reg = <0x63>;
++
++				port@0 {
++					ov106xx_in3: endpoint {
++						clock-lanes = <0>;
++						data-lanes = <1 2 3 4>;
++						remote-endpoint = <&vin3ep0>;
++					};
++				};
++				port@1 {
++					ov106xx_max9286_des0ep3: endpoint@0 {
++						remote-endpoint = <&max9286_des0ep3>;
++					};
++					ov106xx_ti964_des0ep3: endpoint@1 {
++						remote-endpoint = <&ti964_des0ep3>;
++					};
++				};
++			};
++
++			/* DS90UB964 @ 0x3a */
++			ti964-ti9x3@0 {
++				compatible = "ti,ti964-ti9x3";
++				reg = <0x3a>;
++				ti,sensor_delay = <350>;
++				ti,links = <4>;
++				ti,lanes = <4>;
++				ti,forwarding-mode = "round-robin";
++				ti,cable-mode = "coax";
++
++				port@0 {
++					ti964_des0ep0: endpoint@0 {
++						ti9x3-addr = <0x0c>;
++						dvp-order = <0>;
++						remote-endpoint = <&ov106xx_in0>;
++					};
++					ti964_des0ep1: endpoint@1 {
++						ti9x3-addr = <0x0d>;
++						dvp-order = <0>;
++						remote-endpoint = <&ov106xx_in1>;
++					};
++					ti964_des0ep2: endpoint@2 {
++						ti9x3-addr = <0x0e>;
++						dvp-order = <0>;
++						remote-endpoint = <&ov106xx_in2>;
++					};
++					ti964_des0ep3: endpoint@3 {
++						ti9x3-addr = <0x0f>;
++						dvp-order = <0>;
++						remote-endpoint = <&ov106xx_in3>;
++					};
++				};
++				port@1 {
++					ti964_csi0ep0: endpoint {
++						csi-rate = <1450>;
++						remote-endpoint = <&csi2_40_ep>;
++					};
++				};
++			};
++
++			/* DS90UB954 @ 0x38 */
++			ti954-ti9x3@0 {
++				compatible = "ti,ti954-ti9x3";
++				reg = <0x38>;
++				/* gpios = <&video_a_ext1 10 GPIO_ACTIVE_HIGH>; */
++				ti,sensor_delay = <350>;
++				ti,links = <2>;
++				ti,lanes = <4>;
++				ti,forwarding-mode = "round-robin";
++				ti,cable-mode = "coax";
++
++				port@0 {
++					ti954_des0ep0: endpoint@0 {
++						ti9x3-addr = <0x0c>;
++						dvp-order = <0>;
++						remote-endpoint = <&ov106xx_in0>;
++					};
++					ti954_des0ep1: endpoint@1 {
++						ti9x3-addr = <0x0d>;
++						dvp-order = <0>;
++						remote-endpoint = <&ov106xx_in1>;
++					};
++				};
++				port@1 {
++					ti954_csi0ep0: endpoint {
++						csi-rate = <1450>;
++						remote-endpoint = <&csi2_40_ep>;
++					};
++				};
++			};
++
++			/* MAX9286 @ 0x2c */
++			max9286-max9271@0 {
++				compatible = "maxim,max9286-max9271";
++				reg = <0x2c>;
++				maxim,sensor_delay = <350>;
++				maxim,links = <4>;
++				maxim,lanes = <4>;
++				maxim,resetb-gpio = <1>;
++				maxim,fsync-mode = "automatic";
++				maxim,timeout = <100>;
++
++				port@0 {
++					max9286_des0ep0: endpoint@0 {
++						max9271-addr = <0x50>;
++						dvp-order = <1>;
++						remote-endpoint = <&ov106xx_in0>;
++					};
++					max9286_des0ep1: endpoint@1 {
++						max9271-addr = <0x51>;
++						dvp-order = <1>;
++						remote-endpoint = <&ov106xx_in1>;
++					};
++					max9286_des0ep2: endpoint@2 {
++						max9271-addr = <0x52>;
++						dvp-order = <1>;
++						remote-endpoint = <&ov106xx_in2>;
++					};
++					max9286_des0ep3: endpoint@3 {
++						max9271-addr = <0x53>;
++						dvp-order = <1>;
++						remote-endpoint = <&ov106xx_in3>;
++					};
++				};
++				port@1 {
++					max9286_csi0ep0: endpoint {
++						csi-rate = <700>;
++						remote-endpoint = <&csi2_40_ep>;
++					};
++				};
++			};
++		};
++
++		i2c@3 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <3>;
++			/* MOST node(s) */
++		};
++
++		i2c@4 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <4>;
++
++			rpi_camera: ov5647@36 {
++				compatible = "ovti,ov5647";
++				reg = <0x36>;
++
++				port@0 {
++					rpi_camera_in: endpoint {
++						clock-lanes = <0>;
++						data-lanes = <1 2>;
++						remote-endpoint = <&vin4ep0>;
++					};
++				};
++			};
++		};
++
++		i2c@5 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <5>;
++
++			cmos_camera: ov5642@3c {
++				compatible = "ovti,ov5642";
++				reg = <0x3c>;
++				clocks = <&camera_clk>;
++				clock-names = "mclk";
++
++				port@0 {
++					cmos_camera_in: endpoint {
++						remote-endpoint = <&vin5ep0>;
++					};
++				};
++			};
++		};
++
++		i2c@7 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <7>;
++			/* Slot A (CN10) */
++
++			video_a_ext0: pca9535@26 {
++				compatible = "nxp,pca9535";
++				reg = <0x26>;
++				gpio-controller;
++				#gpio-cells = <2>;
++
++				video_a_des_cfg1 {
++					gpio-hog;
++					gpios = <5 GPIO_ACTIVE_HIGH>;
++					input;
++					line-name = "Video-A cfg1";
++				};
++				video_a_des_cfg0 {
++					gpio-hog;
++					gpios = <6 GPIO_ACTIVE_HIGH>;
++					input;
++					line-name = "Video-A cfg0";
++				};
++				video_a_pwr_shdn {
++					gpio-hog;
++					gpios = <3 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR_SHDN";
++				};
++				video_a_cam_pwr0 {
++					gpio-hog;
++					gpios = <12 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR0";
++				};
++				video_a_cam_pwr1 {
++					gpio-hog;
++					gpios = <13 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR1";
++				};
++				video_a_cam_pwr2 {
++					gpio-hog;
++					gpios = <14 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR2";
++				};
++				video_a_cam_pwr3 {
++					gpio-hog;
++					gpios = <15 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR3";
++				};
++				video_a_des_shdn {
++					gpio-hog;
++					gpios = <4 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A DES_SHDN";
++				};
++				video_a_des_led {
++					gpio-hog;
++					gpios = <7 GPIO_ACTIVE_HIGH>;
++					output-low;
++					line-name = "Video-A led";
++				};
++			};
++
++			video_a_ext1: max7325@5c {
++				compatible = "maxim,max7325";
++				reg = <0x5c>;
++				gpio-controller;
++				#gpio-cells = <2>;
++
++				video_a_des_cfg2 {
++					gpio-hog;
++					gpios = <4 GPIO_ACTIVE_HIGH>;
++					input;
++					line-name = "Video-A cfg2";
++				};
++				video_a_des_cfg1 {
++					gpio-hog;
++					gpios = <6 GPIO_ACTIVE_HIGH>;
++					input;
++					line-name = "Video-A cfg1";
++				};
++				video_a_des_cfg0 {
++					gpio-hog;
++					gpios = <7 GPIO_ACTIVE_HIGH>;
++					input;
++					line-name = "Video-A cfg0";
++				};
++				video_a_pwr_shdn {
++					gpio-hog;
++					gpios = <14 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR_SHDN";
++				};
++				video_a_cam_pwr0 {
++					gpio-hog;
++					gpios = <8 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR0";
++				};
++				video_a_cam_pwr1 {
++					gpio-hog;
++					gpios = <9 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR1";
++				};
++				video_a_cam_pwr2 {
++					gpio-hog;
++					gpios = <10 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR2";
++				};
++				video_a_cam_pwr3 {
++					gpio-hog;
++					gpios = <11 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A PWR3";
++				};
++				video_a_des_shdn {
++					gpio-hog;
++					gpios = <13 GPIO_ACTIVE_HIGH>;
++					output-high;
++					line-name = "Video-A DES_SHDN";
++				};
++				video_a_led {
++					gpio-hog;
++					gpios = <12 GPIO_ACTIVE_HIGH>;
++					output-low;
++					line-name = "Video-A LED";
++				};
++			};
++		};
++	};
++};
++
++&pcie_bus_clk {
++	clock-frequency = <100000000>;
++	status = "okay";
++};
++
++&pciec0 {
++	status = "okay";
++};
++
++&pciec1 {
++	status = "okay";
++};
++
++&vin0 {
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin0ep0: endpoint {
++				csi,select = "csi40";
++				virtual,channel = <0>;
++				data-lanes = <1 2 3 4>;
++				remote-endpoint = <&ov106xx_in0>;
++			};
++		};
++		port@1 {
++			csi0ep0: endpoint {
++				remote-endpoint = <&csi2_40_ep>;
++			};
++		};
++		port@2 {
++			vin0_max9286_des0ep0: endpoint@0 {
++				remote-endpoint = <&max9286_des0ep0>;
++			};
++			vin0_ti964_des0ep0: endpoint@1 {
++				remote-endpoint = <&ti964_des0ep0>;
++			};
++			vin0_ti954_des0ep0: endpoint@2 {
++				remote-endpoint = <&ti954_des0ep0>;
++			};
++		};
++	};
++};
++
++&vin1 {
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin1ep0: endpoint {
++				csi,select = "csi40";
++				virtual,channel = <1>;
++				data-lanes = <1 2 3 4>;
++				remote-endpoint = <&ov106xx_in1>;
++			};
++		};
++		port@1 {
++			csi0ep1: endpoint {
++				remote-endpoint = <&csi2_40_ep>;
++			};
++		};
++		port@2 {
++			vin1_max9286_des0ep1: endpoint@0 {
++				remote-endpoint = <&max9286_des0ep1>;
++			};
++			vin1_ti964_des0ep1: endpoint@1 {
++				remote-endpoint = <&ti964_des0ep1>;
++			};
++			vin1_ti954_des0ep1: endpoint@2 {
++				remote-endpoint = <&ti954_des0ep1>;
++			};
++		};
++	};
++};
++
++&vin2 {
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin2ep0: endpoint {
++				csi,select = "csi40";
++				virtual,channel = <2>;
++				data-lanes = <1 2 3 4>;
++				remote-endpoint = <&ov106xx_in2>;
++			};
++		};
++		port@1 {
++			csi0ep2: endpoint {
++				remote-endpoint = <&csi2_40_ep>;
++			};
++		};
++		port@2 {
++			vin2_max9286_des0ep2: endpoint@0 {
++				remote-endpoint = <&max9286_des0ep2>;
++			};
++			vin2_ti964_des0ep2: endpoint@1 {
++				remote-endpoint = <&ti964_des0ep2>;
++			};
++		};
++	};
++};
++
++&vin3 {
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin3ep0: endpoint {
++				csi,select = "csi40";
++				virtual,channel = <3>;
++				data-lanes = <1 2 3 4>;
++				remote-endpoint = <&ov106xx_in3>;
++			};
++		};
++		port@1 {
++			csi0ep3: endpoint {
++				remote-endpoint = <&csi2_40_ep>;
++			};
++		};
++		port@2 {
++			vin3_max9286_des0ep3: endpoint@0 {
++				remote-endpoint = <&max9286_des0ep3>;
++			};
++			vin3_ti964_des0ep3: endpoint@1 {
++				remote-endpoint = <&ti964_des0ep3>;
++			};
++		};
++	};
++};
++
++&vin4 {
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin4ep0: endpoint {
++				csi,select = "csi20";
++				virtual,channel = <0>;
++				remote-endpoint = <&rpi_camera_in>;
++				data-lanes = <1 2>;
++			};
++		};
++		port@1 {
++			csi2ep0: endpoint {
++				remote-endpoint = <&csi2_20_ep>;
++			};
++		};
++	};
++};
++
++&vin5 {
++	pinctrl-0 = <&vin5_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	ports {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		port@0 {
++			vin5ep0: endpoint@0 {
++				bus-width = <8>;
++				/* #HSYNC, #VSYNC */
++				vsync-active = <1>;
++				hsync-active = <0>;
++				remote-endpoint = <&cmos_camera_in>;
++			};
++		};
++	};
++};
++
++&csi2_40 {
++	status = "okay";
++
++	virtual,channel {
++		csi2_vc0 {
++			data,type = "ycbcr422";
++			receive,vc = <0>;
++		};
++		csi2_vc1 {
++			data,type = "ycbcr422";
++			receive,vc = <1>;
++		};
++		csi2_vc2 {
++			data,type = "ycbcr422";
++			receive,vc = <2>;
++		};
++		csi2_vc3 {
++			data,type = "ycbcr422";
++			receive,vc = <3>;
++		};
++	};
++
++	port {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		csi2_40_ep: endpoint {
++			clock-lanes = <0>;
++			data-lanes = <1 2 3 4>;
++			csi-rate = <300>;
++		};
++	};
++};
++
++&csi2_20 {
++	status = "okay";
++
++	virtual,channel {
++		csi2_vc0 {
++			data,type = "raw8";
++			receive,vc = <0>;
++		};
++	};
++
++	port {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		csi2_20_ep: endpoint {
++			clock-lanes = <0>;
++			data-lanes = <1 2>;
++			csi-rate = <280>;
++		};
++	};
++};
++
++
++&rcar_sound {
++	pinctrl-0 = <&sound_clk_pins>;
++	pinctrl-names = "default";
++
++	/* Multi DAI */
++	#sound-dai-cells = <1>;
++
++	rcar_sound,dai {
++		dai0 {
++			playback = <&ssi3>;
++			capture  = <&ssi4>;
++		};
++
++		dai1 {
++			playback = <&ssi0 &src0 &dvc0>;
++			capture  = <&ssi1 &src1 &dvc1>;
++		};
++
++		dai2 {
++			capture  = <&ssi6>;
++		};
++
++		dai3 {
++			playback = <&ssi7>;
++			capture  = <&ssi8>;
++		};
++	};
++};
++
++&sdhi3 {
++	pinctrl-0 = <&sdhi3_pins_3v3>;
++	pinctrl-1 = <&sdhi3_pins_1v8>;
++	pinctrl-names = "default", "state_uhs";
++
++	vmmc-supply = <&wlan_en>;
++	vqmmc-supply = <&vccq_sdhi3>;
++	keep-power-in-suspend;
++	enable-sdio-wakeup;
++	bus-width = <4>;
++	no-1-8-v;
++	non-removable;
++	cap-power-off-card;
++	max-frequency = <26000000>;
++	status = "okay";
++
++	#address-cells = <1>;
++	#size-cells = <0>;
++	wlcore: wlcore@2 {
++		compatible = "ti,wl1837";
++		reg = <2>;
++		interrupt-parent = <&gpio1>;
++		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
++	};
++};
++
++&usb2_phy0 {
++	pinctrl-0 = <&usb0_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&ehci0 {
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&xhci0 {
++	status = "okay";
++};
++
++&msiof1 {
++	status = "disabled";
++};
++
++&can0 {
++	pinctrl-0 = <&can0_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&can1 {
++	pinctrl-0 = <&can1_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&canfd {
++	pinctrl-0 = <&canfd0_pins &canfd1_pins>;
++	pinctrl-names = "default";
++	status = "disabled";
++
++	channel0 {
++		status = "okay";
++	};
++
++	channel1 {
++		status = "okay";
++	};
++};
++
++&ssi4 {
++	shared-pin;
++};
++
++&ssi8 {
++	shared-pin;
++};
++
++&pciec1 {
++	pcie3v3-supply = <&mpcie_3v3>;
++	pcie1v8-supply = <&mpcie_1v8>;
++};
++
++/* uncomment to enable CN47: SD on SDHI3 */
++//#include "ulcb-kf-sd3.dtsi"
 diff --git a/arch/arm64/boot/dts/renesas/ulcb-vb-cn12.dtsi b/arch/arm64/boot/dts/renesas/ulcb-vb-cn12.dtsi
 new file mode 100644
 index 0000000..92ed4a4