Commit 0fcf85d8 authored by Frieder Schrempf's avatar Frieder Schrempf Committed by Shawn Guo
Browse files

ARM: dts: imx6ul-kontron: Simplify devicetree structure 



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: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent b709c5a3

arch/arm/boot/dts/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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 \

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

+4 −4
Original line number Diff line number Diff line
@@ -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";

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

+4 −5
Original line number Diff line number Diff line
@@ -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";

};

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

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
// 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>;

		};

	};

};