diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 641b3c9..c1710ab 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -210,7 +210,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
    sun4i-a10-mini-xplus.dtb \
    sun4i-a10-hackberry.dtb \
    sun5i-a10s-olinuxino-micro.dtb \
-   sun5i-a13-olinuxino.dtb
+   sun5i-a13-olinuxino.dtb \
+   sun7i-a20-cubieboard2.dtb
 dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
    tegra20-iris-512.dtb \
    tegra20-medcom-wide.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
new file mode 100644
index 0000000..28e5b6c
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -0,0 +1,32 @@
+/*
+ * 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/ "sun7i-a20.dtsi"
+
+/ {
+   model = "Cubietech Cubieboard2";
+   compatible = "cubietech,a20-cubieboard2", "allwinner,sun7i-a20";
+
+   aliases {
+       serial0 = &uart0;
+   };
+
+   chosen {
+       #bootargs = "earlyprintk console=ttyS0,115200 rdinit=/sbin/init panic=10";
+       bootargs = "dtuart=serial0 sync_console earlyprintk console=ttyS0,115200 rdinit=/sbin/init panic=10";
+       xen,dom0-bootargs = "earlyprintk console=ttyS0,115200";
+   };
+
+   soc@01c20000 {
+       uart0: serial@01c28000 {
+           status = "okay";
+       };
+   };
+};
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
new file mode 100644
index 0000000..d6c90e7
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -0,0 +1,68 @@
+/*
+ * 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
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+   interrupt-parent = <&gic>;
+
+   cpus {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       cpu@0 {
+           device_type = "cpu";
+           compatible = "arm,cortex-a7";
+           reg = <0x0>;
+       };
+   };
+
+   memory {
+       reg = <0x40000000 0x80000000>;
+   };
+
+   soc@01c20000 {
+       compatible = "simple-bus";
+       #address-cells = <1>;
+       #size-cells = <1>;
+       reg = <0x01c20000 0x300000>;
+       ranges;
+
+       gic: interrupt-controller@2c001000 {
+           compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
+           #interrupt-cells = <3>;
+           #address-cells = <0>;
+           interrupt-controller;
+           reg = <0x01c81000 0x1000>,
+                 <0x01c82000 0x1000>,
+                 <0x01c83000 0x2000>,
+                 <0x01c85000 0x2000>;
+           /* This is pure guest work... */
+           interrupts = <1 9 0xf08>;
+       };
+
+       timer {
+           compatible = "arm,armv7-timer";
+           /* These interrupts are pure guest work... */
+           interrupts = <1 13 0xf08>,
+                    <1 14 0xf08>,
+                    <1 11 0xf08>,
+                    <1 10 0xf08>;
+       };
+
+       uart0: serial@01c28000 {
+           compatible = "snps,dw-apb-uart";
+           reg = <0x01c28000 0x400>;
+           interrupts = <1 1 0xf08>;
+           reg-shift = <2>;
+           reg-io-width = <4>;
+           status = "disabled";
+       };
+
+   };
+};
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 84485a1..6085033 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -95,6 +95,7 @@ static const char * const sunxi_board_dt_compat[] = {
    "allwinner,sun4i-a10",
    "allwinner,sun5i-a10s",
    "allwinner,sun5i-a13",
+   "allwinner,sun7i-a20",
    NULL,
 };