[PATCH 0/4] ARM: dts: imx6ul-kontron: Improve devicetrees

[PATCH 0/4] ARM: dts: imx6ul-kontron: Improve devicetrees

[Frieder Schrempf]

From: Frieder Schrempf <frieder.schrempf@kontron.de>

This series contains some simplifications to the devicetree file structure
and updates the model names of the boards to match what is used officially
by the Kontron marketing.

The first patch also updates the bindings to match up with the changes applied
in the following patches.

This series doesn't contain any functional changes.

Frieder Schrempf (4):
  dt-bindings: arm: fsl: imx6ul-kontron: Update bindings
  ARM: dts: imx6ul-kontron: Simplify devicetree structure
  ARM: dts: imx6ul-kontron: Add imx6ull-kontron-n641x-s to Makefile
  ARM: dts: imx6ul-kontron: Adjust board and SoM model strings

 .../devicetree/bindings/arm/fsl.yaml          | 31 ++++++--------
 arch/arm/boot/dts/Makefile                    |  5 ++-
 .../boot/dts/imx6ul-kontron-n6310-som.dtsi    | 41 -------------------
 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts  | 16 --------
 .../boot/dts/imx6ul-kontron-n6311-som.dtsi    | 40 ------------------
 ...s-43.dts => imx6ul-kontron-n631x-s-43.dts} |  8 ++--
 ...n6310-s.dts => imx6ul-kontron-n631x-s.dts} |  6 +--
 .../boot/dts/imx6ul-kontron-n631x-som.dtsi    | 14 +++++++
 .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  | 15 +++++++
 .../boot/dts/imx6ull-kontron-n6411-som.dtsi   | 40 ------------------
 ...6411-s.dts => imx6ull-kontron-n641x-s.dts} |  6 +--
 .../boot/dts/imx6ull-kontron-n641x-som.dtsi   | 13 ++++++
 12 files changed, 67 insertions(+), 168 deletions(-)
 delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
 delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
 delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
 rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-n631x-s-43.dts} (93%)
 rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-n631x-s.dts} (65%)
 create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi
 delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
 rename arch/arm/boot/dts/{imx6ull-kontron-n6411-s.dts => imx6ull-kontron-n641x-s.dts} (60%)
 create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi

-- 
2.37.1

[PATCH 1/4] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings

[Frieder Schrempf]

From: Frieder Schrempf <frieder.schrempf@kontron.de>

This updates the bindings in order to simplify the devicetree
structure and to add names for the boards that follow the latest
convention used by Kontron marketing.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
 .../devicetree/bindings/arm/fsl.yaml          | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
index ef524378d449..7c4c27d553ec 100644
--- a/Documentation/devicetree/bindings/arm/fsl.yaml
+++ b/Documentation/devicetree/bindings/arm/fsl.yaml
@@ -553,8 +553,7 @@ properties:
               - engicam,imx6ul-isiot      # Engicam Is.IoT MX6UL eMMC/NAND Starter kit
               - fsl,imx6ul-14x14-evk      # i.MX6 UltraLite 14x14 EVK Board
               - karo,imx6ul-tx6ul         # Ka-Ro electronics TXUL-0010 Module
-              - kontron,imx6ul-n6310-som  # Kontron N6310 SOM
-              - kontron,imx6ul-n6311-som  # Kontron N6311 SOM
+              - kontron,imx6ul-n631x-som  # Kontron SL i.MX6UL (N631X SOM)
               - prt,prti6g                # Protonic PRTI6G Board
               - technexion,imx6ul-pico-dwarf   # TechNexion i.MX6UL Pico-Dwarf
               - technexion,imx6ul-pico-hobbit  # TechNexion i.MX6UL Pico-Hobbit
@@ -590,23 +589,17 @@ properties:
           - const: phytec,imx6ul-pcl063   # PHYTEC phyCORE-i.MX 6UL
           - const: fsl,imx6ul
 
-      - description: Kontron N6310 S Board
+      - description: Kontron BL i.MX6UL (N631X S) Board
         items:
-          - const: kontron,imx6ul-n6310-s
-          - const: kontron,imx6ul-n6310-som
+          - const: kontron,imx6ul-n631x-s
+          - const: kontron,imx6ul-n631x-som
           - const: fsl,imx6ul
 
