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: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
index 7f34323a668c41b29066aabce9423b31bdb16094..f26b84b61dafc6ac1c44dfbf79868df2a7943043 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
+++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
@@ -65,15 +65,7 @@
        status = "okay";
 };
 
-&pio {
-       usb1_vbus_pin_a: usb1_vbus_pin@0 {
-               pins = "PH27";
-               function = "gpio_out";
-       };
-};
-
 &reg_usb1_vbus {
-       pinctrl-0 = <&usb1_vbus_pin_a>;
        gpio = <&pio 7 27 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 939c497a6f7003957a287f13cdbf8b43490c4ef2..557d4a988d9a402f8d4bf9fff4f8180deb412457 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -132,11 +132,6 @@
                bias-pull-up;
        };
 
-       usb2_vbus_pin_colombus: usb2_vbus_pin@0 {
-               pins = "PH24";
-               function = "gpio_out";
-       };
-
        i2c_lcd_pins: i2c_lcd_pin@0 {
                pins = "PA23", "PA24";
                function = "gpio_out";
@@ -145,8 +140,6 @@
 };
 
 &reg_usb2_vbus {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb2_vbus_pin_colombus>;
        gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index ce4f9e9834bf1de946984532494e466a79fbd045..fc49d14059b168d911c91bbdd8ef84f0c58431fe 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -160,7 +160,7 @@
 
 &gmac {
        pinctrl-names = "default";
-       pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_hummingbird>;
+       pinctrl-0 = <&gmac_pins_rgmii_a>;
        phy = <&phy1>;
        phy-mode = "rgmii";
        snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
@@ -229,7 +229,7 @@
 
 &mmc1 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>;
+       pinctrl-0 = <&mmc1_pins_a>;
        vmmc-supply = <&reg_aldo1>;
        mmc-pwrseq = <&wifi_pwrseq>;
        bus-width = <4>;
@@ -242,21 +242,12 @@
 };
 
 &pio {
-       gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 {
-               pins = "PA21";
-               function = "gpio_out";
-       };
-
        mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
                pins = "PA8";
                function = "gpio_in";
                bias-pull-up;
        };
 
-       wifi_reset_pin_hummingbird: wifi_reset_pin@0 {
-               pins = "PG10";
-               function = "gpio_out";
-       };
 };
 
 &p2wi {

diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index d659be9dbc507d2eb1b3e4327e78f28739efc169..679f0fa7e50c42aa367b98949bf2454d526ff67e 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -71,8 +71,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_i7>;
 
                blue {
                        label = "i7:blue:usr";
@@ -154,26 +152,14 @@
 };
 
 &pio {
-       led_pins_i7: led_pins@0 {
-               pins = "PH13";
-               function = "gpio_out";
-       };
-
        mmc0_cd_pin_i7: mmc0_cd_pin@0 {
                pins = "PH22";
                function = "gpio_in";
                bias-pull-up;
        };
-
-       usb1_vbus_pin_i7: usb1_vbus_pin@0 {
-               pins = "PC27";
-               function = "gpio_out";
-       };
 };
 
 &reg_usb1_vbus {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb1_vbus_pin_i7>;
        gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 9698f6d38d030739d240b94198ddfc8c514748f0..87ae3031aa8968bfcbb449050acd106be7041ec8 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -60,8 +60,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_m9>;
 
                blue {
                        label = "m9:blue:pwr";
@@ -125,21 +123,11 @@
 #include "axp22x.dtsi"
 
 &pio {
-       led_pins_m9: led_pins@0 {
-               pins = "PH13";
-               function = "gpio_out";
-       };
-
        mmc0_cd_pin_m9: mmc0_cd_pin@0 {
                pins = "PH22";
                function = "gpio_in";
                bias-pull-up;
        };
-
-       usb1_vbus_pin_m9: usb1_vbus_pin@0 {
-               pins = "PC27";
-               function = "gpio_out";
-       };
 };
 
 &reg_aldo1 {
@@ -215,8 +203,6 @@
 };
 
 &reg_usb1_vbus {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb1_vbus_pin_m9>;
        gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index bb14b171b1609dfd7121bdad428f0f36eb80d523..0711f55945e0e81f4eb2d38e102aa773dc52679e 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -60,8 +60,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_m9>;
 
                blue {
                        label = "a1000g:blue:pwr";
@@ -125,21 +123,11 @@
 #include "axp22x.dtsi"
 
 &pio {
-       led_pins_m9: led_pins@0 {
-               pins = "PH13";
-               function = "gpio_out";
-       };
-
        mmc0_cd_pin_m9: mmc0_cd_pin@0 {
                pins = "PH22";
                function = "gpio_in";
                bias-pull-up;
        };
-
-       usb1_vbus_pin_m9: usb1_vbus_pin@0 {
-               pins = "PC27";
-               function = "gpio_out";
-       };
 };
 
 &reg_aldo1 {
@@ -215,8 +203,6 @@
 };
 
 &reg_usb1_vbus {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb1_vbus_pin_m9>;
        gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index ca1c711ed450837f56ce058ffa7c1d2c5c03ae8a..dd6ede6a8377e0da96e337888ce0296c45bc360b 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -101,8 +101,6 @@
        status = "okay";
 
        ctp@5d {
-               pinctrl-names = "default";
-               pinctrl-0 = <&gt911_int_primo81>;
                compatible = "goodix,gt911";
                reg = <0x5d>;
                interrupt-parent = <&pio>;
@@ -156,11 +154,6 @@
 };
 
 &pio {
-       gt911_int_primo81: gt911_int_pin@0 {
-               pins = "PA3";
-               function = "gpio_in";
-       };
-
        mma8452_int_primo81: mma8452_int_pin@0 {
                pins = "PA9";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index 3a7e68c46ba7da3f933601488495639e3e3b25c2..1b07a950cb457db022859b69d63c4dda2166d892 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -66,8 +66,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pin_sina31s>;
 
                status {
                        label = "sina31s:status:usr";
@@ -176,11 +174,6 @@
 };
 
 &pio {
-       led_pin_sina31s: led_pin@0 {
-               pins = "PH13";
-               function = "gpio_out";
-       };
-
        mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {
                pins = "PA4";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index b8b79c0e9ee051255762e7d7d10e76422130fabd..ea29af15125bcfa644408578454a9c83530841c2 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -58,8 +58,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_bpi_m2>;
 
                blue {
                        label = "bpi-m2:blue:usr";
@@ -79,8 +77,6 @@
 
        mmc2_pwrseq: mmc2_pwrseq {
                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 */
        };
 };
@@ -95,7 +91,7 @@
 
 &gmac {
        pinctrl-names = "default";
-       pinctrl-0 = <&gmac_pins_rgmii_a>, <&gmac_phy_reset_pin_bpi_m2>;
+       pinctrl-0 = <&gmac_pins_rgmii_a>;
        phy = <&phy1>;
        phy-mode = "rgmii";
        phy-supply = <&reg_dldo1>;
@@ -168,16 +164,6 @@
 };
 
 &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 {
                pins = "PA4";
                function = "gpio_in";
@@ -185,13 +171,6 @@
        };
 };
 
-&r_pio {
-       mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 {
-               pins = "PL8";
-               function = "gpio_out";
-       };
-};
-
 #include "axp22x.dtsi"
 
 &reg_aldo1 {