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

Commit 02b301f5 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai
Browse files

ARM: dts: sun8i: r40: bananapi-m2-ultra: Sort device node dereferences 



The device nodes dereference (&foo) usages should be sorted by the label
names, barring any parsing order issues such as the #include statement
for the PMIC's .dtsi file that must come after the PMIC.

Move the mmc and ohci blocks in front of the PMIC's regulator blocks.

Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 221cb9fd

arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts

+35 −34
Original line number Diff line number Diff line
@@ -114,6 +114,41 @@ 


#include "axp22x.dtsi"



&mmc0 {

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */

	cd-inverted;

	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pg_pins>;

	vmmc-supply = <&reg_dldo2>;

	vqmmc-supply = <&reg_dldo1>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";

};



&mmc2 {

	vmmc-supply = <&reg_dcdc1>;

	vqmmc-supply = <&reg_dcdc1>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&reg_aldo3 {

	regulator-always-on;

	regulator-min-microvolt = <2700000>;
@@ -161,40 +196,6 @@ 
	regulator-name = "vcc-wifi";

};



&mmc0 {

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */

	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pg_pins>;

	vmmc-supply = <&reg_dldo2>;

	vqmmc-supply = <&reg_dldo1>;

	mmc-pwrseq = <&wifi_pwrseq>;

	bus-width = <4>;

	non-removable;

	status = "okay";

};



&mmc2 {

	vmmc-supply = <&reg_dcdc1>;

	vqmmc-supply = <&reg_dcdc1>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&ohci1 {

	status = "okay";

};



&ohci2 {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pb_pins>;