From d312f6fb806db074e8fad95d6f8f2cb89cb07350 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 23 Sep 2016 00:08:38 +0300 Subject: [PATCH 1/3] ARM: sunxi: Remove useless allwinner,drive property The allwinner,drive property set to 10mA was really considered as our default. Remove all those properties entirely to make that obvious. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai Reviewed-by: Linus Walleij --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 -- .../boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 2 -- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 1 - .../boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 6 ---- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 1 - arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 -- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 2 -- arch/arm/boot/dts/sun4i-a10-inet1.dts | 4 --- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 2 -- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 3 -- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 -- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 2 -- arch/arm/boot/dts/sun4i-a10-mk802.dts | 3 -- .../arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 3 -- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 3 -- arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 1 - .../boot/dts/sun4i-a10-pov-protab2-ips9.dts | 5 --- arch/arm/boot/dts/sun4i-a10.dtsi | 25 ------------- arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 1 - arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 3 -- arch/arm/boot/dts/sun5i-a10s-mk802.dts | 3 -- .../boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 --- arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 2 -- arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 3 -- arch/arm/boot/dts/sun5i-a10s.dtsi | 6 ---- .../dts/sun5i-a13-empire-electronix-d709.dts | 3 -- arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 3 -- .../boot/dts/sun5i-a13-olinuxino-micro.dts | 5 --- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 4 --- arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 1 - arch/arm/boot/dts/sun5i-a13.dtsi | 3 -- arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 2 -- arch/arm/boot/dts/sun5i-gr8-evb.dts | 4 --- arch/arm/boot/dts/sun5i-gr8.dtsi | 19 ---------- arch/arm/boot/dts/sun5i-r8-chip.dts | 4 --- .../dts/sun5i-reference-design-tablet.dtsi | 5 --- arch/arm/boot/dts/sun5i.dtsi | 9 ----- arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 1 - arch/arm/boot/dts/sun6i-a31-colombus.dts | 3 -- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 3 -- arch/arm/boot/dts/sun6i-a31-i7.dts | 3 -- arch/arm/boot/dts/sun6i-a31-m9.dts | 3 -- .../boot/dts/sun6i-a31-mele-a1000g-quad.dts | 3 -- arch/arm/boot/dts/sun6i-a31.dtsi | 8 ----- arch/arm/boot/dts/sun6i-a31s-primo81.dts | 3 -- arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 -- .../boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 4 --- .../sun6i-a31s-yones-toptech-bs1078-v2.dts | 1 - .../dts/sun6i-reference-design-tablet.dtsi | 2 -- .../boot/dts/sun7i-a20-bananapi-m1-plus.dts | 4 --- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 4 --- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 6 ---- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 2 -- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 6 ---- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 4 --- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 4 --- arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 4 --- arch/arm/boot/dts/sun7i-a20-m3.dts | 1 - arch/arm/boot/dts/sun7i-a20-mk808c.dts | 2 -- .../arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 4 --- .../arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 3 -- .../dts/sun7i-a20-olinuxino-lime2-emmc.dts | 1 - .../boot/dts/sun7i-a20-olinuxino-lime2.dts | 4 --- .../boot/dts/sun7i-a20-olinuxino-micro.dts | 3 -- arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 7 ---- arch/arm/boot/dts/sun7i-a20-orangepi.dts | 6 ---- arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 4 --- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 3 -- .../arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 4 --- .../boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 -- arch/arm/boot/dts/sun7i-a20.dtsi | 36 ------------------- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 9 ----- arch/arm/boot/dts/sun8i-a23-evb.dts | 1 - .../dts/sun8i-a23-polaroid-mid2407pxe03.dts | 1 - .../dts/sun8i-a23-polaroid-mid2809pxe04.dts | 1 - arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 3 -- .../arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 1 - arch/arm/boot/dts/sun8i-a33.dtsi | 1 - arch/arm/boot/dts/sun8i-a83t.dtsi | 2 -- .../boot/dts/sun8i-h3-bananapi-m2-plus.dts | 3 -- arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 4 --- arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 1 - arch/arm/boot/dts/sun8i-h3.dtsi | 12 ------- arch/arm/boot/dts/sun8i-q8-common.dtsi | 1 - arch/arm/boot/dts/sun8i-r16-parrot.dts | 5 --- .../dts/sun8i-reference-design-tablet.dtsi | 4 --- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 3 -- arch/arm/boot/dts/sun9i-a80-optimus.dts | 6 ---- arch/arm/boot/dts/sun9i-a80.dtsi | 4 --- .../arm/boot/dts/sunxi-common-regulators.dtsi | 4 --- 94 files changed, 381 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index 39e368ec3428..035395a32212 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -188,14 +188,12 @@ &pio { emac_power_pin_a1000: emac_power_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_a1000: led_pins@0 { allwinner,pins = "PH10", "PH20"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts index 023b03efa5ff..e9d839bc8562 100644 --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts @@ -144,14 +144,12 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 710e2ef516a8..f11dcd82f468 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -174,7 +174,6 @@ led_pins_cubieboard: led_pins@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts index 893497e397da..e01bdd1f1b2b 100644 --- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts @@ -180,42 +180,36 @@ &pio { bl_en_pin_dsrv9703c: bl_en_pin@0 { allwinner,pins = "PH7"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; codec_pa_pin: codec_pa_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; motor_pins: motor_pins@0 { allwinner,pins = "PB3"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; touchscreen_pins: touchscreen_pins@0 { allwinner,pins = "PB13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index ac64781a0a9c..fbd02c7a5d43 100644 --- 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,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 6de83a6187d0..9b8134cb968d 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -131,14 +131,12 @@ &pio { hackberry_hogs: hogs@0 { allwinner,pins = "PH19"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb2_vbus_pin_hackberry: usb2_vbus_pin@0 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts index 9103864fef90..f3f8b90fb9c8 100644 --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts @@ -95,14 +95,12 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index e09053bf5e1f..bb64e466c4e0 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet1.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts @@ -182,28 +182,24 @@ &pio { bl_en_pin_inet: bl_en_pin@0 { allwinner,pins = "PH7"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; touchscreen_wake_pin: touchscreen_wake_pin@0 { allwinner,pins = "PB13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index 04b0d2d1ae6c..5ba4cd4b2aca 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts @@ -163,14 +163,12 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index bba4f9cf9bf5..5ea154f08364 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -326,21 +326,18 @@ key_pins_inet9f: key_pins@0 { "PA14", "PA15", "PA16", "PA17", "PH22", "PH23", "PH24", "PH25", "PH26"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts index e28f080b1fd5..65273bc7998c 100644 --- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts +++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts @@ -165,14 +165,12 @@ &pio { emac_power_pin_q5: emac_power_pin@0 { allwinner,pins = "PH19"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_q5: led_pins@0 { allwinner,pins = "PH20"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts index 8e50723dbe02..c5916125bea8 100644 --- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts @@ -166,14 +166,12 @@ &pio { led_pins_marsboard: led_pins@0 { allwinner,pins = "PB5", "PB6", "PB7", "PB8"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts index ee46ea854832..204e2b68d09f 100644 --- a/arch/arm/boot/dts/sun4i-a10-mk802.dts +++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts @@ -93,21 +93,18 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb2_vbus_pin_mk802: usb2_vbus_pin@0 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index b350448c7217..e8e14a53b764 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts @@ -170,7 +170,6 @@ &pio { ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { allwinner,pins = "PC3"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; @@ -184,14 +183,12 @@ led_pins_olinuxinolime: led_pins@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index 39034aa8e1ae..7e94334420af 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -172,21 +172,18 @@ &pio { led_pins_pcduino: led_pins@0 { allwinner,pins = "PH15", "PH16"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; key_pins_pcduino: key_pins@0 { allwinner,pins = "PH17", "PH18", "PH19"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts index de483a1bf36a..05de4050a831 100644 --- 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,drive = ; allwinner,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 918f97294b33..459c7a2dbee7 100644 --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts @@ -166,35 +166,30 @@ &pio { bl_en_pin_protab: bl_en_pin@0 { allwinner,pins = "PH7"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; codec_pa_pin: codec_pa_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; touchscreen_pins: touchscreen_pins@0 { allwinner,pins = "PA5", "PB13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index b14a4281058d..c09e29592b56 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -981,56 +981,48 @@ emac_pins_a: emac0@0 { "PA11", "PA12", "PA13", "PA14", "PA15", "PA16"; allwinner,function = "emac"; - allwinner,drive = ; allwinner,pull = ; }; i2c0_pins_a: i2c0@0 { allwinner,pins = "PB0", "PB1"; allwinner,function = "i2c0"; - allwinner,drive = ; allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB18", "PB19"; allwinner,function = "i2c1"; - allwinner,drive = ; allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB20", "PB21"; allwinner,function = "i2c2"; - allwinner,drive = ; allwinner,pull = ; }; ir0_rx_pins_a: ir0@0 { allwinner,pins = "PB4"; allwinner,function = "ir0"; - allwinner,drive = ; allwinner,pull = ; }; ir0_tx_pins_a: ir0@1 { allwinner,pins = "PB3"; allwinner,function = "ir0"; - allwinner,drive = ; allwinner,pull = ; }; ir1_rx_pins_a: ir1@0 { allwinner,pins = "PB23"; allwinner,function = "ir1"; - allwinner,drive = ; allwinner,pull = ; }; ir1_tx_pins_a: ir1@1 { allwinner,pins = "PB22"; allwinner,function = "ir1"; - allwinner,drive = ; allwinner,pull = ; }; @@ -1045,119 +1037,102 @@ mmc0_pins_a: mmc0@0 { mmc0_cd_pin_reference_design: mmc0_cd_pin@0 { allwinner,pins = "PH1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; ps20_pins_a: ps20@0 { allwinner,pins = "PI20", "PI21"; allwinner,function = "ps2"; - allwinner,drive = ; allwinner,pull = ; }; ps21_pins_a: ps21@0 { allwinner,pins = "PH12", "PH13"; allwinner,function = "ps2"; - allwinner,drive = ; allwinner,pull = ; }; pwm0_pins_a: pwm0@0 { allwinner,pins = "PB2"; allwinner,function = "pwm"; - allwinner,drive = ; allwinner,pull = ; }; pwm1_pins_a: pwm1@0 { allwinner,pins = "PI3"; allwinner,function = "pwm"; - allwinner,drive = ; allwinner,pull = ; }; spdif_tx_pins_a: spdif@0 { allwinner,pins = "PB13"; allwinner,function = "spdif"; - allwinner,drive = ; allwinner,pull = ; }; spi0_pins_a: spi0@0 { allwinner,pins = "PI11", "PI12", "PI13"; allwinner,function = "spi0"; - allwinner,drive = ; allwinner,pull = ; }; spi0_cs0_pins_a: spi0_cs0@0 { allwinner,pins = "PI10"; allwinner,function = "spi0"; - allwinner,drive = ; allwinner,pull = ; }; spi1_pins_a: spi1@0 { allwinner,pins = "PI17", "PI18", "PI19"; allwinner,function = "spi1"; - allwinner,drive = ; allwinner,pull = ; }; spi1_cs0_pins_a: spi1_cs0@0 { allwinner,pins = "PI16"; allwinner,function = "spi1"; - allwinner,drive = ; allwinner,pull = ; }; spi2_pins_a: spi2@0 { allwinner,pins = "PC20", "PC21", "PC22"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_pins_b: spi2@1 { allwinner,pins = "PB15", "PB16", "PB17"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_cs0_pins_a: spi2_cs0@0 { allwinner,pins = "PC19"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_cs0_pins_b: spi2_cs0@1 { allwinner,pins = "PB14"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PB22", "PB23"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart0_pins_b: uart0@1 { allwinner,pins = "PF2", "PF4"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart1_pins_a: uart1@0 { allwinner,pins = "PA10", "PA11"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts index d4ad02182353..813e18c011da 100644 --- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts +++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts @@ -111,7 +111,6 @@ &pio { mmc0_cd_pin_t003: mmc0_cd_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts index 2150e15e115a..3c79e3536521 100644 --- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts +++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts @@ -132,21 +132,18 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PG12"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_t004: mmc0_cd_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 { allwinner,pins = "PB18"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts index c84ac005342e..940139145fd5 100644 --- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts +++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts @@ -118,21 +118,18 @@ &pio { led_pins_mk802: led_pins@0 { allwinner,pins = "PB2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_mk802: mmc0_cd_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_mk802: usb1_vbus_pin@0 { allwinner,pins = "PB10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts index 0684d7930d65..c1250c1baf02 100644 --- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts @@ -204,14 +204,12 @@ &pio { mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 { allwinner,pins = "PG13"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -225,14 +223,12 @@ led_pins_olinuxino: led_pins@0 { usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 { allwinner,pins = "PB10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PG12"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; 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 3b057983c74a..84a3bf817c3b 100644 --- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts +++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts @@ -103,7 +103,6 @@ &pio { mmc0_cd_pin_r7: mmc0_cd_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -117,7 +116,6 @@ led_pins_r7: led_pins@0 { usb1_vbus_pin_r7: usb1_vbus_pin@0 { allwinner,pins = "PG13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts index b5de75f4c710..56a6982773a9 100644 --- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts +++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts @@ -148,21 +148,18 @@ &pio { led_pins_wobo_i5: led_pins@0 { allwinner,pins = "PB2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 { allwinner,pins = "PB3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; emac_power_pin_wobo: emac_power_pin@0 { allwinner,pins = "PA02"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 7aa8c7aa0153..b4755e7a0b23 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -202,14 +202,12 @@ &pio { uart0_pins_a: uart0@0 { allwinner,pins = "PB19", "PB20"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart2_pins_a: uart2@0 { allwinner,pins = "PC18", "PC19"; allwinner,function = "uart2"; - allwinner,drive = ; allwinner,pull = ; }; @@ -220,7 +218,6 @@ emac_pins_a: emac0@0 { "PA11", "PA12", "PA13", "PA14", "PA15", "PA16"; allwinner,function = "emac"; - allwinner,drive = ; allwinner,pull = ; }; @@ -231,7 +228,6 @@ emac_pins_b: emac0@1 { "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; allwinner,function = "emac"; - allwinner,drive = ; allwinner,pull = ; }; @@ -246,14 +242,12 @@ mmc1_pins_a: mmc1@0 { spi2_pins_b: spi2@1 { allwinner,pins = "PB12", "PB13", "PB14"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_cs0_pins_b: spi2_cs0@1 { allwinner,pins = "PB11"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts index 6efbba6d40a9..693be366ab9c 100644 --- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts +++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts @@ -139,21 +139,18 @@ &pio { mmc0_cd_pin_d709: mmc0_cd_pin@0 { allwinner,pins = "PG0"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts index 3724b988064e..aa4484ac50b2 100644 --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts @@ -138,21 +138,18 @@ &pio { mmc0_cd_pin_h702: mmc0_cd_pin@0 { allwinner,pins = "PG0"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts index 081329e2b80b..8aec90ac28a4 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts @@ -117,7 +117,6 @@ &pio { mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 { allwinner,pins = "PG0"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -131,28 +130,24 @@ led_pins_olinuxinom: led_pins@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 { allwinner,pins = "PG12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 { allwinner,pins = "PG11"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts index bb7210e0e4a9..95ea10b98c7f 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts @@ -208,7 +208,6 @@ &pio { mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { allwinner,pins = "PG0"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -222,21 +221,18 @@ led_pins_olinuxino: led_pins@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 { allwinner,pins = "PG11"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts index 3d7ff10a48e9..8bc6a4b1b233 100644 --- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts +++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts @@ -102,7 +102,6 @@ &pio { i2c_lcd_pins: i2c_lcd_pin@0 { allwinner,pins = "PG10", "PG12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index a17ba0243db3..d79db1525448 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -355,21 +355,18 @@ lcd_rgb666_pins: lcd_rgb666@0 { "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; allwinner,function = "lcd0"; - allwinner,drive = ; allwinner,pull = ; }; uart1_pins_a: uart1@0 { allwinner,pins = "PE10", "PE11"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; uart1_pins_b: uart1@1 { allwinner,pins = "PG3", "PG4"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts index 92a2dc6250a5..a227aeeae9d6 100644 --- a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts +++ b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts @@ -161,14 +161,12 @@ &pio { usb0_id_pin_chip_pro: usb0-id-pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 { allwinner,pins = "PB10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts index 030605aa8065..4d7386f13804 100644 --- a/arch/arm/boot/dts/sun5i-gr8-evb.dts +++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts @@ -261,28 +261,24 @@ &pio { mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 { allwinner,pins = "PG0"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_pin_gr8_evb: usb0-id-pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 { allwinner,pins = "PG13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi index ea86d4d58db6..761b1857280d 100644 --- a/arch/arm/boot/dts/sun5i-gr8.dtsi +++ b/arch/arm/boot/dts/sun5i-gr8.dtsi @@ -766,42 +766,36 @@ pio: pinctrl@01c20800 { i2c0_pins_a: i2c0@0 { allwinner,pins = "PB0", "PB1"; allwinner,function = "i2c0"; - allwinner,drive = ; allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB15", "PB16"; allwinner,function = "i2c1"; - allwinner,drive = ; allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB17", "PB18"; allwinner,function = "i2c2"; - allwinner,drive = ; allwinner,pull = ; }; i2s0_data_pins_a: i2s0-data@0 { allwinner,pins = "PB6", "PB7", "PB8", "PB9"; allwinner,function = "i2s0"; - allwinner,drive = ; allwinner,pull = ; }; i2s0_mclk_pins_a: i2s0-mclk@0 { allwinner,pins = "PB5"; allwinner,function = "i2s0"; - allwinner,drive = ; allwinner,pull = ; }; ir0_rx_pins_a: ir0@0 { allwinner,pins = "PB4"; allwinner,function = "ir0"; - allwinner,drive = ; allwinner,pull = ; }; @@ -811,7 +805,6 @@ lcd_rgb666_pins: lcd-rgb666@0 { "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; allwinner,function = "lcd0"; - allwinner,drive = ; allwinner,pull = ; }; @@ -829,84 +822,72 @@ nand_pins_a: nand-base0@0 { "PC11", "PC12", "PC13", "PC14", "PC15"; allwinner,function = "nand0"; - allwinner,drive = ; allwinner,pull = ; }; nand_cs0_pins_a: nand-cs@0 { allwinner,pins = "PC4"; allwinner,function = "nand0"; - allwinner,drive = ; allwinner,pull = ; }; nand_rb0_pins_a: nand-rb@0 { allwinner,pins = "PC6"; allwinner,function = "nand0"; - allwinner,drive = ; allwinner,pull = ; }; pwm0_pins_a: pwm0@0 { allwinner,pins = "PB2"; allwinner,function = "pwm0"; - allwinner,drive = ; allwinner,pull = ; }; pwm1_pins: pwm1 { allwinner,pins = "PG13"; allwinner,function = "pwm1"; - allwinner,drive = ; allwinner,pull = ; }; spdif_tx_pins_a: spdif@0 { allwinner,pins = "PB10"; allwinner,function = "spdif"; - allwinner,drive = ; allwinner,pull = ; }; uart1_pins_a: uart1@1 { allwinner,pins = "PG3", "PG4"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; uart1_cts_rts_pins_a: uart1-cts-rts@0 { allwinner,pins = "PG5", "PG6"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; uart2_pins_a: uart2@1 { allwinner,pins = "PD2", "PD3"; allwinner,function = "uart2"; - allwinner,drive = ; allwinner,pull = ; }; uart2_cts_rts_pins_a: uart2-cts-rts@0 { allwinner,pins = "PD4", "PD5"; allwinner,function = "uart2"; - allwinner,drive = ; allwinner,pull = ; }; uart3_pins_a: uart3@1 { allwinner,pins = "PG9", "PG10"; allwinner,function = "uart3"; - allwinner,drive = ; allwinner,pull = ; }; uart3_cts_rts_pins_a: uart3-cts-rts@0 { allwinner,pins = "PG11", "PG12"; allwinner,function = "uart3"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts index c6da5ad37152..a1c27c89724a 100644 --- a/arch/arm/boot/dts/sun5i-r8-chip.dts +++ b/arch/arm/boot/dts/sun5i-r8-chip.dts @@ -179,28 +179,24 @@ &pio { chip_vbus_pin: chip_vbus_pin@0 { allwinner,pins = "PB10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 { allwinner,pins = "PC19"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; chip_id_det_pin: chip_id_det_pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; chip_w1_pin: chip_w1_pin@0 { allwinner,pins = "PD2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi index 82f87cdcd164..9d8b8236c512 100644 --- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi @@ -132,14 +132,12 @@ &pio { codec_pa_pin: codec_pa_pin@0 { allwinner,pins = "PG10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin: mmc0_cd_pin@0 { allwinner,pins = "PG0"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -153,21 +151,18 @@ ts_power_pin: ts_power_pin { usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { allwinner,pins = "PG12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index b0fca4ef4dae..dd9536a85286 100644 --- a/arch/arm/boot/dts/sun5i.dtsi +++ b/arch/arm/boot/dts/sun5i.dtsi @@ -557,21 +557,18 @@ pio: pinctrl@01c20800 { i2c0_pins_a: i2c0@0 { allwinner,pins = "PB0", "PB1"; allwinner,function = "i2c0"; - allwinner,drive = ; allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB15", "PB16"; allwinner,function = "i2c1"; - allwinner,drive = ; allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB17", "PB18"; allwinner,function = "i2c2"; - allwinner,drive = ; allwinner,pull = ; }; @@ -581,7 +578,6 @@ lcd_rgb565_pins: lcd_rgb565@0 { "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; allwinner,function = "lcd0"; - allwinner,drive = ; allwinner,pull = ; }; @@ -605,35 +601,30 @@ mmc2_pins_a: mmc2@0 { spi2_pins_a: spi2@0 { allwinner,pins = "PE1", "PE2", "PE3"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_cs0_pins_a: spi2-cs0@0 { allwinner,pins = "PE0"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; uart3_pins_a: uart3@0 { allwinner,pins = "PG9", "PG10"; allwinner,function = "uart3"; - allwinner,drive = ; allwinner,pull = ; }; uart3_pins_cts_rts_a: uart3-cts-rts@0 { allwinner,pins = "PG11", "PG12"; allwinner,function = "uart3"; - allwinner,drive = ; allwinner,pull = ; }; pwm0_pins: pwm0 { allwinner,pins = "PB2"; allwinner,function = "pwm"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts index 2f8cfab771e2..e723dedeb614 100644 --- 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,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index f9cf36888d93..4057e91c7cb5 100644 --- a/arch/arm/boot/dts/sun6i-a31-colombus.dts +++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts @@ -131,21 +131,18 @@ &pio { mmc0_cd_pin_colombus: mmc0_cd_pin@0 { allwinner,pins = "PA8"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb2_vbus_pin_colombus: usb2_vbus_pin@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; i2c_lcd_pins: i2c_lcd_pin@0 { allwinner,pins = "PA23", "PA24"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts index 735914f6ae44..8afef1293ac6 100644 --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts @@ -222,21 +222,18 @@ &pio { gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 { allwinner,pins = "PA21"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 { allwinner,pins = "PA8"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; wifi_reset_pin_hummingbird: wifi_reset_pin@0 { allwinner,pins = "PG10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts index e9185dad67ee..a2d6a92dac29 100644 --- a/arch/arm/boot/dts/sun6i-a31-i7.dts +++ b/arch/arm/boot/dts/sun6i-a31-i7.dts @@ -111,21 +111,18 @@ &pio { led_pins_i7: led_pins@0 { allwinner,pins = "PH13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_i7: mmc0_cd_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_i7: usb1_vbus_pin@0 { allwinner,pins = "PC27"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts index 29016a13a2c1..0ae5ab2f06fa 100644 --- a/arch/arm/boot/dts/sun6i-a31-m9.dts +++ b/arch/arm/boot/dts/sun6i-a31-m9.dts @@ -130,21 +130,18 @@ &pio { led_pins_m9: led_pins@0 { allwinner,pins = "PH13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_m9: mmc0_cd_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_m9: usb1_vbus_pin@0 { allwinner,pins = "PC27"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,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 5faeae429e2a..a551673aca68 100644 --- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts +++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts @@ -130,21 +130,18 @@ &pio { led_pins_m9: led_pins@0 { allwinner,pins = "PH13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_m9: mmc0_cd_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_m9: usb1_vbus_pin@0 { allwinner,pins = "PC27"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 2b26175d55d1..c14cde4cd75d 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -502,7 +502,6 @@ gmac_pins_mii_a: gmac_mii@0 { "PA20", "PA21", "PA22", "PA23", "PA24", "PA26", "PA27"; allwinner,function = "gmac"; - allwinner,drive = ; allwinner,pull = ; }; @@ -523,21 +522,18 @@ gmac_pins_rgmii_a: gmac_rgmii@0 { i2c0_pins_a: i2c0@0 { allwinner,pins = "PH14", "PH15"; allwinner,function = "i2c0"; - allwinner,drive = ; allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PH16", "PH17"; allwinner,function = "i2c1"; - allwinner,drive = ; allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PH18", "PH19"; allwinner,function = "i2c2"; - allwinner,drive = ; allwinner,pull = ; }; @@ -550,7 +546,6 @@ lcd0_rgb888_pins: lcd0_rgb888 { "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; allwinner,function = "lcd0"; - allwinner,drive = ; allwinner,pull = ; }; @@ -601,7 +596,6 @@ mmc3_8bit_emmc_pins: mmc3@1 { uart0_pins_a: uart0@0 { allwinner,pins = "PH20", "PH21"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -1077,14 +1071,12 @@ r_pio: pinctrl@01f02c00 { ir_pins_a: ir@0 { allwinner,pins = "PL4"; allwinner,function = "s_ir"; - allwinner,drive = ; allwinner,pull = ; }; p2wi_pins: p2wi { allwinner,pins = "PL0", "PL1"; allwinner,function = "s_p2wi"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts index 73c133f5e79c..4332cde8d6ca 100644 --- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts @@ -136,21 +136,18 @@ &pio { gt911_int_primo81: gt911_int_pin@0 { allwinner,pins = "PA3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mma8452_int_primo81: mma8452_int_pin@0 { allwinner,pins = "PA9"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_primo81: mmc0_cd_pin@0 { allwinner,pins = "PA8"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts index c35ec112f5a0..e9ec179511a0 100644 --- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts +++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts @@ -138,14 +138,12 @@ &pio { led_pin_sina31s: led_pin@0 { allwinner,pins = "PH13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_sina31s: mmc0_cd_pin@0 { allwinner,pins = "PA4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; 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 db7fa13f5425..83e47a1c93bd 100644 --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts @@ -155,21 +155,18 @@ &pio { gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 { allwinner,pins = "PA21"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_bpi_m2: led_pins@0 { allwinner,pins = "PG5", "PG10", "PG11"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 { allwinner,pins = "PA4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -178,7 +175,6 @@ &r_pio { mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 { allwinner,pins = "PL8"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts index d6ad6196a768..832392125b8e 100644 --- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts +++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts @@ -94,7 +94,6 @@ &pio { mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 { allwinner,pins = "PA8"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi index 0c434304e040..2e7443fc1790 100644 --- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi @@ -79,14 +79,12 @@ &pio { mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 { allwinner,pins = "PA8"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PA15"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,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 532f1a160560..83f651d13bb0 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts @@ -202,28 +202,24 @@ &pio { gmac_power_pin_bpi_m1p: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_bpi_m1p: led_pins@0 { allwinner,pins = "PH24", "PH25"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 { allwinner,pins = "PH10"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts index 67c8a7644b99..158ab889dce7 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts @@ -181,28 +181,24 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_bananapi: mmc0_cd_pin@0 { allwinner,pins = "PH10"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; gmac_power_pin_bananapi: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_bananapi: led_pins@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts index 18fcc87f4621..4aaf137376de 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts @@ -184,42 +184,36 @@ &pio { gmac_power_pin_bananapro: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_bananapro: led_pins@0 { allwinner,pins = "PH24", "PG2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_bananapro: mmc0_cd_pin@0 { allwinner,pins = "PH10"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { allwinner,pins = "PH0"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { allwinner,pins = "PH1"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; vmmc3_pin_bananapro: vmmc3_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index 1fa832d7b469..42779aeb7297 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts @@ -162,14 +162,12 @@ &pio { led_pins_cubieboard2: led_pins@0 { allwinner,pins = "PH20", "PH21"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index 83f39b0362cb..a0b7ffb6196d 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -226,42 +226,36 @@ &pio { ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_cubietruck: led_pins@0 { allwinner,pins = "PH7", "PH11", "PH20", "PH21"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 { allwinner,pins = "PH9"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { allwinner,pins = "PH17"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH19"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts index 37f4a5497452..714a463e24ed 100644 --- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts +++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts @@ -190,28 +190,24 @@ &pio { ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin@0 { allwinner,pins = "PH9"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin@0 { allwinner,pins = "PH16"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts index 1e6bd360dac0..4d1e102ea4b9 100644 --- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts +++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts @@ -200,28 +200,24 @@ &pio { vmmc3_pin_i12_tvbox: vmmc3_pin@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; gmac_power_pin_i12_tvbox: gmac_power_pin@0 { allwinner,pins = "PH21"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_i12_tvbox: led_pins@0 { allwinner,pins = "PH9", "PH20"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts index 73c05dab0a69..57c05e69d012 100644 --- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts +++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts @@ -224,28 +224,24 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 { allwinner,pins = "PH10"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; gmac_power_pin_lamobo_r1: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_lamobo_r1: led_pins@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts index 8d9ea48dd98c..cfaa5b45b159 100644 --- 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,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts index 90ff4a267025..edd397d796be 100644 --- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts +++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts @@ -134,14 +134,12 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,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 134e0c1b129d..7d43526c2e58 100644 --- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts +++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts @@ -210,7 +210,6 @@ &pio { ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin@1 { allwinner,pins = "PC3"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; @@ -224,21 +223,18 @@ led_pins_olimex_som_evb: led_pins@0 { mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 { allwinner,pins = "PH0"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts index 35ad7006c53c..632ad580e09f 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts @@ -155,7 +155,6 @@ &pio { ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { allwinner,pins = "PC3"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; @@ -169,14 +168,12 @@ led_pins_olinuxinolime: led_pins@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; 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 5ea4915f6d75..a64c2b3a1125 100644 --- 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,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index d5c796c8d16f..b47b67765aec 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts @@ -204,7 +204,6 @@ &pio { ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { allwinner,pins = "PC3"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; @@ -218,21 +217,18 @@ led_pins_olinuxinolime: led_pins@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_pin_lime2: usb0_vbus_pin@0 { allwinner,pins = "PC17"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index 7e3006f6a775..2dddbf148d8e 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts @@ -229,7 +229,6 @@ &pio { mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 { allwinner,pins = "PH11"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -243,14 +242,12 @@ led_pins_olinuxino: led_pins@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts index 2be04c438b1e..69ad2345613f 100644 --- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts +++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts @@ -168,49 +168,42 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_orangepi: mmc0_cd_pin@0 { allwinner,pins = "PH10"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc3_cd_pin_orangepi: mmc3_cd_pin@0 { allwinner,pins = "PH11"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; gmac_power_pin_orangepi: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_orangepi: led_pins@0 { allwinner,pins = "PH24", "PH25"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { allwinner,pins = "PH26"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts index 71125bf64575..d6608ed6cdf3 100644 --- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts +++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts @@ -149,42 +149,36 @@ &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_orangepi: mmc0_cd_pin@0 { allwinner,pins = "PH10"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; gmac_power_pin_orangepi: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_orangepi: led_pins@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { allwinner,pins = "PH26"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts index ddac7328b852..4a292a12616d 100644 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts @@ -154,28 +154,24 @@ &pio { ahci_pwr_pin_pcduino3_nano: ahci_pwr_pin@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_pcduino3_nano: led_pins@0 { allwinner,pins = "PH16", "PH15"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_pcduino3_nano: usb1_vbus_pin@0 { allwinner,pins = "PD2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts index 1a8b39be1d61..a416b3a47cee 100644 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts @@ -185,21 +185,18 @@ &pio { led_pins_pcduino3: led_pins@0 { allwinner,pins = "PH15", "PH16"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; key_pins_pcduino3: key_pins@0 { allwinner,pins = "PH17", "PH18", "PH19"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts index 2f6b21adddd9..a10c4ccd741d 100644 --- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts +++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts @@ -175,28 +175,24 @@ &pio { bl_enable_pin: bl_enable_pin@0 { allwinner,pins = "PH7"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; codec_pa_pin: codec_pa_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; ts_reset_pin: ts_reset_pin@0 { allwinner,pins = "PB13"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; 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 dc31d476ef81..87901259582b 100644 --- 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,14 +162,12 @@ &pio { vmmc3_pin_ap6xxx_wl_regon: vmmc3_pin@0 { allwinner,pins = "PH9"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index f7db067b0de0..e7cfc193ce63 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1095,14 +1095,12 @@ pio: pinctrl@01c20800 { clk_out_a_pins_a: clk_out_a@0 { allwinner,pins = "PI12"; allwinner,function = "clk_out_a"; - allwinner,drive = ; allwinner,pull = ; }; clk_out_b_pins_a: clk_out_b@0 { allwinner,pins = "PI13"; allwinner,function = "clk_out_b"; - allwinner,drive = ; allwinner,pull = ; }; @@ -1113,7 +1111,6 @@ emac_pins_a: emac0@0 { "PA11", "PA12", "PA13", "PA14", "PA15", "PA16"; allwinner,function = "emac"; - allwinner,drive = ; allwinner,pull = ; }; @@ -1124,7 +1121,6 @@ gmac_pins_mii_a: gmac_mii@0 { "PA11", "PA12", "PA13", "PA14", "PA15", "PA16"; allwinner,function = "gmac"; - allwinner,drive = ; allwinner,pull = ; }; @@ -1146,56 +1142,48 @@ gmac_pins_rgmii_a: gmac_rgmii@0 { i2c0_pins_a: i2c0@0 { allwinner,pins = "PB0", "PB1"; allwinner,function = "i2c0"; - allwinner,drive = ; allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB18", "PB19"; allwinner,function = "i2c1"; - allwinner,drive = ; allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB20", "PB21"; allwinner,function = "i2c2"; - allwinner,drive = ; allwinner,pull = ; }; i2c3_pins_a: i2c3@0 { allwinner,pins = "PI0", "PI1"; allwinner,function = "i2c3"; - allwinner,drive = ; allwinner,pull = ; }; ir0_rx_pins_a: ir0@0 { allwinner,pins = "PB4"; allwinner,function = "ir0"; - allwinner,drive = ; allwinner,pull = ; }; ir0_tx_pins_a: ir0@1 { allwinner,pins = "PB3"; allwinner,function = "ir0"; - allwinner,drive = ; allwinner,pull = ; }; ir1_rx_pins_a: ir1@0 { allwinner,pins = "PB23"; allwinner,function = "ir1"; - allwinner,drive = ; allwinner,pull = ; }; ir1_tx_pins_a: ir1@1 { allwinner,pins = "PB22"; allwinner,function = "ir1"; - allwinner,drive = ; allwinner,pull = ; }; @@ -1210,7 +1198,6 @@ mmc0_pins_a: mmc0@0 { mmc0_cd_pin_reference_design: mmc0_cd_pin@0 { allwinner,pins = "PH1"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -1233,161 +1220,138 @@ mmc3_pins_a: mmc3@0 { ps20_pins_a: ps20@0 { allwinner,pins = "PI20", "PI21"; allwinner,function = "ps2"; - allwinner,drive = ; allwinner,pull = ; }; ps21_pins_a: ps21@0 { allwinner,pins = "PH12", "PH13"; allwinner,function = "ps2"; - allwinner,drive = ; allwinner,pull = ; }; pwm0_pins_a: pwm0@0 { allwinner,pins = "PB2"; allwinner,function = "pwm"; - allwinner,drive = ; allwinner,pull = ; }; pwm1_pins_a: pwm1@0 { allwinner,pins = "PI3"; allwinner,function = "pwm"; - allwinner,drive = ; allwinner,pull = ; }; spdif_tx_pins_a: spdif@0 { allwinner,pins = "PB13"; allwinner,function = "spdif"; - allwinner,drive = ; allwinner,pull = ; }; spi0_pins_a: spi0@0 { allwinner,pins = "PI11", "PI12", "PI13"; allwinner,function = "spi0"; - allwinner,drive = ; allwinner,pull = ; }; spi0_cs0_pins_a: spi0_cs0@0 { allwinner,pins = "PI10"; allwinner,function = "spi0"; - allwinner,drive = ; allwinner,pull = ; }; spi0_cs1_pins_a: spi0_cs1@0 { allwinner,pins = "PI14"; allwinner,function = "spi0"; - allwinner,drive = ; allwinner,pull = ; }; spi1_pins_a: spi1@0 { allwinner,pins = "PI17", "PI18", "PI19"; allwinner,function = "spi1"; - allwinner,drive = ; allwinner,pull = ; }; spi1_cs0_pins_a: spi1_cs0@0 { allwinner,pins = "PI16"; allwinner,function = "spi1"; - allwinner,drive = ; allwinner,pull = ; }; spi2_pins_a: spi2@0 { allwinner,pins = "PC20", "PC21", "PC22"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_pins_b: spi2@1 { allwinner,pins = "PB15", "PB16", "PB17"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_cs0_pins_a: spi2_cs0@0 { allwinner,pins = "PC19"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; spi2_cs0_pins_b: spi2_cs0@1 { allwinner,pins = "PB14"; allwinner,function = "spi2"; - allwinner,drive = ; allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PB22", "PB23"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart2_pins_a: uart2@0 { allwinner,pins = "PI16", "PI17", "PI18", "PI19"; allwinner,function = "uart2"; - allwinner,drive = ; allwinner,pull = ; }; uart3_pins_a: uart3@0 { allwinner,pins = "PG6", "PG7", "PG8", "PG9"; allwinner,function = "uart3"; - allwinner,drive = ; allwinner,pull = ; }; uart3_pins_b: uart3@1 { allwinner,pins = "PH0", "PH1"; allwinner,function = "uart3"; - allwinner,drive = ; allwinner,pull = ; }; uart4_pins_a: uart4@0 { allwinner,pins = "PG10", "PG11"; allwinner,function = "uart4"; - allwinner,drive = ; allwinner,pull = ; }; uart4_pins_b: uart4@1 { allwinner,pins = "PH4", "PH5"; allwinner,function = "uart4"; - allwinner,drive = ; allwinner,pull = ; }; uart5_pins_a: uart5@0 { allwinner,pins = "PI10", "PI11"; allwinner,function = "uart5"; - allwinner,drive = ; allwinner,pull = ; }; uart6_pins_a: uart6@0 { allwinner,pins = "PI12", "PI13"; allwinner,function = "uart6"; - allwinner,drive = ; allwinner,pull = ; }; uart7_pins_a: uart7@0 { allwinner,pins = "PI20", "PI21"; allwinner,function = "uart7"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index e4991a78ad73..36740909600a 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -276,21 +276,18 @@ pio: pinctrl@01c20800 { uart0_pins_a: uart0@0 { allwinner,pins = "PF2", "PF4"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart1_pins_a: uart1@0 { allwinner,pins = "PG6", "PG7"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; uart1_pins_cts_rts_a: uart1-cts-rts@0 { allwinner,pins = "PG8", "PG9"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; @@ -323,28 +320,24 @@ mmc2_8bit_pins: mmc2_8bit { pwm0_pins: pwm0 { allwinner,pins = "PH0"; allwinner,function = "pwm0"; - allwinner,drive = ; allwinner,pull = ; }; i2c0_pins_a: i2c0@0 { allwinner,pins = "PH2", "PH3"; allwinner,function = "i2c0"; - allwinner,drive = ; allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PH4", "PH5"; allwinner,function = "i2c1"; - allwinner,drive = ; allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PE12", "PE13"; allwinner,function = "i2c2"; - allwinner,drive = ; allwinner,pull = ; }; @@ -354,7 +347,6 @@ lcd_rgb666_pins: lcd-rgb666@0 { "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; allwinner,function = "lcd0"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -596,7 +588,6 @@ r_rsb_pins: r_rsb { r_uart_pins_a: r_uart@0 { allwinner,pins = "PL2", "PL3"; allwinner,function = "s_uart"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts index 610786e635fa..490a5a6da50f 100644 --- a/arch/arm/boot/dts/sun8i-a23-evb.dts +++ b/arch/arm/boot/dts/sun8i-a23-evb.dts @@ -117,7 +117,6 @@ &pio { mmc0_cd_pin_evb: mmc0_cd_pin@0 { allwinner,pins = "PB4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts index 21bb291b9568..edd2a9b2307d 100644 --- 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,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts index 9955f85f9147..abcd94ea5e86 100644 --- 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,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts index 9ea637e82b2d..7eaf610eabd7 100644 --- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts +++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts @@ -94,21 +94,18 @@ &pio { led_pin_olinuxino: led_pins@0 { allwinner,pins = "PB7"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { allwinner,pins = "PB4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PB3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts index 71bb9418c5f9..df58dfb442cc 100644 --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts @@ -128,7 +128,6 @@ &pio { mmc0_cd_pin_sina33: mmc0_cd_pin@0 { allwinner,pins = "PB4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index fd1e1cddd4a8..e60c4c8c6976 100644 --- 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,drive = ; allwinner,pull = ; }; diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi index d3473f81b12f..c03d7f4cac83 100644 --- a/arch/arm/boot/dts/sun8i-a83t.dtsi +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi @@ -177,14 +177,12 @@ mmc0_pins_a: mmc0@0 { uart0_pins_a: uart0@0 { allwinner,pins = "PF2", "PF4"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart0_pins_b: uart0@1 { allwinner,pins = "PB9", "PB10"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,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 06fddaae8edd..e02314a2d643 100644 --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts @@ -158,21 +158,18 @@ &r_pio { pwr_led_bpi_m2p: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; sw_r_bpi_m2p: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; wifi_en_bpi_m2p: wifi_en_pin { allwinner,pins = "PL7"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi index 8038aa29a5a7..a993725c59fe 100644 --- 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,drive = ; allwinner,pull = ; }; }; @@ -121,14 +120,12 @@ &r_pio { leds_r_npi: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; sw_r_npi: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts index e5bcaba3e87f..e44af3446514 100644 --- 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,drive = ; allwinner,pull = ; }; }; @@ -156,21 +155,18 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3", "PL4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 { allwinner,pins = "PL7"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts index 1550fee1ec68..ce5b1086b580 100644 --- 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,drive = ; allwinner,pull = ; }; }; @@ -154,14 +153,12 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts index 5c9b5bfa5c21..fbdd239175d4 100644 --- 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,drive = ; allwinner,pull = ; }; }; @@ -121,14 +120,12 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts index 3ec971285aa3..638720c3d04e 100644 --- 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,drive = ; allwinner,pull = ; }; }; @@ -143,14 +142,12 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts index bb585918cf54..1236583caf64 100644 --- 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,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi index 6c14a6f72820..5483ba8932b0 100644 --- a/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/sun8i-h3.dtsi @@ -331,21 +331,18 @@ pio: pinctrl@01c20800 { i2c0_pins: i2c0 { allwinner,pins = "PA11", "PA12"; allwinner,function = "i2c0"; - allwinner,drive = ; allwinner,pull = ; }; i2c1_pins: i2c1 { allwinner,pins = "PA18", "PA19"; allwinner,function = "i2c1"; - allwinner,drive = ; allwinner,pull = ; }; i2c2_pins: i2c2 { allwinner,pins = "PE12", "PE13"; allwinner,function = "i2c2"; - allwinner,drive = ; allwinner,pull = ; }; @@ -360,7 +357,6 @@ mmc0_pins_a: mmc0@0 { mmc0_cd_pin: mmc0_cd_pin@0 { allwinner,pins = "PF6"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; @@ -385,49 +381,42 @@ mmc2_8bit_pins: mmc2_8bit { spi0_pins: spi0 { allwinner,pins = "PC0", "PC1", "PC2", "PC3"; allwinner,function = "spi0"; - allwinner,drive = ; allwinner,pull = ; }; spi1_pins: spi1 { allwinner,pins = "PA15", "PA16", "PA14", "PA13"; allwinner,function = "spi1"; - allwinner,drive = ; allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PA4", "PA5"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart1_pins: uart1 { allwinner,pins = "PG6", "PG7"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; uart1_rts_cts_pins: uart1_rts_cts { allwinner,pins = "PG8", "PG9"; allwinner,function = "uart1"; - allwinner,drive = ; allwinner,pull = ; }; uart2_pins: uart2 { allwinner,pins = "PA0", "PA1"; allwinner,function = "uart2"; - allwinner,drive = ; allwinner,pull = ; }; uart3_pins: uart3 { allwinner,pins = "PA13", "PA14"; allwinner,function = "uart3"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -626,7 +615,6 @@ r_pio: pinctrl@01f02c00 { ir_pins_a: ir@0 { allwinner,pins = "PL11"; allwinner,function = "s_cir_rx"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi index 29f837a47771..0f680b7f5e03 100644 --- a/arch/arm/boot/dts/sun8i-q8-common.dtsi +++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi @@ -90,7 +90,6 @@ &r_pio { wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 { allwinner,pins = "PL6", "PL7", "PL11"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts index 47553e522982..6161ec441df5 100644 --- a/arch/arm/boot/dts/sun8i-r16-parrot.dts +++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts @@ -161,28 +161,24 @@ &pio { mmc0_cd_pin_parrot: mmc0_cd_pin@0 { allwinner,pins = "PD14"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; led_pins_parrot: led_pins@0 { allwinner,pins = "PE16", "PE17"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_det: usb0_id_detect_pin@0 { allwinner,pins = "PD10"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_parrot: usb1_vbus_pin@0 { allwinner,pins = "PD12"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -191,7 +187,6 @@ &r_pio { wifi_reset_pin_parrot: wifi_reset_pin@0 { allwinner,pins = "PL6"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi index 69bc0cd26ca7..5533a1ec895d 100644 --- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi @@ -96,28 +96,24 @@ &pio { bl_en_pin: bl_en_pin@0 { allwinner,pins = "PH6"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin: mmc0_cd_pin@0 { allwinner,pins = "PB4"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; ts_power_pin: ts_power_pin@0 { allwinner,pins = "PH1"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH8"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index 67b02fe7f11c..6a6695cfe7b3 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -135,14 +135,12 @@ &pio { led_pins_cubieboard4: led-pins@0 { allwinner,pins = "PH6", "PH17"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_cubieboard4: mmc0_cd_pin@0 { allwinner,pins = "PH18"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -155,7 +153,6 @@ &r_pio { wifi_en_pin_cubieboard4: wifi_en_pin@0 { allwinner,pins = "PL2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 7e036b2be762..99739a732241 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -185,28 +185,24 @@ &pio { led_pins_optimus: led-pins@0 { allwinner,pins = "PH0", "PH1"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; mmc0_cd_pin_optimus: mmc0_cd_pin@0 { allwinner,pins = "PH18"; allwinner,function = "gpio_in"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_optimus: usb1_vbus_pin@1 { allwinner,pins = "PH4"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb3_vbus_pin_optimus: usb3_vbus_pin@1 { allwinner,pins = "PH5"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -219,14 +215,12 @@ &r_pio { led_r_pins_optimus: led-pins@1 { allwinner,pins = "PM15"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; wifi_en_pin_optimus: wifi_en_pin@0 { allwinner,pins = "PL2"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 979ad1aacfb1..3a5e98fd5490 100644 --- 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,drive = ; allwinner,pull = ; }; @@ -722,14 +721,12 @@ mmc2_8bit_pins: mmc2_8bit { uart0_pins_a: uart0@0 { allwinner,pins = "PH12", "PH13"; allwinner,function = "uart0"; - allwinner,drive = ; allwinner,pull = ; }; uart4_pins_a: uart4@0 { allwinner,pins = "PG12", "PG13", "PG14", "PG15"; allwinner,function = "uart4"; - allwinner,drive = ; allwinner,pull = ; }; }; @@ -914,7 +911,6 @@ r_pio: pinctrl@08002c00 { r_ir_pins: r_ir { allwinner,pins = "PL6"; allwinner,function = "s_cir_rx"; - allwinner,drive = ; allwinner,pull = ; }; diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi index f1953b0c5059..7809e18d30bd 100644 --- a/arch/arm/boot/dts/sunxi-common-regulators.dtsi +++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi @@ -49,28 +49,24 @@ &pio { ahci_pwr_pin_a: ahci_pwr_pin@0 { allwinner,pins = "PB8"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { allwinner,pins = "PB9"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb1_vbus_pin_a: usb1_vbus_pin@0 { allwinner,pins = "PH6"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; usb2_vbus_pin_a: usb2_vbus_pin@0 { allwinner,pins = "PH3"; allwinner,function = "gpio_out"; - allwinner,drive = ; allwinner,pull = ; }; }; From 119c366aeae35e2322d3e31a7ac0d23679252777 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 23 Sep 2016 00:09:58 +0300 Subject: [PATCH 2/3] 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 Acked-by: Chen-Yu Tsai Reviewed-by: Linus Walleij --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 2 - arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 1 - .../boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 4 -- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 1 - arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 - arch/arm/boot/dts/sun4i-a10-inet1.dts | 2 - arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 2 - arch/arm/boot/dts/sun4i-a10-marsboard.dts | 1 - arch/arm/boot/dts/sun4i-a10-mk802.dts | 3 -- .../arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 2 - arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 - arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 1 - .../boot/dts/sun4i-a10-pov-protab2-ips9.dts | 3 -- arch/arm/boot/dts/sun4i-a10.dtsi | 24 ------------ arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 1 - arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 2 - arch/arm/boot/dts/sun5i-a10s-mk802.dts | 2 - .../boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 - arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 2 - arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 2 - arch/arm/boot/dts/sun5i-a10s.dtsi | 7 ---- arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 1 - .../boot/dts/sun5i-a13-olinuxino-micro.dts | 3 -- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 - arch/arm/boot/dts/sun5i-a13.dtsi | 3 -- arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 2 - arch/arm/boot/dts/sun5i-gr8-evb.dts | 4 -- arch/arm/boot/dts/sun5i-gr8.dtsi | 19 ---------- arch/arm/boot/dts/sun5i-r8-chip.dts | 3 -- .../dts/sun5i-reference-design-tablet.dtsi | 2 - arch/arm/boot/dts/sun5i.dtsi | 10 ----- arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 1 - arch/arm/boot/dts/sun6i-a31-colombus.dts | 1 - arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 2 - arch/arm/boot/dts/sun6i-a31-i7.dts | 2 - arch/arm/boot/dts/sun6i-a31-m9.dts | 2 - .../boot/dts/sun6i-a31-mele-a1000g-quad.dts | 2 - arch/arm/boot/dts/sun6i-a31.dtsi | 14 ------- arch/arm/boot/dts/sun6i-a31s-primo81.dts | 1 - arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 1 - .../boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 3 -- .../boot/dts/sun7i-a20-bananapi-m1-plus.dts | 3 -- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 2 - arch/arm/boot/dts/sun7i-a20-bananapro.dts | 5 --- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 1 - arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 6 --- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 4 -- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 4 -- arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 1 - arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 2 - arch/arm/boot/dts/sun7i-a20-m3.dts | 1 - arch/arm/boot/dts/sun7i-a20-mk808c.dts | 2 - .../arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 4 -- .../arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 2 - .../dts/sun7i-a20-olinuxino-lime2-emmc.dts | 1 - .../boot/dts/sun7i-a20-olinuxino-lime2.dts | 3 -- .../boot/dts/sun7i-a20-olinuxino-micro.dts | 1 - arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 4 -- arch/arm/boot/dts/sun7i-a20-orangepi.dts | 4 -- arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 3 -- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 2 - .../arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 3 -- .../boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 1 - arch/arm/boot/dts/sun7i-a20.dtsi | 37 ------------------- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 12 ------ .../dts/sun8i-a23-polaroid-mid2407pxe03.dts | 1 - .../dts/sun8i-a23-polaroid-mid2809pxe04.dts | 1 - .../arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 1 - arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 3 -- arch/arm/boot/dts/sun8i-a33.dtsi | 1 - arch/arm/boot/dts/sun8i-a83t.dtsi | 3 -- .../boot/dts/sun8i-h3-bananapi-m2-plus.dts | 3 -- arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 4 -- arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 3 -- arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 1 - arch/arm/boot/dts/sun8i-h3.dtsi | 14 ------- arch/arm/boot/dts/sun8i-r16-parrot.dts | 3 -- .../dts/sun8i-reference-design-tablet.dtsi | 2 - arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 - arch/arm/boot/dts/sun9i-a80-optimus.dts | 5 --- arch/arm/boot/dts/sun9i-a80.dtsi | 7 ---- .../arm/boot/dts/sunxi-common-regulators.dtsi | 4 -- 85 files changed, 321 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index 035395a32212..4d8164afc671 100644 --- 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 = ; }; led_pins_a1000: led_pins@0 { allwinner,pins = "PH10", "PH20"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index f11dcd82f468..e7188d2fb303 100644 --- 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 = ; - allwinner,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 e01bdd1f1b2b..b4b829d6008d 100644 --- 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 = ; }; codec_pa_pin: codec_pa_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; motor_pins: motor_pins@0 { allwinner,pins = "PB3"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; touchscreen_pins: touchscreen_pins@0 { allwinner,pins = "PB13"; allwinner,function = "gpio_out"; - allwinner,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 fbd02c7a5d43..57496a38b94a 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 9b8134cb968d..de10ae48c6f6 100644 --- 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 = ; }; usb2_vbus_pin_hackberry: usb2_vbus_pin@0 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index bb64e466c4e0..f78c17a9a298 100644 --- 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 = ; }; touchscreen_wake_pin: touchscreen_wake_pin@0 { allwinner,pins = "PB13"; allwinner,function = "gpio_out"; - allwinner,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 65273bc7998c..e6ffaefed42d 100644 --- 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 = ; }; led_pins_q5: led_pins@0 { allwinner,pins = "PH20"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts index c5916125bea8..001656eb9171 100644 --- 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 = ; }; 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 204e2b68d09f..9ce39f75188e 100644 --- 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 = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; usb2_vbus_pin_mk802: usb2_vbus_pin@0 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index e8e14a53b764..203d399f0f7b 100644 --- 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 = ; }; led_pins_olinuxinolime: led_pins@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; allwinner,drive = ; - allwinner,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 7e94334420af..94cdef53ac11 100644 --- 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 = ; }; key_pins_pcduino: key_pins@0 { allwinner,pins = "PH17", "PH18", "PH19"; allwinner,function = "gpio_in"; - allwinner,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 05de4050a831..9656ec9b51ae 100644 --- 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 = ; }; }; 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 459c7a2dbee7..9dedd808bde8 100644 --- 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 = ; }; codec_pa_pin: codec_pa_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; touchscreen_pins: touchscreen_pins@0 { allwinner,pins = "PA5", "PB13"; allwinner,function = "gpio_out"; - allwinner,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 c09e29592b56..bafedf74f434 100644 --- 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 = ; }; i2c0_pins_a: i2c0@0 { allwinner,pins = "PB0", "PB1"; allwinner,function = "i2c0"; - allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB18", "PB19"; allwinner,function = "i2c1"; - allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB20", "PB21"; allwinner,function = "i2c2"; - allwinner,pull = ; }; ir0_rx_pins_a: ir0@0 { allwinner,pins = "PB4"; allwinner,function = "ir0"; - allwinner,pull = ; }; ir0_tx_pins_a: ir0@1 { allwinner,pins = "PB3"; allwinner,function = "ir0"; - allwinner,pull = ; }; ir1_rx_pins_a: ir1@0 { allwinner,pins = "PB23"; allwinner,function = "ir1"; - allwinner,pull = ; }; ir1_tx_pins_a: ir1@1 { allwinner,pins = "PB22"; allwinner,function = "ir1"; - allwinner,pull = ; }; mmc0_pins_a: mmc0@0 { @@ -1031,7 +1023,6 @@ mmc0_pins_a: mmc0@0 { "PF3", "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,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 = ; }; ps21_pins_a: ps21@0 { allwinner,pins = "PH12", "PH13"; allwinner,function = "ps2"; - allwinner,pull = ; }; pwm0_pins_a: pwm0@0 { allwinner,pins = "PB2"; allwinner,function = "pwm"; - allwinner,pull = ; }; pwm1_pins_a: pwm1@0 { allwinner,pins = "PI3"; allwinner,function = "pwm"; - allwinner,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 = ; }; spi0_cs0_pins_a: spi0_cs0@0 { allwinner,pins = "PI10"; allwinner,function = "spi0"; - allwinner,pull = ; }; spi1_pins_a: spi1@0 { allwinner,pins = "PI17", "PI18", "PI19"; allwinner,function = "spi1"; - allwinner,pull = ; }; spi1_cs0_pins_a: spi1_cs0@0 { allwinner,pins = "PI16"; allwinner,function = "spi1"; - allwinner,pull = ; }; spi2_pins_a: spi2@0 { allwinner,pins = "PC20", "PC21", "PC22"; allwinner,function = "spi2"; - allwinner,pull = ; }; spi2_pins_b: spi2@1 { allwinner,pins = "PB15", "PB16", "PB17"; allwinner,function = "spi2"; - allwinner,pull = ; }; spi2_cs0_pins_a: spi2_cs0@0 { allwinner,pins = "PC19"; allwinner,function = "spi2"; - allwinner,pull = ; }; spi2_cs0_pins_b: spi2_cs0@1 { allwinner,pins = "PB14"; allwinner,function = "spi2"; - allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PB22", "PB23"; allwinner,function = "uart0"; - allwinner,pull = ; }; uart0_pins_b: uart0@1 { allwinner,pins = "PF2", "PF4"; allwinner,function = "uart0"; - allwinner,pull = ; }; uart1_pins_a: uart1@0 { allwinner,pins = "PA10", "PA11"; allwinner,function = "uart1"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts index 813e18c011da..8d1e414c0a3a 100644 --- 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 = ; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts index 3c79e3536521..e3438a685c71 100644 --- 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 = ; }; led_pins_t004: led_pins@0 { allwinner,pins = "PB2"; allwinner,function = "gpio_out"; allwinner,drive = ; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts index 940139145fd5..405c1d519301 100644 --- 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 = ; }; 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts index c1250c1baf02..7c77183924f1 100644 --- 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 = ; - allwinner,pull = ; }; usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 { allwinner,pins = "PB10"; allwinner,function = "gpio_out"; - allwinner,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 84a3bf817c3b..e2dceda4889b 100644 --- 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 = ; - allwinner,pull = ; }; usb1_vbus_pin_r7: usb1_vbus_pin@0 { allwinner,pins = "PG13"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts index 56a6982773a9..f40451bffb84 100644 --- 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 = ; }; 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index b4755e7a0b23..ef1e2ab103d7 100644 --- 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 = ; }; uart2_pins_a: uart2@0 { allwinner,pins = "PC18", "PC19"; allwinner,function = "uart2"; - allwinner,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 = ; }; 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 = ; }; mmc1_pins_a: mmc1@0 { @@ -236,19 +232,16 @@ mmc1_pins_a: mmc1@0 { "PG6", "PG7", "PG8"; allwinner,function = "mmc1"; allwinner,drive = ; - allwinner,pull = ; }; spi2_pins_b: spi2@1 { allwinner,pins = "PB12", "PB13", "PB14"; allwinner,function = "spi2"; - allwinner,pull = ; }; spi2_cs0_pins_b: spi2_cs0@1 { allwinner,pins = "PB11"; allwinner,function = "spi2"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts index aa4484ac50b2..f5d1a04f3a16 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts index 8aec90ac28a4..df9315e5c850 100644 --- 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 = ; - allwinner,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 = ; }; usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 { allwinner,pins = "PG11"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts index 95ea10b98c7f..b9179b36f608 100644 --- 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 = ; - allwinner,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 = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index d79db1525448..1f4c5f773226 100644 --- 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 = ; }; uart1_pins_a: uart1@0 { allwinner,pins = "PE10", "PE11"; allwinner,function = "uart1"; - allwinner,pull = ; }; uart1_pins_b: uart1@1 { allwinner,pins = "PG3", "PG4"; allwinner,function = "uart1"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts index a227aeeae9d6..e29e708e9faf 100644 --- 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 = ; }; wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 { allwinner,pins = "PB10"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts index 4d7386f13804..af5bf886a4d5 100644 --- 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 = ; }; usb0_id_pin_gr8_evb: usb0-id-pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 { allwinner,pins = "PG1"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 { allwinner,pins = "PG13"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi index 761b1857280d..5a03453c397b 100644 --- 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 = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB15", "PB16"; allwinner,function = "i2c1"; - allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB17", "PB18"; allwinner,function = "i2c2"; - allwinner,pull = ; }; i2s0_data_pins_a: i2s0-data@0 { allwinner,pins = "PB6", "PB7", "PB8", "PB9"; allwinner,function = "i2s0"; - allwinner,pull = ; }; i2s0_mclk_pins_a: i2s0-mclk@0 { allwinner,pins = "PB5"; allwinner,function = "i2s0"; - allwinner,pull = ; }; ir0_rx_pins_a: ir0@0 { allwinner,pins = "PB4"; allwinner,function = "ir0"; - allwinner,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 = ; }; mmc0_pins_a: mmc0@0 { @@ -813,7 +806,6 @@ mmc0_pins_a: mmc0@0 { "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,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 = ; }; nand_cs0_pins_a: nand-cs@0 { allwinner,pins = "PC4"; allwinner,function = "nand0"; - allwinner,pull = ; }; nand_rb0_pins_a: nand-rb@0 { allwinner,pins = "PC6"; allwinner,function = "nand0"; - allwinner,pull = ; }; pwm0_pins_a: pwm0@0 { allwinner,pins = "PB2"; allwinner,function = "pwm0"; - allwinner,pull = ; }; pwm1_pins: pwm1 { allwinner,pins = "PG13"; allwinner,function = "pwm1"; - allwinner,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 = ; }; uart1_cts_rts_pins_a: uart1-cts-rts@0 { allwinner,pins = "PG5", "PG6"; allwinner,function = "uart1"; - allwinner,pull = ; }; uart2_pins_a: uart2@1 { allwinner,pins = "PD2", "PD3"; allwinner,function = "uart2"; - allwinner,pull = ; }; uart2_cts_rts_pins_a: uart2-cts-rts@0 { allwinner,pins = "PD4", "PD5"; allwinner,function = "uart2"; - allwinner,pull = ; }; uart3_pins_a: uart3@1 { allwinner,pins = "PG9", "PG10"; allwinner,function = "uart3"; - allwinner,pull = ; }; uart3_cts_rts_pins_a: uart3-cts-rts@0 { allwinner,pins = "PG11", "PG12"; allwinner,function = "uart3"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts index a1c27c89724a..702a0d2ddb77 100644 --- 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 = ; }; chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 { allwinner,pins = "PC19"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; chip_id_det_pin: chip_id_det_pin@0 { allwinner,pins = "PG2"; allwinner,function = "gpio_in"; - allwinner,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 9d8b8236c512..0f2e539e540b 100644 --- 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 = ; }; 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index dd9536a85286..40d0cf5d560a 100644 --- 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 = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB15", "PB16"; allwinner,function = "i2c1"; - allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB17", "PB18"; allwinner,function = "i2c2"; - allwinner,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 = ; }; mmc0_pins_a: mmc0@0 { @@ -586,7 +582,6 @@ mmc0_pins_a: mmc0@0 { "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,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 = ; }; spi2_cs0_pins_a: spi2-cs0@0 { allwinner,pins = "PE0"; allwinner,function = "spi2"; - allwinner,pull = ; }; uart3_pins_a: uart3@0 { allwinner,pins = "PG9", "PG10"; allwinner,function = "uart3"; - allwinner,pull = ; }; uart3_pins_cts_rts_a: uart3-cts-rts@0 { allwinner,pins = "PG11", "PG12"; allwinner,function = "uart3"; - allwinner,pull = ; }; pwm0_pins: pwm0 { allwinner,pins = "PB2"; allwinner,function = "pwm"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts index e723dedeb614..cbc99ce6ab1a 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index 4057e91c7cb5..24909c8c1186 100644 --- 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 = ; }; 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 8afef1293ac6..2d3782edd770 100644 --- 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 = ; }; 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts index a2d6a92dac29..61e3ef4528ec 100644 --- 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 = ; }; 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts index 0ae5ab2f06fa..96ad1fe9bbc8 100644 --- 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 = ; }; 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 = ; }; }; 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 a551673aca68..a29ea186b964 100644 --- 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 = ; }; 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index c14cde4cd75d..ee153a2c9e57 100644 --- 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 = ; - allwinner,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 = ; }; 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 = ; - allwinner,pull = ; }; i2c0_pins_a: i2c0@0 { allwinner,pins = "PH14", "PH15"; allwinner,function = "i2c0"; - allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PH16", "PH17"; allwinner,function = "i2c1"; - allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PH18", "PH19"; allwinner,function = "i2c2"; - allwinner,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 = ; }; mmc0_pins_a: mmc0@0 { @@ -554,7 +547,6 @@ mmc0_pins_a: mmc0@0 { "PF3", "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,pull = ; }; mmc1_pins_a: mmc1@0 { @@ -562,7 +554,6 @@ mmc1_pins_a: mmc1@0 { "PG4", "PG5"; allwinner,function = "mmc1"; allwinner,drive = ; - allwinner,pull = ; }; mmc2_pins_a: mmc2@0 { @@ -580,7 +571,6 @@ mmc2_8bit_emmc_pins: mmc2@1 { "PC24"; allwinner,function = "mmc2"; allwinner,drive = ; - allwinner,pull = ; }; mmc3_8bit_emmc_pins: mmc3@1 { @@ -590,13 +580,11 @@ mmc3_8bit_emmc_pins: mmc3@1 { "PC24"; allwinner,function = "mmc3"; allwinner,drive = ; - allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PH20", "PH21"; allwinner,function = "uart0"; - allwinner,pull = ; }; }; @@ -1071,13 +1059,11 @@ r_pio: pinctrl@01f02c00 { ir_pins_a: ir@0 { allwinner,pins = "PL4"; allwinner,function = "s_ir"; - allwinner,pull = ; }; p2wi_pins: p2wi { allwinner,pins = "PL0", "PL1"; allwinner,function = "s_p2wi"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts index 4332cde8d6ca..f511aa0e250d 100644 --- 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 = ; }; 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 e9ec179511a0..f7b681ef0e8b 100644 --- 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 = ; }; 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 83e47a1c93bd..3731cf22abc1 100644 --- 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 = ; }; led_pins_bpi_m2: led_pins@0 { allwinner,pins = "PG5", "PG10", "PG11"; allwinner,function = "gpio_out"; - allwinner,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 = ; }; }; 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 83f651d13bb0..aa9a1ff89a9d 100644 --- 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 = ; }; led_pins_bpi_m1p: led_pins@0 { allwinner,pins = "PH24", "PH25"; allwinner,function = "gpio_out"; - allwinner,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 = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts index 158ab889dce7..7cd6a74d104c 100644 --- 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 = ; }; led_pins_bananapi: led_pins@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts index 4aaf137376de..366636451e7e 100644 --- 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 = ; }; led_pins_bananapro: led_pins@0 { allwinner,pins = "PH24", "PG2"; allwinner,function = "gpio_out"; - allwinner,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 = ; }; usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { allwinner,pins = "PH1"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; vmmc3_pin_bananapro: vmmc3_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index 42779aeb7297..e635dd6ac47d 100644 --- 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 = ; }; 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 a0b7ffb6196d..be8fa4879453 100644 --- 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 = ; }; led_pins_cubietruck: led_pins@0 { allwinner,pins = "PH7", "PH11", "PH20", "PH21"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 { allwinner,pins = "PH9"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { allwinner,pins = "PH17"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH19"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH22"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts index 714a463e24ed..6719c701a45f 100644 --- 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 = ; }; usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin@0 { allwinner,pins = "PH9"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin@0 { allwinner,pins = "PH16"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts index 4d1e102ea4b9..d64c11134dd7 100644 --- 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 = ; }; vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 { allwinner,pins = "PH12"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; gmac_power_pin_i12_tvbox: gmac_power_pin@0 { allwinner,pins = "PH21"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; led_pins_i12_tvbox: led_pins@0 { allwinner,pins = "PH9", "PH20"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts index 10d48cbf81ff..44f09642c893 100644 --- 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 = ; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts index 57c05e69d012..79cee00a85de 100644 --- 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 = ; }; led_pins_lamobo_r1: led_pins@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts index cfaa5b45b159..97ce27da445f 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts index edd397d796be..c5890617382c 100644 --- 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 = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,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 7d43526c2e58..1ba112ccbb46 100644 --- 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 = ; }; led_pins_olimex_som_evb: led_pins@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; allwinner,drive = ; - allwinner,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 = ; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { allwinner,pins = "PH5"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts index 632ad580e09f..21946497789e 100644 --- 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 = ; }; led_pins_olinuxinolime: led_pins@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; allwinner,drive = ; - allwinner,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 a64c2b3a1125..6858d6aafea3 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index b47b67765aec..3dcd745126a9 100644 --- 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 = ; }; led_pins_olinuxinolime: led_pins@0 { allwinner,pins = "PH2"; allwinner,function = "gpio_out"; allwinner,drive = ; - allwinner,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 = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index 2dddbf148d8e..3773926df96e 100644 --- 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 = ; - allwinner,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 69ad2345613f..8e05256f7c1b 100644 --- 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 = ; }; gmac_power_pin_orangepi: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; led_pins_orangepi: led_pins@0 { allwinner,pins = "PH24", "PH25"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { allwinner,pins = "PH26"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts index d6608ed6cdf3..d168b8f08e30 100644 --- 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 = ; }; gmac_power_pin_orangepi: gmac_power_pin@0 { allwinner,pins = "PH23"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; led_pins_orangepi: led_pins@0 { allwinner,pins = "PH24"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { allwinner,pins = "PH26"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts index 4a292a12616d..cdcbee74274e 100644 --- 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 = ; }; led_pins_pcduino3_nano: led_pins@0 { allwinner,pins = "PH16", "PH15"; allwinner,function = "gpio_out"; - allwinner,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 = ; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts index a416b3a47cee..fd2b4b8af9ea 100644 --- 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 = ; }; key_pins_pcduino3: key_pins@0 { allwinner,pins = "PH17", "PH18", "PH19"; allwinner,function = "gpio_in"; - allwinner,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 a10c4ccd741d..688f75ceab58 100644 --- 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 = ; }; codec_pa_pin: codec_pa_pin@0 { allwinner,pins = "PH15"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; ts_reset_pin: ts_reset_pin@0 { allwinner,pins = "PB13"; allwinner,function = "gpio_out"; - allwinner,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 87901259582b..b12493350ee3 100644 --- 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 = ; }; 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 e7cfc193ce63..ce16a8ca6db4 100644 --- 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 = ; }; clk_out_b_pins_a: clk_out_b@0 { allwinner,pins = "PI13"; allwinner,function = "clk_out_b"; - allwinner,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 = ; }; 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 = ; }; 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 = ; - allwinner,pull = ; }; i2c0_pins_a: i2c0@0 { allwinner,pins = "PB0", "PB1"; allwinner,function = "i2c0"; - allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PB18", "PB19"; allwinner,function = "i2c1"; - allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PB20", "PB21"; allwinner,function = "i2c2"; - allwinner,pull = ; }; i2c3_pins_a: i2c3@0 { allwinner,pins = "PI0", "PI1"; allwinner,function = "i2c3"; - allwinner,pull = ; }; ir0_rx_pins_a: ir0@0 { allwinner,pins = "PB4"; allwinner,function = "ir0"; - allwinner,pull = ; }; ir0_tx_pins_a: ir0@1 { allwinner,pins = "PB3"; allwinner,function = "ir0"; - allwinner,pull = ; }; ir1_rx_pins_a: ir1@0 { allwinner,pins = "PB23"; allwinner,function = "ir1"; - allwinner,pull = ; }; ir1_tx_pins_a: ir1@1 { allwinner,pins = "PB22"; allwinner,function = "ir1"; - allwinner,pull = ; }; mmc0_pins_a: mmc0@0 { @@ -1192,7 +1179,6 @@ mmc0_pins_a: mmc0@0 { "PF3", "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,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 = ; - allwinner,pull = ; }; ps20_pins_a: ps20@0 { allwinner,pins = "PI20", "PI21"; allwinner,function = "ps2"; - allwinner,pull = ; }; ps21_pins_a: ps21@0 { allwinner,pins = "PH12", "PH13"; allwinner,function = "ps2"; - allwinner,pull = ; }; pwm0_pins_a: pwm0@0 { allwinner,pins = "PB2"; allwinner,function = "pwm"; - allwinner,pull = ; }; pwm1_pins_a: pwm1@0 { allwinner,pins = "PI3"; allwinner,function = "pwm"; - allwinner,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 = ; }; spi0_cs0_pins_a: spi0_cs0@0 { allwinner,pins = "PI10"; allwinner,function = "spi0"; - allwinner,pull = ; }; spi0_cs1_pins_a: spi0_cs1@0 { allwinner,pins = "PI14"; allwinner,function = "spi0"; - allwinner,pull = ; }; spi1_pins_a: spi1@0 { allwinner,pins = "PI17", "PI18", "PI19"; allwinner,function = "spi1"; - allwinner,pull = ; }; spi1_cs0_pins_a: spi1_cs0@0 { allwinner,pins = "PI16"; allwinner,function = "spi1"; - allwinner,pull = ; }; spi2_pins_a: spi2@0 { allwinner,pins = "PC20", "PC21", "PC22"; allwinner,function = "spi2"; - allwinner,pull = ; }; spi2_pins_b: spi2@1 { allwinner,pins = "PB15", "PB16", "PB17"; allwinner,function = "spi2"; - allwinner,pull = ; }; spi2_cs0_pins_a: spi2_cs0@0 { allwinner,pins = "PC19"; allwinner,function = "spi2"; - allwinner,pull = ; }; spi2_cs0_pins_b: spi2_cs0@1 { allwinner,pins = "PB14"; allwinner,function = "spi2"; - allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PB22", "PB23"; allwinner,function = "uart0"; - allwinner,pull = ; }; uart2_pins_a: uart2@0 { allwinner,pins = "PI16", "PI17", "PI18", "PI19"; allwinner,function = "uart2"; - allwinner,pull = ; }; uart3_pins_a: uart3@0 { allwinner,pins = "PG6", "PG7", "PG8", "PG9"; allwinner,function = "uart3"; - allwinner,pull = ; }; uart3_pins_b: uart3@1 { allwinner,pins = "PH0", "PH1"; allwinner,function = "uart3"; - allwinner,pull = ; }; uart4_pins_a: uart4@0 { allwinner,pins = "PG10", "PG11"; allwinner,function = "uart4"; - allwinner,pull = ; }; uart4_pins_b: uart4@1 { allwinner,pins = "PH4", "PH5"; allwinner,function = "uart4"; - allwinner,pull = ; }; uart5_pins_a: uart5@0 { allwinner,pins = "PI10", "PI11"; allwinner,function = "uart5"; - allwinner,pull = ; }; uart6_pins_a: uart6@0 { allwinner,pins = "PI12", "PI13"; allwinner,function = "uart6"; - allwinner,pull = ; }; uart7_pins_a: uart7@0 { allwinner,pins = "PI20", "PI21"; allwinner,function = "uart7"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index 36740909600a..0219da4099bd 100644 --- 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 = ; }; uart1_pins_a: uart1@0 { allwinner,pins = "PG6", "PG7"; allwinner,function = "uart1"; - allwinner,pull = ; }; uart1_pins_cts_rts_a: uart1-cts-rts@0 { allwinner,pins = "PG8", "PG9"; allwinner,function = "uart1"; - allwinner,pull = ; }; mmc0_pins_a: mmc0@0 { @@ -296,7 +293,6 @@ mmc0_pins_a: mmc0@0 { "PF3", "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,pull = ; }; mmc1_pins_a: mmc1@0 { @@ -304,7 +300,6 @@ mmc1_pins_a: mmc1@0 { "PG3", "PG4", "PG5"; allwinner,function = "mmc1"; allwinner,drive = ; - allwinner,pull = ; }; mmc2_8bit_pins: mmc2_8bit { @@ -314,31 +309,26 @@ mmc2_8bit_pins: mmc2_8bit { "PC15", "PC16"; allwinner,function = "mmc2"; allwinner,drive = ; - allwinner,pull = ; }; pwm0_pins: pwm0 { allwinner,pins = "PH0"; allwinner,function = "pwm0"; - allwinner,pull = ; }; i2c0_pins_a: i2c0@0 { allwinner,pins = "PH2", "PH3"; allwinner,function = "i2c0"; - allwinner,pull = ; }; i2c1_pins_a: i2c1@0 { allwinner,pins = "PH4", "PH5"; allwinner,function = "i2c1"; - allwinner,pull = ; }; i2c2_pins_a: i2c2@0 { allwinner,pins = "PE12", "PE13"; allwinner,function = "i2c2"; - allwinner,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 = ; }; }; @@ -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 = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts index edd2a9b2307d..8ed0bc3048b3 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts index abcd94ea5e86..e8367deaa587 100644 --- 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 = ; }; }; 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 fb4665576dff..442db91b943a 100644 --- 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 = ; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts index 7eaf610eabd7..59a64d2d695c 100644 --- 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 = ; }; mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { allwinner,pins = "PB4"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PB3"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index e60c4c8c6976..310a38cf7f18 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi index c03d7f4cac83..cec6bfc2d3c9 100644 --- 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 = ; - allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PF2", "PF4"; allwinner,function = "uart0"; - allwinner,pull = ; }; uart0_pins_b: uart0@1 { allwinner,pins = "PB9", "PB10"; allwinner,function = "uart0"; - allwinner,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 e02314a2d643..49194c38d56b 100644 --- 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 = ; }; sw_r_bpi_m2p: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; wifi_en_bpi_m2p: wifi_en_pin { allwinner,pins = "PL7"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi index a993725c59fe..52ed2249528d 100644 --- 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 = ; }; }; @@ -120,13 +119,11 @@ &r_pio { leds_r_npi: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; sw_r_npi: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts index e44af3446514..dfd9bc2008fd 100644 --- 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 = ; }; }; @@ -155,19 +154,16 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3", "PL4"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 { allwinner,pins = "PL7"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts index ce5b1086b580..77d29bae7739 100644 --- 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 = ; }; }; @@ -153,13 +152,11 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts index fbdd239175d4..49529d9ca26d 100644 --- 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 = ; }; }; @@ -120,13 +119,11 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts index 638720c3d04e..0d56d33d43ea 100644 --- 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 = ; }; }; @@ -142,13 +141,11 @@ &r_pio { leds_r_opc: led_pins@0 { allwinner,pins = "PL10"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; sw_r_opc: key_pins@0 { allwinner,pins = "PL3"; allwinner,function = "gpio_in"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts index 1236583caf64..ab8593d1d3df 100644 --- 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi index 5483ba8932b0..c3b5c516809c 100644 --- 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 = ; }; i2c1_pins: i2c1 { allwinner,pins = "PA18", "PA19"; allwinner,function = "i2c1"; - allwinner,pull = ; }; i2c2_pins: i2c2 { allwinner,pins = "PE12", "PE13"; allwinner,function = "i2c2"; - allwinner,pull = ; }; mmc0_pins_a: mmc0@0 { @@ -351,7 +348,6 @@ mmc0_pins_a: mmc0@0 { "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,pull = ; }; mmc0_cd_pin: mmc0_cd_pin@0 { @@ -365,7 +361,6 @@ mmc1_pins_a: mmc1@0 { "PG4", "PG5"; allwinner,function = "mmc1"; allwinner,drive = ; - allwinner,pull = ; }; mmc2_8bit_pins: mmc2_8bit { @@ -375,49 +370,41 @@ mmc2_8bit_pins: mmc2_8bit { "PC15", "PC16"; allwinner,function = "mmc2"; allwinner,drive = ; - allwinner,pull = ; }; spi0_pins: spi0 { allwinner,pins = "PC0", "PC1", "PC2", "PC3"; allwinner,function = "spi0"; - allwinner,pull = ; }; spi1_pins: spi1 { allwinner,pins = "PA15", "PA16", "PA14", "PA13"; allwinner,function = "spi1"; - allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PA4", "PA5"; allwinner,function = "uart0"; - allwinner,pull = ; }; uart1_pins: uart1 { allwinner,pins = "PG6", "PG7"; allwinner,function = "uart1"; - allwinner,pull = ; }; uart1_rts_cts_pins: uart1_rts_cts { allwinner,pins = "PG8", "PG9"; allwinner,function = "uart1"; - allwinner,pull = ; }; uart2_pins: uart2 { allwinner,pins = "PA0", "PA1"; allwinner,function = "uart2"; - allwinner,pull = ; }; uart3_pins: uart3 { allwinner,pins = "PA13", "PA14"; allwinner,function = "uart3"; - allwinner,pull = ; }; }; @@ -615,7 +602,6 @@ r_pio: pinctrl@01f02c00 { ir_pins_a: ir@0 { allwinner,pins = "PL11"; allwinner,function = "s_cir_rx"; - allwinner,pull = ; }; }; }; diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts index 6161ec441df5..0588fceb0636 100644 --- 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 = ; }; 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 = ; }; }; @@ -187,7 +185,6 @@ &r_pio { wifi_reset_pin_parrot: wifi_reset_pin@0 { allwinner,pins = "PL6"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi index 5533a1ec895d..7517faae54a4 100644 --- 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 = ; }; 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 = ; }; 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 6a6695cfe7b3..5ae52cb3d164 100644 --- 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 = ; }; 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 = ; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 99739a732241..dce94424fda6 100644 --- 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 = ; }; 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 = ; }; usb3_vbus_pin_optimus: usb3_vbus_pin@1 { allwinner,pins = "PH5"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; @@ -215,13 +212,11 @@ &r_pio { led_r_pins_optimus: led-pins@1 { allwinner,pins = "PM15"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; wifi_en_pin_optimus: wifi_en_pin@0 { allwinner,pins = "PL2"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 3a5e98fd5490..510b1462cb05 100644 --- 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 = ; }; mmc0_pins: mmc0 { @@ -697,7 +696,6 @@ mmc0_pins: mmc0 { "PF4", "PF5"; allwinner,function = "mmc0"; allwinner,drive = ; - allwinner,pull = ; }; mmc1_pins: mmc1 { @@ -705,7 +703,6 @@ mmc1_pins: mmc1 { "PG4", "PG5"; allwinner,function = "mmc1"; allwinner,drive = ; - allwinner,pull = ; }; mmc2_8bit_pins: mmc2_8bit { @@ -715,19 +712,16 @@ mmc2_8bit_pins: mmc2_8bit { "PC16"; allwinner,function = "mmc2"; allwinner,drive = ; - allwinner,pull = ; }; uart0_pins_a: uart0@0 { allwinner,pins = "PH12", "PH13"; allwinner,function = "uart0"; - allwinner,pull = ; }; uart4_pins_a: uart4@0 { allwinner,pins = "PG12", "PG13", "PG14", "PG15"; allwinner,function = "uart4"; - allwinner,pull = ; }; }; @@ -911,7 +905,6 @@ r_pio: pinctrl@08002c00 { r_ir_pins: r_ir { allwinner,pins = "PL6"; allwinner,function = "s_cir_rx"; - allwinner,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 7809e18d30bd..358b8d9b4703 100644 --- 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 = ; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { allwinner,pins = "PB9"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; usb1_vbus_pin_a: usb1_vbus_pin@0 { allwinner,pins = "PH6"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; usb2_vbus_pin_a: usb2_vbus_pin@0 { allwinner,pins = "PH3"; allwinner,function = "gpio_out"; - allwinner,pull = ; }; }; From 1edcd36fcb48fe841bcc62eda36c105037d9583c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 23 Sep 2016 14:28:10 +0300 Subject: [PATCH 3/3] ARM: sunxi: Convert pinctrl nodes to generic bindings Now that we can handle the generic pinctrl bindings, convert our DT to it. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai Reviewed-by: Linus Walleij --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 8 +- arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- .../boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 12 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 12 +- .../boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 28 +-- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 4 +- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 8 +- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 14 +- arch/arm/boot/dts/sun4i-a10-inet1.dts | 20 +- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 12 +- arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 26 +-- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 8 +- arch/arm/boot/dts/sun4i-a10-marsboard.dts | 10 +- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +- arch/arm/boot/dts/sun4i-a10-mk802.dts | 12 +- .../arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 22 +- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 14 +- arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 4 +- .../boot/dts/sun4i-a10-pov-protab2-ips9.dts | 24 +-- arch/arm/boot/dts/sun4i-a10.dtsi | 120 +++++------ arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 16 +- arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 24 +-- arch/arm/boot/dts/sun5i-a10s-mk802.dts | 14 +- .../boot/dts/sun5i-a10s-olinuxino-micro.dts | 30 +-- arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 16 +- arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 16 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 30 +-- .../dts/sun5i-a13-empire-electronix-d709.dts | 20 +- arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 18 +- .../boot/dts/sun5i-a13-olinuxino-micro.dts | 32 +-- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 30 +-- arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 10 +- arch/arm/boot/dts/sun5i-a13.dtsi | 18 +- arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 8 +- arch/arm/boot/dts/sun5i-gr8-evb.dts | 16 +- arch/arm/boot/dts/sun5i-gr8.dtsi | 84 ++++---- arch/arm/boot/dts/sun5i-r8-chip.dts | 20 +- .../dts/sun5i-reference-design-tablet.dtsi | 26 +-- arch/arm/boot/dts/sun5i.dtsi | 56 ++--- arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 4 +- arch/arm/boot/dts/sun6i-a31-colombus.dts | 18 +- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 18 +- arch/arm/boot/dts/sun6i-a31-i7.dts | 14 +- arch/arm/boot/dts/sun6i-a31-m9.dts | 14 +- .../boot/dts/sun6i-a31-mele-a1000g-quad.dts | 14 +- arch/arm/boot/dts/sun6i-a31.dtsi | 76 +++---- arch/arm/boot/dts/sun6i-a31s-primo81.dts | 16 +- arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 10 +- .../boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 22 +- .../sun6i-a31s-yones-toptech-bs1078-v2.dts | 8 +- .../dts/sun6i-reference-design-tablet.dtsi | 12 +- .../boot/dts/sun7i-a20-bananapi-m1-plus.dts | 20 +- arch/arm/boot/dts/sun7i-a20-bananapi.dts | 20 +- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 26 +-- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 10 +- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 26 +-- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 16 +- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 18 +- arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 6 +- arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 24 +-- arch/arm/boot/dts/sun7i-a20-m3.dts | 4 +- arch/arm/boot/dts/sun7i-a20-mk808c.dts | 8 +- .../arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 24 +-- .../arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 22 +- .../dts/sun7i-a20-olinuxino-lime2-emmc.dts | 4 +- .../boot/dts/sun7i-a20-olinuxino-lime2.dts | 26 +-- .../boot/dts/sun7i-a20-olinuxino-micro.dts | 24 +-- arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 34 +-- arch/arm/boot/dts/sun7i-a20-orangepi.dts | 28 +-- arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 18 +- arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 16 +- .../arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 18 +- .../boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 10 +- arch/arm/boot/dts/sun7i-a20.dtsi | 204 +++++++++--------- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 78 +++---- arch/arm/boot/dts/sun8i-a23-evb.dts | 6 +- .../dts/sun8i-a23-polaroid-mid2407pxe03.dts | 6 +- .../dts/sun8i-a23-polaroid-mid2809pxe04.dts | 6 +- .../arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 8 +- arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 12 +- .../arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 10 +- arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 16 +- .../boot/dts/sun8i-h3-bananapi-m2-plus.dts | 12 +- arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 12 +- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 18 +- arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 12 +- arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 12 +- .../boot/dts/sun8i-h3-orangepi-pc-plus.dts | 4 +- arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 12 +- arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 8 +- arch/arm/boot/dts/sun8i-h3.dtsi | 78 +++---- arch/arm/boot/dts/sun8i-q8-common.dtsi | 8 +- arch/arm/boot/dts/sun8i-r16-parrot.dts | 28 +-- .../dts/sun8i-reference-design-tablet.dtsi | 20 +- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 18 +- arch/arm/boot/dts/sun9i-a80-optimus.dts | 30 +-- arch/arm/boot/dts/sun9i-a80.dtsi | 50 ++--- .../arm/boot/dts/sunxi-common-regulators.dtsi | 16 +- 99 files changed, 1081 insertions(+), 1081 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index 4d8164afc671..68c6bdb2cf7c 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -186,13 +186,13 @@ &ohci1 { &pio { emac_power_pin_a1000: emac_power_pin@0 { - allwinner,pins = "PH15"; - allwinner,function = "gpio_out"; + pins = "PH15"; + function = "gpio_out"; }; led_pins_a1000: led_pins@0 { - allwinner,pins = "PH10", "PH20"; - allwinner,function = "gpio_out"; + pins = "PH10", "PH20"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts index 5f98582232d6..942d739a4384 100644 --- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts +++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts @@ -127,7 +127,7 @@ &otg_sram { &pio { usb2_vbus_pin_a: usb2_vbus_pin@0 { - allwinner,pins = "PH12"; + pins = "PH12"; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts index e9d839bc8562..17f8c5ec011c 100644 --- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts +++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts @@ -142,15 +142,15 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index e7188d2fb303..04e040e6233d 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -165,15 +165,15 @@ &otg_sram { &pio { led_pins_cubieboard: led_pins@0 { - allwinner,pins = "PH20", "PH21"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PH20", "PH21"; + function = "gpio_out"; + drive-strength = <20>; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts index b4b829d6008d..8317fbfeec4a 100644 --- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts +++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts @@ -178,35 +178,35 @@ &otg_sram { &pio { bl_en_pin_dsrv9703c: bl_en_pin@0 { - allwinner,pins = "PH7"; - allwinner,function = "gpio_out"; + pins = "PH7"; + function = "gpio_out"; }; codec_pa_pin: codec_pa_pin@0 { - allwinner,pins = "PH15"; - allwinner,function = "gpio_out"; + pins = "PH15"; + function = "gpio_out"; }; motor_pins: motor_pins@0 { - allwinner,pins = "PB3"; - allwinner,function = "gpio_out"; + pins = "PB3"; + function = "gpio_out"; }; touchscreen_pins: touchscreen_pins@0 { - allwinner,pins = "PB13"; - allwinner,function = "gpio_out"; + pins = "PB13"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts index 57496a38b94a..9616cdecce93 100644 --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts @@ -156,8 +156,8 @@ &mmc0 { &pio { codec_pa_pin: codec_pa_pin@0 { - allwinner,pins = "PH15"; - allwinner,function = "gpio_out"; + pins = "PH15"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index de10ae48c6f6..a48b46474417 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -129,13 +129,13 @@ &pio { pinctrl-0 = <&hackberry_hogs>; hackberry_hogs: hogs@0 { - allwinner,pins = "PH19"; - allwinner,function = "gpio_out"; + pins = "PH19"; + function = "gpio_out"; }; usb2_vbus_pin_hackberry: usb2_vbus_pin@0 { - allwinner,pins = "PH12"; - allwinner,function = "gpio_out"; + pins = "PH12"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts index f3f8b90fb9c8..85dcf81ab64e 100644 --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts @@ -93,15 +93,15 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; @@ -121,7 +121,7 @@ &uart0 { }; &usb2_vbus_pin_a { - allwinner,pins = "PH6"; + pins = "PH6"; }; &usb_otg { diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts index f78c17a9a298..f3092703a1a6 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet1.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts @@ -180,25 +180,25 @@ &otg_sram { &pio { bl_en_pin_inet: bl_en_pin@0 { - allwinner,pins = "PH7"; - allwinner,function = "gpio_out"; + pins = "PH7"; + function = "gpio_out"; }; touchscreen_wake_pin: touchscreen_wake_pin@0 { - allwinner,pins = "PB13"; - allwinner,function = "gpio_out"; + pins = "PB13"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index 5ba4cd4b2aca..a1a2bbb3f9d3 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts @@ -161,15 +161,15 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts index 5ea154f08364..4ef2a60a8cd4 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts @@ -320,25 +320,25 @@ &otg_sram { &pio { key_pins_inet9f: key_pins@0 { - allwinner,pins = "PA0", "PA1", "PA3", "PA4", - "PA5", "PA6", "PA8", "PA9", - "PA11", "PA12", "PA13", - "PA14", "PA15", "PA16", "PA17", - "PH22", "PH23", "PH24", "PH25", "PH26"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA0", "PA1", "PA3", "PA4", + "PA5", "PA6", "PA8", "PA9", + "PA11", "PA12", "PA13", + "PA14", "PA15", "PA16", "PA17", + "PH22", "PH23", "PH24", "PH25", "PH26"; + function = "gpio_in"; + bias-pull-up; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts index e6ffaefed42d..fc4d4d49e2e2 100644 --- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts +++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts @@ -163,13 +163,13 @@ &otg_sram { &pio { emac_power_pin_q5: emac_power_pin@0 { - allwinner,pins = "PH19"; - allwinner,function = "gpio_out"; + pins = "PH19"; + function = "gpio_out"; }; led_pins_q5: led_pins@0 { - allwinner,pins = "PH20"; - allwinner,function = "gpio_out"; + pins = "PH20"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts index 001656eb9171..a2885039d5f1 100644 --- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts @@ -164,14 +164,14 @@ &otg_sram { &pio { led_pins_marsboard: led_pins@0 { - allwinner,pins = "PB5", "PB6", "PB7", "PB8"; - allwinner,function = "gpio_out"; + pins = "PB5", "PB6", "PB7", "PB8"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts index a7dd86d30fa2..af42ebb3a97b 100644 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts @@ -93,7 +93,7 @@ &ir0 { &ir0_rx_pins_a { /* The ir receiver is not always populated */ - allwinner,pull = ; + bias-pull-up; }; &mmc0 { diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts index 9ce39f75188e..9c1afd4277d7 100644 --- a/arch/arm/boot/dts/sun4i-a10-mk802.dts +++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts @@ -91,18 +91,18 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; + pins = "PH4"; + function = "gpio_in"; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; + pins = "PH5"; + function = "gpio_in"; }; usb2_vbus_pin_mk802: usb2_vbus_pin@0 { - allwinner,pins = "PH12"; - allwinner,function = "gpio_out"; + pins = "PH12"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index 203d399f0f7b..214a5accfe93 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts @@ -168,26 +168,26 @@ &otg_sram { &pio { ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { - allwinner,pins = "PC3"; - allwinner,function = "gpio_out"; + pins = "PC3"; + function = "gpio_out"; }; led_pins_olinuxinolime: led_pins@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PH2"; + function = "gpio_out"; + drive-strength = <20>; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index 94cdef53ac11..b0365d63ba70 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts @@ -170,19 +170,19 @@ &otg_sram { &pio { led_pins_pcduino: led_pins@0 { - allwinner,pins = "PH15", "PH16"; - allwinner,function = "gpio_out"; + pins = "PH15", "PH16"; + function = "gpio_out"; }; key_pins_pcduino: key_pins@0 { - allwinner,pins = "PH17", "PH18", "PH19"; - allwinner,function = "gpio_in"; + pins = "PH17", "PH18", "PH19"; + function = "gpio_in"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts index 9656ec9b51ae..811d00ee2ade 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino2.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino2.dts @@ -57,8 +57,8 @@ / { &pio { usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 { - allwinner,pins = "PD2"; - allwinner,function = "gpio_out"; + pins = "PD2"; + function = "gpio_out"; }; }; 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 9dedd808bde8..bfa6bbdaab27 100644 --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts @@ -164,30 +164,30 @@ &otg_sram { &pio { bl_en_pin_protab: bl_en_pin@0 { - allwinner,pins = "PH7"; - allwinner,function = "gpio_out"; + pins = "PH7"; + function = "gpio_out"; }; codec_pa_pin: codec_pa_pin@0 { - allwinner,pins = "PH15"; - allwinner,function = "gpio_out"; + pins = "PH15"; + function = "gpio_out"; }; touchscreen_pins: touchscreen_pins@0 { - allwinner,pins = "PA5", "PB13"; - allwinner,function = "gpio_out"; + pins = "PA5", "PB13"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index bafedf74f434..dae838e4dd9e 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -975,141 +975,141 @@ pio: pinctrl@01c20800 { #gpio-cells = <3>; emac_pins_a: emac0@0 { - allwinner,pins = "PA0", "PA1", "PA2", - "PA3", "PA4", "PA5", "PA6", - "PA7", "PA8", "PA9", "PA10", - "PA11", "PA12", "PA13", "PA14", - "PA15", "PA16"; - allwinner,function = "emac"; + pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16"; + function = "emac"; }; i2c0_pins_a: i2c0@0 { - allwinner,pins = "PB0", "PB1"; - allwinner,function = "i2c0"; + pins = "PB0", "PB1"; + function = "i2c0"; }; i2c1_pins_a: i2c1@0 { - allwinner,pins = "PB18", "PB19"; - allwinner,function = "i2c1"; + pins = "PB18", "PB19"; + function = "i2c1"; }; i2c2_pins_a: i2c2@0 { - allwinner,pins = "PB20", "PB21"; - allwinner,function = "i2c2"; + pins = "PB20", "PB21"; + function = "i2c2"; }; ir0_rx_pins_a: ir0@0 { - allwinner,pins = "PB4"; - allwinner,function = "ir0"; + pins = "PB4"; + function = "ir0"; }; ir0_tx_pins_a: ir0@1 { - allwinner,pins = "PB3"; - allwinner,function = "ir0"; + pins = "PB3"; + function = "ir0"; }; ir1_rx_pins_a: ir1@0 { - allwinner,pins = "PB23"; - allwinner,function = "ir1"; + pins = "PB23"; + function = "ir1"; }; ir1_tx_pins_a: ir1@1 { - allwinner,pins = "PB22"; - allwinner,function = "ir1"; + pins = "PB22"; + function = "ir1"; }; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", - "PF3", "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + pins = "PF0", "PF1", "PF2", + "PF3", "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; }; mmc0_cd_pin_reference_design: mmc0_cd_pin@0 { - allwinner,pins = "PH1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH1"; + function = "gpio_in"; + bias-pull-up; }; ps20_pins_a: ps20@0 { - allwinner,pins = "PI20", "PI21"; - allwinner,function = "ps2"; + pins = "PI20", "PI21"; + function = "ps2"; }; ps21_pins_a: ps21@0 { - allwinner,pins = "PH12", "PH13"; - allwinner,function = "ps2"; + pins = "PH12", "PH13"; + function = "ps2"; }; pwm0_pins_a: pwm0@0 { - allwinner,pins = "PB2"; - allwinner,function = "pwm"; + pins = "PB2"; + function = "pwm"; }; pwm1_pins_a: pwm1@0 { - allwinner,pins = "PI3"; - allwinner,function = "pwm"; + pins = "PI3"; + function = "pwm"; }; spdif_tx_pins_a: spdif@0 { - allwinner,pins = "PB13"; - allwinner,function = "spdif"; - allwinner,pull = ; + pins = "PB13"; + function = "spdif"; + bias-pull-up; }; spi0_pins_a: spi0@0 { - allwinner,pins = "PI11", "PI12", "PI13"; - allwinner,function = "spi0"; + pins = "PI11", "PI12", "PI13"; + function = "spi0"; }; spi0_cs0_pins_a: spi0_cs0@0 { - allwinner,pins = "PI10"; - allwinner,function = "spi0"; + pins = "PI10"; + function = "spi0"; }; spi1_pins_a: spi1@0 { - allwinner,pins = "PI17", "PI18", "PI19"; - allwinner,function = "spi1"; + pins = "PI17", "PI18", "PI19"; + function = "spi1"; }; spi1_cs0_pins_a: spi1_cs0@0 { - allwinner,pins = "PI16"; - allwinner,function = "spi1"; + pins = "PI16"; + function = "spi1"; }; spi2_pins_a: spi2@0 { - allwinner,pins = "PC20", "PC21", "PC22"; - allwinner,function = "spi2"; + pins = "PC20", "PC21", "PC22"; + function = "spi2"; }; spi2_pins_b: spi2@1 { - allwinner,pins = "PB15", "PB16", "PB17"; - allwinner,function = "spi2"; + pins = "PB15", "PB16", "PB17"; + function = "spi2"; }; spi2_cs0_pins_a: spi2_cs0@0 { - allwinner,pins = "PC19"; - allwinner,function = "spi2"; + pins = "PC19"; + function = "spi2"; }; spi2_cs0_pins_b: spi2_cs0@1 { - allwinner,pins = "PB14"; - allwinner,function = "spi2"; + pins = "PB14"; + function = "spi2"; }; uart0_pins_a: uart0@0 { - allwinner,pins = "PB22", "PB23"; - allwinner,function = "uart0"; + pins = "PB22", "PB23"; + function = "uart0"; }; uart0_pins_b: uart0@1 { - allwinner,pins = "PF2", "PF4"; - allwinner,function = "uart0"; + pins = "PF2", "PF4"; + function = "uart0"; }; uart1_pins_a: uart1@0 { - allwinner,pins = "PA10", "PA11"; - allwinner,function = "uart1"; + pins = "PA10", "PA11"; + function = "uart1"; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts index 8d1e414c0a3a..a539b72ce093 100644 --- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts +++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts @@ -109,15 +109,15 @@ &otg_sram { &pio { mmc0_cd_pin_t003: mmc0_cd_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-up; }; led_pins_t003: led_pins@0 { - allwinner,pins = "PB2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PB2"; + function = "gpio_out"; + drive-strength = <20>; }; }; @@ -138,11 +138,11 @@ &uart0 { }; &usb0_vbus_pin_a { - allwinner,pins = "PG13"; + pins = "PG13"; }; &usb1_vbus_pin_a { - allwinner,pins = "PB10"; + pins = "PB10"; }; &usb_otg { diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts index e3438a685c71..e1b5e8a446fe 100644 --- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts +++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts @@ -130,26 +130,26 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PG12"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG12"; + function = "gpio_in"; + bias-pull-up; }; mmc0_cd_pin_t004: mmc0_cd_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-up; }; mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 { - allwinner,pins = "PB18"; - allwinner,function = "gpio_out"; + pins = "PB18"; + function = "gpio_out"; }; led_pins_t004: led_pins@0 { - allwinner,pins = "PB2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PB2"; + function = "gpio_out"; + drive-strength = <20>; }; }; @@ -170,7 +170,7 @@ &usb_otg { }; &usb1_vbus_pin_a { - allwinner,pins = "PG13"; + pins = "PG13"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts index 405c1d519301..020aa9d6c31d 100644 --- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts +++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts @@ -116,19 +116,19 @@ &otg_sram { &pio { led_pins_mk802: led_pins@0 { - allwinner,pins = "PB2"; - allwinner,function = "gpio_out"; + pins = "PB2"; + function = "gpio_out"; }; mmc0_cd_pin_mk802: mmc0_cd_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_mk802: usb1_vbus_pin@0 { - allwinner,pins = "PB10"; - allwinner,function = "gpio_out"; + pins = "PB10"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts index 7c77183924f1..d8245c6314a7 100644 --- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts @@ -202,32 +202,32 @@ &otg_sram { &pio { mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-up; }; mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 { - allwinner,pins = "PG13"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG13"; + function = "gpio_in"; + bias-pull-up; }; led_pins_olinuxino: led_pins@0 { - allwinner,pins = "PE3"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PE3"; + function = "gpio_out"; + drive-strength = <20>; }; usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 { - allwinner,pins = "PB10"; - allwinner,function = "gpio_out"; + pins = "PB10"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PG12"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG12"; + function = "gpio_in"; + bias-pull-up; }; }; @@ -273,7 +273,7 @@ &usb_otg { }; &usb0_vbus_pin_a { - allwinner,pins = "PG11"; + pins = "PG11"; }; &usbphy { 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 e2dceda4889b..51371f9b1cf0 100644 --- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts +++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts @@ -101,20 +101,20 @@ &ohci0 { &pio { mmc0_cd_pin_r7: mmc0_cd_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-up; }; led_pins_r7: led_pins@0 { - allwinner,pins = "PB2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PB2"; + function = "gpio_out"; + drive-strength = <20>; }; usb1_vbus_pin_r7: usb1_vbus_pin@0 { - allwinner,pins = "PG13"; - allwinner,function = "gpio_out"; + pins = "PG13"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts index f40451bffb84..2b8adda0deda 100644 --- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts +++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts @@ -146,19 +146,19 @@ &otg_sram { &pio { led_pins_wobo_i5: led_pins@0 { - allwinner,pins = "PB2"; - allwinner,function = "gpio_out"; + pins = "PB2"; + function = "gpio_out"; }; mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 { - allwinner,pins = "PB3"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PB3"; + function = "gpio_in"; + bias-pull-up; }; emac_power_pin_wobo: emac_power_pin@0 { - allwinner,pins = "PA02"; - allwinner,function = "gpio_out"; + pins = "PA02"; + function = "gpio_out"; }; }; @@ -218,7 +218,7 @@ &usb_otg { }; &usb1_vbus_pin_a { - allwinner,pins = "PG12"; + pins = "PG12"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index ef1e2ab103d7..62b3ffe62df2 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -200,48 +200,48 @@ &pio { compatible = "allwinner,sun5i-a10s-pinctrl"; uart0_pins_a: uart0@0 { - allwinner,pins = "PB19", "PB20"; - allwinner,function = "uart0"; + pins = "PB19", "PB20"; + function = "uart0"; }; uart2_pins_a: uart2@0 { - allwinner,pins = "PC18", "PC19"; - allwinner,function = "uart2"; + pins = "PC18", "PC19"; + function = "uart2"; }; emac_pins_a: emac0@0 { - allwinner,pins = "PA0", "PA1", "PA2", + pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16"; - allwinner,function = "emac"; + function = "emac"; }; emac_pins_b: emac0@1 { - allwinner,pins = "PD6", "PD7", "PD10", + pins = "PD6", "PD7", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; - allwinner,function = "emac"; + function = "emac"; }; mmc1_pins_a: mmc1@0 { - allwinner,pins = "PG3", "PG4", "PG5", + pins = "PG3", "PG4", "PG5", "PG6", "PG7", "PG8"; - allwinner,function = "mmc1"; - allwinner,drive = ; + function = "mmc1"; + drive-strength = <30>; }; spi2_pins_b: spi2@1 { - allwinner,pins = "PB12", "PB13", "PB14"; - allwinner,function = "spi2"; + pins = "PB12", "PB13", "PB14"; + function = "spi2"; }; spi2_cs0_pins_b: spi2_cs0@1 { - allwinner,pins = "PB11"; - allwinner,function = "spi2"; + pins = "PB11"; + function = "spi2"; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts index 693be366ab9c..42435454acef 100644 --- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts +++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts @@ -137,21 +137,21 @@ &otg_sram { &pio { mmc0_cd_pin_d709: mmc0_cd_pin@0 { - allwinner,pins = "PG0"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG0"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-down; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG2"; + function = "gpio_in"; + bias-pull-up; }; }; @@ -209,7 +209,7 @@ &usb_otg { }; &usb0_vbus_pin_a { - allwinner,pins = "PG12"; + pins = "PG12"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts index f5d1a04f3a16..5879a75cf97a 100644 --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts @@ -136,20 +136,20 @@ &otg_sram { &pio { mmc0_cd_pin_h702: mmc0_cd_pin@0 { - allwinner,pins = "PG0"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG0"; + function = "gpio_in"; + bias-pull-up; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG2"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; + pins = "PG1"; + function = "gpio_in"; }; }; @@ -204,7 +204,7 @@ &usb_otg { }; &usb0_vbus_pin_a { - allwinner,pins = "PG12"; + pins = "PG12"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts index df9315e5c850..60e393e28783 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts @@ -115,37 +115,37 @@ &otg_sram { &pio { mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 { - allwinner,pins = "PG0"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG0"; + function = "gpio_in"; + bias-pull-up; }; led_pins_olinuxinom: led_pins@0 { - allwinner,pins = "PG9"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PG9"; + function = "gpio_out"; + drive-strength = <20>; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG2"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-down; }; usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 { - allwinner,pins = "PG12"; - allwinner,function = "gpio_out"; + pins = "PG12"; + function = "gpio_out"; }; usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 { - allwinner,pins = "PG11"; - allwinner,function = "gpio_out"; + pins = "PG11"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts index b9179b36f608..940d47e88056 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts @@ -206,32 +206,32 @@ &otg_sram { &pio { mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { - allwinner,pins = "PG0"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG0"; + function = "gpio_in"; + bias-pull-up; }; led_pins_olinuxino: led_pins@0 { - allwinner,pins = "PG9"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PG9"; + function = "gpio_out"; + drive-strength = <20>; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG2"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-down; }; usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 { - allwinner,pins = "PG11"; - allwinner,function = "gpio_out"; + pins = "PG11"; + function = "gpio_out"; }; }; @@ -271,7 +271,7 @@ &usb_otg { }; &usb0_vbus_pin_a { - allwinner,pins = "PG12"; + pins = "PG12"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts index 8bc6a4b1b233..bfdd38d6bfcc 100644 --- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts +++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts @@ -80,7 +80,7 @@ &codec { }; &codec_pa_pin { - allwinner,pins = "PG3"; + pins = "PG3"; }; &mmc2 { @@ -100,9 +100,9 @@ mmccard: mmccard@0 { &pio { i2c_lcd_pins: i2c_lcd_pin@0 { - allwinner,pins = "PG10", "PG12"; - allwinner,function = "gpio_out"; - allwinner,pull = ; + pins = "PG10", "PG12"; + function = "gpio_out"; + bias-pull-up; }; }; @@ -130,5 +130,5 @@ &uart1 { }; &usb0_vbus_pin_a { - allwinner,pins = "PB4"; + pins = "PB4"; }; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 1f4c5f773226..4131ab44558b 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -350,20 +350,20 @@ &pio { compatible = "allwinner,sun5i-a13-pinctrl"; lcd_rgb666_pins: lcd_rgb666@0 { - allwinner,pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", - "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", - "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", - "PD24", "PD25", "PD26", "PD27"; - allwinner,function = "lcd0"; + pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", + "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", + "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", + "PD24", "PD25", "PD26", "PD27"; + function = "lcd0"; }; uart1_pins_a: uart1@0 { - allwinner,pins = "PE10", "PE11"; - allwinner,function = "uart1"; + pins = "PE10", "PE11"; + function = "uart1"; }; uart1_pins_b: uart1@1 { - allwinner,pins = "PG3", "PG4"; - allwinner,function = "uart1"; + pins = "PG3", "PG4"; + function = "uart1"; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts index e29e708e9faf..0cf0813d363a 100644 --- a/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts +++ b/arch/arm/boot/dts/sun5i-gr8-chip-pro.dts @@ -159,13 +159,13 @@ &otg_sram { &pio { usb0_id_pin_chip_pro: usb0-id-pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; + pins = "PG2"; + function = "gpio_in"; }; wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 { - allwinner,pins = "PB10"; - allwinner,function = "gpio_out"; + pins = "PB10"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts index af5bf886a4d5..1a845af4d4db 100644 --- a/arch/arm/boot/dts/sun5i-gr8-evb.dts +++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts @@ -259,23 +259,23 @@ &otg_sram { &pio { mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 { - allwinner,pins = "PG0"; - allwinner,function = "gpio_in"; + pins = "PG0"; + function = "gpio_in"; }; usb0_id_pin_gr8_evb: usb0-id-pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; + pins = "PG2"; + function = "gpio_in"; }; usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; + pins = "PG1"; + function = "gpio_in"; }; usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 { - allwinner,pins = "PG13"; - allwinner,function = "gpio_out"; + pins = "PG13"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun5i-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi index 5a03453c397b..f83ae3fc6329 100644 --- a/arch/arm/boot/dts/sun5i-gr8.dtsi +++ b/arch/arm/boot/dts/sun5i-gr8.dtsi @@ -764,112 +764,112 @@ pio: pinctrl@01c20800 { #gpio-cells = <3>; i2c0_pins_a: i2c0@0 { - allwinner,pins = "PB0", "PB1"; - allwinner,function = "i2c0"; + pins = "PB0", "PB1"; + function = "i2c0"; }; i2c1_pins_a: i2c1@0 { - allwinner,pins = "PB15", "PB16"; - allwinner,function = "i2c1"; + pins = "PB15", "PB16"; + function = "i2c1"; }; i2c2_pins_a: i2c2@0 { - allwinner,pins = "PB17", "PB18"; - allwinner,function = "i2c2"; + pins = "PB17", "PB18"; + function = "i2c2"; }; i2s0_data_pins_a: i2s0-data@0 { - allwinner,pins = "PB6", "PB7", "PB8", "PB9"; - allwinner,function = "i2s0"; + pins = "PB6", "PB7", "PB8", "PB9"; + function = "i2s0"; }; i2s0_mclk_pins_a: i2s0-mclk@0 { - allwinner,pins = "PB5"; - allwinner,function = "i2s0"; + pins = "PB5"; + function = "i2s0"; }; ir0_rx_pins_a: ir0@0 { - allwinner,pins = "PB4"; - allwinner,function = "ir0"; + pins = "PB4"; + function = "ir0"; }; lcd_rgb666_pins: lcd-rgb666@0 { - allwinner,pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", + pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; - allwinner,function = "lcd0"; + function = "lcd0"; }; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", "PF3", + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + function = "mmc0"; + drive-strength = <30>; }; nand_pins_a: nand-base0@0 { - allwinner,pins = "PC0", "PC1", "PC2", + pins = "PC0", "PC1", "PC2", "PC5", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15"; - allwinner,function = "nand0"; + function = "nand0"; }; nand_cs0_pins_a: nand-cs@0 { - allwinner,pins = "PC4"; - allwinner,function = "nand0"; + pins = "PC4"; + function = "nand0"; }; nand_rb0_pins_a: nand-rb@0 { - allwinner,pins = "PC6"; - allwinner,function = "nand0"; + pins = "PC6"; + function = "nand0"; }; pwm0_pins_a: pwm0@0 { - allwinner,pins = "PB2"; - allwinner,function = "pwm0"; + pins = "PB2"; + function = "pwm0"; }; pwm1_pins: pwm1 { - allwinner,pins = "PG13"; - allwinner,function = "pwm1"; + pins = "PG13"; + function = "pwm1"; }; spdif_tx_pins_a: spdif@0 { - allwinner,pins = "PB10"; - allwinner,function = "spdif"; - allwinner,pull = ; + pins = "PB10"; + function = "spdif"; + bias-pull-up; }; uart1_pins_a: uart1@1 { - allwinner,pins = "PG3", "PG4"; - allwinner,function = "uart1"; + pins = "PG3", "PG4"; + function = "uart1"; }; uart1_cts_rts_pins_a: uart1-cts-rts@0 { - allwinner,pins = "PG5", "PG6"; - allwinner,function = "uart1"; + pins = "PG5", "PG6"; + function = "uart1"; }; uart2_pins_a: uart2@1 { - allwinner,pins = "PD2", "PD3"; - allwinner,function = "uart2"; + pins = "PD2", "PD3"; + function = "uart2"; }; uart2_cts_rts_pins_a: uart2-cts-rts@0 { - allwinner,pins = "PD4", "PD5"; - allwinner,function = "uart2"; + pins = "PD4", "PD5"; + function = "uart2"; }; uart3_pins_a: uart3@1 { - allwinner,pins = "PG9", "PG10"; - allwinner,function = "uart3"; + pins = "PG9", "PG10"; + function = "uart3"; }; uart3_cts_rts_pins_a: uart3-cts-rts@0 { - allwinner,pins = "PG11", "PG12"; - allwinner,function = "uart3"; + pins = "PG11", "PG12"; + function = "uart3"; }; }; diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts index 702a0d2ddb77..e86fa46fdd45 100644 --- a/arch/arm/boot/dts/sun5i-r8-chip.dts +++ b/arch/arm/boot/dts/sun5i-r8-chip.dts @@ -154,7 +154,7 @@ xio: gpio@38 { }; &mmc0_pins_a { - allwinner,pull = ; + bias-pull-up; }; &mmc0 { @@ -177,24 +177,24 @@ &otg_sram { &pio { chip_vbus_pin: chip_vbus_pin@0 { - allwinner,pins = "PB10"; - allwinner,function = "gpio_out"; + pins = "PB10"; + function = "gpio_out"; }; chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 { - allwinner,pins = "PC19"; - allwinner,function = "gpio_out"; + pins = "PC19"; + function = "gpio_out"; }; chip_id_det_pin: chip_id_det_pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; + pins = "PG2"; + function = "gpio_in"; }; chip_w1_pin: chip_w1_pin@0 { - allwinner,pins = "PD2"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PD2"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi index 0f2e539e540b..8a4d2277826f 100644 --- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi @@ -130,14 +130,14 @@ &otg_sram { &pio { codec_pa_pin: codec_pa_pin@0 { - allwinner,pins = "PG10"; - allwinner,function = "gpio_out"; + pins = "PG10"; + function = "gpio_out"; }; mmc0_cd_pin: mmc0_cd_pin@0 { - allwinner,pins = "PG0"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG0"; + function = "gpio_in"; + bias-pull-up; }; ts_power_pin: ts_power_pin { @@ -148,20 +148,20 @@ ts_power_pin: ts_power_pin { }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PG1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG1"; + function = "gpio_in"; + bias-pull-down; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PG2"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PG2"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { - allwinner,pins = "PG12"; - allwinner,function = "gpio_out"; + pins = "PG12"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi index 40d0cf5d560a..7ab6b336533e 100644 --- a/arch/arm/boot/dts/sun5i.dtsi +++ b/arch/arm/boot/dts/sun5i.dtsi @@ -555,67 +555,67 @@ pio: pinctrl@01c20800 { #gpio-cells = <3>; i2c0_pins_a: i2c0@0 { - allwinner,pins = "PB0", "PB1"; - allwinner,function = "i2c0"; + pins = "PB0", "PB1"; + function = "i2c0"; }; i2c1_pins_a: i2c1@0 { - allwinner,pins = "PB15", "PB16"; - allwinner,function = "i2c1"; + pins = "PB15", "PB16"; + function = "i2c1"; }; i2c2_pins_a: i2c2@0 { - allwinner,pins = "PB17", "PB18"; - allwinner,function = "i2c2"; + pins = "PB17", "PB18"; + function = "i2c2"; }; lcd_rgb565_pins: lcd_rgb565@0 { - allwinner,pins = "PD3", "PD4", "PD5", "PD6", "PD7", + pins = "PD3", "PD4", "PD5", "PD6", "PD7", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; - allwinner,function = "lcd0"; + function = "lcd0"; }; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", "PF3", - "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + pins = "PF0", "PF1", "PF2", "PF3", + "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; }; mmc2_pins_a: mmc2@0 { - allwinner,pins = "PC6", "PC7", "PC8", "PC9", - "PC10", "PC11", "PC12", "PC13", - "PC14", "PC15"; - allwinner,function = "mmc2"; - allwinner,drive = ; - allwinner,pull = ; + pins = "PC6", "PC7", "PC8", "PC9", + "PC10", "PC11", "PC12", "PC13", + "PC14", "PC15"; + function = "mmc2"; + drive-strength = <30>; + bias-pull-up; }; spi2_pins_a: spi2@0 { - allwinner,pins = "PE1", "PE2", "PE3"; - allwinner,function = "spi2"; + pins = "PE1", "PE2", "PE3"; + function = "spi2"; }; spi2_cs0_pins_a: spi2-cs0@0 { - allwinner,pins = "PE0"; - allwinner,function = "spi2"; + pins = "PE0"; + function = "spi2"; }; uart3_pins_a: uart3@0 { - allwinner,pins = "PG9", "PG10"; - allwinner,function = "uart3"; + pins = "PG9", "PG10"; + function = "uart3"; }; uart3_pins_cts_rts_a: uart3-cts-rts@0 { - allwinner,pins = "PG11", "PG12"; - allwinner,function = "uart3"; + pins = "PG11", "PG12"; + function = "uart3"; }; pwm0_pins: pwm0 { - allwinner,pins = "PB2"; - allwinner,function = "pwm"; + pins = "PB2"; + function = "pwm"; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts index cbc99ce6ab1a..effbdc766938 100644 --- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts +++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts @@ -68,8 +68,8 @@ &ehci0 { &pio { usb1_vbus_pin_a: usb1_vbus_pin@0 { - allwinner,pins = "PH27"; - allwinner,function = "gpio_out"; + pins = "PH27"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index 24909c8c1186..f5ececd45bc0 100644 --- a/arch/arm/boot/dts/sun6i-a31-colombus.dts +++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts @@ -124,25 +124,25 @@ &mmc0 { }; &mmc0_pins_a { - allwinner,pull = ; + bias-pull-up; }; &pio { mmc0_cd_pin_colombus: mmc0_cd_pin@0 { - allwinner,pins = "PA8"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA8"; + function = "gpio_in"; + bias-pull-up; }; usb2_vbus_pin_colombus: usb2_vbus_pin@0 { - allwinner,pins = "PH24"; - allwinner,function = "gpio_out"; + pins = "PH24"; + function = "gpio_out"; }; i2c_lcd_pins: i2c_lcd_pin@0 { - allwinner,pins = "PA23", "PA24"; - allwinner,function = "gpio_out"; - allwinner,pull = ; + pins = "PA23", "PA24"; + function = "gpio_out"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts index 2d3782edd770..b168d6df2b30 100644 --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts @@ -201,7 +201,7 @@ &mmc0 { &mmc0_pins_a { /* external pull-ups missing for some pins */ - allwinner,pull = ; + bias-pull-up; }; &mmc1 { @@ -220,19 +220,19 @@ &ohci0 { &pio { gmac_phy_reset_pin_hummingbird: gmac_phy_reset_pin@0 { - allwinner,pins = "PA21"; - allwinner,function = "gpio_out"; + pins = "PA21"; + function = "gpio_out"; }; mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 { - allwinner,pins = "PA8"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA8"; + function = "gpio_in"; + bias-pull-up; }; wifi_reset_pin_hummingbird: wifi_reset_pin@0 { - allwinner,pins = "PG10"; - allwinner,function = "gpio_out"; + pins = "PG10"; + function = "gpio_out"; }; }; @@ -328,7 +328,7 @@ &uart0 { &usb1_vbus_pin_a { /* different pin from sunxi-common-regulators */ - allwinner,pins = "PH24"; + pins = "PH24"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts index 61e3ef4528ec..f3468a14596e 100644 --- a/arch/arm/boot/dts/sun6i-a31-i7.dts +++ b/arch/arm/boot/dts/sun6i-a31-i7.dts @@ -109,19 +109,19 @@ &mmc0 { &pio { led_pins_i7: led_pins@0 { - allwinner,pins = "PH13"; - allwinner,function = "gpio_out"; + pins = "PH13"; + function = "gpio_out"; }; mmc0_cd_pin_i7: mmc0_cd_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH22"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_i7: usb1_vbus_pin@0 { - allwinner,pins = "PC27"; - allwinner,function = "gpio_out"; + pins = "PC27"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts index 96ad1fe9bbc8..8af5b667a46d 100644 --- a/arch/arm/boot/dts/sun6i-a31-m9.dts +++ b/arch/arm/boot/dts/sun6i-a31-m9.dts @@ -128,19 +128,19 @@ axp22x: pmic@68 { &pio { led_pins_m9: led_pins@0 { - allwinner,pins = "PH13"; - allwinner,function = "gpio_out"; + pins = "PH13"; + function = "gpio_out"; }; mmc0_cd_pin_m9: mmc0_cd_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH22"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_m9: usb1_vbus_pin@0 { - allwinner,pins = "PC27"; - allwinner,function = "gpio_out"; + pins = "PC27"; + function = "gpio_out"; }; }; 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 a29ea186b964..bf0f5831126f 100644 --- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts +++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts @@ -128,19 +128,19 @@ axp22x: pmic@68 { &pio { led_pins_m9: led_pins@0 { - allwinner,pins = "PH13"; - allwinner,function = "gpio_out"; + pins = "PH13"; + function = "gpio_out"; }; mmc0_cd_pin_m9: mmc0_cd_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH22"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_m9: usb1_vbus_pin@0 { - allwinner,pins = "PC27"; - allwinner,function = "gpio_out"; + pins = "PC27"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index ee153a2c9e57..7ea1116c7c88 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -479,112 +479,112 @@ pio: pinctrl@01c20800 { #gpio-cells = <3>; gmac_pins_gmii_a: gmac_gmii@0 { - allwinner,pins = "PA0", "PA1", "PA2", "PA3", + pins = "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PA18", "PA19", "PA20", "PA21", "PA22", "PA23", "PA24", "PA25", "PA26", "PA27"; - allwinner,function = "gmac"; + function = "gmac"; /* * data lines in GMII mode run at 125MHz and * might need a higher signal drive strength */ - allwinner,drive = ; + drive-strength = <30>; }; gmac_pins_mii_a: gmac_mii@0 { - allwinner,pins = "PA0", "PA1", "PA2", "PA3", + pins = "PA0", "PA1", "PA2", "PA3", "PA8", "PA9", "PA11", "PA12", "PA13", "PA14", "PA19", "PA20", "PA21", "PA22", "PA23", "PA24", "PA26", "PA27"; - allwinner,function = "gmac"; + function = "gmac"; }; gmac_pins_rgmii_a: gmac_rgmii@0 { - allwinner,pins = "PA0", "PA1", "PA2", "PA3", + pins = "PA0", "PA1", "PA2", "PA3", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA19", "PA20", "PA25", "PA26", "PA27"; - allwinner,function = "gmac"; + function = "gmac"; /* * data lines in RGMII mode use DDR mode * and need a higher signal drive strength */ - allwinner,drive = ; + drive-strength = <40>; }; i2c0_pins_a: i2c0@0 { - allwinner,pins = "PH14", "PH15"; - allwinner,function = "i2c0"; + pins = "PH14", "PH15"; + function = "i2c0"; }; i2c1_pins_a: i2c1@0 { - allwinner,pins = "PH16", "PH17"; - allwinner,function = "i2c1"; + pins = "PH16", "PH17"; + function = "i2c1"; }; i2c2_pins_a: i2c2@0 { - allwinner,pins = "PH18", "PH19"; - allwinner,function = "i2c2"; + pins = "PH18", "PH19"; + function = "i2c2"; }; lcd0_rgb888_pins: lcd0_rgb888 { - allwinner,pins = "PD0", "PD1", "PD2", "PD3", + pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", "PD24", "PD25", "PD26", "PD27"; - allwinner,function = "lcd0"; + function = "lcd0"; }; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", + pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + function = "mmc0"; + drive-strength = <30>; }; mmc1_pins_a: mmc1@0 { - allwinner,pins = "PG0", "PG1", "PG2", "PG3", + pins = "PG0", "PG1", "PG2", "PG3", "PG4", "PG5"; - allwinner,function = "mmc1"; - allwinner,drive = ; + function = "mmc1"; + drive-strength = <30>; }; mmc2_pins_a: mmc2@0 { - allwinner,pins = "PC6", "PC7", "PC8", "PC9", + pins = "PC6", "PC7", "PC8", "PC9", "PC10", "PC11"; - allwinner,function = "mmc2"; - allwinner,drive = ; - allwinner,pull = ; + function = "mmc2"; + drive-strength = <30>; + bias-pull-up; }; mmc2_8bit_emmc_pins: mmc2@1 { - allwinner,pins = "PC6", "PC7", "PC8", "PC9", + pins = "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC24"; - allwinner,function = "mmc2"; - allwinner,drive = ; + function = "mmc2"; + drive-strength = <30>; }; mmc3_8bit_emmc_pins: mmc3@1 { - allwinner,pins = "PC6", "PC7", "PC8", "PC9", + pins = "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC24"; - allwinner,function = "mmc3"; - allwinner,drive = ; + function = "mmc3"; + drive-strength = <40>; }; uart0_pins_a: uart0@0 { - allwinner,pins = "PH20", "PH21"; - allwinner,function = "uart0"; + pins = "PH20", "PH21"; + function = "uart0"; }; }; @@ -1057,13 +1057,13 @@ r_pio: pinctrl@01f02c00 { #gpio-cells = <3>; ir_pins_a: ir@0 { - allwinner,pins = "PL4"; - allwinner,function = "s_ir"; + pins = "PL4"; + function = "s_ir"; }; p2wi_pins: p2wi { - allwinner,pins = "PL0", "PL1"; - allwinner,function = "s_p2wi"; + pins = "PL0", "PL1"; + function = "s_p2wi"; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts index f511aa0e250d..2238eda318f6 100644 --- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts @@ -134,20 +134,20 @@ &mmc0 { &pio { gt911_int_primo81: gt911_int_pin@0 { - allwinner,pins = "PA3"; - allwinner,function = "gpio_in"; + pins = "PA3"; + function = "gpio_in"; }; mma8452_int_primo81: mma8452_int_pin@0 { - allwinner,pins = "PA9"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA9"; + function = "gpio_in"; + bias-pull-up; }; mmc0_cd_pin_primo81: mmc0_cd_pin@0 { - allwinner,pins = "PA8"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA8"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts index f7b681ef0e8b..8743aeed1275 100644 --- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts +++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts @@ -136,14 +136,14 @@ &ohci1 { &pio { led_pin_sina31s: led_pin@0 { - allwinner,pins = "PH13"; - allwinner,function = "gpio_out"; + pins = "PH13"; + function = "gpio_out"; }; mmc0_cd_pin_sina31s: mmc0_cd_pin@0 { - allwinner,pins = "PA4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA4"; + function = "gpio_in"; + bias-pull-up; }; }; 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 3731cf22abc1..3bd862bf82a9 100644 --- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts +++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts @@ -122,7 +122,7 @@ &mmc0 { }; &mmc0_pins_a { - allwinner,pull = ; + bias-pull-up; }; &mmc2 { @@ -144,7 +144,7 @@ brcmf: bcrmf@1 { }; &mmc2_pins_a { - allwinner,pull = ; + bias-pull-up; }; &ohci0 { @@ -153,26 +153,26 @@ &ohci0 { &pio { gmac_phy_reset_pin_bpi_m2: gmac_phy_reset_pin@0 { - allwinner,pins = "PA21"; - allwinner,function = "gpio_out"; + pins = "PA21"; + function = "gpio_out"; }; led_pins_bpi_m2: led_pins@0 { - allwinner,pins = "PG5", "PG10", "PG11"; - allwinner,function = "gpio_out"; + pins = "PG5", "PG10", "PG11"; + function = "gpio_out"; }; mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 { - allwinner,pins = "PA4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA4"; + function = "gpio_in"; + bias-pull-up; }; }; &r_pio { mmc2_pwrseq_pin_bpi_m2: mmc2_pwrseq_pin@0 { - allwinner,pins = "PL8"; - allwinner,function = "gpio_out"; + pins = "PL8"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts index 832392125b8e..154ebf5082ed 100644 --- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts +++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts @@ -92,9 +92,9 @@ &ohci1 { &pio { mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 { - allwinner,pins = "PA8"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA8"; + function = "gpio_in"; + bias-pull-up; }; }; @@ -109,7 +109,7 @@ &mmc0 { }; &mmc0_pins_a { - allwinner,pull = ; + bias-pull-up; }; &p2wi { diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi index 2e7443fc1790..edaba5f904fd 100644 --- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi @@ -77,15 +77,15 @@ &mmc0 { &pio { mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 { - allwinner,pins = "PA8"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA8"; + function = "gpio_in"; + bias-pull-up; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PA15"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PA15"; + function = "gpio_in"; + bias-pull-up; }; }; 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 aa9a1ff89a9d..08e776ae095a 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts @@ -183,7 +183,7 @@ brcmf: bcrmf@1 { &mmc3_pins_a { /* AP6210 requires pull-up */ - allwinner,pull = ; + bias-pull-up; }; &ohci0 { @@ -200,24 +200,24 @@ &otg_sram { &pio { gmac_power_pin_bpi_m1p: gmac_power_pin@0 { - allwinner,pins = "PH23"; - allwinner,function = "gpio_out"; + pins = "PH23"; + function = "gpio_out"; }; led_pins_bpi_m1p: led_pins@0 { - allwinner,pins = "PH24", "PH25"; - allwinner,function = "gpio_out"; + pins = "PH24", "PH25"; + function = "gpio_out"; }; mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 { - allwinner,pins = "PH10"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH10"; + function = "gpio_in"; + bias-pull-up; }; mmc3_pwrseq_pin_bpi_m1p: mmc3_pwrseq_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_out"; + pins = "PH22"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts index 7cd6a74d104c..91f2e5f9efcb 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts @@ -179,25 +179,25 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; mmc0_cd_pin_bananapi: mmc0_cd_pin@0 { - allwinner,pins = "PH10"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH10"; + function = "gpio_in"; + bias-pull-up; }; gmac_power_pin_bananapi: gmac_power_pin@0 { - allwinner,pins = "PH23"; - allwinner,function = "gpio_out"; + pins = "PH23"; + function = "gpio_out"; }; led_pins_bananapi: led_pins@0 { - allwinner,pins = "PH24"; - allwinner,function = "gpio_out"; + pins = "PH24"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts index 366636451e7e..19d63d4049de 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts @@ -182,34 +182,34 @@ &ohci1 { &pio { gmac_power_pin_bananapro: gmac_power_pin@0 { - allwinner,pins = "PH23"; - allwinner,function = "gpio_out"; + pins = "PH23"; + function = "gpio_out"; }; led_pins_bananapro: led_pins@0 { - allwinner,pins = "PH24", "PG2"; - allwinner,function = "gpio_out"; + pins = "PH24", "PG2"; + function = "gpio_out"; }; mmc0_cd_pin_bananapro: mmc0_cd_pin@0 { - allwinner,pins = "PH10"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH10"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { - allwinner,pins = "PH0"; - allwinner,function = "gpio_out"; + pins = "PH0"; + function = "gpio_out"; }; usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { - allwinner,pins = "PH1"; - allwinner,function = "gpio_out"; + pins = "PH1"; + function = "gpio_out"; }; vmmc3_pin_bananapro: vmmc3_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_out"; + pins = "PH22"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index e635dd6ac47d..4dc1e10f88c4 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts @@ -160,14 +160,14 @@ &otg_sram { &pio { led_pins_cubieboard2: led_pins@0 { - allwinner,pins = "PH20", "PH21"; - allwinner,function = "gpio_out"; + pins = "PH20", "PH21"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index be8fa4879453..f019aa3fe96d 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -207,7 +207,7 @@ brcmf: bcrmf@1 { &mmc3_pins_a { /* AP6210 requires pull-up */ - allwinner,pull = ; + bias-pull-up; }; &ohci0 { @@ -224,33 +224,33 @@ &otg_sram { &pio { ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 { - allwinner,pins = "PH12"; - allwinner,function = "gpio_out"; + pins = "PH12"; + function = "gpio_out"; }; led_pins_cubietruck: led_pins@0 { - allwinner,pins = "PH7", "PH11", "PH20", "PH21"; - allwinner,function = "gpio_out"; + pins = "PH7", "PH11", "PH20", "PH21"; + function = "gpio_out"; }; mmc3_pwrseq_pin_cubietruck: mmc3_pwrseq_pin@0 { - allwinner,pins = "PH9"; - allwinner,function = "gpio_out"; + pins = "PH9"; + function = "gpio_out"; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { - allwinner,pins = "PH17"; - allwinner,function = "gpio_out"; + pins = "PH17"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH19"; - allwinner,function = "gpio_in"; + pins = "PH19"; + function = "gpio_in"; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_in"; + pins = "PH22"; + function = "gpio_in"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts index 6719c701a45f..e921ba42f170 100644 --- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts +++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts @@ -188,23 +188,23 @@ &ohci1 { &pio { ahci_pwr_pin_a20_hummingbird: ahci_pwr_pin@0 { - allwinner,pins = "PH15"; - allwinner,function = "gpio_out"; + pins = "PH15"; + function = "gpio_out"; }; usb1_vbus_pin_a20_hummingbird: usb1_vbus_pin@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; + pins = "PH2"; + function = "gpio_out"; }; mmc3_vdd_pin_a20_hummingbird: mmc3_vdd_pin@0 { - allwinner,pins = "PH9"; - allwinner,function = "gpio_out"; + pins = "PH9"; + function = "gpio_out"; }; gmac_vdd_pin_a20_hummingbird: gmac_vdd_pin@0 { - allwinner,pins = "PH16"; - allwinner,function = "gpio_out"; + pins = "PH16"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts index d64c11134dd7..385fd8232ae0 100644 --- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts +++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts @@ -185,7 +185,7 @@ brcmf: bcrmf@1 { &mmc3_pins_a { /* AP6210 / AP6330 requires pull-up */ - allwinner,pull = ; + bias-pull-up; }; &ohci0 { @@ -198,23 +198,23 @@ &ohci1 { &pio { vmmc3_pin_i12_tvbox: vmmc3_pin@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; + pins = "PH2"; + function = "gpio_out"; }; vmmc3_io_pin_i12_tvbox: vmmc3_io_pin@0 { - allwinner,pins = "PH12"; - allwinner,function = "gpio_out"; + pins = "PH12"; + function = "gpio_out"; }; gmac_power_pin_i12_tvbox: gmac_power_pin@0 { - allwinner,pins = "PH21"; - allwinner,function = "gpio_out"; + pins = "PH21"; + function = "gpio_out"; }; led_pins_i12_tvbox: led_pins@0 { - allwinner,pins = "PH9", "PH20"; - allwinner,function = "gpio_out"; + pins = "PH9", "PH20"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts index 44f09642c893..d52222c82cb8 100644 --- a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts +++ b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts @@ -131,9 +131,9 @@ &mmc0 { &pio { led_pins_itead_core: led_pins@0 { - allwinner,pins = "PH20","PH21"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PH20","PH21"; + function = "gpio_out"; + drive-strength = <20>; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts index 79cee00a85de..72ec0d5ae052 100644 --- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts +++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts @@ -87,7 +87,7 @@ reg_gmac_3v3: gmac-3v3 { }; &ahci_pwr_pin_a { - allwinner,pins = "PB3"; + pins = "PB3"; }; &ahci { @@ -222,25 +222,25 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 { - allwinner,pins = "PH10"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH10"; + function = "gpio_in"; + bias-pull-up; }; gmac_power_pin_lamobo_r1: gmac_power_pin@0 { - allwinner,pins = "PH23"; - allwinner,function = "gpio_out"; + pins = "PH23"; + function = "gpio_out"; }; led_pins_lamobo_r1: led_pins@0 { - allwinner,pins = "PH24"; - allwinner,function = "gpio_out"; + pins = "PH24"; + function = "gpio_out"; }; }; @@ -321,7 +321,7 @@ &usb_power_supply { }; &usb2_vbus_pin_a { - allwinner,pins = "PH12"; + pins = "PH12"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts index 97ce27da445f..0e074bd0e8c9 100644 --- a/arch/arm/boot/dts/sun7i-a20-m3.dts +++ b/arch/arm/boot/dts/sun7i-a20-m3.dts @@ -145,8 +145,8 @@ &ohci1 { &pio { led_pins_m3: led_pins@0 { - allwinner,pins = "PH20"; - allwinner,function = "gpio_out"; + pins = "PH20"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts index c5890617382c..97d7a8b65a03 100644 --- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts +++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts @@ -132,13 +132,13 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; + pins = "PH4"; + function = "gpio_in"; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; + pins = "PH5"; + function = "gpio_in"; }; }; 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 1ba112ccbb46..7af954142132 100644 --- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts +++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts @@ -208,30 +208,30 @@ &otg_sram { &pio { ahci_pwr_pin_olimex_som_evb: ahci_pwr_pin@1 { - allwinner,pins = "PC3"; - allwinner,function = "gpio_out"; + pins = "PC3"; + function = "gpio_out"; }; led_pins_olimex_som_evb: led_pins@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PH2"; + function = "gpio_out"; + drive-strength = <20>; }; mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 { - allwinner,pins = "PH0"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH0"; + function = "gpio_in"; + bias-pull-up; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; + pins = "PH4"; + function = "gpio_in"; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; + pins = "PH5"; + function = "gpio_in"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts index 21946497789e..1297432c2802 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts @@ -153,26 +153,26 @@ &otg_sram { &pio { ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { - allwinner,pins = "PC3"; - allwinner,function = "gpio_out"; + pins = "PC3"; + function = "gpio_out"; }; led_pins_olinuxinolime: led_pins@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PH2"; + function = "gpio_out"; + drive-strength = <20>; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; 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 6858d6aafea3..6efd915b00ee 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts @@ -57,8 +57,8 @@ mmc2_pwrseq: pwrseq { &pio { mmc2_pins_nrst: mmc2@0 { - allwinner,pins = "PC16"; - allwinner,function = "gpio_out"; + pins = "PC16"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index 3dcd745126a9..b421d5170e0a 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts @@ -202,31 +202,31 @@ &otg_sram { &pio { ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { - allwinner,pins = "PC3"; - allwinner,function = "gpio_out"; + pins = "PC3"; + function = "gpio_out"; }; led_pins_olinuxinolime: led_pins@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PH2"; + function = "gpio_out"; + drive-strength = <20>; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; usb0_vbus_pin_lime2: usb0_vbus_pin@0 { - allwinner,pins = "PC17"; - allwinner,function = "gpio_out"; + pins = "PC17"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index 3773926df96e..223fbd9f7c62 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts @@ -227,27 +227,27 @@ &otg_sram { &pio { mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 { - allwinner,pins = "PH11"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH11"; + function = "gpio_in"; + bias-pull-up; }; led_pins_olinuxino: led_pins@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PH2"; + function = "gpio_out"; + drive-strength = <20>; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH5"; + function = "gpio_in"; + bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts index 8e05256f7c1b..a74265749227 100644 --- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts +++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts @@ -166,41 +166,41 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; mmc0_cd_pin_orangepi: mmc0_cd_pin@0 { - allwinner,pins = "PH10"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH10"; + function = "gpio_in"; + bias-pull-up; }; mmc3_cd_pin_orangepi: mmc3_cd_pin@0 { - allwinner,pins = "PH11"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH11"; + function = "gpio_in"; + bias-pull-up; }; usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_out"; + pins = "PH22"; + function = "gpio_out"; }; gmac_power_pin_orangepi: gmac_power_pin@0 { - allwinner,pins = "PH23"; - allwinner,function = "gpio_out"; + pins = "PH23"; + function = "gpio_out"; }; led_pins_orangepi: led_pins@0 { - allwinner,pins = "PH24", "PH25"; - allwinner,function = "gpio_out"; + pins = "PH24", "PH25"; + function = "gpio_out"; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { - allwinner,pins = "PH26"; - allwinner,function = "gpio_out"; + pins = "PH26"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts index d168b8f08e30..3de980c8f8ff 100644 --- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts +++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts @@ -147,35 +147,35 @@ &otg_sram { &pio { usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; mmc0_cd_pin_orangepi: mmc0_cd_pin@0 { - allwinner,pins = "PH10"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH10"; + function = "gpio_in"; + bias-pull-up; }; usb2_vbus_pin_bananapro: usb2_vbus_pin@0 { - allwinner,pins = "PH22"; - allwinner,function = "gpio_out"; + pins = "PH22"; + function = "gpio_out"; }; gmac_power_pin_orangepi: gmac_power_pin@0 { - allwinner,pins = "PH23"; - allwinner,function = "gpio_out"; + pins = "PH23"; + function = "gpio_out"; }; led_pins_orangepi: led_pins@0 { - allwinner,pins = "PH24"; - allwinner,function = "gpio_out"; + pins = "PH24"; + function = "gpio_out"; }; usb1_vbus_pin_bananapro: usb1_vbus_pin@0 { - allwinner,pins = "PH26"; - allwinner,function = "gpio_out"; + pins = "PH26"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts index cdcbee74274e..f47a5c46bc20 100644 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts @@ -152,24 +152,24 @@ &otg_sram { &pio { ahci_pwr_pin_pcduino3_nano: ahci_pwr_pin@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; + pins = "PH2"; + function = "gpio_out"; }; led_pins_pcduino3_nano: led_pins@0 { - allwinner,pins = "PH16", "PH15"; - allwinner,function = "gpio_out"; + pins = "PH16", "PH15"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_pcduino3_nano: usb1_vbus_pin@0 { - allwinner,pins = "PD2"; - allwinner,function = "gpio_out"; + pins = "PD2"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts index fd2b4b8af9ea..4599f98a3aee 100644 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts @@ -108,7 +108,7 @@ &ahci { }; &ahci_pwr_pin_a { - allwinner,pins = "PH2"; + pins = "PH2"; }; &codec { @@ -183,19 +183,19 @@ &otg_sram { &pio { led_pins_pcduino3: led_pins@0 { - allwinner,pins = "PH15", "PH16"; - allwinner,function = "gpio_out"; + pins = "PH15", "PH16"; + function = "gpio_out"; }; key_pins_pcduino3: key_pins@0 { - allwinner,pins = "PH17", "PH18", "PH19"; - allwinner,function = "gpio_in"; + pins = "PH17", "PH18", "PH19"; + function = "gpio_in"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts index 688f75ceab58..e19f17177755 100644 --- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts +++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts @@ -173,24 +173,24 @@ &otg_sram { &pio { bl_enable_pin: bl_enable_pin@0 { - allwinner,pins = "PH7"; - allwinner,function = "gpio_out"; + pins = "PH7"; + function = "gpio_out"; }; codec_pa_pin: codec_pa_pin@0 { - allwinner,pins = "PH15"; - allwinner,function = "gpio_out"; + pins = "PH15"; + function = "gpio_out"; }; ts_reset_pin: ts_reset_pin@0 { - allwinner,pins = "PB13"; - allwinner,function = "gpio_out"; + pins = "PB13"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; }; 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 b12493350ee3..c3078d4f1093 100644 --- a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts +++ b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts @@ -160,14 +160,14 @@ &otg_sram { &pio { vmmc3_pin_ap6xxx_wl_regon: vmmc3_pin@0 { - allwinner,pins = "PH9"; - allwinner,function = "gpio_out"; + pins = "PH9"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index ce16a8ca6db4..34d613b0dd73 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -1093,229 +1093,229 @@ pio: pinctrl@01c20800 { #gpio-cells = <3>; clk_out_a_pins_a: clk_out_a@0 { - allwinner,pins = "PI12"; - allwinner,function = "clk_out_a"; + pins = "PI12"; + function = "clk_out_a"; }; clk_out_b_pins_a: clk_out_b@0 { - allwinner,pins = "PI13"; - allwinner,function = "clk_out_b"; + pins = "PI13"; + function = "clk_out_b"; }; emac_pins_a: emac0@0 { - allwinner,pins = "PA0", "PA1", "PA2", - "PA3", "PA4", "PA5", "PA6", - "PA7", "PA8", "PA9", "PA10", - "PA11", "PA12", "PA13", "PA14", - "PA15", "PA16"; - allwinner,function = "emac"; + pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16"; + function = "emac"; }; gmac_pins_mii_a: gmac_mii@0 { - allwinner,pins = "PA0", "PA1", "PA2", - "PA3", "PA4", "PA5", "PA6", - "PA7", "PA8", "PA9", "PA10", - "PA11", "PA12", "PA13", "PA14", - "PA15", "PA16"; - allwinner,function = "gmac"; + pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA9", "PA10", + "PA11", "PA12", "PA13", "PA14", + "PA15", "PA16"; + function = "gmac"; }; gmac_pins_rgmii_a: gmac_rgmii@0 { - allwinner,pins = "PA0", "PA1", "PA2", - "PA3", "PA4", "PA5", "PA6", - "PA7", "PA8", "PA10", - "PA11", "PA12", "PA13", - "PA15", "PA16"; - allwinner,function = "gmac"; + pins = "PA0", "PA1", "PA2", + "PA3", "PA4", "PA5", "PA6", + "PA7", "PA8", "PA10", + "PA11", "PA12", "PA13", + "PA15", "PA16"; + function = "gmac"; /* * data lines in RGMII mode use DDR mode * and need a higher signal drive strength */ - allwinner,drive = ; + drive-strength = <40>; }; i2c0_pins_a: i2c0@0 { - allwinner,pins = "PB0", "PB1"; - allwinner,function = "i2c0"; + pins = "PB0", "PB1"; + function = "i2c0"; }; i2c1_pins_a: i2c1@0 { - allwinner,pins = "PB18", "PB19"; - allwinner,function = "i2c1"; + pins = "PB18", "PB19"; + function = "i2c1"; }; i2c2_pins_a: i2c2@0 { - allwinner,pins = "PB20", "PB21"; - allwinner,function = "i2c2"; + pins = "PB20", "PB21"; + function = "i2c2"; }; i2c3_pins_a: i2c3@0 { - allwinner,pins = "PI0", "PI1"; - allwinner,function = "i2c3"; + pins = "PI0", "PI1"; + function = "i2c3"; }; ir0_rx_pins_a: ir0@0 { - allwinner,pins = "PB4"; - allwinner,function = "ir0"; + pins = "PB4"; + function = "ir0"; }; ir0_tx_pins_a: ir0@1 { - allwinner,pins = "PB3"; - allwinner,function = "ir0"; + pins = "PB3"; + function = "ir0"; }; ir1_rx_pins_a: ir1@0 { - allwinner,pins = "PB23"; - allwinner,function = "ir1"; + pins = "PB23"; + function = "ir1"; }; ir1_tx_pins_a: ir1@1 { - allwinner,pins = "PB22"; - allwinner,function = "ir1"; + pins = "PB22"; + function = "ir1"; }; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", - "PF3", "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + pins = "PF0", "PF1", "PF2", + "PF3", "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; }; mmc0_cd_pin_reference_design: mmc0_cd_pin@0 { - allwinner,pins = "PH1"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH1"; + function = "gpio_in"; + bias-pull-up; }; mmc2_pins_a: mmc2@0 { - allwinner,pins = "PC6", "PC7", "PC8", - "PC9", "PC10", "PC11"; - allwinner,function = "mmc2"; - allwinner,drive = ; - allwinner,pull = ; + pins = "PC6", "PC7", "PC8", + "PC9", "PC10", "PC11"; + function = "mmc2"; + drive-strength = <30>; + bias-pull-up; }; mmc3_pins_a: mmc3@0 { - allwinner,pins = "PI4", "PI5", "PI6", - "PI7", "PI8", "PI9"; - allwinner,function = "mmc3"; - allwinner,drive = ; + pins = "PI4", "PI5", "PI6", + "PI7", "PI8", "PI9"; + function = "mmc3"; + drive-strength = <30>; }; ps20_pins_a: ps20@0 { - allwinner,pins = "PI20", "PI21"; - allwinner,function = "ps2"; + pins = "PI20", "PI21"; + function = "ps2"; }; ps21_pins_a: ps21@0 { - allwinner,pins = "PH12", "PH13"; - allwinner,function = "ps2"; + pins = "PH12", "PH13"; + function = "ps2"; }; pwm0_pins_a: pwm0@0 { - allwinner,pins = "PB2"; - allwinner,function = "pwm"; + pins = "PB2"; + function = "pwm"; }; pwm1_pins_a: pwm1@0 { - allwinner,pins = "PI3"; - allwinner,function = "pwm"; + pins = "PI3"; + function = "pwm"; }; spdif_tx_pins_a: spdif@0 { - allwinner,pins = "PB13"; - allwinner,function = "spdif"; - allwinner,pull = ; + pins = "PB13"; + function = "spdif"; + bias-pull-up; }; spi0_pins_a: spi0@0 { - allwinner,pins = "PI11", "PI12", "PI13"; - allwinner,function = "spi0"; + pins = "PI11", "PI12", "PI13"; + function = "spi0"; }; spi0_cs0_pins_a: spi0_cs0@0 { - allwinner,pins = "PI10"; - allwinner,function = "spi0"; + pins = "PI10"; + function = "spi0"; }; spi0_cs1_pins_a: spi0_cs1@0 { - allwinner,pins = "PI14"; - allwinner,function = "spi0"; + pins = "PI14"; + function = "spi0"; }; spi1_pins_a: spi1@0 { - allwinner,pins = "PI17", "PI18", "PI19"; - allwinner,function = "spi1"; + pins = "PI17", "PI18", "PI19"; + function = "spi1"; }; spi1_cs0_pins_a: spi1_cs0@0 { - allwinner,pins = "PI16"; - allwinner,function = "spi1"; + pins = "PI16"; + function = "spi1"; }; spi2_pins_a: spi2@0 { - allwinner,pins = "PC20", "PC21", "PC22"; - allwinner,function = "spi2"; + pins = "PC20", "PC21", "PC22"; + function = "spi2"; }; spi2_pins_b: spi2@1 { - allwinner,pins = "PB15", "PB16", "PB17"; - allwinner,function = "spi2"; + pins = "PB15", "PB16", "PB17"; + function = "spi2"; }; spi2_cs0_pins_a: spi2_cs0@0 { - allwinner,pins = "PC19"; - allwinner,function = "spi2"; + pins = "PC19"; + function = "spi2"; }; spi2_cs0_pins_b: spi2_cs0@1 { - allwinner,pins = "PB14"; - allwinner,function = "spi2"; + pins = "PB14"; + function = "spi2"; }; uart0_pins_a: uart0@0 { - allwinner,pins = "PB22", "PB23"; - allwinner,function = "uart0"; + pins = "PB22", "PB23"; + function = "uart0"; }; uart2_pins_a: uart2@0 { - allwinner,pins = "PI16", "PI17", "PI18", "PI19"; - allwinner,function = "uart2"; + pins = "PI16", "PI17", "PI18", "PI19"; + function = "uart2"; }; uart3_pins_a: uart3@0 { - allwinner,pins = "PG6", "PG7", "PG8", "PG9"; - allwinner,function = "uart3"; + pins = "PG6", "PG7", "PG8", "PG9"; + function = "uart3"; }; uart3_pins_b: uart3@1 { - allwinner,pins = "PH0", "PH1"; - allwinner,function = "uart3"; + pins = "PH0", "PH1"; + function = "uart3"; }; uart4_pins_a: uart4@0 { - allwinner,pins = "PG10", "PG11"; - allwinner,function = "uart4"; + pins = "PG10", "PG11"; + function = "uart4"; }; uart4_pins_b: uart4@1 { - allwinner,pins = "PH4", "PH5"; - allwinner,function = "uart4"; + pins = "PH4", "PH5"; + function = "uart4"; }; uart5_pins_a: uart5@0 { - allwinner,pins = "PI10", "PI11"; - allwinner,function = "uart5"; + pins = "PI10", "PI11"; + function = "uart5"; }; uart6_pins_a: uart6@0 { - allwinner,pins = "PI12", "PI13"; - allwinner,function = "uart6"; + pins = "PI12", "PI13"; + function = "uart6"; }; uart7_pins_a: uart7@0 { - allwinner,pins = "PI20", "PI21"; - allwinner,function = "uart7"; + pins = "PI20", "PI21"; + function = "uart7"; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index 0219da4099bd..ecb49a5a7615 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -274,69 +274,69 @@ pio: pinctrl@01c20800 { #gpio-cells = <3>; uart0_pins_a: uart0@0 { - allwinner,pins = "PF2", "PF4"; - allwinner,function = "uart0"; + pins = "PF2", "PF4"; + function = "uart0"; }; uart1_pins_a: uart1@0 { - allwinner,pins = "PG6", "PG7"; - allwinner,function = "uart1"; + pins = "PG6", "PG7"; + function = "uart1"; }; uart1_pins_cts_rts_a: uart1-cts-rts@0 { - allwinner,pins = "PG8", "PG9"; - allwinner,function = "uart1"; + pins = "PG8", "PG9"; + function = "uart1"; }; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", - "PF3", "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + pins = "PF0", "PF1", "PF2", + "PF3", "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; }; mmc1_pins_a: mmc1@0 { - allwinner,pins = "PG0", "PG1", "PG2", - "PG3", "PG4", "PG5"; - allwinner,function = "mmc1"; - allwinner,drive = ; + pins = "PG0", "PG1", "PG2", + "PG3", "PG4", "PG5"; + function = "mmc1"; + drive-strength = <30>; }; mmc2_8bit_pins: mmc2_8bit { - allwinner,pins = "PC5", "PC6", "PC8", - "PC9", "PC10", "PC11", - "PC12", "PC13", "PC14", - "PC15", "PC16"; - allwinner,function = "mmc2"; - allwinner,drive = ; + pins = "PC5", "PC6", "PC8", + "PC9", "PC10", "PC11", + "PC12", "PC13", "PC14", + "PC15", "PC16"; + function = "mmc2"; + drive-strength = <30>; }; pwm0_pins: pwm0 { - allwinner,pins = "PH0"; - allwinner,function = "pwm0"; + pins = "PH0"; + function = "pwm0"; }; i2c0_pins_a: i2c0@0 { - allwinner,pins = "PH2", "PH3"; - allwinner,function = "i2c0"; + pins = "PH2", "PH3"; + function = "i2c0"; }; i2c1_pins_a: i2c1@0 { - allwinner,pins = "PH4", "PH5"; - allwinner,function = "i2c1"; + pins = "PH4", "PH5"; + function = "i2c1"; }; i2c2_pins_a: i2c2@0 { - allwinner,pins = "PE12", "PE13"; - allwinner,function = "i2c2"; + pins = "PE12", "PE13"; + function = "i2c2"; }; lcd_rgb666_pins: lcd-rgb666@0 { - allwinner,pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", - "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", - "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", - "PD24", "PD25", "PD26", "PD27"; - allwinner,function = "lcd0"; + pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", + "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", + "PD18", "PD19", "PD20", "PD21", "PD22", "PD23", + "PD24", "PD25", "PD26", "PD27"; + function = "lcd0"; }; }; @@ -568,15 +568,15 @@ r_pio: pinctrl@01f02c00 { #gpio-cells = <3>; r_rsb_pins: r_rsb { - allwinner,pins = "PL0", "PL1"; - allwinner,function = "s_rsb"; - allwinner,drive = ; - allwinner,pull = ; + pins = "PL0", "PL1"; + function = "s_rsb"; + drive-strength = <20>; + bias-pull-up; }; r_uart_pins_a: r_uart@0 { - allwinner,pins = "PL2", "PL3"; - allwinner,function = "s_uart"; + pins = "PL2", "PL3"; + function = "s_uart"; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts index 490a5a6da50f..c21f5b1b255e 100644 --- a/arch/arm/boot/dts/sun8i-a23-evb.dts +++ b/arch/arm/boot/dts/sun8i-a23-evb.dts @@ -115,9 +115,9 @@ &mmc0 { &pio { mmc0_cd_pin_evb: mmc0_cd_pin@0 { - allwinner,pins = "PB4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PB4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts index 8ed0bc3048b3..649e31339662 100644 --- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts +++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts @@ -86,13 +86,13 @@ esp8089: sdio_wifi@1 { }; &mmc1_pins_a { - allwinner,pull = ; + bias-pull-up; }; &r_pio { wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin@0 { - allwinner,pins = "PL6"; - allwinner,function = "gpio_out"; + pins = "PL6"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts index e8367deaa587..6b3bcae089f2 100644 --- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts +++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts @@ -79,13 +79,13 @@ esp8089: sdio_wifi@1 { }; &mmc1_pins_a { - allwinner,pull = ; + bias-pull-up; }; &r_pio { wifi_pwrseq_pin_mid2809: wifi_pwrseq_pin@0 { - allwinner,pins = "PL6"; - allwinner,function = "gpio_out"; + pins = "PL6"; + function = "gpio_out"; }; }; 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 442db91b943a..3e05959104f1 100644 --- a/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts +++ b/arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts @@ -71,7 +71,7 @@ home { }; &mmc1_pins_a { - allwinner,pull = ; + bias-pull-up; }; &mmc1 { @@ -89,9 +89,9 @@ rtl8723bs: sdio_wifi@1 { &r_pio { led_pin_d978: led_pin_d978@0 { - allwinner,pins = "PL5"; - allwinner,function = "gpio_out"; - allwinner,drive = ; + pins = "PL5"; + function = "gpio_out"; + drive-strength = <20>; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts index 59a64d2d695c..231d115d1997 100644 --- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts +++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts @@ -92,18 +92,18 @@ &ohci0 { &pio { led_pin_olinuxino: led_pins@0 { - allwinner,pins = "PB7"; - allwinner,function = "gpio_out"; + pins = "PB7"; + function = "gpio_out"; }; mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { - allwinner,pins = "PB4"; - allwinner,function = "gpio_in"; + pins = "PB4"; + function = "gpio_in"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PB3"; - allwinner,function = "gpio_in"; + pins = "PB3"; + function = "gpio_in"; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts index df58dfb442cc..370ee82882de 100644 --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts @@ -115,9 +115,9 @@ &mmc2 { &mmc2_8bit_pins { /* Increase drive strength for DDR modes */ - allwinner,drive = ; + drive-strength = <40>; /* eMMC is missing pull-ups */ - allwinner,pull = ; + bias-pull-up; }; &ohci0 { @@ -126,9 +126,9 @@ &ohci0 { &pio { mmc0_cd_pin_sina33: mmc0_cd_pin@0 { - allwinner,pins = "PB4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PB4"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 310a38cf7f18..63d5181ffff8 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -238,8 +238,8 @@ &pio { ; uart0_pins_b: uart0@1 { - allwinner,pins = "PB0", "PB1"; - allwinner,function = "uart0"; + pins = "PB0", "PB1"; + function = "uart0"; }; }; diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi index cec6bfc2d3c9..656cdb5f7a88 100644 --- a/arch/arm/boot/dts/sun8i-a83t.dtsi +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi @@ -167,20 +167,20 @@ pio: pinctrl@01c20800 { #gpio-cells = <3>; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", - "PF3", "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + pins = "PF0", "PF1", "PF2", + "PF3", "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; }; uart0_pins_a: uart0@0 { - allwinner,pins = "PF2", "PF4"; - allwinner,function = "uart0"; + pins = "PF2", "PF4"; + function = "uart0"; }; uart0_pins_b: uart0@1 { - allwinner,pins = "PB9", "PB10"; - allwinner,function = "uart0"; + pins = "PB9", "PB10"; + function = "uart0"; }; }; 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 49194c38d56b..c0c49dd4d3b2 100644 --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts @@ -156,18 +156,18 @@ &ohci2 { &r_pio { pwr_led_bpi_m2p: led_pins@0 { - allwinner,pins = "PL10"; - allwinner,function = "gpio_out"; + pins = "PL10"; + function = "gpio_out"; }; sw_r_bpi_m2p: key_pins@0 { - allwinner,pins = "PL3"; - allwinner,function = "gpio_in"; + pins = "PL3"; + function = "gpio_in"; }; wifi_en_bpi_m2p: wifi_en_pin { - allwinner,pins = "PL7"; - allwinner,function = "gpio_out"; + pins = "PL7"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi index 52ed2249528d..2216e68d1838 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi +++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi @@ -110,20 +110,20 @@ &ohci3 { &pio { leds_npi: led_pins@0 { - allwinner,pins = "PA10"; - allwinner,function = "gpio_out"; + pins = "PA10"; + function = "gpio_out"; }; }; &r_pio { leds_r_npi: led_pins@0 { - allwinner,pins = "PL10"; - allwinner,function = "gpio_out"; + pins = "PL10"; + function = "gpio_out"; }; sw_r_npi: key_pins@0 { - allwinner,pins = "PL3"; - allwinner,function = "gpio_in"; + pins = "PL3"; + function = "gpio_in"; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts index dfd9bc2008fd..047e9e1c6093 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts @@ -145,25 +145,25 @@ rtl8189: sdio_wifi@1 { &pio { leds_opc: led_pins@0 { - allwinner,pins = "PA15"; - allwinner,function = "gpio_out"; + pins = "PA15"; + function = "gpio_out"; }; }; &r_pio { leds_r_opc: led_pins@0 { - allwinner,pins = "PL10"; - allwinner,function = "gpio_out"; + pins = "PL10"; + function = "gpio_out"; }; sw_r_opc: key_pins@0 { - allwinner,pins = "PL3", "PL4"; - allwinner,function = "gpio_in"; + pins = "PL3", "PL4"; + function = "gpio_in"; }; wifi_pwrseq_pin_orangepi: wifi_pwrseq_pin@0 { - allwinner,pins = "PL7"; - allwinner,function = "gpio_out"; + pins = "PL7"; + function = "gpio_out"; }; }; @@ -197,7 +197,7 @@ &uart3 { }; &usb1_vbus_pin_a { - allwinner,pins = "PG13"; + pins = "PG13"; }; &usbphy { diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts index 77d29bae7739..22b99b407019 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts @@ -143,20 +143,20 @@ &ohci2 { &pio { leds_opc: led_pins@0 { - allwinner,pins = "PA15"; - allwinner,function = "gpio_out"; + pins = "PA15"; + function = "gpio_out"; }; }; &r_pio { leds_r_opc: led_pins@0 { - allwinner,pins = "PL10"; - allwinner,function = "gpio_out"; + pins = "PL10"; + function = "gpio_out"; }; sw_r_opc: key_pins@0 { - allwinner,pins = "PL3"; - allwinner,function = "gpio_in"; + pins = "PL3"; + function = "gpio_in"; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts index 49529d9ca26d..34da853ee037 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts @@ -110,20 +110,20 @@ &ohci1 { &pio { leds_opc: led_pins@0 { - allwinner,pins = "PA15"; - allwinner,function = "gpio_out"; + pins = "PA15"; + function = "gpio_out"; }; }; &r_pio { leds_r_opc: led_pins@0 { - allwinner,pins = "PL10"; - allwinner,function = "gpio_out"; + pins = "PL10"; + function = "gpio_out"; }; sw_r_opc: key_pins@0 { - allwinner,pins = "PL3"; - allwinner,function = "gpio_in"; + pins = "PL3"; + function = "gpio_in"; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts index 851fd2c2cc8c..8b93f5c781a7 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts @@ -82,7 +82,7 @@ &mmc2 { &mmc2_8bit_pins { /* Increase drive strength for DDR modes */ - allwinner,drive = ; + drive-strength = <40>; /* eMMC is missing pull-ups */ - allwinner,pull = ; + bias-pull-up; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts index 0d56d33d43ea..98b85be61e17 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts @@ -132,20 +132,20 @@ &ohci3 { &pio { leds_opc: led_pins@0 { - allwinner,pins = "PA15"; - allwinner,function = "gpio_out"; + pins = "PA15"; + function = "gpio_out"; }; }; &r_pio { leds_r_opc: led_pins@0 { - allwinner,pins = "PL10"; - allwinner,function = "gpio_out"; + pins = "PL10"; + function = "gpio_out"; }; sw_r_opc: key_pins@0 { - allwinner,pins = "PL3"; - allwinner,function = "gpio_in"; + pins = "PL3"; + function = "gpio_in"; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts index ab8593d1d3df..8c40ab7bfa72 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts @@ -76,15 +76,15 @@ &mmc2 { &mmc2_8bit_pins { /* Increase drive strength for DDR modes */ - allwinner,drive = ; + drive-strength = <40>; /* eMMC is missing pull-ups */ - allwinner,pull = ; + bias-pull-up; }; &pio { usb3_vbus_pin_a: usb3_vbus_pin@0 { - allwinner,pins = "PG11"; - allwinner,function = "gpio_out"; + pins = "PG11"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi index c3b5c516809c..e7f7502f6f25 100644 --- a/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/sun8i-h3.dtsi @@ -329,82 +329,82 @@ pio: pinctrl@01c20800 { #interrupt-cells = <3>; i2c0_pins: i2c0 { - allwinner,pins = "PA11", "PA12"; - allwinner,function = "i2c0"; + pins = "PA11", "PA12"; + function = "i2c0"; }; i2c1_pins: i2c1 { - allwinner,pins = "PA18", "PA19"; - allwinner,function = "i2c1"; + pins = "PA18", "PA19"; + function = "i2c1"; }; i2c2_pins: i2c2 { - allwinner,pins = "PE12", "PE13"; - allwinner,function = "i2c2"; + pins = "PE12", "PE13"; + function = "i2c2"; }; mmc0_pins_a: mmc0@0 { - allwinner,pins = "PF0", "PF1", "PF2", "PF3", - "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + pins = "PF0", "PF1", "PF2", "PF3", + "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; }; mmc0_cd_pin: mmc0_cd_pin@0 { - allwinner,pins = "PF6"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PF6"; + function = "gpio_in"; + bias-pull-up; }; mmc1_pins_a: mmc1@0 { - allwinner,pins = "PG0", "PG1", "PG2", "PG3", - "PG4", "PG5"; - allwinner,function = "mmc1"; - allwinner,drive = ; + pins = "PG0", "PG1", "PG2", "PG3", + "PG4", "PG5"; + function = "mmc1"; + drive-strength = <30>; }; mmc2_8bit_pins: mmc2_8bit { - allwinner,pins = "PC5", "PC6", "PC8", - "PC9", "PC10", "PC11", - "PC12", "PC13", "PC14", - "PC15", "PC16"; - allwinner,function = "mmc2"; - allwinner,drive = ; + pins = "PC5", "PC6", "PC8", + "PC9", "PC10", "PC11", + "PC12", "PC13", "PC14", + "PC15", "PC16"; + function = "mmc2"; + drive-strength = <30>; }; spi0_pins: spi0 { - allwinner,pins = "PC0", "PC1", "PC2", "PC3"; - allwinner,function = "spi0"; + pins = "PC0", "PC1", "PC2", "PC3"; + function = "spi0"; }; spi1_pins: spi1 { - allwinner,pins = "PA15", "PA16", "PA14", "PA13"; - allwinner,function = "spi1"; + pins = "PA15", "PA16", "PA14", "PA13"; + function = "spi1"; }; uart0_pins_a: uart0@0 { - allwinner,pins = "PA4", "PA5"; - allwinner,function = "uart0"; + pins = "PA4", "PA5"; + function = "uart0"; }; uart1_pins: uart1 { - allwinner,pins = "PG6", "PG7"; - allwinner,function = "uart1"; + pins = "PG6", "PG7"; + function = "uart1"; }; uart1_rts_cts_pins: uart1_rts_cts { - allwinner,pins = "PG8", "PG9"; - allwinner,function = "uart1"; + pins = "PG8", "PG9"; + function = "uart1"; }; uart2_pins: uart2 { - allwinner,pins = "PA0", "PA1"; - allwinner,function = "uart2"; + pins = "PA0", "PA1"; + function = "uart2"; }; uart3_pins: uart3 { - allwinner,pins = "PA13", "PA14"; - allwinner,function = "uart3"; + pins = "PA13", "PA14"; + function = "uart3"; }; }; @@ -600,8 +600,8 @@ r_pio: pinctrl@01f02c00 { #interrupt-cells = <3>; ir_pins_a: ir@0 { - allwinner,pins = "PL11"; - allwinner,function = "s_cir_rx"; + pins = "PL11"; + function = "s_cir_rx"; }; }; }; diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi index 0f680b7f5e03..c676940a96da 100644 --- a/arch/arm/boot/dts/sun8i-q8-common.dtsi +++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi @@ -83,14 +83,14 @@ sdio_wifi: sdio_wifi@1 { }; &mmc1_pins_a { - allwinner,pull = ; + bias-pull-up; }; &r_pio { wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 { - allwinner,pins = "PL6", "PL7", "PL11"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PL6", "PL7", "PL11"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts index 0588fceb0636..6e42adbde60b 100644 --- a/arch/arm/boot/dts/sun8i-r16-parrot.dts +++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts @@ -149,8 +149,8 @@ &mmc2 { }; &mmc2_8bit_pins { - allwinner,drive = ; - allwinner,pull = ; + drive-strength = <40>; + bias-pull-up; }; &ohci0 { @@ -159,32 +159,32 @@ &ohci0 { &pio { mmc0_cd_pin_parrot: mmc0_cd_pin@0 { - allwinner,pins = "PD14"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PD14"; + function = "gpio_in"; + bias-pull-up; }; led_pins_parrot: led_pins@0 { - allwinner,pins = "PE16", "PE17"; - allwinner,function = "gpio_out"; + pins = "PE16", "PE17"; + function = "gpio_out"; }; usb0_id_det: usb0_id_detect_pin@0 { - allwinner,pins = "PD10"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PD10"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_parrot: usb1_vbus_pin@0 { - allwinner,pins = "PD12"; - allwinner,function = "gpio_out"; + pins = "PD12"; + function = "gpio_out"; }; }; &r_pio { wifi_reset_pin_parrot: wifi_reset_pin@0 { - allwinner,pins = "PL6"; - allwinner,function = "gpio_out"; + pins = "PL6"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi index 7517faae54a4..1493516e01d9 100644 --- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi +++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi @@ -94,25 +94,25 @@ &mmc0 { &pio { bl_en_pin: bl_en_pin@0 { - allwinner,pins = "PH6"; - allwinner,function = "gpio_in"; + pins = "PH6"; + function = "gpio_in"; }; mmc0_cd_pin: mmc0_cd_pin@0 { - allwinner,pins = "PB4"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PB4"; + function = "gpio_in"; + bias-pull-up; }; ts_power_pin: ts_power_pin@0 { - allwinner,pins = "PH1"; - allwinner,function = "gpio_out"; + pins = "PH1"; + function = "gpio_out"; }; usb0_id_detect_pin: usb0_id_detect_pin@0 { - allwinner,pins = "PH8"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH8"; + function = "gpio_in"; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index 5ae52cb3d164..9112a200fd5e 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -108,7 +108,7 @@ &mmc1 { }; &mmc1_pins { - allwinner,pull = ; + bias-pull-up; }; &mmc2 { @@ -123,7 +123,7 @@ &mmc2 { &mmc2_8bit_pins { /* Increase drive strength for DDR modes */ - allwinner,drive = ; + drive-strength = <40>; }; &osc32k { @@ -133,14 +133,14 @@ &osc32k { &pio { led_pins_cubieboard4: led-pins@0 { - allwinner,pins = "PH6", "PH17"; - allwinner,function = "gpio_out"; + pins = "PH6", "PH17"; + function = "gpio_out"; }; mmc0_cd_pin_cubieboard4: mmc0_cd_pin@0 { - allwinner,pins = "PH18"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH18"; + function = "gpio_in"; + bias-pull-up; }; }; @@ -150,8 +150,8 @@ &r_ir { &r_pio { wifi_en_pin_cubieboard4: wifi_en_pin@0 { - allwinner,pins = "PL2"; - allwinner,function = "gpio_out"; + pins = "PL2"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index dce94424fda6..0fc3a87f5576 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -150,7 +150,7 @@ &mmc1 { }; &mmc1_pins { - allwinner,pull = ; + bias-pull-up; }; &mmc2 { @@ -165,7 +165,7 @@ &mmc2 { &mmc2_8bit_pins { /* Increase drive strength for DDR modes */ - allwinner,drive = ; + drive-strength = <40>; }; &ohci0 { @@ -183,24 +183,24 @@ &osc32k { &pio { led_pins_optimus: led-pins@0 { - allwinner,pins = "PH0", "PH1"; - allwinner,function = "gpio_out"; + pins = "PH0", "PH1"; + function = "gpio_out"; }; mmc0_cd_pin_optimus: mmc0_cd_pin@0 { - allwinner,pins = "PH18"; - allwinner,function = "gpio_in"; - allwinner,pull = ; + pins = "PH18"; + function = "gpio_in"; + bias-pull-up; }; usb1_vbus_pin_optimus: usb1_vbus_pin@1 { - allwinner,pins = "PH4"; - allwinner,function = "gpio_out"; + pins = "PH4"; + function = "gpio_out"; }; usb3_vbus_pin_optimus: usb3_vbus_pin@1 { - allwinner,pins = "PH5"; - allwinner,function = "gpio_out"; + pins = "PH5"; + function = "gpio_out"; }; }; @@ -210,13 +210,13 @@ &r_ir { &r_pio { led_r_pins_optimus: led-pins@1 { - allwinner,pins = "PM15"; - allwinner,function = "gpio_out"; + pins = "PM15"; + function = "gpio_out"; }; wifi_en_pin_optimus: wifi_en_pin@0 { - allwinner,pins = "PL2"; - allwinner,function = "gpio_out"; + pins = "PL2"; + function = "gpio_out"; }; }; diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 510b1462cb05..b97db1df0803 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi @@ -687,41 +687,41 @@ pio: pinctrl@06000800 { #gpio-cells = <3>; i2c3_pins_a: i2c3@0 { - allwinner,pins = "PG10", "PG11"; - allwinner,function = "i2c3"; + pins = "PG10", "PG11"; + function = "i2c3"; }; mmc0_pins: mmc0 { - allwinner,pins = "PF0", "PF1" ,"PF2", "PF3", - "PF4", "PF5"; - allwinner,function = "mmc0"; - allwinner,drive = ; + pins = "PF0", "PF1" ,"PF2", "PF3", + "PF4", "PF5"; + function = "mmc0"; + drive-strength = <30>; }; mmc1_pins: mmc1 { - allwinner,pins = "PG0", "PG1" ,"PG2", "PG3", + pins = "PG0", "PG1" ,"PG2", "PG3", "PG4", "PG5"; - allwinner,function = "mmc1"; - allwinner,drive = ; + function = "mmc1"; + drive-strength = <30>; }; mmc2_8bit_pins: mmc2_8bit { - allwinner,pins = "PC6", "PC7", "PC8", "PC9", - "PC10", "PC11", "PC12", - "PC13", "PC14", "PC15", - "PC16"; - allwinner,function = "mmc2"; - allwinner,drive = ; + pins = "PC6", "PC7", "PC8", "PC9", + "PC10", "PC11", "PC12", + "PC13", "PC14", "PC15", + "PC16"; + function = "mmc2"; + drive-strength = <30>; }; uart0_pins_a: uart0@0 { - allwinner,pins = "PH12", "PH13"; - allwinner,function = "uart0"; + pins = "PH12", "PH13"; + function = "uart0"; }; uart4_pins_a: uart4@0 { - allwinner,pins = "PG12", "PG13", "PG14", "PG15"; - allwinner,function = "uart4"; + pins = "PG12", "PG13", "PG14", "PG15"; + function = "uart4"; }; }; @@ -903,15 +903,15 @@ r_pio: pinctrl@08002c00 { #gpio-cells = <3>; r_ir_pins: r_ir { - allwinner,pins = "PL6"; - allwinner,function = "s_cir_rx"; + pins = "PL6"; + function = "s_cir_rx"; }; r_rsb_pins: r_rsb { - allwinner,pins = "PN0", "PN1"; - allwinner,function = "s_rsb"; - allwinner,drive = ; - allwinner,pull = ; + pins = "PN0", "PN1"; + function = "s_rsb"; + drive-strength = <20>; + bias-pull-up; }; }; diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi index 358b8d9b4703..17c09fed9e84 100644 --- a/arch/arm/boot/dts/sunxi-common-regulators.dtsi +++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi @@ -47,23 +47,23 @@ &pio { ahci_pwr_pin_a: ahci_pwr_pin@0 { - allwinner,pins = "PB8"; - allwinner,function = "gpio_out"; + pins = "PB8"; + function = "gpio_out"; }; usb0_vbus_pin_a: usb0_vbus_pin@0 { - allwinner,pins = "PB9"; - allwinner,function = "gpio_out"; + pins = "PB9"; + function = "gpio_out"; }; usb1_vbus_pin_a: usb1_vbus_pin@0 { - allwinner,pins = "PH6"; - allwinner,function = "gpio_out"; + pins = "PH6"; + function = "gpio_out"; }; usb2_vbus_pin_a: usb2_vbus_pin@0 { - allwinner,pins = "PH3"; - allwinner,function = "gpio_out"; + pins = "PH3"; + function = "gpio_out"; }; };