Merge tag 'hisi-arm64-dt-for-4.19v2' of git://github.com/hisilicon/linux-hisi into...
authorOlof Johansson <olof@lixom.net>
Sat, 21 Jul 2018 21:28:31 +0000 (14:28 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 21 Jul 2018 21:28:31 +0000 (14:28 -0700)
ARM64: DT: Hisilicon SoC DT updates for 4.19v2

- Tidy up MMC properties for hi3660
- Remove keep-power-in-suspend on hikey and hikey960 to
  avoid keeping wifi power during suspend and let the
  user enable it if required
- Update idle states for hikey960
- Add missing cooling device properties for cpus on hi6220

* tag 'hisi-arm64-dt-for-4.19v2' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hisilicon: Add missing cooling device properties for CPUs
  arm64: hikey960: update idle-states
  arm64: dts: hikey: Remove keep-power-in-suspend property
  arm64: dts: hikey960: Remove keep-power-in-suspend property
  arm64: dts: hikey960: Clean up MMC properties and move to proper file
  arm64: dts: hikey960: Remove deprecated MMC properties

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
arch/arm64/boot/dts/hisilicon/hi3660.dtsi
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
arch/arm64/boot/dts/hisilicon/hi6220.dtsi

index 68c5a6c819aef2c3fbe8b59aac695cfb0c3a3a77..c98bcbc8dfba33386f5cf7d66fcc8a6c9480d817 100644 (file)
 };
 
 &dwmmc1 {
+       bus-width = <0x4>;
+       cap-sd-highspeed;
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr50;
+       sd-uhs-sdr104;
+       disable-wp;
+       cd-inverted;
+       cd-gpios = <&gpio25 3 0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sd_pmx_func
+                    &sd_clk_cfg_func
+                    &sd_cfg_func>;
        vmmc-supply = <&ldo16>;
        vqmmc-supply = <&ldo9>;
        status = "okay";
 };
 
 &dwmmc2 { /* WIFI */
+       bus-width = <0x4>;
+       non-removable;
        broken-cd;
+       cap-power-off-card;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdio_pmx_func
+                    &sdio_clk_cfg_func
+                    &sdio_cfg_func>;
        /* WL_EN */
        vmmc-supply = <&wlan_en>;
-       ti,non-removable;
-       non-removable;
-       cap-power-off-card;
-       keep-power-in-suspend;
-       #address-cells = <0x1>;
-       #size-cells = <0x0>;
        status = "ok";
 
        wlcore: wlcore@2 {
index 8d477dcbfa5822c4b037cee7e187bd27ee045f04..fa79a5d8fb5be94ca8fd797d594612808a363ef9 100644 (file)
@@ -61,7 +61,7 @@
                        reg = <0x0 0x0>;
                        enable-method = "psci";
                        next-level-cache = <&A53_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
+                       cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
                        capacity-dmips-mhz = <592>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER0>;
                        operating-points-v2 = <&cluster0_opp>;
@@ -75,7 +75,7 @@
                        reg = <0x0 0x1>;
                        enable-method = "psci";
                        next-level-cache = <&A53_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
+                       cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
                        capacity-dmips-mhz = <592>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER0>;
                        operating-points-v2 = <&cluster0_opp>;
@@ -87,7 +87,7 @@
                        reg = <0x0 0x2>;
                        enable-method = "psci";
                        next-level-cache = <&A53_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
+                       cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
                        capacity-dmips-mhz = <592>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER0>;
                        operating-points-v2 = <&cluster0_opp>;
@@ -99,7 +99,7 @@
                        reg = <0x0 0x3>;
                        enable-method = "psci";
                        next-level-cache = <&A53_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
+                       cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>;
                        capacity-dmips-mhz = <592>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER0>;
                        operating-points-v2 = <&cluster0_opp>;
                        reg = <0x0 0x100>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
+                       cpu-idle-states = <&CPU_SLEEP_1 &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER1>;
                        operating-points-v2 = <&cluster1_opp>;
                        reg = <0x0 0x101>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
+                       cpu-idle-states = <&CPU_SLEEP_1 &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER1>;
                        operating-points-v2 = <&cluster1_opp>;
                        reg = <0x0 0x102>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
+                       cpu-idle-states = <&CPU_SLEEP_1 &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER1>;
                        operating-points-v2 = <&cluster1_opp>;
                        reg = <0x0 0x103>;
                        enable-method = "psci";
                        next-level-cache = <&A73_L2>;
-                       cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
+                       cpu-idle-states = <&CPU_SLEEP_1 &CLUSTER_SLEEP_1>;
                        capacity-dmips-mhz = <1024>;
                        clocks = <&stub_clock HI3660_CLK_STUB_CLUSTER1>;
                        operating-points-v2 = <&cluster1_opp>;
                idle-states {
                        entry-method = "psci";
 
-                       CPU_SLEEP: cpu-sleep {
+                       CPU_SLEEP_0: cpu-sleep-0 {
                                compatible = "arm,idle-state";
                                local-timer-stop;
                                arm,psci-suspend-param = <0x0010000>;
-                               entry-latency-us = <40>;
-                               exit-latency-us = <70>;
-                               min-residency-us = <3000>;
+                               entry-latency-us = <400>;
+                               exit-latency-us = <650>;
+                               min-residency-us = <1500>;
                        };
-
                        CLUSTER_SLEEP_0: cluster-sleep-0 {
                                compatible = "arm,idle-state";
                                local-timer-stop;
                                arm,psci-suspend-param = <0x1010000>;
                                entry-latency-us = <500>;
-                               exit-latency-us = <5000>;
-                               min-residency-us = <20000>;
+                               exit-latency-us = <1600>;
+                               min-residency-us = <3500>;
+                       };
+
+
+                       CPU_SLEEP_1: cpu-sleep-1 {
+                               compatible = "arm,idle-state";
+                               local-timer-stop;
+                               arm,psci-suspend-param = <0x0010000>;
+                               entry-latency-us = <400>;
+                               exit-latency-us = <550>;
+                               min-residency-us = <1500>;
                        };
 
                        CLUSTER_SLEEP_1: cluster-sleep-1 {
                                compatible = "arm,idle-state";
                                local-timer-stop;
                                arm,psci-suspend-param = <0x1010000>;
-                               entry-latency-us = <1000>;
-                               exit-latency-us = <5000>;
-                               min-residency-us = <20000>;
+                               entry-latency-us = <800>;
+                               exit-latency-us = <2900>;
+                               min-residency-us = <3500>;
                        };
                };
 
 
                /* SD */
                dwmmc1: dwmmc1@ff37f000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       cd-inverted;
                        compatible = "hisilicon,hi3660-dw-mshc";
-                       bus-width = <0x4>;
-                       disable-wp;
-                       cap-sd-highspeed;
-                       supports-highspeed;
-                       card-detect-delay = <200>;
                        reg = <0x0 0xff37f000 0x0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&crg_ctrl HI3660_CLK_GATE_SD>,
                                <&crg_ctrl HI3660_HCLK_GATE_SD>;
                        clock-frequency = <3200000>;
                        resets = <&crg_rst 0x94 18>;
                        reset-names = "reset";
-                       cd-gpios = <&gpio25 3 0>;
                        hisilicon,peripheral-syscon = <&sctrl>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&sd_pmx_func
-                                    &sd_clk_cfg_func
-                                    &sd_cfg_func>;
-                       sd-uhs-sdr12;
-                       sd-uhs-sdr25;
-                       sd-uhs-sdr50;
-                       sd-uhs-sdr104;
+                       card-detect-delay = <200>;
                        status = "disabled";
-
-                       slot@0 {
-                               reg = <0x0>;
-                               bus-width = <4>;
-                               disable-wp;
-                       };
                };
 
                /* SDIO */
                dwmmc2: dwmmc2@ff3ff000 {
                        compatible = "hisilicon,hi3660-dw-mshc";
                        reg = <0x0 0xff3ff000 0x0 0x1000>;
+                       #address-cells = <0x1>;
+                       #size-cells = <0x0>;
                        interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&crg_ctrl HI3660_CLK_GATE_SDIO0>,
                                 <&crg_ctrl HI3660_HCLK_GATE_SDIO0>;
                        resets = <&crg_rst 0x94 20>;
                        reset-names = "reset";
                        card-detect-delay = <200>;
-                       supports-highspeed;
-                       keep-power-in-suspend;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&sdio_pmx_func
-                                    &sdio_clk_cfg_func
-                                    &sdio_cfg_func>;
                        status = "disabled";
                };
 
index 7f12624f6c8e8c6af0a3900f3e7d703a969c6c0e..f4964bee6a1a9b7b7e0ab2063f3c2987253c9096 100644 (file)
                        bus-width = <0x4>;
                        non-removable;
                        cap-power-off-card;
-                       keep-power-in-suspend;
                        vmmc-supply = <&reg_vdd_3v3>;
                        mmc-pwrseq = <&wl1835_pwrseq>;
 
index 586b281cd5312d711e115eb3fe4734b125e476d3..247024df714fce9ab1d85ee4dc73a5bec948f99c 100644 (file)
@@ -88,8 +88,8 @@
                        next-level-cache = <&CLUSTER0_L2>;
                        clocks = <&stub_clock 0>;
                        operating-points-v2 = <&cpu_opp_table>;
-                       #cooling-cells = <2>; /* min followed by max */
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
                        dynamic-power-coefficient = <311>;
                };
 
                        next-level-cache = <&CLUSTER0_L2>;
                        operating-points-v2 = <&cpu_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <311>;
                };
 
                cpu2: cpu@2 {
                        next-level-cache = <&CLUSTER0_L2>;
                        operating-points-v2 = <&cpu_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <311>;
                };
 
                cpu3: cpu@3 {
                        next-level-cache = <&CLUSTER0_L2>;
                        operating-points-v2 = <&cpu_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <311>;
                };
 
                cpu4: cpu@100 {
                        next-level-cache = <&CLUSTER1_L2>;
                        operating-points-v2 = <&cpu_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <311>;
                };
 
                cpu5: cpu@101 {
                        next-level-cache = <&CLUSTER1_L2>;
                        operating-points-v2 = <&cpu_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <311>;
                };
 
                cpu6: cpu@102 {
                        next-level-cache = <&CLUSTER1_L2>;
                        operating-points-v2 = <&cpu_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <311>;
                };
 
                cpu7: cpu@103 {
                        next-level-cache = <&CLUSTER1_L2>;
                        operating-points-v2 = <&cpu_opp_table>;
                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
+                       #cooling-cells = <2>; /* min followed by max */
+                       dynamic-power-coefficient = <311>;
                };
 
                CLUSTER0_L2: l2-cache0 {