ARM: sunxi: Remove useless allwinner,pull property

The allwinner,pull property set to NO_PULL was really considered our
default (and wasn't even changing the default value in the code).

Remove these properties to make it obvious that we do not set anything in
such a case.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 035395a32212d0544d344d2f1c7aa07aef5b39d4..4d8164afc671e54344ba39cd991cda47ccb9e32f 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -188,13 +188,11 @@ &pio {
        emac_power_pin_a1000: emac_power_pin@0 {
                allwinner,pins = "PH15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_a1000: led_pins@0 {
                allwinner,pins = "PH10", "PH20";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index f11dcd82f468d2ff5122867c7355aa683a4baa06..e7188d2fb303e57a089f0c51183a817b7fa3eeba 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -168,7 +168,6 @@ led_pins_cubieboard: led_pins@0 {
                allwinner,pins = "PH20", "PH21";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
index e01bdd1f1b2b38bd202167ca62f6b7065f34e035..b4b829d6008d13c1ab2cbc53f0e45aebfdf15fce 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
+++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
@@ -180,25 +180,21 @@ &pio {
        bl_en_pin_dsrv9703c: bl_en_pin@0 {
                allwinner,pins = "PH7";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        codec_pa_pin: codec_pa_pin@0 {
                allwinner,pins = "PH15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        motor_pins: motor_pins@0 {
                allwinner,pins = "PB3";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        touchscreen_pins: touchscreen_pins@0 {
                allwinner,pins = "PB13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index fbd02c7a5d439dad4f95ab4ad7c7b83ec385fb68..57496a38b94a48c7f104daa1788c33200c58e52b 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -158,7 +158,6 @@ &pio {
        codec_pa_pin: codec_pa_pin@0 {
                allwinner,pins = "PH15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 9b8134cb968d596f4ebd82e89d8dd79d069638fe..de10ae48c6f64cb99aab5a95ba82738adc6142bf 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -131,13 +131,11 @@ &pio {
        hackberry_hogs: hogs@0 {
                allwinner,pins = "PH19";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {
                allwinner,pins = "PH12";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts
index bb64e466c4e06218562ed717a6b8e2ba1d3117f4..f78c17a9a298e8bb44713e39c59c3bf9be9bcd44 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-inet1.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts
@@ -182,13 +182,11 @@ &pio {
        bl_en_pin_inet: bl_en_pin@0 {
                allwinner,pins = "PH7";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        touchscreen_wake_pin: touchscreen_wake_pin@0 {
                allwinner,pins = "PB13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
index 65273bc7998cf30e35d4e136bd6173d0c4214738..e6ffaefed42d2c97888242bb2315ccc6ff371f4f 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
+++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
@@ -165,13 +165,11 @@ &pio {
        emac_power_pin_q5: emac_power_pin@0 {
                allwinner,pins = "PH19";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_q5: led_pins@0 {
                allwinner,pins = "PH20";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
index c5916125bea80bfdaf37da1f18938db9e209fc6d..001656eb9171624d39947e3647bd460ccc5f4062 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
@@ -166,7 +166,6 @@ &pio {
        led_pins_marsboard: led_pins@0 {
                allwinner,pins = "PB5", "PB6", "PB7", "PB8";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts
index 204e2b68d09fa8be627ece95a20056aff9dba1c1..9ce39f75188eb044627deaefaa2d018bb5478a1c 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-mk802.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts
@@ -93,19 +93,16 @@ &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                allwinner,pins = "PH4";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
                allwinner,pins = "PH5";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb2_vbus_pin_mk802: usb2_vbus_pin@0 {
                allwinner,pins = "PH12";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
index e8e14a53b764a670dd6a8aab930eb42bb8a64611..203d399f0f7bd0239db63b8ef5c45d4e116a2438 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
@@ -170,14 +170,12 @@ &pio {
        ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
                allwinner,pins = "PC3";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_olinuxinolime: led_pins@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index 7e94334420af0f12a1f7ccebd10a1a8289fa8295..94cdef53ac11262f73ef0cb010b70cfffdb4b485 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -172,13 +172,11 @@ &pio {
        led_pins_pcduino: led_pins@0 {
                allwinner,pins = "PH15", "PH16";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        key_pins_pcduino: key_pins@0 {
                allwinner,pins = "PH17", "PH18", "PH19";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts
index 05de4050a831f78f3c3a3547557578460619a5f8..9656ec9b51aec174b9257bc3dbf5b5d0e6a48ca3 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts
@@ -59,7 +59,6 @@ &pio {
        usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 {
                allwinner,pins = "PD2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

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 459c7a2dbee74c81beef348f2ff52c93660f9d68..9dedd808bde8494f6cb5076e649e5951185d134c 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
@@ -166,19 +166,16 @@ &pio {
        bl_en_pin_protab: bl_en_pin@0 {
                allwinner,pins = "PH7";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        codec_pa_pin: codec_pa_pin@0 {
                allwinner,pins = "PH15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        touchscreen_pins: touchscreen_pins@0 {
                allwinner,pins = "PA5", "PB13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index c09e29592b5663d5707463e0af4ef7d1e586ef68..bafedf74f434582f4d39bfa74a733ab21c9439bc 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -981,49 +981,41 @@ emac_pins_a: emac0@0 {
                                                "PA11", "PA12", "PA13", "PA14",
                                                "PA15", "PA16";
                                allwinner,function = "emac";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c0_pins_a: i2c0@0 {
                                allwinner,pins = "PB0", "PB1";
                                allwinner,function = "i2c0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c1_pins_a: i2c1@0 {
                                allwinner,pins = "PB18", "PB19";
                                allwinner,function = "i2c1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c2_pins_a: i2c2@0 {
                                allwinner,pins = "PB20", "PB21";
                                allwinner,function = "i2c2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir0_rx_pins_a: ir0@0 {
                                allwinner,pins = "PB4";
                                allwinner,function = "ir0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir0_tx_pins_a: ir0@1 {
                                allwinner,pins = "PB3";
                                allwinner,function = "ir0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir1_rx_pins_a: ir1@0 {
                                allwinner,pins = "PB23";
                                allwinner,function = "ir1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir1_tx_pins_a: ir1@1 {
                                allwinner,pins = "PB22";
                                allwinner,function = "ir1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins_a: mmc0@0 {
@@ -1031,7 +1023,6 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF3", "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
@@ -1043,25 +1034,21 @@ mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
                        ps20_pins_a: ps20@0 {
                                allwinner,pins = "PI20", "PI21";
                                allwinner,function = "ps2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ps21_pins_a: ps21@0 {
                                allwinner,pins = "PH12", "PH13";
                                allwinner,function = "ps2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm0_pins_a: pwm0@0 {
                                allwinner,pins = "PB2";
                                allwinner,function = "pwm";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm1_pins_a: pwm1@0 {
                                allwinner,pins = "PI3";
                                allwinner,function = "pwm";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spdif_tx_pins_a: spdif@0 {
@@ -1073,67 +1060,56 @@ spdif_tx_pins_a: spdif@0 {
                        spi0_pins_a: spi0@0 {
                                allwinner,pins = "PI11", "PI12", "PI13";
                                allwinner,function = "spi0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi0_cs0_pins_a: spi0_cs0@0 {
                                allwinner,pins = "PI10";
                                allwinner,function = "spi0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi1_pins_a: spi1@0 {
                                allwinner,pins = "PI17", "PI18", "PI19";
                                allwinner,function = "spi1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi1_cs0_pins_a: spi1_cs0@0 {
                                allwinner,pins = "PI16";
                                allwinner,function = "spi1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_pins_a: spi2@0 {
                                allwinner,pins = "PC20", "PC21", "PC22";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_pins_b: spi2@1 {
                                allwinner,pins = "PB15", "PB16", "PB17";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_cs0_pins_a: spi2_cs0@0 {
                                allwinner,pins = "PC19";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_cs0_pins_b: spi2_cs0@1 {
                                allwinner,pins = "PB14";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_a: uart0@0 {
                                allwinner,pins = "PB22", "PB23";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_b: uart0@1 {
                                allwinner,pins = "PF2", "PF4";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart1_pins_a: uart1@0 {
                                allwinner,pins = "PA10", "PA11";
                                allwinner,function = "uart1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index 813e18c011daf50e0db22e5c3890e3acb25a9d23..8d1e414c0a3ad5c04644507f8058ecfd54d3a40f 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -118,7 +118,6 @@ led_pins_t003: led_pins@0 {
                allwinner,pins = "PB2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 3c79e3536521c7f1443f2255f2049ffd0bf06ee5..e3438a685c7107a64ee996dc7360b4e961c7a5f8 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -144,14 +144,12 @@ mmc0_cd_pin_t004: mmc0_cd_pin@0 {
        mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 {
                allwinner,pins = "PB18";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_t004: led_pins@0 {
                allwinner,pins = "PB2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 940139145fd544de5f58b57308c82a54f637f1c2..405c1d51930114dc6a603215d71544d304d86a9a 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -118,7 +118,6 @@ &pio {
        led_pins_mk802: led_pins@0 {
                allwinner,pins = "PB2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
@@ -130,7 +129,6 @@ mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
        usb1_vbus_pin_mk802: usb1_vbus_pin@0 {
                allwinner,pins = "PB10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index c1250c1baf0276cd84e22529d403bd1a285b809f..7c77183924f1d7cf74743a8cc4599fb9c7ec896a 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -217,13 +217,11 @@ led_pins_olinuxino: led_pins@0 {
                allwinner,pins = "PE3";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
                allwinner,pins = "PB10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index 84a3bf817c3b57e11de625261be3e0d50456d6df..e2dceda4889b6e9323bcba06da1999dd6a68b6cd 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -110,13 +110,11 @@ led_pins_r7: led_pins@0 {
                allwinner,pins = "PB2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_r7: usb1_vbus_pin@0 {
                allwinner,pins = "PG13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index 56a6982773a90695c34f3751ee6278e1991209fd..f40451bffb843e857a0951b7271bc6eb88608e0e 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -148,7 +148,6 @@ &pio {
        led_pins_wobo_i5: led_pins@0 {
                allwinner,pins = "PB2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
@@ -160,7 +159,6 @@ mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
        emac_power_pin_wobo: emac_power_pin@0 {
                allwinner,pins = "PA02";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index b4755e7a0b238fb07f9bb34b4fd1e90c39e0380d..ef1e2ab103d7f52a956ab1cafa97e73eb73f4dcc 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -202,13 +202,11 @@ &pio {
        uart0_pins_a: uart0@0 {
                allwinner,pins = "PB19", "PB20";
                allwinner,function = "uart0";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        uart2_pins_a: uart2@0 {
                allwinner,pins = "PC18", "PC19";
                allwinner,function = "uart2";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        emac_pins_a: emac0@0 {
@@ -218,7 +216,6 @@ emac_pins_a: emac0@0 {
                                "PA11", "PA12", "PA13", "PA14",
                                "PA15", "PA16";
                allwinner,function = "emac";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        emac_pins_b: emac0@1 {
@@ -228,7 +225,6 @@ emac_pins_b: emac0@1 {
                                "PD21", "PD22", "PD23", "PD24",
                                "PD25", "PD26", "PD27";
                allwinner,function = "emac";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc1_pins_a: mmc1@0 {
@@ -236,19 +232,16 @@ mmc1_pins_a: mmc1@0 {
                                 "PG6", "PG7", "PG8";
                allwinner,function = "mmc1";
                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        spi2_pins_b: spi2@1 {
                allwinner,pins = "PB12", "PB13", "PB14";
                allwinner,function = "spi2";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        spi2_cs0_pins_b: spi2_cs0@1 {
                allwinner,pins = "PB11";
                allwinner,function = "spi2";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index aa4484ac50b2f3136c6d25933a3927fcd7546994..f5d1a04f3a16a28b91c0570e386f2b4e6c7a7bb9 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -150,7 +150,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
                allwinner,pins = "PG1";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 8aec90ac28a450f5921fe90b834e67b17dcd19bd..df9315e5c850ba2840b4047d661cfd68bb5c51cd 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -124,7 +124,6 @@ led_pins_olinuxinom: led_pins@0 {
                allwinner,pins = "PG9";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
@@ -142,13 +141,11 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
        usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 {
                allwinner,pins = "PG12";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 {
                allwinner,pins = "PG11";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 95ea10b98c7fdc49d151662bff47c42e919ce5a0..b9179b36f608cb2261a2e3d86819569cf51e535d 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -215,7 +215,6 @@ led_pins_olinuxino: led_pins@0 {
                allwinner,pins = "PG9";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
@@ -233,7 +232,6 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
        usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {
                allwinner,pins = "PG11";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index d79db152544837e1a4fb32bda904468b6645af31..1f4c5f7732264011d2f25c5cea4591cdb2f77e71 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -355,18 +355,15 @@ lcd_rgb666_pins: lcd_rgb666@0 {
                                 "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
                                 "PD24", "PD25", "PD26", "PD27";
                allwinner,function = "lcd0";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        uart1_pins_a: uart1@0 {
                allwinner,pins = "PE10", "PE11";
                allwinner,function = "uart1";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        uart1_pins_b: uart1@1 {
                allwinner,pins = "PG3", "PG4";
                allwinner,function = "uart1";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };

diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
index a227aeeae9d66a1f75451a7847cd035de279b452..e29e708e9fafa083a7e43755f83b84ed7b72be04 100644 (file)
--- a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
@@ -161,13 +161,11 @@ &pio {
        usb0_id_pin_chip_pro: usb0-id-pin@0 {
                allwinner,pins = "PG2";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 {
                allwinner,pins = "PB10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index 4d7386f13804cbea69c4e9535e3b9424d98a17a3..af5bf886a4d5c6f29c41dad4677e3229c5396c8c 100644 (file)
--- a/arch/arm/boot/dts/sun5i-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -261,25 +261,21 @@ &pio {
        mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 {
                allwinner,pins = "PG0";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_pin_gr8_evb: usb0-id-pin@0 {
                allwinner,pins = "PG2";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 {
                allwinner,pins = "PG1";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 {
                allwinner,pins = "PG13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi
index 761b1857280de16aac7ec258c979c920263a063e..5a03453c397b4f789360ecd8c75fbc93c26cde9d 100644 (file)
--- a/arch/arm/boot/dts/sun5i-gr8.dtsi
+++ b/arch/arm/boot/dts/sun5i-gr8.dtsi
@@ -766,37 +766,31 @@ pio: pinctrl@01c20800 {
                        i2c0_pins_a: i2c0@0 {
                                allwinner,pins = "PB0", "PB1";
                                allwinner,function = "i2c0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c1_pins_a: i2c1@0 {
                                allwinner,pins = "PB15", "PB16";
                                allwinner,function = "i2c1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c2_pins_a: i2c2@0 {
                                allwinner,pins = "PB17", "PB18";
                                allwinner,function = "i2c2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2s0_data_pins_a: i2s0-data@0 {
                                allwinner,pins = "PB6", "PB7", "PB8", "PB9";
                                allwinner,function = "i2s0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2s0_mclk_pins_a: i2s0-mclk@0 {
                                allwinner,pins = "PB5";
                                allwinner,function = "i2s0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir0_rx_pins_a: ir0@0 {
                                allwinner,pins = "PB4";
                                allwinner,function = "ir0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        lcd_rgb666_pins: lcd-rgb666@0 {
@@ -805,7 +799,6 @@ lcd_rgb666_pins: lcd-rgb666@0 {
                                                 "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
                                                 "PD24", "PD25", "PD26", "PD27";
                                allwinner,function = "lcd0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins_a: mmc0@0 {
@@ -813,7 +806,6 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        nand_pins_a: nand-base0@0 {
@@ -822,31 +814,26 @@ nand_pins_a: nand-base0@0 {
                                                "PC11", "PC12", "PC13", "PC14",
                                                "PC15";
                                allwinner,function = "nand0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        nand_cs0_pins_a: nand-cs@0 {
                                allwinner,pins = "PC4";
                                allwinner,function = "nand0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        nand_rb0_pins_a: nand-rb@0 {
                                allwinner,pins = "PC6";
                                allwinner,function = "nand0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm0_pins_a: pwm0@0 {
                                allwinner,pins = "PB2";
                                allwinner,function = "pwm0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm1_pins: pwm1 {
                                allwinner,pins = "PG13";
                                allwinner,function = "pwm1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spdif_tx_pins_a: spdif@0 {
@@ -858,37 +845,31 @@ spdif_tx_pins_a: spdif@0 {
                        uart1_pins_a: uart1@1 {
                                allwinner,pins = "PG3", "PG4";
                                allwinner,function = "uart1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart1_cts_rts_pins_a: uart1-cts-rts@0 {
                                allwinner,pins = "PG5", "PG6";
                                allwinner,function = "uart1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart2_pins_a: uart2@1 {
                                allwinner,pins = "PD2", "PD3";
                                allwinner,function = "uart2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart2_cts_rts_pins_a: uart2-cts-rts@0 {
                                allwinner,pins = "PD4", "PD5";
                                allwinner,function = "uart2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart3_pins_a: uart3@1 {
                                allwinner,pins = "PG9", "PG10";
                                allwinner,function = "uart3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart3_cts_rts_pins_a: uart3-cts-rts@0 {
                                allwinner,pins = "PG11", "PG12";
                                allwinner,function = "uart3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index a1c27c89724a8a588addc34f0f5d09ebe8260e94..702a0d2ddb771dfb165bff4b20bce81dc60b681f 100644 (file)
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -179,19 +179,16 @@ &pio {
        chip_vbus_pin: chip_vbus_pin@0 {
                allwinner,pins = "PB10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 {
                allwinner,pins = "PC19";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        chip_id_det_pin: chip_id_det_pin@0 {
                allwinner,pins = "PG2";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        chip_w1_pin: chip_w1_pin@0 {

diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index 9d8b8236c51221fd806971906f01b98381e92ab3..0f2e539e540bce47a8877be695c3077f38ba1320 100644 (file)
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -132,7 +132,6 @@ &pio {
        codec_pa_pin: codec_pa_pin@0 {
                allwinner,pins = "PG10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin: mmc0_cd_pin@0 {
@@ -163,7 +162,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
        usb0_vbus_pin_a: usb0_vbus_pin@0 {
                allwinner,pins = "PG12";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index dd9536a85286f8d0821d9f2b75433232d680f7aa..40d0cf5d560aad26b7efde57a063fdf37e685ed9 100644 (file)
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -557,19 +557,16 @@ pio: pinctrl@01c20800 {
                        i2c0_pins_a: i2c0@0 {
                                allwinner,pins = "PB0", "PB1";
                                allwinner,function = "i2c0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c1_pins_a: i2c1@0 {
                                allwinner,pins = "PB15", "PB16";
                                allwinner,function = "i2c1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c2_pins_a: i2c2@0 {
                                allwinner,pins = "PB17", "PB18";
                                allwinner,function = "i2c2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        lcd_rgb565_pins: lcd_rgb565@0 {
@@ -578,7 +575,6 @@ lcd_rgb565_pins: lcd_rgb565@0 {
                                                 "PD19", "PD20", "PD21", "PD22", "PD23",
                                                 "PD24", "PD25", "PD26", "PD27";
                                allwinner,function = "lcd0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins_a: mmc0@0 {
@@ -586,7 +582,6 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc2_pins_a: mmc2@0 {
@@ -601,31 +596,26 @@ mmc2_pins_a: mmc2@0 {
                        spi2_pins_a: spi2@0 {
                                allwinner,pins = "PE1", "PE2", "PE3";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_cs0_pins_a: spi2-cs0@0 {
                                allwinner,pins = "PE0";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart3_pins_a: uart3@0 {
                                allwinner,pins = "PG9", "PG10";
                                allwinner,function = "uart3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart3_pins_cts_rts_a: uart3-cts-rts@0 {
                                allwinner,pins = "PG11", "PG12";
                                allwinner,function = "uart3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm0_pins: pwm0 {
                                allwinner,pins = "PB2";
                                allwinner,function = "pwm";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
index e723dedeb614500d59e2691ae45e16eaeeb2ff96..cbc99ce6ab1af136ba429d7aeeb988eb106ec04a 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
+++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
@@ -70,7 +70,6 @@ &pio {
        usb1_vbus_pin_a: usb1_vbus_pin@0 {
                allwinner,pins = "PH27";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 4057e91c7cb5c2a69122c7754d65913cf27d8a9e..24909c8c11863c5ba9077b6146e9d08206ed5565 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -137,7 +137,6 @@ mmc0_cd_pin_colombus: mmc0_cd_pin@0 {
        usb2_vbus_pin_colombus: usb2_vbus_pin@0 {
                allwinner,pins = "PH24";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        i2c_lcd_pins: i2c_lcd_pin@0 {

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 8afef1293ac6e2ab517530c81f1b83cbbe1efaf6..2d3782edd77070a344a2bafa15fcd5232c7de2fe 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -222,7 +222,6 @@ &pio {
        gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 {
                allwinner,pins = "PA21";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
@@ -234,7 +233,6 @@ mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
        wifi_reset_pin_hummingbird: wifi_reset_pin@0 {
                allwinner,pins = "PG10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index a2d6a92dac29764e7a19f0182a7ec317793fe15f..61e3ef4528ec9dbdc2391df3ed8ba84b64b2ef20 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -111,7 +111,6 @@ &pio {
        led_pins_i7: led_pins@0 {
                allwinner,pins = "PH13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_i7: mmc0_cd_pin@0 {
@@ -123,7 +122,6 @@ mmc0_cd_pin_i7: mmc0_cd_pin@0 {
        usb1_vbus_pin_i7: usb1_vbus_pin@0 {
                allwinner,pins = "PC27";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 0ae5ab2f06fa281831d551365094403cf7f94860..96ad1fe9bbc8f358d02e6e3e061139d2ea9a8e5c 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -130,7 +130,6 @@ &pio {
        led_pins_m9: led_pins@0 {
                allwinner,pins = "PH13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_m9: mmc0_cd_pin@0 {
@@ -142,7 +141,6 @@ mmc0_cd_pin_m9: mmc0_cd_pin@0 {
        usb1_vbus_pin_m9: usb1_vbus_pin@0 {
                allwinner,pins = "PC27";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

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 a551673aca68ae5fc65415c75f90d0f97dc4a581..a29ea186b964ed3e43944af39e5bdef1d8b600df 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -130,7 +130,6 @@ &pio {
        led_pins_m9: led_pins@0 {
                allwinner,pins = "PH13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_m9: mmc0_cd_pin@0 {
@@ -142,7 +141,6 @@ mmc0_cd_pin_m9: mmc0_cd_pin@0 {
        usb1_vbus_pin_m9: usb1_vbus_pin@0 {
                allwinner,pins = "PC27";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index c14cde4cd75d91643bae42010ab662e64f0bac99..ee153a2c9e57c8093eb941ee8fa6a951cbc5da47 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -492,7 +492,6 @@ gmac_pins_gmii_a: gmac_gmii@0 {
                                 * might need a higher signal drive strength
                                 */
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        gmac_pins_mii_a: gmac_mii@0 {
@@ -502,7 +501,6 @@ gmac_pins_mii_a: gmac_mii@0 {
                                                "PA20", "PA21", "PA22", "PA23",
                                                "PA24", "PA26", "PA27";
                                allwinner,function = "gmac";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        gmac_pins_rgmii_a: gmac_rgmii@0 {
@@ -516,25 +514,21 @@ gmac_pins_rgmii_a: gmac_rgmii@0 {
                                 * and need a higher signal drive strength
                                 */
                                allwinner,drive = <SUN4I_PINCTRL_40_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c0_pins_a: i2c0@0 {
                                allwinner,pins = "PH14", "PH15";
                                allwinner,function = "i2c0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c1_pins_a: i2c1@0 {
                                allwinner,pins = "PH16", "PH17";
                                allwinner,function = "i2c1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c2_pins_a: i2c2@0 {
                                allwinner,pins = "PH18", "PH19";
                                allwinner,function = "i2c2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        lcd0_rgb888_pins: lcd0_rgb888 {
@@ -546,7 +540,6 @@ lcd0_rgb888_pins: lcd0_rgb888 {
                                                 "PD20", "PD21", "PD22", "PD23",
                                                 "PD24", "PD25", "PD26", "PD27";
                                allwinner,function = "lcd0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins_a: mmc0@0 {
@@ -554,7 +547,6 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF3", "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc1_pins_a: mmc1@0 {
@@ -562,7 +554,6 @@ mmc1_pins_a: mmc1@0 {
                                                 "PG4", "PG5";
                                allwinner,function = "mmc1";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc2_pins_a: mmc2@0 {
@@ -580,7 +571,6 @@ mmc2_8bit_emmc_pins: mmc2@1 {
                                                 "PC24";
                                allwinner,function = "mmc2";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc3_8bit_emmc_pins: mmc3@1 {
@@ -590,13 +580,11 @@ mmc3_8bit_emmc_pins: mmc3@1 {
                                                 "PC24";
                                allwinner,function = "mmc3";
                                allwinner,drive = <SUN4I_PINCTRL_40_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_a: uart0@0 {
                                allwinner,pins = "PH20", "PH21";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 
@@ -1071,13 +1059,11 @@ r_pio: pinctrl@01f02c00 {
                        ir_pins_a: ir@0 {
                                allwinner,pins = "PL4";
                                allwinner,function = "s_ir";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        p2wi_pins: p2wi {
                                allwinner,pins = "PL0", "PL1";
                                allwinner,function = "s_p2wi";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 4332cde8d6cac99b05470b2b8ee284e827da8f78..f511aa0e250da90d4cf833f2ccf823699c1017ed 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -136,7 +136,6 @@ &pio {
        gt911_int_primo81: gt911_int_pin@0 {
                allwinner,pins = "PA3";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mma8452_int_primo81: mma8452_int_pin@0 {

diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index e9ec179511a063e21308d5998113c41590b3a594..f7b681ef0e8b1bb352c55976caee35586a3a97fc 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -138,7 +138,6 @@ &pio {
        led_pin_sina31s: led_pin@0 {
                allwinner,pins = "PH13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {

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 83e47a1c93bd1d5486b37798c4c4be3798a2d5a5..3731cf22abc1db252344b26452e0dd84b34d642c 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -155,13 +155,11 @@ &pio {
        gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 {
                allwinner,pins = "PA21";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_bpi_m2: led_pins@0 {
                allwinner,pins = "PG5", "PG10", "PG11";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {
@@ -175,7 +173,6 @@ &r_pio {
        mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 {
                allwinner,pins = "PL8";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index 83f651d13bb02eb1d9ab9ea137e4dd653a55c075..aa9a1ff89a9d74377d38306b59cd1c1716e1f826 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -202,13 +202,11 @@ &pio {
        gmac_power_pin_bpi_m1p: gmac_power_pin@0 {
                allwinner,pins = "PH23";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_bpi_m1p: led_pins@0 {
                allwinner,pins = "PH24", "PH25";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {
@@ -220,7 +218,6 @@ mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {
        mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 {
                allwinner,pins = "PH22";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index 158ab889dce7a83d6277d0d7a7ab83ce2d50e7f8..7cd6a74d104cac460003337ac62858379f9f5dc3 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -193,13 +193,11 @@ mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
        gmac_power_pin_bananapi: gmac_power_pin@0 {
                allwinner,pins = "PH23";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_bananapi: led_pins@0 {
                allwinner,pins = "PH24";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index 4aaf137376de57b1d5dcb5a402e691554052d423..366636451e7e4e4dc6fede8affb44dcbd7de4405 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -184,13 +184,11 @@ &pio {
        gmac_power_pin_bananapro: gmac_power_pin@0 {
                allwinner,pins = "PH23";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_bananapro: led_pins@0 {
                allwinner,pins = "PH24", "PG2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {
@@ -202,19 +200,16 @@ mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {
        usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
                allwinner,pins = "PH0";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
                allwinner,pins = "PH1";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        vmmc3_pin_bananapro: vmmc3_pin@0 {
                allwinner,pins = "PH22";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 42779aeb7297cb610bccabdba1c417e2ce40e97c..e635dd6ac47dc9f5609e59b1489b42f05196268b 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -162,7 +162,6 @@ &pio {
        led_pins_cubieboard2: led_pins@0 {
                allwinner,pins = "PH20", "PH21";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index a0b7ffb6196dd191987ba4cee6d56c5205ee5e97..be8fa4879453fa865825525afe3cbd18b102fc47 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -226,37 +226,31 @@ &pio {
        ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 {
                allwinner,pins = "PH12";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_cubietruck: led_pins@0 {
                allwinner,pins = "PH7", "PH11", "PH20", "PH21";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 {
                allwinner,pins = "PH9";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_vbus_pin_a: usb0_vbus_pin@0 {
                allwinner,pins = "PH17";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                allwinner,pins = "PH19";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
                allwinner,pins = "PH22";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 714a463e24ed4ff42694d70891205941ba911e13..6719c701a45f8853a6e44266096140ce4efa4576 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -190,25 +190,21 @@ &pio {
        ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin@0 {
                allwinner,pins = "PH15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin@0 {
                allwinner,pins = "PH9";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin@0 {
                allwinner,pins = "PH16";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 4d1e102ea4b9465966170af2f94fe14ec158b1c9..d64c11134dd7cfff0b6fd05b5b0c505e8bcc154f 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -200,25 +200,21 @@ &pio {
        vmmc3_pin_i12_tvbox: vmmc3_pin@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 {
                allwinner,pins = "PH12";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        gmac_power_pin_i12_tvbox: gmac_power_pin@0 {
                allwinner,pins = "PH21";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_i12_tvbox: led_pins@0 {
                allwinner,pins = "PH9", "PH20";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
index 10d48cbf81ff2cce0c817b1560224661bb4c5bb7..44f09642c8933f9384d25d2846e18819b0d7264e 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
@@ -134,7 +134,6 @@ led_pins_itead_core: led_pins@0 {
                allwinner,pins = "PH20","PH21";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 57c05e69d01293cff915b84bef2b4f8a75f0ede8..79cee00a85de9b1a684ad49a6011d5f18d247b14 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -236,13 +236,11 @@ mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 {
        gmac_power_pin_lamobo_r1: gmac_power_pin@0 {
                allwinner,pins = "PH23";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_lamobo_r1: led_pins@0 {
                allwinner,pins = "PH24";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index cfaa5b45b159efce335cee1b833a5a0147c0f214..97ce27da445f55b60bdbeb85874955ee3213ad2b 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -147,7 +147,6 @@ &pio {
        led_pins_m3: led_pins@0 {
                allwinner,pins = "PH20";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index edd397d796bebab092efb71553bb6c8fae22405e..c5890617382c95d39da131693a5a58a8724f2656 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@ -134,13 +134,11 @@ &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                allwinner,pins = "PH4";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
                allwinner,pins = "PH5";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index 7d43526c2e584b00e3c21fcaf38837cb4094f063..1ba112ccbb4691ab91c0cfde45489dbe384ac6f1 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -210,14 +210,12 @@ &pio {
        ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin@1 {
                allwinner,pins = "PC3";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_olimex_som_evb: led_pins@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {
@@ -229,13 +227,11 @@ mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                allwinner,pins = "PH4";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
                allwinner,pins = "PH5";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index 632ad580e09fc773408675db57346946139e8f4a..21946497789efab2448526f520e938a816a9b140 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -155,14 +155,12 @@ &pio {
        ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
                allwinner,pins = "PC3";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_olinuxinolime: led_pins@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
index a64c2b3a11250a5fbc9647e071aa6c3062e60e7e..6858d6aafea3121bf046b4c56ccf2298cbba1a61 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@ -59,7 +59,6 @@ &pio {
        mmc2_pins_nrst: mmc2@0 {
                allwinner,pins = "PC16";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index b47b67765aec1e489dfadea46c2e2a708c1dff4f..3dcd745126a9382d9aeed0f8b473603a06999b80 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -204,14 +204,12 @@ &pio {
        ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
                allwinner,pins = "PC3";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_olinuxinolime: led_pins@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
@@ -229,7 +227,6 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
        usb0_vbus_pin_lime2: usb0_vbus_pin@0 {
                allwinner,pins = "PC17";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 2dddbf148d8e2731da5354f5eb2bfe3ffa4b32fd..3773926df96eca05558b1ab0854f163158bd8d54 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -236,7 +236,6 @@ led_pins_olinuxino: led_pins@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index 69ad2345613f1da4dfa44e01a7b4506ff0ab7f31..8e05256f7c1bd53a2b1d29ed3798d5ea128b72de 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -186,25 +186,21 @@ mmc3_cd_pin_orangepi: mmc3_cd_pin@0 {
        usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
                allwinner,pins = "PH22";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        gmac_power_pin_orangepi: gmac_power_pin@0 {
                allwinner,pins = "PH23";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_orangepi: led_pins@0 {
                allwinner,pins = "PH24", "PH25";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
                allwinner,pins = "PH26";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index d6608ed6cdf350e536a077bd1435e2a2c48e9783..d168b8f08e303f423cc9e3ca0a9984deff2e93ad 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -161,25 +161,21 @@ mmc0_cd_pin_orangepi: mmc0_cd_pin@0 {
        usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
                allwinner,pins = "PH22";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        gmac_power_pin_orangepi: gmac_power_pin@0 {
                allwinner,pins = "PH23";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_orangepi: led_pins@0 {
                allwinner,pins = "PH24";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
                allwinner,pins = "PH26";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
index 4a292a12616d409b62213e97993f1865c16e4fb6..cdcbee74274efe02fc89c775add9a45726c33a76 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
@@ -154,13 +154,11 @@ &pio {
        ahci_pwr_pin_pcduino3_nano: ahci_pwr_pin@0 {
                allwinner,pins = "PH2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        led_pins_pcduino3_nano: led_pins@0 {
                allwinner,pins = "PH16", "PH15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
@@ -172,7 +170,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
        usb1_vbus_pin_pcduino3_nano: usb1_vbus_pin@0 {
                allwinner,pins = "PD2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index a416b3a47cee96119b10b6fbfe71ea26bff975e8..fd2b4b8af9eabd4033ae903b549536219df07acb 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -185,13 +185,11 @@ &pio {
        led_pins_pcduino3: led_pins@0 {
                allwinner,pins = "PH15", "PH16";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        key_pins_pcduino3: key_pins@0 {
                allwinner,pins = "PH17", "PH18", "PH19";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
index a10c4ccd741dee7c99050e7b76130108144982f3..688f75ceab580a65ccf74b4e00982544a6e9f737 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
@@ -175,19 +175,16 @@ &pio {
        bl_enable_pin: bl_enable_pin@0 {
                allwinner,pins = "PH7";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        codec_pa_pin: codec_pa_pin@0 {
                allwinner,pins = "PH15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        ts_reset_pin: ts_reset_pin@0 {
                allwinner,pins = "PB13";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
index 87901259582b4aacab8d85833077c4c0412537b0..b12493350ee3fbe8c34034aed06481e77075c351 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
@@ -162,7 +162,6 @@ &pio {
        vmmc3_pin_ap6xxx_wl_regon: vmmc3_pin@0 {
                allwinner,pins = "PH9";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index e7cfc193ce63b507c804d909ce6ebd90ecd83fcd..ce16a8ca6db46e21c8834ab30b63fd9a8e1a67d4 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -1095,13 +1095,11 @@ pio: pinctrl@01c20800 {
                        clk_out_a_pins_a: clk_out_a@0 {
                                allwinner,pins = "PI12";
                                allwinner,function = "clk_out_a";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        clk_out_b_pins_a: clk_out_b@0 {
                                allwinner,pins = "PI13";
                                allwinner,function = "clk_out_b";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        emac_pins_a: emac0@0 {
@@ -1111,7 +1109,6 @@ emac_pins_a: emac0@0 {
                                                "PA11", "PA12", "PA13", "PA14",
                                                "PA15", "PA16";
                                allwinner,function = "emac";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        gmac_pins_mii_a: gmac_mii@0 {
@@ -1121,7 +1118,6 @@ gmac_pins_mii_a: gmac_mii@0 {
                                                "PA11", "PA12", "PA13", "PA14",
                                                "PA15", "PA16";
                                allwinner,function = "gmac";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        gmac_pins_rgmii_a: gmac_rgmii@0 {
@@ -1136,55 +1132,46 @@ gmac_pins_rgmii_a: gmac_rgmii@0 {
                                 * and need a higher signal drive strength
                                 */
                                allwinner,drive = <SUN4I_PINCTRL_40_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c0_pins_a: i2c0@0 {
                                allwinner,pins = "PB0", "PB1";
                                allwinner,function = "i2c0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c1_pins_a: i2c1@0 {
                                allwinner,pins = "PB18", "PB19";
                                allwinner,function = "i2c1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c2_pins_a: i2c2@0 {
                                allwinner,pins = "PB20", "PB21";
                                allwinner,function = "i2c2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c3_pins_a: i2c3@0 {
                                allwinner,pins = "PI0", "PI1";
                                allwinner,function = "i2c3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir0_rx_pins_a: ir0@0 {
                                    allwinner,pins = "PB4";
                                    allwinner,function = "ir0";
-                                   allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir0_tx_pins_a: ir0@1 {
                                    allwinner,pins = "PB3";
                                    allwinner,function = "ir0";
-                                   allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir1_rx_pins_a: ir1@0 {
                                    allwinner,pins = "PB23";
                                    allwinner,function = "ir1";
-                                   allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ir1_tx_pins_a: ir1@1 {
                                    allwinner,pins = "PB22";
                                    allwinner,function = "ir1";
-                                   allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins_a: mmc0@0 {
@@ -1192,7 +1179,6 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF3", "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
@@ -1214,31 +1200,26 @@ mmc3_pins_a: mmc3@0 {
                                                 "PI7", "PI8", "PI9";
                                allwinner,function = "mmc3";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ps20_pins_a: ps20@0 {
                                allwinner,pins = "PI20", "PI21";
                                allwinner,function = "ps2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        ps21_pins_a: ps21@0 {
                                allwinner,pins = "PH12", "PH13";
                                allwinner,function = "ps2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm0_pins_a: pwm0@0 {
                                allwinner,pins = "PB2";
                                allwinner,function = "pwm";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm1_pins_a: pwm1@0 {
                                allwinner,pins = "PI3";
                                allwinner,function = "pwm";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spdif_tx_pins_a: spdif@0 {
@@ -1250,109 +1231,91 @@ spdif_tx_pins_a: spdif@0 {
                        spi0_pins_a: spi0@0 {
                                allwinner,pins = "PI11", "PI12", "PI13";
                                allwinner,function = "spi0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi0_cs0_pins_a: spi0_cs0@0 {
                                allwinner,pins = "PI10";
                                allwinner,function = "spi0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi0_cs1_pins_a: spi0_cs1@0 {
                                allwinner,pins = "PI14";
                                allwinner,function = "spi0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi1_pins_a: spi1@0 {
                                allwinner,pins = "PI17", "PI18", "PI19";
                                allwinner,function = "spi1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi1_cs0_pins_a: spi1_cs0@0 {
                                allwinner,pins = "PI16";
                                allwinner,function = "spi1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_pins_a: spi2@0 {
                                allwinner,pins = "PC20", "PC21", "PC22";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_pins_b: spi2@1 {
                                allwinner,pins = "PB15", "PB16", "PB17";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_cs0_pins_a: spi2_cs0@0 {
                                allwinner,pins = "PC19";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi2_cs0_pins_b: spi2_cs0@1 {
                                allwinner,pins = "PB14";
                                allwinner,function = "spi2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_a: uart0@0 {
                                allwinner,pins = "PB22", "PB23";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart2_pins_a: uart2@0 {
                                allwinner,pins = "PI16", "PI17", "PI18", "PI19";
                                allwinner,function = "uart2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart3_pins_a: uart3@0 {
                                allwinner,pins = "PG6", "PG7", "PG8", "PG9";
                                allwinner,function = "uart3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart3_pins_b: uart3@1 {
                                allwinner,pins = "PH0", "PH1";
                                allwinner,function = "uart3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart4_pins_a: uart4@0 {
                                allwinner,pins = "PG10", "PG11";
                                allwinner,function = "uart4";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart4_pins_b: uart4@1 {
                                allwinner,pins = "PH4", "PH5";
                                allwinner,function = "uart4";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart5_pins_a: uart5@0 {
                                allwinner,pins = "PI10", "PI11";
                                allwinner,function = "uart5";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart6_pins_a: uart6@0 {
                                allwinner,pins = "PI12", "PI13";
                                allwinner,function = "uart6";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart7_pins_a: uart7@0 {
                                allwinner,pins = "PI20", "PI21";
                                allwinner,function = "uart7";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
index 36740909600a07838f69c0c9704703de4a0fa157..0219da4099bde9d18e3f6327ad105abc7df678b9 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
@@ -276,19 +276,16 @@ pio: pinctrl@01c20800 {
                        uart0_pins_a: uart0@0 {
                                allwinner,pins = "PF2", "PF4";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart1_pins_a: uart1@0 {
                                allwinner,pins = "PG6", "PG7";
                                allwinner,function = "uart1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart1_pins_cts_rts_a: uart1-cts-rts@0 {
                                allwinner,pins = "PG8", "PG9";
                                allwinner,function = "uart1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins_a: mmc0@0 {
@@ -296,7 +293,6 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF3", "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc1_pins_a: mmc1@0 {
@@ -304,7 +300,6 @@ mmc1_pins_a: mmc1@0 {
                                                 "PG3", "PG4", "PG5";
                                allwinner,function = "mmc1";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc2_8bit_pins: mmc2_8bit {
@@ -314,31 +309,26 @@ mmc2_8bit_pins: mmc2_8bit {
                                                 "PC15", "PC16";
                                allwinner,function = "mmc2";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        pwm0_pins: pwm0 {
                                allwinner,pins = "PH0";
                                allwinner,function = "pwm0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c0_pins_a: i2c0@0 {
                                allwinner,pins = "PH2", "PH3";
                                allwinner,function = "i2c0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c1_pins_a: i2c1@0 {
                                allwinner,pins = "PH4", "PH5";
                                allwinner,function = "i2c1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c2_pins_a: i2c2@0 {
                                allwinner,pins = "PE12", "PE13";
                                allwinner,function = "i2c2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        lcd_rgb666_pins: lcd-rgb666@0 {
@@ -347,7 +337,6 @@ lcd_rgb666_pins: lcd-rgb666@0 {
                                                 "PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
                                                 "PD24", "PD25", "PD26", "PD27";
                                allwinner,function = "lcd0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 
@@ -588,7 +577,6 @@ r_rsb_pins: r_rsb {
                        r_uart_pins_a: r_uart@0 {
                                allwinner,pins = "PL2", "PL3";
                                allwinner,function = "s_uart";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
index edd2a9b2307d61e4c97fe29ab3df22e9c98868b9..8ed0bc3048b342617680d8d8c16ecca33488e83a 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
@@ -93,7 +93,6 @@ &r_pio {
        wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin@0 {
                allwinner,pins = "PL6";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
index abcd94ea5e86682556890fc83248611e57ded670..e8367deaa587550f239dd37379f10b8120f75c6e 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
@@ -86,7 +86,6 @@ &r_pio {
        wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin@0 {
                allwinner,pins = "PL6";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
index fb4665576dfffc8169bb0c7afcd9e1c22c146378..442db91b943a95bbcd5ec01d52593c1dc88bbf72 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
+++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
@@ -92,7 +92,6 @@ led_pin_d978: led_pin_d978@0 {
                allwinner,pins = "PL5";
                allwinner,function = "gpio_out";
                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index 7eaf610eabd729a178c983b5d2b8d4a17e09256f..59a64d2d695c7cd97457a5a2479f52e1a35b5a48 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -94,19 +94,16 @@ &pio {
        led_pin_olinuxino: led_pins@0 {
                allwinner,pins = "PB7";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
                allwinner,pins = "PB4";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                allwinner,pins = "PB3";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index e60c4c8c6976107f9d3bf787c539c12d0b5ed607..310a38cf7f183c0df1ba85a1d2dc6ca3d9452b2c 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -240,7 +240,6 @@ &pio {
        uart0_pins_b: uart0@1 {
                allwinner,pins = "PB0", "PB1";
                allwinner,function = "uart0";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
 };

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index c03d7f4cac8353844030d45e46e3ac7a0a8139ea..cec6bfc2d3c9ccc9524cb8dcef396697ab06ab66 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -171,19 +171,16 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF3", "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_a: uart0@0 {
                                allwinner,pins = "PF2", "PF4";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_b: uart0@1 {
                                allwinner,pins = "PB9", "PB10";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 

diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
index e02314a2d643f16338bf0bef47ec2138388fd39d..49194c38d56b4558ce88b1434d4519092ed9f7af 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
@@ -158,19 +158,16 @@ &r_pio {
        pwr_led_bpi_m2p: led_pins@0 {
                allwinner,pins = "PL10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        sw_r_bpi_m2p: key_pins@0 {
                allwinner,pins = "PL3";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        wifi_en_bpi_m2p: wifi_en_pin {
                allwinner,pins = "PL7";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
index a993725c59fe4ec4f83eabbc40ba6f68c4bbf2a6..52ed2249528da48abd8e8558b6657d14221363f7 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
@@ -112,7 +112,6 @@ &pio {
        leds_npi: led_pins@0 {
                allwinner,pins = "PA10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 
@@ -120,13 +119,11 @@ &r_pio {
        leds_r_npi: led_pins@0 {
                allwinner,pins = "PL10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        sw_r_npi: key_pins@0 {
                allwinner,pins = "PL3";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
index e44af344651466812699ab0c2f07e3b3dcdcc55e..dfd9bc2008fdfef3631a2e35e51f8257c9a4a0fa 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
@@ -147,7 +147,6 @@ &pio {
        leds_opc: led_pins@0 {
                allwinner,pins = "PA15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 
@@ -155,19 +154,16 @@ &r_pio {
        leds_r_opc: led_pins@0 {
                allwinner,pins = "PL10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        sw_r_opc: key_pins@0 {
                allwinner,pins = "PL3", "PL4";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 {
                allwinner,pins = "PL7";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
index ce5b1086b5800ddd87d12f3532bf4a2090016b04..77d29bae7739c6bfc5d4d53fc3fec3eaaaa6914a 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
@@ -145,7 +145,6 @@ &pio {
        leds_opc: led_pins@0 {
                allwinner,pins = "PA15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 
@@ -153,13 +152,11 @@ &r_pio {
        leds_r_opc: led_pins@0 {
                allwinner,pins = "PL10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        sw_r_opc: key_pins@0 {
                allwinner,pins = "PL3";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
index fbdd239175d4d6ac50aa32e457834c00d43421f6..49529d9ca26d335b61370a31054aa9db462b5fab 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
@@ -112,7 +112,6 @@ &pio {
        leds_opc: led_pins@0 {
                allwinner,pins = "PA15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 
@@ -120,13 +119,11 @@ &r_pio {
        leds_r_opc: led_pins@0 {
                allwinner,pins = "PL10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        sw_r_opc: key_pins@0 {
                allwinner,pins = "PL3";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
index 638720c3d04e090cee385976df18d2bb6f92a2f3..0d56d33d43ea0ec02f960cad0de6875fcbe869fc 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
@@ -134,7 +134,6 @@ &pio {
        leds_opc: led_pins@0 {
                allwinner,pins = "PA15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 
@@ -142,13 +141,11 @@ &r_pio {
        leds_r_opc: led_pins@0 {
                allwinner,pins = "PL10";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        sw_r_opc: key_pins@0 {
                allwinner,pins = "PL3";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
index 1236583caf64576108ecf903f61494cc8dda467f..ab8593d1d3df0942dd7bfad56b255656449ba1b1 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
@@ -85,7 +85,6 @@ &pio {
        usb3_vbus_pin_a: usb3_vbus_pin@0 {
                allwinner,pins = "PG11";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 5483ba8932b0708c1a981d6784376238a0b10e5d..c3b5c516809c122d5419a2ecf4502f14d51bb00c 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -331,19 +331,16 @@ pio: pinctrl@01c20800 {
                        i2c0_pins: i2c0 {
                                allwinner,pins = "PA11", "PA12";
                                allwinner,function = "i2c0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c1_pins: i2c1 {
                                allwinner,pins = "PA18", "PA19";
                                allwinner,function = "i2c1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        i2c2_pins: i2c2 {
                                allwinner,pins = "PE12", "PE13";
                                allwinner,function = "i2c2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins_a: mmc0@0 {
@@ -351,7 +348,6 @@ mmc0_pins_a: mmc0@0 {
                                                 "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_cd_pin: mmc0_cd_pin@0 {
@@ -365,7 +361,6 @@ mmc1_pins_a: mmc1@0 {
                                                 "PG4", "PG5";
                                allwinner,function = "mmc1";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc2_8bit_pins: mmc2_8bit {
@@ -375,49 +370,41 @@ mmc2_8bit_pins: mmc2_8bit {
                                                 "PC15", "PC16";
                                allwinner,function = "mmc2";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi0_pins: spi0 {
                                allwinner,pins = "PC0", "PC1", "PC2", "PC3";
                                allwinner,function = "spi0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        spi1_pins: spi1 {
                                allwinner,pins = "PA15", "PA16", "PA14", "PA13";
                                allwinner,function = "spi1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_a: uart0@0 {
                                allwinner,pins = "PA4", "PA5";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart1_pins: uart1 {
                                allwinner,pins = "PG6", "PG7";
                                allwinner,function = "uart1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart1_rts_cts_pins: uart1_rts_cts {
                                allwinner,pins = "PG8", "PG9";
                                allwinner,function = "uart1";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart2_pins: uart2 {
                                allwinner,pins = "PA0", "PA1";
                                allwinner,function = "uart2";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart3_pins: uart3 {
                                allwinner,pins = "PA13", "PA14";
                                allwinner,function = "uart3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 
@@ -615,7 +602,6 @@ r_pio: pinctrl@01f02c00 {
                        ir_pins_a: ir@0 {
                                allwinner,pins = "PL11";
                                allwinner,function = "s_cir_rx";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 6161ec441df5e756e9aabb6c358b4d48b7af8a16..0588fceb0636ece7e81dd82394a5bf09c6ab432a 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -167,7 +167,6 @@ mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
        led_pins_parrot: led_pins@0 {
                allwinner,pins = "PE16", "PE17";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_det: usb0_id_detect_pin@0 {
@@ -179,7 +178,6 @@ usb0_id_det: usb0_id_detect_pin@0 {
        usb1_vbus_pin_parrot: usb1_vbus_pin@0 {
                allwinner,pins = "PD12";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 
@@ -187,7 +185,6 @@ &r_pio {
        wifi_reset_pin_parrot: wifi_reset_pin@0 {
                allwinner,pins = "PL6";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index 5533a1ec895d66ad91ef2e80d4568430dc69034c..7517faae54a4568c79c3d2e6772defc38b16c6b3 100644 (file)
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -96,7 +96,6 @@ &pio {
        bl_en_pin: bl_en_pin@0 {
                allwinner,pins = "PH6";
                allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin: mmc0_cd_pin@0 {
@@ -108,7 +107,6 @@ mmc0_cd_pin: mmc0_cd_pin@0 {
        ts_power_pin: ts_power_pin@0 {
                allwinner,pins = "PH1";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {

diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
index 6a6695cfe7b3297e4831b1b9e03fc88451f5f6ca..5ae52cb3d1649960399c6404925e8bb76664036f 100644 (file)
--- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
+++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
@@ -135,7 +135,6 @@ &pio {
        led_pins_cubieboard4: led-pins@0 {
                allwinner,pins = "PH6", "PH17";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_cubieboard4: mmc0_cd_pin@0 {
@@ -153,7 +152,6 @@ &r_pio {
        wifi_en_pin_cubieboard4: wifi_en_pin@0 {
                allwinner,pins = "PL2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 99739a7322410ad483e621dbab5f9f1c18627140..dce94424fda6a82189ebdc0452d78436ee2c9635 100644 (file)
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -185,7 +185,6 @@ &pio {
        led_pins_optimus: led-pins@0 {
                allwinner,pins = "PH0", "PH1";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        mmc0_cd_pin_optimus: mmc0_cd_pin@0 {
@@ -197,13 +196,11 @@ mmc0_cd_pin_optimus: mmc0_cd_pin@0 {
        usb1_vbus_pin_optimus: usb1_vbus_pin@1 {
                allwinner,pins = "PH4";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb3_vbus_pin_optimus: usb3_vbus_pin@1 {
                allwinner,pins = "PH5";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 
@@ -215,13 +212,11 @@ &r_pio {
        led_r_pins_optimus: led-pins@1 {
                allwinner,pins = "PM15";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        wifi_en_pin_optimus: wifi_en_pin@0 {
                allwinner,pins = "PL2";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };
 

diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index 3a5e98fd54905d69df4bb94b22d3cf223891d27f..510b1462cb05abf0587b83371691c21d57d52775 100644 (file)
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -689,7 +689,6 @@ pio: pinctrl@06000800 {
                        i2c3_pins_a: i2c3@0 {
                                allwinner,pins = "PG10", "PG11";
                                allwinner,function = "i2c3";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc0_pins: mmc0 {
@@ -697,7 +696,6 @@ mmc0_pins: mmc0 {
                                                 "PF4", "PF5";
                                allwinner,function = "mmc0";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc1_pins: mmc1 {
@@ -705,7 +703,6 @@ mmc1_pins: mmc1 {
                                                 "PG4", "PG5";
                                allwinner,function = "mmc1";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        mmc2_8bit_pins: mmc2_8bit {
@@ -715,19 +712,16 @@ mmc2_8bit_pins: mmc2_8bit {
                                                 "PC16";
                                allwinner,function = "mmc2";
                                allwinner,drive = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart0_pins_a: uart0@0 {
                                allwinner,pins = "PH12", "PH13";
                                allwinner,function = "uart0";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        uart4_pins_a: uart4@0 {
                                allwinner,pins = "PG12", "PG13", "PG14", "PG15";
                                allwinner,function = "uart4";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 
@@ -911,7 +905,6 @@ r_pio: pinctrl@08002c00 {
                        r_ir_pins: r_ir {
                                allwinner,pins = "PL6";
                                allwinner,function = "s_cir_rx";
-                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        r_rsb_pins: r_rsb {

diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
index 7809e18d30bd14ce577b546fb5dbdd63f14f22ae..358b8d9b4703247d971b4679a75993f80f1589b0 100644 (file)
--- a/arch/arm/boot/dts/sunxi-common-regulators.dtsi
+++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
@@ -49,25 +49,21 @@ &pio {
        ahci_pwr_pin_a: ahci_pwr_pin@0 {
                allwinner,pins = "PB8";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb0_vbus_pin_a: usb0_vbus_pin@0 {
                allwinner,pins = "PB9";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb1_vbus_pin_a: usb1_vbus_pin@0 {
                allwinner,pins = "PH6";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 
        usb2_vbus_pin_a: usb2_vbus_pin@0 {
                allwinner,pins = "PH3";
                allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
        };
 };