From nobody Wed Nov 27 07:39:56 2024 Received: from mail.manjaro.org (mail.manjaro.org [116.203.91.91]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 689DF1E892; Sat, 12 Oct 2024 17:04:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.91.91 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728752694; cv=none; b=m0niXhM+7HFsv5iz/7IIFXiQOgIWFjGC84Gd5EVbisYSrCmaJ62q3AhZu33k4OqKjCwaIkA/vFd6uNdSaKdk96jfoqs7QY+h+R2ijZjzJ2S52FH4SrGAhHtcGgUtECqfn1VsgR2xYfZE+TB1bnzgDc+bpa1Zxnb8e3AypzNLuqY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728752694; c=relaxed/simple; bh=XFiJzv5BfhkdwEGXWLD0l6UqKqpkOp5ql57al9c727M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xejr18cWXsawoLt/+Wp0/n3obYlzEdTKmPIfEfsqUQ6IvYey86t5ADdLwtk0iXxEF9I70StZZg9AiPhYKO6YDduW2+PRo0D1p9KMziiZjo5J3feyi+GbuKFAxH/adV88i6CUsYZlG3W1c0Q4/lifKlGLfMQsZpRjSziEuaqbikg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org; spf=pass smtp.mailfrom=manjaro.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b=MgVdMB/b; arc=none smtp.client-ip=116.203.91.91 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=manjaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b="MgVdMB/b" From: Dragan Simic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=manjaro.org; s=2021; t=1728752683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NuP15JgrcJxfFn80/PEe92g6NMuABXTZ5DDL1SpfVMk=; b=MgVdMB/bCPu8gi5WzdI5eA/we4ErD5MuowKiIQOFfem5hNAn2FhQ2BFvaZuMRaJY4ffw1q FKzo8Mf799Sm53XQB6Ix7t1lakIEECG/aVKjD6krRIw/M3lWrp1HjwgjmcFzegw3Jb7K5A zAq+G4doAUjqt4F/38O5vlzF5N2yBPVgBfEO0d0nz/R7bCSnbIEch68tKBtZYHur5U953L 105mqjIwnvUf4vlSI5Eom2/vc4m+g78eQaAMdjbjmWEkhSNsrDXOPz58AFVw9v5albUltQ B7sPie0jyuXViNFJZS6tbYn3U/cXpwnNVX9HPv5pkjszg1q86lLPWamF5ZLM+Q== To: linux-rockchip@lists.infradead.org Cc: heiko@sntech.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Subject: [PATCH 2/3] arm64: dts: rockchip: Prepare RK356x SoC dtsi files for per-variant OPPs Date: Sat, 12 Oct 2024 19:04:35 +0200 Message-Id: In-Reply-To: References: 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 Authentication-Results: ORIGINATING; auth=pass smtp.auth=dsimic@manjaro.org smtp.mailfrom=dsimic@manjaro.org Content-Type: text/plain; charset="utf-8" Rename the Rockchip RK356x SoC dtsi files and, consequently, adjust their contents appropriately, to prepare them for the ability to specify different CPU and GPU OPPs for each of the supported RK356x SoC variants. The first new RK356x SoC variant to be introduced is the RK3566T, which the Pine64 Quartz64 Zero SBC is officially based on. [1] Some other SBCs are also based on the RK3566T variant, including Radxa ROCK 3C and ZERO 3E/3W, but the slight trouble is that Radxa doesn't state that officially. Though, it's rather easy to spot the RK3566T on such boards, because their official specifications state that the maximum frequency for the Cortex-A55 cores is lower than the "full-fat" RK3566's 1.8 GHz. [2][3][4] These changes follow the approach used for the Rockchip RK3588 SoC variants, which was introduced and described further in commit def88eb4d836 ("arm64: dts: rockchip: Prepare RK3588 SoC dtsi files for per-variant OPPs"). Please see that commit for a more detailed explanation. No functional changes are introduced, which was validated by decompiling and comparing all affected board dtb files before and after these changes. In more detail, the affected dtb files have some of their blocks shuffled arou= nd a bit and some of their phandles have different values, as a result of the changes to the order in which the building blocks from the parent dtsi files are included, but they effectively remain the same as the originals. [1] https://wiki.pine64.org/wiki/Quartz64 [2] https://dl.radxa.com/rock3/docs/hw/3c/radxa_rock3c_product_brief.pdf [3] https://dl.radxa.com/zero3/docs/hw/3e/radxa_zero_3e_product_brief.pdf [4] https://dl.radxa.com/zero3/docs/hw/3w/radxa_zero_3w_product_brief.pdf Related-to: def88eb4d836 ("arm64: dts: rockchip: Prepare RK3588 SoC dtsi fi= les for per-variant OPPs") Signed-off-by: Dragan Simic --- .../{rk3566.dtsi =3D> rk3566-base.dtsi} | 2 +- arch/arm64/boot/dts/rockchip/rk3566.dtsi | 116 ++++++++++++++---- arch/arm64/boot/dts/rockchip/rk3568.dtsi | 114 +++++++++++++++-- .../{rk356x.dtsi =3D> rk356x-base.dtsi} | 87 ------------- 4 files changed, 202 insertions(+), 117 deletions(-) copy arch/arm64/boot/dts/rockchip/{rk3566.dtsi =3D> rk3566-base.dtsi} (95%) rename arch/arm64/boot/dts/rockchip/{rk356x.dtsi =3D> rk356x-base.dtsi} (9= 6%) diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts= /rockchip/rk3566-base.dtsi similarity index 95% copy from arch/arm64/boot/dts/rockchip/rk3566.dtsi copy to arch/arm64/boot/dts/rockchip/rk3566-base.dtsi index 6c4b17d27bdc..e56e0b6ba941 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) =20 -#include "rk356x.dtsi" +#include "rk356x-base.dtsi" =20 / { compatible =3D "rockchip,rk3566"; diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts= /rockchip/rk3566.dtsi index 6c4b17d27bdc..3fcca79279f7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -1,35 +1,107 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) =20 -#include "rk356x.dtsi" +#include "rk3566-base.dtsi" =20 / { - compatible =3D "rockchip,rk3566"; + cpu0_opp_table: opp-table-0 { + compatible =3D "operating-points-v2"; + opp-shared; + + opp-408000000 { + opp-hz =3D /bits/ 64 <408000000>; + opp-microvolt =3D <850000 850000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-600000000 { + opp-hz =3D /bits/ 64 <600000000>; + opp-microvolt =3D <850000 850000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-816000000 { + opp-hz =3D /bits/ 64 <816000000>; + opp-microvolt =3D <850000 850000 1150000>; + clock-latency-ns =3D <40000>; + opp-suspend; + }; + + opp-1104000000 { + opp-hz =3D /bits/ 64 <1104000000>; + opp-microvolt =3D <900000 900000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-1416000000 { + opp-hz =3D /bits/ 64 <1416000000>; + opp-microvolt =3D <1025000 1025000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-1608000000 { + opp-hz =3D /bits/ 64 <1608000000>; + opp-microvolt =3D <1100000 1100000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-1800000000 { + opp-hz =3D /bits/ 64 <1800000000>; + opp-microvolt =3D <1150000 1150000 1150000>; + clock-latency-ns =3D <40000>; + }; + }; + + gpu_opp_table: opp-table-1 { + compatible =3D "operating-points-v2"; + + opp-200000000 { + opp-hz =3D /bits/ 64 <200000000>; + opp-microvolt =3D <850000 850000 1000000>; + }; + + opp-300000000 { + opp-hz =3D /bits/ 64 <300000000>; + opp-microvolt =3D <850000 850000 1000000>; + }; + + opp-400000000 { + opp-hz =3D /bits/ 64 <400000000>; + opp-microvolt =3D <850000 850000 1000000>; + }; + + opp-600000000 { + opp-hz =3D /bits/ 64 <600000000>; + opp-microvolt =3D <900000 900000 1000000>; + }; + + opp-700000000 { + opp-hz =3D /bits/ 64 <700000000>; + opp-microvolt =3D <950000 950000 1000000>; + }; + + opp-800000000 { + opp-hz =3D /bits/ 64 <800000000>; + opp-microvolt =3D <1000000 1000000 1000000>; + }; + }; }; =20 -&pipegrf { - compatible =3D "rockchip,rk3566-pipe-grf", "syscon"; +&cpu0 { + operating-points-v2 =3D <&cpu0_opp_table>; }; =20 -&power { - power-domain@RK3568_PD_PIPE { - reg =3D ; - clocks =3D <&cru PCLK_PIPE>; - pm_qos =3D <&qos_pcie2x1>, - <&qos_sata1>, - <&qos_sata2>, - <&qos_usb3_0>, - <&qos_usb3_1>; - #power-domain-cells =3D <0>; - }; +&cpu1 { + operating-points-v2 =3D <&cpu0_opp_table>; +}; + +&cpu2 { + operating-points-v2 =3D <&cpu0_opp_table>; }; =20 -&usb_host0_xhci { - phys =3D <&usb2phy0_otg>; - phy-names =3D "usb2-phy"; - extcon =3D <&usb2phy0>; - maximum-speed =3D "high-speed"; +&cpu3 { + operating-points-v2 =3D <&cpu0_opp_table>; }; =20 -&vop { - compatible =3D "rockchip,rk3566-vop"; +&gpu { + operating-points-v2 =3D <&gpu_opp_table>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts= /rockchip/rk3568.dtsi index 5c54898f6ed1..ecaefe208e3e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -3,11 +3,99 @@ * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ =20 -#include "rk356x.dtsi" +#include "rk356x-base.dtsi" =20 / { compatible =3D "rockchip,rk3568"; =20 + cpu0_opp_table: opp-table-0 { + compatible =3D "operating-points-v2"; + opp-shared; + + opp-408000000 { + opp-hz =3D /bits/ 64 <408000000>; + opp-microvolt =3D <850000 850000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-600000000 { + opp-hz =3D /bits/ 64 <600000000>; + opp-microvolt =3D <850000 850000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-816000000 { + opp-hz =3D /bits/ 64 <816000000>; + opp-microvolt =3D <850000 850000 1150000>; + clock-latency-ns =3D <40000>; + opp-suspend; + }; + + opp-1104000000 { + opp-hz =3D /bits/ 64 <1104000000>; + opp-microvolt =3D <900000 900000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-1416000000 { + opp-hz =3D /bits/ 64 <1416000000>; + opp-microvolt =3D <1025000 1025000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-1608000000 { + opp-hz =3D /bits/ 64 <1608000000>; + opp-microvolt =3D <1100000 1100000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-1800000000 { + opp-hz =3D /bits/ 64 <1800000000>; + opp-microvolt =3D <1150000 1150000 1150000>; + clock-latency-ns =3D <40000>; + }; + + opp-1992000000 { + opp-hz =3D /bits/ 64 <1992000000>; + opp-microvolt =3D <1150000 1150000 1150000>; + clock-latency-ns =3D <40000>; + }; + }; + + gpu_opp_table: opp-table-1 { + compatible =3D "operating-points-v2"; + + opp-200000000 { + opp-hz =3D /bits/ 64 <200000000>; + opp-microvolt =3D <850000 850000 1000000>; + }; + + opp-300000000 { + opp-hz =3D /bits/ 64 <300000000>; + opp-microvolt =3D <850000 850000 1000000>; + }; + + opp-400000000 { + opp-hz =3D /bits/ 64 <400000000>; + opp-microvolt =3D <850000 850000 1000000>; + }; + + opp-600000000 { + opp-hz =3D /bits/ 64 <600000000>; + opp-microvolt =3D <900000 900000 1000000>; + }; + + opp-700000000 { + opp-hz =3D /bits/ 64 <700000000>; + opp-microvolt =3D <950000 950000 1000000>; + }; + + opp-800000000 { + opp-hz =3D /bits/ 64 <800000000>; + opp-microvolt =3D <1000000 1000000 1000000>; + }; + }; + sata0: sata@fc000000 { compatible =3D "rockchip,rk3568-dwc-ahci", "snps,dwc-ahci"; reg =3D <0 0xfc000000 0 0x1000>; @@ -269,12 +357,24 @@ combphy0: phy@fe820000 { }; }; =20 -&cpu0_opp_table { - opp-1992000000 { - opp-hz =3D /bits/ 64 <1992000000>; - opp-microvolt =3D <1150000 1150000 1150000>; - clock-latency-ns =3D <40000>; - }; +&cpu0 { + operating-points-v2 =3D <&cpu0_opp_table>; +}; + +&cpu1 { + operating-points-v2 =3D <&cpu0_opp_table>; +}; + +&cpu2 { + operating-points-v2 =3D <&cpu0_opp_table>; +}; + +&cpu3 { + operating-points-v2 =3D <&cpu0_opp_table>; +}; + +&gpu { + operating-points-v2 =3D <&gpu_opp_table>; }; =20 &pipegrf { diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts= /rockchip/rk356x-base.dtsi similarity index 96% rename from arch/arm64/boot/dts/rockchip/rk356x.dtsi rename to arch/arm64/boot/dts/rockchip/rk356x-base.dtsi index 534593f2ed0b..62be06f3b863 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi @@ -56,7 +56,6 @@ cpu0: cpu@0 { clocks =3D <&scmi_clk 0>; #cooling-cells =3D <2>; enable-method =3D "psci"; - operating-points-v2 =3D <&cpu0_opp_table>; i-cache-size =3D <0x8000>; i-cache-line-size =3D <64>; i-cache-sets =3D <128>; @@ -72,7 +71,6 @@ cpu1: cpu@100 { reg =3D <0x0 0x100>; #cooling-cells =3D <2>; enable-method =3D "psci"; - operating-points-v2 =3D <&cpu0_opp_table>; i-cache-size =3D <0x8000>; i-cache-line-size =3D <64>; i-cache-sets =3D <128>; @@ -88,7 +86,6 @@ cpu2: cpu@200 { reg =3D <0x0 0x200>; #cooling-cells =3D <2>; enable-method =3D "psci"; - operating-points-v2 =3D <&cpu0_opp_table>; i-cache-size =3D <0x8000>; i-cache-line-size =3D <64>; i-cache-sets =3D <128>; @@ -104,7 +101,6 @@ cpu3: cpu@300 { reg =3D <0x0 0x300>; #cooling-cells =3D <2>; enable-method =3D "psci"; - operating-points-v2 =3D <&cpu0_opp_table>; i-cache-size =3D <0x8000>; i-cache-line-size =3D <64>; i-cache-sets =3D <128>; @@ -128,54 +124,6 @@ l3_cache: l3-cache { cache-sets =3D <512>; }; =20 - cpu0_opp_table: opp-table-0 { - compatible =3D "operating-points-v2"; - opp-shared; - - opp-408000000 { - opp-hz =3D /bits/ 64 <408000000>; - opp-microvolt =3D <850000 850000 1150000>; - clock-latency-ns =3D <40000>; - }; - - opp-600000000 { - opp-hz =3D /bits/ 64 <600000000>; - opp-microvolt =3D <850000 850000 1150000>; - clock-latency-ns =3D <40000>; - }; - - opp-816000000 { - opp-hz =3D /bits/ 64 <816000000>; - opp-microvolt =3D <850000 850000 1150000>; - clock-latency-ns =3D <40000>; - opp-suspend; - }; - - opp-1104000000 { - opp-hz =3D /bits/ 64 <1104000000>; - opp-microvolt =3D <900000 900000 1150000>; - clock-latency-ns =3D <40000>; - }; - - opp-1416000000 { - opp-hz =3D /bits/ 64 <1416000000>; - opp-microvolt =3D <1025000 1025000 1150000>; - clock-latency-ns =3D <40000>; - }; - - opp-1608000000 { - opp-hz =3D /bits/ 64 <1608000000>; - opp-microvolt =3D <1100000 1100000 1150000>; - clock-latency-ns =3D <40000>; - }; - - opp-1800000000 { - opp-hz =3D /bits/ 64 <1800000000>; - opp-microvolt =3D <1150000 1150000 1150000>; - clock-latency-ns =3D <40000>; - }; - }; - display_subsystem: display-subsystem { compatible =3D "rockchip,display-subsystem"; ports =3D <&vop_out>; @@ -196,40 +144,6 @@ scmi_clk: protocol@14 { }; }; =20 - gpu_opp_table: opp-table-1 { - compatible =3D "operating-points-v2"; - - opp-200000000 { - opp-hz =3D /bits/ 64 <200000000>; - opp-microvolt =3D <850000 850000 1000000>; - }; - - opp-300000000 { - opp-hz =3D /bits/ 64 <300000000>; - opp-microvolt =3D <850000 850000 1000000>; - }; - - opp-400000000 { - opp-hz =3D /bits/ 64 <400000000>; - opp-microvolt =3D <850000 850000 1000000>; - }; - - opp-600000000 { - opp-hz =3D /bits/ 64 <600000000>; - opp-microvolt =3D <900000 900000 1000000>; - }; - - opp-700000000 { - opp-hz =3D /bits/ 64 <700000000>; - opp-microvolt =3D <950000 950000 1000000>; - }; - - opp-800000000 { - opp-hz =3D /bits/ 64 <800000000>; - opp-microvolt =3D <1000000 1000000 1000000>; - }; - }; - hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; simple-audio-card,name =3D "HDMI"; @@ -635,7 +549,6 @@ gpu: gpu@fde60000 { clocks =3D <&scmi_clk 1>, <&cru CLK_GPU>; clock-names =3D "gpu", "bus"; #cooling-cells =3D <2>; - operating-points-v2 =3D <&gpu_opp_table>; power-domains =3D <&power RK3568_PD_GPU>; status =3D "disabled"; };