arm64: dts: renesas: r8a7795: remove unneeded sound #address/size-cells

commit 2d87dc0e5be2 ("arm64: dts: renesas: r8a7795: Add address
properties to rcar_sound port nodes") added missing #address-cells
and #size-cells for sound ports.
But, these are based on platform, not on SoC. This patch cleanups it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
index 0895503b69d0b71bcdf0f47d64d705ae38326049..c1a56eab7b2483dbf102cd9f33ed7177ab4a6a61 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
@@ -112,6 +112,7 @@ &rcar_sound {
        ports {
                /* rsnd_port0 is on salvator-common */
                rsnd_port1: port@1 {
+                       reg = <1>;
                        rsnd_endpoint1: endpoint {
                                remote-endpoint = <&dw_hdmi0_snd_in>;
 
@@ -123,6 +124,7 @@ rsnd_endpoint1: endpoint {
                        };
                };
                rsnd_port2: port@2 {
+                       reg = <2>;
                        rsnd_endpoint2: endpoint {
                                remote-endpoint = <&dw_hdmi1_snd_in>;
 

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 1620e8d8dacc3c561f0a8dde96877712bfe79547..d2d48b33b37f471b504b289bd909e6ab772b7c37 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -112,6 +112,7 @@ &rcar_sound {
        ports {
                /* rsnd_port0 is on salvator-common */
                rsnd_port1: port@1 {
+                       reg = <1>;
                        rsnd_endpoint1: endpoint {
                                remote-endpoint = <&dw_hdmi0_snd_in>;
 
@@ -123,6 +124,7 @@ rsnd_endpoint1: endpoint {
                        };
                };
                rsnd_port2: port@2 {
+                       reg = <2>;
                        rsnd_endpoint2: endpoint {
                                remote-endpoint = <&dw_hdmi1_snd_in>;
 

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
index cf08a119eec093cdf635fbd43998c58750accddc..42101fc76837a0e3138f12c38af6a39c4cf355a0 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
@@ -127,6 +127,7 @@ &rcar_sound {
        ports {
                /* rsnd_port0 is on salvator-common */
                rsnd_port1: port@1 {
+                       reg = <1>;
                        rsnd_endpoint1: endpoint {
                                remote-endpoint = <&dw_hdmi0_snd_in>;
 
@@ -138,6 +139,7 @@ rsnd_endpoint1: endpoint {
                        };
                };
                rsnd_port2: port@2 {
+                       reg = <2>;
                        rsnd_endpoint2: endpoint {
                                remote-endpoint = <&dw_hdmi1_snd_in>;
 

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index b5f2273caca4ded1e6bc0cfe3a5e52b97a3fd854..95a8ed40e7d3d225d5f11823069d09668d319a25 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1972,20 +1972,6 @@ ssi9: ssi-9 {
                                        dma-names = "rx", "tx", "rxu", "txu";
                                };
                        };
-
-                       ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               port@0 {
-                                       reg = <0>;
-                               };
-                               port@1 {
-                                       reg = <1>;
-                               };
-                               port@2 {
-                                       reg = <2>;
-                               };
-                       };
                };
 
                audma0: dma-controller@ec700000 {

diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
index 7f91ff5241091b2fca66f9059911f50360628803..054a7eeeef92525e82c1d99af81ec114282ca783 100644 (file)
--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
@@ -707,7 +707,10 @@ &rcar_sound {
                 <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
 
        ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
                rsnd_port0: port@0 {
+                       reg = <0>;
                        rsnd_endpoint0: endpoint {
                                remote-endpoint = <&ak4613_endpoint>;