diff options
author | Ye.Li <Ye.Li@freescale.com> | 2015-05-22 11:39:02 +0800 |
---|---|---|
committer | Ye.Li <Ye.Li@freescale.com> | 2015-05-25 17:17:16 +0800 |
commit | 639a371777f7f56d6cd2455aaf1f9bd7554fd7eb (patch) | |
tree | 2447a02c98753e8c8e1d446b903c8a1dc8f4e35e /arch/arm/boot | |
parent | daa58f5dd375e5df2b0245befc7825e0a1a7f6f9 (diff) |
MLK-10956 imx: mx6ul: Update dtb name for 14x14 package
Since there is 9x9 package for mx6ul, modify the dtb names of ddr3 arm2 board and
evk board to add 14x14 package info.
Signed-off-by: Ye.Li <Ye.Li@freescale.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 14 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts (renamed from arch/arm/boot/dts/imx6ul-ddr3-arm2-flexcan2.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts (renamed from arch/arm/boot/dts/imx6ul-ddr3-arm2-lcdif.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-mqs.dts (renamed from arch/arm/boot/dts/imx6ul-ddr3-arm2-mqs.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-spdif.dts (renamed from arch/arm/boot/dts/imx6ul-ddr3-arm2-spdif.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts (renamed from arch/arm/boot/dts/imx6ul-ddr3-arm2-wm8958.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts (renamed from arch/arm/boot/dts/imx6ul-ddr3-arm2.dts) | 0 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dts (renamed from arch/arm/boot/dts/imx6ul-evk.dts) | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 307c818b31f2..4500f5f4102b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -208,13 +208,13 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6sx-sabreauto.dtb \ imx6sx-sabreauto-m4.dtb \ imx6sx-sdb-lcdif1.dtb \ - imx6ul-ddr3-arm2.dtb \ - imx6ul-ddr3-arm2-flexcan2.dtb \ - imx6ul-ddr3-arm2-lcdif.dtb \ - imx6ul-ddr3-arm2-mqs.dtb \ - imx6ul-ddr3-arm2-spdif.dtb \ - imx6ul-ddr3-arm2-wm8958.dtb \ - imx6ul-evk.dtb \ + imx6ul-14x14-ddr3-arm2.dtb \ + imx6ul-14x14-ddr3-arm2-flexcan2.dtb \ + imx6ul-14x14-ddr3-arm2-lcdif.dtb \ + imx6ul-14x14-ddr3-arm2-mqs.dtb \ + imx6ul-14x14-ddr3-arm2-spdif.dtb \ + imx6ul-14x14-ddr3-arm2-wm8958.dtb \ + imx6ul-14x14-evk.dtb \ vf610-cosmic.dtb \ imx6sx-sdb-emmc.dtb \ imx6sx-sdb-m4.dtb \ diff --git a/arch/arm/boot/dts/imx6ul-ddr3-arm2-flexcan2.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts index 3ff8a617559e..7130367b77cc 100644 --- a/arch/arm/boot/dts/imx6ul-ddr3-arm2-flexcan2.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ul-ddr3-arm2.dts" +#include "imx6ul-14x14-ddr3-arm2.dts" &uart2{ status = "disabled"; diff --git a/arch/arm/boot/dts/imx6ul-ddr3-arm2-lcdif.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts index 82588a19719d..aeb3f993f9dd 100644 --- a/arch/arm/boot/dts/imx6ul-ddr3-arm2-lcdif.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-lcdif.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ul-ddr3-arm2.dts" +#include "imx6ul-14x14-ddr3-arm2.dts" / { backlight { diff --git a/arch/arm/boot/dts/imx6ul-ddr3-arm2-mqs.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-mqs.dts index 818127e17f4f..3427bc330638 100644 --- a/arch/arm/boot/dts/imx6ul-ddr3-arm2-mqs.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-mqs.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ul-ddr3-arm2.dts" +#include "imx6ul-14x14-ddr3-arm2.dts" / { sound-mqs { diff --git a/arch/arm/boot/dts/imx6ul-ddr3-arm2-spdif.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-spdif.dts index ce2eb8352992..b407150117a5 100644 --- a/arch/arm/boot/dts/imx6ul-ddr3-arm2-spdif.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-spdif.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ul-ddr3-arm2.dts" +#include "imx6ul-14x14-ddr3-arm2.dts" / { sound-spdif { diff --git a/arch/arm/boot/dts/imx6ul-ddr3-arm2-wm8958.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts index 1ac7dba83b77..568399832a07 100644 --- a/arch/arm/boot/dts/imx6ul-ddr3-arm2-wm8958.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ul-ddr3-arm2.dts" +#include "imx6ul-14x14-ddr3-arm2.dts" / { diff --git a/arch/arm/boot/dts/imx6ul-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts index 7abcb3515839..7abcb3515839 100644 --- a/arch/arm/boot/dts/imx6ul-ddr3-arm2.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts diff --git a/arch/arm/boot/dts/imx6ul-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts index c608d55156a5..35ec9dec9659 100644 --- a/arch/arm/boot/dts/imx6ul-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -12,8 +12,8 @@ #include "imx6ul.dtsi" / { - model = "Freescale i.MX6 UltraLite EVK Board"; - compatible = "fsl,imx6ul-evk", "fsl,imx6ul"; + model = "Freescale i.MX6 UltraLite 14x14 EVK Board"; + compatible = "fsl,imx6ul-14x14-evk", "fsl,imx6ul"; chosen { stdout-path = &uart1; |