Merge tag 'dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[platform/kernel/linux-starfive.git] / arch / arm / boot / dts / qcom-apq8064.dtsi

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index d1c1c6a..4d562c9 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -95,13 +95,13 @@
                };
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x0>;
        };
 
        thermal-zones {
-               cpu-thermal0 {
+               cpu0-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -122,7 +122,7 @@
                        };
                };
 
-               cpu-thermal1 {
+               cpu1-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -143,7 +143,7 @@
                        };
                };
 
-               cpu-thermal2 {
+               cpu2-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -164,7 +164,7 @@
                        };
                };
 
-               cpu-thermal3 {
+               cpu3-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -683,12 +683,11 @@
                                pm8821_mpps: mpps@50 {
                                        compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";
                                        reg = <0x50>;
-                                       interrupts = <24 IRQ_TYPE_NONE>,
-                                                    <25 IRQ_TYPE_NONE>,
-                                                    <26 IRQ_TYPE_NONE>,
-                                                    <27 IRQ_TYPE_NONE>;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
                                        gpio-controller;
                                        #gpio-cells = <2>;
+                                       gpio-ranges = <&pm8821_mpps 0 0 4>;
                                };
                        };
                };
@@ -726,19 +725,9 @@
                                        reg = <0x50>;
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       interrupts =
-                                       <128 IRQ_TYPE_NONE>,
-                                       <129 IRQ_TYPE_NONE>,
-                                       <130 IRQ_TYPE_NONE>,
-                                       <131 IRQ_TYPE_NONE>,
-                                       <132 IRQ_TYPE_NONE>,
-                                       <133 IRQ_TYPE_NONE>,
-                                       <134 IRQ_TYPE_NONE>,
-                                       <135 IRQ_TYPE_NONE>,
-                                       <136 IRQ_TYPE_NONE>,
-                                       <137 IRQ_TYPE_NONE>,
-                                       <138 IRQ_TYPE_NONE>,
-                                       <139 IRQ_TYPE_NONE>;
+                                       gpio-ranges = <&pm8921_mpps 0 0 12>;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
                                };
 
                                rtc@11d {
@@ -1084,7 +1073,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status          = "disabled";
                                compatible      = "arm,pl18x", "arm,primecell";
                                pinctrl-names   = "default";
@@ -1104,7 +1093,7 @@
                                dma-names = "tx", "rx";
                        };
 
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";
@@ -1122,7 +1111,7 @@
                                dma-names = "tx", "rx";
                        };
 
-                       sdcc4: sdcc@121c0000 {
+                       sdcc4: mmc@121c0000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";
@@ -1229,13 +1218,17 @@
                                  &gfx3d1 30
                                  &gfx3d1 31>;
 
-                       qcom,gpu-pwrlevels {
-                               compatible = "qcom,gpu-pwrlevels";
-                               qcom,gpu-pwrlevel@0 {
-                                       qcom,gpu-freq = <450000000>;
+                       operating-points-v2 = <&gpu_opp_table>;
+
+                       gpu_opp_table: opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-320000000 {
+                                       opp-hz = /bits/ 64 <450000000>;
                                };
-                               qcom,gpu-pwrlevel@1 {
-                                       qcom,gpu-freq = <27000000>;
+
+                               opp-27000000 {
+                                       opp-hz = /bits/ 64 <27000000>;
                                };
                        };
                };
@@ -1419,9 +1412,9 @@
                        clocks = <&mmcc HDMI_APP_CLK>,
                                 <&mmcc HDMI_M_AHB_CLK>,
                                 <&mmcc HDMI_S_AHB_CLK>;
-                       clock-names = "core_clk",
-                                     "master_iface_clk",
-                                     "slave_iface_clk";
+                       clock-names = "core",
+                                     "master_iface",
+                                     "slave_iface";
 
                        phys = <&hdmi_phy>;
                        phy-names = "hdmi-phy";
@@ -1452,7 +1445,7 @@
                                    "hdmi_pll";
 
                        clocks = <&mmcc HDMI_S_AHB_CLK>;
-                       clock-names = "slave_iface_clk";
+                       clock-names = "slave_iface";
                        #phy-cells = <0>;
                };