Skip to contentSkip to conversation

ARM: dts: sun7i: Change cubietruck wifi enable pin to use mmc-pwrseq

PATCH New Hans de Goede 2 participants 2 messages Jul 31, 2015 – Aug 1, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: sun7i: Change cubietruck wifi enable pin to use mmc-pwrseq

The wifi-enable pin of the ap6210 module is not really a regulator, switch to the mmc-pwrseq framework for controlling it. This more accurately reflects how the hardware actually works.

---
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
arch/arm/boot/dts/sun7i-a20-cubietruck.dts +5 -8
index de3e195..0b2f914 100644
@@ -88,15 +88,11 @@
 		};
 	};
 
-	reg_vmmc3: vmmc3 {
-		compatible = "regulator-fixed";
+	mmc3_pwrseq: mmc3_pwrseq {
+		compatible = "mmc-pwrseq-simple";
 		pinctrl-names = "default";
 		pinctrl-0 = <&vmmc3_pin_cubietruck>;
-		regulator-name = "vmmc3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		enable-active-high;
-		gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */
 	};
 };
 
@@ -179,7 +175,8 @@
 &mmc3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc3_pins_a>;
-	vmmc-supply = <&reg_vmmc3>;
+	vmmc-supply = <&reg_vcc3v3>;
+	mmc-pwrseq = <&mmc3_pwrseq>;
 	bus-width = <4>;
 	non-removable;
 	status = "okay";
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 ARM: dts: sun7i: Change cubietruck wifi enable pin to use mmc-pwrseq

Quoted 14 lines · Hans de Goede

The wifi-enable pin of the ap6210 module is not really a regulator, switch to the mmc-pwrseq framework for controlling it. This more accurately reflects how the hardware actually works.

---
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
arch/arm/boot/dts/sun7i-a20-cubietruck.dts +0 -0
index de3e195..0b2f914 100644

arch/arm/boot/dts/sun7i-a20-cubietruck.dts line 94

Quoted 9 lines
arch/arm/boot/dts/sun7i-a20-cubietruck.dts +2 -2
@@ -88,15 +88,11 @@
 		};
 	};
 
-	reg_vmmc3: vmmc3 {
-		compatible = "regulator-fixed";
+	mmc3_pwrseq: mmc3_pwrseq {
+		compatible = "mmc-pwrseq-simple";
 		pinctrl-names = "default";
 		pinctrl-0 = <&vmmc3_pin_cubietruck>;

The pinctrl name shouldn't be called that way anymore.

Changed it to mmc3_pwrseq_pin_cubietruck, and applied the patch.

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150801/e8beae06/attachment.sig>