From patchwork Tue Aug 9 15:25:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 12939695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3A9DC19F2D for ; Tue, 9 Aug 2022 15:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g8iz3YKfZPh6tKKgPEofDzajiJDMHD1iLnPQWsEIxe4=; b=ndyDvxHOsFf9VC lK3ledd7oYw/Yu5/Vt4B9++F1HU4Ayu2aJf6lhOhalcULlbcX5xbMl/FGgTFdPGEtjeRcgIt8E2G9 VHEAXv9gipc1CPEHQeToIjqy5pHH3n6fHXG8CbIch/1etkoySGqTNw/oze3KW4CtWv/hQfkDmsX83 6CASz1XnB07trRsOe6lISb0hq0H/QmcoAzh7R/erVhlAMhd0vUiMmnqZFACaF8lwsMCTZsN7lAxPY dKm5iNFP33tUUUkBB9FflbXWi8/WmYryGfGWKDaRDvqTUBDHIGAPhi4OFS6EOoJlft5lSY7S4kWc+ XBxxaD2uR4MPDMCQR7nA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLR7m-004cdO-CI; Tue, 09 Aug 2022 15:26:30 +0000 Received: from mail.fris.de ([2a01:4f8:c2c:390b::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLR7Y-004cVC-VA for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2022 15:26:19 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3BD8FBFADC; Tue, 9 Aug 2022 17:26:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1660058766; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=Up/vt3EYDPnmgs/YbP0KJU4jU8/61VSN/1ifLZ6Uhtw=; b=ihFou1wCCQzNh8Qv9AktICqqVwgbzZxyNDhlPlMbW/OeVJWvi2otvUcCe21FK0Np1BiC2H ERt8IDX01OBCnpb9N7rLPrKwlY58SSuXU8RSV6ZpbcVDVP7hk+x538R0VwZ199RqUeAkIE OacJyAsWF+tD7WX2TxwBxNjmoBN3wjo20mGIDS6L11OjRPmnaJ5ZfSXiuzqWsY69LmiBe7 f/JE2uh+pVzBh+xzV/PPenVQoqzhtiFM65fm2z3deMMlA/UuQCWc38rBFM+VddCx9SEMbf /WpTkFZ6/yWUXsrY7YfQb4fBqNx/WZRYVHA1ulIR9C2vHjaZrcyxCXpDagRTUg== From: Frieder Schrempf To: devicetree@vger.kernel.org, Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rob Herring , Sascha Hauer , Shawn Guo Cc: Frieder Schrempf , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team Subject: [PATCH 2/4] ARM: dts: imx6ul-kontron: Simplify devicetree structure Date: Tue, 9 Aug 2022 17:25:29 +0200 Message-Id: <20220809152534.292034-3-frieder@fris.de> In-Reply-To: <20220809152534.292034-1-frieder@fris.de> References: <20220809152534.292034-1-frieder@fris.de> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220809_082617_396365_9F3C3729 X-CRM114-Status: GOOD ( 14.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Frieder Schrempf 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 --- .../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 - */ - -#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 */ -#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 + */ + +#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"; +}; From patchwork Tue Aug 9 15:25:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 12939693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A02ABC19F2D for ; Tue, 9 Aug 2022 15:27:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=z+R08V5+zS8z7llRLKV6FJtF9BgCBJb57U4iko5kelY=; b=A6Q+H1VlVp0Msv /yQ4EV9SE1/f/sS5cF2IvQRis/A44yybAEN38WjTS7NTbT41ebvAKsExhP2LC52LoyxkXe8BDLeJW XEtBBYsqbAqPLQX3vg7b/DtvmRNle71WEgKlEeR3DA3ofrZXyg521elCuM+mAxxZ5NFra2rYslV4H jL7C2UWsGOUiAdx9zzdKFqdIuw1yHgTOHHrtJkBJi3ZyJ3wUwgiH/EOHGb0+t4QyGJOyHIHb/QtcM T2jcWMMhC9B9sKSA1DPkBdsbISoo6CFblkGM/nWQFAqZWJpPjH3HlQ1QFc42Zsm1VE20tbkyWC7Z+ N8ZBONvanNhBF1wn1QrQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLR7c-004cb6-9g; Tue, 09 Aug 2022 15:26:20 +0000 Received: from mail.fris.de ([2a01:4f8:c2c:390b::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLR7Z-004cYe-6O for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2022 15:26:18 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0FF2DC0115; Tue, 9 Aug 2022 17:26:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1660058775; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=PSCP0kIbE147G2sIrP84ZavMu3rRxvkFSpWSssQnMYo=; b=K/oiX1i3u/0DjbBMEh1GiQmnZadk1fKqiK6jYJhrysrD7oDRj30bvtWFSA9jhOVJUeKt/2 Ab1bllHDuL21IFPxcwQCJjihaJI/DIf5uQsDM3EIHNtk94js/rWqXxwbY/Bm18vq80dzSj s2pq/2U+0eTpQYQTEDGcRYrNIWxLyolIXkIQiHyOtV+q+WnjIBfzfLWZ1ztLSkOaNoC01i wfCBDQ7B9dz6/52SLhY0vvfXBhITBaIQ7i2svgZEJgi1zozULo/MoJ1lv0QRSENwVJbZXy a2MyyPKF/oAs4r20gnHV7RaI4Hav8pW7hF9XPt5kggwY8SGTO+Xbj6rJxSo3sw== From: Frieder Schrempf To: Arnd Bergmann , devicetree@vger.kernel.org, Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Olof Johansson , Rob Herring , soc@kernel.org Cc: Frieder Schrempf , Bjorn Andersson , Denys Drozdov , Dmitry Osipenko , Joel Stanley , Konrad Dybcio , Luca Weiss , Shawn Guo , Thierry Reding Subject: [PATCH 3/4] ARM: dts: imx6ul-kontron: Add imx6ull-kontron-n641x-s to Makefile Date: Tue, 9 Aug 2022 17:25:30 +0200 Message-Id: <20220809152534.292034-4-frieder@fris.de> In-Reply-To: <20220809152534.292034-1-frieder@fris.de> References: <20220809152534.292034-1-frieder@fris.de> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220809_082617_418846_E55E7AA9 X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Frieder Schrempf 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 --- 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 \ From patchwork Tue Aug 9 15:25:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 12939696 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67897C25B07 for ; Tue, 9 Aug 2022 15:27:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HWDTBHUN1gRCaOox6WNRoEyFQPvNTWbcV6budp54AIY=; b=x3RsI86cSqVPDB IPeh4rlLnGoO84w1gpgpe3IotIgnAom56N1EaBofW1pxU63XmblVcXHKxKcFlhAaPVTBUu2z8dRwd Jj3zxmi5bkuvTr8oEu6ewvmH2A/xcGbsRJfwAODbQX0KUu0EouzF7xqipXM2P6gkw3HSOEhVh8n/F UTctIrQbxo4Mdce51KewP98ZDpS0KdtmYoWCAed+CRqcqxS/I1kiU4CXSQukd8TACAOMqBBlEOFbe 0rdvdOb4zg4wZqmnqRJi+7vuyonqBlnje4FFkZM0/9p45NhQPOWZQoSqSkV2N93LLlyr18aqCjVyT QxjXAiMZV4Hyp5NQXqng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLR7x-004chb-Hd; Tue, 09 Aug 2022 15:26:41 +0000 Received: from mail.fris.de ([2a01:4f8:c2c:390b::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLR7i-004ccC-Ey for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2022 15:26:28 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2764ABFADC; Tue, 9 Aug 2022 17:26:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1660058783; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=O84QH3syOxwPsTE0OubIf0vwZyDg4pFnuKeXNvxDAuU=; b=fgbwyUJEJArGVnXmQlNeaiAGWuSI/hho057f78AXtnu32xHrKCa7n2Wu2xdyY4gYft45wz giObwflCrUjF+91z9psUinthSkOomkaLsDz/Co5Lrpvd+qvTj7mXV/Efwfeul4Xx5s7FM/ XgTBYzFIQqph+2fFZvFMWkDxcNsGAY8HSTUHLXnw/Jbyqv1AlXzuJzvq4KZrpI7A2R7RKM liiuGsH8Ve1wvIWGcQ/gV/OIgSK+SVWq6ZRiDkNHInhWu+w+RwoT0+dAFhDewFs9PwEoVw +rNDSG1pd6m/Cc1GMWpRDefxE7AIU4v22CWPQsBuz0dMbWpQ0ekKMu5Typsxgg== From: Frieder Schrempf To: devicetree@vger.kernel.org, Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Rob Herring , Sascha Hauer , Shawn Guo Cc: Frieder Schrempf , Fabio Estevam , NXP Linux Team , Pengutronix Kernel Team Subject: [PATCH 4/4] ARM: dts: imx6ul-kontron: Adjust board and SoM model strings Date: Tue, 9 Aug 2022 17:25:31 +0200 Message-Id: <20220809152534.292034-5-frieder@fris.de> In-Reply-To: <20220809152534.292034-1-frieder@fris.de> References: <20220809152534.292034-1-frieder@fris.de> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220809_082626_704705_3D4482F8 X-CRM114-Status: UNSURE ( 9.74 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Frieder Schrempf 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 --- 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"; };