diff options
author | Bai Ping <ping.bai@nxp.com> | 2016-05-11 12:36:32 +0800 |
---|---|---|
committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
commit | c6debd830d7e0e2dc7710ebf48d50bf2b156e3df (patch) | |
tree | 148f7f680fa0f8e29adb75add6c4d03179119cac /arch/arm | |
parent | 6790200f3acfa6914f15f452ccb59a80420e1fe7 (diff) |
MLK-12776 ARM: dts: imx: rename the imx6ull dts by adding the die size
Add the dize size info in the ARM2 board dts file name to align with
i.MX6UL, so mfgtool and yocto script can handle the naming rule easily.
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 24 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-adc.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-cs42888.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-ecspi.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-ecspi.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-emmc.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-emmc.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-flexcan2.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-gpmi-weim.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-gpmi-weim.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-lcdif.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-qspi.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-uart2.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-uart2.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-usb.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-usb.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2-wm8958.dts) | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts (renamed from arch/arm/boot/dts/imx6ull-ddr3-arm2.dts) | 0 |
13 files changed, 23 insertions, 23 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 2078d9ec073d..6323c8e60cd3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -481,18 +481,18 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-9x9-evk-csi.dtb \ imx6ul-9x9-evk-ldo.dtb dtb-$(CONFIG_SOC_IMX6ULL) += \ - imx6ull-ddr3-arm2.dtb \ - imx6ull-ddr3-arm2-adc.dtb \ - imx6ull-ddr3-arm2-cs42888.dtb \ - imx6ull-ddr3-arm2-ecspi.dtb \ - imx6ull-ddr3-arm2-emmc.dtb \ - imx6ull-ddr3-arm2-flexcan2.dtb \ - imx6ull-ddr3-arm2-gpmi-weim.dtb \ - imx6ull-ddr3-arm2-lcdif.dtb \ - imx6ull-ddr3-arm2-qspi.dtb \ - imx6ull-ddr3-arm2-uart2.dtb \ - imx6ull-ddr3-arm2-usb.dtb \ - imx6ull-ddr3-arm2-wm8958.dtb + imx6ull-14x14-ddr3-arm2.dtb \ + imx6ull-14x14-ddr3-arm2-adc.dtb \ + imx6ull-14x14-ddr3-arm2-cs42888.dtb \ + imx6ull-14x14-ddr3-arm2-ecspi.dtb \ + imx6ull-14x14-ddr3-arm2-emmc.dtb \ + imx6ull-14x14-ddr3-arm2-flexcan2.dtb \ + imx6ull-14x14-ddr3-arm2-gpmi-weim.dtb \ + imx6ull-14x14-ddr3-arm2-lcdif.dtb \ + imx6ull-14x14-ddr3-arm2-qspi.dtb \ + imx6ull-14x14-ddr3-arm2-uart2.dtb \ + imx6ull-14x14-ddr3-arm2-usb.dtb \ + imx6ull-14x14-ddr3-arm2-wm8958.dtb dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-cl-som-imx7.dtb \ imx7d-colibri-eval-v3.dtb \ diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-adc.dts index c586459303b5..334597cac3ce 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-adc.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-adc.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" &usbotg1 { status = "disabled"; diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-cs42888.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts index ea95c6f2cbd0..a75fb1d5847f 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-cs42888.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" / { clocks { diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-ecspi.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-ecspi.dts index 81f9aecef347..e9012c95cb74 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-ecspi.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-ecspi.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" &ecspi1 { status ="okay"; diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-emmc.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-emmc.dts index 2c3b9758d856..7b244666d395 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-emmc.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-emmc.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" &usdhc1 { assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>; diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-flexcan2.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts index 3761224dad2a..7169630ccc51 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-flexcan2.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" /* flexcan2 tx/rx pin conflicts with uart2 */ diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-gpmi-weim.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-gpmi-weim.dts index bb0ba90b3aa6..d46a9f5de910 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-gpmi-weim.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-gpmi-weim.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" &gpmi { status ="okay"; diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-lcdif.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts index 52bd813ed117..1f12d12cf605 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-lcdif.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts @@ -8,7 +8,7 @@ /* DTS file for LCDIF at imx6ull ddr3 arm2 board */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" / { backlight { diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-qspi.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi.dts index d9330e7789ba..a4cdbe588d83 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-qspi.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-qspi.dts @@ -7,7 +7,7 @@ */ #define REWORKED_ENABLE_ALL_QSPI -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" &gpmi { status ="disabled"; diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-uart2.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-uart2.dts index c7c71497d5bf..6f157ea4656d 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-uart2.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-uart2.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" &flexcan2 { status = "disabled"; diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-usb.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-usb.dts index ed4f1448fecb..67e7be245602 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-usb.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-usb.dts @@ -8,7 +8,7 @@ /* DTS file for validate USB at i.mx6ull ddr3 arm2 board */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" / { regulators { diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-wm8958.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts index 112ecbf2d788..8ce93ff69c4e 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2-wm8958.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts @@ -6,7 +6,7 @@ * published by the Free Software Foundation. */ -#include "imx6ull-ddr3-arm2.dts" +#include "imx6ull-14x14-ddr3-arm2.dts" / { diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts index ea2a79750216..ea2a79750216 100644 --- a/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts |