From patchwork Thu Nov 7 21:29:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 13867188 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 9DE4ED5D68A for ; Thu, 7 Nov 2024 21:31:36 +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=0BaDrrp8L1uGEGbzO9VwdVR+W5zinPASM/sQfVw3sjo=; b=cIRoAjgMR8nTcC keSwEkCiKxhfaRdZtKh1cbNq+eZ2dxADaMaA0JWmdreEKKrQKQEC2JT3s+rB6vJAiaMKO9+dJ72ZS PpLkopajdujog+TyXIcdpJWYFdsbIQD5V+8bR3KIuHgl0BNHf5A9hDyTFTiTxsYgvFrgMrKo/hYfW WVeMPjM0TSG+tQoQm1Vn3jucRueo+kk5RUjmCI3OvwuL6A9Bbhf74/IoEBz9TkpRxFPc2bGaZlJ7E lO+rY3Ys/w9JcA1dzvTf+CQpGFnN7yBV+fX8fnbUB3KBq3zKOB3fiVyY6Ki9g5kLdCeGL+obiSHuH 9AF6p43iAQwm7XiIfssw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t9A6H-00000008Psj-0y1d; Thu, 07 Nov 2024 21:31:33 +0000 Received: from smtp.forwardemail.net ([149.28.215.223]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t9A4V-00000008Pif-1JLc for linux-rockchip@lists.infradead.org; Thu, 07 Nov 2024 21:29:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1731014972; bh=ZnS7uhasltQq8a70D1WpVyW+EFmsRaHottC0hi42MhI=; b=pcfKlvCXqHWkx5lDIZhW0pH0vxNOQN4gY0pDz5k24C8TFO1dUwfSqOj+Fe71D4aYv2ggr96ZD eAcEhXE2ynDj774ecOF7yupk5MRYL+IucLT8Li8kVE9J5ASHUrV8CZ8aoL9TWbGCahNccV3F3oa nBt2Kcc8OuJdcZflbtItUFy0ab+GaWYl0xztggBgdlrH59a3M3bmarAcMcm2WOEzpVwdBVAQ+UJ X1yfdnGPZ+CgN5F5JOBRNm5WZ1EsRIbP93YHvc8SPbuMMqS1rhkWeNKlOa/Dmbn0EsfX+54cB0K eiRpbTrpTjJ7akhJw5qQpog0UlAT8bfyR5exBlqnKw4A== From: Jonas Karlman To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman Subject: [PATCH 1/2] arm64: dts: rockchip: Enable GPU on NanoPi R6C/R6S Date: Thu, 7 Nov 2024 21:29:09 +0000 Message-ID: <20241107212913.1322666-2-jonas@kwiboo.se> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241107212913.1322666-1-jonas@kwiboo.se> References: <20241107212913.1322666-1-jonas@kwiboo.se> MIME-Version: 1.0 X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-ForwardEmail-ID: 672d313b6ff4b179fef288a8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241107_132943_417179_6FC5B105 X-CRM114-Status: UNSURE ( 7.84 ) 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 Add the necessary DT changes to enable GPU on NanoPi R6C/R6S. Signed-off-by: Jonas Karlman --- arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index eef4851844bc..dc16d60b8228 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -218,6 +218,11 @@ &gmac1_rgmii_clk status = "okay"; }; +&gpu { + mali-supply = <&vdd_gpu_s0>; + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>; From patchwork Thu Nov 7 21:29:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 13867190 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 33599D5D688 for ; Thu, 7 Nov 2024 21:35:08 +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=Kfp3rUQpO7UpKKhCok1mVqRLihyO2RAwVj49Hrnl3tg=; b=wqAH21NlyBg3xi oMDu6jAv5/wsGV0FxfEQNjx9flgnPjRv+ff0O6pVb9yBDyYJcKbd5Q33T7oxGBpXdOqCujp5/ZqLF 2oJy+fsKKeIC2vDfukeqO3foHZX/eeRAf9eSRpIXAVW2WuWX5anry3423WTQoRn9zc0bku6hgD1yH eHdWYR/1ZsLepeFz6B1Vzs0aZPzsM6gMi4oX91UJvMDGz1vUggC6KJutJJc/kU/kxGQMOQNbZtUhM BtwoFHj7EHTkX15/ZmMxLL85oH6vSuqawR/oDytX/NuzNiA0GWv/y/KrdOLBnvUJhVz0D+B4ruHLO zl9uNIQKNaI21sdXVF3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t9A9g-00000008QN9-2F7Y; Thu, 07 Nov 2024 21:35:04 +0000 Received: from smtp.forwardemail.net ([149.28.215.223]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t9A4X-00000008Pjx-470B for linux-rockchip@lists.infradead.org; Thu, 07 Nov 2024 21:29:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1731014977; bh=s35hfQLt9bSo6W0C/uoTYaEkOoDd04wiZKrv3+ugeqU=; b=MwVc7G88Def5/rwUePLN5WAXiYkud5mZL9U9qz7scJbmfY133G0BEcw2jdG6GypBaccYJXvH/ gYfS3TbmTvF1A+SpaPt7lrFD3mMv0ID5nzqblnrtHLe4v1Y7+Dm1j3zhsLbv+0nHgq2bLhXim/Q fuNK7SVcPiRrfs8lhoAsHzJjEOnuNu97MZOdl+P8USY7iDNM4Fq0aFOyE4MYljNLQqEv8/dphiV hXJmn56sPubhfkrJbgByr6TusrGuL2noo5k7dlqnR2Mr53uKujEUmmJgxp7q3bYLxzwvwEFbv0c AQvoW9l33A93vFVBPFAjhA/6gLYASnNRCjUf977uEh9Q== From: Jonas Karlman To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman Subject: [PATCH 2/2] arm64: dts: rockchip: Enable HDMI on NanoPi R6C/R6S Date: Thu, 7 Nov 2024 21:29:10 +0000 Message-ID: <20241107212913.1322666-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241107212913.1322666-1-jonas@kwiboo.se> References: <20241107212913.1322666-1-jonas@kwiboo.se> MIME-Version: 1.0 X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-ForwardEmail-ID: 672d31406ff4b179fef288d5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241107_132946_079366_FB9DE4A1 X-CRM114-Status: UNSURE ( 9.13 ) 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 Add the necessary DT changes to enable HDMI on NanoPi R6C/R6S. Signed-off-by: Jonas Karlman --- .../boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi index dc16d60b8228..2e22a49000e5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi @@ -5,6 +5,7 @@ #include #include #include +#include #include "rk3588s.dtsi" / { @@ -45,6 +46,17 @@ button-user { }; }; + hdmi-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + leds { compatible = "gpio-leds"; @@ -223,6 +235,26 @@ &gpu { status = "okay"; }; +&hdmi0 { + status = "okay"; +}; + +&hdmi0_in { + hdmi0_in_vp0: endpoint { + remote-endpoint = <&vp0_out_hdmi0>; + }; +}; + +&hdmi0_out { + hdmi0_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>; @@ -763,3 +795,18 @@ &usb_host0_ehci { &usb_host0_ohci { status = "okay"; }; + +&vop { + status = "okay"; +}; + +&vop_mmu { + status = "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi0_in_vp0>; + }; +};