ARM: sunxi: Convert pinctrl nodes to generic bindings

[linux-2.6-microblaze.git] / arch / arm / boot / dts / sun7i-a20-bananapro.dts

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index 3666364..19d63d4 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -182,34 +182,34 @@
 
 &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";
        };
 };