-      - description: Kontron N6311 S Board
+      - description: Kontron BL i.MX6UL 43 (N631X S 43) Board
         items:
-          - const: kontron,imx6ul-n6311-s
-          - const: kontron,imx6ul-n6311-som
-          - const: fsl,imx6ul
-
-      - description: Kontron N6310 S 43 Board
-        items:
-          - const: kontron,imx6ul-n6310-s-43
-          - const: kontron,imx6ul-n6310-s
-          - const: kontron,imx6ul-n6310-som
+          - const: kontron,imx6ul-n631x-s-43
+          - const: kontron,imx6ul-n631x-s
+          - const: kontron,imx6ul-n631x-som
           - const: fsl,imx6ul
 
       - description: TQ-Systems TQMa6UL1 SoM on MBa6ULx board
@@ -636,7 +629,7 @@ properties:
           - enum:
               - fsl,imx6ull-14x14-evk     # i.MX6 UltraLiteLite 14x14 EVK Board
               - joz,jozacp                # JOZ Access Point
-              - kontron,imx6ull-n6411-som # Kontron N6411 SOM
+              - kontron,imx6ull-n641x-som # Kontron SL i.MX6ULL (N641X SOM)
               - myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
               - toradex,colibri-imx6ull      # Colibri iMX6ULL Modules
               - toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
@@ -697,10 +690,10 @@ properties:
           - const: toradex,colibri-imx6ull-wifi       # Colibri iMX6ULL Wi-Fi / BT Module
           - const: fsl,imx6ull
 
-      - description: Kontron N6411 S Board
+      - description: Kontron BL i.MX6ULL (N6411 S) Board
         items:
-          - const: kontron,imx6ull-n6411-s
-          - const: kontron,imx6ull-n6411-som
+          - const: kontron,imx6ull-n641x-s
+          - const: kontron,imx6ull-n641x-som
           - const: fsl,imx6ull
 
       - description: TQ Systems TQMa6ULLx SoM on MBa6ULx board
-- 
2.37.1

Re: [PATCH 1/4] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings

[Krzysztof Kozlowski]

On 09/08/2022 18:25, Frieder Schrempf wrote:
> From: Frieder Schrempf <frieder.schrempf@kontron.de>
> 
> This updates the bindings in order to simplify the devicetree
> structure and to add names for the boards that follow the latest
> convention used by Kontron marketing.
> 
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
>  .../devicetree/bindings/arm/fsl.yaml          | 31 +++++++------------
>  1 file changed, 12 insertions(+), 19 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
> index ef524378d449..7c4c27d553ec 100644
> --- a/Documentation/devicetree/bindings/arm/fsl.yaml
> +++ b/Documentation/devicetree/bindings/arm/fsl.yaml
> @@ -553,8 +553,7 @@ properties:
>                - engicam,imx6ul-isiot      # Engicam Is.IoT MX6UL eMMC/NAND Starter kit
>                - fsl,imx6ul-14x14-evk      # i.MX6 UltraLite 14x14 EVK Board
>                - karo,imx6ul-tx6ul         # Ka-Ro electronics TXUL-0010 Module
> -              - kontron,imx6ul-n6310-som  # Kontron N6310 SOM
> -              - kontron,imx6ul-n6311-som  # Kontron N6311 SOM
> +              - kontron,imx6ul-n631x-som  # Kontron SL i.MX6UL (N631X SOM)

Although board-level compatibles are not that important, yet still they
follow the same rules as other DT bindings: no wildcards for compatibles.

Therefore the change is not correct, in my opinion.

Best regards,
Krzysztof

Re: [PATCH 1/4] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings

[Frieder Schrempf]

