Skip to content

Commit ccbd9e9

Browse files
krzkkrzk
committed
Merge tag 'v6.20-rockchip-dts64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards: Orange Pi CM5 module + Baseboard, Radxa CM5 module + IO-board. PCIe-slot-overlay for rk3576-evb1 New peripherals: some of the video decoders on rk3576 and rk3588 Enabled peripherals: many RK3588-NPUs and a lot of other peripherals on a plethora of boards. * tag 'v6.20-rockchip-dts64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (40 commits) arm64: dts: rockchip: Add the vdpu383 Video Decoder on rk3576 arm64: dts: rockchip: Add the vdpu381 Video Decoders on RK3588 arm64: dts: rockchip: Add rk3588s-orangepi-cm5-base device tree dt-bindings: arm: rockchip: Add Orange Pi CM5 Base arm64: dts: rockchip: Enable second HDMI output on CM3588 arm64: dts: rockchip: Add HDMI to Gameforce Ace arm64: dts: rockchip: Enable analog sound on RK3576 EVB1 arm64: dts: rockchip: Enable HDMI sound on RK3576 EVB1 arm64: dts: rockchip: Enable HDMI sound on Luckfox Core3576 arm64: dts: rockchip: Enable HDMI sound on FriendlyElec NanoPi M5 arm64: dts: rockchip: Use a readable audio card name on NanoPi M5 arm64: dts: rockchip: enable NPU on rk3588-jaguar arm64: dts: rockchip: enable NPU on rk3588-tiger dt-bindings: arm: rockchip: fix description for Radxa CM5 dt-bindings: arm: rockchip: fix description for Radxa CM3I arm64: dts: rockchip: Add missing everest,es8388 supplies to rk3399-roc-pc-plus arm64: dts: rockchip: Enable PCIe for ArmSoM Sige1 arm64: dts: rockchip: Enable the NPU on Turing RK1 arm64: dts: rockchip: Enable the NPU on FriendlyElec CM3588 arm64: dts: rockchip: Enable the NPU on NanoPC T6/T6-LTS ... Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2 parents 43fdf9c + da0de80 commit ccbd9e9

39 files changed

Lines changed: 2262 additions & 26 deletions

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,13 +907,20 @@ properties:
907907
- const: radxa,cm3
908908
- const: rockchip,rk3566
909909

910-
- description: Radxa CM3 Industrial
910+
- description: Radxa CM3I
911911
items:
912912
- enum:
913913
- radxa,e25
914914
- const: radxa,cm3i
915915
- const: rockchip,rk3568
916916

917+
- description: Radxa CM5
918+
items:
919+
- enum:
920+
- radxa,cm5-io
921+
- const: radxa,cm5
922+
- const: rockchip,rk3588s
923+
917924
- description: Radxa E20C
918925
items:
919926
- const: radxa,e20c
@@ -1299,6 +1306,12 @@ properties:
12991306
- xunlong,orangepi-5b
13001307
- const: rockchip,rk3588s
13011308

1309+
- description: Xunlong Orange Pi CM5
1310+
items:
1311+
- const: xunlong,orangepi-cm5-base
1312+
- const: xunlong,orangepi-cm5
1313+
- const: rockchip,rk3588s
1314+
13021315
- description: Zkmagic A95X Z2
13031316
items:
13041317
- const: zkmagic,a95x-z2

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-100ask-dshanpi-a1.dtb
159159
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5.dtb
160160
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5-v1.2-wifibt.dtbo
161161
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10.dtb
162+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10-pcie1.dtbo
162163
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-luckfox-omni3576.dtb
163164
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-nanopi-m5.dtb
164165
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-nanopi-r76s.dtb
@@ -209,6 +210,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-nanopi-r6c.dtb
209210
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-odroid-m2.dtb
210211
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb
211212
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5b.dtb
213+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-cm5-base.dtb
214+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-radxa-cm5-io.dtb
212215
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-roc-pc.dtb
213216
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb
214217
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5c.dtb
@@ -259,6 +262,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5-v1.2-wifibt.dtb
259262
rk3576-armsom-sige5-v1.2-wifibt-dtbs := rk3576-armsom-sige5.dtb \
260263
rk3576-armsom-sige5-v1.2-wifibt.dtbo
261264

265+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10-pcie1.dtb
266+
rk3576-evb1-v10-pcie1-dtbs := rk3576-evb1-v10.dtb \
267+
rk3576-evb1-v10-pcie1.dtbo
268+
262269
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-wifi.dtb
263270
rk3588-edgeble-neu6a-wifi-dtbs := rk3588-edgeble-neu6a-io.dtb \
264271
rk3588-edgeble-neu6a-wifi.dtbo

‎arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,11 @@
154154
assigned-clocks = <&cru SCLK_MAC>;
155155
assigned-clock-parents = <&ext_gmac>;
156156
clock_in_out = "input";
157+
phy-handle = <&vsc8531_2>;
157158
phy-supply = <&vcc33_io>;
158159
phy-mode = "rgmii";
159160
pinctrl-names = "default";
160161
pinctrl-0 = <&rgmii_pins>;
161-
snps,reset-active-low;
162-
snps,reset-delays-us = <0 10000 50000>;
163-
snps,reset-gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;
164162
tx_delay = <0x10>;
165163
rx_delay = <0x10>;
166164
status = "okay";
@@ -285,7 +283,25 @@
285283
status = "okay";
286284
};
287285

