From 2cad82bf34e7f23916304a73578bced1b51fe706 Mon Sep 17 00:00:00 2001
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date: Wed, 15 Aug 2012 19:07:35 +0200
Subject: [PATCH] --- yaml --- r: 331338 b: refs/heads/master c:
 1f5e6c639e25de9f059ea0e0181a5baeb3b3f4bf h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/boot/dts/dove-cubox.dts | 42 ++++++++++++++++++++++++++
 trunk/arch/arm/mach-dove/Makefile.boot |  1 +
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/boot/dts/dove-cubox.dts

diff --git a/[refs] b/[refs]
index 7ea1def53fcf..644a6c27d2ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80a8b54b9a0ba418f25d2014b1375f9f4876eb15
+refs/heads/master: 1f5e6c639e25de9f059ea0e0181a5baeb3b3f4bf
diff --git a/trunk/arch/arm/boot/dts/dove-cubox.dts b/trunk/arch/arm/boot/dts/dove-cubox.dts
new file mode 100644
index 000000000000..0adbd5a38095
--- /dev/null
+++ b/trunk/arch/arm/boot/dts/dove-cubox.dts
@@ -0,0 +1,42 @@
+/dts-v1/;
+
+/include/ "dove.dtsi"
+
+/ {
+	model = "SolidRun CuBox";
+	compatible = "solidrun,cubox", "marvell,dove";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x40000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		power {
+			label = "Power";
+			gpios = <&gpio0 18 1>;
+			linux,default-trigger = "default-on";
+		};
+	};
+};
+
+&uart0 { status = "okay"; };
+&sdio0 { status = "okay"; };
+&sata0 { status = "okay"; };
+&i2c0 { status = "okay"; };
+
+&spi0 {
+	status = "okay";
+
+	/* spi0.0: 4M Flash Winbond W25Q32BV */
+	spi-flash@0 {
+		compatible = "st,w25q32";
+		spi-max-frequency = <20000000>;
+		reg = <0>;
+	};
+};
diff --git a/trunk/arch/arm/mach-dove/Makefile.boot b/trunk/arch/arm/mach-dove/Makefile.boot
index 94ab6b3586a1..cfac9c5157cc 100644
--- a/trunk/arch/arm/mach-dove/Makefile.boot
+++ b/trunk/arch/arm/mach-dove/Makefile.boot
@@ -4,3 +4,4 @@ initrd_phys-y	:= 0x00800000
 
 dtb-$(CONFIG_MACH_DOVE_DT) += dove-dove-db.dtb
 dtb-$(CONFIG_MACH_DOVE_DT) += dove-cm-a510.dtb
+dtb-$(CONFIG_MACH_DOVE_DT) += dove-cubox.dtb