Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / mediatek / mt8183.dtsi

diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
index c5e822b..f90df64 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -197,6 +197,91 @@
                };
        };
 
+       gpu_opp_table: opp_table0 {
+               compatible = "operating-points-v2";
+               opp-shared;
+
+               opp-300000000 {
+                       opp-hz = /bits/ 64 <300000000>;
+                       opp-microvolt = <625000>, <850000>;
+               };
+
+               opp-320000000 {
+                       opp-hz = /bits/ 64 <320000000>;
+                       opp-microvolt = <631250>, <850000>;
+               };
+
+               opp-340000000 {
+                       opp-hz = /bits/ 64 <340000000>;
+                       opp-microvolt = <637500>, <850000>;
+               };
+
+               opp-360000000 {
+                       opp-hz = /bits/ 64 <360000000>;
+                       opp-microvolt = <643750>, <850000>;
+               };
+
+               opp-380000000 {
+                       opp-hz = /bits/ 64 <380000000>;
+                       opp-microvolt = <650000>, <850000>;
+               };
+
+               opp-400000000 {
+                       opp-hz = /bits/ 64 <400000000>;
+                       opp-microvolt = <656250>, <850000>;
+               };
+
+               opp-420000000 {
+                       opp-hz = /bits/ 64 <420000000>;
+                       opp-microvolt = <662500>, <850000>;
+               };
+
+               opp-460000000 {
+                       opp-hz = /bits/ 64 <460000000>;
+                       opp-microvolt = <675000>, <850000>;
+               };
+
+               opp-500000000 {
+                       opp-hz = /bits/ 64 <500000000>;
+                       opp-microvolt = <687500>, <850000>;
+               };
+
+               opp-540000000 {
+                       opp-hz = /bits/ 64 <540000000>;
+                       opp-microvolt = <700000>, <850000>;
+               };
+
+               opp-580000000 {
+                       opp-hz = /bits/ 64 <580000000>;
+                       opp-microvolt = <712500>, <850000>;
+               };
+
+               opp-620000000 {
+                       opp-hz = /bits/ 64 <620000000>;
+                       opp-microvolt = <725000>, <850000>;
+               };
+
+               opp-653000000 {
+                       opp-hz = /bits/ 64 <653000000>;
+                       opp-microvolt = <743750>, <850000>;
+               };
+
+               opp-698000000 {
+                       opp-hz = /bits/ 64 <698000000>;
+                       opp-microvolt = <768750>, <868750>;
+               };
+
+               opp-743000000 {
+                       opp-hz = /bits/ 64 <743000000>;
+                       opp-microvolt = <793750>, <893750>;
+               };
+
+               opp-800000000 {
+                       opp-hz = /bits/ 64 <800000000>;
+                       opp-microvolt = <825000>, <925000>;
+               };
+       };
+
        pmu-a53 {
                compatible = "arm,cortex-a53-pmu";
                interrupt-parent = <&gic>;
@@ -673,7 +758,7 @@
                        nvmem-cell-names = "calibration-data";
                };
 
-               thermal-zones {
+               thermal_zones: thermal-zones {
                        cpu_thermal: cpu_thermal {
                                polling-delay-passive = <100>;
                                polling-delay = <500>;
@@ -1118,6 +1203,26 @@
                        #clock-cells = <1>;
                };
 
+               gpu: gpu@13040000 {
+                       compatible = "mediatek,mt8183-mali", "arm,mali-bifrost";
+                       reg = <0 0x13040000 0 0x4000>;
+                       interrupts =
+                               <GIC_SPI 280 IRQ_TYPE_LEVEL_LOW>,
+                               <GIC_SPI 279 IRQ_TYPE_LEVEL_LOW>,
+                               <GIC_SPI 278 IRQ_TYPE_LEVEL_LOW>;
+                       interrupt-names = "job", "mmu", "gpu";
+
+                       clocks = <&topckgen CLK_TOP_MFGPLL_CK>;
+
+                       power-domains =
+                               <&spm MT8183_POWER_DOMAIN_MFG_CORE0>,
+                               <&spm MT8183_POWER_DOMAIN_MFG_CORE1>,
+                               <&spm MT8183_POWER_DOMAIN_MFG_2D>;
+                       power-domain-names = "core0", "core1", "core2";
+
+                       operating-points-v2 = <&gpu_opp_table>;
+               };
+
                mmsys: syscon@14000000 {
                        compatible = "mediatek,mt8183-mmsys", "syscon";
                        reg = <0 0x14000000 0 0x1000>;
@@ -1263,13 +1368,14 @@
                };
 
                smi_common: smi@14019000 {
-                       compatible = "mediatek,mt8183-smi-common", "syscon";
+                       compatible = "mediatek,mt8183-smi-common";
                        reg = <0 0x14019000 0 0x1000>;
                        clocks = <&mmsys CLK_MM_SMI_COMMON>,
                                 <&mmsys CLK_MM_SMI_COMMON>,
                                 <&mmsys CLK_MM_GALS_COMM0>,
                                 <&mmsys CLK_MM_GALS_COMM1>;
                        clock-names = "apb", "smi", "gals0", "gals1";
+                       power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
                };
 
                imgsys: syscon@15020000 {