From patchwork Sat Mar 11 13:13:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 13170823 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 8FC84C61DA4 for ; Sat, 11 Mar 2023 13:14:48 +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=y1qwf0JKcEwFuRpP04swLM4obsQgmFOPYprG6895Log=; b=MZeyddOtNv93ME jhQVxbXNR0grytUgl3OAfDqsMhSSSVd0QISufSPwVjeAKsWk6P4GFQ+bYOPy2etP0Sm3Wh8oTgKGg WsKghDHHd7kRl/X5rvd4J6G8DNU8V+PPzGcgjqb6T3OIK2dIMK/yLJkcWTwbKP4j9OkmuTqGkUSoQ s5bC9dfyZUAeIzQkFVumWdd/15AFKq2re+97Pz8p3Tnjt0lv4LQi9uVbvvgUoJWhsTkdxKBdxir2d 4grLYtnw1xvT0pVWtPBOEQJYc5joT+eY/BeIw3Fd/+Y7yqDlZkaM4ErjKAiSFved2uWmO1+5JecCw Xw5m8rLw9ncZR3IdgYeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1paz2h-000ZvM-V6; Sat, 11 Mar 2023 13:13:48 +0000 Received: from lelv0143.ext.ti.com ([198.47.23.248]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1paz2e-000Ztl-96 for linux-arm-kernel@lists.infradead.org; Sat, 11 Mar 2023 13:13:45 +0000 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32BDDQI6087811; Sat, 11 Mar 2023 07:13:26 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1678540406; bh=kEYDSV6Gh2DW14CuXdqw8T1zKsiopR7bs8xtVKOlGYM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=pOw1S8yQ9Iy7K/XZJyyL1r9f2y+6Lepf4WkVSbBCVgLe6gd9q8udo0vKBFoh8yFhM M7p30PpNImBqvHalGis0F7wVbeki5pA0ZFmqfm6NvI9rydurWPitKwsmOJPkEywj8f a4Tofw+/2PEWyFcoJSn7phWMLLYNNsqrsHndJOvY= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32BDDQrY012210 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Sat, 11 Mar 2023 07:13:26 -0600 Received: from DFLE113.ent.ti.com (10.64.6.34) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Sat, 11 Mar 2023 07:13:25 -0600 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Sat, 11 Mar 2023 07:13:26 -0600 Received: from localhost (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32BDDQiV016530; Sat, 11 Mar 2023 07:13:26 -0600 From: Nishanth Menon To: Sekhar Nori , Linus Walleij , Krzysztof Kozlowski , Rob Herring , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" CC: , , , , , Tero Kristo , Vignesh Raghavendra , Nishanth Menon Subject: [PATCH 1/2] dt-bindings: net: ti: k3-am654-cpsw-nuss: Drop pinmux header Date: Sat, 11 Mar 2023 07:13:24 -0600 Message-ID: <20230311131325.9750-2-nm@ti.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230311131325.9750-1-nm@ti.com> References: <20230311131325.9750-1-nm@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230311_051344_458277_FFC649BF X-CRM114-Status: GOOD ( 10.69 ) 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 Drop the pinmux header reference. Examples should just show the node definition. Signed-off-by: Nishanth Menon Acked-by: Krzysztof Kozlowski --- Looks like there are regressions in this yaml file already when checked with dt_bindings_check, but that is a seperate activity of it's own. If net maintainers are OK, I'd like to pick this up as part of the pinctrl fixes series for next.. Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml index 900063411a20..837d6db299c4 100644 --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml @@ -222,7 +222,6 @@ additionalProperties: false examples: - | - #include #include #include #include From patchwork Sat Mar 11 13:13:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 13170824 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 9BBB7C61DA4 for ; Sat, 11 Mar 2023 13:14:55 +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=Z2P8vPufOt7kZuEm3t2dYbPa6gUkvo9SRtB+kvxqLaM=; b=ieEE51nQTrGgmq yaupNJLhiidXMCK1jSaTH6tiaYS4C5jfBWQN+PvxYaEibpQwKV0tyQRBubkVlvnxsSXBUQy59uICZ TBE0RthS22YwTJhNHidir0a9wPl8s07+UtIwYXGRpqZjszoIamDkF3u5kSMOk43JgdzJ2as2zeUd6 HOlg6l2A7LBbK5C3eaXYtEdZwXfEcshnq//N+wSKwXcHMI3flaIt00HnPOjcvEz2bSdj002QfmYJV v2F3TRyKy7cdNPPMifSQyHXejU5Fq2xdNbiWVWDQa1JnDnMbGZjvbE5cEy1GiQicxJ7/lyiQKuhuJ ADkCR88GjDl8ItL50pew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1paz2x-000Zz4-4G; Sat, 11 Mar 2023 13:14:03 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1paz2e-000Zti-95 for linux-arm-kernel@lists.infradead.org; Sat, 11 Mar 2023 13:13:47 +0000 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32BDDQm1017523; Sat, 11 Mar 2023 07:13:26 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1678540406; bh=eYpa+eh8qEfFT016DWnLlGWJJDueQKCLZItt0BSTdwY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Ox1ko/+8Dn34IzOPaHpZv9cHLrz6pW8oKljstDtPgK9J34KOGI1XmIqPIL9Si6ha1 PPKfRW98JMP/eKw3jGEW2j5h7yU8B6DCfH9ANGYs2su7tsFx/ZO+YR7g+GP/VnFJJo uZpjJMfFu+AHL+EfUsgYTL9inczgAZE/s/0DWbrI= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32BDDQbm012213 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Sat, 11 Mar 2023 07:13:26 -0600 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Sat, 11 Mar 2023 07:13:26 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Sat, 11 Mar 2023 07:13:25 -0600 Received: from localhost (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32BDDQHO007410; Sat, 11 Mar 2023 07:13:26 -0600 From: Nishanth Menon To: Sekhar Nori , Linus Walleij , Krzysztof Kozlowski , Rob Herring , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" CC: , , , , , Tero Kristo , Vignesh Raghavendra , Nishanth Menon , Krzysztof Kozlowski Subject: [PATCH 2/2] dt-bindings: pinctrl: Move k3.h to arch Date: Sat, 11 Mar 2023 07:13:25 -0600 Message-ID: <20230311131325.9750-3-nm@ti.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230311131325.9750-1-nm@ti.com> References: <20230311131325.9750-1-nm@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230311_051344_459313_5B09FA8B X-CRM114-Status: GOOD ( 12.75 ) 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 Move the k3 pinctrl definition to arch dts folder. While at this, fixup MAINTAINERS and header guard macro to better reflect the changes. Suggested-by: Krzysztof Kozlowski Suggested-by: Linus Walleij Link: https://lore.kernel.org/all/c4d53e9c-dac0-8ccc-dc86-faada324beba@linaro.org/ Signed-off-by: Nishanth Menon --- There is no specific case I can think of at the moment to create a pinctrl.dtsi for the SoCs.. So, unlike other SoCs, I had not done that in the series, if folks have a better opinion about this, please let us discuss. MAINTAINERS | 1 - arch/arm64/boot/dts/ti/k3-am62.dtsi | 3 ++- arch/arm64/boot/dts/ti/k3-am62a.dtsi | 3 ++- arch/arm64/boot/dts/ti/k3-am64.dtsi | 3 ++- arch/arm64/boot/dts/ti/k3-am65.dtsi | 3 ++- arch/arm64/boot/dts/ti/k3-j7200.dtsi | 3 ++- arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 ++- arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 3 ++- arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 3 ++- .../pinctrl/k3.h => arch/arm64/boot/dts/ti/k3-pinctrl.h | 6 +++--- 10 files changed, 19 insertions(+), 12 deletions(-) rename include/dt-bindings/pinctrl/k3.h => arch/arm64/boot/dts/ti/k3-pinctrl.h (94%) diff --git a/MAINTAINERS b/MAINTAINERS index 2892858cb040..442ac29e1fce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2933,7 +2933,6 @@ F: Documentation/devicetree/bindings/arm/ti/k3.yaml F: Documentation/devicetree/bindings/hwinfo/ti,k3-socinfo.yaml F: arch/arm64/boot/dts/ti/Makefile F: arch/arm64/boot/dts/ti/k3-* -F: include/dt-bindings/pinctrl/k3.h ARM/TOSHIBA VISCONTI ARCHITECTURE M: Nobuhiro Iwamatsu diff --git a/arch/arm64/boot/dts/ti/k3-am62.dtsi b/arch/arm64/boot/dts/ti/k3-am62.dtsi index 37fcbe7a3c33..a401f5225243 100644 --- a/arch/arm64/boot/dts/ti/k3-am62.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62.dtsi @@ -8,9 +8,10 @@ #include #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 AM625 SoC"; compatible = "ti,am625"; diff --git a/arch/arm64/boot/dts/ti/k3-am62a.dtsi b/arch/arm64/boot/dts/ti/k3-am62a.dtsi index 6eb87c3f9f3c..fe60c9ce21e3 100644 --- a/arch/arm64/boot/dts/ti/k3-am62a.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62a.dtsi @@ -8,9 +8,10 @@ #include #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 AM62A SoC"; compatible = "ti,am62a7"; diff --git a/arch/arm64/boot/dts/ti/k3-am64.dtsi b/arch/arm64/boot/dts/ti/k3-am64.dtsi index c858725133af..60fe95b48312 100644 --- a/arch/arm64/boot/dts/ti/k3-am64.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am64.dtsi @@ -8,9 +8,10 @@ #include #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 AM642 SoC"; compatible = "ti,am642"; diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi index c538a0bf3cdd..3093ef6b9b23 100644 --- a/arch/arm64/boot/dts/ti/k3-am65.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi @@ -8,9 +8,10 @@ #include #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 AM654 SoC"; compatible = "ti,am654"; diff --git a/arch/arm64/boot/dts/ti/k3-j7200.dtsi b/arch/arm64/boot/dts/ti/k3-j7200.dtsi index d74f86b0f622..bbe380c72a7e 100644 --- a/arch/arm64/boot/dts/ti/k3-j7200.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j7200.dtsi @@ -7,9 +7,10 @@ #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 J7200 SoC"; compatible = "ti,j7200"; diff --git a/arch/arm64/boot/dts/ti/k3-j721e.dtsi b/arch/arm64/boot/dts/ti/k3-j721e.dtsi index 6975cae644d9..4c7d5f9d61a8 100644 --- a/arch/arm64/boot/dts/ti/k3-j721e.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721e.dtsi @@ -7,9 +7,10 @@ #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 J721E SoC"; compatible = "ti,j721e"; diff --git a/arch/arm64/boot/dts/ti/k3-j721s2.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2.dtsi index 78295ee0fee5..376924726f1f 100644 --- a/arch/arm64/boot/dts/ti/k3-j721s2.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721s2.dtsi @@ -10,9 +10,10 @@ #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 J721S2 SoC"; diff --git a/arch/arm64/boot/dts/ti/k3-j784s4.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4.dtsi index 3eb0d0568959..2e03d84da7d2 100644 --- a/arch/arm64/boot/dts/ti/k3-j784s4.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j784s4.dtsi @@ -10,9 +10,10 @@ #include #include -#include #include +#include "k3-pinctrl.h" + / { model = "Texas Instruments K3 J784S4 SoC"; compatible = "ti,j784s4"; diff --git a/include/dt-bindings/pinctrl/k3.h b/arch/arm64/boot/dts/ti/k3-pinctrl.h similarity index 94% rename from include/dt-bindings/pinctrl/k3.h rename to arch/arm64/boot/dts/ti/k3-pinctrl.h index 469bd29651db..6004e0967ec5 100644 --- a/include/dt-bindings/pinctrl/k3.h +++ b/arch/arm64/boot/dts/ti/k3-pinctrl.h @@ -3,10 +3,10 @@ * This header provides constants for pinctrl bindings for TI's K3 SoC * family. * - * Copyright (C) 2018-2021 Texas Instruments Incorporated - https://www.ti.com/ + * Copyright (C) 2018-2023 Texas Instruments Incorporated - https://www.ti.com/ */ -#ifndef _DT_BINDINGS_PINCTRL_TI_K3_H -#define _DT_BINDINGS_PINCTRL_TI_K3_H +#ifndef DTS_ARM64_TI_K3_PINCTRL_H +#define DTS_ARM64_TI_K3_PINCTRL_H #define PULLUDEN_SHIFT (16) #define PULLTYPESEL_SHIFT (17)