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-sabreauto.dts b/arch/arm/boot/dts/imx6q-arm2.dts
similarity index 91%
rename from arch/arm/boot/dts/imx6q-sabreauto.dts
rename to arch/arm/boot/dts/imx6q-arm2.dts
index eef6d640e655c8825e88c47c0c46ec71ed9aa516..c3977e0478b9a1ba7f9376d827fb377910f1275a 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -14,8 +14,8 @@
 /include/ "imx6q.dtsi"
 
 / {
-       model = "Freescale i.MX6 Quad SABRE Automotive Board";
-       compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
+       model = "Freescale i.MX6 Quad Armadillo2 Board";
+       compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
        chosen {
                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";

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,
 };