Unverified Commit 054da074 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sun7i: Remove all useless pinctrl nodes 



The gpio pinctrl nodes are redundant and as such useless most of the times.
Since they will also generate warnings in DTC, we can simply remove most of
them.

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

arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts

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


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_bpi_m1p>;



		green {

			label = "bananapi-m1-plus:green:usr";
@@ -90,15 +88,11 @@ 


	mmc3_pwrseq: mmc3_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-0 = <&mmc3_pwrseq_pin_bpi_m1p>;

		reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 WL-PMU-EN */

	};



	reg_gmac_3v3: gmac-3v3 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&gmac_power_pin_bpi_m1p>;

		regulator-name = "gmac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -227,26 +221,11 @@ 
};



&pio {

	gmac_power_pin_bpi_m1p: gmac_power_pin@0 {

		pins = "PH23";

		function = "gpio_out";

	};



	led_pins_bpi_m1p: led_pins@0 {

		pins = "PH24", "PH25";

		function = "gpio_out";

	};



	mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {

		pins = "PH10";

		function = "gpio_in";

		bias-pull-up;

	};



	mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 {

		pins = "PH22";

		function = "gpio_out";

	};

};



&reg_dcdc2 {

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

+0 −14
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_bananapi>;



		green {

			label = "bananapi:green:usr";
@@ -87,8 +85,6 @@ 


	reg_gmac_3v3: gmac-3v3 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&gmac_power_pin_bananapi>;

		regulator-name = "gmac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -263,16 +259,6 @@ 
		function = "gpio_in";

		bias-pull-up;

	};



	gmac_power_pin_bananapi: gmac_power_pin@0 {

		pins = "PH23";

		function = "gpio_out";

	};



	led_pins_bananapi: led_pins@0 {

		pins = "PH24";

		function = "gpio_out";

	};

};



#include "axp209.dtsi"

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

+0 −33
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_bananapro>;



		blue {

			label = "bananapro:blue:usr";
@@ -78,15 +76,11 @@ 


	wifi_pwrseq: wifi-pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-0 = <&vmmc3_pin_bananapro>;

		reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>;

	};



	reg_gmac_3v3: gmac-3v3 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&gmac_power_pin_bananapro>;

		regulator-name = "gmac-3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -189,46 +183,19 @@ 
};



&pio {

	gmac_power_pin_bananapro: gmac_power_pin@0 {

		pins = "PH23";

		function = "gpio_out";

	};



	led_pins_bananapro: led_pins@0 {

		pins = "PH24", "PG2";

		function = "gpio_out";

	};



	mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {

		pins = "PH10";

		function = "gpio_in";

		bias-pull-up;

	};



	usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {

		pins = "PH0";

		function = "gpio_out";

	};



	usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {

		pins = "PH1";

		function = "gpio_out";

	};



	vmmc3_pin_bananapro: vmmc3_pin@0 {

		pins = "PH22";

		function = "gpio_out";

	};

};



&reg_usb1_vbus {

	pinctrl-0 = <&usb1_vbus_pin_bananapro>;

	gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */

	status = "okay";

};



&reg_usb2_vbus {

	pinctrl-0 = <&usb2_vbus_pin_bananapro>;

	gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */

	status = "okay";

};

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

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


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_cubieboard2>;



		blue {

			label = "cubieboard2:blue:usr";
@@ -182,11 +180,6 @@ 
};



&pio {

	led_pins_cubieboard2: led_pins@0 {

		pins = "PH20", "PH21";

		function = "gpio_out";

	};



	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		pins = "PH4";

		function = "gpio_in";

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

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


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&led_pins_cubietruck>;



		blue {

			label = "cubietruck:blue:usr";
@@ -100,8 +98,6 @@ 


	mmc3_pwrseq: mmc3_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-0 = <&mmc3_pwrseq_pin_cubietruck>;

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

	};
@@ -245,38 +241,6 @@ 
	status = "okay";

};



&pio {

	ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {

		pins = "PH12";

		function = "gpio_out";

	};



	led_pins_cubietruck: led_pins@0 {

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

		function = "gpio_out";

	};



	mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 {

		pins = "PH9";

		function = "gpio_out";

	};



	usb0_vbus_pin_a: usb0_vbus_pin@0 {

		pins = "PH17";

		function = "gpio_out";

	};



	usb0_id_detect_pin: usb0_id_detect_pin@0 {

		pins = "PH19";

		function = "gpio_in";

	};



	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {

		pins = "PH22";

		function = "gpio_in";

	};

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>;
@@ -284,7 +248,6 @@ 
};



&reg_ahci_5v {

	pinctrl-0 = <&ahci_pwr_pin_cubietruck>;

	gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;

	status = "okay";

};
@@ -325,7 +288,6 @@ 
};



&reg_usb0_vbus {

	pinctrl-0 = <&usb0_vbus_pin_a>;

	gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>;

	status = "okay";

};
@@ -360,8 +322,6 @@ 
};



&usbphy {

	pinctrl-names = "default";

	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;

	usb0_id_det-gpios = <&pio 7 19 GPIO_ACTIVE_HIGH>; /* PH19 */

	usb0_vbus_det-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */

	usb0_vbus_power-supply = <&usb_power_supply>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE