1 files changed, 68 insertions, 11 deletions

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index e31d291d14cb..6b24876ed462 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -48,20 +48,28 @@
  */
 
 /dts-v1/;
-/include/ "sun5i-a13.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun5i-a13.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
         model = "Olimex A13-Olinuxino";
         compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13";
 
+        aliases {
+                serial0 = &uart1;
+        };
+
         soc@01c00000 {
                 mmc0: mmc@01c0f000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
                         vmmc-supply = <&reg_vcc3v3>;
                         bus-width = <4>;
-                        cd-gpios = <&pio 6 0 0>; /* PG0 */
+                        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
                         cd-inverted;
                         status = "okay";
                 };
@@ -83,22 +91,62 @@
                         mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
                                 allwinner,pins = "PG0";
                                 allwinner,function = "gpio_in";
-                                allwinner,drive = <0>;
-                                allwinner,pull = <1>;
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
                         };
 
                         led_pins_olinuxino: led_pins@0 {
                                 allwinner,pins = "PG9";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <1>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_20_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
                         };
 
                         usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {
                                 allwinner,pins = "PG11";
                                 allwinner,function = "gpio_out";
-                                allwinner,drive = <0>;
-                                allwinner,pull = <0>;
+                                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+                                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+                        };
+                };
+
+                lradc: lradc@01c22800 {
+                        vref-supply = <&reg_vcc3v0>;
+                        status = "okay";
+
+                        button@191 {
+                                label = "Volume Up";
+                                linux,code = <KEY_VOLUMEUP>;
+                                channel = <0>;
+                                voltage = <191274>;
+                        };
+
+                        button@392 {
+                                label = "Volume Down";
+                                linux,code = <KEY_VOLUMEDOWN>;
+                                channel = <0>;
+                                voltage = <392644>;
+                        };
+
+                        button@601 {
+                                label = "Menu";
+                                linux,code = <KEY_MENU>;
+                                channel = <0>;
+                                voltage = <601151>;
+                        };
+
+                        button@795 {
+                                label = "Enter";
+                                linux,code = <KEY_ENTER>;
+                                channel = <0>;
+                                voltage = <795090>;
+                        };
+
+                        button@987 {
+                                label = "Home";
+                                linux,code = <KEY_HOMEPAGE>;
+                                channel = <0>;
+                                voltage = <987387>;
                         };
                 };
 
@@ -112,6 +160,15 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins_a>;
                         status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
                 };
 
                 i2c1: i2c@01c2b000 {
@@ -133,14 +190,14 @@
                 pinctrl-0 = <&led_pins_olinuxino>;
 
                 power {
-                        gpios = <&pio 6 9 0>;
+                        gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>;
                         default-state = "on";
                 };
         };
 
         reg_usb1_vbus: usb1-vbus {
                 pinctrl-0 = <&usb1_vbus_pin_olinuxino>;
-                gpio = <&pio 6 11 0>;
+                gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
                 status = "okay";
         };
 };