ARM: sunxi: Convert pinctrl nodes to generic bindings
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Fri, 23 Sep 2016 11:28:10 +0000 (14:28 +0300)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 26 Dec 2016 07:27:11 +0000 (08:27 +0100)
Now that we can handle the generic pinctrl bindings, convert our DT to it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
99 files changed:
arch/arm/boot/dts/sun4i-a10-a1000.dts
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
arch/arm/boot/dts/sun4i-a10-hackberry.dts
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
arch/arm/boot/dts/sun4i-a10-inet1.dts
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
arch/arm/boot/dts/sun4i-a10-marsboard.dts
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
arch/arm/boot/dts/sun4i-a10-mk802.dts
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
arch/arm/boot/dts/sun4i-a10-pcduino.dts
arch/arm/boot/dts/sun4i-a10-pcduino2.dts
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
arch/arm/boot/dts/sun5i-a10s-mk802.dts
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
arch/arm/boot/dts/sun5i-a10s.dtsi
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
arch/arm/boot/dts/sun5i-a13.dtsi
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
arch/arm/boot/dts/sun5i-gr8-evb.dts
arch/arm/boot/dts/sun5i-gr8.dtsi
arch/arm/boot/dts/sun5i-r8-chip.dts
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
arch/arm/boot/dts/sun5i.dtsi
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
arch/arm/boot/dts/sun6i-a31-colombus.dts
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
arch/arm/boot/dts/sun6i-a31-i7.dts
arch/arm/boot/dts/sun6i-a31-m9.dts
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
arch/arm/boot/dts/sun6i-a31.dtsi
arch/arm/boot/dts/sun6i-a31s-primo81.dts
arch/arm/boot/dts/sun6i-a31s-sina31s.dts
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
arch/arm/boot/dts/sun7i-a20-bananapi.dts
arch/arm/boot/dts/sun7i-a20-bananapro.dts
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
arch/arm/boot/dts/sun7i-a20-m3.dts
arch/arm/boot/dts/sun7i-a20-mk808c.dts
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
arch/arm/boot/dts/sun7i-a20-orangepi.dts
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
arch/arm/boot/dts/sun7i-a20.dtsi
arch/arm/boot/dts/sun8i-a23-a33.dtsi
arch/arm/boot/dts/sun8i-a23-evb.dts
arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
arch/arm/boot/dts/sun8i-a33-olinuxino.dts
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
arch/arm/boot/dts/sun8i-a33.dtsi
arch/arm/boot/dts/sun8i-a83t.dtsi
arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
arch/arm/boot/dts/sun8i-h3.dtsi
arch/arm/boot/dts/sun8i-q8-common.dtsi
arch/arm/boot/dts/sun8i-r16-parrot.dts
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
arch/arm/boot/dts/sun9i-a80-optimus.dts
arch/arm/boot/dts/sun9i-a80.dtsi
arch/arm/boot/dts/sunxi-common-regulators.dtsi

index 4d8164afc671e54344ba39cd991cda47ccb9e32f..68c6bdb2cf7ccfbd492a83d904fce8eab1d37125 100644 (file)
 
 &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";
        };
 };
 
index 5f98582232d67b36b8194d488f354047f70616e4..942d739a438464bbf4e36b6e13581445bbcbf625 100644 (file)
 
 &pio {
        usb2_vbus_pin_a: usb2_vbus_pin@0 {
-               allwinner,pins = "PH12";
+               pins = "PH12";
        };
 };
 
index e9d839bc85628e39860543e41696880466978f0a..17f8c5ec011c4415203e7ae7243b23e777f50dd1 100644 (file)
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index e7188d2fb303e57a089f0c51183a817b7fa3eeba..04e040e6233d081ddd6b04fece52a3cc94551014 100644 (file)
 
 &pio {
        led_pins_cubieboard: led_pins@0 {
-               allwinner,pins = "PH20", "PH21";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index b4b829d6008d13c1ab2cbc53f0e45aebfdf15fce..8317fbfeec4a477a6c84099346421096a73479e1 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index 57496a38b94a48c7f104daa1788c33200c58e52b..9616cdecce930ba80b3827697b969cc3d6694742 100644 (file)
 
 &pio {
        codec_pa_pin: codec_pa_pin@0 {
-               allwinner,pins = "PH15";
-               allwinner,function = "gpio_out";
+               pins = "PH15";
+               function = "gpio_out";
        };
 };
 
index de10ae48c6f64cb99aab5a95ba82738adc6142bf..a48b4647441710e5e41bef064860f7744a103f3a 100644 (file)
        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";
        };
 };
 
