admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: Move RK3399 OPPs to dtsi files for SoC variants

Browse Source 
Rename the Rockchip RK3399 SoC dtsi files and, consequently, adjust their
contents and the contents of the affected board dts(i) files appropriately,
to "encapsulate" the different CPU and GPU OPPs for each of the supported
RK3399 SoC variants into the respective SoC variant dtsi files.

Moving the OPPs to the SoC variant dtsi files, instead of requiring the
board dts(i) files to include both the SoC variant dtsi file and the right
OPP variant dtsi file, reduces the possibility for mismatched inclusion and
improves the overall hierarchical representation of data.

These changes follow the approach used for the Rockchip RK3588 SoC variants,
which was introduced and described further in commit def88eb4d8 ("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 dtb files before and after these changes.  In more
detail, all decompiled dtb files remain exactly the same, except the files
list below, which results from all of them stemming from the same base board
dtsi file (rk3399-rock-pi-4.dtsi), while all of them include one of the three
different RK3399 SoC variant dtsi files by themselves:

  - rk3399-rock-4se.dtb
  - rk3399-rock-pi-4a.dtb
  - rk3399-rock-pi-4a-plus.dtb
  - rk3399-rock-pi-4b.dtb
  - rk3399-rock-pi-4b-plus.dtb
  - rk3399-rock-pi-4c.dtb

When compared with the decompiled original dtb files, these dtb files have
some of their blocks shuffled around 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 into them, but they
still effectively remain the same as the originals.

The only exception to the "include only a SoC variant dtsi" is found in
rk3399-evb.dts, which includes rk3399-base.dtsi instead of rk3399.dtsi.
This is intentional, because this board dts file doesn't enable the TSADC,
so including rk3399.dtsi would enable the SoC to go into higher OPPs with
no thermal throttling in place.  Let's hope that people interested in this
board will fix this in the future.

As a side note, due to the nature of introduced changes, this commit is best
viewed using the --break-rewrites option for git-log(1).

Related-to: def88eb4d8 ("arm64: dts: rockchip: Prepare RK3588 SoC dtsi files for per-variant OPPs")
Signed-off-by: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/9417b5c5b64f9aceea64530a85a536169a3e7466.1721532747.git.dsimic@manjaro.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Dragan Simic
2024-07-21 05:45:16 +02:00
committed by Heiko Stuebner
parent 64b7f16fb3
commit 296602b8e5
31 changed files with 3133 additions and 3147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3019
arch/arm64/boot/dts/rockchip/rk3399-base.dtsi Normal file
View File

File diff suppressed because it is too large Load Diff

1
arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
View File

@@ -8,7 +8,6 @@
#include <dt-bindings/pwm/pwm.h>
#include <dt-bindings/usb/pd.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "OPEN AI LAB EAIDK-610";

2
arch/arm64/boot/dts/rockchip/rk3399-evb.dts
View File

@@ -5,7 +5,7 @@
/dts-v1/;
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
#include "rk3399-base.dtsi"
/ {
model = "Rockchip RK3399 Evaluation Board";

1
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
View File

@@ -9,7 +9,6 @@
#include <dt-bindings/pwm/pwm.h>
#include <dt-bindings/usb/pd.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Firefly-RK3399 Board";

3
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
View File

@@ -6,8 +6,7 @@
*/
#include <dt-bindings/input/input.h>
#include "rk3399.dtsi"
#include "rk3399-op1-opp.dtsi"
#include "rk3399-op1.dtsi"
/ {
aliases {

1
arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
View File

@@ -4,7 +4,6 @@
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Hugsun X99 TV BOX";

1
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
View File

@@ -9,7 +9,6 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
aliases {

1
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
View File

@@ -12,7 +12,6 @@
/dts-v1/;
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Kobol Helios64";

1
arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
View File

@@ -8,7 +8,6 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Leez RK3399 P710";

1
arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
View File

@@ -14,7 +14,6 @@
/dts-v1/;
#include <dt-bindings/input/linux-event-codes.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
aliases {

2
arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi → arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
View File

@@ -3,6 +3,8 @@
* Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
*/
#include "rk3399.dtsi"
/ {
cluster0_opp: opp-table-0 {
compatible = "operating-points-v2";

133
arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
View File

@@ -1,133 +0,0 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
*/
/ {
cluster0_opp: opp-table-0 {
compatible = "operating-points-v2";
opp-shared;
opp00 {
opp-hz = /bits/ 64 <408000000>;
opp-microvolt = <825000 825000 1250000>;
clock-latency-ns = <40000>;
};
opp01 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <825000 825000 1250000>;
};
opp02 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <850000 850000 1250000>;
};
opp03 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <925000 925000 1250000>;
};
opp04 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <1000000 1000000 1250000>;
};
opp05 {
opp-hz = /bits/ 64 <1416000000>;
opp-microvolt = <1125000 1125000 1250000>;
};
};
cluster1_opp: opp-table-1 {
compatible = "operating-points-v2";
opp-shared;
opp00 {
opp-hz = /bits/ 64 <408000000>;
opp-microvolt = <825000 825000 1250000>;
clock-latency-ns = <40000>;
};
opp01 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <825000 825000 1250000>;
};
opp02 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <825000 825000 1250000>;
};
opp03 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <875000 875000 1250000>;
};
opp04 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <950000 950000 1250000>;
};
opp05 {
opp-hz = /bits/ 64 <1416000000>;
opp-microvolt = <1025000 1025000 1250000>;
};
opp06 {
opp-hz = /bits/ 64 <1608000000>;
opp-microvolt = <1100000 1100000 1250000>;
};
opp07 {
opp-hz = /bits/ 64 <1800000000>;
opp-microvolt = <1200000 1200000 1250000>;
};
};
gpu_opp_table: opp-table-2 {
compatible = "operating-points-v2";
opp00 {
opp-hz = /bits/ 64 <200000000>;
opp-microvolt = <825000 825000 1150000>;
};
opp01 {
opp-hz = /bits/ 64 <297000000>;
opp-microvolt = <825000 825000 1150000>;
};
opp02 {
opp-hz = /bits/ 64 <400000000>;
opp-microvolt = <825000 825000 1150000>;
};
opp03 {
opp-hz = /bits/ 64 <500000000>;
opp-microvolt = <875000 875000 1150000>;
};
opp04 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <925000 925000 1150000>;
};
opp05 {
opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1100000 1100000 1150000>;
};
};
};
&cpu_l0 {
operating-points-v2 = <&cluster0_opp>;
};
&cpu_l1 {
operating-points-v2 = <&cluster0_opp>;
};
&cpu_l2 {
operating-points-v2 = <&cluster0_opp>;
};
&cpu_l3 {
operating-points-v2 = <&cluster0_opp>;
};
&cpu_b0 {
operating-points-v2 = <&cluster1_opp>;
};
&cpu_b1 {
operating-points-v2 = <&cluster1_opp>;
};
&gpu {
operating-points-v2 = <&gpu_opp_table>;
};

