From patchwork Mon Aug 15 08:28:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 597334 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 585EAC25B0D for ; Mon, 15 Aug 2022 08:28:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232507AbiHOI21 (ORCPT ); Mon, 15 Aug 2022 04:28:27 -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 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. 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 Module - - 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-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,bl-imx6ul # Kontron BL i.MX6UL Carrier Board + - const: kontron,sl-imx6ul # Kontron SL i.MX6UL 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,bl-imx6ul-43 # Kontron BL i.MX6UL Carrier Board with 4.3" Display + - const: kontron,bl-imx6ul # Kontron BL i.MX6UL Carrier Board + - const: kontron,sl-imx6ul # Kontron SL i.MX6UL 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,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 - - 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 - description: TQ Systems TQMa6ULLx SoM on MBa6ULx board From patchwork Mon Aug 15 08:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 597333 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 60091C3F6B0 for ; Mon, 15 Aug 2022 08:29:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241577AbiHOI27 (ORCPT ); Mon, 15 Aug 2022 04:28:59 -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 X-Last-TLS-Session-Version: TLSv1.3 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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) += \ 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 \