index f3f8b90fb9c88180f786bc43dfb4c0f90420a5be..85dcf81ab64ef0fd67d49881f7efe1b54c0248a4 100644 (file)
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
 };
 
 &usb2_vbus_pin_a {
-       allwinner,pins = "PH6";
+       pins = "PH6";
 };
 
 &usb_otg {
index f78c17a9a298e8bb44713e39c59c3bf9be9bcd44..f3092703a1a6a6b7e858d9b3a41ecaf63457826e 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index 5ba4cd4b2acaa39d486c392a2d734a21f8b1008b..a1a2bbb3f9d38977befea181a45b4a8400158731 100644 (file)
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index 5ea154f08364b07d934922713a5d95e48faabe35..4ef2a60a8cd49e36265535e36b97371612773f1c 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index e6ffaefed42d2c97888242bb2315ccc6ff371f4f..fc4d4d49e2e2e2659acf833a54f0d737a6ee3b97 100644 (file)
 
 &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";
        };
 };
 
index 001656eb9171624d39947e3647bd460ccc5f4062..a2885039d5f1646a0a3c21819ee4aa7ee19e3c46 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index a7dd86d30fa2711ba2533670cff0cc8559377505..af42ebb3a97b20811642fcc265ee53b7ffd8ad26 100644 (file)
@@ -93,7 +93,7 @@
 
 &ir0_rx_pins_a {
        /* The ir receiver is not always populated */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &mmc0 {
index 9ce39f75188eb044627deaefaa2d018bb5478a1c..9c1afd4277d75b69d3ee73f09aac76404c75979b 100644 (file)
 
 &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";
        };
 };
 
index 203d399f0f7bd0239db63b8ef5c45d4e116a2438..214a5accfe9302a7025c2acad4c977d402510e06 100644 (file)
 
 &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 = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index 94cdef53ac11262f73ef0cb010b70cfffdb4b485..b0365d63ba70ab7ce46a994890bb6035a134191d 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 9656ec9b51aec174b9257bc3dbf5b5d0e6a48ca3..811d00ee2aded649d4aa92674f7da34b0d61e022 100644 (file)
@@ -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";
        };
 };
 
index 9dedd808bde8494f6cb5076e649e5951185d134c..bfa6bbdaab276eaaa03b394c5223eb9471c3ace1 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index bafedf74f434582f4d39bfa74a733ab21c9439bc..dae838e4dd9ee4f4bceb21eff99e902d2007d9b0 100644 (file)
                        #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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_PULL_UP>;
+                               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 = <SUN4I_PINCTRL_PULL_UP>;
+                               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";
                        };
                };
 
