Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / boot / dts / sun7i-a20-bananapi.dts

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index bd7b15add6972d26fbcffdfa010fe3435141c0b5..5dd139e7792e122edd1235a61dd6c2a452594d58 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -48,8 +48,12 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
        model = "LeMaker Banana Pi";
@@ -73,7 +77,7 @@
                        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
                        vmmc-supply = <&reg_vcc3v3>;
                        bus-width = <4>;
-                       cd-gpios = <&pio 7 10 0>; /* PH10 */
+                       cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
                        cd-inverted;
                        status = "okay";
                };
@@ -108,22 +112,22 @@
                        mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
                                allwinner,pins = "PH10";
                                allwinner,function = "gpio_in";
-                               allwinner,drive = <0>;
-                               allwinner,pull = <1>;
+                               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
                        };
 
                        gmac_power_pin_bananapi: gmac_power_pin@0 {
                                allwinner,pins = "PH23";
                                allwinner,function = "gpio_out";
-                               allwinner,drive = <0>;
-                               allwinner,pull = <0>;
+                               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                        };
 
                        led_pins_bananapi: led_pins@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>;
                        };
                };
 
@@ -160,7 +164,7 @@
                                compatible = "x-powers,axp209";
                                reg = <0x34>;
                                interrupt-parent = <&nmi_intc>;
-                               interrupts = <0 8>;
+                               interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 
                                interrupt-controller;
                                #interrupt-cells = <1>;
@@ -194,7 +198,7 @@
 
                green {
                        label = "bananapi:green:usr";
-                       gpios = <&pio 7 24 0>;
+                       gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -215,6 +219,6 @@
                regulator-max-microvolt = <3300000>;
                startup-delay-us = <100000>;
                enable-active-high;
-               gpio = <&pio 7 23 0>;
+               gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>;
        };
 };