summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShenwei Wang <shenwei.wang@nxp.com>2019-02-28 09:08:57 -0600
committerShenwei Wang <shenwei.wang@nxp.com>2019-02-28 11:05:15 -0600
commiteb98561b1223dd3714b126ad59886f10bdec1cd2 (patch)
tree8e786ce7be7ae7a22d0f640898ea50420de20c14
parent931a2276a3a972f98b8f79ced2f1afc313d519c6 (diff)
MLK-20998 ARM: dts: imx7ulp: move testing features to EVKB.
Move the emmc/lpuart/sdcard/sensor/spi-slave testing features from EVK to EVKB board. Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com> Reviewed-by: Frank Li <frank.li@nxp.com>
-rw-r--r--arch/arm/boot/dts/Makefile10
-rw-r--r--arch/arm/boot/dts/imx7ulp-evkb-emmc.dts (renamed from arch/arm/boot/dts/imx7ulp-evk-emmc.dts)2
-rw-r--r--arch/arm/boot/dts/imx7ulp-evkb-lpuart.dts (renamed from arch/arm/boot/dts/imx7ulp-evk-lpuart.dts)2
-rw-r--r--arch/arm/boot/dts/imx7ulp-evkb-sd1.dts (renamed from arch/arm/boot/dts/imx7ulp-evk-sd1.dts)2
-rw-r--r--arch/arm/boot/dts/imx7ulp-evkb-sensors-to-i2c5.dts (renamed from arch/arm/boot/dts/imx7ulp-evk-sensors-to-i2c5.dts)2
-rw-r--r--arch/arm/boot/dts/imx7ulp-evkb-spi-slave.dts (renamed from arch/arm/boot/dts/imx7ulp-evk-spi-slave.dts)2
6 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 32b1d7586855..76780229f9d6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -646,16 +646,16 @@ dtb-$(CONFIG_SOC_IMX7D) += \
dtb-$(CONFIG_SOC_IMX7ULP) += \
imx7ulp-14x14-arm2.dtb \
imx7ulp-evk.dtb \
- imx7ulp-evk-spi-slave.dtb \
- imx7ulp-evk-emmc.dtb \
+ imx7ulp-evkb-spi-slave.dtb \
+ imx7ulp-evkb-emmc.dtb \
imx7ulp-evk-emmc-qspi.dtb \
imx7ulp-evk-ft5416.dtb \
- imx7ulp-evk-sd1.dtb \
- imx7ulp-evk-lpuart.dtb \
+ imx7ulp-evkb-sd1.dtb \
+ imx7ulp-evkb-lpuart.dtb \
imx7ulp-evk-qspi.dtb \
imx7ulp-evk-wm8960.dtb \
imx7ulp-evk-mipi.dtb \
- imx7ulp-evk-sensors-to-i2c5.dtb \
+ imx7ulp-evkb-sensors-to-i2c5.dtb \
imx7ulp-evkb.dtb \
imx7ulp-evkb-mipi.dtb \
imx7ulp-evkb-rm68200-wxga.dtb \
diff --git a/arch/arm/boot/dts/imx7ulp-evk-emmc.dts b/arch/arm/boot/dts/imx7ulp-evkb-emmc.dts
index 403bfb28e2be..fbd04b8c8868 100644
--- a/arch/arm/boot/dts/imx7ulp-evk-emmc.dts
+++ b/arch/arm/boot/dts/imx7ulp-evkb-emmc.dts
@@ -7,7 +7,7 @@
* published by the Free Software Foundation.
*/
-#include "imx7ulp-evk.dts"
+#include "imx7ulp-evkb.dts"
/* To support eMMC HS200/HS400, need to do the following reowrk:
* 1,remove TF sd slot, replace eMMC chip
diff --git a/arch/arm/boot/dts/imx7ulp-evk-lpuart.dts b/arch/arm/boot/dts/imx7ulp-evkb-lpuart.dts
index 6c9dba0f2a35..a5e804c6e7d6 100644
--- a/arch/arm/boot/dts/imx7ulp-evk-lpuart.dts
+++ b/arch/arm/boot/dts/imx7ulp-evkb-lpuart.dts
@@ -6,7 +6,7 @@
* published by the Free Software Foundation.
*/
-#include "imx7ulp-evk.dts"
+#include "imx7ulp-evkb.dts"
&lpi2c7 {
status = "disabled";
diff --git a/arch/arm/boot/dts/imx7ulp-evk-sd1.dts b/arch/arm/boot/dts/imx7ulp-evkb-sd1.dts
index e5bdf04acc88..c29134dbacfb 100644
--- a/arch/arm/boot/dts/imx7ulp-evk-sd1.dts
+++ b/arch/arm/boot/dts/imx7ulp-evkb-sd1.dts
@@ -7,7 +7,7 @@
* published by the Free Software Foundation.
*/
-#include "imx7ulp-evk.dts"
+#include "imx7ulp-evkb.dts"
/ {
regulators {
diff --git a/arch/arm/boot/dts/imx7ulp-evk-sensors-to-i2c5.dts b/arch/arm/boot/dts/imx7ulp-evkb-sensors-to-i2c5.dts
index 54f0e619de20..cfc7402b1b60 100644
--- a/arch/arm/boot/dts/imx7ulp-evk-sensors-to-i2c5.dts
+++ b/arch/arm/boot/dts/imx7ulp-evkb-sensors-to-i2c5.dts
@@ -1,5 +1,5 @@
-#include "imx7ulp-evk.dts"
+#include "imx7ulp-evkb.dts"
&lpi2c5 {
diff --git a/arch/arm/boot/dts/imx7ulp-evk-spi-slave.dts b/arch/arm/boot/dts/imx7ulp-evkb-spi-slave.dts
index 217f5b83395e..3e38544add00 100644
--- a/arch/arm/boot/dts/imx7ulp-evk-spi-slave.dts
+++ b/arch/arm/boot/dts/imx7ulp-evkb-spi-slave.dts
@@ -7,7 +7,7 @@
* published by the Free Software Foundation.
*/
-#include "imx7ulp-evk.dts"
+#include "imx7ulp-evkb.dts"
/delete-node/&spidev0;