---

yaml --- r: 326744 b: refs/heads/master c: db84c03 h: refs/heads/master v: v3
git-mirror · Sep 3, 2012 · 3736ef4 · 3736ef4
1 parent 8f937ed
commit 3736ef4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de7e934f2bd27e2636946600e4335c929fae3c87
+refs/heads/master: db84c038d6d7ff5ad1f18e2613b4d67583a7e40f
diff --git a/trunk/arch/arm/boot/dts/imx28-cfa10049.dts b/trunk/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -0,0 +1,31 @@
+/*
+ * 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
+ */
+
+/*
+ * The CFA-10049 is an expansion board for the CFA-10036 module, thus we
+ * need to include the CFA-10036 DTS.
+ */
+/include/ "imx28-cfa10036.dts"
+
+/ {
+	model = "Crystalfontz CFA-10049 Board";
+	compatible = "crystalfontz,cfa10049", "crystalfontz,cfa10036", "fsl,imx28";
+
+	apb@80000000 {
+		apbx@80040000 {
+			i2c1: i2c@8005a000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&i2c1_pins_a>;
+				status = "okay";
+			};
+		};
+	};
+};
diff --git a/trunk/arch/arm/mach-mxs/Makefile.boot b/trunk/arch/arm/mach-mxs/Makefile.boot
@@ -5,6 +5,7 @@ dtb-y += imx23-evk.dtb \
 	 imx23-stmp378x_devb.dtb \
 	 imx28-apx4devkit.dtb \
 	 imx28-cfa10036.dtb \
+	 imx28-cfa10049.dtb \
 	 imx28-evk.dtb \
 	 imx28-m28evk.dtb \
 	 imx28-tx28.dtb \