1 files changed, 14 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index 3f3ff9693992..12ded69d61eb 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -49,8 +49,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 = "Olimex A20-OLinuXino-LIME";
@@ -62,7 +66,7 @@
                         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
                         vmmc-supply = <&reg_vcc3v3>;
                         bus-width = <4>;
-                        cd-gpios = <&pio 7 1 0>; /* PH1 */
+                        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
                         cd-inverted;
                         status = "okay";
                 };
@@ -98,15 +102,15 @@
                         ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
                                 allwinner,pins = "PC3";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <0>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         led_pins_olinuxinolime: led_pins@0 {
                                 allwinner,pins = "PH2";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <1>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
                 };
 
@@ -125,7 +129,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>;
@@ -152,14 +156,14 @@
 
                 green {
                         label = "a20-olinuxino-lime:green:usr";
-                        gpios = <&pio 7 2 0>;
+                        gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>;
                         default-state = "on";
                 };
         };
 
         reg_ahci_5v: ahci-5v {
                 pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
-                gpio = <&pio 2 3 0>;
+                gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
                 status = "okay";
         };