Am 09.08.22 um 17:55 schrieb Krzysztof Kozlowski:
> On 09/08/2022 18:25, Frieder Schrempf wrote:
>> From: Frieder Schrempf <frieder.schrempf@kontron.de>
>>
>> This updates the bindings in order to simplify the devicetree
>> structure and to add names for the boards that follow the latest
>> convention used by Kontron marketing.
>>
>> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
>> ---
>>  .../devicetree/bindings/arm/fsl.yaml          | 31 +++++++------------
>>  1 file changed, 12 insertions(+), 19 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
>> index ef524378d449..7c4c27d553ec 100644
>> --- a/Documentation/devicetree/bindings/arm/fsl.yaml
>> +++ b/Documentation/devicetree/bindings/arm/fsl.yaml
>> @@ -553,8 +553,7 @@ properties:
>>                - engicam,imx6ul-isiot      # Engicam Is.IoT MX6UL eMMC/NAND Starter kit
>>                - fsl,imx6ul-14x14-evk      # i.MX6 UltraLite 14x14 EVK Board
>>                - karo,imx6ul-tx6ul         # Ka-Ro electronics TXUL-0010 Module
>> -              - kontron,imx6ul-n6310-som  # Kontron N6310 SOM
>> -              - kontron,imx6ul-n6311-som  # Kontron N6311 SOM
>> +              - kontron,imx6ul-n631x-som  # Kontron SL i.MX6UL (N631X SOM)
> 
> Although board-level compatibles are not that important, yet still they
> follow the same rules as other DT bindings: no wildcards for compatibles.
> 
> Therefore the change is not correct, in my opinion.

Ok, I see your point. I will look for a way to get rid of the wildcard
in the compatible. Either by keeping the old names and having some
duplication in the devicetree files or by renaming the compatibles
altogether, as the N6xxx notation is not used nowadays anyway.

[PATCH 2/4] ARM: dts: imx6ul-kontron: Simplify devicetree structure

[Frieder Schrempf]

From: Frieder Schrempf <frieder.schrempf@kontron.de>

There is no need in differentiating between the different SoM versions
that only differ in memory size, etc. It's much cleaner to simplify
the devicetrees and let them be more generic.

If necessary the bootloader will update the devicetree dynamically
to contain the correct size of the memory.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
 .../boot/dts/imx6ul-kontron-n6310-som.dtsi    | 41 -------------------
 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts  | 16 --------
 .../boot/dts/imx6ul-kontron-n6311-som.dtsi    | 40 ------------------
 ...s-43.dts => imx6ul-kontron-n631x-s-43.dts} |  8 ++--
 ...n6310-s.dts => imx6ul-kontron-n631x-s.dts} |  6 +--
 .../boot/dts/imx6ul-kontron-n631x-som.dtsi    | 14 +++++++
 .../dts/imx6ul-kontron-n6x1x-som-common.dtsi  | 15 +++++++
 .../boot/dts/imx6ull-kontron-n6411-som.dtsi   | 40 ------------------
 ...6411-s.dts => imx6ull-kontron-n641x-s.dts} |  6 +--
 .../boot/dts/imx6ull-kontron-n641x-som.dtsi   | 13 ++++++
 10 files changed, 52 insertions(+), 147 deletions(-)
 delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
 delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
 delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
 rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-n631x-s-43.dts} (93%)
 rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-n631x-s.dts} (67%)
 create mode 100644 arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi
 delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
 rename arch/arm/boot/dts/{imx6ull-kontron-n6411-s.dts => imx6ull-kontron-n641x-s.dts} (62%)
 create mode 100644 arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi

diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
deleted file mode 100644
index acd936540d89..000000000000
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2017 exceet electronics GmbH
- * Copyright (C) 2018 Kontron Electronics GmbH
- * Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
- */
-
-#include "imx6ul.dtsi"
-#include "imx6ul-kontron-n6x1x-som-common.dtsi"
-
-/ {
-	model = "Kontron N6310 SOM";
-	compatible = "kontron,imx6ul-n6310-som", "fsl,imx6ul";
-
-	memory@80000000 {
-		reg = <0x80000000 0x10000000>;
-		device_type = "memory";
-	};
-};
-
-&qspi {
-	flash@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "spi-nand";
-		spi-max-frequency = <108000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-		reg = <0>;
-
-		partition@0 {
-			label = "ubi1";
-			reg = <0x00000000 0x08000000>;
-		};
-
-		partition@8000000 {
-			label = "ubi2";
-			reg = <0x08000000 0x08000000>;
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts b/arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
deleted file mode 100644
index 239a1af3aeaa..000000000000
--- a/arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2017 exceet electronics GmbH
- * Copyright (C) 2018 Kontron Electronics GmbH
- */
-
-/dts-v1/;
-
-#include "imx6ul-kontron-n6311-som.dtsi"
-#include "imx6ul-kontron-n6x1x-s.dtsi"
-
-/ {
-	model = "Kontron N6311 S";
-	compatible = "kontron,imx6ul-n6311-s", "kontron,imx6ul-n6311-som",
-		     "fsl,imx6ul";
-};
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
deleted file mode 100644
index 29ed38dce580..000000000000
--- a/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
+++ /dev/null
@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2017 exceet electronics GmbH
- * Copyright (C) 2018 Kontron Electronics GmbH
- */
-
-#include "imx6ul.dtsi"
-#include "imx6ul-kontron-n6x1x-som-common.dtsi"
-
-/ {
-	model = "Kontron N6311 SOM";
-	compatible = "kontron,imx6ul-n6311-som", "fsl,imx6ul";
-
-	memory@80000000 {
-		reg = <0x80000000 0x20000000>;
-		device_type = "memory";
-	};
-};
-
-&qspi {
-	flash@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "spi-nand";
-		spi-max-frequency = <104000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-		reg = <0>;
-
-		partition@0 {
-			label = "ubi1";
-			reg = <0x00000000 0x08000000>;
-		};
-
-		partition@8000000 {
-			label = "ubi2";
-			reg = <0x08000000 0x18000000>;
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts b/arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts
similarity index 93%
rename from arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
rename to arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts
index 5bfad4655b22..20556b2df966 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts
@@ -5,12 +5,12 @@
  * Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
  */
 
-#include "imx6ul-kontron-n6310-s.dts"
+#include "imx6ul-kontron-n631x-s.dts"
 
 / {
-	model = "Kontron N6310 S 43";
-	compatible = "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s",
-		     "kontron,imx6ul-n6310-som", "fsl,imx6ul";
+	model = "Kontron N631X S 43";
+	compatible = "kontron,imx6ul-n631x-s-43", "kontron,imx6ul-n631x-s",
+		     "kontron,imx6ul-n631x-som", "fsl,imx6ul";
 
 	backlight {
 		compatible = "pwm-backlight";
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts b/arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts
similarity index 67%
rename from arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts
rename to arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts
index 5a3e06d6219b..407d2b1dab98 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts
@@ -7,11 +7,11 @@
 
 /dts-v1/;
 
-#include "imx6ul-kontron-n6310-som.dtsi"
+#include "imx6ul-kontron-n631x-som.dtsi"
 #include "imx6ul-kontron-n6x1x-s.dtsi"
 
 / {
-	model = "Kontron N6310 S";
-	compatible = "kontron,imx6ul-n6310-s", "kontron,imx6ul-n6310-som",
+	model = "Kontron N631X S";
+	compatible = "kontron,imx6ul-n631x-s", "kontron,imx6ul-n631x-som",
 		     "fsl,imx6ul";
 };
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi
new file mode 100644
index 000000000000..9a1179814b7d
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2017 exceet electronics GmbH
+ * Copyright (C) 2018 Kontron Electronics GmbH
+ * Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
+ */
+
+#include "imx6ul.dtsi"
+#include "imx6ul-kontron-n6x1x-som-common.dtsi"
+
+/ {
+	model = "Kontron N631X SOM";
+	compatible = "kontron,imx6ul-n631x-som", "fsl,imx6ul";
+};
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
index 09a83dbdf651..dcf88f610346 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
@@ -11,6 +11,11 @@ / {
 	chosen {
 		stdout-path = &uart4;
 	};
+
+	memory@80000000 {
+		reg = <0x80000000 0x10000000>;
+		device_type = "memory";
+	};
 };
 
 &ecspi2 {
@@ -55,6 +60,16 @@ &qspi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_qspi>;
 	status = "okay";
+
+	spi-flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spi-nand";
+		spi-max-frequency = <104000000>;
+		spi-tx-bus-width = <4>;
+		spi-rx-bus-width = <4>;
+		reg = <0>;
+	};
 };
 
 &wdog1 {
diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi b/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
deleted file mode 100644
index d000606c0704..000000000000
--- a/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
+++ /dev/null
@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2017 exceet electronics GmbH
- * Copyright (C) 2018 Kontron Electronics GmbH
- */
-
-#include "imx6ull.dtsi"
-#include "imx6ul-kontron-n6x1x-som-common.dtsi"
-
-/ {
-	model = "Kontron N6411 SOM";
-	compatible = "kontron,imx6ull-n6311-som", "fsl,imx6ull";
-
-	memory@80000000 {
-		reg = <0x80000000 0x20000000>;
-		device_type = "memory";
-	};
-};
-
-&qspi {
-	flash@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "spi-nand";
-		spi-max-frequency = <104000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-		reg = <0>;
-
-		partition@0 {
-			label = "ubi1";
-			reg = <0x00000000 0x08000000>;
-		};
-
-		partition@8000000 {
-			label = "ubi2";
-			reg = <0x08000000 0x18000000>;
-		};
-	};
-};
diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts b/arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts
similarity index 62%
rename from arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
rename to arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts
index 57588a5e1e34..01aeea408531 100644
--- a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
+++ b/arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts
@@ -6,11 +6,11 @@
 
 /dts-v1/;
 
-#include "imx6ull-kontron-n6411-som.dtsi"
+#include "imx6ull-kontron-n641x-som.dtsi"
 #include "imx6ul-kontron-n6x1x-s.dtsi"
 
 / {
-	model = "Kontron N6411 S";
-	compatible = "kontron,imx6ull-n6411-s", "kontron,imx6ull-n6411-som",
+	model = "Kontron N641X S";
+	compatible = "kontron,imx6ull-n641x-s", "kontron,imx6ull-n641x-som",
 		     "fsl,imx6ull";
 };
diff --git a/arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi b/arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi
new file mode 100644
index 000000000000..8a64aa9a2751
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2017 exceet electronics GmbH
+ * Copyright (C) 2018 Kontron Electronics GmbH
+ */
+
+#include "imx6ull.dtsi"
+#include "imx6ul-kontron-n6x1x-som-common.dtsi"
+
+/ {
+	model = "Kontron N641X SOM";
+	compatible = "kontron,imx6ull-n641x-som", "fsl,imx6ull";
+};
-- 
2.37.1

[PATCH 3/4] ARM: dts: imx6ul-kontron: Add imx6ull-kontron-n641x-s to Makefile

[Frieder Schrempf]

From: Frieder Schrempf <frieder.schrempf@kontron.de>

The imx6ull-kontron-n641x-s.dtb wasn't build as part of the
CONFIG_SOC_IMX6UL option. Add it to the list.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
 arch/arm/boot/dts/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5112f493f494..2665db1c35bf 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -696,8 +696,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
 	imx6ul-geam.dtb \
 	imx6ul-isiot-emmc.dtb \
 	imx6ul-isiot-nand.dtb \
-	imx6ul-kontron-n6310-s.dtb \
-	imx6ul-kontron-n6310-s-43.dtb \
+	imx6ul-kontron-n631x-s.dtb \
+	imx6ul-kontron-n631x-s-43.dtb \
 	imx6ul-liteboard.dtb \
 	imx6ul-tqma6ul1-mba6ulx.dtb \
 	imx6ul-tqma6ul2-mba6ulx.dtb \
@@ -726,6 +726,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
 	imx6ull-colibri-wifi-iris.dtb \
 	imx6ull-colibri-wifi-iris-v2.dtb \
 	imx6ull-jozacp.dtb \
+	imx6ull-kontron-n641x-s.dtb \
 	imx6ull-myir-mys-6ulx-eval.dtb \
 	imx6ull-opos6uldev.dtb \
 	imx6ull-phytec-segin-ff-rdk-nand.dtb \
-- 
2.37.1

Re: [PATCH 3/4] ARM: dts: imx6ul-kontron: Add imx6ull-kontron-n641x-s to Makefile

[Frieder Schrempf]

Am 09.08.22 um 17:25 schrieb Frieder Schrempf:
> From: Frieder Schrempf <frieder.schrempf@kontron.de>
> 
> The imx6ull-kontron-n641x-s.dtb wasn't build as part of the
> CONFIG_SOC_IMX6UL option. Add it to the list.
> 
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
>  arch/arm/boot/dts/Makefile | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 5112f493f494..2665db1c35bf 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -696,8 +696,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
>  	imx6ul-geam.dtb \
>  	imx6ul-isiot-emmc.dtb \
>  	imx6ul-isiot-nand.dtb \
> -	imx6ul-kontron-n6310-s.dtb \
> -	imx6ul-kontron-n6310-s-43.dtb \
> +	imx6ul-kontron-n631x-s.dtb \
> +	imx6ul-kontron-n631x-s-43.dtb \

Sorry, the changes above should actually be part of patch 2.

>  	imx6ul-liteboard.dtb \
>  	imx6ul-tqma6ul1-mba6ulx.dtb \
>  	imx6ul-tqma6ul2-mba6ulx.dtb \
> @@ -726,6 +726,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
>  	imx6ull-colibri-wifi-iris.dtb \
>  	imx6ull-colibri-wifi-iris-v2.dtb \
>  	imx6ull-jozacp.dtb \
> +	imx6ull-kontron-n641x-s.dtb \
>  	imx6ull-myir-mys-6ulx-eval.dtb \
>  	imx6ull-opos6uldev.dtb \
>  	imx6ull-phytec-segin-ff-rdk-nand.dtb \

[PATCH 4/4] ARM: dts: imx6ul-kontron: Adjust board and SoM model strings

[Frieder Schrempf]

From: Frieder Schrempf <frieder.schrempf@kontron.de>

The official naming includes "SL" (SoM-Line) or "BL" (Board-Line).
The legacy identifiers are kept in brackets and are still used in
file names and compatible strings.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
 arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts  | 2 +-
 arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts     | 2 +-
 arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi  | 2 +-
 arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts    | 2 +-
 arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts b/arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts
index 20556b2df966..5ef20556ffc0 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-n631x-s-43.dts
@@ -8,7 +8,7 @@
 #include "imx6ul-kontron-n631x-s.dts"
 
 / {
-	model = "Kontron N631X S 43";
+	model = "Kontron BL i.MX6UL 43 (N631X S 43)";
 	compatible = "kontron,imx6ul-n631x-s-43", "kontron,imx6ul-n631x-s",
 		     "kontron,imx6ul-n631x-som", "fsl,imx6ul";
 
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts b/arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts
index 407d2b1dab98..7b1abe088224 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-n631x-s.dts
@@ -11,7 +11,7 @@
 #include "imx6ul-kontron-n6x1x-s.dtsi"
 
 / {
-	model = "Kontron N631X S";
+	model = "Kontron BL i.MX6UL (N631X S)";
 	compatible = "kontron,imx6ul-n631x-s", "kontron,imx6ul-n631x-som",
 		     "fsl,imx6ul";
 };
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi
index 9a1179814b7d..750f20293bd4 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-n631x-som.dtsi
@@ -9,6 +9,6 @@
 #include "imx6ul-kontron-n6x1x-som-common.dtsi"
 
 / {
-	model = "Kontron N631X SOM";
+	model = "Kontron SL i.MX6UL (N631X SOM)";
 	compatible = "kontron,imx6ul-n631x-som", "fsl,imx6ul";
 };
diff --git a/arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts b/arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts
index 01aeea408531..4f9f69a84a72 100644
--- a/arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts
+++ b/arch/arm/boot/dts/imx6ull-kontron-n641x-s.dts
@@ -10,7 +10,7 @@
 #include "imx6ul-kontron-n6x1x-s.dtsi"
 
 / {
-	model = "Kontron N641X S";
+	model = "Kontron BL i.MX6ULL (N641X S)";
 	compatible = "kontron,imx6ull-n641x-s", "kontron,imx6ull-n641x-som",
 		     "fsl,imx6ull";
 };
diff --git a/arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi b/arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi
index 8a64aa9a2751..3ea1e9661616 100644
--- a/arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi
+++ b/arch/arm/boot/dts/imx6ull-kontron-n641x-som.dtsi
@@ -8,6 +8,6 @@
 #include "imx6ul-kontron-n6x1x-som-common.dtsi"
 
 / {
-	model = "Kontron N641X SOM";
+	model = "Kontron SL i.MX6ULL (N641X SOM)";
 	compatible = "kontron,imx6ull-n641x-som", "fsl,imx6ull";
 };
-- 
2.37.1