From 7bfe6212a89ca0581ba712d339f781ea3e90662b Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Wed, 27 Jun 2012 10:18:12 +0200
Subject: [PATCH] --- yaml --- r: 313228 b: refs/heads/master c:
 330eaaf947abe81b020ed23e9b46d1e620e55457 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/arm/boot/dts/cfa10036.dts | 43 ++++++++++++++++++++++++++++
 trunk/arch/arm/mach-mxs/mach-mxs.c   |  1 +
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/boot/dts/cfa10036.dts

diff --git a/[refs] b/[refs]
index 6734538f0915..cec36ff2b19f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8385e7c1db749f526e04854b48c12f1bd079b65e
+refs/heads/master: 330eaaf947abe81b020ed23e9b46d1e620e55457
diff --git a/trunk/arch/arm/boot/dts/cfa10036.dts b/trunk/arch/arm/boot/dts/cfa10036.dts
new file mode 100644
index 000000000000..28b93262bfc4
--- /dev/null
+++ b/trunk/arch/arm/boot/dts/cfa10036.dts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012 Free Electrons
+ *
+ * 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/ "imx28.dtsi"
+
+/ {
+	model = "Crystalfontz CFA-10036 Board";
+	compatible = "crystalfontz,cfa10036", "fsl,imx28";
+
+	memory {
+		reg = <0x40000000 0x08000000>;
+	};
+
+	apb@80000000 {
+		apbh@80000000 {
+			ssp0: ssp@80010000 {
+				compatible = "fsl,imx28-mmc";
+				pinctrl-names = "default";
+				pinctrl-0 = <&mmc0_4bit_pins_a
+					&mmc0_cd_cfg &mmc0_sck_cfg>;
+				bus-width = <4>;
+				status = "okay";
+			};
+		};
+
+		apbx@80040000 {
+			duart: serial@80074000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&duart_pins_b>;
+				status = "okay";
+			};
+		};
+	};
+};
diff --git a/trunk/arch/arm/mach-mxs/mach-mxs.c b/trunk/arch/arm/mach-mxs/mach-mxs.c
index 167f64911e72..8d764f20d4b7 100644
--- a/trunk/arch/arm/mach-mxs/mach-mxs.c
+++ b/trunk/arch/arm/mach-mxs/mach-mxs.c
@@ -161,6 +161,7 @@ static const char *imx23_dt_compat[] __initdata = {
 };
 
 static const char *imx28_dt_compat[] __initdata = {
+	"crystalfontz,cfa10036",
 	"fsl,imx28-evk",
 	"fsl,imx28",
 	NULL,