ARM: dts: sun5i: 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: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
This commit is contained in:
Maxime Ripard 2018-11-07 11:14:15 +01:00
parent 7d94610e16
commit f606c4b3b7
13 changed files with 2 additions and 160 deletions

View File

@ -71,8 +71,6 @@ red {
reg_vmmc1: vmmc1 { reg_vmmc1: vmmc1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&mmc1_vcc_en_pin_t004>;
regulator-name = "vmmc1"; regulator-name = "vmmc1";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@ -139,11 +137,6 @@ mmc0_cd_pin_t004: mmc0_cd_pin@0 {
bias-pull-up; bias-pull-up;
}; };
mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 {
pins = "PB18";
function = "gpio_out";
};
led_pins_t004: led_pins@0 { led_pins_t004: led_pins@0 {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";

View File

@ -59,8 +59,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_mk802>;
red { red {
label = "mk802:red:usr"; label = "mk802:red:usr";
@ -114,25 +112,14 @@ &otg_sram {
}; };
&pio { &pio {
led_pins_mk802: led_pins@0 {
pins = "PB2";
function = "gpio_out";
};
mmc0_cd_pin_mk802: mmc0_cd_pin@0 { mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb1_vbus_pin_mk802: usb1_vbus_pin@0 {
pins = "PB10";
function = "gpio_out";
};
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_mk802>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */ gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay"; status = "okay";
}; };

View File

@ -241,11 +241,6 @@ led_pins_olinuxino: led_pins@0 {
drive-strength = <20>; drive-strength = <20>;
}; };
usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
pins = "PB10";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PG12"; pins = "PG12";
function = "gpio_in"; function = "gpio_in";
@ -259,7 +254,6 @@ &reg_usb0_vbus {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };

View File

@ -109,15 +109,9 @@ led_pins_r7: led_pins@0 {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb1_vbus_pin_r7: usb1_vbus_pin@0 {
pins = "PG13";
function = "gpio_out";
};
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_r7>;
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };

View File

@ -61,8 +61,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_wobo_i5>;
blue { blue {
label = "a10s-wobo-i5:blue:usr"; label = "a10s-wobo-i5:blue:usr";
@ -73,8 +71,6 @@ blue {
reg_emac_3v3: emac-3v3 { reg_emac_3v3: emac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&emac_power_pin_wobo>;
regulator-name = "emac-3v3"; regulator-name = "emac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@ -143,21 +139,11 @@ &otg_sram {
}; };
&pio { &pio {
led_pins_wobo_i5: led_pins@0 {
pins = "PB2";
function = "gpio_out";
};
mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 { mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
pins = "PB3"; pins = "PB3";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
emac_power_pin_wobo: emac_power_pin@0 {
pins = "PA02";
function = "gpio_out";
};
}; };
&reg_dcdc2 { &reg_dcdc2 {

View File

@ -144,11 +144,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PG1";
function = "gpio_in";
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
@ -202,7 +197,7 @@ &usb_otg {
&usbphy { &usbphy {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; pinctrl-0 = <&usb0_id_detect_pin>;
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;

View File

@ -135,26 +135,14 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
}; };
usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 {
pins = "PG12";
function = "gpio_out";
};
usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 {
pins = "PG11";
function = "gpio_out";
};
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
pinctrl-0 = <&usb0_vbus_pin_olinuxinom>;
gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_olinuxinom>;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };

View File

@ -230,11 +230,6 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
}; };
usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {
pins = "PG11";
function = "gpio_out";
};
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
@ -243,7 +238,6 @@ &reg_usb0_vbus {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_olinuxino>;
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };

View File

@ -79,10 +79,6 @@ &codec {
allwinner,pa-gpios = <&pio 6 3 GPIO_ACTIVE_HIGH>; /* PG3 */ allwinner,pa-gpios = <&pio 6 3 GPIO_ACTIVE_HIGH>; /* PG3 */
}; };
&codec_pa_pin {
pins = "PG3";
};
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_pins_a>;
@ -128,7 +124,3 @@ &uart1 {
/* The P66 uses the uart pins as gpios */ /* The P66 uses the uart pins as gpios */
status = "disabled"; status = "disabled";
}; };
&usb0_vbus_pin_a {
pins = "PB4";
};

View File

@ -79,8 +79,6 @@ status {
mmc0_pwrseq: mmc0_pwrseq { mmc0_pwrseq: mmc0_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&wifi_reg_on_pin_chip_pro>;
reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */ reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */
}; };
}; };
@ -157,18 +155,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_pin_chip_pro: usb0-id-pin@0 {
pins = "PG2";
function = "gpio_in";
};
wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 {
pins = "PB10";
function = "gpio_out";
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>; pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>;
@ -253,8 +239,6 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_pin_chip_pro>;
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;
usb1_vbus-supply = <&reg_vcc5v0>; usb1_vbus-supply = <&reg_vcc5v0>;

View File

@ -233,7 +233,7 @@ button-1400 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_gr8_evb>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@ -256,28 +256,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 {
pins = "PG0";
function = "gpio_in";
};
usb0_id_pin_gr8_evb: usb0-id-pin@0 {
pins = "PG2";
function = "gpio_in";
};
usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 {
pins = "PG1";
function = "gpio_in";
};
usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 {
pins = "PG13";
function = "gpio_out";
};
};
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>; pinctrl-0 = <&pwm0_pins>;
@ -310,7 +288,6 @@ &reg_ldo2 {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_gr8_evb>;
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>; gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
@ -356,8 +333,6 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_pin_gr8_evb>, <&usb0_vbus_det_pin_gr8_evb>;
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus_power-supply = <&usb_power_supply>;

View File

@ -79,8 +79,6 @@ status {
mmc0_pwrseq: mmc0_pwrseq { mmc0_pwrseq: mmc0_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&chip_wifi_reg_on_pin>;
reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */ reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
}; };
@ -184,20 +182,6 @@ &otg_sram {
}; };
&pio { &pio {
chip_vbus_pin: chip_vbus_pin@0 {
pins = "PB10";
function = "gpio_out";
};
chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 {
pins = "PC19";
function = "gpio_out";
};
chip_id_det_pin: chip_id_det_pin@0 {
pins = "PG2";
function = "gpio_in";
};
chip_w1_pin: chip_w1_pin@0 { chip_w1_pin: chip_w1_pin@0 {
pins = "PD2"; pins = "PD2";
@ -260,7 +244,6 @@ &reg_ldo5 {
}; };
&reg_usb0_vbus { &reg_usb0_vbus {
pinctrl-0 = <&chip_vbus_pin>;
vin-supply = <&reg_vcc5v0>; vin-supply = <&reg_vcc5v0>;
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */ gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay"; status = "okay";
@ -303,8 +286,6 @@ &usb_power_supply {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&chip_id_det_pin>;
status = "okay"; status = "okay";
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */

View File

@ -63,8 +63,6 @@ chosen {
}; };
&codec { &codec {
pinctrl-names = "default";
pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */ allwinner,pa-gpios = <&pio 6 10 GPIO_ACTIVE_HIGH>; /* PG10 */
status = "okay"; status = "okay";
}; };
@ -96,8 +94,6 @@ touchscreen: touchscreen@40 {
reg = <0x40>; reg = <0x40>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */ interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */
pinctrl-names = "default";
pinctrl-0 = <&ts_power_pin>;
power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
/* Tablet dts must provide reg and compatible */ /* Tablet dts must provide reg and compatible */
status = "disabled"; status = "disabled";
@ -137,24 +133,12 @@ &otg_sram {
}; };
&pio { &pio {
codec_pa_pin: codec_pa_pin@0 {
pins = "PG10";
function = "gpio_out";
};
mmc0_cd_pin: mmc0_cd_pin@0 { mmc0_cd_pin: mmc0_cd_pin@0 {
pins = "PG0"; pins = "PG0";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
ts_power_pin: ts_power_pin {
pins = "PB3";
function = "gpio_out";
drive-strength = <10>;
bias-disable;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
@ -166,11 +150,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_pin_a: usb0_vbus_pin@0 {
pins = "PG12";
function = "gpio_out";
};
}; };
&reg_dcdc2 { &reg_dcdc2 {