shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-24 19:40:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: imx6ul-kontron: Simplify devicetree structure

Browse Source 
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.

This is a breaking change, but the impact shouldn't be too big and it
makes usage and maintenance easier in the future.

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Frieder Schrempf
2022-08-15 10:28:11 +02:00
committed by Shawn Guo
parent b709c5a39e
commit 0fcf85d89d
13 changed files with 67 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/Makefile
View File

@@ -706,8 +706,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 \

8
arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts → arch/arm/boot/dts/imx6ul-kontron-bl-43.dts
View File

@@ -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";

0
arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi → arch/arm/boot/dts/imx6ul-kontron-bl-common.dtsi
View File

9
arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts → arch/arm/boot/dts/imx6ul-kontron-bl.dts
View File

@@ -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";
};

41
arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
View File

@@ -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>;
};
};
};

16
arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts
View File

@@ -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";
};

40
arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
View File

@@ -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>;
};
};
};

15
arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi → arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi
View File

@@ -11,6 +11,11 @@
chosen {
stdout-path = &uart4;
};
memory@80000000 {
reg = <0x80000000 0x10000000>;
device_type = "memory";
};
};
&ecspi2 {
@@ -55,6 +60,16 @@
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 {

14
arch/arm/boot/dts/imx6ul-kontron-sl.dtsi Normal file
View File

@@ -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";
};

15
arch/arm/boot/dts/imx6ull-kontron-bl.dts Normal file
View File

@@ -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";
};

16
arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts
View File

@@ -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";
};

40
arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
View File

@@ -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>;
};
};
};

13
arch/arm/boot/dts/imx6ull-kontron-sl.dtsi Normal file
View File

@@ -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";
};