From patchwork Tue Dec 5 16:48:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 13480436 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 44472C10DC3 for ; Tue, 5 Dec 2023 16:49:15 +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=d5UuoLOSMG2WVXZwa0TYGwVQJHK93Ci+aKhSJE7clVE=; b=qbAGhgQiro5G3+ LgTw9zN7hiIZaVHY9XlUW9n24wuCPMmEaY2CMynnK1dEH1ik34fmcgfpFEsu/FKRVWjBiytumcFiF tNJInS5jGDpm0qAeYnXFu92xV/Vt3aaxlGBv+IPiAqxz9JWiwG/urhyk/RO3ZaAuPrlPMAfJtIwfx RtVPot9OZSGPMcwUv3J5Xd+DkrEZ/tKDcEvIMayC/0RmjvD0pSw0TZJprumdeCBFfKIaauhl5nCmU TZjDuzOidN6Ji5ofXSLRlLyyk0AFLyZ96Tzi4fRWb+bipKBfYAJ2uovKKBTMDB61sVu07lkGYKasB 11IEzGu2QuKdiGmYvXTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbQ-007uh9-2y; Tue, 05 Dec 2023 16:48:56 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbN-007ufn-1h; Tue, 05 Dec 2023 16:48:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FFMN1QIm8K/wWmXqyS6thAKmGZChklx02OZvSLx2yEw=; b=lHVsvmAztGaveenKTr76Kva77T yopsDg1aSVS0IHZCW+IGlwwIZGqQGAJPwjelZ1QnfePcwb3W7ZZXMz+RS0uwhlop/VzU514I4klMQ QE4pEfZdM4b4+TnbVI6+m3+OvNLSZo2jSI7zATQcxPCK/5JN/zHKRxzWhoBjr7chpk/TrgSI9piIP 1kikDeDkX8S/Cru0Zy2zBeczhNZWB85Su+NhHZyw9j7Yv8uPDxK7RKFptZTcO0/B7wsWAO+uUvcVf 6ibldovKEcteeRWvhjnBO3CsU9fYN3dXy/Ua/S47gsE6F4x1jkB+dLqBC9WXpNpnSVSA7IDTnGwIM CgE49gag==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbI-004oHZ-09; Tue, 05 Dec 2023 16:48:52 +0000 Received: from i53875b61.versanet.de ([83.135.91.97] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAYbE-00014D-JD; Tue, 05 Dec 2023 17:48:44 +0100 From: Heiko Stuebner To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, quentin.schulz@theobroma-systems.com, heiko@sntech.de, dsimic@manjaro.org, didi.debian@cknow.org, Heiko Stuebner Subject: [PATCH v2 1/4] arm64: dts: rockchip: move rk3588 serial aliases to soc dtsi Date: Tue, 5 Dec 2023 17:48:39 +0100 Message-Id: <20231205164842.556684-2-heiko@sntech.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205164842.556684-1-heiko@sntech.de> References: <20231205164842.556684-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231205_164848_298447_8B5B8F71 X-CRM114-Status: GOOD ( 12.97 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Heiko Stuebner The serial ports on rk3588 are named uart0 - uart9. Board schematics also use these exact numbers and we want those names to also reflect in the OS devices because everything else would just cause confusion. To prevent each board repeating their list of serial aliases, move them to the soc dtsi, as all previous Rockchip soc do already. Signed-off-by: Heiko Stuebner Reviewed-by: Dragan Simic --- .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts | 4 ---- .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 4 ---- arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 1 - .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 2 -- .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 1 - .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 - arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 13 +++++++++++++ 13 files changed, 13 insertions(+), 19 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts index b51543892078..be6a4f4f90f6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts @@ -12,10 +12,6 @@ / { compatible = "edgeble,neural-compute-module-6a-io", "edgeble,neural-compute-module-6a", "rockchip,rk3588"; - aliases { - serial2 = &uart2; - }; - chosen { stdout-path = "serial2:1500000n8"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts index 9933765e4097..96a18077f26f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts @@ -12,10 +12,6 @@ / { compatible = "edgeble,neural-compute-module-6b-io", "edgeble,neural-compute-module-6b", "rockchip,rk3588"; - aliases { - serial2 = &uart2; - }; - chosen { stdout-path = "serial2:1500000n8"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts index b9d789d57862..a36d4fcd9b1d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts @@ -17,7 +17,6 @@ / { aliases { mmc0 = &sdhci; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts index 97af4f912828..612107615e66 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts @@ -19,7 +19,6 @@ / { aliases { mmc0 = &sdhci; mmc1 = &sdmmc; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts index 298c183d6f4f..3e660ff6cd5f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -19,7 +19,6 @@ / { aliases { mmc0 = &sdhci; mmc1 = &sdmmc; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts index 5c59f9571dce..c7cd57609bc2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts @@ -19,7 +19,6 @@ / { aliases { mmc0 = &sdhci; mmc1 = &sdmmc; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index 741f631db345..e302eeb6ce5a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -14,7 +14,6 @@ aliases { mmc0 = &sdhci; mmc1 = &sdmmc; mmc2 = &sdio; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi index 9570b34aca2e..25a0ca73a8f7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi @@ -19,8 +19,6 @@ / { aliases { ethernet0 = &gmac1; mmc0 = &sdhci; - serial2 = &uart2; - serial9 = &uart9; }; fan: pwm-fan { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts index 60f00ceb630e..dc677f29a9c7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts @@ -44,7 +44,6 @@ aliases { mmc0 = &sdhci; mmc1 = &sdmmc; mmc2 = &sdio; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts index 82478a452533..f53e993c785e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts @@ -12,7 +12,6 @@ / { aliases { mmc0 = &sdhci; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts index 8f399c4317bd..52ec9cb38f57 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -14,7 +14,6 @@ / { aliases { mmc0 = &sdmmc; - serial2 = &uart2; }; chosen { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts index 8347adcbd003..73cf97062a09 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -14,7 +14,6 @@ / { aliases { mmc0 = &sdhci; mmc1 = &sdmmc; - serial2 = &uart2; }; analog-sound { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 8aa0499f9b03..d854536a44b8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -18,6 +18,19 @@ / { #address-cells = <2>; #size-cells = <2>; + aliases { + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; + serial4 = &uart4; + serial5 = &uart5; + serial6 = &uart6; + serial7 = &uart7; + serial8 = &uart8; + serial9 = &uart9; + }; + cpus { #address-cells = <1>; #size-cells = <0>; From patchwork Tue Dec 5 16:48:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 13480435 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 CF828C4167B for ; Tue, 5 Dec 2023 16:49:13 +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=uxOjuvQWeL/+vbtiz0sZiPDhkD3gYoNa7Eycs4s2XxU=; b=V8/vivQ6nqF2LH Wo9RuxZAM8VNe23ThB//rpsse4kBCCJGnnB5D2JkEoq/69X7Uho/ZVKnxVqMy4AgysgVxtFLPSqMk fMxJ6+Ep2GN0HC8Ru6USvT8YQnvunWbD7Y5/YHAPHQOHxqSUmld/62yANPMVMd7KugGxw3H3EVJIu wchO9317EP6S29XsH1w1NbZd0y7QOSvE+3ke9yepJsVYFrIFrV0YKnrbAg4b8T+MJGoqflfs+WQRm b6FWplGmRlSGoX/U+9LEIFXW8SFDcPEok2ZI0aUndeXXLgmAKBxteScxjT1uBMiAODI5zlcYWPU2s k/AZvlwtAwbwxtr8iBlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbP-007ugy-2y; Tue, 05 Dec 2023 16:48:55 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbN-007ufj-1Q; Tue, 05 Dec 2023 16:48:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=2cTVjqqa8EEmf7TS0KqOrNCoduHUd3c/KJNBbFCf5IA=; b=mMOly9x3q0pn9tlVPRqHtSe742 AVE9Hp/nJbP9Axc2Nw+zoMqU28pZUqlN/JixUELdn9olMnGLoGhwSWzhl6EZbje9bhJk1f0kzwWzg aiOXtvidozcsSacmaAsJagESmIA2DbOB7JCWrHUAonuW7YwiwoVoHHvNWvuNNbLutbZs6enX7UVbF vb/9Mvxe5l9uCX3fJxh/GXg6Me+zMewjfd6EgQ9GLIiiJwGFsWWhLrJUBvF4WBtvJ420jPdwjo4cd q5A1Ek66aDri/i7Jj/qNawu3td9hRfQ7baTAX10xn++289bxk3xxV3RFn4z3xL01RImAldCq9h5bc M/Vn+cMQ==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbI-004oHa-0J; Tue, 05 Dec 2023 16:48:52 +0000 Received: from i53875b61.versanet.de ([83.135.91.97] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAYbE-00014D-W3; Tue, 05 Dec 2023 17:48:45 +0100 From: Heiko Stuebner To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, quentin.schulz@theobroma-systems.com, heiko@sntech.de, dsimic@manjaro.org, didi.debian@cknow.org, Heiko Stuebner Subject: [PATCH v2 2/4] arm64: dts: rockchip: add rk3588 i2c aliases to soc dtsi Date: Tue, 5 Dec 2023 17:48:40 +0100 Message-Id: <20231205164842.556684-3-heiko@sntech.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205164842.556684-1-heiko@sntech.de> References: <20231205164842.556684-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231205_164848_317557_86C2E68B X-CRM114-Status: GOOD ( 10.23 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Heiko Stuebner The i2c controllers on rk3588 are named i2c0 - i2c8. Board schematics also use these exact numbers and we want those names to also reflect in the OS devices because everything else would just cause confusion. Userspace i2c access is a thing afterall. To prevent each board repeating their list of i2c aliases, define them in the soc dtsi, as all previous Rockchip soc do already. Signed-off-by: Heiko Stuebner Reviewed-by: Dragan Simic --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index d854536a44b8..47512c39e55a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -19,6 +19,15 @@ / { #size-cells = <2>; aliases { + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c4 = &i2c4; + i2c5 = &i2c5; + i2c6 = &i2c6; + i2c7 = &i2c7; + i2c8 = &i2c8; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; From patchwork Tue Dec 5 16:48:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 13480433 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 8E8F1C10DC3 for ; Tue, 5 Dec 2023 16:49:06 +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=wAJoRX+vEut4DqL02ssER7pggEJpHO8pl66X167DqFs=; b=g+1f1ruzrPvfJT HVK1pwafLNh/QwLMx/ak3iZC1p/pn+0s5uBjXRhOkzXdYU50QFO0NisiLc29JUQk8miZ+CioVKFYb vBwHNHd0ekITSmQwotqhw0/raPyN9MSFOdaVmOJvmgl6KqIL7erbRoBV+z5BhJfe1vpxlIAp8/68m g5ST1tFkwQO3cejNH9p041MjVe/FoReCe0jsbF4e4+aKeZZcbRd0Esy9U4qLX9KluL9nvQouhQ69Y vhR70CHUw4IWoyqyl5uMXnRngNLaiB4zLdQA6NrOjNU+HLbJhwKaGIoUa3BSgoQ8b/jKQQkJ1LW3s VeD7zLTO+vPhz2SkMaZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbQ-007uh3-1E; Tue, 05 Dec 2023 16:48:56 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbN-007ufl-1U; Tue, 05 Dec 2023 16:48:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=D6/9YDuwS+ygiZa4oJ4bI48VxrGLKCxHT3TEx2RiyEQ=; b=Yl1G3VjyI1fX8zK5lidsgAijIu O0PimdZaapaazfJAjDoUhCuo457vdb9OhSD5kRuEfBW3/RpQ7hFJOUwO3Rqfx7QeDRC7lyX4t+ykl mEfqqayB9j66OGC82jRWGBDCwL1hTmTivVcJDrLTuwuIA/ZQFTMEv0EQB9wG8sKSQSfITprxBiLRu VRYYwmzWmsuwOwrBTEL3+fhZs/ZRilbF4aJDsPvzFdsuGKCpJV2qXlwzLUCLbeALEle4801mAR9J3 7Sci2fI9FMJplUM5D1Nt1N8ul7V5dH5xOLdMSbQ3S9Bb2zD/4VY5n1d5UxMdqeb7IeaNe2m/vgvpU 4JIHBsLA==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbI-004oHb-0K; Tue, 05 Dec 2023 16:48:52 +0000 Received: from i53875b61.versanet.de ([83.135.91.97] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAYbF-00014D-CB; Tue, 05 Dec 2023 17:48:45 +0100 From: Heiko Stuebner To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, quentin.schulz@theobroma-systems.com, heiko@sntech.de, dsimic@manjaro.org, didi.debian@cknow.org, Heiko Stuebner Subject: [PATCH v2 3/4] arm64: dts: rockchip: add rk3588 gpio aliases to soc dtsi Date: Tue, 5 Dec 2023 17:48:41 +0100 Message-Id: <20231205164842.556684-4-heiko@sntech.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205164842.556684-1-heiko@sntech.de> References: <20231205164842.556684-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231205_164848_341280_0A5C2945 X-CRM114-Status: GOOD ( 11.00 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Heiko Stuebner The gpio controllers on rk3588 are named gpio0 - gpio4. Board schematics also use these exact numbers and we want those names to also reflect in the OS devices because everything else would just cause confusion. Userspace gpio access is a thing afterall. To prevent each board repeating their list of gpio aliases, define them in the soc dtsi, as previous Rockchip soc like the rk356x do already. Signed-off-by: Heiko Stuebner Reviewed-by: Dragan Simic --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 47512c39e55a..a59407466746 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -19,6 +19,11 @@ / { #size-cells = <2>; aliases { + gpio0 = &gpio0; + gpio1 = &gpio1; + gpio2 = &gpio2; + gpio3 = &gpio3; + gpio4 = &gpio4; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; From patchwork Tue Dec 5 16:48:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 13480434 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 92FACC46CA0 for ; Tue, 5 Dec 2023 16:49:06 +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=MAmXlslv3Dq0ShK31fN43WKRgjgFu/wGcusBk1IwYng=; b=LAxUINLy5ZcUbl tMdWAiN7yqTgGPuzlcwyrXCmbOUnK7fwkuBBSd9V2Y93dj8VA0gXRKgEb/S9MzPCYg0OdRsekTieq KLEgwRfd+gXFWUdKQBwSVorzFvtYHu4FS4KIaP3x6EniXDraby100AxcAi+F/LwSBssuDS9QP6bWh NRVj7Z0vkPvLyd1frDGB+0xaURhAOxBUfUdRm/SqxPSUXvn23rA1mNuXp9BjGZTXHHbuJeRInccnS kCc0K9ZHnC79DWmkmkEujKhFVRjH8JbGk80DiD63xnOM+0qGtDEyCt4MXyvVMRn4O4JkFLv+DCKM2 4GwD0dPr1Z/Olfmw9D7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbP-007ugs-1Y; Tue, 05 Dec 2023 16:48:55 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbN-007ufa-1O; Tue, 05 Dec 2023 16:48:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=TNN2It3uhksfjpWnPP7ToeTKzXeJp6KH/m0Rz39JWP0=; b=JEd2wLNrfLgc5kaUDEOaO6w0Xr jX//vPdmlfWlUUeyo5Lbi6aChqir4zUClRD8qmstkrgcT5w4k5Bz47c0FAYUUGqg3+9W9MA49WrFp WYK9gDmL9UoPe6wXpTQpWji0ZN7Ppz7m2BJ/+s3Zkhf0pIDTquwNia8Xxrvv97/eZV+8c5vR4aDHl vdigWc5AYuYRvw+Lu/lrCaE4uj36SqInjr9Q3lEBr6AY75ieuNabHAthWYz/0gWRSCFfbbjdD/Bal tEGZDB0aZjyBV67MjckQCO0vFIq7HLy8Lcko3MeUa8ZthdkZN32Fll5U1L7ax2r5A7NPLLzI+PRro QBkQpUfQ==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAYbI-004oHc-0J; Tue, 05 Dec 2023 16:48:50 +0000 Received: from i53875b61.versanet.de ([83.135.91.97] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAYbF-00014D-O4; Tue, 05 Dec 2023 17:48:45 +0100 From: Heiko Stuebner To: linux-rockchip@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, quentin.schulz@theobroma-systems.com, heiko@sntech.de, dsimic@manjaro.org, didi.debian@cknow.org, Heiko Stuebner Subject: [PATCH v2 4/4] arm64: dts: rockchip: add rk3588 spi aliases to soc dtsi Date: Tue, 5 Dec 2023 17:48:42 +0100 Message-Id: <20231205164842.556684-5-heiko@sntech.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205164842.556684-1-heiko@sntech.de> References: <20231205164842.556684-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231205_164848_307363_C643338B X-CRM114-Status: GOOD ( 10.80 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Heiko Stuebner The spi controllers on rk3588 are named spi0 - spi4. Board schematics also use these exact numbers and we want those names to also reflect in the OS devices because everything else would just cause confusion. Userspace spi access is a thing afterall. To prevent each board repeating their list of spi aliases, define them in the soc dtsi, as previous Rockchip soc like the rk356x do already. Signed-off-by: Heiko Stuebner Reviewed-by: Dragan Simic --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index a59407466746..7863aded672b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -43,6 +43,11 @@ aliases { serial7 = &uart7; serial8 = &uart8; serial9 = &uart9; + spi0 = &spi0; + spi1 = &spi1; + spi2 = &spi2; + spi3 = &spi3; + spi4 = &spi4; }; cpus {