index 8d1e414c0a3ad5c04644507f8058ecfd54d3a40f..a539b72ce093d0150b2b97e7817a6a57b67f7e32 100644 (file)
 
 &pio {
        mmc0_cd_pin_t003: mmc0_cd_pin@0 {
-               allwinner,pins = "PG1";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG1";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_t003: led_pins@0 {
-               allwinner,pins = "PB2";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               pins = "PB2";
+               function = "gpio_out";
+               drive-strength = <20>;
        };
 };
 
 };
 
 &usb0_vbus_pin_a {
-       allwinner,pins = "PG13";
+       pins = "PG13";
 };
 
 &usb1_vbus_pin_a {
-       allwinner,pins = "PB10";
+       pins = "PB10";
 };
 
 &usb_otg {
index e3438a685c7107a64ee996dc7360b4e961c7a5f8..e1b5e8a446fecd11baac888f800e9e86633f6bff 100644 (file)
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PG12";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_20_MA>;
+               pins = "PB2";
+               function = "gpio_out";
+               drive-strength = <20>;
        };
 };
 
 };
 
 &usb1_vbus_pin_a {
-       allwinner,pins = "PG13";
+       pins = "PG13";
 };
 
 &usbphy {
index 405c1d51930114dc6a603215d71544d304d86a9a..020aa9d6c31daa5c8c2718d0ba2467a10b6e413e 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 7c77183924f1d7cf74743a8cc4599fb9c7ec896a..d8245c6314a7e8228e967e6b8014b01468029d45 100644 (file)
 
 &pio {
        mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
-               allwinner,pins = "PG1";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG13";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_olinuxino: led_pins@0 {
-               allwinner,pins = "PE3";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG12";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
 };
 
 &usb0_vbus_pin_a {
-       allwinner,pins = "PG11";
+       pins = "PG11";
 };
 
 &usbphy {
index e2dceda4889b6e9323bcba06da1999dd6a68b6cd..51371f9b1cf0699243a7b4c6f446ff745e28b8ad 100644 (file)
 
 &pio {
        mmc0_cd_pin_r7: mmc0_cd_pin@0 {
-               allwinner,pins = "PG1";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG1";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_r7: led_pins@0 {
-               allwinner,pins = "PB2";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               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";
        };
 };
 
index f40451bffb843e857a0951b7271bc6eb88608e0e..2b8adda0dedad1d838db4471e2e03c50483d96c4 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
 };
 
 &usb1_vbus_pin_a {
-       allwinner,pins = "PG12";
+       pins = "PG12";
 };
 
 &usbphy {
index ef1e2ab103d7f52a956ab1cafa97e73eb73f4dcc..62b3ffe62df2a30cac25687afb207d658fc7e0af 100644 (file)
        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 = <SUN4I_PINCTRL_30_MA>;
+               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";
        };
 };
 
index 693be366ab9c9736c3d944d548ebb1799141fe35..42435454acefe1e5bf211f0fce6d6f0986a3e9f5 100644 (file)
 
 &pio {
        mmc0_cd_pin_d709: mmc0_cd_pin@0 {
-               allwinner,pins = "PG0";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG2";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
 };
 
 &usb0_vbus_pin_a {
-       allwinner,pins = "PG12";
+       pins = "PG12";
 };
 
 &usbphy {
index f5d1a04f3a16a28b91c0570e386f2b4e6c7a7bb9..5879a75cf97a3b1982d0c80b5c20b278b9610def 100644 (file)
 
 &pio {
        mmc0_cd_pin_h702: mmc0_cd_pin@0 {
-               allwinner,pins = "PG0";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
 };
 
 &usb0_vbus_pin_a {
-       allwinner,pins = "PG12";
+       pins = "PG12";
 };
 
 &usbphy {
index df9315e5c850ba2840b4047d661cfd68bb5c51cd..60e393e287832a1a09dace62e72a20563d3866a9 100644 (file)
 
 &pio {
        mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {
-               allwinner,pins = "PG0";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG0";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_olinuxinom: led_pins@0 {
-               allwinner,pins = "PG9";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               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";
        };
 };
 
index b9179b36f608cb2261a2e3d86819569cf51e535d..940d47e880561289e1ca71c93e3cbabb22613817 100644 (file)
 
 &pio {
        mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
-               allwinner,pins = "PG0";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG0";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_olinuxino: led_pins@0 {
-               allwinner,pins = "PG9";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               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";
        };
 };
 
 };
 
 &usb0_vbus_pin_a {
-       allwinner,pins = "PG12";
+       pins = "PG12";
 };
 
 &usbphy {
index 8bc6a4b1b233794d76987030af003b2125d020e5..bfdd38d6bfccc6af92e7225d3713ca103243e53f 100644 (file)
@@ -80,7 +80,7 @@
 };
 
 &codec_pa_pin {
-       allwinner,pins = "PG3";
+       pins = "PG3";
 };
 
 &mmc2 {
 
 &pio {
        i2c_lcd_pins: i2c_lcd_pin@0 {
-               allwinner,pins = "PG10", "PG12";
-               allwinner,function = "gpio_out";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG10", "PG12";
+               function = "gpio_out";
+               bias-pull-up;
        };
 };
 
 };
 
 &usb0_vbus_pin_a {
-       allwinner,pins = "PB4";
+       pins = "PB4";
 };
index 1f4c5f7732264011d2f25c5cea4591cdb2f77e71..4131ab44558bac931a3ccba70e30da9a7f8f069c 100644 (file)
        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";
        };
 };
