projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b357e6a)
ARM: dts: exynos: use hyphens in Exynos4 node names
authorKrzysztof Kozlowski <krzk@kernel.org>
Thu, 5 Nov 2020 18:45:02 +0000 (19:45 +0100)
committerKrzysztof Kozlowski <krzk@kernel.org>
Tue, 10 Nov 2020 18:20:54 +0000 (19:20 +0100)
Use hyphens instead of underscores in the Exynos4210 and Exynos4412 node
names which is expected by naming convention, multiple dtschema files
and pointed out by dtc W=2 builds.  Use also generic "ppmu" node name
for PPMU nodes to match Devicetree specification.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20201105184506.215648-2-krzk@kernel.org
arch/arm/boot/dts/exynos4.dtsi patch | blob | history
arch/arm/boot/dts/exynos4210.dtsi patch | blob | history
arch/arm/boot/dts/exynos4412.dtsi patch | blob | history

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index a1e5444..eab77a6 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -782,7 +782,7 @@
                        status = "disabled";
                };
 
-               ppmu_dmc0: ppmu_dmc0@106a0000 {
+               ppmu_dmc0: ppmu@106a0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x106a0000 0x2000>;
                        clocks = <&clock CLK_PPMUDMC0>;
@@ -790,7 +790,7 @@
                        status = "disabled";
                };
 
-               ppmu_dmc1: ppmu_dmc1@106b0000 {
+               ppmu_dmc1: ppmu@106b0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x106b0000 0x2000>;
                        clocks = <&clock CLK_PPMUDMC1>;
@@ -798,7 +798,7 @@
                        status = "disabled";
                };
 
-               ppmu_cpu: ppmu_cpu@106c0000 {
+               ppmu_cpu: ppmu@106c0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x106c0000 0x2000>;
                        clocks = <&clock CLK_PPMUCPU>;
@@ -806,7 +806,7 @@
                        status = "disabled";
                };
 
-               ppmu_rightbus: ppmu_rightbus@112a0000 {
+               ppmu_rightbus: ppmu@112a0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x112a0000 0x2000>;
                        clocks = <&clock CLK_PPMURIGHT>;
@@ -814,7 +814,7 @@
                        status = "disabled";
                };
 
-               ppmu_leftbus: ppmu_leftbus0@116a0000 {
+               ppmu_leftbus: ppmu@116a0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x116a0000 0x2000>;
                        clocks = <&clock CLK_PPMULEFT>;
@@ -822,7 +822,7 @@
                        status = "disabled";
                };
 
-               ppmu_camif: ppmu_camif@11ac0000 {
+               ppmu_camif: ppmu@11ac0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x11ac0000 0x2000>;
                        clocks = <&clock CLK_PPMUCAMIF>;
@@ -830,7 +830,7 @@
                        status = "disabled";
                };
 
-               ppmu_lcd0: ppmu_lcd0@11e40000 {
+               ppmu_lcd0: ppmu@11e40000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x11e40000 0x2000>;
                        clocks = <&clock CLK_PPMULCD0>;
@@ -838,13 +838,13 @@
                        status = "disabled";
                };
 
-               ppmu_fsys: ppmu_g3d@12630000 {
+               ppmu_fsys: ppmu@12630000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x12630000 0x2000>;
                        status = "disabled";
                };
 
-               ppmu_image: ppmu_image@12aa0000 {
+               ppmu_image: ppmu@12aa0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x12aa0000 0x2000>;
                        clocks = <&clock CLK_PPMUIMAGE>;
@@ -852,7 +852,7 @@
                        status = "disabled";
                };
 
-               ppmu_tv: ppmu_tv@12e40000 {
+               ppmu_tv: ppmu@12e40000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x12e40000 0x2000>;
                        clocks = <&clock CLK_PPMUTV>;
@@ -860,7 +860,7 @@
                        status = "disabled";
                };
 
-               ppmu_g3d: ppmu_g3d@13220000 {
+               ppmu_g3d: ppmu@13220000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x13220000 0x2000>;
                        clocks = <&clock CLK_PPMUG3D>;
@@ -868,7 +868,7 @@
                        status = "disabled";
                };
 
-               ppmu_mfc_left: ppmu_mfc_left@13660000 {
+               ppmu_mfc_left: ppmu@13660000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x13660000 0x2000>;
                        clocks = <&clock CLK_PPMUMFC_L>;
@@ -876,7 +876,7 @@
                        status = "disabled";
                };
 
-               ppmu_mfc_right: ppmu_mfc_right@13670000 {
+               ppmu_mfc_right: ppmu@13670000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x13670000 0x2000>;
                        clocks = <&clock CLK_PPMUMFC_R>;
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index fddc661..70baad9 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -168,13 +168,13 @@
                        iommus = <&sysmmu_g2d>;
                };
 
-               ppmu_acp: ppmu_acp@10ae0000 {
+               ppmu_acp: ppmu@10ae0000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x10ae0000 0x2000>;
                        status = "disabled";
                };
 
