Merge tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos4210.dtsi

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index f8c6c5d1906afd638ddedae1ee1f82b09045f11f..0e27c3375e2e9b097e9cab3770597e8ff06ad94c 100644 (file)
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -28,6 +28,151 @@
                pinctrl2 = &pinctrl_2;
        };
 
+       bus_acp: bus-acp {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DIV_ACP>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_acp_opp_table>;
+               status = "disabled";
+
+               bus_acp_opp_table: opp-table {
+                       compatible = "operating-points-v2";
+                       opp-shared;
+
+                       opp-134000000 {
+                               opp-hz = /bits/ 64 <134000000>;
+                       };
+                       opp-160000000 {
+                               opp-hz = /bits/ 64 <160000000>;
+                       };
+                       opp-200000000 {
+                               opp-hz = /bits/ 64 <200000000>;
+                       };
+               };
+       };
+
+       bus_display: bus-display {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_ACLK160>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_display_opp_table>;
+               status = "disabled";
+
+               bus_display_opp_table: opp-table {
+                       compatible = "operating-points-v2";
+                       opp-shared;
+
+                       opp-100000000 {
+                               opp-hz = /bits/ 64 <100000000>;
+                       };
+                       opp-134000000 {
+                               opp-hz = /bits/ 64 <134000000>;
+                       };
+                       opp-160000000 {
+                               opp-hz = /bits/ 64 <160000000>;
+                       };
+               };
+       };
+
+       bus_dmc: bus-dmc {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DIV_DMC>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_dmc_opp_table>;
+               status = "disabled";
+
+               bus_dmc_opp_table: opp-table {
+                       compatible = "operating-points-v2";
+                       opp-shared;
+
+                       opp-134000000 {
+                               opp-hz = /bits/ 64 <134000000>;
+                               opp-microvolt = <1025000>;
+                       };
+                       opp-267000000 {
+                               opp-hz = /bits/ 64 <267000000>;
+                               opp-microvolt = <1050000>;
+                       };
+                       opp-400000000 {
+                               opp-hz = /bits/ 64 <400000000>;
+                               opp-microvolt = <1150000>;
+                               opp-suspend;
+                       };
+               };
+       };
+
+       bus_fsys: bus-fsys {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_ACLK133>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_fsys_opp_table>;
+               status = "disabled";
+
+               bus_fsys_opp_table: opp-table {
+                       compatible = "operating-points-v2";
+                       opp-shared;
+
+                       opp-10000000 {
+                               opp-hz = /bits/ 64 <10000000>;
+                       };
+                       opp-134000000 {
+                               opp-hz = /bits/ 64 <134000000>;
+                       };
+               };
+       };
+
+       bus_lcd0: bus-lcd0 {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_ACLK200>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_leftbus_opp_table>;
+               status = "disabled";
+       };
+
+       bus_leftbus: bus-leftbus {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DIV_GDL>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_leftbus_opp_table>;
+               status = "disabled";
+       };
+
+       bus_mfc: bus-mfc {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_SCLK_MFC>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_leftbus_opp_table>;
+               status = "disabled";
+       };
+
+       bus_peri: bus-peri {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_ACLK100>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_peri_opp_table>;
+               status = "disabled";
+
+               bus_peri_opp_table: opp-table {
+                       compatible = "operating-points-v2";
+                       opp-shared;
+
+                       opp-5000000 {
+                               opp-hz = /bits/ 64 <5000000>;
+                       };
+                       opp-100000000 {
+                               opp-hz = /bits/ 64 <100000000>;
+                       };
+               };
+       };
+
+       bus_rightbus: bus-rightbus {
+               compatible = "samsung,exynos-bus";
+               clocks = <&clock CLK_DIV_GDR>;
+               clock-names = "bus";
+               operating-points-v2 = <&bus_leftbus_opp_table>;
+               status = "disabled";
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -82,6 +227,22 @@
                };
        };
 
