Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64b8c506 authored by Biju Das's avatar Biju Das Committed by Greg Kroah-Hartman
Browse files

arm64: dts: renesas: r8a774a1: Remove audio port node 



commit a381325812691f57aece60aaee76938ac8fc6619 upstream.

This patch removes audio port node from SoC device tree and
fixes the below dtb warning

    Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property

Fixes: e2f04248 ("arm64: dts: renesas: r8a774a1: Add audio support")
Signed-off-by: default avatarBiju Das <biju.das@bp.renesas.com>
Link: https://lore.kernel.org/r/1570200761-884-1-git-send-email-biju.das@bp.renesas.com


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 796ffb07

arch/arm64/boot/dts/renesas/hihope-common.dtsi

+9 −11
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 


		label = "rcar-sound";



		dais = <&rsnd_port0>;

		dais = <&rsnd_port>;

	};



	vbus0_usb2: regulator-vbus0-usb2 {
@@ -191,7 +191,7 @@ 
		port@2 {

			reg = <2>;

			dw_hdmi0_snd_in: endpoint {

				remote-endpoint = <&rsnd_endpoint0>;

				remote-endpoint = <&rsnd_endpoint>;

			};

		};

	};
@@ -327,20 +327,18 @@ 
	/* Single DAI */

	#sound-dai-cells = <0>;



	ports {

		rsnd_port0: port@0 {

			rsnd_endpoint0: endpoint {

	rsnd_port: port {

		rsnd_endpoint: endpoint {

			remote-endpoint = <&dw_hdmi0_snd_in>;



			dai-format = "i2s";

				bitclock-master = <&rsnd_endpoint0>;

				frame-master = <&rsnd_endpoint0>;

			bitclock-master = <&rsnd_endpoint>;

			frame-master = <&rsnd_endpoint>;



			playback = <&ssi2>;

		};

	};

};

};



&rwdt {

	timeout-sec = <60>;

arch/arm64/boot/dts/renesas/r8a774a1.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -1726,17 +1726,6 @@ 
				      "ssi.1", "ssi.0";

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;

				port@0 {

					reg = <0>;

				};

				port@1 {

					reg = <1>;

				};

			};



			rcar_sound,ctu {

				ctu00: ctu-0 { };

				ctu01: ctu-1 { };