6 files changed, 127 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 2752a13f1b60..e7d3444caed8 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -263,6 +263,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
         sun4i-a10-hackberry.dtb \
         sun5i-a10s-olinuxino-micro.dtb \
         sun5i-a13-olinuxino.dtb \
+        sun5i-a13-olinuxino-micro.dtb \
         sun6i-a31-colombus.dtb \
         sun7i-a20-cubieboard2.dtb \
         sun7i-a20-cubietruck.dtb \
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 319cc6b509da..0bf70ee041ed 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -15,6 +15,10 @@
 / {
         interrupt-parent = <&intc>;
 
+        aliases {
+                ethernet0 = &emac;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -266,6 +270,12 @@
                         reg = <0x01c20c90 0x10>;
                 };
 
+                rtc: rtc@01c20d00 {
+                        compatible = "allwinner,sun4i-rtc";
+                        reg = <0x01c20d00 0x20>;
+                        interrupts = <24>;
+                };
+
                 sid: eeprom@01c23800 {
                         compatible = "allwinner,sun4i-sid";
                         reg = <0x01c23800 0x10>;
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 52476742a104..b4764be10a60 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -16,6 +16,10 @@
 / {
         interrupt-parent = <&intc>;
 
+        aliases {
+                ethernet0 = &emac;
+        };
+
         cpus {
                 cpu@0 {
                         compatible = "arm,cortex-a8";
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
new file mode 100644
index 000000000000..fe2ce0acdb06
--- /dev/null
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012 Maxime Ripard
+ * Copyright 2013 Hans de Goede <hdegoede@redhat.com>
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "sun5i-a13.dtsi"
+
+/ {
+        model = "Olimex A13-Olinuxino Micro";
+        compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13";
+
+        soc@01c00000 {
+                pinctrl@01c20800 {
+                        led_pins_olinuxinom: led_pins@0 {
+                                allwinner,pins = "PG9";
+                                allwinner,function = "gpio_out";
+                                allwinner,drive = <1>;
+                                allwinner,pull = <0>;
+                        };
+                };
+
+                uart1: serial@01c28400 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart1_pins_b>;
+                        status = "okay";
+                };
+
+                i2c0: i2c@01c2ac00 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_pins_a>;
+                        status = "okay";
+                };
+
+                i2c1: i2c@01c2b000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c1_pins_a>;
+                        status = "okay";
+                };
+
+                i2c2: i2c@01c2b400 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c2_pins_a>;
+                        status = "okay";
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&led_pins_olinuxinom>;
+
+                power {
+                        label = "a13-olinuxino-micro:green:power";
+                        gpios = <&pio 6 9 0>;
+                        default-state = "on";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index c1751a64889a..6dd9393dde17 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -209,6 +209,24 @@
                         };
                 };
 
+                ahb1_rst: reset@01c202c0 {
+                        #reset-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-ahb1-reset";
+                        reg = <0x01c202c0 0xc>;
+                };
+
+                apb1_rst: reset@01c202d0 {
+                        #reset-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-clock-reset";
+                        reg = <0x01c202d0 0x4>;
+                };
+
+                apb2_rst: reset@01c202d8 {
+                        #reset-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-clock-reset";
+                        reg = <0x01c202d8 0x4>;
+                };
+
                 timer@01c20c00 {
                         compatible = "allwinner,sun4i-timer";
                         reg = <0x01c20c00 0xa0>;
@@ -232,6 +250,7 @@
                         reg-shift = <2>;
                         reg-io-width = <4>;
                         clocks = <&apb2_gates 16>;
+                        resets = <&apb2_rst 16>;
                         status = "disabled";
                 };
 
@@ -242,6 +261,7 @@
                         reg-shift = <2>;
                         reg-io-width = <4>;
                         clocks = <&apb2_gates 17>;
+                        resets = <&apb2_rst 17>;
                         status = "disabled";
                 };
 
@@ -252,6 +272,7 @@
                         reg-shift = <2>;
                         reg-io-width = <4>;
                         clocks = <&apb2_gates 18>;
+                        resets = <&apb2_rst 18>;
                         status = "disabled";
                 };
 
@@ -262,6 +283,7 @@
                         reg-shift = <2>;
                         reg-io-width = <4>;
                         clocks = <&apb2_gates 19>;
+                        resets = <&apb2_rst 19>;
                         status = "disabled";
                 };
 
@@ -272,6 +294,7 @@
                         reg-shift = <2>;
                         reg-io-width = <4>;
                         clocks = <&apb2_gates 20>;
+                        resets = <&apb2_rst 20>;
                         status = "disabled";
                 };
 
@@ -282,6 +305,7 @@
                         reg-shift = <2>;
                         reg-io-width = <4>;
                         clocks = <&apb2_gates 21>;
+                        resets = <&apb2_rst 21>;
                         status = "disabled";
                 };
 
@@ -295,5 +319,15 @@
                         #interrupt-cells = <3>;
                         interrupts = <1 9 0xf04>;
                 };
+
+                cpucfg@01f01c00 {
+                        compatible = "allwinner,sun6i-a31-cpuconfig";
+                        reg = <0x01f01c00 0x300>;
+                };
+
+                prcm@01f01c00 {
+                        compatible = "allwinner,sun6i-a31-prcm";
+                        reg = <0x01f01400 0x200>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index e46cfedde74c..74bf906ef786 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -16,6 +16,10 @@
 / {
         interrupt-parent = <&gic>;
 
+        aliases {
+                ethernet0 = &emac;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -265,6 +269,12 @@
                         reg = <0x01c20c90 0x10>;
                 };
 
+                rtc: rtc@01c20d00 {
+                        compatible = "allwinner,sun7i-a20-rtc";
+                        reg = <0x01c20d00 0x20>;
+                        interrupts = <0 24 1>;
+                };
+
                 sid: eeprom@01c23800 {
                         compatible = "allwinner,sun7i-a20-sid";
                         reg = <0x01c23800 0x200>;