index e29e708e9fafa083a7e43755f83b84ed7b72be04..0cf0813d363a8a19a884f03bd01cc0ef16163d40 100644 (file)
 
 &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";
        };
 };
 
index af5bf886a4d5c6f29c41dad4677e3229c5396c8c..1a845af4d4db7432164ec2c50025996b1acbf207 100644 (file)
 
 &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";
        };
 };
 
index 5a03453c397b4f789360ecd8c75fbc93c26cde9d..f83ae3fc632981634c8ba57e9798ad22c2463542 100644 (file)
                        #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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_PULL_UP>;
+                               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";
                        };
                };
 
index 702a0d2ddb771dfb165bff4b20bce81dc60b681f..e86fa46fdd4553c4afb41a8ef66cd803734457b4 100644 (file)
 };
 
 &mmc0_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &mmc0 {
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PD2";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 0f2e539e540bce47a8877be695c3077f38ba1320..8a4d2277826f03fccdb52b4e1cf4ecbd5f511fa0 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG0";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        ts_power_pin: ts_power_pin {
        };
 
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
-               allwinner,pins = "PG1";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 40d0cf5d560aad26b7efde57a063fdf37e685ed9..7ab6b336533ed6c9c0521da9a9b9c0a680701101 100644 (file)
                        #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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                               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";
                        };
                };
 
index cbc99ce6ab1af136ba429d7aeeb988eb106ec04a..effbdc766938590cae987afbf3ef638d60532ca1 100644 (file)
@@ -68,8 +68,8 @@
 
 &pio {
        usb1_vbus_pin_a: usb1_vbus_pin@0 {
-               allwinner,pins = "PH27";
-               allwinner,function = "gpio_out";
+               pins = "PH27";
+               function = "gpio_out";
        };
 };
 
index 24909c8c11863c5ba9077b6146e9d08206ed5565..f5ececd45bc0333bbbede4bd7acd40673a25d8ea 100644 (file)
 };
 
 &mmc0_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &pio {
        mmc0_cd_pin_colombus: mmc0_cd_pin@0 {
-               allwinner,pins = "PA8";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PA23", "PA24";
+               function = "gpio_out";
+               bias-pull-up;
        };
 };
 
index 2d3782edd77070a344a2bafa15fcd5232c7de2fe..b168d6df2b30fea0e32b48d13204dbd0e19aa579 100644 (file)
 
 &mmc0_pins_a {
        /* external pull-ups missing for some pins */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &mmc1 {
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
 
 &usb1_vbus_pin_a {
        /* different pin from sunxi-common-regulators */
-       allwinner,pins = "PH24";
+       pins = "PH24";
 };
 
 &usbphy {
index 61e3ef4528ec9dbdc2391df3ed8ba84b64b2ef20..f3468a14596e3d9aed1c2e217ef5bd33a8cc8d40 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 96ad1fe9bbc8f358d02e6e3e061139d2ea9a8e5c..8af5b667a46d01d9c4efabe3bdc846fdcd22ca84 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index a29ea186b964ed3e43944af39e5bdef1d8b600df..bf0f5831126f15710348e0dd00012295dbf43d36 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index ee153a2c9e57c8093eb941ee8fa6a951cbc5da47..7ea1116c7c886e604552af9f8f84f8558fdc5a2b 100644 (file)
                        #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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_40_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_40_MA>;
+                               function = "mmc3";
+                               drive-strength = <40>;
                        };
 
                        uart0_pins_a: uart0@0 {
-                               allwinner,pins = "PH20", "PH21";
-                               allwinner,function = "uart0";
+                               pins = "PH20", "PH21";
+                               function = "uart0";
                        };
                };
 
                        #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";
                        };
                };
 
