From nobody Mon Nov 25 19:47:17 2024 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 214B31CFEA9; Thu, 24 Oct 2024 15:14:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729782852; cv=none; b=RhlotWesELqUk4Uh3YVCVNrtizbCmBsL/n2X2cxhs0zY6JMFw8T6rINnkgT8gfwXZdFWJn5T0cnxWN6JNs41DF4Bp0vbYvLXGcRE/b7+Y642Fr1/CSlW3J9QAXJTO39HUpTexr3R50lvJORBfySGkbYW4wQ3oGztdP2LYV/fVOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729782852; c=relaxed/simple; bh=Ndp3SJ/8KKLrReY9CNUxED4Pd1m4po2RC7IbR4fRxXM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z73JDkXTQM/gDEUKwInyve3vNOzfkStRb25StDQy1TMzs+3kYWa6OZkk7SWB5pTQ6dEfnEeiC3sX4drdef4GXx4peRQStroi1WE4q8+ajumTKJRTnfoyDPXJz9uwskqPA1hKOM/SPr1vsCTwpUN+7y5Ix1geEbVq77IKRIt3JDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=jFfH2AG9; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="jFfH2AG9" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/bo= ot/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 =3D "okay"; }; =20 +&hdmi0 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hdmim1_tx0_cec &hdmim0_tx0_hpd &hdmim1_tx0_scl + &hdmim1_tx0_sda>; +}; + &i2c1 { pinctrl-0 =3D <&i2c1m0_xfer>; }; --=20 2.45.2 From nobody Mon Nov 25 19:47:17 2024 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 215101DDA21; Thu, 24 Oct 2024 15:14:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729782852; cv=none; b=eOx0YOHV770LavW7ktWu9s5Uodjho9idxGVHEcijeN0DjAnD3BcQWn2L0ziXNDeKqXbKesjO1kYebRXYYEWODG7sMYh4QYDNtBxd0xxISVrkls/OqqpM53i0jQh28CaCtEXPuHUOL7Tug9WMOAaHt51kxs5pHlrnqK2hk8jR6Fg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729782852; c=relaxed/simple; bh=4LWglwpqZd5E9gVekuQg7zARpvR8P7IsglFzq4awsts=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=juhkHwWMKwWrHwCwujIVy+qKEFzE/6+T7LEX0RTLG3mzAxZgwyPTDMadzJ7Uy3CfcKebbOL0LtLMF7GXB6PWa3f81FYzUNFuvbt7jP8ClDFHReSy98QFHfgGEcJt+Ilw45zFYJBl0sWPSbli0AAfOtEIORcyh5evzf2h7SIwlsI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=C2aW70CR; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="C2aW70CR" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Quentin Schulz Tested-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/ar= m64/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 @@ =20 /dts-v1/; #include +#include #include "rk3588-tiger.dtsi" =20 / { @@ -61,6 +62,17 @@ switch-lid-btn-n { }; }; =20 + hdmi-con { + compatible =3D "hdmi-connector"; + type =3D "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint =3D <&hdmi0_out_con>; + }; + }; + }; + i2s3-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; @@ -155,6 +167,32 @@ &gmac0 { status =3D "okay"; }; =20 +&hdmi0 { + /* + * While HDMI-CEC is present on the Q7 connector, it is not + * connected on Haikou itself. + */ + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hdmim0_tx0_hpd &hdmim1_tx0_scl &hdmim1_tx0_sda>; + status =3D "okay"; +}; + +&hdmi0_in { + hdmi0_in_vp0: endpoint { + remote-endpoint =3D <&vp0_out_hdmi0>; + }; +}; + +&hdmi0_out { + hdmi0_out_con: endpoint { + remote-endpoint =3D <&hdmi_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status =3D "okay"; +}; + &i2c1 { status =3D "okay"; =20 @@ -321,3 +359,18 @@ &usb_host1_xhci { &usb_host2_xhci { status =3D "okay"; }; + +&vop { + status =3D "okay"; +}; + +&vop_mmu { + status =3D "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg =3D ; + remote-endpoint =3D <&hdmi0_in_vp0>; + }; +}; --=20 2.45.2 From nobody Mon Nov 25 19:47:17 2024 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 215671E378A; Thu, 24 Oct 2024 15:14:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729782851; cv=none; b=AggsWtPYDxbJY0nbAqn5OmtkVyeZuFie/JBNxhDaadtIEDDRV3aOSoP02CADh45tiBNNIQ8IQ+uw4exgvM82vbthayB5a+/aJ1uI0rcKMMLvuz7mOaK/uBIWPwKgZO3Cp4nLtLX+lxnDkK2jFwXhQSfbEwcRW10aKlCibU/3JEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729782851; c=relaxed/simple; bh=AAiz/VD1btLjuJNykiG+8szSa3n9z3i8FooWG3QVfHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dhWgl/T+0UXwjLkMgweG2o3ryPYyt0uW/RrAhRh3QYpS0Q09SVXV57bDur/U3pA398LwA6ch3IAz7eXzC93xFU8eM5EXyMA/L45DT2etAoRDEbfd5ZSlVp+O/AXFW+YsIALadG0FiBr0KaaomlSO8Iu2YBjorj+HTjXpTrPqW58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=aENqxCrl; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="aENqxCrl" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Quentin Schulz Tested-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/bo= ot/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" =20 @@ -58,6 +59,17 @@ emmc_pwrseq: emmc-pwrseq { reset-gpios =3D <&gpio2 RK_PA3 GPIO_ACTIVE_HIGH>; }; =20 + hdmi-con { + compatible =3D "hdmi-connector"; + type =3D "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint =3D <&hdmi0_out_con>; + }; + }; + }; + leds { compatible =3D "gpio-leds"; pinctrl-names =3D "default"; @@ -271,6 +283,29 @@ &gpu { status =3D "okay"; }; =20 +&hdmi0 { + /* No CEC on Jaguar */ + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hdmim0_tx0_hpd &hdmim0_tx0_scl &hdmim0_tx0_sda>; + status =3D "okay"; +}; + +&hdmi0_in { + hdmi0_in_vp0: endpoint { + remote-endpoint =3D <&vp0_out_hdmi0>; + }; +}; + +&hdmi0_out { + hdmi0_out_con: endpoint { + remote-endpoint =3D <&hdmi_con_in>; + }; +}; + +&hdptxphy_hdmi0 { + status =3D "okay"; +}; + &i2c0 { pinctrl-0 =3D <&i2c0m2_xfer>; status =3D "okay"; @@ -1052,3 +1087,18 @@ &usb_host1_ehci { &usb_host1_ohci { status =3D "okay"; }; + +&vop { + status =3D "okay"; +}; + +&vop_mmu { + status =3D "okay"; +}; + +&vp0 { + vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + reg =3D ; + remote-endpoint =3D <&hdmi0_in_vp0>; + }; +}; --=20 2.45.2