Skip to content

Commit 31257ea

Browse files
arndbarndb
committed
Merge tag 'v6.13-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
More new boards: Rock-5C, Banana Pi P2 Pro HDMI output enabled on a huge number of rk3588 boards, now that we have the ability to do that. A new RK356x variant - the RK3566T (with lower max-frequencies). The variant was already in use on some boards which then encoded those OPP differences in the board files itself. This moves this to saner place. Fixed-regulator nowadays has a preferred node-naming scheme set in the binding and we had accumulated a number of different styles over time. A change brings all of them in line for arm64 dts files. * tag 'v6.13-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (24 commits) arm64: dts: rockchip: use less broad pinctrl for pcie3x1 on Radxa E25 arm64: dts: rockchip: add Radxa ROCK 5C dt-bindings: arm: rockchip: add Radxa ROCK 5C arm64: dts: rockchip: orangepi-5-plus: Enable GPU arm64: dts: rockchip: enable USB3 on NanoPC-T6 arm64: dts: rockchip: adapt regulator nodenames to preferred form arm64: dts: rockchip: Enable HDMI display for rk3588 Cool Pi GenBook arm64: dts: rockchip: Enable HDMI display for rk3588 Cool Pi 4B arm64: dts: rockchip: Enable HDMI0 for rk3588 Cool Pi CM5 EVB arm64: dts: rockchip: Enable HDMI on NanoPi R6C/R6S arm64: dts: rockchip: Enable GPU on NanoPi R6C/R6S arm64: dts: rockchip: Enable HDMI on Hardkernel ODROID-M2 arm64: dts: rockchip: Remove non-removable flag from sdmmc on rk3576-sige5 arm64: dts: rockchip: Enable HDMI0 on FriendlyElec CM3588 NAS arm64: dts: rockchip: add Banana Pi P2 Pro board dt-bindings: arm: rockchip: add Banana Pi P2 Pro board arm64: dts: rockchip: Add new SoC dtsi for the RK3566T variant arm64: dts: rockchip: Prepare RK356x SoC dtsi files for per-variant OPPs arm64: dts: rockchip: Update CPU OPP voltages in RK356x SoC dtsi arm64: dts: rockchip: Add OPP voltage ranges to RK3399 OP1 SoC dtsi ... Link: https://lore.kernel.org/r/3313711.oiGErgHkdL@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 06fc642 + 409e01f commit 31257ea

128 files changed

Lines changed: 2674 additions & 775 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/arm/rockchip.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,11 @@ properties:
895895
- const: radxa,rock-5b
896896
- const: rockchip,rk3588
897897

898+
- description: Radxa ROCK 5C
899+
items:
900+
- const: radxa,rock-5c
901+
- const: rockchip,rk3588s
902+
898903
- description: Radxa ROCK S0
899904
items:
900905
- const: radxa,rock-s0
@@ -1104,6 +1109,11 @@ properties:
11041109
- const: rockchip,rk3568-evb1-v10
11051110
- const: rockchip,rk3568
11061111

1112+
- description: Sinovoip RK3308 Banana Pi P2 Pro
1113+
items:
1114+
- const: sinovoip,rk3308-bpi-p2pro
1115+
- const: rockchip,rk3308
1116+
11071117
- description: Sinovoip RK3568 Banana Pi R2 Pro
11081118
items:
11091119
- const: sinovoip,rk3568-bpi-r2pro

‎arch/arm64/boot/dts/rockchip/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-ctouch2-of10.dtb
55
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-engicam-px30-core-edimm2.2.dtb
66
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-firefly-jd4-core-mb.dtb
77
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-ringneck-haikou.dtb
8+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-bpi-p2-pro.dtb
89
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
910
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
1011
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
@@ -157,7 +158,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb
157158
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb
158159
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-nanopi-r6s.dtb
159160
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-nanopi-r6c.dtb
160-
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
161161
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-odroid-m2.dtb
162162
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb
163163
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5b.dtb
164+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
165+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5c.dtb

‎arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
mmc2 = &sdio;
1313
};
1414

