arm64: dts: renesas: Move CPG_AUDIO_CLK_I from board to soc files

PATCH New Geert Uytterhoeven 3 participants 3 messages Jun 30, 2017

Subsystems (2)

Device tree bindings Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Geert Uytterhoeven

author maintainer

2017-06-30 08:22 UTC #0 lore raw

PATCH 1/1 arm64: dts: renesas: Move CPG_AUDIO_CLK_I from board to soc files

The definition of CPG_AUDIO_CLK_I is SoC-specific, not board-specific. Hence move it from the board-specific .dts files to the SoC-specific .dtsi files.

Signed-off-by Geert Uytterhoeven <[email protected]>

---
I don't think it's worth adding Fixes tags.

If you disagree, feel free to add:

Fixes 79e3b5cf035e4734 ("arm64: dts: renesas: Add support for Salvator-XS with R-Car H3 ES2.0")

Fixes fb5202dbebfd8fbf ("arm64: dts: r8a7795: h3ulcb: Add support for R-Car H3 ES2.0")

Fixes 0b03c32db03d63de ("arm64: dts: r8a7795: salvator-x: Add support for R-Car H3 ES2.0")

Fixes 253ed045a34d16d9 ("arm64: dts: renesas: Extract common ULCB board support")

Fixes d25e8ff0d5aaf8b1 ("arm64: dts: renesas: Extract common Salvator-X board support")

---
 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts     | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts         | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts     | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts    | 2 --
 arch/arm64/boot/dts/renesas/r8a7795.dtsi               | 2 ++
 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts         | 2 --
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts     | 2 --
 arch/arm64/boot/dts/renesas/r8a7796.dtsi               | 2 ++
 9 files changed, 4 insertions(+), 14 deletions(-)

arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts +0 -2

index 95fe207cb6a3fd2f..dd4f9b6a42546def 100644
@@ -9,8 +9,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795-es1.dtsi"
 #include "ulcb.dtsi"

arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +0 -2

index b84c156ed6969947..3f7d5f51e42878cb 100644
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795-es1.dtsi"
 #include "salvator-x.dtsi"

arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts +0 -2

index 0426f41765f0bc68..27d4b1a4c4754732 100644
@@ -9,8 +9,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795.dtsi"
 #include "ulcb.dtsi"

arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +0 -2

index 684fb3b9d154559e..17953070f38dff8d 100644
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795.dtsi"
 #include "salvator-x.dtsi"

arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts +0 -2

index de354957144b4822..6a7d1b22d0fecc9c 100644
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795.dtsi"
 #include "salvator-xs.dtsi"

arch/arm64/boot/dts/renesas/r8a7795.dtsi +2 -0

index 5ec03641d9873f22..6b75d4b9ce7efa49 100644
@@ -12,6 +12,8 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/power/r8a7795-sysc.h>
 