+       bus_leftbus_opp_table: opp-table-0 {
+               compatible = "operating-points-v2";
+               opp-shared;
+
+               opp-100000000 {
+                       opp-hz = /bits/ 64 <100000000>;
+               };
+               opp-160000000 {
+                       opp-hz = /bits/ 64 <160000000>;
+               };
+               opp-200000000 {
+                       opp-hz = /bits/ 64 <200000000>;
+                       opp-suspend;
+               };
+       };
+
        soc: soc {
                sysram: sram@2020000 {
                        compatible = "mmio-sram";
@@ -103,7 +264,7 @@
 
                pd_lcd1: power-domain@10023ca0 {
                        compatible = "samsung,exynos4210-pd";
-                       reg = <0x10023CA0 0x20>;
+                       reg = <0x10023ca0 0x20>;
                        #power-domain-cells = <0>;
                        label = "LCD1";
                };
@@ -195,7 +356,7 @@
 
                sysmmu_g2d: sysmmu@12a20000 {
                        compatible = "samsung,exynos-sysmmu";
-                       reg = <0x12A20000 0x1000>;
+                       reg = <0x12a20000 0x1000>;
                        interrupt-parent = <&combiner>;
                        interrupts = <4 7>;
                        clock-names = "sysmmu", "master";
@@ -214,167 +375,6 @@
                        power-domains = <&pd_lcd1>;
                        #iommu-cells = <0>;
                };
-
-               bus_dmc: bus-dmc {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DIV_DMC>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_dmc_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_acp: bus-acp {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DIV_ACP>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_acp_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_peri: bus-peri {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_ACLK100>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_peri_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_fsys: bus-fsys {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_ACLK133>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_fsys_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_display: bus-display {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_ACLK160>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_display_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_lcd0: bus-lcd0 {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_ACLK200>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_leftbus_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_leftbus: bus-leftbus {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DIV_GDL>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_leftbus_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_rightbus: bus-rightbus {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_DIV_GDR>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_leftbus_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_mfc: bus-mfc {
-                       compatible = "samsung,exynos-bus";
-                       clocks = <&clock CLK_SCLK_MFC>;
-                       clock-names = "bus";
-                       operating-points-v2 = <&bus_leftbus_opp_table>;
-                       status = "disabled";
-               };
-
-               bus_dmc_opp_table: opp-table1 {
-                       compatible = "operating-points-v2";
-                       opp-shared;
-
-                       opp-134000000 {
-                               opp-hz = /bits/ 64 <134000000>;
-                               opp-microvolt = <1025000>;
-                       };
-                       opp-267000000 {
-                               opp-hz = /bits/ 64 <267000000>;
-                               opp-microvolt = <1050000>;
-                       };
-                       opp-400000000 {
-                               opp-hz = /bits/ 64 <400000000>;
-                               opp-microvolt = <1150000>;
-                               opp-suspend;
-                       };
-               };
-
-               bus_acp_opp_table: opp-table2 {
-                       compatible = "operating-points-v2";
-                       opp-shared;
-
-                       opp-134000000 {
-                               opp-hz = /bits/ 64 <134000000>;
-                       };
-                       opp-160000000 {
-                               opp-hz = /bits/ 64 <160000000>;
-                       };
-                       opp-200000000 {
-                               opp-hz = /bits/ 64 <200000000>;
-                       };
-               };
-
-               bus_peri_opp_table: opp-table3 {
-                       compatible = "operating-points-v2";
-                       opp-shared;
-
-                       opp-5000000 {
-                               opp-hz = /bits/ 64 <5000000>;
-                       };
-                       opp-100000000 {
-                               opp-hz = /bits/ 64 <100000000>;
-                       };
-               };
-
-               bus_fsys_opp_table: opp-table4 {
-                       compatible = "operating-points-v2";
-                       opp-shared;
-
-                       opp-10000000 {
-                               opp-hz = /bits/ 64 <10000000>;
-                       };
-                       opp-134000000 {
-                               opp-hz = /bits/ 64 <134000000>;
-                       };
-               };
-
-               bus_display_opp_table: opp-table5 {
-                       compatible = "operating-points-v2";
-                       opp-shared;
-
-                       opp-100000000 {
-                               opp-hz = /bits/ 64 <100000000>;
-                       };
-                       opp-134000000 {
-                               opp-hz = /bits/ 64 <134000000>;
-                       };
-                       opp-160000000 {
-                               opp-hz = /bits/ 64 <160000000>;
-                       };
-               };
-
-               bus_leftbus_opp_table: opp-table6 {
-                       compatible = "operating-points-v2";
-                       opp-shared;
-
-                       opp-100000000 {
-                               opp-hz = /bits/ 64 <100000000>;
-                       };
-                       opp-160000000 {
-                               opp-hz = /bits/ 64 <160000000>;
-                       };
-                       opp-200000000 {
-                               opp-hz = /bits/ 64 <200000000>;
-                               opp-suspend;
-                       };
-               };
        };
 };