Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index c76460b..e23e8ff 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -42,7 +42,7 @@
         * by exynos5420-cpus.dtsi or exynos5422-cpus.dtsi.
         */
 
-       cluster_a15_opp_table: opp_table0 {
+       cluster_a15_opp_table: opp-table0 {
                compatible = "operating-points-v2";
                opp-shared;
 
@@ -108,7 +108,7 @@
                };
        };
 
-       cluster_a7_opp_table: opp_table1 {
+       cluster_a7_opp_table: opp-table1 {
                compatible = "operating-points-v2";
                opp-shared;
 
@@ -240,9 +240,6 @@
                dmc: memory-controller@10c20000 {
                        compatible = "samsung,exynos5422-dmc";
                        reg = <0x10c20000 0x10000>, <0x10c30000 0x10000>;
-                       interrupt-parent = <&combiner>;
-                       interrupts = <16 0>, <16 1>;
-                       interrupt-names = "drex_0", "drex_1";
                        clocks = <&clock CLK_FOUT_SPLL>,
                                 <&clock CLK_MOUT_SCLK_SPLL>,
                                 <&clock CLK_FF_DOUT_SPLL2>,
@@ -1080,112 +1077,112 @@
                        #iommu-cells = <0>;
                };
 
-               bus_wcore: bus_wcore {
+               bus_wcore: bus-wcore {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK400_WCORE>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_noc: bus_noc {
+               bus_noc: bus-noc {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK100_NOC>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_fsys_apb: bus_fsys_apb {
+               bus_fsys_apb: bus-fsys-apb {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_PCLK200_FSYS>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_fsys: bus_fsys {
+               bus_fsys: bus-fsys {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK200_FSYS>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_fsys2: bus_fsys2 {
+               bus_fsys2: bus-fsys2 {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK200_FSYS2>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_mfc: bus_mfc {
+               bus_mfc: bus-mfc {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK333>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_gen: bus_gen {
+               bus_gen: bus-gen {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK266>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_peri: bus_peri {
+               bus_peri: bus-peri {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK66>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_g2d: bus_g2d {
+               bus_g2d: bus-g2d {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK333_G2D>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_g2d_acp: bus_g2d_acp {
+               bus_g2d_acp: bus-g2d-acp {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK266_G2D>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_jpeg: bus_jpeg {
+               bus_jpeg: bus-jpeg {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK300_JPEG>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_jpeg_apb: bus_jpeg_apb {
+               bus_jpeg_apb: bus-jpeg-apb {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK166>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_disp1_fimd: bus_disp1_fimd {
+               bus_disp1_fimd: bus-disp1-fimd {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK300_DISP1>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_disp1: bus_disp1 {
+               bus_disp1: bus-disp1 {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK400_DISP1>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_gscl_scaler: bus_gscl_scaler {
+               bus_gscl_scaler: bus-gscl-scaler {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK300_GSCL>;
                        clock-names = "bus";
                        status = "disabled";
                };
 
-               bus_mscl: bus_mscl {
+               bus_mscl: bus-mscl {
                        compatible = "samsung,exynos-bus";
                        clocks = <&clock CLK_DOUT_ACLK400_MSCL>;
                        clock-names = "bus";
@@ -1199,20 +1196,20 @@
                        #include "exynos5420-trip-points.dtsi"
                };
                cpu1_thermal: cpu1-thermal {
-                      thermal-sensors = <&tmu_cpu1>;
-                      #include "exynos5420-trip-points.dtsi"
+                       thermal-sensors = <&tmu_cpu1>;
+                       #include "exynos5420-trip-points.dtsi"
                };
                cpu2_thermal: cpu2-thermal {
-                      thermal-sensors = <&tmu_cpu2>;
-                      #include "exynos5420-trip-points.dtsi"
+                       thermal-sensors = <&tmu_cpu2>;
+                       #include "exynos5420-trip-points.dtsi"
                };
                cpu3_thermal: cpu3-thermal {
-                      thermal-sensors = <&tmu_cpu3>;
-                      #include "exynos5420-trip-points.dtsi"
+                       thermal-sensors = <&tmu_cpu3>;
+                       #include "exynos5420-trip-points.dtsi"
                };
                gpu_thermal: gpu-thermal {
-                      thermal-sensors = <&tmu_gpu>;
-                      #include "exynos5420-trip-points.dtsi"
+                       thermal-sensors = <&tmu_gpu>;
+                       #include "exynos5420-trip-points.dtsi"
                };
        };
 };