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

Commit 1813ac1a authored by Hans de Goede's avatar Hans de Goede Committed by Maxime Ripard
Browse files

ARM: dts: sun8i: Fix pio nodes Orangepi Plus dts 



Fix sun8i-h3-orangepi-plus.dts:
1) Having 2 pio nodes, by merging these into one
2) Having the pio and r_pio nodes before the mmc nodes, while they
   should be sorted by alphabet

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent be0f167a

arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts

+39 −41
Original line number Diff line number Diff line
@@ -125,47 +125,6 @@ 
	status = "okay";

};



&pio {

	usb3_vbus_pin_a: usb3_vbus_pin@0 {

		allwinner,pins = "PG11";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&pio {

	leds_opc: led_pins@0 {

		allwinner,pins = "PA15";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&r_pio {

	leds_r_opc: led_pins@0 {

		allwinner,pins = "PL10";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	sw_r_opc: key_pins@0 {

		allwinner,pins = "PL03";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 {

		allwinner,pins = "PL7";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
@@ -203,6 +162,45 @@ 
	allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;

};



&pio {

	leds_opc: led_pins@0 {

		allwinner,pins = "PA15";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	usb3_vbus_pin_a: usb3_vbus_pin@0 {

		allwinner,pins = "PG11";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&r_pio {

	leds_r_opc: led_pins@0 {

		allwinner,pins = "PL10";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	sw_r_opc: key_pins@0 {

		allwinner,pins = "PL03";

		allwinner,function = "gpio_in";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};



	wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 {

		allwinner,pins = "PL7";

		allwinner,function = "gpio_out";

		allwinner,drive = <SUN4I_PINCTRL_10_MA>;

		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;

	};

};



&reg_usb1_vbus {

	gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;

	status = "okay";