286+
&mdio {
287+
vsc8531_2: ethernet-phy@0 {
288+
compatible = "ethernet-phy-ieee802.3-c22";
289+
reg = <0x0>;
290+
pinctrl-names = "default";
291+
pinctrl-0 = <&phy_rst>;
292+
reset-assert-us = <10000>;
293+
reset-deassert-us = <50000>;
294+
reset-gpios = <&gpio3 RK_PB3 GPIO_ACTIVE_LOW>;
295+
};
296+
};
297+
288298
&pinctrl {
299+
ethernet {
300+
phy_rst: phy-rst {
301+
rockchip,pins = <3 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
302+
};
303+
};
304+
289305
leds {
290306
module_led_pins: module-led-pins {
291307
rockchip,pins =

‎arch/arm64/boot/dts/rockchip/rk3368.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,15 @@
498498
"mac_clk_rx", "mac_clk_tx",
499499
"clk_mac_ref", "clk_mac_refout",
500500
"aclk_mac", "pclk_mac";
501+
resets = <&cru SRST_MAC>;
502+
reset-names = "stmmaceth";
501503
status = "disabled";
504+
505+
mdio: mdio {
506+
compatible = "snps,dwmac-mdio";
507+
#address-cells = <1>;
508+
#size-cells = <0>;
509+
};
502510
};
503511

504512
usb_host0_ehci: usb@ff500000 {

‎arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,16 @@
520520
touchscreen-size-x = <720>;
521521
touchscreen-size-y = <1440>;
522522
};
523+
524+
light-sensor@48 {
525+
compatible = "sensortek,stk3311";
526+
reg = <0x48>;
527+
interrupt-parent = <&gpio4>;
528+
interrupts = <RK_PD3 IRQ_TYPE_EDGE_FALLING>;
529+
pinctrl-names = "default";
530+
pinctrl-0 = <&light_int_l>;
531+
proximity-near-level = <300>;
532+
};
523533
};
524534

525535
&i2c4 {
@@ -533,7 +543,30 @@
533543
reg = <0x68>;
534544
interrupt-parent = <&gpio1>;
535545
interrupts = <RK_PC6 IRQ_TYPE_LEVEL_LOW>;
546+
vdd-supply = <&vcc_1v8>;
536547
vddio-supply = <&vcc_1v8>;
548+
549+
mount-matrix =
550+
"1", "0", "0",
551+
"0", "-1", "0",
552+
"0", "0", "-1";
553+
};
554+
};
555+
556+
&i2c4 {
557+
af8133j: compass@1c {
558+
compatible = "voltafield,af8133j";
559+
reg = <0x1c>;
560+
avdd-supply = <&vcc_3v0>;
561+
dvdd-supply = <&vcc_1v8>;
562+
pinctrl-names = "default";
563+
pinctrl-0 = <&compass_rst_l>;
564+
reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>;
565+
566+
mount-matrix =
567+
"0", "1", "0",
568+
"-1", "0", "0",
569+
"0", "0", "1";
537570
};
538571
};
539572

@@ -649,6 +682,12 @@
649682
};
650683
};
651684

685+
compass {
686+
compass_rst_l: compass-rst-l {
687+
rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
688+
};
689+
};
690+
652691
leds {
653692
red_led_pin: red-led-pin {
654693
rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -689,6 +728,12 @@
689728
};
690729
};
691730

731+
stk3311 {
732+
light_int_l: light-int-l {
733+
rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_input_pull_up>;
734+
};
735+
};
736+
692737
wifi {
693738
wifi_host_wake_l: wifi-host-wake-l {
694739
rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;

‎arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@
116116
reg = <0x11>;
117117
clocks = <&cru SCLK_I2S_8CH_OUT>;
118118
#sound-dai-cells = <0>;
119+
AVDD-supply = <&vcca3v0_codec>;
120+
DVDD-supply = <&vcca1v8_codec>;
121+
HPVDD-supply = <&vcca3v0_codec>;
122+
PVDD-supply = <&vcca1v8_codec>;
119123
};
120124
};
121125

‎arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@
408408

409409
vcca3v0_codec: LDO_REG5 {
410410
regulator-name = "vcca3v0_codec";
411-
regulator-always-on;
412411
regulator-boot-on;
413412
regulator-min-microvolt = <3000000>;
414413
regulator-max-microvolt = <3000000>;

‎arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,14 @@
453453
regulator-off-in-suspend;
454454
};
455455
};
456+
457+
eeprom@50 {
458+
compatible = "belling,bl24c04a", "atmel,24c04";
459+
reg = <0x50>;
460+
pagesize = <16>;
461+
read-only;
462+
vcc-supply = <&vcc_3v0_s0>;
463+
};
456464
};
457465

458466
&i2c3 {

‎arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include "rk3399-t.dtsi"
99
#include "rk3399-rock-pi-4.dtsi"
1010

11+
/delete-node/ &eeprom;
12+
1113
/ {
1214
model = "Radxa ROCK 4SE";
1315
compatible = "radxa,rock-4se", "rockchip,rk3399";
@@ -17,6 +19,16 @@
1719
};
1820
};
1921

22+
&i2c0 {
23+
eeprom@50 {
24+
compatible = "belling,bl24c16a", "atmel,24c16";
25+
reg = <0x50>;
26+
pagesize = <16>;
27+
read-only;
28+
vcc-supply = <&vcc_3v0>;
29+
};
30+
};
31+
2032
&sdio0 {
2133
status = "okay";
2234

‎arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,14 @@
456456
regulator-off-in-suspend;
457457
};
458458
};
459+
460+
eeprom: eeprom@50 {
461+
compatible = "belling,bl24c04a", "atmel,24c04";
462+
reg = <0x50>;
463+
pagesize = <16>;
464+
read-only;
465+
vcc-supply = <&vcc_3v0>;
466+
};
459467
};
460468

461469
&i2c1 {

0 commit comments

Comments
 (0)