Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun9i-a80-optimus.dts

diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 58a199b0e4943424443043a72f1e430279fa8ea3..864715ec3cb0fd1110cd21f37e5e3e4478ed28eb 100644 (file)
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -120,6 +120,19 @@
        status = "okay";
 };
 
+&gmac {
+       pinctrl-names = "default";
+       pinctrl-0 = <&gmac_rgmii_pins>;
+       phy = <&phy1>;
+       phy-mode = "rgmii";
+       phy-supply = <&reg_cldo1>;
+       status = "okay";
+
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+};
+
 &mmc0 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc0_pins>;
@@ -172,10 +185,26 @@
        clocks = <&ac100_rtc 0>;
 };
 
+&pio {
+       vcc-pa-supply = <&reg_ldo_io1>;
+       vcc-pb-supply = <&reg_aldo2>;
+       vcc-pc-supply = <&reg_dcdc1>;
+       vcc-pd-supply = <&reg_dcdc1>;
+       vcc-pe-supply = <&reg_eldo2>;
+       vcc-pf-supply = <&reg_dcdc1>;
+       vcc-pg-supply = <&reg_ldo_io0>;
+       vcc-ph-supply = <&reg_dcdc1>;
+};
+
 &r_ir {
        status = "okay";
 };
 
+&r_pio {
+       vcc-pl-supply = <&reg_dldo2>;
+       vcc-pm-supply = <&reg_eldo3>;
+};
+
 &r_rsb {
        status = "okay";
 
@@ -213,6 +242,10 @@
                                regulator-name = "vdd-cpus-09-usbh";
                        };
 
+                       dc1sw {
+                               /* unused */
+                       };
+
                        reg_dcdc1: dcdc1 {
                                regulator-always-on;
                                regulator-min-microvolt = <3000000>;
@@ -260,7 +293,6 @@
                        };
 
                        reg_dldo2: dldo2 {
-                               regulator-always-on;
                                regulator-min-microvolt = <3000000>;
                                regulator-max-microvolt = <3000000>;
                                regulator-name = "vcc-pl";
@@ -279,14 +311,12 @@
                        };
 
                        reg_eldo3: eldo3 {
-                               regulator-always-on;
                                regulator-min-microvolt = <3000000>;
                                regulator-max-microvolt = <3000000>;
                                regulator-name = "vcc-pm-codec-io1";
                        };
 
                        reg_ldo_io0: ldo_io0 {
-                               regulator-always-on;
                                regulator-min-microvolt = <3000000>;
                                regulator-max-microvolt = <3000000>;
                                regulator-name = "vcc-pg";
@@ -374,6 +404,14 @@
                                 */
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
+                               /*
+                                * The PHY requires 20ms after all voltages
+                                * are applied until core logic is ready and
+                                * 30ms after the reset pin is de-asserted.
+                                * Set a 100ms delay to account for PMIC
+                                * ramp time and board traces.
+                                */
+                               regulator-enable-ramp-delay = <100000>;
                                regulator-name = "vcc-gmac-phy";
                        };