+#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
+
 / {
 	compatible = "renesas,r8a7795";
 	#address-cells = <2>;

arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +0 -2

index 38b58b7fca4bf0e9..1ff9dffae4618a5a 100644
@@ -9,8 +9,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7796_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7796.dtsi"
 #include "ulcb.dtsi"

arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +0 -2

index db4f162d6bdd2c42..b35b15914771af86 100644
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7796_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7796.dtsi"
 #include "salvator-x.dtsi"

arch/arm64/boot/dts/renesas/r8a7796.dtsi +2 -0

index cfb37d4bd65914b4..49b9f2c05f71cd05 100644
@@ -12,6 +12,8 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/power/r8a7796-sysc.h>
 
+#define CPG_AUDIO_CLK_I		R8A7796_CLK_S0D4
+
 / {
 	compatible = "renesas,r8a7796";
 	#address-cells = <2>;

Signature · 1 line

2.7.4

Laurent Pinchart

2017-06-30 09:10 UTC #1 lore raw

PATCH 1/1 arm64: dts: renesas: Move CPG_AUDIO_CLK_I from board to soc files

Hi Geert,

Thank you for the patch.

Quoted 5 lines · On Friday 30 Jun 2017 10:22:28 Geert Uytterhoeven wrote:

The definition of CPG_AUDIO_CLK_I is SoC-specific, not board-specific. Hence move it from the board-specific .dts files to the SoC-specific .dtsi files.
Signed-off-by Geert Uytterhoeven <[email protected]>

Reviewed-by Laurent Pinchart <[email protected]>

Quoted 149 lines

---
I don't think it's worth adding Fixes tags.
If you disagree, feel free to add:
Fixes 79e3b5cf035e4734 ("arm64: dts: renesas: Add support for Salvator-XS
with R-Car H3 ES2.0") Fixes: fb5202dbebfd8fbf ("arm64: dts: r8a7795:
h3ulcb: Add support for R-Car H3 ES2.0") Fixes: 0b03c32db03d63de ("arm64:
dts: r8a7795: salvator-x: Add support for R-Car H3 ES2.0") Fixes:
253ed045a34d16d9 ("arm64: dts: renesas: Extract common ULCB board support")
Fixes d25e8ff0d5aaf8b1 ("arm64: dts: renesas: Extract common Salvator-X
board support") ---
 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts     | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts         | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts     | 2 --
 arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts    | 2 --
 arch/arm64/boot/dts/renesas/r8a7795.dtsi               | 2 ++
 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts         | 2 --
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts     | 2 --
 arch/arm64/boot/dts/renesas/r8a7796.dtsi               | 2 ++
 9 files changed, 4 insertions(+), 14 deletions(-)
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts index 95fe207cb6a3fd2f..dd4f9b6a42546def 100644
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts +0 -2
@@ -9,8 +9,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795-es1.dtsi"
 #include "ulcb.dtsi"
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts index b84c156ed6969947..3f7d5f51e42878cb 100644
arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +0 -2
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795-es1.dtsi"
 #include "salvator-x.dtsi"
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts index 0426f41765f0bc68..27d4b1a4c4754732 100644
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts +0 -2
@@ -9,8 +9,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795.dtsi"
 #include "ulcb.dtsi"
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index 684fb3b9d154559e..17953070f38dff8d 100644
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +0 -2
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795.dtsi"
 #include "salvator-x.dtsi"
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts index de354957144b4822..6a7d1b22d0fecc9c 100644
arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts +0 -2
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7795.dtsi"
 #include "salvator-xs.dtsi"
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index
5ec03641d9873f22..6b75d4b9ce7efa49 100644
arch/arm64/boot/dts/renesas/r8a7795.dtsi +2 -0
@@ -12,6 +12,8 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/power/r8a7795-sysc.h>
 
+#define CPG_AUDIO_CLK_I		R8A7795_CLK_S0D4
+
 / {
 	compatible = "renesas,r8a7795";
 	#address-cells = <2>;
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts index 38b58b7fca4bf0e9..1ff9dffae4618a5a 100644
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +0 -2
@@ -9,8 +9,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7796_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7796.dtsi"
 #include "ulcb.dtsi"
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts index db4f162d6bdd2c42..b35b15914771af86 100644
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +0 -2
@@ -8,8 +8,6 @@
  * kind, whether express or implied.
  */
 
-#define CPG_AUDIO_CLK_I		R8A7796_CLK_S0D4
-
 /dts-v1/;
 #include "r8a7796.dtsi"
 #include "salvator-x.dtsi"
(quoted diff) +0 -0
b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index
cfb37d4bd65914b4..49b9f2c05f71cd05 100644
arch/arm64/boot/dts/renesas/r8a7796.dtsi +2 -0
@@ -12,6 +12,8 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/power/r8a7796-sysc.h>
 
+#define CPG_AUDIO_CLK_I		R8A7796_CLK_S0D4
+
 / {
 	compatible = "renesas,r8a7796";
 	#address-cells = <2>;

Signature · 3 lines

Regards,

Laurent Pinchart

Simon Horman

2017-06-30 11:51 UTC #2 lore raw

PATCH 1/1 arm64: dts: renesas: Move CPG_AUDIO_CLK_I from board to soc files

Quoted 4 lines · Laurent Pinchart

Hi Geert,
Thank you for the patch.

Quoted 21 lines

Quoted 5 lines · On Friday 30 Jun 2017 10:22:28 Geert Uytterhoeven wrote:
The definition of CPG_AUDIO_CLK_I is SoC-specific, not board-specific. Hence move it from the board-specific .dts files to the SoC-specific .dtsi files.
Signed-off-by Geert Uytterhoeven <[email protected]>
Reviewed-by Laurent Pinchart <[email protected]>
Quoted 12 lines
---
I don't think it's worth adding Fixes tags.
If you disagree, feel free to add:
Fixes 79e3b5cf035e4734 ("arm64: dts: renesas: Add support for Salvator-XS
with R-Car H3 ES2.0") Fixes: fb5202dbebfd8fbf ("arm64: dts: r8a7795:
h3ulcb: Add support for R-Car H3 ES2.0") Fixes: 0b03c32db03d63de ("arm64:
dts: r8a7795: salvator-x: Add support for R-Car H3 ES2.0") Fixes:
253ed045a34d16d9 ("arm64: dts: renesas: Extract common ULCB board support")
Fixes d25e8ff0d5aaf8b1 ("arm64: dts: renesas: Extract common Salvator-X
board support") ---

I agree. I've applied this for v4.14 without the fixes tags.