ARM: dts: sun4i: 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.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index f80d37d..16e65aa 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -62,8 +62,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_a1000>;
 
                red {
                        label = "a1000:red:usr";
@@ -79,8 +77,6 @@
 
        reg_emac_3v3: emac-3v3 {
                compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&emac_power_pin_a1000>;
                regulator-name = "emac-3v3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
@@ -187,18 +183,6 @@
        status = "okay";
 };
 
-&pio {
-       emac_power_pin_a1000: emac_power_pin@0 {
-               pins = "PH15";
-               function = "gpio_out";
-       };
-
-       led_pins_a1000: led_pins@0 {
-               pins = "PH10", "PH20";
-               function = "gpio_out";
-       };
-};
-
 #include "axp209.dtsi"
 
 &reg_dcdc2 {

diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
index 6b02de5..97f2cd1 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
+++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
@@ -125,12 +125,6 @@
        status = "okay";
 };
 
-&pio {
-       usb2_vbus_pin_a: usb2_vbus_pin@0 {
-               pins = "PH12";
-       };
-};
-
 &reg_usb0_vbus {
        regulator-boot-on;
        status = "okay";

diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
index e0777ae..a69bd56 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
+++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
@@ -58,8 +58,6 @@
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pinctrl-names = "default";
-               pinctrl-0 = <&bl_en_pin_dsrv9703c>;
                pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
                brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
                default-brightness-level = <8>;
@@ -79,8 +77,6 @@
 
        reg_motor: reg_motor {
                compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&motor_pins>;
                regulator-name = "vcc-motor";
                regulator-min-microvolt = <3000000>;
                regulator-max-microvolt = <3000000>;
@@ -90,8 +86,6 @@
 };
 
 &codec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&codec_pa_pin>;
        allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
        status = "okay";
 };
@@ -134,8 +128,6 @@
                reg = <0x38>;
                interrupt-parent = <&pio>;
                interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&touchscreen_pins>;
                reset-gpios = <&pio 1 13 GPIO_ACTIVE_LOW>;
                touchscreen-size-x = <1024>;
                touchscreen-size-y = <768>;
@@ -176,26 +168,6 @@
 };
 
 &pio {
-       bl_en_pin_dsrv9703c: bl_en_pin@0 {
-               pins = "PH7";
-               function = "gpio_out";
-       };
-
-       codec_pa_pin: codec_pa_pin@0 {
-               pins = "PH15";
-               function = "gpio_out";
-       };
-
-       motor_pins: motor_pins@0 {
-               pins = "PB3";
-               function = "gpio_out";
-       };
-
-       touchscreen_pins: touchscreen_pins@0 {
-               pins = "PB13";
-               function = "gpio_out";
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PH4";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index d8bfd7b..d347eaf 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -72,8 +72,6 @@
  */
 &codec {
        /* PH15 controls power to external amplifier (ft2012q) */
-       pinctrl-names = "default";
-       pinctrl-0 = <&codec_pa_pin>;
        allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };
@@ -154,13 +152,6 @@
        status = "okay";
 };
 
-&pio {
-       codec_pa_pin: codec_pa_pin@0 {
-               pins = "PH15";
-               function = "gpio_out";
-       };
-};
-
 &reg_dcdc2 {
        regulator-always-on;
        regulator-min-microvolt = <1000000>;

diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 856cfc9..872163c 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -123,27 +123,11 @@
        status = "okay";
 };
 
-&pio {
-       pinctrl-names = "default";
-       pinctrl-0 = <&hackberry_hogs>;
-
-       hackberry_hogs: hogs@0 {
-               pins = "PH19";
-               function = "gpio_out";
-       };
-
-       usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {
-               pins = "PH12";
-               function = "gpio_out";
-       };
-};
-
 &reg_usb1_vbus {
        status = "okay";
 };
 
 &reg_usb2_vbus {
-       pinctrl-0 = <&usb2_vbus_pin_hackberry>;
        gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts
index d51d8c3..f667374 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-inet1.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts
@@ -58,8 +58,6 @@
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pinctrl-names = "default";
-               pinctrl-0 = <&bl_en_pin_inet>;
                pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
                brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
                default-brightness-level = <8>;
@@ -124,8 +122,6 @@
                reg = <0x38>;
                interrupt-parent = <&pio>;
                interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&touchscreen_wake_pin>;
                wake-gpios = <&pio 1 13 GPIO_ACTIVE_HIGH>; /* PB13 */
                touchscreen-size-x = <600>;
                touchscreen-size-y = <1024>;
@@ -178,16 +174,6 @@
 };
 
 &pio {
-       bl_en_pin_inet: bl_en_pin@0 {
-               pins = "PH7";
-               function = "gpio_out";
-       };
-
-       touchscreen_wake_pin: touchscreen_wake_pin@0 {
-               pins = "PB13";
-               function = "gpio_out";
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PH4";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
index 92b2d4a..3880b38 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
+++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
@@ -62,8 +62,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_q5>;
 
                green {
                        label = "q5:green:usr";
@@ -74,8 +72,6 @@
 
        reg_emac_3v3: emac-3v3 {
                compatible = "regulator-fixed";
-               pinctrl-names = "default";
-               pinctrl-0 = <&emac_power_pin_q5>;
                regulator-name = "emac-3v3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
@@ -160,18 +156,6 @@
        status = "okay";
 };
 
-&pio {
-       emac_power_pin_q5: emac_power_pin@0 {
-               pins = "PH19";
-               function = "gpio_out";
-       };
-
-       led_pins_q5: led_pins@0 {
-               pins = "PH20";
-               function = "gpio_out";
-       };
-};
-
 &reg_usb0_vbus {
        regulator-boot-on;
        status = "okay";

diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
index 0f927da..cba8a1b 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
@@ -61,8 +61,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_marsboard>;
 
                red1 {
                        label = "marsboard:red1:usr";
@@ -162,11 +160,6 @@
 };
 
 &pio {
-       led_pins_marsboard: led_pins@0 {
-               pins = "PB5", "PB6", "PB7", "PB8";
-               function = "gpio_out";
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PH4";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts
index 81db682..c4bc513 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-mk802.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts
@@ -88,23 +88,6 @@
        status = "okay";
 };
 
-&pio {
-       usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               pins = "PH4";
-               function = "gpio_in";
-       };
-
-       usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
-               pins = "PH5";
-               function = "gpio_in";
-       };
-
-       usb2_vbus_pin_mk802: usb2_vbus_pin@0 {
-               pins = "PH12";
-               function = "gpio_out";
-       };
-};
-
 &reg_usb0_vbus {
        status = "okay";
 };
@@ -114,7 +97,6 @@
 };
 
 &reg_usb2_vbus {
-       pinctrl-0 = <&usb2_vbus_pin_mk802>;
        gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */
        status = "okay";
 };
@@ -131,8 +113,6 @@
 };
 
 &usbphy {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
        usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
        usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
        usb0_vbus-supply = <&reg_usb0_vbus>;

diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
index 462412e..40e9aa8 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
@@ -166,11 +166,6 @@
 };
 
 &pio {
-       ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
-               pins = "PC3";
-               function = "gpio_out";
-       };
-
        led_pins_olinuxinolime: led_pins@0 {
                pins = "PH2";
                function = "gpio_out";
@@ -191,7 +186,6 @@
 };
 
 &reg_ahci_5v {
-       pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
        gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index 84f55e7..3580b83 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -62,8 +62,6 @@
 
        leds {
                compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins_pcduino>;
 
                tx {
                        label = "pcduino:green:tx";
@@ -78,8 +76,6 @@
 
        gpio_keys {
                compatible = "gpio-keys";
-               pinctrl-names = "default";
-               pinctrl-0 = <&key_pins_pcduino>;
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -168,16 +164,6 @@
 };
 
 &pio {
-       led_pins_pcduino: led_pins@0 {
-               pins = "PH15", "PH16";
-               function = "gpio_out";
-       };
-
-       key_pins_pcduino: key_pins@0 {
-               pins = "PH17", "PH18", "PH19";
-               function = "gpio_in";
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PH4";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts
index 811d00e..bc4f128 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts
@@ -55,16 +55,7 @@
        compatible = "linksprite,a10-pcduino2", "allwinner,sun4i-a10";
 };
 
-&pio {
-       usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 {
-               pins = "PD2";
-               function = "gpio_out";
-       };
-};
-
 &reg_usb2_vbus {
-       pinctrl-names = "default";
-       pinctrl-0 = <&usb2_vbus_pin_pcduino2>;
        gpio = <&pio 3 2 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
index c0f8c88..d919511 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
@@ -58,8 +58,6 @@
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pinctrl-names = "default";
-               pinctrl-0 = <&bl_en_pin_protab>;
                pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
                brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
                default-brightness-level = <8>;
@@ -72,8 +70,6 @@
 };
 
 &codec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&codec_pa_pin>;
        allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
        status = "okay";
 };
@@ -112,8 +108,6 @@
        status = "okay";
 
        pixcir_ts@5c {
-               pinctrl-names = "default";
-               pinctrl-0 = <&touchscreen_pins>;
                compatible = "pixcir,pixcir_tangoc";
                reg = <0x5c>;
                interrupt-parent = <&pio>;
@@ -162,21 +156,6 @@
 };
 
 &pio {
-       bl_en_pin_protab: bl_en_pin@0 {
-               pins = "PH7";
-               function = "gpio_out";
-       };
-
-       codec_pa_pin: codec_pa_pin@0 {
-               pins = "PH15";
-               function = "gpio_out";
-       };
-
-       touchscreen_pins: touchscreen_pins@0 {
-               pins = "PA5", "PB13";
-               function = "gpio_out";
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PH4";
                function = "gpio_in";