index f511aa0e250da90d4cf833f2ccf823699c1017ed..2238eda318f60f060d7c82ad290d3a1271ce1358 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PA8";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index f7b681ef0e8b1bb352c55976caee35586a3a97fc..8743aeed127521a0e6e7a5cdd909591cca5ac09f 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PA4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 3731cf22abc1db252344b26452e0dd84b34d642c..3bd862bf82a968caebd44f512ae0e0a76866fcea 100644 (file)
 };
 
 &mmc0_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &mmc2 {
 };
 
 &mmc2_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 832392125b8e7661d88311d4f5d61085ef20d562..154ebf5082ed3543a3d48c48da866dbe71a65034 100644 (file)
@@ -92,9 +92,9 @@
 
 &pio {
        mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 {
-               allwinner,pins = "PA8";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PA8";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
 };
 
 &mmc0_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &p2wi {
index 2e7443fc1790ca85d43ce8a90562b0de8223257d..edaba5f904fd8eccaf518dc9389d183d16c62c56 100644 (file)
 
 &pio {
        mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 {
-               allwinner,pins = "PA8";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PA15";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index aa9a1ff89a9d74377d38306b59cd1c1716e1f826..08e776ae095a36ada2aea0a6c62738f72acf4a51 100644 (file)
 
 &mmc3_pins_a {
        /* AP6210 requires pull-up */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &ohci0 {
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 7cd6a74d104cac460003337ac62858379f9f5dc3..91f2e5f9efcbe30219fafc4bca99cdebb9386d41 100644 (file)
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 366636451e7e4e4dc6fede8affb44dcbd7de4405..19d63d4049de68983d08973f6f5dfc4128d82ffc 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index e635dd6ac47dc9f5609e59b1489b42f05196268b..4dc1e10f88c47ba5769757933f22e5d363f6db65 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index be8fa4879453fa865825525afe3cbd18b102fc47..f019aa3fe96d86031000c4cf6ddaa03656669594 100644 (file)
 
 &mmc3_pins_a {
        /* AP6210 requires pull-up */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &ohci0 {
 
 &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";
        };
 };
 
index 6719c701a45f8853a6e44266096140ce4efa4576..e921ba42f1703c11f2c1182d0ae67b6e793ea550 100644 (file)
 
 &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";
        };
 };
 
index d64c11134dd7cfff0b6fd05b5b0c505e8bcc154f..385fd8232ae00b83f1b9e14073a3a144cc9b0b66 100644 (file)
 
 &mmc3_pins_a {
        /* AP6210 / AP6330 requires pull-up */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &ohci0 {
 
 &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";
        };
 };
 
index 44f09642c8933f9384d25d2846e18819b0d7264e..d52222c82cb8f3cfb06f7081eced17fc432b3595 100644 (file)
 
 &pio {
        led_pins_itead_core: led_pins@0 {
-               allwinner,pins = "PH20","PH21";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               pins = "PH20","PH21";
+               function = "gpio_out";
+               drive-strength = <20>;
        };
 };
 
index 79cee00a85de9b1a684ad49a6011d5f18d247b14..72ec0d5ae052cda33bc05a0086cd7e34a684184c 100644 (file)
@@ -87,7 +87,7 @@
 };
 
 &ahci_pwr_pin_a {
-       allwinner,pins = "PB3";
+       pins = "PB3";
 };
 
 &ahci {
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
 };
 
 &usb2_vbus_pin_a {
-       allwinner,pins = "PH12";
+       pins = "PH12";
 };
 
 &usbphy {
index 97ce27da445f55b60bdbeb85874955ee3213ad2b..0e074bd0e8c924e6164b92c91c1c6d49bcda7268 100644 (file)
 
 &pio {
        led_pins_m3: led_pins@0 {
-               allwinner,pins = "PH20";
-               allwinner,function = "gpio_out";
+               pins = "PH20";
+               function = "gpio_out";
        };
 };
 
index c5890617382c95d39da131693a5a58a8724f2656..97d7a8b65a0313b1167f13aaa45199be4ec388f3 100644 (file)
 
 &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";
        };
 };
 
index 1ba112ccbb4691ab91c0cfde45489dbe384ac6f1..7af9541421326b6f0634b80de6ce44f023cdceaa 100644 (file)
 
 &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 = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 21946497789efab2448526f520e938a816a9b140..1297432c28021701cafe96b3080cc61505eec413 100644 (file)
 
 &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 = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index 6858d6aafea3121bf046b4c56ccf2298cbba1a61..6efd915b00eedeeed8482e9d3c3411117b021d6c 100644 (file)
@@ -57,8 +57,8 @@
 
 &pio {
        mmc2_pins_nrst: mmc2@0 {
-               allwinner,pins = "PC16";
-               allwinner,function = "gpio_out";
+               pins = "PC16";
+               function = "gpio_out";
        };
 };
 
index 3dcd745126a9382d9aeed0f8b473603a06999b80..b421d5170e0aa512ea6a71f3cfb82274dcd21c82 100644 (file)
 
 &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 = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               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";
        };
 };
 
