ARM: dts: rockchip: add missing regulators for firefly reload board

There are many regulators are missed in previous commit, this
commit complete most of them. It also fix some mistakes in the
regulator properties. The VDD_10(REG10) and VCC_18(REG11) had better
to keep in always-on state, as it is used as the USB PHY supply,
corretly we have no way to assign power supply to a USB PHY.
The VCCA_33(REG8) should be enabled or the GMAC won't work.

It also fix the wrong properties for audio in io-domains, the supply
connected to APIO4_VDD is different to firefly release version.

Signed-off-by: Randy Li <ayaka@soulik.info>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
index 73c88ff..ec418c9 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
@@ -50,14 +50,6 @@
                reg = <0 0x80000000>;
        };
 
-       dovdd_1v8: dovdd-1v8-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "dovdd_1v8";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               vin-supply = <&vcc28_dvp>;
-       };
-
        ext_gmac: external-gmac-clock {
                compatible = "fixed-clock";
                #clock-cells = <0>;
@@ -65,14 +57,6 @@
                clock-output-names = "ext_gmac";
        };
 
-       vbat_wl: vcc_sys: vsys-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "vcc_sys";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               regulator-boot-on;
-       };
 
        vcc_flash: flash-regulator {
                compatible = "regulator-fixed";
@@ -81,16 +65,6 @@
                regulator-max-microvolt = <1800000>;
                vin-supply = <&vcc_io>;
        };
-
-       vcc_5v: usb-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "vcc_5v";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               regulator-boot-on;
-               vin-supply = <&vcc_sys>;
-       };
 };
 
 &cpu0 {
@@ -205,34 +179,34 @@
                                regulator-name = "vccio_sd";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
                        };
 
                        vdd10_lcd: REG6 {
                                regulator-name = "vdd10_lcd";
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <1000000>;
+                       };
+
+                       vcca_18: REG7  {
+                               regulator-name = "vcca_18";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
                                regulator-always-on;
                        };
 
-                       vcca_33: REG7  {
+                       vcca_33: REG8 {
                                regulator-name = "vcca_33";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
                        };
 
-                       vcc_lan: REG8 {
+                       vcc_lan: REG9 {
                                regulator-name = "vcca_lan";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                        };
 
-                       vccio_pmu: REG9 {
-                               regulator-name = "vccio_pmu";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                       };
-
                        vdd_10: REG10 {
                                regulator-name = "vdd_10";
                                regulator-min-microvolt = <1000000>;
@@ -244,14 +218,12 @@
                                regulator-name = "vcc_18";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
                        };
 
                        vcc18_lcd: REG12 {
                                regulator-name = "vcc18_lcd";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
-                               regulator-always-on;
                        };
                };
        };
@@ -260,7 +232,7 @@
 &io_domains {
        status = "okay";
 
-       audio-supply = <&vcca_33>;
+       audio-supply = <&vccio_wl>;
        bb-supply = <&vcc_io>;
        dvp-supply = <&dovdd_1v8>;
        flash0-supply = <&vcc_flash>;

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index a127b45..751bee8 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -122,6 +122,15 @@
                vin-supply = <&vcc_5v>;
        };
 
+       vcc_5v: vcc_sys: vsys-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_5v";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
+
        vcc_sd: sdmmc-regulator {
                compatible = "regulator-fixed";
                gpio = <&gpio7 11 GPIO_ACTIVE_LOW>;
@@ -147,10 +156,18 @@
                vin-supply = <&vcc_5v>;
        };
 
-       /*
-        * A TT8142 creates both dovdd_1v8 and vcc28_dvp, controlled
-        * by the dvp_pwr pin.
-        */
+       dovdd_1v8: dovdd-1v8-regulator {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&dvp_pwr>;
+               regulator-name = "dovdd_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               vin-supply = <&vcc_io>;
+       };
+
        vcc28_dvp: vcc28-dvp-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
@@ -160,7 +177,38 @@
                regulator-name = "vcc28_dvp";
                regulator-min-microvolt = <2800000>;
                regulator-max-microvolt = <2800000>;
-               regulator-always-on;
+               vin-supply = <&vcc_io>;
+       };
+
+       af_28: af_28-regulator {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&dvp_pwr>;
+               regulator-name = "af_28";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               vin-supply = <&vcc_io>;
+       };
+
+       dvdd_1v2: af_28-regulator {
+               compatible = "regulator-fixed";
+               enable-active-high;
+               gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&cif_pwr>;
+               regulator-name = "dvdd_1v2";
+               regulator-min-microvolt = <1200000>;
+               regulator-max-microvolt = <1200000>;
+               vin-supply = <&vcc_io>;
+       };
+
+       vbat_wl: wifi-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "vbat_wl";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
                vin-supply = <&vcc_io>;
        };
 };
@@ -278,6 +326,10 @@
                dvp_pwr: dvp-pwr {
                        rockchip,pins = <0 11 RK_FUNC_GPIO &pcfg_pull_none>;
                };
+
+               cif_pwr: cif-pwr {
+                       rockchip,pins = <7 12 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
        };
 
        hym8563 {