Commit 08d70143 authored by Quentin Schulz's avatar Quentin Schulz Committed by Heiko Stuebner
Browse files

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



In commit 296602b8 ("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: 296602b8 ("arm64: dts: rockchip: Move RK3399 OPPs to dtsi files for SoC variants")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarQuentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: default avatarDragan Simic <dsimic@manjaro.org>
Link: https://patch.msgid.link/20251029-rk3399-op1-include-v1-1-2472ee60e7f8@cherry.de


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 26f0f122
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 {