From nobody Fri Dec 19 19:02:50 2025 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 46BA2C00140 for ; Mon, 15 Aug 2022 08:28:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240972AbiHOI2e (ORCPT ); Mon, 15 Aug 2022 04:28:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231685AbiHOI21 (ORCPT ); Mon, 15 Aug 2022 04:28:27 -0400 Received: from mail.fris.de (mail.fris.de [116.203.77.234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E51291F611; Mon, 15 Aug 2022 01:28:25 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 26D88C017B; Mon, 15 Aug 2022 10:28:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1660552104; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=LTBolOrKW71HOA29KSRA59eoWDLOhelEVU1jEz2c+ck=; b=zKbYB4vXXsZMWAiKxPxBsvPKC7RWtWaWuL2BLQ0B+zMc6YWmLOFdRHug4UK9QuCXyNBJNQ w9MCFFjLANuq/OhdZAdPpj6nWmZB+5EWelfHcgB3iotBxo8DHLyoZuCG4zMrtA226tOwce Q95CMe/lC5BzjEgoJ5j8vVTeXeZaHl2bjfNCrHKwDSkDUY/N13YYv6SS7iCZsZJVfquXiv 47fZ5nyTc/Po0HXe+L24Z+8ZbdewC4Wf7ooEjIO834y9bmARvN/ujVW5tNwGNpV4wNPl82 DsPRTqM1CKYAYqnp3iMwtQ3AB+MpBdz1vDdrC/2/FHoInGmWKT5b4QikHsuhWg== From: Frieder Schrempf To: devicetree@vger.kernel.org, Krzysztof Kozlowski , linux-kernel@vger.kernel.org, Li Yang , Rob Herring , Shawn Guo Cc: Frieder Schrempf , Krzysztof Kozlowski , Alexander Stein , "Ariel D'Alessandro" , Denys Drozdov , Marcel Ziswiler , Marek Vasut , Matthias Schiffer , Max Krummenacher , Rob Herring Subject: [PATCH v3 1/3] dt-bindings: arm: fsl: imx6ul-kontron: Update bindings Date: Mon, 15 Aug 2022 10:28:10 +0200 Message-Id: <20220815082814.27651-2-frieder@fris.de> In-Reply-To: <20220815082814.27651-1-frieder@fris.de> References: <20220815082814.27651-1-frieder@fris.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. It also gets 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 Acked-by: Krzysztof Kozlowski --- .../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..649862052f53 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 Mo= dule - - kontron,imx6ul-n6310-som # Kontron N6310 SOM - - kontron,imx6ul-n6311-som # Kontron N6311 SOM + - kontron,sl-imx6ul # Kontron SL i.MX6UL SoM - prt,prti6g # Protonic PRTI6G Board - technexion,imx6ul-pico-dwarf # TechNexion i.MX6UL Pico-D= warf - technexion,imx6ul-pico-hobbit # TechNexion i.MX6UL Pico-H= obbit @@ -590,23 +589,17 @@ properties: - const: phytec,imx6ul-pcl063 # PHYTEC phyCORE-i.MX 6UL - const: fsl,imx6ul =20 - - 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,bl-imx6ul # Kontron BL i.MX6UL Carrier Bo= ard + - const: kontron,sl-imx6ul # Kontron SL i.MX6UL SoM - const: fsl,imx6ul =20 - - 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,bl-imx6ul-43 # Kontron BL i.MX6UL Carrier Bo= ard with 4.3" Display + - const: kontron,bl-imx6ul # Kontron BL i.MX6UL Carrier Bo= ard + - const: kontron,sl-imx6ul # Kontron SL i.MX6UL SoM - const: fsl,imx6ul =20 - 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,sl-imx6ull # Kontron SL i.MX6ULL 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 =20 - - 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,bl-imx6ull # Kontron BL i.MX6ULL Carrier Board + - const: kontron,sl-imx6ull # Kontron SL i.MX6ULL SoM - const: fsl,imx6ull =20 - description: TQ Systems TQMa6ULLx SoM on MBa6ULx board --=20 2.37.1 From nobody Fri Dec 19 19:02:50 2025 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 6348EC00140 for ; Mon, 15 Aug 2022 08:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231256AbiHOI3B (ORCPT ); Mon, 15 Aug 2022 04:29:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231685AbiHOI2u (ORCPT ); Mon, 15 Aug 2022 04:28:50 -0400 Received: from mail.fris.de (mail.fris.de [IPv6:2a01:4f8:c2c:390b::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB0C41F624; Mon, 15 Aug 2022 01:28:48 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3C651BFADB; Mon, 15 Aug 2022 10:28:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1660552125; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=sl6SUxmAvCtP4OCDbrUpoCUjEKmSThZ1ykVQkty4PkY=; b=ERH0izhw41NwQGgY3f8bYUY5SceyY9Z5TY1NsyeRlxzk/bqt2ZG3IsvH3nxL2DcjIQCRaY 1ZTUw6YiT6BVgUpnWVgfrpLqiJ+xzgnaJr1C3L6tgS4YYGi0MRSHD/l7oMnQQ1vvmaawim XCDu+5N1WGU79y1FjTTaK5BjYd6W3p0lAjOhBHZIo6lAYONlTbinBv+TwDRI8wdJc8pY3G 3zAWYyEuZIT7JC5T19sjPw52aFlBANPG9GKohw60QJuxwdyVKd15EyabasriPX78cLfE5B neVZyN6XTAdjvEUwzOZKyWtdiu076Slb2tZ4lWn+af+SlBA/Bus9+KLkhojLhg== 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 , Sascha Hauer , Shawn Guo , soc@kernel.org Cc: Frieder Schrempf , Bjorn Andersson , Denys Drozdov , Dmitry Osipenko , Fabio Estevam , Joel Stanley , Konrad Dybcio , Krzysztof Kozlowski , Luca Weiss , NXP Linux Team , Pengutronix Kernel Team , Thierry Reding Subject: [PATCH v3 2/3] ARM: dts: imx6ul-kontron: Simplify devicetree structure Date: Mon, 15 Aug 2022 10:28:11 +0200 Message-Id: <20220815082814.27651-3-frieder@fris.de> In-Reply-To: <20220815082814.27651-1-frieder@fris.de> References: <20220815082814.27651-1-frieder@fris.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. 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 --- arch/arm/boot/dts/Makefile | 4 +- ...6310-s-43.dts =3D> imx6ul-kontron-bl-43.dts} | 8 ++-- ...x-s.dtsi =3D> imx6ul-kontron-bl-common.dtsi} | 0 ...tron-n6310-s.dts =3D> imx6ul-kontron-bl.dts} | 9 ++--- .../boot/dts/imx6ul-kontron-n6311-som.dtsi | 40 ------------------- ...mon.dtsi =3D> imx6ul-kontron-sl-common.dtsi} | 15 +++++++ ...-n6310-som.dtsi =3D> imx6ul-kontron-sl.dtsi} | 33 ++------------- ...ron-n6411-s.dts =3D> imx6ull-kontron-bl.dts} | 9 ++--- .../boot/dts/imx6ull-kontron-n6411-som.dtsi | 40 ------------------- ...on-n6311-s.dts =3D> imx6ull-kontron-sl.dtsi} | 11 ++--- 10 files changed, 36 insertions(+), 133 deletions(-) rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s-43.dts =3D> imx6ul-kontro= n-bl-43.dts} (93%) rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-s.dtsi =3D> imx6ul-kontron-= bl-common.dtsi} (100%) rename arch/arm/boot/dts/{imx6ul-kontron-n6310-s.dts =3D> imx6ul-kontron-b= l.dts} (52%) delete mode 100644 arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi rename arch/arm/boot/dts/{imx6ul-kontron-n6x1x-som-common.dtsi =3D> imx6ul= -kontron-sl-common.dtsi} (90%) rename arch/arm/boot/dts/{imx6ul-kontron-n6310-som.dtsi =3D> imx6ul-kontro= n-sl.dtsi} (28%) rename arch/arm/boot/dts/{imx6ull-kontron-n6411-s.dts =3D> imx6ull-kontron= -bl.dts} (43%) delete mode 100644 arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi rename arch/arm/boot/dts/{imx6ul-kontron-n6311-s.dts =3D> imx6ull-kontron-= sl.dtsi} (41%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5112f493f494..6627aed26fd6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -696,8 +696,8 @@ dtb-$(CONFIG_SOC_IMX6UL) +=3D \ 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 \ diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts b/arch/arm/boo= t/dts/imx6ul-kontron-bl-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-bl-43.dts index 5bfad4655b22..0c643706a158 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s-43.dts +++ b/arch/arm/boot/dts/imx6ul-kontron-bl-43.dts @@ -5,12 +5,12 @@ * Copyright (c) 2019 Krzysztof Kozlowski */ =20 -#include "imx6ul-kontron-n6310-s.dts" +#include "imx6ul-kontron-bl.dts" =20 / { - model =3D "Kontron N6310 S 43"; - compatible =3D "kontron,imx6ul-n6310-s-43", "kontron,imx6ul-n6310-s", - "kontron,imx6ul-n6310-som", "fsl,imx6ul"; + model =3D "Kontron BL i.MX6UL 43 (N631X S 43)"; + compatible =3D "kontron,bl-imx6ul-43", "kontron,bl-imx6ul", + "kontron,sl-imx6ul", "fsl,imx6ul"; =20 backlight { compatible =3D "pwm-backlight"; diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi b/arch/arm/boot/= dts/imx6ul-kontron-bl-common.dtsi similarity index 100% rename from arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi rename to arch/arm/boot/dts/imx6ul-kontron-bl-common.dtsi diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts b/arch/arm/boot/d= ts/imx6ul-kontron-bl.dts similarity index 52% rename from arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts rename to arch/arm/boot/dts/imx6ul-kontron-bl.dts index 5a3e06d6219b..dadf6d3d5f52 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-s.dts +++ b/arch/arm/boot/dts/imx6ul-kontron-bl.dts @@ -7,11 +7,10 @@ =20 /dts-v1/; =20 -#include "imx6ul-kontron-n6310-som.dtsi" -#include "imx6ul-kontron-n6x1x-s.dtsi" +#include "imx6ul-kontron-sl.dtsi" +#include "imx6ul-kontron-bl-common.dtsi" =20 / { - model =3D "Kontron N6310 S"; - compatible =3D "kontron,imx6ul-n6310-s", "kontron,imx6ul-n6310-som", - "fsl,imx6ul"; + model =3D "Kontron BL i.MX6UL (N631X S)"; + compatible =3D "kontron,bl-imx6ul", "kontron,sl-imx6ul", "fsl,imx6ul"; }; diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi b/arch/arm/boo= t/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 =3D "Kontron N6311 SOM"; - compatible =3D "kontron,imx6ul-n6311-som", "fsl,imx6ul"; - - memory@80000000 { - reg =3D <0x80000000 0x20000000>; - device_type =3D "memory"; - }; -}; - -&qspi { - flash@0 { - #address-cells =3D <1>; - #size-cells =3D <1>; - compatible =3D "spi-nand"; - spi-max-frequency =3D <104000000>; - spi-tx-bus-width =3D <4>; - spi-rx-bus-width =3D <4>; - reg =3D <0>; - - partition@0 { - label =3D "ubi1"; - reg =3D <0x00000000 0x08000000>; - }; - - partition@8000000 { - label =3D "ubi2"; - reg =3D <0x08000000 0x18000000>; - }; - }; -}; diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi b/arch/= arm/boot/dts/imx6ul-kontron-sl-common.dtsi similarity index 90% rename from arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi rename to arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi index 09a83dbdf651..dcf88f610346 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi +++ b/arch/arm/boot/dts/imx6ul-kontron-sl-common.dtsi @@ -11,6 +11,11 @@ / { chosen { stdout-path =3D &uart4; }; + + memory@80000000 { + reg =3D <0x80000000 0x10000000>; + device_type =3D "memory"; + }; }; =20 &ecspi2 { @@ -55,6 +60,16 @@ &qspi { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_qspi>; status =3D "okay"; + + spi-flash@0 { + #address-cells =3D <1>; + #size-cells =3D <1>; + compatible =3D "spi-nand"; + spi-max-frequency =3D <104000000>; + spi-tx-bus-width =3D <4>; + spi-rx-bus-width =3D <4>; + reg =3D <0>; + }; }; =20 &wdog1 { diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi b/arch/arm/boo= t/dts/imx6ul-kontron-sl.dtsi similarity index 28% rename from arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi rename to arch/arm/boot/dts/imx6ul-kontron-sl.dtsi index acd936540d89..0580d043e5ae 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-kontron-sl.dtsi @@ -6,36 +6,9 @@ */ =20 #include "imx6ul.dtsi" -#include "imx6ul-kontron-n6x1x-som-common.dtsi" +#include "imx6ul-kontron-sl-common.dtsi" =20 / { - model =3D "Kontron N6310 SOM"; - compatible =3D "kontron,imx6ul-n6310-som", "fsl,imx6ul"; - - memory@80000000 { - reg =3D <0x80000000 0x10000000>; - device_type =3D "memory"; - }; -}; - -&qspi { - flash@0 { - #address-cells =3D <1>; - #size-cells =3D <1>; - compatible =3D "spi-nand"; - spi-max-frequency =3D <108000000>; - spi-tx-bus-width =3D <4>; - spi-rx-bus-width =3D <4>; - reg =3D <0>; - - partition@0 { - label =3D "ubi1"; - reg =3D <0x00000000 0x08000000>; - }; - - partition@8000000 { - label =3D "ubi2"; - reg =3D <0x08000000 0x08000000>; - }; - }; + model =3D "Kontron SL i.MX6UL (N631X SOM)"; + compatible =3D "kontron,sl-imx6ul", "fsl,imx6ul"; }; diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts b/arch/arm/boot/= dts/imx6ull-kontron-bl.dts similarity index 43% rename from arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts rename to arch/arm/boot/dts/imx6ull-kontron-bl.dts index 57588a5e1e34..fa016465cdbc 100644 --- a/arch/arm/boot/dts/imx6ull-kontron-n6411-s.dts +++ b/arch/arm/boot/dts/imx6ull-kontron-bl.dts @@ -6,11 +6,10 @@ =20 /dts-v1/; =20 -#include "imx6ull-kontron-n6411-som.dtsi" -#include "imx6ul-kontron-n6x1x-s.dtsi" +#include "imx6ull-kontron-sl.dtsi" +#include "imx6ul-kontron-bl-common.dtsi" =20 / { - model =3D "Kontron N6411 S"; - compatible =3D "kontron,imx6ull-n6411-s", "kontron,imx6ull-n6411-som", - "fsl,imx6ull"; + model =3D "Kontron BL i.MX6ULL (N641X S)"; + compatible =3D "kontron,bl-imx6ull", "kontron,sl-imx6ull", "fsl,imx6ull"; }; diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi b/arch/arm/bo= ot/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 =3D "Kontron N6411 SOM"; - compatible =3D "kontron,imx6ull-n6311-som", "fsl,imx6ull"; - - memory@80000000 { - reg =3D <0x80000000 0x20000000>; - device_type =3D "memory"; - }; -}; - -&qspi { - flash@0 { - #address-cells =3D <1>; - #size-cells =3D <1>; - compatible =3D "spi-nand"; - spi-max-frequency =3D <104000000>; - spi-tx-bus-width =3D <4>; - spi-rx-bus-width =3D <4>; - reg =3D <0>; - - partition@0 { - label =3D "ubi1"; - reg =3D <0x00000000 0x08000000>; - }; - - partition@8000000 { - label =3D "ubi2"; - reg =3D <0x08000000 0x18000000>; - }; - }; -}; diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts b/arch/arm/boot/d= ts/imx6ull-kontron-sl.dtsi similarity index 41% rename from arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts rename to arch/arm/boot/dts/imx6ull-kontron-sl.dtsi index 239a1af3aeaa..93f10eb3494f 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6311-s.dts +++ b/arch/arm/boot/dts/imx6ull-kontron-sl.dtsi @@ -4,13 +4,10 @@ * Copyright (C) 2018 Kontron Electronics GmbH */ =20 -/dts-v1/; - -#include "imx6ul-kontron-n6311-som.dtsi" -#include "imx6ul-kontron-n6x1x-s.dtsi" +#include "imx6ull.dtsi" +#include "imx6ul-kontron-sl-common.dtsi" =20 / { - model =3D "Kontron N6311 S"; - compatible =3D "kontron,imx6ul-n6311-s", "kontron,imx6ul-n6311-som", - "fsl,imx6ul"; + model =3D "Kontron SL i.MX6ULL (N641X SOM)"; + compatible =3D "kontron,sl-imx6ull", "fsl,imx6ull"; }; --=20 2.37.1 From nobody Fri Dec 19 19:02:50 2025 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 DA616C00140 for ; Mon, 15 Aug 2022 08:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233335AbiHOI3D (ORCPT ); Mon, 15 Aug 2022 04:29:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241214AbiHOI2v (ORCPT ); Mon, 15 Aug 2022 04:28:51 -0400 Received: from mail.fris.de (mail.fris.de [IPv6:2a01:4f8:c2c:390b::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B01581F637; Mon, 15 Aug 2022 01:28:50 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D64CDBFAE8; Mon, 15 Aug 2022 10:28:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1660552128; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=24xyn2EcGe3/F2/wyHYU1Hh1pGAy3aJpsHHcjneCMio=; b=jLgnQEyT2ttQLDmozy84ZlASXmp3bBjEUrwipGpYZKNexyXqYSh+RsammlyLDqANMW47xb ABjit/9qwJikLTZS8AII7idywFlN9W78Vu90UWfWJp85fx4rC60mV/7akDwk7ZDg5z13xV 8fI9hSTD+gVXBYIWJuAOgol05yqlUNB4wNHqmZsUbHh9/B1OYpcEgHhAWGhQAYi8riJUvZ sI6leRXbwFenvjrMEQ/cKDzrz0s1hXJJMdASqOossktTNgmyc/Bz7IqBfxPOxnX0Jo7O8q 4AQPsfwh59C4qzEt2my67D0P98MUqVMPjKVrC1nb5USGdk17K7aDpfk5g7gr/w== 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 v3 3/3] ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile Date: Mon, 15 Aug 2022 10:28:12 +0200 Message-Id: <20220815082814.27651-4-frieder@fris.de> In-Reply-To: <20220815082814.27651-1-frieder@fris.de> References: <20220815082814.27651-1-frieder@fris.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Frieder Schrempf The imx6ull-kontron-bl.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 | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 6627aed26fd6..1d0c79f61072 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -726,6 +726,7 @@ dtb-$(CONFIG_SOC_IMX6UL) +=3D \ imx6ull-colibri-wifi-iris.dtb \ imx6ull-colibri-wifi-iris-v2.dtb \ imx6ull-jozacp.dtb \ + imx6ull-kontron-bl.dtb \ imx6ull-myir-mys-6ulx-eval.dtb \ imx6ull-opos6uldev.dtb \ imx6ull-phytec-segin-ff-rdk-nand.dtb \ --=20 2.37.1