Merge tag 'docs-5.11-2' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4.dtsi

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>;