Merge tag 'v4.20-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 22:21:26 +0000 (14:21 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 22:21:26 +0000 (14:21 -0800)
rockpro64 regulator fixes that cause stability issues

* tag 'v4.20-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts

index 1d35f5406b5e2b27b8b478e796778af717e73e00..5bd4d69914bdea906dfd60dc3ec81dec1dbddd62 100644 (file)
@@ -97,7 +97,7 @@
        vcc3v3_pcie: vcc3v3-pcie-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
-               gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
+               gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&pcie_pwr_en>;
                regulator-name = "vcc3v3_pcie";
                                };
                        };
 
-                       vcc2v8_dvp: LDO_REG2 {
-                               regulator-name = "vcc2v8_dvp";
+                       vcc3v0_touch: LDO_REG2 {
+                               regulator-name = "vcc3v0_touch";
                                regulator-always-on;
                                regulator-boot-on;
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <2800000>;
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
                                regulator-state-mem {
                                        regulator-off-in-suspend;
                                };
        vdd_cpu_b: regulator@40 {
                compatible = "silergy,syr827";
                reg = <0x40>;
-               fcs,suspend-voltage-selector = <0>;
+               fcs,suspend-voltage-selector = <1>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&vsel1_gpio>;
                regulator-name = "vdd_cpu_b";
                regulator-min-microvolt = <712500>;
                regulator-max-microvolt = <1500000>;
                compatible = "silergy,syr828";
                reg = <0x41>;
                fcs,suspend-voltage-selector = <1>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&vsel2_gpio>;
                regulator-name = "vdd_gpu";
                regulator-min-microvolt = <712500>;
                regulator-max-microvolt = <1500000>;
 
        pcie {
                pcie_pwr_en: pcie-pwr-en {
-                       rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
+                       rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };
 
                };
 
                vsel1_gpio: vsel1-gpio {
-                       rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
+                       rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
                };
 
                vsel2_gpio: vsel2-gpio {