Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp2076526rwa; Mon, 22 Aug 2022 01:24:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR4/b1+AmnrXEnXIz29fCYYO/0OFJ0KuqUy4MNeWZAWWDMNRRu1boDywvI7tnK+gH1b1XwsX X-Received: by 2002:a17:907:75f5:b0:73d:6c02:7f39 with SMTP id jz21-20020a17090775f500b0073d6c027f39mr4868702ejc.570.1661156673916; Mon, 22 Aug 2022 01:24:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661156673; cv=none; d=google.com; s=arc-20160816; b=NoqB9I/40dP3vkSeddd4TnrDpNIhE+Ig9mav/xxhHwTuoAQnu0Cv9RvOi/GRBD32c2 JBaFqomPSXYGRDl9rcGYj4wUZkX9u2YXl5geTnt7+8/TyGFwjRslkyCkQIF5ezfPbUeC 5URpAwKlttpL3x8Q9aPo1ebDvGX4tdHQpY7Tgt7VNJ+k300I+7c4ksSiqdwPRrgsDk7e +R2tbqJ2yDpr1fSG2SYhJSyF+Kshcg5AngSvPxSSyVLU7+b5AEV+IOyRGE3gpTaDfPKJ +s7e4pBz7nc+KudaqCuIAU4r7+jgR0iWZyvjs91p+5670uloyiCxelkNnyAbn3zIqqkk bZ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VLD7rK7HYJT00mnuzEusL+Azqc9fPUAgIsqUp9tsh68=; b=Mh2/ojRy3ySXMVce6GDfcX75nImxRDfqc+9xNUxH7jfp3nBMtE52/EDUD5adhqTDsl NJMyvkKPjwF3IsBMmz84tGkWCLHf8C2STQ12HnE1aIp+ok6TfuplG6SFTJ63ynYyl8qj sPwhAeQfdEwibiZKU6EgMQiX2+LEA50se2yI/g2q4luzNVcKu071VrwQFZjiALtomVbb 0k680HwsU5KWqR1cWp9aHJalzGZO7rSc+RPSDiRlMqJCh65qv0fbHuzXRgzL4aubbmid PHvsqql1nxPdFtooeEihKZN+9d6ibExzTArbUggXAeTz/mCF1yPj2ImS8OS1qpYFVBgz DsFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fris.de header.s=dkim header.b=zSydjTQc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=fris.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hz1-20020a1709072ce100b0073cbac99ac6si8363584ejc.446.2022.08.22.01.24.05; Mon, 22 Aug 2022 01:24:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@fris.de header.s=dkim header.b=zSydjTQc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=fris.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233523AbiHVIB4 (ORCPT + 99 others); Mon, 22 Aug 2022 04:01:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233504AbiHVIBr (ORCPT ); Mon, 22 Aug 2022 04:01:47 -0400 Received: from mail.fris.de (mail.fris.de [IPv6:2a01:4f8:c2c:390b::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CAA62AE22; Mon, 22 Aug 2022 01:01:46 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E7C7ABFB01; Mon, 22 Aug 2022 10:01:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1661155304; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=VLD7rK7HYJT00mnuzEusL+Azqc9fPUAgIsqUp9tsh68=; b=zSydjTQcxfEakzxHtaN7dSYyaJ2iV8ZPFFd63qCCIhnWwGBFJSqIWaXkkWIwl4BwqTAGHl K4u3Cw7FVzhTkVbpXwgerTNlNLDza85lur/Xbq1083ls7MFIKVgNx0Ep4v/p5w6fZ3EwNC GFEMwNxjI72IzwKb7xG4zlIFiYzKXOzHG3+WerUuKFWuDr+LAxVkO37o3mw8Xx+tI6FY4P I6VVZdP/vc0B52pSOC78z9tJFXPpFqnFgq2/zRY7PHMlQa3w58FTV2bFIGZtIAQfr4xJXo LxyW/X3sScAUMzKmB8Z3kN6XR40K+XUpZkuMqnXuqGjCGzGRJ8xOrJm35H4Ahg== 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: Krzysztof Kozlowski , Frieder Schrempf , Alexander Stein , Alex Marginean , Fabio Estevam , Heiko Thiery , Krzysztof Kozlowski , Marcel Ziswiler , Marek Vasut , NXP Linux Team , Oleksij Rempel , Pengutronix Kernel Team , Reinhold Mueller , Tim Harvey , Vladimir Oltean Subject: [PATCH v3 3/8] arm64: dts: imx8mm-kontron: Adjust compatibles, file names and model strings Date: Mon, 22 Aug 2022 10:00:56 +0200 Message-Id: <20220822080103.24016-4-frieder@fris.de> In-Reply-To: <20220822080103.24016-1-frieder@fris.de> References: <20220822080103.24016-1-frieder@fris.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frieder Schrempf The official naming includes "SL" (SoM-Line) or "BL" (Board-Line). By updating we make sure, that we can maintain this more easily in future and make sure that the proper devicetree can be selected for the hardware. Signed-off-by: Frieder Schrempf --- Changes in v3: * also rename compatibles and file names * rebase on v6.0-rc1 Changes in v2: * none --- arch/arm64/boot/dts/freescale/Makefile | 2 +- .../{imx8mm-kontron-n801x-s.dts => imx8mm-kontron-bl.dts} | 4 ++-- .../{imx8mm-kontron-n801x-som.dtsi => imx8mm-kontron-sl.dtsi} | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm64/boot/dts/freescale/{imx8mm-kontron-n801x-s.dts => imx8mm-kontron-bl.dts} (98%) rename arch/arm64/boot/dts/freescale/{imx8mm-kontron-n801x-som.dtsi => imx8mm-kontron-sl.dtsi} (98%) diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 8bf7f7ecebaa..d014f7c4c888 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -55,7 +55,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-emcon-avari.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-ctouch2.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-edimm2.2.dtb -dtb-$(CONFIG_ARCH_MXC) += imx8mm-kontron-n801x-s.dtb +dtb-$(CONFIG_ARCH_MXC) += imx8mm-kontron-bl.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-mx8menlo.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-nitrogen-r2.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-phyboard-polis-rdk.dtb diff --git a/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts b/arch/arm64/boot/dts/freescale/imx8mm-kontron-bl.dts similarity index 98% rename from arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts rename to arch/arm64/boot/dts/freescale/imx8mm-kontron-bl.dts index 23be1ec538ba..4e5828fa815b 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-s.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-kontron-bl.dts @@ -8,8 +8,8 @@ #include "imx8mm-kontron-n801x-som.dtsi" / { - model = "Kontron i.MX8MM N801X S"; - compatible = "kontron,imx8mm-n801x-s", "kontron,imx8mm-n801x-som", "fsl,imx8mm"; + model = "Kontron BL i.MX8MM (N801X S)"; + compatible = "kontron,imx8mm-bl", "kontron,imx8mm-sl", "fsl,imx8mm"; aliases { ethernet1 = &usbnet; diff --git a/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-kontron-sl.dtsi similarity index 98% rename from arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi rename to arch/arm64/boot/dts/freescale/imx8mm-kontron-sl.dtsi index 8f90eb02550d..30299c2a98ea 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm-kontron-sl.dtsi @@ -6,8 +6,8 @@ #include "imx8mm.dtsi" / { - model = "Kontron i.MX8MM N801X SoM"; - compatible = "kontron,imx8mm-n801x-som", "fsl,imx8mm"; + model = "Kontron SL i.MX8MM (N801X SOM)"; + compatible = "kontron,imx8mm-sl", "fsl,imx8mm"; memory@40000000 { device_type = "memory"; -- 2.37.1