index 3773926df96eca05558b1ab0854f163158bd8d54..223fbd9f7c62db31d1f0e72c56664df0159b54f0 100644 (file)
 
 &pio {
        mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
-               allwinner,pins = "PH11";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH11";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_olinuxino: led_pins@0 {
-               allwinner,pins = "PH2";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_DOWN>;
+               pins = "PH5";
+               function = "gpio_in";
+               bias-pull-down;
        };
 };
 
index 8e05256f7c1bd53a2b1d29ed3798d5ea128b72de..a7426574922781b4801569ad784206ca5ba1e64b 100644 (file)
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index d168b8f08e303f423cc9e3ca0a9984deff2e93ad..3de980c8f8ff9ab4ebfb8484875d634f7bc72204 100644 (file)
 
 &pio {
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PH4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index cdcbee74274efe02fc89c775add9a45726c33a76..f47a5c46bc20a4a8ca7b3a8b6d282b4f67769eb9 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index fd2b4b8af9eabd4033ae903b549536219df07acb..4599f98a3aeee60c89f291fcf517a09042644d3f 100644 (file)
 };
 
 &ahci_pwr_pin_a {
-       allwinner,pins = "PH2";
+       pins = "PH2";
 };
 
 &codec {
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 688f75ceab580a65ccf74b4e00982544a6e9f737..e19f171777551b06b4511ccd3409a32543add7da 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index b12493350ee3fbe8c34034aed06481e77075c351..c3078d4f10930a80b26f483a7b984e44261465f8 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index ce16a8ca6db46e21c8834ab30b63fd9a8e1a67d4..34d613b0dd730278416e06569cbdc6a49790b39f 100644 (file)
                        #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 = <SUN4I_PINCTRL_40_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_PULL_UP>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_PULL_UP>;
+                               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";
                        };
                };
 
index 0219da4099bde9d18e3f6327ad105abc7df678b9..ecb49a5a76150561c617fb3d8fa4b3372a5a5e2c 100644 (file)
                        #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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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";
                        };
                };
 
                        #gpio-cells = <3>;
 
                        r_rsb_pins: r_rsb {
-                               allwinner,pins = "PL0", "PL1";
-                               allwinner,function = "s_rsb";
-                               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                               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";
                        };
                };
 
index 490a5a6da50f529a4f94bb886a463259c7f459e2..c21f5b1b255e27d33b932988ec426bf9032e57f7 100644 (file)
 
 &pio {
        mmc0_cd_pin_evb: mmc0_cd_pin@0 {
-               allwinner,pins = "PB4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PB4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 8ed0bc3048b342617680d8d8c16ecca33488e83a..649e31339662832c4fa64bbfe18cd07bc1aef61b 100644 (file)
 };
 
 &mmc1_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       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";
        };
 };
 
index e8367deaa587550f239dd37379f10b8120f75c6e..6b3bcae089f2e5905bc8f328b45e04125dcf92c5 100644 (file)
 };
 
 &mmc1_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       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";
        };
 };
 
