From b558b5c6b9c731df1af0c8286f6936f30c6a58dd Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Thu, 8 Dec 2011 08:22:01 +0100 Subject: [PATCH] --- yaml --- r: 281694 b: refs/heads/master c: 752baf5647d40dc67dc1b74125fa693ac2137563 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/arm/fsl.txt | 4 ++-- .../arch/arm/boot/dts/{imx6q-sabreauto.dts => imx6q-arm2.dts} | 4 ++-- trunk/arch/arm/mach-imx/mach-imx6q.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename trunk/arch/arm/boot/dts/{imx6q-sabreauto.dts => imx6q-arm2.dts} (91%) diff --git a/[refs] b/[refs] index 76db1b9c6a49..6d914ff63024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 477fce49aef4096639ca169556435c1f9068ce33 +refs/heads/master: 752baf5647d40dc67dc1b74125fa693ac2137563 diff --git a/trunk/Documentation/devicetree/bindings/arm/fsl.txt b/trunk/Documentation/devicetree/bindings/arm/fsl.txt index d4e50adbba4a..54bdddadf1cf 100644 --- a/trunk/Documentation/devicetree/bindings/arm/fsl.txt +++ b/trunk/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/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts b/trunk/arch/arm/boot/dts/imx6q-arm2.dts similarity index 91% rename from trunk/arch/arm/boot/dts/imx6q-sabreauto.dts rename to trunk/arch/arm/boot/dts/imx6q-arm2.dts index eef6d640e655..c3977e0478b9 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts +++ b/trunk/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/trunk/arch/arm/mach-imx/mach-imx6q.c b/trunk/arch/arm/mach-imx/mach-imx6q.c index b2c3f69fb4e9..bee633496f7b 100644 --- a/trunk/arch/arm/mach-imx/mach-imx6q.c +++ b/trunk/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, };