From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 7 Aug 2019 04:44:48 +0000 (+0200)
Subject: DT: sun8i: add vdd_cpux regulator to nanopi-r1 and nanopi-neo{-air}
X-Git-Tag: v4.14.232-multi
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fv4.14.y-multi;p=people%2Farne_f%2Fkernel.git

DT: sun8i: add vdd_cpux regulator to nanopi-r1 and nanopi-neo{-air}

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
index 85b88b2c9055e..0525673bb067b 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
@@ -80,6 +80,27 @@
 			linux,default-trigger = "heartbeat";
 		};
 	};
+
+	reg_mp2134dj: gpio-regulator {
+		compatible = "regulator-gpio";
+		regulator-name = "vdd-cpux";
+		regulator-type = "voltage";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <1100000>;
+		regulator-max-microvolt = <1300000>;
+		regulator-ramp-delay = <50>;		// 50=4ms check
+
+		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;	// PL6 check
+		enable-active-high;
+		gpios-states = <0x1>;
+		states = <1100000 0x0
+			  1300000 0x1>;
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&reg_mp2134dj>;
 };
 
 &r_pio {
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
index 78f6c24952dd1..1b95e157304f0 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
@@ -45,6 +45,27 @@
 / {
 	model = "FriendlyARM NanoPi NEO";
 	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
+
+	reg_sy8113b: gpio-regulator {
+		compatible = "regulator-gpio";
+		regulator-name = "vdd-cpux";
+		regulator-type = "voltage";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <1100000>;
+		regulator-max-microvolt = <1300000>;
+		regulator-ramp-delay = <50>; 		// 50=4ms check
+
+		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;	// PL6 check
+		enable-active-high;
+		gpios-states = <0x1>;
+		states = <1100000 0x0
+			  1300000 0x1>;
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&reg_sy8113b>;
 };
 
 &emac {
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts
index 1c3e18f5fbad0..856e534a92360 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-r1.dts
@@ -108,6 +108,27 @@
 			linux,default-trigger = "netdev";
 		};
 	};
+
+	reg_mp2143dj: gpio-regulator {
+		compatible = "regulator-gpio";
+		regulator-name = "vdd-cpux";
+		regulator-type = "voltage";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <1100000>;
+		regulator-max-microvolt = <1300000>;
+		regulator-ramp-delay = <50>;		// 50=4ms check
+
+		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;	// PL6 check
+		enable-active-high;
+		gpios-states = <0x1>;
+		states = <1100000 0x0
+			  1300000 0x1>;
+	};
+};
+
+&cpu0 {
+	cpu-supply = <&reg_mp2143dj>;
 };
 
 &pio {