index 442db91b943a95bbcd5ec01d52593c1dc88bbf72..3e05959104f175768ec6d2ecb04b4ff973eddf5b 100644 (file)
@@ -71,7 +71,7 @@
 };
 
 &mmc1_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &mmc1 {
@@ -89,9 +89,9 @@
 
 &r_pio {
        led_pin_d978: led_pin_d978@0 {
-               allwinner,pins = "PL5";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+               pins = "PL5";
+               function = "gpio_out";
+               drive-strength = <20>;
        };
 };
 
index 59a64d2d695c7cd97457a5a2479f52e1a35b5a48..231d115d19971929355a1594de1895bda2c54b3d 100644 (file)
 
 &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";
        };
 };
 
index df58dfb442cc8f2d2dcc2cade35db46f076dad45..370ee82882debfae8bc3c7fc62fc0c198c4b4fb0 100644 (file)
 
 &mmc2_8bit_pins {
        /* Increase drive strength for DDR modes */
-       allwinner,drive = <SUN4I_PINCTRL_40_MA>;
+       drive-strength = <40>;
        /* eMMC is missing pull-ups */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &ohci0 {
 
 &pio {
        mmc0_cd_pin_sina33: mmc0_cd_pin@0 {
-               allwinner,pins = "PB4";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PB4";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 310a38cf7f183c0df1ba85a1d2dc6ca3d9452b2c..63d5181ffff825669330802c18c31cc6c9f3786e 100644 (file)
                     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
 
        uart0_pins_b: uart0@1 {
-               allwinner,pins = "PB0", "PB1";
-               allwinner,function = "uart0";
+               pins = "PB0", "PB1";
+               function = "uart0";
        };
 
 };
index cec6bfc2d3c9ccc9524cb8dcef396697ab06ab66..656cdb5f7a8895b16edd0fb2f0e8d95e6e12c338 100644 (file)
                        #gpio-cells = <3>;
 
                        mmc0_pins_a: mmc0@0 {
-                               allwinner,pins = "PF0", "PF1", "PF2",
-                                                "PF3", "PF4", "PF5";
-                               allwinner,function = "mmc0";
-                               allwinner,drive = <SUN4I_PINCTRL_30_MA>;
+                               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";
                        };
                };
 
index 49194c38d56b4558ce88b1434d4519092ed9f7af..c0c49dd4d3b268d88f6347a9ff0104d22bfd6093 100644 (file)
 
 &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";
        };
 };
 
index 52ed2249528da48abd8e8558b6657d14221363f7..2216e68d1838b2615717f866314d717de161761f 100644 (file)
 
 &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";
        };
 };
 
index dfd9bc2008fdfef3631a2e35e51f8257c9a4a0fa..047e9e1c609326b5a7338c1d50afe5ef35017a54 100644 (file)
 
 &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";
        };
 };
 
 };
 
 &usb1_vbus_pin_a {
-       allwinner,pins = "PG13";
+       pins = "PG13";
 };
 
 &usbphy {
index 77d29bae7739c6bfc5d4d53fc3fec3eaaaa6914a..22b99b407019b3bb09f8dc1fd623849728fa47f1 100644 (file)
 
 &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";
        };
 };
 
index 49529d9ca26d335b61370a31054aa9db462b5fab..34da853ee0372b6b284b72c371eb25c4a2ecb28e 100644 (file)
 
 &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";
        };
 };
 
index 851fd2c2cc8cc3d671163af5a41bd37590159a8f..8b93f5c781a70b565ed0012d2c29b35f04987dcd 100644 (file)
@@ -82,7 +82,7 @@
 
 &mmc2_8bit_pins {
        /* Increase drive strength for DDR modes */
-       allwinner,drive = <SUN4I_PINCTRL_40_MA>;
+       drive-strength = <40>;
        /* eMMC is missing pull-ups */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
index 0d56d33d43ea0ec02f960cad0de6875fcbe869fc..98b85be61e17d68b43e24c66bf851aaa2999f254 100644 (file)
 
 &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";
        };
 };
 
