arm/imx6q: Rename Sabreauto to Armadillo2

The Sabreauto board was renamed to Armadillo2 recently. To avoid
confusion, rename Sabreauto to Armadillo2/arm2.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index d4e50adbba4af5fb129fd2a5e74b43084a2a2567..54bdddadf1cf66169b789e2ef53754eafd4bfcc6 100644 (file)
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -21,9 +21,9 @@ i.MX53 Smart Mobile Reference Design Board
 Required root node properties:
     - compatible = "fsl,imx53-smd", "fsl,imx53";
 
-i.MX6 Quad SABRE Automotive Board
+i.MX6 Quad Armadillo2 Board
 Required root node properties:
-    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
+    - compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
 i.MX6 Quad SABRE Lite Board
 Required root node properties:

diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
new file mode 100644 (file)
index 0000000..c3977e0
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * 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/ "imx6q.dtsi"
+
+/ {
+       model = "Freescale i.MX6 Quad Armadillo2 Board";
+       compatible = "fsl,imx6q-arm2", "fsl,imx6q";
+
+       chosen {
+               bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";
+       };
+
+       memory {
+               reg = <0x10000000 0x80000000>;
+       };
+
+       soc {
+               aips-bus@02100000 { /* AIPS2 */
+                       enet@02188000 {
+                               phy-mode = "rgmii";
+                               local-mac-address = [00 04 9F 01 1B 61];
+                               status = "okay";
+                       };
+
+                       usdhc@02198000 { /* uSDHC3 */
+                               cd-gpios = <&gpio6 11 0>;
+                               wp-gpios = <&gpio6 14 0>;
+                               status = "okay";
+                       };
+
+                       usdhc@0219c000 { /* uSDHC4 */
+                               fsl,card-wired;
+                               status = "okay";
+                       };
+
+                       uart4: uart@021f0000 {
+                               status = "okay";
+                       };
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               debug-led {
+                       label = "Heartbeat";
+                       gpios = <&gpio3 25 0>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+};

diff --git a/arch/arm/boot/dts/imx6q-sabreauto.dts b/arch/arm/boot/dts/imx6q-sabreauto.dts
deleted file mode 100644 (file)
index eef6d64..0000000
--- a/arch/arm/boot/dts/imx6q-sabreauto.dts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011 Freescale Semiconductor, Inc.
- * Copyright 2011 Linaro Ltd.
- *
- * 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/ "imx6q.dtsi"
-
-/ {
-       model = "Freescale i.MX6 Quad SABRE Automotive Board";
-       compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
-
-       chosen {
-               bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";
-       };
-
-       memory {
-               reg = <0x10000000 0x80000000>;
-       };
-
-       soc {
-               aips-bus@02100000 { /* AIPS2 */
-                       enet@02188000 {
-                               phy-mode = "rgmii";
-                               local-mac-address = [00 04 9F 01 1B 61];
-                               status = "okay";
-                       };
-
-                       usdhc@02198000 { /* uSDHC3 */
-                               cd-gpios = <&gpio6 11 0>;
-                               wp-gpios = <&gpio6 14 0>;
-                               status = "okay";
-                       };
-
-                       usdhc@0219c000 { /* uSDHC4 */
-                               fsl,card-wired;
-                               status = "okay";
-                       };
-
-                       uart4: uart@021f0000 {
-                               status = "okay";
-                       };
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               debug-led {
-                       label = "Heartbeat";
-                       gpios = <&gpio3 25 0>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-};

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index b2c3f69fb4e94825fe7e44390abd15ce9e596b88..bee633496f7be731bb356bffbba27ebbc4479908 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -93,7 +93,7 @@ static struct sys_timer imx6q_timer = {
 };
 
 static const char *imx6q_dt_compat[] __initdata = {
-       "fsl,imx6q-sabreauto",
+       "fsl,imx6q-arm2",
        "fsl,imx6q-sabrelite",
        NULL,
 };