-               ppmu_lcd1: ppmu_lcd1@12240000 {
+               ppmu_lcd1: ppmu@12240000 {
                        compatible = "samsung,exynos-ppmu";
                        reg = <0x12240000 0x2000>;
                        clocks = <&clock CLK_PPMULCD1>;
@@ -204,7 +204,7 @@
                        #iommu-cells = <0>;
                };
 
-               bus_dmc: bus_dmc {
+               bus_dmc: bus-dmc {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_DMC>;
                        clock-names = "bus";
@@ -212,7 +212,7 @@
                        status = "disabled";
                };
 
-               bus_acp: bus_acp {
+               bus_acp: bus-acp {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_ACP>;
                        clock-names = "bus";
@@ -220,7 +220,7 @@
                        status = "disabled";
                };
 
-               bus_peri: bus_peri {
+               bus_peri: bus-peri {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_ACLK100>;
                        clock-names = "bus";
@@ -228,7 +228,7 @@
                        status = "disabled";
                };
 
-               bus_fsys: bus_fsys {
+               bus_fsys: bus-fsys {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_ACLK133>;
                        clock-names = "bus";
@@ -236,7 +236,7 @@
                        status = "disabled";
                };
 
-               bus_display: bus_display {
+               bus_display: bus-display {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_ACLK160>;
                        clock-names = "bus";
@@ -244,7 +244,7 @@
                        status = "disabled";
                };
 
-               bus_lcd0: bus_lcd0 {
+               bus_lcd0: bus-lcd0 {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_ACLK200>;
                        clock-names = "bus";
@@ -252,7 +252,7 @@
                        status = "disabled";
                };
 
-               bus_leftbus: bus_leftbus {
+               bus_leftbus: bus-leftbus {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_GDL>;
                        clock-names = "bus";
@@ -260,7 +260,7 @@
                        status = "disabled";
                };
 
-               bus_rightbus: bus_rightbus {
+               bus_rightbus: bus-rightbus {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_GDR>;
                        clock-names = "bus";
@@ -268,7 +268,7 @@
                        status = "disabled";
                };
 
-               bus_mfc: bus_mfc {
+               bus_mfc: bus-mfc {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_SCLK_MFC>;
                        clock-names = "bus";
@@ -276,7 +276,7 @@
                        status = "disabled";
                };
 
-               bus_dmc_opp_table: opp_table1 {
+               bus_dmc_opp_table: opp-table1 {
                        compatible = "operating-points-v2";
                        opp-shared;
 
@@ -295,7 +295,7 @@
                        };
                };
 
-               bus_acp_opp_table: opp_table2 {
+               bus_acp_opp_table: opp-table2 {
                        compatible = "operating-points-v2";
                        opp-shared;
 
@@ -310,7 +310,7 @@
                        };
                };
 
-               bus_peri_opp_table: opp_table3 {
+               bus_peri_opp_table: opp-table3 {
                        compatible = "operating-points-v2";
                        opp-shared;
 
@@ -322,7 +322,7 @@
                        };
                };
 
-               bus_fsys_opp_table: opp_table4 {
+               bus_fsys_opp_table: opp-table4 {
                        compatible = "operating-points-v2";
                        opp-shared;
 
@@ -334,7 +334,7 @@
                        };
                };
 
-               bus_display_opp_table: opp_table5 {
+               bus_display_opp_table: opp-table5 {
                        compatible = "operating-points-v2";
                        opp-shared;
 
@@ -349,7 +349,7 @@
                        };
                };
 
-               bus_leftbus_opp_table: opp_table6 {
+               bus_leftbus_opp_table: opp-table6 {
                        compatible = "operating-points-v2";
                        opp-shared;
 
@@ -463,7 +463,7 @@
                          "ppmmu3";
        operating-points-v2 = <&gpu_opp_table>;
 
-       gpu_opp_table: opp_table {
+       gpu_opp_table: opp-table {
                compatible = "operating-points-v2";
 
                opp-160000000 {
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index bcb87c5..96a4b01 100644 (file)
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -378,7 +378,7 @@
                        #iommu-cells = <0>;
                };
 
-               bus_dmc: bus_dmc {
+               bus_dmc: bus-dmc {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_DMC>;
                        clock-names = "bus";
@@ -388,7 +388,7 @@
                        status = "disabled";
                };
 
-               bus_acp: bus_acp {
+               bus_acp: bus-acp {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_ACP>;
                        clock-names = "bus";
@@ -396,7 +396,7 @@
                        status = "disabled";
                };
 
-               bus_c2c: bus_c2c {
+               bus_c2c: bus-c2c {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_C2C>;
                        clock-names = "bus";
@@ -447,7 +447,7 @@
                        };
                };
 
-               bus_leftbus: bus_leftbus {
+               bus_leftbus: bus-leftbus {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_GDL>;
                        clock-names = "bus";
@@ -457,7 +457,7 @@
                        status = "disabled";
                };
 
-               bus_rightbus: bus_rightbus {
+               bus_rightbus: bus-rightbus {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DIV_GDR>;
                        clock-names = "bus";
@@ -465,7 +465,7 @@
                        status = "disabled";
                };
 
-               bus_display: bus_display {
+               bus_display: bus-display {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_ACLK160>;
                        clock-names = "bus";
@@ -475,7 +475,7 @@
                        status = "disabled";
                };
 
-               bus_fsys: bus_fsys {
+               bus_fsys: bus-fsys {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_ACLK133>;
                        clock-names = "bus";
@@ -483,7 +483,7 @@
                        status = "disabled";
                };
 
-               bus_peri: bus_peri {
+               bus_peri: bus-peri {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_ACLK100>;
                        clock-names = "bus";
@@ -491,7 +491,7 @@
                        status = "disabled";
                };
 
-               bus_mfc: bus_mfc {
+               bus_mfc: bus-mfc {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_SCLK_MFC>;
                        clock-names = "bus";
Domain: System / Kernel;