Skip to content

L
linux
Commit 8ebb5038 authored by Fabrizio Castro's avatar Fabrizio Castro Committed by Simon Horman
Browse files
Options

arm64: dts: renesas: r8a774a1: Replace clock magic numbers 

Now that include/dt-bindings/clock/r8a774a1-cpg-mssr.h is in Linus'
master branch we can replace clock related magic numbers with the
corresponding labels.
Signed-off-by: default avatarFabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
[simon: corrected whitespace]
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent aeee3d9c
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
arch/arm64/boot/dts/renesas/r8a774a1.dtsi
View file @ 8ebb5038
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/renesas-cpg-mssr.h> #include <dt-bindings/clock/r8a774a1-cpg-mssr.h>
#include <dt-bindings/power/r8a774a1-sysc.h> #include <dt-bindings/power/r8a774a1-sysc.h>
/ { / {
...@@ -67,7 +67,7 @@ a57_0: cpu@0 { ...@@ -67,7 +67,7 @@ a57_0: cpu@0 {
power-domains = <&sysc R8A774A1_PD_CA57_CPU0>; power-domains = <&sysc R8A774A1_PD_CA57_CPU0>;
next-level-cache = <&L2_CA57>; next-level-cache = <&L2_CA57>;
enable-method = "psci"; enable-method = "psci";
clocks = <&cpg CPG_CORE 0>; clocks = <&cpg CPG_CORE R8A774A1_CLK_Z>;
}; };
a57_1: cpu@1 { a57_1: cpu@1 {
...@@ -77,7 +77,7 @@ a57_1: cpu@1 { ...@@ -77,7 +77,7 @@ a57_1: cpu@1 {
power-domains = <&sysc R8A774A1_PD_CA57_CPU1>; power-domains = <&sysc R8A774A1_PD_CA57_CPU1>;
next-level-cache = <&L2_CA57>; next-level-cache = <&L2_CA57>;
enable-method = "psci"; enable-method = "psci";
clocks = <&cpg CPG_CORE 0>; clocks = <&cpg CPG_CORE R8A774A1_CLK_Z>;
}; };
a53_0: cpu@100 { a53_0: cpu@100 {
...@@ -87,7 +87,7 @@ a53_0: cpu@100 { ...@@ -87,7 +87,7 @@ a53_0: cpu@100 {
power-domains = <&sysc R8A774A1_PD_CA53_CPU0>; power-domains = <&sysc R8A774A1_PD_CA53_CPU0>;
next-level-cache = <&L2_CA53>; next-level-cache = <&L2_CA53>;
enable-method = "psci"; enable-method = "psci";
clocks =<&cpg CPG_CORE 1>; clocks = <&cpg CPG_CORE R8A774A1_CLK_Z2>;
}; };
a53_1: cpu@101 { a53_1: cpu@101 {
...@@ -97,7 +97,7 @@ a53_1: cpu@101 { ...@@ -97,7 +97,7 @@ a53_1: cpu@101 {
power-domains = <&sysc R8A774A1_PD_CA53_CPU1>; power-domains = <&sysc R8A774A1_PD_CA53_CPU1>;
next-level-cache = <&L2_CA53>; next-level-cache = <&L2_CA53>;
enable-method = "psci"; enable-method = "psci";
clocks =<&cpg CPG_CORE 1>; clocks = <&cpg CPG_CORE R8A774A1_CLK_Z2>;
}; };
a53_2: cpu@102 { a53_2: cpu@102 {
...@@ -107,7 +107,7 @@ a53_2: cpu@102 { ...@@ -107,7 +107,7 @@ a53_2: cpu@102 {
power-domains = <&sysc R8A774A1_PD_CA53_CPU2>; power-domains = <&sysc R8A774A1_PD_CA53_CPU2>;
next-level-cache = <&L2_CA53>; next-level-cache = <&L2_CA53>;
enable-method = "psci"; enable-method = "psci";
clocks =<&cpg CPG_CORE 1>; clocks = <&cpg CPG_CORE R8A774A1_CLK_Z2>;
}; };
a53_3: cpu@103 { a53_3: cpu@103 {
...@@ -117,7 +117,7 @@ a53_3: cpu@103 { ...@@ -117,7 +117,7 @@ a53_3: cpu@103 {
power-domains = <&sysc R8A774A1_PD_CA53_CPU3>; power-domains = <&sysc R8A774A1_PD_CA53_CPU3>;
next-level-cache = <&L2_CA53>; next-level-cache = <&L2_CA53>;
enable-method = "psci"; enable-method = "psci";
clocks =<&cpg CPG_CORE 1>; clocks = <&cpg CPG_CORE R8A774A1_CLK_Z2>;
}; };
L2_CA57: cache-controller-0 { L2_CA57: cache-controller-0 {
...@@ -515,7 +515,7 @@ hscif0: serial@e6540000 { ...@@ -515,7 +515,7 @@ hscif0: serial@e6540000 {
reg = <0 0xe6540000 0 0x60>; reg = <0 0xe6540000 0 0x60>;
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 520>, clocks = <&cpg CPG_MOD 520>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x31>, <&dmac1 0x30>, dmas = <&dmac1 0x31>, <&dmac1 0x30>,
...@@ -533,7 +533,7 @@ hscif1: serial@e6550000 { ...@@ -533,7 +533,7 @@ hscif1: serial@e6550000 {
reg = <0 0xe6550000 0 0x60>; reg = <0 0xe6550000 0 0x60>;
interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 519>, clocks = <&cpg CPG_MOD 519>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x33>, <&dmac1 0x32>, dmas = <&dmac1 0x33>, <&dmac1 0x32>,
...@@ -551,7 +551,7 @@ hscif2: serial@e6560000 { ...@@ -551,7 +551,7 @@ hscif2: serial@e6560000 {
reg = <0 0xe6560000 0 0x60>; reg = <0 0xe6560000 0 0x60>;
interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 518>, clocks = <&cpg CPG_MOD 518>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x35>, <&dmac1 0x34>, dmas = <&dmac1 0x35>, <&dmac1 0x34>,
...@@ -569,7 +569,7 @@ hscif3: serial@e66a0000 { ...@@ -569,7 +569,7 @@ hscif3: serial@e66a0000 {
reg = <0 0xe66a0000 0 0x60>; reg = <0 0xe66a0000 0 0x60>;
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 517>, clocks = <&cpg CPG_MOD 517>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac0 0x37>, <&dmac0 0x36>; dmas = <&dmac0 0x37>, <&dmac0 0x36>;
...@@ -586,7 +586,7 @@ hscif4: serial@e66b0000 { ...@@ -586,7 +586,7 @@ hscif4: serial@e66b0000 {
reg = <0 0xe66b0000 0 0x60>; reg = <0 0xe66b0000 0 0x60>;
interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 516>, clocks = <&cpg CPG_MOD 516>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac0 0x39>, <&dmac0 0x38>; dmas = <&dmac0 0x39>, <&dmac0 0x38>;
...@@ -974,7 +974,7 @@ scif0: serial@e6e60000 { ...@@ -974,7 +974,7 @@ scif0: serial@e6e60000 {
reg = <0 0xe6e60000 0 0x40>; reg = <0 0xe6e60000 0 0x40>;
interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 207>, clocks = <&cpg CPG_MOD 207>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x51>, <&dmac1 0x50>, dmas = <&dmac1 0x51>, <&dmac1 0x50>,
...@@ -991,7 +991,7 @@ scif1: serial@e6e68000 { ...@@ -991,7 +991,7 @@ scif1: serial@e6e68000 {
reg = <0 0xe6e68000 0 0x40>; reg = <0 0xe6e68000 0 0x40>;
interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 206>, clocks = <&cpg CPG_MOD 206>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x53>, <&dmac1 0x52>, dmas = <&dmac1 0x53>, <&dmac1 0x52>,
...@@ -1008,7 +1008,7 @@ scif2: serial@e6e88000 { ...@@ -1008,7 +1008,7 @@ scif2: serial@e6e88000 {
reg = <0 0xe6e88000 0 0x40>; reg = <0 0xe6e88000 0 0x40>;
interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 310>, clocks = <&cpg CPG_MOD 310>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>; power-domains = <&sysc R8A774A1_PD_ALWAYS_ON>;
...@@ -1022,7 +1022,7 @@ scif3: serial@e6c50000 { ...@@ -1022,7 +1022,7 @@ scif3: serial@e6c50000 {
reg = <0 0xe6c50000 0 0x40>; reg = <0 0xe6c50000 0 0x40>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 204>, clocks = <&cpg CPG_MOD 204>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac0 0x57>, <&dmac0 0x56>; dmas = <&dmac0 0x57>, <&dmac0 0x56>;
...@@ -1038,7 +1038,7 @@ scif4: serial@e6c40000 { ...@@ -1038,7 +1038,7 @@ scif4: serial@e6c40000 {
reg = <0 0xe6c40000 0 0x40>; reg = <0 0xe6c40000 0 0x40>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 203>, clocks = <&cpg CPG_MOD 203>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac0 0x59>, <&dmac0 0x58>; dmas = <&dmac0 0x59>, <&dmac0 0x58>;
...@@ -1054,7 +1054,7 @@ scif5: serial@e6f30000 { ...@@ -1054,7 +1054,7 @@ scif5: serial@e6f30000 {
reg = <0 0xe6f30000 0 0x40>; reg = <0 0xe6f30000 0 0x40>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 202>, clocks = <&cpg CPG_MOD 202>,
<&cpg CPG_CORE 19>, <&cpg CPG_CORE R8A774A1_CLK_S3D1>,
<&scif_clk>; <&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk"; clock-names = "fck", "brg_int", "scif_clk";
dmas = <&dmac1 0x5b>, <&dmac1 0x5a>, dmas = <&dmac1 0x5b>, <&dmac1 0x5a>,
...@@ -1420,7 +1420,7 @@ rcar_sound: sound@ec500000 { ...@@ -1420,7 +1420,7 @@ rcar_sound: sound@ec500000 {
<&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>, <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_a>, <&audio_clk_b>,
<&audio_clk_c>, <&audio_clk_c>,
<&cpg CPG_CORE 10>; <&cpg CPG_CORE R8A774A1_CLK_S0D4>;
clock-names = "ssi-all", clock-names = "ssi-all",
"ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.9", "ssi.8", "ssi.7", "ssi.6",
"ssi.5", "ssi.4", "ssi.3", "ssi.2", "ssi.5", "ssi.4", "ssi.3", "ssi.2",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7