From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8C48ECAAD8 for ; Fri, 23 Sep 2022 09:47:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231673AbiIWJrT (ORCPT ); Fri, 23 Sep 2022 05:47:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230055AbiIWJqi (ORCPT ); Fri, 23 Sep 2022 05:46:38 -0400 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31833E3680; Fri, 23 Sep 2022 02:45:44 -0700 (PDT) Received: from p508fdb48.dip0.t-ipconnect.de ([80.143.219.72] helo=phil.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1obfFV-0005Wv-T2; Fri, 23 Sep 2022 11:45:33 +0200 From: Heiko Stuebner To: Nicolas Frattaroli , Rob Herring , Krzysztof Kozlowski , Dan Johansen Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: dts: rockchip: Enable HDMI and GPU on quartz64-b Date: Fri, 23 Sep 2022 11:45:33 +0200 Message-ID: <2198677.PYKUYFuaPT@phil> In-Reply-To: <659fc2fe-f820-04ad-8a4f-224b4d4bd97b@manjaro.org> References: <20220920143446.633956-1-frattaroli.nicolas@gmail.com> <659fc2fe-f820-04ad-8a4f-224b4d4bd97b@manjaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi, Am Donnerstag, 22. September 2022, 23:22:37 CEST schrieb Dan Johansen: > This seems to be based against linux-next and not mainline. It fails to > apply on mainline for me. I would not expect things any other way though :-) . I.e. in the current cycle everything new is of course targetting v6.1 and the Quartz boards already saw some other changes. > Den 20.09.2022 kl. 16.34 skrev Nicolas Frattaroli: > > This enables the GPU and HDMI output (including HDMI audio) on > > the PINE64 Quartz64 Model B single board computer. > > > > Signed-off-by: Nicolas Frattaroli > > --- > > .../boot/dts/rockchip/rk3566-quartz64-b.dts | 60 +++++++++++++++++++ > > 1 file changed, 60 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts > > index 0f623198970f..77b179cd20e7 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts > > @@ -4,6 +4,7 @@ > > > > #include > > #include > > +#include > > #include "rk3566.dtsi" > > > > / { > > @@ -28,6 +29,17 @@ gmac1_clkin: external-gmac1-clock { > > #clock-cells = <0>; > > }; > > > > + hdmi-con { > > + compatible = "hdmi-connector"; > > + type = "a"; > > + > > + port { > > + hdmi_con_in: endpoint { > > + remote-endpoint = <&hdmi_out_con>; > > + }; > > + }; > > + }; > > + > > leds { > > compatible = "gpio-leds"; > > > > @@ -183,6 +195,33 @@ &gmac1m1_clkinout > > status = "okay"; > > }; > > > > +&gpu { > > + mali-supply = <&vdd_gpu>; > > + status = "okay"; > > +}; > > + > > +&hdmi { > > + avdd-0v9-supply = <&vdda0v9_image>; > > + avdd-1v8-supply = <&vcca1v8_image>; > > + status = "okay"; > > +}; > > + > > +&hdmi_in { > > + hdmi_in_vp0: endpoint { > > + remote-endpoint = <&vp0_out_hdmi>; > > + }; > > +}; > > + > > +&hdmi_out { > > + hdmi_out_con: endpoint { > > + remote-endpoint = <&hdmi_con_in>; > > + }; > > +}; > > + > > +&hdmi_sound { > > + status = "okay"; > > +}; > > + > > &i2c0 { > > status = "okay"; > > > > @@ -456,6 +495,10 @@ &i2c5 { > > status = "disabled"; > > }; > > > > +&i2s0_8ch { > > + status = "okay"; > > +}; > > + > > &i2s1_8ch { > > pinctrl-names = "default"; > > pinctrl-0 = <&i2s1m0_sclktx > The above part does not seem to exist in the current mainline (rc6) git > repo. which is of course already in linux-next, so this patch just applied nicely. Heiko > > @@ -677,3 +720,20 @@ &usb_host0_ehci { > > &usb_host0_ohci { > > status = "okay"; > > }; > > + > > +&vop { > > + assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; > > + assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; > > + status = "okay"; > > +}; > > + > > +&vop_mmu { > > + status = "okay"; > > +}; > > + > > +&vp0 { > > + vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { > > + reg = ; > > + remote-endpoint = <&hdmi_in_vp0>; > > + }; > > +}; >