From patchwork Thu Oct 24 15:14:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 13849342 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 D872DCE8E8B for ; Thu, 24 Oct 2024 15:27: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=xI1iEGW3Dq8P9RGl/44DPiQ4yJmj2jpu+/hU2UIBcUk=; b=baN8lCtYGNizWU 5v7A5DdRS8Wg8BCbJWiADCsi56utis3KvCYQHvaQjsfo9HXrry7d8stKj7LGUycoZC7aW9s31LrfC f3O3H5/NkLo2xtUM0lvdRhYySB3AQVweq1Jx2K0lY4EPweBZN2TOEjEzK7r8Oi4W3uspA6qAeoPv+ WPrZ0eHIKJEBFUqZOP/gy4Ng7zlimvZy6KPcyo7m/GN0KkfyxRsOLU/1U8MghNjaZiGZWD6aeYhJk /vwX4JcEYyb+6z9rpqiOzqjcwnBSEnGw2zHyyqYJLHWpwIrAZpI1IyxKAPKegu+UNXpX1UtA/IRlp vvUp/Wl4bNcNBpiEpu9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3zkJ-00000000uNQ-0pCE; Thu, 24 Oct 2024 15:27:31 +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 1t3zXR-00000000sYv-1k8X; Thu, 24 Oct 2024 15:14:13 +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=FuuE2DfjRA1FWJIBJRKhJNQLLqzau7vyr2ycbZbbPws=; b=U91iHFzlfLq6HHiw3lKnGqCxok auJKYm70mS6jujtQpufdmThT1Z/N0Q5rTB4SSOgZudLGz0BdgHPjH2QfdRG2Ke72WdObYKvC5m1S/ Sp+KPYfryalG8hq0SxH6RhpcD2OXaSXuV0/7KBZrTftGxb2CBo1GGznwtoHDgTi4v2wRFNX/6zRru 0iUrAevYl6q3FSKQK975o/m0lha3GmoIFZJquoUiI7863tI6vu57dzeUBhLb+iMlcqVP/ceZojP/g 9fascOKDCHdgKm+H3zzgT1mRBWGhS9QmrSJt/zTbIzymVuypUOQI1D0+hdDeP15JXToCQvz0/WVMR Gq8TUn2g==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3zXO-00000008h62-2te0; Thu, 24 Oct 2024 15:14:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; 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:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=FuuE2DfjRA1FWJIBJRKhJNQLLqzau7vyr2ycbZbbPws=; b=jFfH2AG9XtE7VrCasB/T4rs65O lIfHfZr1jtQ/1kBDTspQU3MMAQESkm4j+ZsnvbKX2GEZ9n2lzQkHtVmAm9vfpQU0TDObEGCuPVc5A exRVNIkmgxeN5dWwEKFdNFN8oS1L3rY5QfuoRh3/BKnMWWaV5eARt0Rh0+Cl7ZMuSmKuzORMSuvKC ndjRyULbvfeJxUHgkT26UekaZ4wK6MBIYxd0knwDSDw3OeEgUVTcGjwr2cT8s0TzX8ThhsKVPY+fN 4E3+KmQwTOgdtRLwyfu4prD4Wnm7SKg3DwqDI/OxIOisqMoghXOUuBbwr/iKaE+WtXFH3hUWFjc+B GLaVzTDg==; Received: from i53875b34.versanet.de ([83.135.91.52] 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 1t3zXK-0004at-OH; Thu, 24 Oct 2024 17:14:06 +0200 From: Heiko Stuebner To: heiko@sntech.de Cc: quentin.schulz@cherry.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner Subject: [PATCH v2 1/3] arm64: dts: rockchip: add HDMI pinctrl to rk3588-tiger SoM Date: Thu, 24 Oct 2024 17:14:01 +0200 Message-ID: <20241024151403.1748554-2-heiko@sntech.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241024151403.1748554-1-heiko@sntech.de> References: <20241024151403.1748554-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241024_161410_837875_CD14544A X-CRM114-Status: GOOD ( 11.26 ) 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 Tiger SoM routes all relevant HDMI pins to its Q7 connector. Some from the M0 and some from the M1 set of pins. Add the necessary pinctrl entry to the hdmi controller for the SoM. Not all baseboards may use all pins, but even for them it'll serve documentation purposes. Signed-off-by: Heiko Stuebner Reviewed-by: Quentin Schulz --- arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi index 615094bb8ba3..11c1cb27f9c3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi @@ -152,6 +152,12 @@ &gpu { status = "okay"; }; +&hdmi0 { + pinctrl-names = "default"; + pinctrl-0 = <&hdmim1_tx0_cec &hdmim0_tx0_hpd &hdmim1_tx0_scl + &hdmim1_tx0_sda>; +}; + &i2c1 { pinctrl-0 = <&i2c1m0_xfer>; }; From patchwork Thu Oct 24 15:14:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 13849341 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 7D048CE8E8C for ; Thu, 24 Oct 2024 15:27:37 +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=wtg8DPxecyg0C7tFJSHKTCHuGCNMdVLDm7MvOGVQqqw=; b=gdynik3SHUhlwD gKdklMM5HxM0tIL3kFpFBXmufWJQwRY6NlRYJQ4HN5FlltIW7ArH5JTyUOmXYrIMh9kOsAKg53nFA znPyK0klWYDo+XfNqc/B4OZ3w2P595adqmxfMGPyuKI3UZv9eGW3kicGhqs73couZsnEWFP7fHPsP JYp1VCkLWgBEPr8XBWQTYNU93betcD0lSjI5HM3GvBLqqlQYKL9eArYj9rnQgarm3hYTUTdEfo1W5 a40pXXWZ3BJ7nq1HrTJtLpDtl5LfnhvlQzM6/gbwkQlaDAWsf7U8+TI0C4lg7ZkqbblgBjJjccGjs ostIUjwSdkrtm7N4a8YA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3zkJ-00000000uNW-2N7a; Thu, 24 Oct 2024 15:27:31 +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 1t3zXR-00000000sYw-1otA; Thu, 24 Oct 2024 15:14:13 +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=xtYtlnfTmvr3zN41Ip+EWEfN6UogitdaSsSvvG5Igbo=; b=qfkVxkDq7o8fKtA2SCMe+1OLlq PB/iuqutR0eNOkCNGH7ZMI2dXbjBwsIE1Dc6ga6ubhXxqJ8jZ1BtxBzdLhHfPSbmgYfxw8mdppGK8 2yYXzw1V4Y5G/h7C8DTDkNtS6jGa4tfePwBx3BxGKYiTYfbmshns2rtQfEgbrqNpeuGP9M0OCiNRC 1uOwbhwmriEG4hs2cLQlr8wJ2Chc0dEC33jQbPO0ln7MRGQAs74JC6wcHE800CahWHE/sLHtknqRO hxVQlanDUdcUtiS/Tt1upPLUCRRrKC14IjwOkbjpyHcm/WnStVpThJVpzIu9Ejz/WPmSqgrokt5IV ex+4Ue7A==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3zXO-00000008h64-2tH7; Thu, 24 Oct 2024 15:14:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; 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:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xtYtlnfTmvr3zN41Ip+EWEfN6UogitdaSsSvvG5Igbo=; b=C2aW70CRgRMOdVKehjfz70W+Cr svEASVpImDuk6Se2C1x4e6t8o2meA3u80bJhW7T6KN1pG2eWmZuz9w1mMvnJjnjLVg9GerofysCvT bb/9Tn/mVwRQxDiJlSJxTN0FWoMCnvIr11Qdpy24Ei0FL8YK3lrHc7xNLErFfY5Sl20KpWGUQ+u5D CD+UngHkHp3CA2CYmGfIKu1/4G8ZVKTSuS6U0enP9MjmuBzGxfd27PZVnsXNyjhsbfGEJNlRxqo/T gcmdHfRR7JT9xpTgiBpF8l70DyoGfAWRzTG9IwVe1qV/dsGS1AmTzVKz2jZpZYEVdhhi2xfm8GmEF R4euxe8A==; Received: from i53875b34.versanet.de ([83.135.91.52] 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 1t3zXL-0004at-3T; Thu, 24 Oct 2024 17:14:07 +0200 From: Heiko Stuebner To: heiko@sntech.de Cc: quentin.schulz@cherry.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner Subject: [PATCH v2 2/3] arm64: dts: rockchip: add HDMI support to rk3588-tiger-haikou Date: Thu, 24 Oct 2024 17:14:02 +0200 Message-ID: <20241024151403.1748554-3-heiko@sntech.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241024151403.1748554-1-heiko@sntech.de> References: <20241024151403.1748554-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241024_161410_880991_5E399CE6 X-CRM114-Status: GOOD ( 13.17 ) 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 Haikou baseboard has an hdmi output port, which is connected via the Q7 connector to the hdmi0 controller of the rk3588. Add the necessary plumbing to enable it using the recently merged hdmi-qp controller. Signed-off-by: Heiko Stuebner Tested-by: Quentin Schulz Reviewed-by: Quentin Schulz --- .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts index e4b7a0a4444b..270d59a56037 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts @@ -5,6 +5,7 @@ /dts-v1/; #include +#include #include "rk3588-tiger.dtsi" / { @@ -61,6 +62,17 @@ switch-lid-btn-n { }; }; + hdmi-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + i2s3-sound { compatible = "simple-audio-card"; simple-audio-card,format = "i2s"; @@ -155,6 +167,32 @@ &gmac0 { status = "okay"; }; +&hdmi0 { + /* + * While HDMI-CEC is present on the Q7 connector, it is not + * connected on Haikou itself. + */ + pinctrl-names = "default"; + pinctrl-0 = <&hdmim0_tx0_hpd &hdmim1_tx0_scl &hdmim1_tx0_sda>; + 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"; +}; + &i2c1 { status = "okay"; @@ -321,3 +359,18 @@ &usb_host1_xhci { &usb_host2_xhci { status = "okay"; }; + +&vop { + status = "okay"; +}; + +&vop_mmu { + status = "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg = ; + remote-endpoint = <&hdmi0_in_vp0>; + }; +}; From patchwork Thu Oct 24 15:14:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 13849343 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 7F814CE8E8A for ; Thu, 24 Oct 2024 15:29: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: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=vVgOZUJtR7R7AgiEAgLjNtp0OS7gW5z3h9bNAtpMFoI=; b=rlbLWJnySgEa8t FBorMhoxqihVH0jTXwUfnuf5nyN1GgLNyqVhp4MvqHy0/Cd2rfogo5G0mf8PNd/zs+LhgyLNIuBdm DTviYw9g4TLYplePUph74zfFmM+x63p2IbEC/rv6ugXUgAuFrOtWb8ifwK5cV5vT29y+CXpPI9NQU 5BJ9FsbEbDipXt7WyWixxecVAaWW2XLtTgZOAr/vlj5CLwXPENRNF+Xx/Vfa2fILAUXkrftV7oN5+ 95GKOLZw5HbDjB1msljXefhG2Orw2XG337TOsBvZ9zyQyxLoHVK/q90As1I84H3K/82UKFZaCyZni MtiUp2io5fLpWHbZMwpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3zmN-00000000uw0-3tA6; Thu, 24 Oct 2024 15:29:39 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3zXM-00000000sXq-3Lrl; Thu, 24 Oct 2024 15:15:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; 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:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tT0U40vv7udlyyxS/UUhxQXBmlfc4h3QNcCT/CwDSHw=; b=aENqxCrlMoVWcNI5m97whKwwDx sfcr7DpCIZAQEFOdxx4DafhqabWaY7q6cN3SP6WRdLAwmwSQ+wGVmQp3qUG78P9ouI8vNdu/qccis 8Ezhr28LZKVr8PqCG6+FSPPf9zRjo5BW84cwEqUA7A5jKuhwtQMPO8vezrvPcc5g4m1xvjNQjViqB 5AW0oeLQEhc7B4OS2L1xanNFmZyw0QoFQie2rTWPVxUMpFXfXk8dS5JZ7ZQ08pZx47BQra42s67V+ STuvV+4RFko1j1t6V+kSGwGVKyq9P4+AF+AM7ug2Erypeyf/2meAj40EnCkKpt9BRBvI6FclmCHcv zKDyzgbA==; Received: from i53875b34.versanet.de ([83.135.91.52] 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 1t3zXL-0004at-Ea; Thu, 24 Oct 2024 17:14:07 +0200 From: Heiko Stuebner To: heiko@sntech.de Cc: quentin.schulz@cherry.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner Subject: [PATCH v2 3/3] arm64: dts: rockchip: add HDMI support to rk3588-jaguar Date: Thu, 24 Oct 2024 17:14:03 +0200 Message-ID: <20241024151403.1748554-4-heiko@sntech.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241024151403.1748554-1-heiko@sntech.de> References: <20241024151403.1748554-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241024_081408_841545_C4689CFF X-CRM114-Status: GOOD ( 12.64 ) 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 jaguar has an hdmi output port, which is connected to the hdmi0 controller of the rk3588. Add the necessary plumbing to enable it using the recently merged hdmi-qp controller. Signed-off-by: Heiko Stuebner Tested-by: Quentin Schulz Reviewed-by: Quentin Schulz --- .../arm64/boot/dts/rockchip/rk3588-jaguar.dts | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts index e24da1a4331d..6a59887979ce 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "rk3588.dtsi" @@ -58,6 +59,17 @@ emmc_pwrseq: emmc-pwrseq { reset-gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>; }; + hdmi-con { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi0_out_con>; + }; + }; + }; + leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -271,6 +283,29 @@ &gpu { status = "okay"; }; +&hdmi0 { + /* No CEC on Jaguar */ + pinctrl-names = "default"; + pinctrl-0 = <&hdmim0_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 = <&hdmi_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status = "okay"; +}; + &i2c0 { pinctrl-0 = <&i2c0m2_xfer>; status = "okay"; @@ -1052,3 +1087,18 @@ &usb_host1_ehci { &usb_host1_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>; + }; +};