1
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
View File

@@ -10,7 +10,6 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include "dt-bindings/usb/pd.h"
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Orange Pi RK3399 Board";

1
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
View File

@@ -12,7 +12,6 @@
#include <dt-bindings/usb/pd.h>
#include <dt-bindings/leds/common.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Pine64 Pinebook Pro";

1
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
View File

@@ -14,7 +14,6 @@
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/leds/common.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Pine64 PinePhone Pro";

1
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
View File

@@ -5,7 +5,6 @@
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
aliases {

1
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
View File

@@ -7,7 +7,6 @@
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Firefly ROC-RK3399-PC Board";

3
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
View File

@@ -7,8 +7,7 @@
/dts-v1/;
#include <dt-bindings/leds/common.h>
#include "rk3399.dtsi"
#include "rk3399-t-opp.dtsi"
#include "rk3399-t.dtsi"
/ {
model = "Radxa ROCK 4C+";

2
arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts
View File

@@ -5,8 +5,8 @@
*/
/dts-v1/;
#include "rk3399-t.dtsi"
#include "rk3399-rock-pi-4.dtsi"
#include "rk3399-t-opp.dtsi"
/ {
model = "Radxa ROCK 4SE";

2
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
View File

@@ -4,11 +4,9 @@
* Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
*/
/dts-v1/;
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
/ {
aliases {

2
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
View File

@@ -5,8 +5,8 @@
*/
/dts-v1/;
#include "rk3399-op1.dtsi"
#include "rk3399-rock-pi-4.dtsi"
#include "rk3399-op1-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4A+";

2
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts
View File

@@ -5,8 +5,8 @@
*/
/dts-v1/;
#include "rk3399.dtsi"
#include "rk3399-rock-pi-4.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4A";

2
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
View File

@@ -5,8 +5,8 @@
*/
/dts-v1/;
#include "rk3399-op1.dtsi"
#include "rk3399-rock-pi-4.dtsi"
#include "rk3399-op1-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4B+";

2
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
View File

@@ -5,8 +5,8 @@
*/
/dts-v1/;
#include "rk3399.dtsi"
#include "rk3399-rock-pi-4.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4B";

2
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
View File

@@ -6,8 +6,8 @@
*/
/dts-v1/;
#include "rk3399.dtsi"
#include "rk3399-rock-pi-4.dtsi"
#include "rk3399-opp.dtsi"
/ {
model = "Radxa ROCK Pi 4C";

3
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
View File

@@ -5,9 +5,8 @@
* Copyright (c) 2018 Linaro Ltd.
*/
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
#include <dt-bindings/interrupt-controller/irq.h>
#include "rk3399.dtsi"
/ {
aliases {

1
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
View File

@@ -7,7 +7,6 @@
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
aliases {

1
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View File

@@ -6,7 +6,6 @@
#include "dt-bindings/pwm/pwm.h"
#include "dt-bindings/input/input.h"
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";

2
arch/arm64/boot/dts/rockchip/rk3399-t-opp.dtsi → arch/arm64/boot/dts/rockchip/rk3399-t.dtsi
View File

@@ -4,6 +4,8 @@
* Copyright (c) 2022 Radxa Limited
*/
#include "rk3399-base.dtsi"
/ {
cluster0_opp: opp-table-0 {
compatible = "operating-points-v2";

3084
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View File

File diff suppressed because it is too large Load Diff

1
arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts
View File

@@ -7,7 +7,6 @@
/dts-v1/;
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
#include <arm/rockchip/rockchip-radxa-dalang-carrier.dtsi>
#include "rk3399pro-vmarc-som.dtsi"