Commit 8f9e1052 authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun6i: 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 97b3d912
...@@ -65,15 +65,7 @@ &ehci0 { ...@@ -65,15 +65,7 @@ &ehci0 {
status = "okay"; status = "okay";
}; };
&pio {
usb1_vbus_pin_a: usb1_vbus_pin@0 {
pins = "PH27";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-0 = <&usb1_vbus_pin_a>;
gpio = <&pio 7 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -132,11 +132,6 @@ mmc0_cd_pin_colombus: mmc0_cd_pin@0 { ...@@ -132,11 +132,6 @@ mmc0_cd_pin_colombus: mmc0_cd_pin@0 {
bias-pull-up; bias-pull-up;
}; };
usb2_vbus_pin_colombus: usb2_vbus_pin@0 {
pins = "PH24";
function = "gpio_out";
};
i2c_lcd_pins: i2c_lcd_pin@0 { i2c_lcd_pins: i2c_lcd_pin@0 {
pins = "PA23", "PA24"; pins = "PA23", "PA24";
function = "gpio_out"; function = "gpio_out";
...@@ -145,8 +140,6 @@ i2c_lcd_pins: i2c_lcd_pin@0 { ...@@ -145,8 +140,6 @@ i2c_lcd_pins: i2c_lcd_pin@0 {
}; };
&reg_usb2_vbus { &reg_usb2_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb2_vbus_pin_colombus>;
gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -160,7 +160,7 @@ &ehci0 { ...@@ -160,7 +160,7 @@ &ehci0 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_hummingbird>; pinctrl-0 = <&gmac_pins_rgmii_a>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
...@@ -229,7 +229,7 @@ &mmc0_pins_a { ...@@ -229,7 +229,7 @@ &mmc0_pins_a {
&mmc1 { &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>; pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <&reg_aldo1>; vmmc-supply = <&reg_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -242,21 +242,12 @@ &ohci0 { ...@@ -242,21 +242,12 @@ &ohci0 {
}; };
&pio { &pio {
gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 {
pins = "PA21";
function = "gpio_out";
};
mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 { mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
pins = "PA8"; pins = "PA8";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
wifi_reset_pin_hummingbird: wifi_reset_pin@0 {
pins = "PG10";
function = "gpio_out";
};
}; };
&p2wi { &p2wi {
......
...@@ -71,8 +71,6 @@ hdmi_con_in: endpoint { ...@@ -71,8 +71,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_i7>;
blue { blue {
label = "i7:blue:usr"; label = "i7:blue:usr";
...@@ -154,26 +152,14 @@ &mmc0 { ...@@ -154,26 +152,14 @@ &mmc0 {
}; };
&pio { &pio {
led_pins_i7: led_pins@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_i7: mmc0_cd_pin@0 { mmc0_cd_pin_i7: mmc0_cd_pin@0 {
pins = "PH22"; pins = "PH22";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb1_vbus_pin_i7: usb1_vbus_pin@0 {
pins = "PC27";
function = "gpio_out";
};
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_i7>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -60,8 +60,6 @@ chosen { ...@@ -60,8 +60,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_m9>;
blue { blue {
label = "m9:blue:pwr"; label = "m9:blue:pwr";
...@@ -125,21 +123,11 @@ axp22x: pmic@68 { ...@@ -125,21 +123,11 @@ axp22x: pmic@68 {
#include "axp22x.dtsi" #include "axp22x.dtsi"
&pio { &pio {
led_pins_m9: led_pins@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_m9: mmc0_cd_pin@0 { mmc0_cd_pin_m9: mmc0_cd_pin@0 {
pins = "PH22"; pins = "PH22";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb1_vbus_pin_m9: usb1_vbus_pin@0 {
pins = "PC27";
function = "gpio_out";
};
}; };
&reg_aldo1 { &reg_aldo1 {
...@@ -215,8 +203,6 @@ &reg_dldo4 { ...@@ -215,8 +203,6 @@ &reg_dldo4 {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_m9>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -60,8 +60,6 @@ chosen { ...@@ -60,8 +60,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_m9>;
blue { blue {
label = "a1000g:blue:pwr"; label = "a1000g:blue:pwr";
...@@ -125,21 +123,11 @@ axp22x: pmic@68 { ...@@ -125,21 +123,11 @@ axp22x: pmic@68 {
#include "axp22x.dtsi" #include "axp22x.dtsi"
&pio { &pio {
led_pins_m9: led_pins@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_m9: mmc0_cd_pin@0 { mmc0_cd_pin_m9: mmc0_cd_pin@0 {
pins = "PH22"; pins = "PH22";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb1_vbus_pin_m9: usb1_vbus_pin@0 {
pins = "PC27";
function = "gpio_out";
};
}; };
&reg_aldo1 { &reg_aldo1 {
...@@ -215,8 +203,6 @@ &reg_dldo4 { ...@@ -215,8 +203,6 @@ &reg_dldo4 {
}; };
&reg_usb1_vbus { &reg_usb1_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_m9>;
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -101,8 +101,6 @@ &i2c1 { ...@@ -101,8 +101,6 @@ &i2c1 {
status = "okay"; status = "okay";
ctp@5d { ctp@5d {
pinctrl-names = "default";
pinctrl-0 = <&gt911_int_primo81>;
compatible = "goodix,gt911"; compatible = "goodix,gt911";
reg = <0x5d>; reg = <0x5d>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
...@@ -156,11 +154,6 @@ &mmc0 { ...@@ -156,11 +154,6 @@ &mmc0 {
}; };
&pio { &pio {
gt911_int_primo81: gt911_int_pin@0 {
pins = "PA3";
function = "gpio_in";
};
mma8452_int_primo81: mma8452_int_pin@0 { mma8452_int_primo81: mma8452_int_pin@0 {
pins = "PA9"; pins = "PA9";
function = "gpio_in"; function = "gpio_in";
......
...@@ -66,8 +66,6 @@ hdmi_con_in: endpoint { ...@@ -66,8 +66,6 @@ hdmi_con_in: endpoint {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pin_sina31s>;
status { status {
label = "sina31s:status:usr"; label = "sina31s:status:usr";
...@@ -176,11 +174,6 @@ &ohci1 { ...@@ -176,11 +174,6 @@ &ohci1 {
}; };
&pio { &pio {
led_pin_sina31s: led_pin@0 {
pins = "PH13";
function = "gpio_out";
};
mmc0_cd_pin_sina31s: mmc0_cd_pin@0 { mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {
pins = "PA4"; pins = "PA4";
function = "gpio_in"; function = "gpio_in";
......
...@@ -58,8 +58,6 @@ chosen { ...@@ -58,8 +58,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_bpi_m2>;
blue { blue {
label = "bpi-m2:blue:usr"; label = "bpi-m2:blue:usr";
...@@ -79,8 +77,6 @@ red { ...@@ -79,8 +77,6 @@ red {
mmc2_pwrseq: mmc2_pwrseq { mmc2_pwrseq: mmc2_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pwrseq_pin_bpi_m2>;
reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 WIFI_EN */ reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 WIFI_EN */
}; };
}; };
...@@ -95,7 +91,7 @@ &ehci0 { ...@@ -95,7 +91,7 @@ &ehci0 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>; pinctrl-0 = <&gmac_pins_rgmii_a>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_dldo1>; phy-supply = <&reg_dldo1>;
...@@ -168,16 +164,6 @@ axp22x: pmic@68 { ...@@ -168,16 +164,6 @@ axp22x: pmic@68 {
}; };
&pio { &pio {
gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 {
pins = "PA21";
function = "gpio_out";
};
led_pins_bpi_m2: led_pins@0 {
pins = "PG5", "PG10", "PG11";
function = "gpio_out";
};
mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 { mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {
pins = "PA4"; pins = "PA4";
function = "gpio_in"; function = "gpio_in";
...@@ -185,13 +171,6 @@ mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 { ...@@ -185,13 +171,6 @@ mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {
}; };
}; };
&r_pio {
mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 {
pins = "PL8";
function = "gpio_out";
};
};
#include "axp22x.dtsi" #include "axp22x.dtsi"
&reg_aldo1 { &reg_aldo1 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment