Unverified Commit 18009b80 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sunxi: Remove useless pinctrl nodes 



We have for the H3 boards some kind of cargo cult apparently, where we
would have a pinctrl node even for GPIOs without any particular settings.

This is pretty much useless, so let's remove them.

Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent a107bd2b

arch/arm/boot/dts/sun8i-h3-nanopi.dtsi

+0 −23
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&leds_npi>, <&leds_r_npi>;



		status {

			label = "nanopi:blue:status";
@@ -78,8 +76,6 @@ 
	r_gpio_keys {

		compatible = "gpio-keys";

		input-name = "k1";

		pinctrl-names = "default";

		pinctrl-0 = <&sw_r_npi>;



		k1 {

			label = "k1";
@@ -104,25 +100,6 @@ 
	status = "okay";

};



&pio {

	leds_npi: led_pins {

		pins = "PA10";

		function = "gpio_out";

	};

};



&r_pio {

	leds_r_npi: led_pins {

		pins = "PL10";

		function = "gpio_out";

	};



	sw_r_npi: key_pins {

		pins = "PL3";

		function = "gpio_in";

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

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

+0 −30
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&leds_opc>, <&leds_r_opc>;



		status_led {

			label = "orangepi:red:status";
@@ -92,8 +90,6 @@ 


	r_gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&sw_r_opc>;



		sw2 {

			label = "sw2";
@@ -110,8 +106,6 @@ 


	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_pwrseq_pin_orangepi>;

		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 WIFI_EN */

	};

};
@@ -179,30 +173,6 @@ 
	};

};



&pio {

	leds_opc: led_pins {

		pins = "PA15";

		function = "gpio_out";

	};

};



&r_pio {

	leds_r_opc: led_pins {

		pins = "PL10";

		function = "gpio_out";

	};



	sw_r_opc: key_pins {

		pins = "PL3", "PL4";

		function = "gpio_in";

	};



	wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin {

		pins = "PL7";

		function = "gpio_out";

	};

};



&reg_usb1_vbus {

	gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;

	status = "okay";

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

+0 −23
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&leds_opc>, <&leds_r_opc>;



		pwr_led {

			label = "orangepi:green:pwr";
@@ -91,8 +89,6 @@ 


	r_gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&sw_r_opc>;



		sw4 {

			label = "sw4";
@@ -160,25 +156,6 @@ 
	status = "okay";

};



&pio {

	leds_opc: led_pins {

		pins = "PA15";

		function = "gpio_out";

	};

};



&r_pio {

	leds_r_opc: led_pins {

		pins = "PL10";

		function = "gpio_out";

	};



	sw_r_opc: key_pins {

		pins = "PL3";

		function = "gpio_in";

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins_a>;

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

+0 −23
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&leds_opc>, <&leds_r_opc>;



		pwr_led {

			label = "orangepi:green:pwr";
@@ -90,8 +88,6 @@ 


	r_gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&sw_r_opc>;



		sw4 {

			label = "sw4";
@@ -166,25 +162,6 @@ 
	status = "okay";

};



&pio {

	leds_opc: led_pins {

		pins = "PA15";

		function = "gpio_out";

	};

};



&r_pio {

	leds_r_opc: led_pins {

		pins = "PL10";

		function = "gpio_out";

	};



	sw_r_opc: key_pins {

		pins = "PL3";

		function = "gpio_in";

	};

};



&reg_usb0_vbus {

	gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */

	status = "okay";

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

+0 −23
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&leds_opc>, <&leds_r_opc>;



		pwr_led {

			label = "orangepi:green:pwr";
@@ -90,8 +88,6 @@ 


	r_gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&sw_r_opc>;



		sw4 {

			label = "sw4";
@@ -179,13 +175,6 @@ 
	status = "okay";

};



&pio {

	leds_opc: led_pins {

		pins = "PA15";

		function = "gpio_out";

	};

};



&r_i2c {

	status = "okay";
@@ -210,18 +199,6 @@ 
	};

};



&r_pio {

	leds_r_opc: led_pins {

		pins = "PL10";

		function = "gpio_out";

	};



	sw_r_opc: key_pins {

		pins = "PL3";

		function = "gpio_in";

	};

};



&reg_usb0_vbus {

	gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE