* [PATCH v2 0/3] ARM: dts: imx6ul-kontron: Improve devicetrees
@ 2022-08-10 8:18 ` Frieder Schrempf
0 siblings, 0 replies; 10+ messages in thread
From: Frieder Schrempf @ 2022-08-10 8:18 UTC (permalink / raw)
To: devicetree, linux-arm-kernel, linux-kernel, Li Yang, Shawn Guo
Cc: Frieder Schrempf, Arnd Bergmann, Krzysztof Kozlowski,
Olof Johansson, Rob Herring, Sascha Hauer, soc
From: Frieder Schrempf <frieder.schrempf@kontron.de>
This series contains some simplifications to the devicetree file structure
and updates the model names, compatibles and devicetree file names to match
what is used officially by the Kontron marketing.
This is a somewhat breaking change (for out-of-tree devicetrees that include
the SoM files) but it reduces the complexity quite a bit, makes things easier
to read and lets people discover the devicetree matching their hardware more
easily.
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.
---
Changes in v2:
* Also rename compatibles to get rid of N6xxx notation
* Also rename devicetree files for consistency
* Squash model renaming patch into patch 2
* Move part of Makefile changes to patch 2
Frieder Schrempf (3):
dt-bindings: arm: fsl: imx6ul-kontron: Update bindings
ARM: dts: imx6ul-kontron: Simplify devicetree structure
ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile
.../devicetree/bindings/arm/fsl.yaml | 31 ++++++--------
arch/arm/boot/dts/Makefile | 5 ++-
...6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 ++--
...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
...tron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 ++--
.../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 ------------------
...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +++++++
arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 +++++++
arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 +++++++
arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 --------
.../boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------------------
arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 ++++++
14 files changed, 80 insertions(+), 183 deletions(-)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} (93%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} (52%)
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-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%)
create mode 100644 arch/arm/boot/dts/imx6ul-kontron-sl.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-bl.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
--
2.37.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 0/3] ARM: dts: imx6ul-kontron: Improve devicetrees
@ 2022-08-10 8:18 ` Frieder Schrempf
0 siblings, 0 replies; 10+ messages in thread
From: Frieder Schrempf @ 2022-08-10 8:18 UTC (permalink / raw)
To: devicetree, linux-arm-kernel, linux-kernel, Li Yang, Shawn Guo
Cc: Frieder Schrempf, Arnd Bergmann, Krzysztof Kozlowski,
Olof Johansson, Rob Herring, Sascha Hauer, soc
From: Frieder Schrempf <frieder.schrempf@kontron.de>
This series contains some simplifications to the devicetree file structure
and updates the model names, compatibles and devicetree file names to match
what is used officially by the Kontron marketing.
This is a somewhat breaking change (for out-of-tree devicetrees that include
the SoM files) but it reduces the complexity quite a bit, makes things easier
to read and lets people discover the devicetree matching their hardware more
easily.
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.
---
Changes in v2:
* Also rename compatibles to get rid of N6xxx notation
* Also rename devicetree files for consistency
* Squash model renaming patch into patch 2
* Move part of Makefile changes to patch 2
Frieder Schrempf (3):
dt-bindings: arm: fsl: imx6ul-kontron: Update bindings
ARM: dts: imx6ul-kontron: Simplify devicetree structure
ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile
.../devicetree/bindings/arm/fsl.yaml | 31 ++++++--------
arch/arm/boot/dts/Makefile | 5 ++-
...6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 ++--
...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
...tron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 ++--
.../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 ------------------
...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +++++++
arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 +++++++
arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 +++++++
arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 --------
.../boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------------------
arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 ++++++
14 files changed, 80 insertions(+), 183 deletions(-)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} (93%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} (52%)
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-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%)
create mode 100644 arch/arm/boot/dts/imx6ul-kontron-sl.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-bl.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/3] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings
2022-08-10 8:18 ` Frieder Schrempf
(?)
@ 2022-08-10 8:18 ` Frieder Schrempf
2022-08-11 10:52 ` Krzysztof Kozlowski
-1 siblings, 1 reply; 10+ messages in thread
From: Frieder Schrempf @ 2022-08-10 8:18 UTC (permalink / raw)
To: devicetree, Krzysztof Kozlowski, linux-kernel, Li Yang,
Rob Herring, Shawn Guo
Cc: Frieder Schrempf, Alexander Stein, Ariel D'Alessandro,
Denys Drozdov, Krzysztof Kozlowski, Marcel Ziswiler, Marek Vasut,
Matthias Schiffer, Max Krummenacher, Peng Fan, Rob Herring
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.
It also gets rid of the N6xxx notation in the compatibles and
file names, as they are not really used anymore and often result
in confusion.
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..649862052f53 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,sl-imx6ul # Kontron SL i.MX6UL 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,bl-imx6ul # Kontron BL i.MX6UL Carrier Board
+ - const: kontron,sl-imx6ul # Kontron SL i.MX6UL 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,bl-imx6ul-43 # Kontron BL i.MX6UL Carrier Board with 4.3" Display
+ - const: kontron,bl-imx6ul # Kontron BL i.MX6UL Carrier Board
+ - const: kontron,sl-imx6ul # Kontron SL i.MX6UL 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,sl-imx6ull # Kontron SL i.MX6ULL 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,bl-imx6ull # Kontron BL i.MX6ULL Carrier Board
+ - const: kontron,sl-imx6ull # Kontron SL i.MX6ULL SoM
- const: fsl,imx6ull
- description: TQ Systems TQMa6ULLx SoM on MBa6ULx board
--
2.37.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/3] ARM: dts: imx6ul-kontron: Simplify devicetree structure
2022-08-10 8:18 ` Frieder Schrempf
@ 2022-08-10 8:18 ` Frieder Schrempf
-1 siblings, 0 replies; 10+ messages in thread
From: Frieder Schrempf @ 2022-08-10 8:18 UTC (permalink / raw)
To: Arnd Bergmann, devicetree, Krzysztof Kozlowski, linux-arm-kernel,
linux-kernel, Olof Johansson, Rob Herring, Sascha Hauer,
Shawn Guo, soc
Cc: Frieder Schrempf, Bjorn Andersson, Denys Drozdov, Dmitry Osipenko,
Fabio Estevam, Joel Stanley, Konrad Dybcio, Krzysztof Kozlowski,
Luca Weiss, NXP Linux Team, Pengutronix Kernel Team,
Thierry Reding
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.
We also get rid of the N6xxx notation in the compatibles and file
names, as they are not really used anymore and often result in
confusion.
Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
arch/arm/boot/dts/Makefile | 4 +-
...6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 ++--
...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
...tron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 ++--
.../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 ------------------
...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +++++++
arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 +++++++
arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 +++++++
arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 --------
.../boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------------------
arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 ++++++
13 files changed, 67 insertions(+), 164 deletions(-)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} (93%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} (52%)
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-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%)
create mode 100644 arch/arm/boot/dts/imx6ul-kontron-sl.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-bl.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5112f493f494..6627aed26fd6 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-bl.dtb \
+ imx6ul-kontron-bl-43.dtb \
imx6ul-liteboard.dtb \
imx6ul-tqma6ul1-mba6ulx.dtb \
imx6ul-tqma6ul2-mba6ulx.dtb \
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts b/arch/arm/boot/dts/imx6ul-kontron-bl-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-bl-43.dts
index 5bfad4655b22..0c643706a158 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-bl-43.dts
@@ -5,12 +5,12 @@
* Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
*/
-#include "imx6ul-kontron-n6310-s.dts"
+#include "imx6ul-kontron-bl.dts"
/ {
- model = "Kontron N6310 S 43";
- compatible = "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s",
- "kontron,imx6ul-n6310-som", "fsl,imx6ul";
+ model = "Kontron BL i.MX6UL 43 (N631X S 43)";
+ compatible = "kontron,bl-imx6ul-43", "kontron,bl-imx6ul",
+ "kontron,sl-imx6ul", "fsl,imx6ul";
backlight {
compatible = "pwm-backlight";
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi b/arch/arm/boot/dts/imx6ul-kontron-bl-common.dtsi
similarity index 100%
rename from arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
rename to arch/arm/boot/dts/imx6ul-kontron-bl-common.dtsi
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts b/arch/arm/boot/dts/imx6ul-kontron-bl.dts
similarity index 52%
rename from arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts
rename to arch/arm/boot/dts/imx6ul-kontron-bl.dts
index 5a3e06d6219b..dadf6d3d5f52 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-bl.dts
@@ -7,11 +7,10 @@
/dts-v1/;
-#include "imx6ul-kontron-n6310-som.dtsi"
-#include "imx6ul-kontron-n6x1x-s.dtsi"
+#include "imx6ul-kontron-sl.dtsi"
+#include "imx6ul-kontron-bl-common.dtsi"
/ {
- model = "Kontron N6310 S";
- compatible = "kontron,imx6ul-n6310-s", "kontron,imx6ul-n6310-som",
- "fsl,imx6ul";
+ model = "Kontron BL i.MX6UL (N631X S)";
+ compatible = "kontron,bl-imx6ul", "kontron,sl-imx6ul", "fsl,imx6ul";
};
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-n6x1x-som-common.dtsi b/arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi
similarity index 90%
rename from arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
rename to arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi
index 09a83dbdf651..dcf88f610346 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-sl-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/imx6ul-kontron-sl.dtsi b/arch/arm/boot/dts/imx6ul-kontron-sl.dtsi
new file mode 100644
index 000000000000..0580d043e5ae
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-kontron-sl.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-sl-common.dtsi"
+
+/ {
+ model = "Kontron SL i.MX6UL (N631X SOM)";
+ compatible = "kontron,sl-imx6ul", "fsl,imx6ul";
+};
diff --git a/arch/arm/boot/dts/imx6ull-kontron-bl.dts b/arch/arm/boot/dts/imx6ull-kontron-bl.dts
new file mode 100644
index 000000000000..fa016465cdbc
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-kontron-bl.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2017 exceet electronics GmbH
+ * Copyright (C) 2019 Kontron Electronics GmbH
+ */
+
+/dts-v1/;
+
+#include "imx6ull-kontron-sl.dtsi"
+#include "imx6ul-kontron-bl-common.dtsi"
+
+/ {
+ model = "Kontron BL i.MX6ULL (N641X S)";
+ compatible = "kontron,bl-imx6ull", "kontron,sl-imx6ull", "fsl,imx6ull";
+};
diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts b/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
deleted file mode 100644
index 57588a5e1e34..000000000000
--- a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2017 exceet electronics GmbH
- * Copyright (C) 2019 Kontron Electronics GmbH
- */
-
-/dts-v1/;
-
-#include "imx6ull-kontron-n6411-som.dtsi"
-#include "imx6ul-kontron-n6x1x-s.dtsi"
-
-/ {
- model = "Kontron N6411 S";
- compatible = "kontron,imx6ull-n6411-s", "kontron,imx6ull-n6411-som",
- "fsl,imx6ull";
-};
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-sl.dtsi b/arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
new file mode 100644
index 000000000000..93f10eb3494f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-kontron-sl.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-sl-common.dtsi"
+
+/ {
+ model = "Kontron SL i.MX6ULL (N641X SOM)";
+ compatible = "kontron,sl-imx6ull", "fsl,imx6ull";
+};
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/3] ARM: dts: imx6ul-kontron: Simplify devicetree structure
@ 2022-08-10 8:18 ` Frieder Schrempf
0 siblings, 0 replies; 10+ messages in thread
From: Frieder Schrempf @ 2022-08-10 8:18 UTC (permalink / raw)
To: Arnd Bergmann, devicetree, Krzysztof Kozlowski, linux-arm-kernel,
linux-kernel, Olof Johansson, Rob Herring, Sascha Hauer,
Shawn Guo, soc
Cc: Frieder Schrempf, Bjorn Andersson, Denys Drozdov, Dmitry Osipenko,
Fabio Estevam, Joel Stanley, Konrad Dybcio, Krzysztof Kozlowski,
Luca Weiss, NXP Linux Team, Pengutronix Kernel Team,
Thierry Reding
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.
We also get rid of the N6xxx notation in the compatibles and file
names, as they are not really used anymore and often result in
confusion.
Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
arch/arm/boot/dts/Makefile | 4 +-
...6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 ++--
...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
...tron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 ++--
.../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 ------------------
...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +++++++
arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 +++++++
arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 +++++++
arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 --------
.../boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------------------
arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 ++++++
13 files changed, 67 insertions(+), 164 deletions(-)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts => imx6ul-kontron-bl-43.dts} (93%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi => imx6ul-kontron-bl-common.dtsi} (100%)
rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts => imx6ul-kontron-bl.dts} (52%)
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-n6x1x-som-common.dtsi => imx6ul-kontron-sl-common.dtsi} (90%)
create mode 100644 arch/arm/boot/dts/imx6ul-kontron-sl.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-bl.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
create mode 100644 arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5112f493f494..6627aed26fd6 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-bl.dtb \
+ imx6ul-kontron-bl-43.dtb \
imx6ul-liteboard.dtb \
imx6ul-tqma6ul1-mba6ulx.dtb \
imx6ul-tqma6ul2-mba6ulx.dtb \
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts b/arch/arm/boot/dts/imx6ul-kontron-bl-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-bl-43.dts
index 5bfad4655b22..0c643706a158 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-bl-43.dts
@@ -5,12 +5,12 @@
* Copyright (c) 2019 Krzysztof Kozlowski <krzk@kernel.org>
*/
-#include "imx6ul-kontron-n6310-s.dts"
+#include "imx6ul-kontron-bl.dts"
/ {
- model = "Kontron N6310 S 43";
- compatible = "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s",
- "kontron,imx6ul-n6310-som", "fsl,imx6ul";
+ model = "Kontron BL i.MX6UL 43 (N631X S 43)";
+ compatible = "kontron,bl-imx6ul-43", "kontron,bl-imx6ul",
+ "kontron,sl-imx6ul", "fsl,imx6ul";
backlight {
compatible = "pwm-backlight";
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi b/arch/arm/boot/dts/imx6ul-kontron-bl-common.dtsi
similarity index 100%
rename from arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi
rename to arch/arm/boot/dts/imx6ul-kontron-bl-common.dtsi
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts b/arch/arm/boot/dts/imx6ul-kontron-bl.dts
similarity index 52%
rename from arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts
rename to arch/arm/boot/dts/imx6ul-kontron-bl.dts
index 5a3e06d6219b..dadf6d3d5f52 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts
+++ b/arch/arm/boot/dts/imx6ul-kontron-bl.dts
@@ -7,11 +7,10 @@
/dts-v1/;
-#include "imx6ul-kontron-n6310-som.dtsi"
-#include "imx6ul-kontron-n6x1x-s.dtsi"
+#include "imx6ul-kontron-sl.dtsi"
+#include "imx6ul-kontron-bl-common.dtsi"
/ {
- model = "Kontron N6310 S";
- compatible = "kontron,imx6ul-n6310-s", "kontron,imx6ul-n6310-som",
- "fsl,imx6ul";
+ model = "Kontron BL i.MX6UL (N631X S)";
+ compatible = "kontron,bl-imx6ul", "kontron,sl-imx6ul", "fsl,imx6ul";
};
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-n6x1x-som-common.dtsi b/arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi
similarity index 90%
rename from arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
rename to arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi
index 09a83dbdf651..dcf88f610346 100644
--- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-sl-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/imx6ul-kontron-sl.dtsi b/arch/arm/boot/dts/imx6ul-kontron-sl.dtsi
new file mode 100644
index 000000000000..0580d043e5ae
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-kontron-sl.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-sl-common.dtsi"
+
+/ {
+ model = "Kontron SL i.MX6UL (N631X SOM)";
+ compatible = "kontron,sl-imx6ul", "fsl,imx6ul";
+};
diff --git a/arch/arm/boot/dts/imx6ull-kontron-bl.dts b/arch/arm/boot/dts/imx6ull-kontron-bl.dts
new file mode 100644
index 000000000000..fa016465cdbc
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-kontron-bl.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2017 exceet electronics GmbH
+ * Copyright (C) 2019 Kontron Electronics GmbH
+ */
+
+/dts-v1/;
+
+#include "imx6ull-kontron-sl.dtsi"
+#include "imx6ul-kontron-bl-common.dtsi"
+
+/ {
+ model = "Kontron BL i.MX6ULL (N641X S)";
+ compatible = "kontron,bl-imx6ull", "kontron,sl-imx6ull", "fsl,imx6ull";
+};
diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts b/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
deleted file mode 100644
index 57588a5e1e34..000000000000
--- a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2017 exceet electronics GmbH
- * Copyright (C) 2019 Kontron Electronics GmbH
- */
-
-/dts-v1/;
-
-#include "imx6ull-kontron-n6411-som.dtsi"
-#include "imx6ul-kontron-n6x1x-s.dtsi"
-
-/ {
- model = "Kontron N6411 S";
- compatible = "kontron,imx6ull-n6411-s", "kontron,imx6ull-n6411-som",
- "fsl,imx6ull";
-};
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-sl.dtsi b/arch/arm/boot/dts/imx6ull-kontron-sl.dtsi
new file mode 100644
index 000000000000..93f10eb3494f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-kontron-sl.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-sl-common.dtsi"
+
+/ {
+ model = "Kontron SL i.MX6ULL (N641X SOM)";
+ compatible = "kontron,sl-imx6ull", "fsl,imx6ull";
+};
--
2.37.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 3/3] ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile
2022-08-10 8:18 ` Frieder Schrempf
@ 2022-08-10 8:18 ` Frieder Schrempf
-1 siblings, 0 replies; 10+ messages in thread
From: Frieder Schrempf @ 2022-08-10 8:18 UTC (permalink / raw)
To: Arnd Bergmann, devicetree, Krzysztof Kozlowski, linux-arm-kernel,
linux-kernel, Olof Johansson, Rob Herring, soc
Cc: Frieder Schrempf, Bjorn Andersson, Denys Drozdov, Dmitry Osipenko,
Joel Stanley, Konrad Dybcio, Luca Weiss, Shawn Guo,
Thierry Reding
From: Frieder Schrempf <frieder.schrempf@kontron.de>
The imx6ull-kontron-bl.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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 6627aed26fd6..1d0c79f61072 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -726,6 +726,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ull-colibri-wifi-iris.dtb \
imx6ull-colibri-wifi-iris-v2.dtb \
imx6ull-jozacp.dtb \
+ imx6ull-kontron-bl.dtb \
imx6ull-myir-mys-6ulx-eval.dtb \
imx6ull-opos6uldev.dtb \
imx6ull-phytec-segin-ff-rdk-nand.dtb \
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 3/3] ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile
@ 2022-08-10 8:18 ` Frieder Schrempf
0 siblings, 0 replies; 10+ messages in thread
From: Frieder Schrempf @ 2022-08-10 8:18 UTC (permalink / raw)
To: Arnd Bergmann, devicetree, Krzysztof Kozlowski, linux-arm-kernel,
linux-kernel, Olof Johansson, Rob Herring, soc
Cc: Frieder Schrempf, Bjorn Andersson, Denys Drozdov, Dmitry Osipenko,
Joel Stanley, Konrad Dybcio, Luca Weiss, Shawn Guo,
Thierry Reding
From: Frieder Schrempf <frieder.schrempf@kontron.de>
The imx6ull-kontron-bl.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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 6627aed26fd6..1d0c79f61072 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -726,6 +726,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ull-colibri-wifi-iris.dtb \
imx6ull-colibri-wifi-iris-v2.dtb \
imx6ull-jozacp.dtb \
+ imx6ull-kontron-bl.dtb \
imx6ull-myir-mys-6ulx-eval.dtb \
imx6ull-opos6uldev.dtb \
imx6ull-phytec-segin-ff-rdk-nand.dtb \
--
2.37.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/3] ARM: dts: imx6ul-kontron: Simplify devicetree structure
2022-08-10 8:18 ` Frieder Schrempf
@ 2022-08-11 10:50 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-08-11 10:50 UTC (permalink / raw)
To: Frieder Schrempf, Arnd Bergmann, devicetree, Krzysztof Kozlowski,
linux-arm-kernel, linux-kernel, Olof Johansson, Rob Herring,
Sascha Hauer, Shawn Guo, soc
Cc: Frieder Schrempf, Bjorn Andersson, Denys Drozdov, Dmitry Osipenko,
Fabio Estevam, Joel Stanley, Konrad Dybcio, Luca Weiss,
NXP Linux Team, Pengutronix Kernel Team, Thierry Reding
On 10/08/2022 11:18, Frieder Schrempf wrote:
> 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.
>
> We also get rid of the N6xxx notation in the compatibles and file
> names, as they are not really used anymore and often result in
> confusion.
>
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
> arch/arm/boot/dts/Makefile | 4 +-
> ...6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 ++--
> ...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
> ...tron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 ++--
> .../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 ------------------
> ...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +++++++
> arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 +++++++
> arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 +++++++
> arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 --------
> .../boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------------------
> arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 ++++++
Most of these should be renames with small amount of changes. You should
experiment with -B/-M/-C format-patch arguments so the end diff is easy
to read.
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/3] ARM: dts: imx6ul-kontron: Simplify devicetree structure
@ 2022-08-11 10:50 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-08-11 10:50 UTC (permalink / raw)
To: Frieder Schrempf, Arnd Bergmann, devicetree, Krzysztof Kozlowski,
linux-arm-kernel, linux-kernel, Olof Johansson, Rob Herring,
Sascha Hauer, Shawn Guo, soc
Cc: Frieder Schrempf, Bjorn Andersson, Denys Drozdov, Dmitry Osipenko,
Fabio Estevam, Joel Stanley, Konrad Dybcio, Luca Weiss,
NXP Linux Team, Pengutronix Kernel Team, Thierry Reding
On 10/08/2022 11:18, Frieder Schrempf wrote:
> 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.
>
> We also get rid of the N6xxx notation in the compatibles and file
> names, as they are not really used anymore and often result in
> confusion.
>
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
> arch/arm/boot/dts/Makefile | 4 +-
> ...6310-s-43.dts => imx6ul-kontron-bl-43.dts} | 8 ++--
> ...x-s.dtsi => imx6ul-kontron-bl-common.dtsi} | 0
> ...tron-n6310-s.dts => imx6ul-kontron-bl.dts} | 9 ++--
> .../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 ------------------
> ...mon.dtsi => imx6ul-kontron-sl-common.dtsi} | 15 +++++++
> arch/arm/boot/dts/imx6ul-kontron-sl.dtsi | 14 +++++++
> arch/arm/boot/dts/imx6ull-kontron-bl.dts | 15 +++++++
> arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts | 16 --------
> .../boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------------------
> arch/arm/boot/dts/imx6ull-kontron-sl.dtsi | 13 ++++++
Most of these should be renames with small amount of changes. You should
experiment with -B/-M/-C format-patch arguments so the end diff is easy
to read.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings
2022-08-10 8:18 ` [PATCH v2 1/3] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings Frieder Schrempf
@ 2022-08-11 10:52 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-08-11 10:52 UTC (permalink / raw)
To: Frieder Schrempf, devicetree, Krzysztof Kozlowski, linux-kernel,
Li Yang, Rob Herring, Shawn Guo
Cc: Frieder Schrempf, Alexander Stein, Ariel D'Alessandro,
Denys Drozdov, Marcel Ziswiler, Marek Vasut, Matthias Schiffer,
Max Krummenacher, Peng Fan, Rob Herring
On 10/08/2022 11:18, 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.
>
> It also gets rid of the N6xxx notation in the compatibles and
> file names, as they are not really used anymore and often result
> in confusion.
>
> Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
This affects the ABI, so you should be sure that it is desired...
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-08-11 10:52 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-10 8:18 [PATCH v2 0/3] ARM: dts: imx6ul-kontron: Improve devicetrees Frieder Schrempf
2022-08-10 8:18 ` Frieder Schrempf
2022-08-10 8:18 ` [PATCH v2 1/3] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings Frieder Schrempf
2022-08-11 10:52 ` Krzysztof Kozlowski
2022-08-10 8:18 ` [PATCH v2 2/3] ARM: dts: imx6ul-kontron: Simplify devicetree structure Frieder Schrempf
2022-08-10 8:18 ` Frieder Schrempf
2022-08-11 10:50 ` Krzysztof Kozlowski
2022-08-11 10:50 ` Krzysztof Kozlowski
2022-08-10 8:18 ` [PATCH v2 3/3] ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile Frieder Schrempf
2022-08-10 8:18 ` Frieder Schrempf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.