Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60018d02 authored by Hans de Goede's avatar Hans de Goede Committed by Maxime Ripard
Browse files

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.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[maxime: Changed the name of the pinctrl node and re-ordered it]
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 36d16154

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

+12 −15
Original line number Original line Diff line number Diff line
@@ -88,15 +88,11 @@ 
		};

		};

	};

	};





	reg_vmmc3: vmmc3 {

	mmc3_pwrseq: mmc3_pwrseq {

		compatible = "regulator-fixed";

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-names = "default";

		pinctrl-0 = <&vmmc3_pin_cubietruck>;

		pinctrl-0 = <&mmc3_pwrseq_pin_cubietruck>;

		regulator-name = "vmmc3";

		reset-gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; /* PH9 WIFI_EN */

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>;

	};

	};

};

};
@@ -172,7 +168,8 @@ 
&mmc3 {

&mmc3 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins_a>;

	pinctrl-0 = <&mmc3_pins_a>;

	vmmc-supply = <&reg_vmmc3>;

	vmmc-supply = <&reg_vcc3v3>;

	mmc-pwrseq = <&mmc3_pwrseq>;

	bus-width = <4>;

	bus-width = <4>;

	non-removable;

	non-removable;

	status = "okay";

	status = "okay";
@@ -204,22 +201,22 @@ 
};

};





&pio {

&pio {

	vmmc3_pin_cubietruck: vmmc3_pin@0 {

	ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {

		allwinner,pins = "PH9";

		allwinner,pins = "PH12";

		allwinner,function = "gpio_out";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

	};





	ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {

	led_pins_cubietruck: led_pins@0 {

		allwinner,pins = "PH12";

		allwinner,pins = "PH7", "PH11", "PH20", "PH21";

		allwinner,function = "gpio_out";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

	};





	led_pins_cubietruck: led_pins@0 {

	mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 {

		allwinner,pins = "PH7", "PH11", "PH20", "PH21";

		allwinner,pins = "PH9";

		allwinner,function = "gpio_out";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;