From: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx> 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@xxxxxxxxxx> --- .../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@xxxxxxxxxx> - */ - -#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@xxxxxxxxxx> */ -#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@xxxxxxxxxx> + */ + +#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