From patchwork Sat Oct 19 10:12:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 13842650 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 18878D3C906 for ; Sat, 19 Oct 2024 10:15:51 +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=dXQBdY5FoTKYctPdd7tEFnh82ox5nE11vU/sZsrt4+M=; b=WrUldN0K0RxxZX 8ldiISL4ZDLOROrl1Aqx+61338OVZxnp4II666UQ0+8lmL0Wl+JyqoQpsJjaBiO4ARNxW9qBJjFBc LDyHp0D2OstKE9H/G6T91xzD6kqTu4tOJ6jB/wmjBNH8YUIESOBLzFYEpQ0elRAVH9/ImEbAJy1Io 8bcOk8sO3kJRYUDfFBHHFqXUf+nRYHwxQXisrHWpYTDeaK7XHmQiPVZSrvzt08CViG/qGHxmYvnr1 GVmfU2FXXwG06Geg7+/WijP/8EmAz8SI4a8zmaAkc6836sNHqTrr9bfgsRnBY94jgtyq9daz0zgBW kURelGoSp8g3Ob3/YXzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t26Us-000000032ZQ-2O0l; Sat, 19 Oct 2024 10:15:46 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t26Rx-0000000327o-1dcs; Sat, 19 Oct 2024 10:12:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1729332763; bh=shzTkSVeDAoYPdbpkz2nRxG6xjYT1Tvs40xs92JMLzM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DofBcSUJL5Z4Te78BJ/bgETDj/Bp3ltNDn8uMl87ud51nt6LHoahxJOkve3EwZi6c 9tJp8l40SCoDLuvCFAcmdSj10lvLRb2krDhmD3poZ8HNjF3EVHaN4S1gcsVRGkpNSX mWWE5kkDD8rp3RcaJr1ZUEppCLkAdUVmznkYKIMLNGLXCvwwIW7qMvtVcIjosV49U0 IFZWbgvdeTskJaUpGGaCTUYRSDJgtcpUh/tCqcra8fptTISxEyXACEkZSzXuP2fNE7 7IeZLl4rzPPNiClvJ+C+9gr2LG9R8AOl8W9ewWTs157mu24zGpR2zKHak0m6W5ugr7 rweW8l87K3G+A== Received: from localhost (unknown [188.24.146.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id CD82817E13A2; Sat, 19 Oct 2024 12:12:42 +0200 (CEST) From: Cristian Ciocaltea Date: Sat, 19 Oct 2024 13:12:10 +0300 Subject: [PATCH v2 1/5] arm64: dts: rockchip: Add HDMI0 node to rk3588 MIME-Version: 1.0 Message-Id: <20241019-rk3588-hdmi0-dt-v2-1-466cd80e8ff9@collabora.com> References: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> In-Reply-To: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sebastian Reichel , Luis de Arquer , Alexandre ARNOUD Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_031245_618812_51C1AB93 X-CRM114-Status: UNSURE ( 9.69 ) 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 support for the HDMI0 output port found on RK3588 SoC. Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi index fc67585b64b7baa33d5a816517f20c4cb940b52d..a337f3fb8377e4a3a200d4d3a3773a237de2bd6e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -1370,6 +1370,47 @@ i2s9_8ch: i2s@fddfc000 { status = "disabled"; }; + hdmi0: hdmi@fde80000 { + compatible = "rockchip,rk3588-dw-hdmi-qp"; + reg = <0x0 0xfde80000 0x0 0x20000>; + clocks = <&cru PCLK_HDMITX0>, + <&cru CLK_HDMITX0_EARC>, + <&cru CLK_HDMITX0_REF>, + <&cru MCLK_I2S5_8CH_TX>, + <&cru CLK_HDMIHDP0>, + <&cru HCLK_VO1>; + clock-names = "pclk", "earc", "ref", "aud", "hdp", "hclk_vo1"; + interrupts = , + , + , + , + ; + interrupt-names = "avp", "cec", "earc", "main", "hpd"; + phys = <&hdptxphy_hdmi0>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd + &hdmim0_tx0_scl &hdmim0_tx0_sda>; + power-domains = <&power RK3588_PD_VO1>; + resets = <&cru SRST_HDMITX0_REF>, <&cru SRST_HDMIHDP0>; + reset-names = "ref", "hdp"; + rockchip,grf = <&sys_grf>; + rockchip,vo-grf = <&vo1_grf>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + hdmi0_in: port@0 { + reg = <0>; + }; + + hdmi0_out: port@1 { + reg = <1>; + }; + }; + }; + qos_gpu_m0: qos@fdf35000 { compatible = "rockchip,rk3588-qos", "syscon"; reg = <0x0 0xfdf35000 0x0 0x20>; From patchwork Sat Oct 19 10:12:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 13842655 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 74F83D3C902 for ; Sat, 19 Oct 2024 10:18:47 +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=BnlcffOG/zgz1k6rK4M8TQUKTQe1tV+1FKczV8PUJYE=; b=zhjSrtXB0Tgrge lxTldmlebbEDwfC6NiAj5k758PVCt4ZQpb5YfMO87OkYGAkMMbRSzLmqfpkzK8/O5mWIvsJXBlxE0 WTU6lSOsQrnVfu+XaBPGlG699OQ6VtG3hik0PCZgeXxYedurDZdiNGPjVeGvb82BnPYXh3rp7qvJI k8OuXmAUc2CXj8OE4QsGvP20IEC0XH3rduhKcmzPWw8VdvrOdNgSiYHFVwPOzO9OvsMEDm5VjJA0m 6BBy8IybvU5EZ+YB9Nng9kcI9SpIvjNeVor5IPYHuGmwNzBwcNWYXmMyNMkfHxhRz96G53KuKTuGx s2hy73wdOhWfVkyIK4rw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t26Xk-000000032rl-1sVx; Sat, 19 Oct 2024 10:18:44 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t26Rx-0000000327p-31Ov; Sat, 19 Oct 2024 10:12:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1729332764; bh=Rsn1cb69JK8bVAsgme/KNDkDYxyr1CTGotMpZS0cdGo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JIk7X4u+nz/jyHG+y0b/TAfGShrGzIz1iY/ef2SbY5WRirokQYdOJhl7xQy4lUepU hZkS9ILP4cOul5Vv/g+ltvdcHgKDkYPUUraU7/z/k2oYQ1jODmlMzd6FWw2QibBcj3 GE+lhlDSQmRE3Y7BV48G+yNUDBvwIeZ0DPv9TYeUAlYBTFhSa7ZdIaLHJlCSYYahNt 5vEwVn7Y5FqK2va+9qqeHHg8OrirwuPtYlljqGgKsnxYyw27d/bR9NpeoSWJvFNiQF 965wZ1JLU4ubwgTliuIQznJsSTngYmx+w3vHxJ50BxpNd+mJSUFyjphzXwCIyyUM1N WffRDHPWYffuw== Received: from localhost (unknown [188.24.146.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id CBC0117E14D5; Sat, 19 Oct 2024 12:12:43 +0200 (CEST) From: Cristian Ciocaltea Date: Sat, 19 Oct 2024 13:12:11 +0300 Subject: [PATCH v2 2/5] arm64: dts: rockchip: Enable HDMI0 on rock-5b MIME-Version: 1.0 Message-Id: <20241019-rk3588-hdmi0-dt-v2-2-466cd80e8ff9@collabora.com> References: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> In-Reply-To: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sebastian Reichel , Luis de Arquer , Alexandre ARNOUD Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, FUKAUMI Naoki X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_031245_978377_715CE7AA X-CRM114-Status: UNSURE ( 9.91 ) 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 HDMI0 on Radxa ROCK 5B. Tested-by: FUKAUMI Naoki Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index d6fff5b86b87020f115ce64795aee90c002a2255..0c3baf74981b714eb2a1edbc3fbbb69cd688cfc2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -4,6 +4,7 @@ #include #include +#include #include "rk3588.dtsi" / { @@ -37,6 +38,17 @@ analog-sound { pinctrl-0 = <&hp_detect>; }; + hdmi0-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi0_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -192,6 +204,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 = <&hdmi0_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>; @@ -858,3 +890,18 @@ &usb_host1_xhci { &usb_host2_xhci { status = "okay"; }; + +&vop_mmu { + status = "okay"; +}; + +&vop { + status = "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi0_in_vp0>; + }; +}; From patchwork Sat Oct 19 10:12:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 13842656 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 5CEC1D3C906 for ; Sat, 19 Oct 2024 10:18: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: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=7JCcvaR9qZtsGd1nEF8eNB2YjOsryNDWvamt8wIQkmE=; b=JzEAJM5Nx3tUee c1saiDo9NIfA070TdmtN3UfV5RtJwmFW8uCtA6bkP7WZaFCljBMPht705TGoh2MbEtYQbo/xLzg4p L9qCXE18i/15mjA0qOlSDQCno5tHjjpR4LmxJteWdHtE7BPOy+Aco0lTOEBD0ffCfSOw8dT5vdy/Q Zb4qBP0lwhZr/L4oz5A89/zI1SKKeCluSd3TkXeYmuLvghd5oa0eMHjqb8qqVSW8OUmpEMjaMwjBs ioluERdRnemyHMgV5B/Il4FWAqUqKDt6lZ9Lzi7as07CwPaXpGVm2uqfLwCSPe+j/4WdlOnYJaV5t 7YE6L1qhF8rRNLt05dXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t26Xk-000000032rx-3Q7A; Sat, 19 Oct 2024 10:18:44 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t26Ry-0000000327r-2Gvn; Sat, 19 Oct 2024 10:12:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1729332764; bh=dcAzLYdeTArkjRaoR6EOKg0UQYPSvk1zvu+tq9qsMAc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bNjxorMfMysGL14xhEmAE8aVuDIdoFEuxzvSmk4aMAFeGmVypwLXkngqWUH2MCdQR PA12wmpPwFb/xBdyQxch4xFxZr4AnWOhOWqZAYM3k/PzvY/c5jPtdYVlTAqoxLMpht OqEDFEfHEYwh1+pUDqJHYc3L55SvRKd7GS9sKrNvx8xmcBbBlfnEfBEBUzzaBeK7Mg oWAJleP1prEn8HLeb6qKIenzPdzXeNTpQyYkpolGnTpNZk6JOvuActs0ZRCWqc1Zta PlybpQlJN9W9aC1oZYAbaKvtFTvPQCytk9mlROVxMp5C3L9q4kv4ScCDh6gzTqWwGt 2iczws/gd7jEQ== Received: from localhost (unknown [188.24.146.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id C18EB17E14D7; Sat, 19 Oct 2024 12:12:44 +0200 (CEST) From: Cristian Ciocaltea Date: Sat, 19 Oct 2024 13:12:12 +0300 Subject: [PATCH v2 3/5] arm64: dts: rockchip: Enable HDMI0 on rk3588-evb1 MIME-Version: 1.0 Message-Id: <20241019-rk3588-hdmi0-dt-v2-3-466cd80e8ff9@collabora.com> References: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> In-Reply-To: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sebastian Reichel , Luis de Arquer , Alexandre ARNOUD Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_031246_859490_D97B62D5 X-CRM114-Status: UNSURE ( 9.48 ) 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 HDMI0 on Rockchip RK3588 EVB1. Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts index df44dbc394ca54fac61664fc3c647cf8e1189dff..863a73b0e3da73150d2874abc5762ab0c4c0ce63 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "rk3588.dtsi" @@ -120,6 +121,17 @@ backlight: backlight { pwms = <&pwm2 0 25000 0>; }; + hdmi0-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi0_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + pcie20_avdd0v85: pcie20-avdd0v85-regulator { compatible = "regulator-fixed"; regulator-name = "pcie20_avdd0v85"; @@ -300,6 +312,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 = <&hdmi0_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + &i2c2 { status = "okay"; @@ -1256,3 +1288,18 @@ &usb_host1_xhci { dr_mode = "host"; status = "okay"; }; + +&vop_mmu { + status = "okay"; +}; + +&vop { + status = "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi0_in_vp0>; + }; +}; From patchwork Sat Oct 19 10:12:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 13842657 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 DBF07D3C906 for ; Sat, 19 Oct 2024 10:20:16 +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=XX+QupAVigbnfTMyQpN36dRrAatgRPQ9zd1MmLA6GuA=; b=T9e22Eu8m42+XP DlY91Z/TWFWr+vP9nAqcyebY9Gt8g4bfXLA2iHWMUvM+k7R6NjVdd0AWmSunzY8ydTaRvVrSuhNM3 OXPRF04nTA0Y+WGg5zlsa5ibocQXDaIj03AAVRgBBuNmXHzzmdE8O4EvGjqGJiGhB7FgKH+CWaOFv rE270fSQEU4ILwTZ5YU5wrw0prIinQadJF6KFsd+wt/yobO0FxRwB/toL6lP4BG8OkzKIUQqqAwe+ Hvq4XTwptJ6QCV2jEf1Je81pp9uSKWLiIArxQf9VdCCSbcnMP3B6VrmTB0C1uQ8DyAWM18Ty1kJKs +WVMVleuwUqcWCRabPHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t26ZB-0000000330O-1BKU; Sat, 19 Oct 2024 10:20:13 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t26Rz-0000000328T-2e6a; Sat, 19 Oct 2024 10:12:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1729332765; bh=Jr41L06cJhaViYFmP0B+b+cWwpUnFddqeq9b14cNNXc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ym+Eaxhd5oy4XoXOqcGpqlVicXXczpLYW1DICdmG0rdjk62OHfK65GOBwsuwCODaG tYMD8YQ8zxoAF+cwpswiWJyrxGI6EdnXqmHNOfjDl30f0Cc6VPe25i3qbVso2HxTX5 B5Vq9PNBDoGS9gZf92QpQFlD5HqEsNc/otAchZL6RwFqosRuwmd9TOgE/I38jwOaLu YHgpNomeltk5xbKBwvJJH4cn6i/HcFgh2QeMMGkOrDWziHqLM3fpq7KQbDjzoov9WL NHluxiGfGYsQRkmhdOh+V2eUdIIQURTw47DTj2duqZpb0XGzaP7Bql0XcO96b/BFTJ z4KbShyFbRePg== Received: from localhost (unknown [188.24.146.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 9A83C17E14EA; Sat, 19 Oct 2024 12:12:45 +0200 (CEST) From: Cristian Ciocaltea Date: Sat, 19 Oct 2024 13:12:13 +0300 Subject: [PATCH v2 4/5] arm64: dts: rockchip: Enable HDMI0 on orangepi-5-plus MIME-Version: 1.0 Message-Id: <20241019-rk3588-hdmi0-dt-v2-4-466cd80e8ff9@collabora.com> References: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> In-Reply-To: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sebastian Reichel , Luis de Arquer , Alexandre ARNOUD Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_031247_850596_0BD1F9B9 X-CRM114-Status: UNSURE ( 9.79 ) 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 HDMI0 on Orange Pi 5 Plus. Signed-off-by: Cristian Ciocaltea --- .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) 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 c73fecf1c73c94944bb25e1243d5390b84241338..9b1f985a32ebe73478d4318d5246aada78c08ffa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "rk3588.dtsi" @@ -85,6 +86,17 @@ led { }; }; + hdmi0-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi0_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + fan: pwm-fan { compatible = "pwm-fan"; cooling-levels = <0 70 75 80 100>; @@ -263,6 +275,26 @@ &cpu_l3 { cpu-supply = <&vdd_cpu_lit_s0>; }; +&hdmi0 { + status = "okay"; +}; + +&hdmi0_in { + hdmi0_in_vp0: endpoint { + remote-endpoint = <&vp0_out_hdmi0>; + }; +}; + +&hdmi0_out { + hdmi0_out_con: endpoint { + remote-endpoint = <&hdmi0_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0m2_xfer>; @@ -883,3 +915,18 @@ &usb_host1_ehci { &usb_host1_ohci { status = "okay"; }; + +&vop_mmu { + status = "okay"; +}; + +&vop { + status = "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi0_in_vp0>; + }; +}; From patchwork Sat Oct 19 10:12:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 13842658 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 C50D6D3C906 for ; Sat, 19 Oct 2024 10:21:43 +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=4cAXRU9D13SkwkYlEK9qVMKCJN3yqndfA72UOQxA8fc=; b=4EeAwtBu5lP+g0 Hh6jb6ZTqGW5cekrWT9Vhz6Jd0RfgP/Gh7WHVglvoddzKHqrqFnd0y0VOrigHsd53og9Pr73IyCXn 0C7POSfkROZxeTgeZIYXOoV8ETVvCfGKDlTrd3hfM8/6KatywU+rWPmZoPIdmVmf/CuLuRqe9CzIv hmoPv1ThIAX0LwpZ1dCKxzbKxvLqgYBxCyKbCbyQcm8ScBm4/ItpSfFag/ycvNZGuacHhWGF2eCla y5bvNHTSG8wUEpAbPteF3QRajF3tIDepM4SzN4eKMKK75AIRMOc+ufC8Uhrd1E0FvpUCQvKkz+dq4 OO2u5Qd919EvzDXfNFrw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t26aa-00000003383-2PVH; Sat, 19 Oct 2024 10:21:40 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t26S0-0000000328u-1Ax4; Sat, 19 Oct 2024 10:12:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1729332766; bh=bQ/pqBqAd3mTtFhL5mhMd/smH96L9EiLiAGK0FH/78Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=m3gfqr5aVc1ZmI9H+PXzf+sgN6wm+BiKPkTXnPDZ+Jj7t70ZRxa31xnEuI+CFUDI1 ZpqbdUgvZ/F0C0Ygwf1+QRKK6Vshw9m2j2di3eFjP4lJKeoU2w3YsBReEY4gCV6pyK /OPRrTgqXHyx60ZuG/PSE+Yg1pZed56LP8zfYwEea8Mpc6RERxqh0TOukrcj9Zz+AC oVpMHsM8gPuE1fp/x1yQ6hpzyncUUy/yWhimS5xwF5ZmQ/Ee6WDsOVXqGGerbGhV6/ kcoX0c8VyHfVusmOJpHBW3Yn5OPLkkVlXr2JLS/zlAuKie3Xm5gnrZ2/UrWVjNrEJQ Od/QtfgjM15sA== Received: from localhost (unknown [188.24.146.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6D7DA17E14FB; Sat, 19 Oct 2024 12:12:46 +0200 (CEST) From: Cristian Ciocaltea Date: Sat, 19 Oct 2024 13:12:14 +0300 Subject: [PATCH v2 5/5] arm64: dts: rockchip: Enable HDMI0 on rock-5a MIME-Version: 1.0 Message-Id: <20241019-rk3588-hdmi0-dt-v2-5-466cd80e8ff9@collabora.com> References: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> In-Reply-To: <20241019-rk3588-hdmi0-dt-v2-0-466cd80e8ff9@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Sebastian Reichel , Luis de Arquer , Alexandre ARNOUD Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241019_031248_557828_8E29FC50 X-CRM114-Status: UNSURE ( 9.87 ) 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 HDMI0 on Radxa ROCK 5A. Signed-off-by: Cristian Ciocaltea --- arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts index 87fce8d9a964cd53d179ce214ae1c0ff505a2dce..2b141af5e709b0bc2193dbfb2327e6bc1fdaa502 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -5,6 +5,7 @@ #include #include #include +#include #include "rk3588s.dtsi" / { @@ -35,6 +36,17 @@ chosen { stdout-path = "serial2:1500000n8"; }; + hdmi0-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi0_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -296,6 +308,31 @@ &gmac1_rgmii_clk status = "okay"; }; +&hdmi0 { + pinctrl-names = "default"; + pinctrl-0 = <&hdmim0_tx0_cec + &hdmim1_tx0_hpd + &hdmim0_tx0_scl + &hdmim0_tx0_sda>; + status = "okay"; +}; + +&hdmi0_in { + hdmi0_in_vp0: endpoint { + remote-endpoint = <&vp0_out_hdmi0>; + }; +}; + +&hdmi0_out { + hdmi0_out_con: endpoint { + remote-endpoint = <&hdmi0_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + &mdio1 { rgmii_phy1: ethernet-phy@1 { /* RTL8211F */ @@ -788,3 +825,18 @@ &usb_host1_ohci { &usb_host2_xhci { status = "okay"; }; + +&vop_mmu { + status = "okay"; +}; + +&vop { + status = "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi0_in_vp0>; + }; +};