diff options
| -rw-r--r-- | Documentation/devicetree/bindings/arm/fsl.txt | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-arm2.dts (renamed from arch/arm/boot/dts/imx6q-sabreauto.dts) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt index d4e50adbba4a..54bdddadf1cf 100644 --- 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 | |||
| 21 | Required root node properties: | 21 | Required root node properties: |
| 22 | - compatible = "fsl,imx53-smd", "fsl,imx53"; | 22 | - compatible = "fsl,imx53-smd", "fsl,imx53"; |
| 23 | 23 | ||
| 24 | i.MX6 Quad SABRE Automotive Board | 24 | i.MX6 Quad Armadillo2 Board |
| 25 | Required root node properties: | 25 | Required root node properties: |
| 26 | - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; | 26 | - compatible = "fsl,imx6q-arm2", "fsl,imx6q"; |
| 27 | 27 | ||
| 28 | i.MX6 Quad SABRE Lite Board | 28 | i.MX6 Quad SABRE Lite Board |
| 29 | Required root node properties: | 29 | Required root node properties: |
diff --git a/arch/arm/boot/dts/imx6q-sabreauto.dts b/arch/arm/boot/dts/imx6q-arm2.dts index eef6d640e655..c3977e0478b9 100644 --- a/arch/arm/boot/dts/imx6q-sabreauto.dts +++ b/arch/arm/boot/dts/imx6q-arm2.dts | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | /include/ "imx6q.dtsi" | 14 | /include/ "imx6q.dtsi" |
| 15 | 15 | ||
| 16 | / { | 16 | / { |
| 17 | model = "Freescale i.MX6 Quad SABRE Automotive Board"; | 17 | model = "Freescale i.MX6 Quad Armadillo2 Board"; |
| 18 | compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; | 18 | compatible = "fsl,imx6q-arm2", "fsl,imx6q"; |
| 19 | 19 | ||
| 20 | chosen { | 20 | chosen { |
| 21 | bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait"; | 21 | 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 b2c3f69fb4e9..bee633496f7b 100644 --- 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 = { | |||
| 93 | }; | 93 | }; |
| 94 | 94 | ||
| 95 | static const char *imx6q_dt_compat[] __initdata = { | 95 | static const char *imx6q_dt_compat[] __initdata = { |
| 96 | "fsl,imx6q-sabreauto", | 96 | "fsl,imx6q-arm2", |
| 97 | "fsl,imx6q-sabrelite", | 97 | "fsl,imx6q-sabrelite", |
| 98 | NULL, | 98 | NULL, |
| 99 | }; | 99 | }; |