15-
vcc5v0_sys: vcc5v0-sys {
15+
vcc5v0_sys: regulator-vcc5v0-sys {
1616
compatible = "regulator-fixed";
1717
regulator-name = "vcc5v0_sys"; /* +5V */
1818
regulator-always-on;
@@ -42,7 +42,7 @@
4242
states = <3300000 0x0>;
4343
};
4444

45-
vcc3v3_rf_aux_mod: vcc3v3-rf-aux-mod {
45+
vcc3v3_rf_aux_mod: regulator-vcc3v3-rf-aux-mod {
4646
compatible = "regulator-fixed";
4747
regulator-name = "vcc3v3_rf_aux_mod";
4848
regulator-min-microvolt = <3300000>;

‎arch/arm64/boot/dts/rockchip/px30-evb.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
9090
};
9191

92-
vcc5v0_sys: vccsys {
92+
vcc5v0_sys: regulator-vccsys {
9393
compatible = "regulator-fixed";
9494
regulator-name = "vcc5v0_sys";
9595
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
stdout-path = "serial2:115200n8";
2525
};
2626

27-
dc_12v: dc-12v-regulator {
27+
dc_12v: regulator-dc-12v {
2828
compatible = "regulator-fixed";
2929
regulator-name = "dc_12v";
3030
regulator-always-on;
@@ -85,7 +85,7 @@
8585
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */
8686
};
8787

88-
vcc5v0_baseboard: vcc5v0-baseboard-regulator {
88+
vcc5v0_baseboard: regulator-vcc5v0-baseboard {
8989
compatible = "regulator-fixed";
9090
regulator-name = "vcc5v0_baseboard";
9191
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
reset-gpios = <&gpio1 RK_PB3 GPIO_ACTIVE_HIGH>;
1818
};
1919

20-
vcc5v0_sys: vcc5v0-sys-regulator {
20+
vcc5v0_sys: regulator-vcc5v0-sys {
2121
compatible = "regulator-fixed";
2222
regulator-name = "vcc5v0_sys";
2323
regulator-always-on;

‎arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
clock-frequency = <24576000>;
9191
};
9292

93-
dc_12v: dc-12v-regulator {
93+
dc_12v: regulator-dc-12v {
9494
compatible = "regulator-fixed";
9595
regulator-name = "dc_12v";
9696
regulator-always-on;
@@ -99,7 +99,7 @@
9999
regulator-max-microvolt = <12000000>;
100100
};
101101

102-
vcc3v3_baseboard: vcc3v3-baseboard-regulator {
102+
vcc3v3_baseboard: regulator-vcc3v3-baseboard {
103103
compatible = "regulator-fixed";
104104
regulator-name = "vcc3v3_baseboard";
105105
regulator-always-on;
@@ -109,7 +109,7 @@
109109
vin-supply = <&dc_12v>;
110110
};
111111

112-
vcc5v0_baseboard: vcc5v0-baseboard-regulator {
112+
vcc5v0_baseboard: regulator-vcc5v0-baseboard {
113113
compatible = "regulator-fixed";
114114
regulator-name = "vcc5v0_baseboard";
115115
regulator-always-on;
@@ -119,7 +119,7 @@
119119
vin-supply = <&dc_12v>;
120120
};
121121

122-
vdda_codec: vdda-codec-regulator {
122+
vdda_codec: regulator-vdda-codec {
123123
compatible = "regulator-fixed";
124124
regulator-name = "vdda_codec";
125125
regulator-boot-on;
@@ -128,7 +128,7 @@
128128
vin-supply = <&vcc5v0_baseboard>;
129129
};
130130

131-
vddd_codec: vddd-codec-regulator {
131+
vddd_codec: regulator-vddd-codec {
132132
compatible = "regulator-fixed";
133133
regulator-name = "vddd_codec";
134134
regulator-boot-on;

‎arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
};
4444
};
4545

46-
vcc5v0_sys: vccsys-regulator {
46+
vcc5v0_sys: regulator-vccsys {
4747
compatible = "regulator-fixed";
4848
regulator-name = "vcc5v0_sys";
4949
regulator-always-on;

0 commit comments

Comments
 (0)