From patchwork Tue Aug 9 15:25:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 596273 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D28A8C19F2D for ; Tue, 9 Aug 2022 15:26:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237621AbiHIP0B (ORCPT ); Tue, 9 Aug 2022 11:26:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244843AbiHIPZx (ORCPT ); Tue, 9 Aug 2022 11:25:53 -0400 Received: from mail.fris.de (mail.fris.de [116.203.77.234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F14706381; Tue, 9 Aug 2022 08:25:52 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 4BEA4C0160; Tue, 9 Aug 2022 17:25:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1660058750; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=5xiMAiruKhslu8d37P50Kdp+6lpsYDSM14qlW6rniqk=; b=k0SheYgbLa7YRoo+uVcg6SsDksvEoBQBeSoaOoIaJ2XIahCYUN5au923cbk0umWzfwYj4E 2KvmflEhReYrd7tgvwIjfyjaF2q+iWdkuuW8mFFQ3sOC9+41252irNGpjwcmNtz9+7Wr4Y 1+u+cBHmqXFAzOIzEQKEawG428nE6VrPhyhbTMwL0VffbswhxzReCvfn5bHOAg3punqpDx QciO9RIVg7WAqQrq0kfPA2TPPEMVrSKhtZBkebBJkAIpWMY/8u6br32Vo6DlwI5AuHCQgD ED1UvwOZbzBUt9OgK136T/sODu4yt2wh6S07goSFldg6hXD3k7noglTM0SrhCQ== From: Frieder Schrempf To: devicetree@vger.kernel.org, Krzysztof Kozlowski , linux-kernel@vger.kernel.org, Li Yang , Rob Herring , Shawn Guo Cc: Frieder Schrempf , Alexander Stein , Denys Drozdov , Fabio Estevam , Krzysztof Kozlowski , Marcel Ziswiler , Marek Vasut , Matthias Schiffer , Max Krummenacher , Rob Herring , Tim Harvey Subject: [PATCH 1/4] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings Date: Tue, 9 Aug 2022 17:25:28 +0200 Message-Id: <20220809152534.292034-2-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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Frieder Schrempf 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. Signed-off-by: Frieder Schrempf --- .../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..7c4c27d553ec 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,imx6ul-n631x-som # Kontron SL i.MX6UL (N631X 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,imx6ul-n631x-s + - const: kontron,imx6ul-n631x-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,imx6ul-n631x-s-43 + - const: kontron,imx6ul-n631x-s + - const: kontron,imx6ul-n631x-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,imx6ull-n641x-som # Kontron SL i.MX6ULL (N641X 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,imx6ull-n641x-s + - const: kontron,imx6ull-n641x-som - const: fsl,imx6ull - description: TQ Systems TQMa6ULLx SoM on MBa6ULx board 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: 596272 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F6AFC19F2D for ; Tue, 9 Aug 2022 15:26:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244805AbiHIP0N (ORCPT ); Tue, 9 Aug 2022 11:26:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244855AbiHIP0K (ORCPT ); Tue, 9 Aug 2022 11:26:10 -0400 Received: from mail.fris.de (mail.fris.de [IPv6:2a01:4f8:c2c:390b::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C5A2D122; Tue, 9 Aug 2022 08:26:08 -0700 (PDT) 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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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: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: 596271 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 477B1C19F2D for ; Tue, 9 Aug 2022 15:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244903AbiHIP0d (ORCPT ); Tue, 9 Aug 2022 11:26:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244852AbiHIP03 (ORCPT ); Tue, 9 Aug 2022 11:26:29 -0400 Received: from mail.fris.de (mail.fris.de [116.203.77.234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03B231902D; Tue, 9 Aug 2022 08:26:25 -0700 (PDT) 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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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"; };