VB2: enable ULCB sound

1 files changed, 10 insertions, 46 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 bd872ac..6e93fa6 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
@@ -1,4 +1,4 @@
-From fbc9403a97c602447751b49aa9d4d9cea56fef4c Mon Sep 17 00:00:00 2001
+From feb70aaac3b9760a732129c9dc6d7cbe9abc32b1 Mon Sep 17 00:00:00 2001
 From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
 Date: Fri, 14 Jul 2017 15:05:42 +0300
 Subject: [PATCH] arm64: dts: renesas: add ADAS boards
@@ -39,7 +39,7 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
  arch/arm64/boot/dts/renesas/legacy/Makefile        |    8 +
  .../renesas/legacy/r8a7795-es1-h3ulcb-kf-v0.dts    | 1624 +++++++++++++++++++
  .../renesas/legacy/r8a7795-es1-h3ulcb-kf-v1.dts    |  441 ++++++
- .../dts/renesas/legacy/r8a7795-h3ulcb-kf-v0.dts    | 1638 +++++++++++++++++++
+ .../dts/renesas/legacy/r8a7795-h3ulcb-kf-v0.dts    | 1638 ++++++++++++++++++++
  .../dts/renesas/legacy/r8a7795-h3ulcb-kf-v1.dts    |  465 ++++++
  .../dts/renesas/legacy/r8a7796-m3ulcb-kf-v0.dts    | 1171 ++++++++++++++
  .../dts/renesas/legacy/r8a7796-m3ulcb-kf-v1.dts    |  465 ++++++
@@ -77,11 +77,11 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
  .../boot/dts/renesas/r8a7797-es1-v3msk-view.dts    |   17 +
  arch/arm64/boot/dts/renesas/r8a7797-es1-v3msk.dts  |   17 +
  arch/arm64/boot/dts/renesas/r8a7797-es1.dtsi       |  116 ++
- arch/arm64/boot/dts/renesas/r8a7797-v3msk-kf.dts   |  520 ++++++
+ arch/arm64/boot/dts/renesas/r8a7797-v3msk-kf.dts   |  520 +++++++
  .../boot/dts/renesas/r8a7797-v3msk-vbm-v2.dts      |   81 +
  arch/arm64/boot/dts/renesas/r8a7797-v3msk-vbm.dts  |  507 ++++++
  arch/arm64/boot/dts/renesas/r8a7797-v3msk-view.dts |  297 ++++
- arch/arm64/boot/dts/renesas/r8a7797-v3msk.dts      |  345 ++++
+ arch/arm64/boot/dts/renesas/r8a7797-v3msk.dts      |  345 +++++
  arch/arm64/boot/dts/renesas/r8a7797-v3mzf.dts      |  462 ++++++
  arch/arm64/boot/dts/renesas/r8a7798-condor.dts     |  963 ++++++++++++
  .../boot/dts/renesas/r8a7798-v3hsk-vbm-v2.dts      |   72 +
@@ -93,9 +93,9 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
  arch/arm64/boot/dts/renesas/ulcb-kf.dtsi           | 1456 +++++++++++++++++
  arch/arm64/boot/dts/renesas/ulcb-vb-cn12.dtsi      |  459 ++++++
  arch/arm64/boot/dts/renesas/ulcb-vb.dtsi           | 1610 +++++++++++++++++++
- arch/arm64/boot/dts/renesas/ulcb-vb2.dtsi          | 1650 ++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/ulcb-vb2.dtsi          | 1614 +++++++++++++++++++
  arch/arm64/boot/dts/renesas/ulcb-vbm.dtsi          |  543 +++++++
- 60 files changed, 21129 insertions(+)
+ 60 files changed, 21093 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
@@ -19446,10 +19446,10 @@ index 0000000..0185e46
 +//#include "ulcb-vb-cn12.dtsi"
 diff --git a/arch/arm64/boot/dts/renesas/ulcb-vb2.dtsi b/arch/arm64/boot/dts/renesas/ulcb-vb2.dtsi
 new file mode 100644
-index 0000000..509c7f3
+index 0000000..fe2513e
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/ulcb-vb2.dtsi
-@@ -0,0 +1,1650 @@
+@@ -0,0 +1,1614 @@
 +/*
 + * Device Tree Source for the ULCB Videobox V2 board
 + *
@@ -19546,28 +19546,6 @@ index 0000000..509c7f3
 +		regulator-always-on;
 +	};
 +
-+	/delete-node/sound;
-+
-+	rsnd_ak4613: sound@0 {
-+		pinctrl-0 = <&sound_0_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>;
-+		};
-+
-+		sndcodec: simple-audio-card,codec@1 {
-+			sound-dai = <&ak4613>;
-+		};
-+	};
-+
 +	lvds-encoder {
 +		compatible = "thine,thc63lvdm83d";
 +
@@ -19678,13 +19656,6 @@ index 0000000..509c7f3
 +		function = "hscif4";
 +	};
 +
-+	/delete-node/sound;
-+
-+	sound_0_pins: sound1 {
-+		groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";
-+		function = "ssi";
-+	};
-+
 +	usb0_pins: usb0 {
 +		groups = "usb0";
 +		function = "usb0";
@@ -21003,15 +20974,8 @@ index 0000000..509c7f3
 +	};
 +};
 +
-+&rcar_sound {
-+	pinctrl-0 = <&sound_clk_pins>;
-+
-+	/* Multi DAI */
-+	#sound-dai-cells = <1>;
-+};
-+
-+&ssi1 {
-+	/delete-property/shared-pin;
++&rsnd_ak4613 {
++	simple-audio-card,name = "ak4613";
 +};
 +
 +&sdhi3 {