Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[pandora-kernel.git] / arch / arm / boot / dts / sun6i-a31-colombus.dts

diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index c36b4dc..84630e5 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -48,8 +48,11 @@
  */
 
 /dts-v1/;
-/include/ "sun6i-a31.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun6i-a31.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
        model = "WITS A31 Colombus Evaluation Board";
@@ -65,7 +68,7 @@
                        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>;
                        vmmc-supply = <&reg_vcc3v0>;
                        bus-width = <4>;
-                       cd-gpios = <&pio 0 8 0>; /* PA8 */
+                       cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
                        cd-inverted;
                        status = "okay";
                };
@@ -81,21 +84,21 @@
 
                pio: pinctrl@01c20800 {
                        mmc0_pins_a: mmc0@0 {
-                               allwinner,pull = <1>;
+                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
                        };
 
                        mmc0_cd_pin_colombus: mmc0_cd_pin@0 {
                                allwinner,pins = "PA8";
                                allwinner,function = "gpio_in";
-                               allwinner,drive = <0>;
-                               allwinner,pull = <1>;
+                               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
                        };
 
                        usb2_vbus_pin_colombus: usb2_vbus_pin@0 {
                                allwinner,pins = "PH24";
                                allwinner,function = "gpio_out";
-                               allwinner,drive = <0>;
-                               allwinner,pull = <0>;
+                               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
                };
 
@@ -127,7 +130,7 @@
        reg_usb2_vbus: usb2-vbus {
                pinctrl-names = "default";
                pinctrl-0 = <&usb2_vbus_pin_colombus>;
-               gpio = <&pio 7 24 0>;
+               gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>;
                status = "okay";
        };
 };