Skip to content

Commit aeda2a1

Browse files
QSchulzedoardocanepa
authored andcommitted
arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1
BugLink: https://bugs.launchpad.net/bugs/2137723 commit 08d70143e3033d267507deb98a5fd187df3e6640 upstream. In commit 296602b ("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: 296602b ("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> Reviewed-by: Dragan Simic <dsimic@manjaro.org> Link: https://patch.msgid.link/20251029-rk3399-op1-include-v1-1-2472ee60e7f8@cherry.de Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Bethany <bethany.jamison@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Edoardo Canepa <edoardo.canepa@canonical.com>
1 parent bd830d2 commit aeda2a1

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
44
*/
55

6-
#include "rk3399.dtsi"
6+
#include "rk3399-base.dtsi"
77

88
/ {
99
cluster0_opp: opp-table-0 {

0 commit comments

Comments
 (0)