From patchwork Tue Jan 10 22:55:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 641033 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 31899C677F1 for ; Tue, 10 Jan 2023 22:58:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233103AbjAJW6D (ORCPT ); Tue, 10 Jan 2023 17:58:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234473AbjAJW5b (ORCPT ); Tue, 10 Jan 2023 17:57:31 -0500 X-Greylist: delayed 99 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 10 Jan 2023 14:57:29 PST Received: from xtrwkvxq.outbound-mail.sendgrid.net (xtrwkvxq.outbound-mail.sendgrid.net [167.89.24.164]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 762E7FD1 for ; Tue, 10 Jan 2023 14:57:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=nL5XyQsYGoRBUTGQZVcx0re09e/L9yxuOq9liZaew+4=; b=hZ9HMTVO2DRCW1EkWFn1bp5LOWCWqrmygRtKr0bIlgFCkSSDp0ivD7h1LiBHpzL0mhyI xq1OprKFj+f6WKnhRbJ2eDNwRWOTKJ8FJMnpeSQQuRuC1bT2FYoQalBxhSPTbV5HoH6/7e m4YCEiG84FDCXlSzdTn8t1/HmQtC0BQG0P10QWwegsvEqe1pVoJ5Rq6v4YlT3cKpzyFIBc 1++PanXXyyAe3+7Rc8P84A1rvnFkXygOBfmB0/5bmMl7GTicOQsrBB/47hvXVYsEPDO02c 1qZ8IZ/kybr7hFWGns5GiIjmUw36XGrV6NCI+zxZDd1D9rdAPExaDjRJGEsjf0XQ== Received: by filterdrecv-69c5db5cf4-rhmnr with SMTP id filterdrecv-69c5db5cf4-rhmnr-1-63BDECF6-10 2023-01-10 22:55:50.420439465 +0000 UTC m=+908337.208210986 Received: from bionic.localdomain (unknown) by geopod-ismtpd-6-0 (SG) with ESMTP id 1VaIgpvDSGSndX56pXOKVg Tue, 10 Jan 2023 22:55:50.229 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 1/2] arm64: dts: rockchip: assign rate to clk_rtc_32k on rk356x Date: Tue, 10 Jan 2023 22:55:50 +0000 (UTC) Message-Id: <20230110225547.1563119-2-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110225547.1563119-1-jonas@kwiboo.se> References: <20230110225547.1563119-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h7VQTI+bPssuBeGGiuNeJ01fKv0v28c8muMmlezyo+tQ8xf/S2DIK4/mWzj2PEofWLDopIfah/Aj9kGt2VqzGgGWQKHIXqxEZwyz4bAsVPVOn7o4cbcidosIc8F1PkW4wd0cN2fbQqXWDi+5FgKA1s4QzCBoyRjOkOzHR6P3NKAq To: Heiko Stuebner , linux-rockchip@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski , Michael Riesch , Chukun Pan , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org clk_rtc_32k and its child clock clk_hdmi_cec detauls to a rate of 24 MHz and not to 32 kHz on RK356x. Fix this by assigning clk_rtc_32k a rate of 32768, also assign the parent to clk_rtc32k_frac. Signed-off-by: Jonas Karlman --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 5706c3e24f0a..e319699f5e39 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -422,8 +422,9 @@ cru: clock-controller@fdd20000 { clock-names = "xin24m"; #clock-cells = <1>; #reset-cells = <1>; - assigned-clocks = <&cru PLL_GPLL>, <&pmucru PLL_PPLL>; - assigned-clock-rates = <1200000000>, <200000000>; + assigned-clocks = <&pmucru CLK_RTC_32K>, <&cru PLL_GPLL>, <&pmucru PLL_PPLL>; + assigned-clock-rates = <32768>, <1200000000>, <200000000>; + assigned-clock-parents = <&pmucru CLK_RTC32K_FRAC>; rockchip,grf = <&grf>; }; From patchwork Tue Jan 10 22:55:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 641034 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 22E8FC46467 for ; Tue, 10 Jan 2023 22:58:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233452AbjAJW6C (ORCPT ); Tue, 10 Jan 2023 17:58:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234505AbjAJW5d (ORCPT ); Tue, 10 Jan 2023 17:57:33 -0500 Received: from xtrwkkxd.outbound-mail.sendgrid.net (xtrwkkxd.outbound-mail.sendgrid.net [167.89.17.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F5507653 for ; Tue, 10 Jan 2023 14:57:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=iu9XeEHXs85wlWI08zrM0heL4rRQNr148D7eobXqpVM=; b=JeTLAGCio3p04KCfTFic9sY6ZRzSgfXUaXVuRqvp0yjrWGWiw335WBWqdZUfCDxpAqRS bdADo1gQ73+wl00ukc4phuI76MuLwKTWaPL9/I2sVLCSK7fLFsIWKMmvzhfPuPSsgRAqOK uOZdgQcCKQ/H+ENK0y/acbZiRUi+faqK7z/gN8Y152Bv/j/KDH+9nTaCkEnXqjinEQlWaO Km/9ZivgpCa0tjqVxi1uy2HggPvh5yqmM4CRxkENpOk0D2oTvqKTo6wVSyod8IF/wvRj9C mWSD8juLBI8YbfU5euy2jpLHY0qaQKmmpHpZGJ10bcclmhQ2xSoUIuRiveFs8Xzw== Received: by filterdrecv-69c5db5cf4-xtwpv with SMTP id filterdrecv-69c5db5cf4-xtwpv-1-63BDECFE-2D 2023-01-10 22:55:58.84405825 +0000 UTC m=+3665522.168729091 Received: from bionic.localdomain (unknown) by geopod-ismtpd-6-0 (SG) with ESMTP id Mr120nyQRqec91sAAXlt_g Tue, 10 Jan 2023 22:55:50.525 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 2/2] arm64: dts: rockchip: fix hdmi cec on rock-3a Date: Tue, 10 Jan 2023 22:55:59 +0000 (UTC) Message-Id: <20230110225547.1563119-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110225547.1563119-1-jonas@kwiboo.se> References: <20230110225547.1563119-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h+QgBffmXDJfQEHAqs25/e17FJ3dKFHD6gTSEYSLMW01yEpPM+m/Oyv5C1+Y3KIlUfqNYvjwqYjVLxEzgDfHKDpSL2CnCesWAylhCHwfRm0YBA6v728w8vKQGEZKfaFtnFsnWrgo2kV23dRdIv3UmYOgx1ube3ILpt3sj8SYPB24 To: Heiko Stuebner , linux-rockchip@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski , Michael Riesch , Chukun Pan , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org HDMI CEC is configured to select HDMITX_CEC_M0 function of GPIO0_C7 by default in rk356x.dtsi. On Radxa ROCK 3 Model A it is routed to HDMITX_CEC_M1 according to board schematic [1]. Fix HDMI CEC by overriding pinctrl in hdmi node to select HDMITX_CEC_M1. [1] https://dl.radxa.com/rock3/docs/hw/3a/ROCK-3A-V1.3-SCH.pdf Signed-off-by: Jonas Karlman --- arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts index a1c5fdf7d68f..c9cded3d2f1b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts @@ -279,6 +279,7 @@ &gpu { &hdmi { avdd-0v9-supply = <&vdda0v9_image>; avdd-1v8-supply = <&vcca1v8_image>; + pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>; status = "okay"; };