arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1

[PATCH] arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1

Posted by Quentin Schulz 3 months, 1 week ago

From: Quentin Schulz <quentin.schulz@cherry.de>

In commit 296602b8e5f7 ("arm64: dts: rockchip: Move RK3399 OPPs to dtsi
files for SoC variants"), everything shared between variants of RK3399
was put into rk3399-base.dtsi and the rest in variant-specific DTSI,
such as rk3399-t, rk3399-op1, rk3399, etc.
Therefore, the variant-specific DTSI should include rk3399-base.dtsi and
not another variant's DTSI.

rk3399-op1 wrongly includes rk3399 (a variant) DTSI instead of
rk3399-base DTSI, let's fix this oversight by including the intended
DTSI.

Fortunately, this had no impact on the resulting DTB since all nodes
were named the same and all node properties were overridden in
rk3399-op1.dtsi. This was checked by doing a checksum of rk3399-op1 DTBs
before and after this commit.

No intended change in behavior.

Fixes: 296602b8e5f7 ("arm64: dts: rockchip: Move RK3399 OPPs to dtsi files for SoC variants")
Cc: stable@vger.kernel.org
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
index c4f4f1ff6117b..9da6fd82e46b2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
@@ -3,7 +3,7 @@
  * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
  */
 
-#include "rk3399.dtsi"
+#include "rk3399-base.dtsi"
 
 / {
 	cluster0_opp: opp-table-0 {

---
base-commit: e53642b87a4f4b03a8d7e5f8507fc3cd0c595ea6
change-id: 20251029-rk3399-op1-include-b311b4e16909

Best regards,
-- 
Quentin Schulz <quentin.schulz@cherry.de>

Re: [PATCH] arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1

Posted by Heiko Stuebner 3 months, 1 week ago

On Wed, 29 Oct 2025 14:50:59 +0100, Quentin Schulz wrote:
> In commit 296602b8e5f7 ("arm64: dts: rockchip: Move RK3399 OPPs to dtsi
> files for SoC variants"), everything shared between variants of RK3399
> was put into rk3399-base.dtsi and the rest in variant-specific DTSI,
> such as rk3399-t, rk3399-op1, rk3399, etc.
> Therefore, the variant-specific DTSI should include rk3399-base.dtsi and
> not another variant's DTSI.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1
      commit: 08d70143e3033d267507deb98a5fd187df3e6640

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

Re: [PATCH] arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1

Posted by Dragan Simic 3 months, 1 week ago

Hello Quentin,

On Wednesday, October 29, 2025 14:50 CET, Quentin Schulz <foss+kernel@0leil.net> wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> In commit 296602b8e5f7 ("arm64: dts: rockchip: Move RK3399 OPPs to dtsi
> files for SoC variants"), everything shared between variants of RK3399
> was put into rk3399-base.dtsi and the rest in variant-specific DTSI,
> such as rk3399-t, rk3399-op1, rk3399, etc.
> Therefore, the variant-specific DTSI should include rk3399-base.dtsi and
> not another variant's DTSI.
> 
> rk3399-op1 wrongly includes rk3399 (a variant) DTSI instead of
> rk3399-base DTSI, let's fix this oversight by including the intended
> DTSI.
> 
> Fortunately, this had no impact on the resulting DTB since all nodes
> were named the same and all node properties were overridden in
> rk3399-op1.dtsi. This was checked by doing a checksum of rk3399-op1 DTBs
> before and after this commit.
> 
> No intended change in behavior.

Thank you for spotting this issue and for fixing it!  That was
an honest oversight on my part, but it actually resulted in no
ill effects, which is the main reason why and how it managed to
slip by originally.

Your description of the issue is pretty much perfect, so I've
got nothing else to add but

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

> Fixes: 296602b8e5f7 ("arm64: dts: rockchip: Move RK3399 OPPs to dtsi files for SoC variants")
> Cc: stable@vger.kernel.org
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
>  arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
> index c4f4f1ff6117b..9da6fd82e46b2 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
> @@ -3,7 +3,7 @@
>   * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
>   */
>  
> -#include "rk3399.dtsi"
> +#include "rk3399-base.dtsi"
>  
>  / {
>  	cluster0_opp: opp-table-0 {