From patchwork Tue Feb 18 11:49:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979724 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 BBBF8C021AD for ; Tue, 18 Feb 2025 12:04:38 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3+rr7dZWSYmNmagk0023ypHpknMzQhO2i/XqQn3oekg=; b=n70wLnJHhx5htq e7k7xK6+yGBIVrzAsa8fGiy7Xu0vATczixKEJw7UAD2V7dZj8BydLqOw7Z7AhHMRUm7epMw4+ZuaW BDSwSoMDg0kiroRvqnLUDDSyRvNpHAwKjSrdFAQZpZGwShfMI9b5EdTujueX3mjbeBrq9RW4xNqr7 U8pdUfmfbuW9AfDIJmJQMz81SKIOkRqlbS00gxfRn+K/I5qcakTkWYCYQ1SQI44E+rIxqlYCPBiwB w/GKChiA5NlXyQdjvI1WN9L4Kpe8/07AV37sfmzp3R2RDRT9FsYYGmYj2wyOm/U089V2vmiqANzzS gTatLqj3SzKnEkMXcJMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkML5-000000084f3-3hos; Tue, 18 Feb 2025 12:04:35 +0000 Received: from smtp-190c.mail.infomaniak.ch ([2001:1600:4:17::190c]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6X-000000081Vm-3Eok for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:37 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:4:17::246b]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVd6cw2z3GT; Tue, 18 Feb 2025 12:49:29 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVd2XrpzkJJ; Tue, 18 Feb 2025 12:49:29 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:12 +0100 Subject: [PATCH 1/9] arm64: dts: rockchip: enable UART5 on RK3588 Tiger Haikou MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-1-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_034933_955801_8EBF5BF6 X-CRM114-Status: UNSURE ( 9.17 ) X-CRM114-Notice: Please train this message. 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: Quentin Schulz In its default configuration (SW2 on "UART1"), UART5 is exposed on the DB9 RS232/RS485 connector. While the same signals are also exposed on Q7_GPIO5 and Q7_GPIO6, a GPIO header, and thus could be used for other purposes, RK3399 Puma Haikou and PX30 Ringneck Haikou do enable the UART controller exposed on the DB9 connector, so let's keep consistency across our modules and enable it on RK3588 Tiger Haikou by default too. Add a comment while at it to explicit where this controller is routed to. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts index 3187b4918a300dae49fe05d760fb7e1fd55f14d5..7bd07e5026ed914063965c9f1ec6a29357b0c05d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts @@ -310,8 +310,10 @@ &uart2 { status = "okay"; }; +/* DB9 RS232/RS485 when SW2 in "UART1" mode */ &uart5 { rts-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>; + status = "okay"; }; &usbdp_phy0 { From patchwork Tue Feb 18 11:49:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979727 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 0731CC021AD for ; Tue, 18 Feb 2025 12:05:00 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bmIfKCJz0y3NZ+GGfYXbU1aKfsezlWA1mqA+ytjjQ0Q=; b=XDASldFjFeWQ7Z z/m4W8wPugVFjAxhXyE6hkVc9RB6NawWqiIDDiLnVS8hoEa/arjCHnRmtOVcKaRNjyMGuOBc/ivY5 ISunStFOHBnQpPWmMD2iCuLv6QwmIAZcaZSYVhI9RsBvotHKKswU7/KYt00+mppHirNa0S35ykE4O S7NPmsTwyAtoP2FoUkilkP/oPIAwoP4DHcRdGa4apNQdm7Qq7ZmZ7i6/BtrmozCo3CxemNyDGHuDt GGaVSmvKM/kc5gPKHe3S+ZCtE5d9X5Kw5rcVOmjtgUJWDKHCwrCwWBaSC6LARaGh0GAfWEzbHqzU2 IqHHVt2L0J+EkyALYpSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkMLQ-000000084m2-11G2; Tue, 18 Feb 2025 12:04:56 +0000 Received: from smtp-8faa.mail.infomaniak.ch ([83.166.143.170]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6Y-000000081Vy-0goU for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:38 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:4:17::246b]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVf36t1z37b; Tue, 18 Feb 2025 12:49:30 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVd6W9NzknF; Tue, 18 Feb 2025 12:49:29 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:13 +0100 Subject: [PATCH 2/9] arm64: dts: rockchip: move DDC bus from Haikou carrierboard to RK3399 Puma DTSI MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-2-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_034934_330896_F380ACBC X-CRM114-Status: GOOD ( 10.70 ) 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: Quentin Schulz The DDC bus is necessarily on I2C3, that's how it's exposed by RK3399 Puma on the Q7 golden fingers, so let's move it to the SoM DTSI instead. If the carrierboard doesn't route it for some reason, /delete-property/ can be used to remove it. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 1 - arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 947bbd62a6b09ce55320d0889ee8cf50ca59dfd4..4a1a71995bf5da65d59214711671d87c9ea2de62 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -150,7 +150,6 @@ vddd_codec: regulator-vddd-codec { }; &hdmi { - ddc-i2c-bus = <&i2c3>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 995b30a7aae01a0326e9f80d6be930f227968539..f7548613ac46e190972d549271ec0bbc0c8a9b92 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -389,6 +389,10 @@ vdd_gpu: regulator@60 { }; }; +&hdmi { + ddc-i2c-bus = <&i2c3>; +}; + &i2c7 { status = "okay"; clock-frequency = <400000>; From patchwork Tue Feb 18 11:49:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979728 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 56C88C021AE for ; Tue, 18 Feb 2025 12:05:00 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+fzbjzFYS+cw8ddRLDQjFJQdYxRKzDHpzQS70bxTbvo=; b=hBUeY/UOuXjPyr 2LjuqW3TBKhoHthJR0KKamRJ4wwLjY12X1mlmq7x2LMP/U6i46vj2F0398BIPhMBmwN0bmaa0Cylr 76N5Zc5ootdfM1XkET/sX8+1qErDB72ECSbrMv4r3C39NQGSPGs/ml9IusZVmfwwv3AgrbQAX7+c+ ipJUjkd2ZGTXqpG+3my5uOvTPvRR0gkWjUcr3Zfe9g6iH/7HmLNIMVTetcdudzRwY/hoPPbCZLZ+F 9wZanBdZ/aAM3iJduEWIT8o9QhMp6vFMVIIG0JKcHwv5ZM4LkyaAZkzEPme0EJ/ZuNXpentO1N89f t/cFIshWjksq9w/1kyIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkMLP-000000084lM-2HdX; Tue, 18 Feb 2025 12:04:55 +0000 Received: from smtp-42ae.mail.infomaniak.ch ([2001:1600:4:17::42ae]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6X-000000081W4-3czB for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:37 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVf6QLBz7Gv; Tue, 18 Feb 2025 12:49:30 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVf32JtzmXD; Tue, 18 Feb 2025 12:49:30 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:14 +0100 Subject: [PATCH 3/9] arm64: dts: rockchip: move I2C6 from Haikou carrierboard to Puma DTSI MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-3-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_034934_047172_270D05D5 X-CRM114-Status: UNSURE ( 9.65 ) X-CRM114-Notice: Please train this message. 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: Quentin Schulz I2C6 is not exposed on Q7 golden fingers which is for routing signals to the carrierboard but on Q7 Camera connector, for routing signals to an additional adapter (e.g. Q7 Camera Demo adapter). Therefore, let's move the modification of I2C6 bus to Puma DTSI. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 ---- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 4a1a71995bf5da65d59214711671d87c9ea2de62..327fbc0a56655d5e544a99cedbfb1bcd39ad769a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -185,10 +185,6 @@ sgtl5000: codec@a { }; }; -&i2c6 { - status = "okay"; - clock-frequency = <400000>; -}; &pcie_phy { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index f7548613ac46e190972d549271ec0bbc0c8a9b92..f398a55408ee2c8259085cf2325da97cdce3e4de 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -393,6 +393,11 @@ &hdmi { ddc-i2c-bus = <&i2c3>; }; +&i2c6 { + clock-frequency = <400000>; + status = "okay"; +}; + &i2c7 { status = "okay"; clock-frequency = <400000>; From patchwork Tue Feb 18 11:49:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979725 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 0836EC021AA for ; Tue, 18 Feb 2025 12:04:40 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=12g4N/noc/hsG3HPFTZhFLe+GXga0Ctlij5IFF0saFU=; b=InIGCQsMp/Dqb4 9hFSPUj42Fbm2UnvBn/H24lsTmMGW0g0X6Xg58d/ufLbySw5+WjFYU0d1zvV8+Lai2QKbOb9kEUzh e9GgdFsJMdeAbENjJT6mHqMeFGofYmLDpItY7Nrr53ye1rq7ImrwGduDSnGBp/pzDYDcwbGAiYRK+ pnUr1U86VQE80Z4wm0tCW//w/xAtBsMIDTvJ0vrisJkVht6bquyaMI5EURn3ho+uG6fD2L5YOLQtN WBFXEqSa9Y3rW4h3bSJufYWzSynwojHhr6vk6FcFgSy15syOadQEw8BxCSKs3aa2vio3V6LcPc8Tq ELWt6Myqln3k6Spzs0Xg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkML5-000000084ej-2CsR; Tue, 18 Feb 2025 12:04:35 +0000 Received: from smtp-8fa8.mail.infomaniak.ch ([83.166.143.168]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6X-000000081WC-2gSz for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:36 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:4:17::246b]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVg2sRSz6J3; Tue, 18 Feb 2025 12:49:31 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVf6L2mzkNs; Tue, 18 Feb 2025 12:49:30 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:15 +0100 Subject: [PATCH 4/9] arm64: dts: rockchip: disable I2C6 on Puma DTSI MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-4-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_034933_858463_A35AF148 X-CRM114-Status: UNSURE ( 9.02 ) X-CRM114-Notice: Please train this message. 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: Quentin Schulz The bus is only exposed on Q7 Camera FFC connector which accepts external adapters such as Q7 Camera Demo. The enabling of I2C6 should therefore be done in the adapter Device Tree Overlay and not in the SoM DTSI, so let's disable it by default. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index f398a55408ee2c8259085cf2325da97cdce3e4de..548bd7b486c185c80be87d433f149c3fac65ae8a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -395,7 +395,6 @@ &hdmi { &i2c6 { clock-frequency = <400000>; - status = "okay"; }; &i2c7 { From patchwork Tue Feb 18 11:49:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979726 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 CC53FC02198 for ; Tue, 18 Feb 2025 12:04:58 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GBVlqV/Tv0iZcZptEzrZE5bb/DU5jh78Ec/ksggA8y8=; b=Q2Wk/DVUoQy1tz mrKRV/2cD9aQR4osyq4FT4A6aerIehKPMFsn1G/L8XlKLa2Yk0SvbNHTrC+UbssTewr7i0eragU3d YC5zj4/G+A5xazw2oCYoi9rWO0P0Iv5AarH0DYadJz4VdukTYTPaw2geJVIg53W4CsyVt/mVDUj+1 vkLSZHwXfCw/jfRAiQu+OGUYLhqNyR3fyF08L+XjNxr+vAo754f6j/W3PMxOaZF69rQi7uH0totmV 8RF8kQ5ORgGDWPPbevKX6TZPAIFKBqhoQafOZbilm1LVBq6FWtVBntO045U9uOZBxqmji+41ZpQAy LdoswvBMk9OWmh4h7gbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkMLP-000000084ld-3iCK; Tue, 18 Feb 2025 12:04:55 +0000 Received: from smtp-8fac.mail.infomaniak.ch ([83.166.143.172]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6Y-000000081WF-05mG for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:38 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:4:17::246b]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVg6P1Hz79m; Tue, 18 Feb 2025 12:49:31 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVg2l5Zzk6M; Tue, 18 Feb 2025 12:49:31 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:16 +0100 Subject: [PATCH 5/9] arm64: dts: rockchip: enable I2S0 in Haikou carrierboard, not Puma DTSI MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-5-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_034934_202153_093B1FB3 X-CRM114-Status: GOOD ( 10.34 ) 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: Quentin Schulz I2S0 is routed to the Q7 golden fingers and, on Haikou carrierboard, to an I2S codec. Nothing aside from signal routing is done on the SoM, therefore it's the duty of the carrierboard to enable I2S0 whenever an I2S codec is present. Such is the case of the Haikou carrierboard, therefore let's migrate the enabling of this controller to the carrierboard DTS instead of the SoM DTSI. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 3 +++ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 327fbc0a56655d5e544a99cedbfb1bcd39ad769a..df8a8ec582ecc6830ef11be372f204057759d1f3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -185,6 +185,9 @@ sgtl5000: codec@a { }; }; +&i2s0 { + status = "okay"; +}; &pcie_phy { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 548bd7b486c185c80be87d433f149c3fac65ae8a..399c86bcbfefa5c667f11f31b3491eb693cfae76 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -447,7 +447,6 @@ &i2s0 { pinctrl-1 = <&i2s0_2ch_bus_bclk_off>; rockchip,playback-channels = <2>; rockchip,capture-channels = <2>; - status = "okay"; }; /* From patchwork Tue Feb 18 11:49:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979736 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 F1CA1C021AA for ; Tue, 18 Feb 2025 12:07:00 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ieQuELaDwScXjbkDWMy2h/t3YDukHNk9MKk6FdDeABY=; b=u1IrIXS+U4njfQ psDF68WP8KhC+53FnTk4ruX11y3ZjT6DfUtIG/kLyTkcDA2F/mElFmKZ3RCvjwrsXgxgf3yk1cbTz 66CV80dw6bWerqXG3PTHrQ7EDZTZSD2E07iWTIEZsTojrLqCkB58ZwzAFXMz6fXE1fvATkyqKRWJD SgVC9I6TvdJ7L4yfKNEP4fhA16/jdBb+vh37I4nzdlEo0Yre1kqeYK5WnynhnHK/R7aw0uXhNTj4F 92k5eTJHZcimLPqpL2ZWeZr5GxOTSAWsCf8ybGTfDEtHQRkdjuUFjPvMFwRb9VW7azVdWa+wiJ4AZ voCF9L1nvkMRTEi4zVng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkMNO-0000000856V-0IMs; Tue, 18 Feb 2025 12:06:58 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6g-000000081c3-1Pb3 for linux-rockchip@bombadil.infradead.org; Tue, 18 Feb 2025 11:49:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=x4BCvLPXLVBNWWfP0us5XdGPJJn8f0zHeTMdG2zuumY=; b=FAX5M+jKp8j1u43SKBDhiPjyOP Db0tUOZjIkNLByKKp/+HICsBRh58+hrSdKQkedQ//AT5TrC8UIVlhPn40fX7HpMBhb3W/UJVsDKwO VdDcfXzjFP5V5xn6cVv9r2t33LNeMFrffiPqhtbFqybWhNIWmJ+4vgZX8I2+janOQ5CbCN6Tag8P+ xTDKO7aVZNYTcelU9ZtZp6oXe0rZ/mdQh9vgM4PvZHjnm/8KQIFdx2OA2wfV4OV+4uTfYT9FC0sgD a/rFv7gIndcv2v/nxR8NdVsnJJezq3F125YzmkxnMwjx+NzyRz4hhLnboX6FvPU4hekFyAUTbqdEZ L9qzaHOg==; Received: from smtp-42a8.mail.infomaniak.ch ([2001:1600:4:17::42a8]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6b-00000001zRp-0rUW for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:40 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:4:17::246b]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVh2r7vz4CR; Tue, 18 Feb 2025 12:49:32 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVg6HY7zkRX; Tue, 18 Feb 2025 12:49:31 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:17 +0100 Subject: [PATCH 6/9] arm64: dts: rockchip: add EEPROM found on RK3399 Puma Haikou MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-6-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_114937_438455_9BB8D07E X-CRM114-Status: UNSURE ( 9.27 ) X-CRM114-Notice: Please train this message. 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: Quentin Schulz The Haikou carrierboard has an EEPROM on LVDS_BLC_CLK/DAT which are signals that can carry either I2C or be used as HPD for eDP0/1. Only eDP0 is routed from RK3399 Puma SoM but only exposed on Haikou through the Video Connector, a fake PCIe connector. So to be able to use eDP one would need to use a Device Tree overlay. Therefore, let's default to having an EEPROM in Haikou carrierboard DTS. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index df8a8ec582ecc6830ef11be372f204057759d1f3..bea146d0d3f02afaf5e406d61d9a8ab7476fa8df 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -185,6 +185,16 @@ sgtl5000: codec@a { }; }; +&i2c7 { + eeprom@50 { + reg = <0x50>; + compatible = "atmel,24c01"; + pagesize = <8>; + size = <128>; + vcc-supply = <&vcc3v3_baseboard>; + }; +}; + &i2s0 { status = "okay"; }; From patchwork Tue Feb 18 11:49:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979737 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 84851C02198 for ; Tue, 18 Feb 2025 12:07:01 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=e9+wBdVCq0YnXacrQRMQDK9U+gOPXkMV0HDU14W7CH8=; b=CKiTRcKJcDi7ft 0tSkvNy1Kfv20x9s9QfRIv/EFvQ4JojhmAZCwft3aSOIXWRgUpeArAsFqfvBXKvrt5tFS64TWnff3 wf/zUQlnnnrCsWNxfehNuJ8Zfp3P9HwRrqEhgUXhva4v0PiHglKnE1TfqvX4lkqSSULQBAOVfmHLl S6wQgo6jvC9IDHkr8E0kSsXxT/IEk+438mt5KfCW0TLu/g9XFT/9Eicb2l+2glt5MY/Gxd1kkq6vF kiCzhfbqzVx/qxqgyVOUSGse2RPnHaJqB7eecDJ/yZVwe7STnfWfOVOQtnJvCrMjxGxEqKXzjOB3u KqwIc6uLUr+ZkdiCYWVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkMNN-00000008564-32qj; Tue, 18 Feb 2025 12:06:57 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6g-000000081c5-1PzQ for linux-rockchip@bombadil.infradead.org; Tue, 18 Feb 2025 11:49:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=U0384NZ5P88+S5UmkFQn+bUE/+ihVeSwKV7E2cHdJGM=; b=LZidXhXhbNuC4wnkVR7fCzGY0I wg8rL+nEvGvsR/+/w1Yz7DioQR2zl8UagT69xDzBiIoBJ5YftQ39XqQ9cb0DCWFEq/EKABkK5oKdx Et2KUSAqIhPgyRSkPYN/TFQTHB6BKfYr0oRGuHHRW0oQXCwZNCZE6ndVGmAYXZ88vcpma2uvy30SS 1Lzioth0kYCZgNq7pEk/ll097WrJbgEyKNj1KOKu49q9nATkYKeHHWWeVg3okudtMTFDaQaVUHO+Z 1m4/tcYiBRC7lYXUoQU2JUxrwbe7MMU68Hd0miQVJK5o/vnuRrwxp+3p3ZShKmlys+mDMTQTbIN49 SiA/COUw==; Received: from smtp-bc08.mail.infomaniak.ch ([45.157.188.8]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6b-00000001zRq-1Bk5 for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:40 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVh6rg5z5v6; Tue, 18 Feb 2025 12:49:32 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVh2lmRzjHM; Tue, 18 Feb 2025 12:49:32 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:18 +0100 Subject: [PATCH 7/9] arm64: dts: rockchip: enable Ethernet in Haikou carrierboard, not Puma DTSI MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-7-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_114937_530426_D58398E5 X-CRM114-Status: UNSURE ( 9.98 ) X-CRM114-Notice: Please train this message. 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: Quentin Schulz The signals are exposed on Q7 golden fingers but it's not a given that the carrierboard will have an Ethernet jack. So let's move the enabling of the Ethernet controller to the carrierboard DTS instead. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index bea146d0d3f02afaf5e406d61d9a8ab7476fa8df..47775005874308e217a523659bfd92dc56fba8e8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -149,6 +149,10 @@ vddd_codec: regulator-vddd-codec { }; }; +&gmac { + status = "okay"; +}; + &hdmi { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 399c86bcbfefa5c667f11f31b3491eb693cfae76..e00fbaa8acc1685af46495c0dfc9bdac7e6e991c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -183,7 +183,6 @@ &gmac { snps,reset-delays-us = <0 10000 50000>; tx_delay = <0x10>; rx_delay = <0x23>; - status = "okay"; }; &gpu { From patchwork Tue Feb 18 11:49:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979738 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 11319C021AA for ; Tue, 18 Feb 2025 12:08:32 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m/eaoAJHknIGCqeBiwgCI4+aapKAEM4YndEwGJsd6bs=; b=QrutyzVUUlJlw2 rFReRCsqwHMqQ90iKiz2zlf53aODl3hC2Qic0XC+B5N2e5OqTov+Kw4Ishg+dpg+LkXG5csSXWhxr +bc9iixHq/a+G3VEWeqVBdfOVePnY+me2rQNAA2WxLBi4cFdXsiBmG0g9/xrnzZnNpu3Mijhz7kW/ 5qqOOltr/AbD+zR8H41vmMZVQWJZgRxOTv+y01sDySe4Dp83ggvbkaPD+3EonQGGJkt0nXEyo8Krv mG+AkhJ1lg3h6bfA22QHwT1fbVSW2sKvJLm4BejJPMR7LHrzGX+hHc9C+wRfwPI20PjVc1JS3sJy+ mzDqpmSqUiznP5zL09OQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkMOo-000000085Kg-1Ftz; Tue, 18 Feb 2025 12:08:26 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6g-000000081c6-1V9X for linux-rockchip@bombadil.infradead.org; Tue, 18 Feb 2025 11:49:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=onCIRPcY3ZnXeO0K68ovO2YLbFr2LXlyKws4kj9k1k4=; b=qvRcbgJyF7yf0BSd6k0ykHWZKw QEsvRHVwx9J/E4kylOZDTPnDrY3aJMR6QvvaEPTLxtcRkB2bXlzJFntewleMGCxHPlhWLGVB0dnR4 NcQUjwK1h17WNqapXBagsGyEwGRQgGca4UI3WCflcKdfcqXmfIhb9Va+lNXnk5503YnXjwbu5KNrP ptWa+mdiLJc3zP0KDlIYlxm49b9x62rTJNR9n7TcXTdXQ7wx9KcchBakDiY2KhXqD45Bls/gbuLY7 nZoGytldo/3iRSOFCGrguKjyiFnqRPW8JprbEigdybXY4s5FT3JcRGUWrgrLMUQr6XQvB1jJTkkWB jNumHFRw==; Received: from smtp-42aa.mail.infomaniak.ch ([2001:1600:4:17::42aa]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6a-00000001zRs-3yWX for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:40 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:4:17::246b]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVj3NHhz4mn; Tue, 18 Feb 2025 12:49:33 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVh6mK1zkLh; Tue, 18 Feb 2025 12:49:32 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:19 +0100 Subject: [PATCH 8/9] arm64: dts: rockchip: enable I2C3 in Haikou carrierboard, not Ringneck DTSI MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-8-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_114937_316525_3761161B X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. 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: Quentin Schulz PX30 Ringneck only exposes I2C3 as LVDS_BLC_CLK/DAT on Q7 golden fingers but nothing is on that bus on the SoM itself. Therefore, let's enable the I2C3 bus where it makes sense, in the Haikou carrierboard DTS. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts | 2 ++ arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts index e4517f47d519cc08ec9ee705a6f51a740687f6df..16996cc6b8b62fb4f87ab5cff7e86ba751af1794 100644 --- a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts @@ -154,6 +154,8 @@ sgtl5000: codec@a { }; &i2c3 { + status = "okay"; + eeprom@50 { reg = <0x50>; compatible = "atmel,24c01"; diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi index ae050cc6cd050f730fb8fd7e3971a166d234d408..c166a9e3cc1c30bba3ab9b6a5ce3e1f67566ee8c 100644 --- a/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi @@ -325,10 +325,6 @@ rtc_twi: rtc@6f { }; }; -&i2c3 { - status = "okay"; -}; - &i2s0_8ch { rockchip,trcm-sync-tx-only; From patchwork Tue Feb 18 11:49:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 13979729 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 2B193C02198 for ; Tue, 18 Feb 2025 12:05:20 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kcDo1YTw4a4kU/r3SD9JOzHnLZZlRdwz+nTO4q+7EL8=; b=bkTvGcJugPfaN/ 2GZOYbkeLNLQFvxujEoEOgUv8+GH1i4kFnXD8XrugAggK8eLom9zdR57jgHxR4aJfOwn7BIBddCze gv3BPGEAwWQCI7d6I2y1GXG3zwnYnXtesPs50ALAqtT+wMDW+RbrmBRianUk+fLhPh/fYHUc+ws8W GkHMtkVIbReWjQg1EqgRpSSLyJhvrhKuxO4LCZrXRksCy3AGxNiPr5DuZ4n1sjvnbCbIpwayHgm73 5D95gaT67Ea01GY6aesn1k2tzPUStyoo/0HAv/TWgpQ2LZCFDR7VL9EbbXNEQOWjU3A7BV/JtFTAb VGNwNSmV4She31Na8PBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkMLk-000000084sS-2fZX; Tue, 18 Feb 2025 12:05:16 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6e-000000081bV-2p2z for linux-rockchip@bombadil.infradead.org; Tue, 18 Feb 2025 11:49:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Sender:Reply-To:Content-ID:Content-Description; bh=c+ftn8jkbitWUtsbEAaJmABpvum9lNkKn+UCCsMOLhc=; b=TJSkdbMElVsn5KQVXbJl9G9ml/ KdXPcBsZOUlb6803jeIa0+n1cYSnbul+k0ioVe8TTUW8E8kI6I01KSyiaFOv1lStmJxLR/v0gr01S P1CTutpl7K59tSaZTLctJRWprUNx2oWJ/I6LjIjHaxNZSnGsG38p/OnCtYPTBmbPp6ZYdoYBj6nPH ptmVBqFToYOHJjji6qdwns7U1jCzjzjKG42zRMdiP/dYeenhmfs6kwHRr2UqUXX07/GwyjPBctWmN DdCUaqPyC+boPJjwBqjyKilEROJzCe4W+dPOqQT4qZUke8dTRYp3upewUk+bYopBtwKwd071s1C7F dUMHqKlw==; Received: from smtp-bc08.mail.infomaniak.ch ([2001:1600:4:17::bc08]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkM6a-00000001zRt-3e88 for linux-rockchip@lists.infradead.org; Tue, 18 Feb 2025 11:49:39 +0000 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:4:17::246b]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4YxyVj6m9wz79p; Tue, 18 Feb 2025 12:49:33 +0100 (CET) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4YxyVj3DxqzmC2; Tue, 18 Feb 2025 12:49:33 +0100 (CET) From: Quentin Schulz Date: Tue, 18 Feb 2025 12:49:20 +0100 Subject: [PATCH 9/9] arm64: dts: rockchip: disable I2C2 bus by default on RK3588 Tiger MIME-Version: 1.0 Message-Id: <20250218-tsd-align-haikou-v1-9-5c44d1dd8658@cherry.de> References: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> In-Reply-To: <20250218-tsd-align-haikou-v1-0-5c44d1dd8658@cherry.de> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Quentin Schulz X-Mailer: b4 0.14.2 X-Infomaniak-Routing: alpha X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250218_114937_266792_3171826C X-CRM114-Status: UNSURE ( 8.46 ) X-CRM114-Notice: Please train this message. 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: Quentin Schulz RK3588 Tiger routes I2C2 signals to the Q7 Camera FFC connector (P2) but nothing on the SoM itself is on that bus, therefore it'll be up to the adapter connected to the Q7 Camera FFC connector (P2) to enable the I2C2 controller, if need be. Thus, disable it by default. Signed-off-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi index 81a6a05ce13b68a93e381f7051c1f861c1f11a25..0ab7032924cf60768f848e0d5ecbe32c189dbdfe 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi @@ -173,7 +173,6 @@ &i2c1m0_xfer { &i2c2 { pinctrl-0 = <&i2c2m3_xfer>; - status = "okay"; }; &i2c2m3_xfer {