index ab8593d1d3df0942dd7bfad56b255656449ba1b1..8c40ab7bfa72145f74213980818705fde45a1e4b 100644 (file)
 
 &mmc2_8bit_pins {
        /* Increase drive strength for DDR modes */
-       allwinner,drive = <SUN4I_PINCTRL_40_MA>;
+       drive-strength = <40>;
        /* eMMC is missing pull-ups */
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &pio {
        usb3_vbus_pin_a: usb3_vbus_pin@0 {
-               allwinner,pins = "PG11";
-               allwinner,function = "gpio_out";
+               pins = "PG11";
+               function = "gpio_out";
        };
 };
 
index c3b5c516809c122d5419a2ecf4502f14d51bb00c..e7f7502f6f25e2ad02dcdc239ae87de28a412ba2 100644 (file)
                        #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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_PULL_UP>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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";
                        };
                };
 
                        #interrupt-cells = <3>;
 
                        ir_pins_a: ir@0 {
-                               allwinner,pins = "PL11";
-                               allwinner,function = "s_cir_rx";
+                               pins = "PL11";
+                               function = "s_cir_rx";
                        };
                };
        };
index 0f680b7f5e0363d0cadaae8520d25977f361f120..c676940a96dadd695aa20fdadfc15f9f0409ae23 100644 (file)
 };
 
 &mmc1_pins_a {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &r_pio {
        wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 {
-               allwinner,pins = "PL6", "PL7", "PL11";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PL6", "PL7", "PL11";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 0588fceb0636ece7e81dd82394a5bf09c6ab432a..6e42adbde60b727ac7c35e0aa7665e9d53a8dc3e 100644 (file)
 };
 
 &mmc2_8bit_pins {
-       allwinner,drive = <SUN4I_PINCTRL_40_MA>;
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       drive-strength = <40>;
+       bias-pull-up;
 };
 
 &ohci0 {
 
 &pio {
        mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
-               allwinner,pins = "PD14";
-               allwinner,function = "gpio_in";
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
index 7517faae54a4568c79c3d2e6772defc38b16c6b3..1493516e01d96e85241ee8a64253d50430f0586e 100644 (file)
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH8";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
index 5ae52cb3d1649960399c6404925e8bb76664036f..9112a200fd5e5d79d8f44104099b0fdfee6530d6 100644 (file)
 };
 
 &mmc1_pins {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &mmc2 {
 
 &mmc2_8bit_pins {
        /* Increase drive strength for DDR modes */
-       allwinner,drive = <SUN4I_PINCTRL_40_MA>;
+       drive-strength = <40>;
 };
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PH18";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
 
 &r_pio {
        wifi_en_pin_cubieboard4: wifi_en_pin@0 {
-               allwinner,pins = "PL2";
-               allwinner,function = "gpio_out";
+               pins = "PL2";
+               function = "gpio_out";
        };
 };
 
index dce94424fda6a82189ebdc0452d78436ee2c9635..0fc3a87f5576146dd21cfae48d4e92f6a1fa3831 100644 (file)
 };
 
 &mmc1_pins {
-       allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+       bias-pull-up;
 };
 
 &mmc2 {
 
 &mmc2_8bit_pins {
        /* Increase drive strength for DDR modes */
-       allwinner,drive = <SUN4I_PINCTRL_40_MA>;
+       drive-strength = <40>;
 };
 
 &ohci0 {
 
 &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 = <SUN4I_PINCTRL_PULL_UP>;
+               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";
        };
 };
 
 
 &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";
        };
 };
 
index 510b1462cb05abf0587b83371691c21d57d52775..b97db1df0803fdfeb9815ac67630acd00346b61e 100644 (file)
                        #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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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 = <SUN4I_PINCTRL_30_MA>;
+                               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";
                        };
                };
 
                        #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 = <SUN4I_PINCTRL_20_MA>;
-                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                               pins = "PN0", "PN1";
+                               function = "s_rsb";
+                               drive-strength = <20>;
+                               bias-pull-up;
                        };
                };
 
index 358b8d9b4703247d971b4679a75993f80f1589b0..17c09fed9e84d2b38490c7627b4ef938b135ddc6 100644 (file)
 
 &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";
        };
 };