imx: kontron-sl-mx8mm: Adjust devicetree names, compatibles and model strings

This adjusts the names of the boards and SoMs to the official naming
used by Kontron marketing. These changes also affect devicetree
names and compatibles. The same changes have been submitted to the
Linux kernel.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: Fabio Estevam <festevam@denx.de>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 0459be1f860494d41731993c41778b1e122f32c2..8dd50d7adb5e1690072188a2264db989899cdd38 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -947,7 +947,7 @@ dtb-$(CONFIG_ARCH_IMX8M) += \
        imx8mm-evk.dtb \
        imx8mm-icore-mx8mm-ctouch2.dtb \
        imx8mm-icore-mx8mm-edimm2.2.dtb \
-       imx8mm-kontron-n801x-s.dtb \
+       imx8mm-kontron-bl.dtb \
        imx8mm-mx8menlo.dtb \
        imx8mm-venice.dtb \
        imx8mm-venice-gw71xx-0x.dtb \

diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi
similarity index 100%
rename from arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
rename to arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi

diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s.dts b/arch/arm/dts/imx8mm-kontron-bl.dts
similarity index 97%
rename from arch/arm/dts/imx8mm-kontron-n801x-s.dts
rename to arch/arm/dts/imx8mm-kontron-bl.dts
index 23be1ec538ba61b2057cc3f41f2e7796ae8cbcde..ca533baedcd2e327ec04dad316baabe70ea7a515 100644 (file)
--- a/arch/arm/dts/imx8mm-kontron-n801x-s.dts
+++ b/arch/arm/dts/imx8mm-kontron-bl.dts
@@ -5,11 +5,11 @@
 
 /dts-v1/;
 
-#include "imx8mm-kontron-n801x-som.dtsi"
+#include "imx8mm-kontron-sl.dtsi"
 
 / {
-       model = "Kontron i.MX8MM N801X S";
-       compatible = "kontron,imx8mm-n801x-s", "kontron,imx8mm-n801x-som", "fsl,imx8mm";
+       model = "Kontron BL i.MX8MM (N801X S)";
+       compatible = "kontron,imx8mm-bl", "kontron,imx8mm-sl", "fsl,imx8mm";
 
        aliases {
                ethernet1 = &usbnet;

diff --git a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi b/arch/arm/dts/imx8mm-kontron-sl.dtsi
similarity index 98%
rename from arch/arm/dts/imx8mm-kontron-n801x-som.dtsi
rename to arch/arm/dts/imx8mm-kontron-sl.dtsi
index 39c0ce19ef1bf5d415f96375538133bba563b17c..11a50cffc8c4c01663efe019b743a5c1e05e9585 100644 (file)
--- a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi
+++ b/arch/arm/dts/imx8mm-kontron-sl.dtsi
@@ -6,8 +6,8 @@
 #include "imx8mm.dtsi"
 
 / {
-       model = "Kontron i.MX8MM N801X SoM";
-       compatible = "kontron,imx8mm-n801x-som", "fsl,imx8mm";
+       model = "Kontron SL i.MX8MM (N801X SOM)";
+       compatible = "kontron,imx8mm-sl", "fsl,imx8mm";
 
        memory@40000000 {
                device_type = "memory";

diff --git a/board/kontron/sl-mx8mm/MAINTAINERS b/board/kontron/sl-mx8mm/MAINTAINERS
index 5e68ae0305ade768d4ac59be36e882937fb9dc11..e4e12d3f55890bd66cd72eb2fe6ccd636bbd5c9d 100644 (file)
--- a/board/kontron/sl-mx8mm/MAINTAINERS
+++ b/board/kontron/sl-mx8mm/MAINTAINERS
@@ -1,7 +1,7 @@
 Kontron SL/BL i.MX8M Mini Boards (N801x)
 M:     Frieder Schrempf <frieder.schrempf@kontron.de>
 S:     Maintained
-F:     arch/arm/dts/imx8mm-kontron-n801x-*
+F:     arch/arm/dts/imx8mm-kontron*
 F:     board/kontron/sl-mx8mm
 F:     configs/kontron-sl-mx8mm_defconfig
 F:     doc/board/kontron/sl-mx8mm.rst

diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c
index affdc136e1013bd6cb7b1d942d4789007e735f82..00e63659f4a4f0f176bb96d062d03aafae5044af 100644 (file)
--- a/board/kontron/sl-mx8mm/spl.c
+++ b/board/kontron/sl-mx8mm/spl.c
@@ -150,7 +150,8 @@ int do_board_detect(void)
 int board_fit_config_name_match(const char *name)
 {
        if (gd->board_type == BOARD_TYPE_KTN_N801X && is_imx8mm() &&
-           !strncmp(name, "imx8mm-kontron-n801x-s", 22))
+           (!strcmp(name, "imx8mm-kontron-n801x-s") ||
+            !strcmp(name, "imx8mm-kontron-bl")))
                return 0;
 
        return -1;

diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig
index f273f228303e3469309bad9c63af31f19703db4d..3b80ed2e142da771922b243c0b462931492a6426 100644 (file)
--- a/configs/kontron-sl-mx8mm_defconfig
+++ b/configs/kontron-sl-mx8mm_defconfig
@@ -11,7 +11,7 @@ CONFIG_ENV_SECT_SIZE=0x10000
 CONFIG_IMX_CONFIG="board/kontron/sl-mx8mm/imximage.cfg"
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s"
+CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-bl"
 CONFIG_SPL_TEXT_BASE=0x7E1000
 CONFIG_TARGET_KONTRON_MX8MM=y
 CONFIG_SPL_MMC=y