Skip to content

Commit c7639b7

Browse files
arndbarndb
committed
Merge tag 'v6.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards: ArmSom Sige7, GameForce Chi,Forlinx FET3588-C with OK3588-C baseboard, Protonic MECSBC, Wolfvision PF5. The panthor driver for Mali Valhall GPUs landed, so a number of boards enable their gpu (Cool Pi, Theobroma-Systems boards, QuartzPro64, Rock5b, EVB1) Also the USBDP phy driver landed, allowing the usb3 dual-role controllers to be used on EVB1, Rock 5A and 5B, Indiedroid-Nova, Theobroma-Systems Tiger and Jaguar. A lot new peripherals for the Khadas Edge 2 (rtc, uart, sfc, adc, ir, usb, pcie, tf-card, pmic); PCIe3 support on Jaguar, audio support for the rk3308 and cache descriptions for rk356x and rk3328. Corrected model names for boards from Radxa, Pine64, Powkiddy, Anberic and general more dt cleanups. * tag 'v6.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (64 commits) arm64: dts: rockchip: add dual-role usb3 hosts to rk3588 Tiger-Haikou arm64: dts: rockchip: add usb-id extcon on rk3588 tiger arm64: dts: rockchip: fix comment for upper usb3 port arm64: dts: rockchip: fix pcie-refclk frequency on rk3588 tiger arm64: dts: rockchip: correct gpio_pwrctrl1 typos on rk3588(s) boards arm64: dts: rockchip: Correct the model names for Pine64 boards dt-bindings: arm: rockchip: Correct the descriptions for Pine64 boards arm64: dts: rockchip: Add ArmSom Sige7 board dt-bindings: arm: rockchip: Add ArmSoM Sige7 dt-bindings: vendor-prefixes: add ArmSoM arm64: dts: rockchip: add PCIe3 support on rk3588-jaguar arm64: dts: rockchip: move uart2 pinmux to dtsi on rk3588-tiger arm64: dts: rockchip: Add USB-C Support for rk3588s-indiedroid-nova arm64: dts: rockchip: correct the model name for Radxa ROCK 3A dt-bindings: arm: rockchip: correct the model name for Radxa ROCK 3A arm64: dts: rockchip: Correct the model names for Radxa ROCK 5 boards dt-bindings: arm: rockchip: Correct the descriptions for Radxa boards arm64: dts: rockchip: add lower USB3 port to rock-5b arm64: dts: rockchip: add upper USB3 port to rock-5a arm64: dts: rockchip: add USB3 to rk3588-evb1 ... Link: https://lore.kernel.org/r/15361932.O9o76ZdvQC@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 3f35669 + d7b8392 commit c7639b7

49 files changed

Lines changed: 5226 additions & 154 deletions

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: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ properties:
4949
- anbernic,rg-arc-s
5050
- const: rockchip,rk3566
5151

52+
- description: ArmSoM Sige7 board
53+
items:
54+
- const: armsom,sige7
55+
- const: rockchip,rk3588
56+
5257
- description: Asus Tinker board
5358
items:
5459
- const: asus,rk3288-tinker
@@ -198,6 +203,13 @@ properties:
198203
- const: firefly,rk3568-roc-pc
199204
- const: rockchip,rk3568
200205

206+
- description: Forlinx FET3588-C SoM
207+
items:
208+
- enum:
209+
- forlinx,ok3588-c
210+
- const: forlinx,fet3588-c
211+
- const: rockchip,rk3588
212+
201213
- description: FriendlyElec NanoPi R2 series boards
202214
items:
203215
- enum:
@@ -236,6 +248,11 @@ properties:
236248
- const: friendlyarm,nanopc-t6
237249
- const: rockchip,rk3588
238250

251+
- description: GameForce Chi
252+
items:
253+
- const: gameforce,chi
254+
- const: rockchip,rk3326
255+
239256
- description: GeekBuying GeekBox
240257
items:
241258
- const: geekbuying,geekbox
@@ -631,7 +648,7 @@ properties:
631648
- const: phytec,rk3288-phycore-som
632649
- const: rockchip,rk3288
633650

634-
- description: Pine64 PinebookPro
651+
- description: Pine64 Pinebook Pro
635652
items:
636653
- const: pine64,pinebook-pro
637654
- const: rockchip,rk3399
@@ -644,7 +661,7 @@ properties:
644661
- const: pine64,pinenote
645662
- const: rockchip,rk3566
646663

647-
- description: Pine64 PinePhonePro
664+
- description: Pine64 PinePhone Pro
648665
items:
649666
- const: pine64,pinephone-pro
650667
- const: rockchip,rk3399
@@ -682,7 +699,7 @@ properties:
682699
- const: pine64,quartzpro64
683700
- const: rockchip,rk3588
684701

685-
- description: Pine64 SoQuartz SoM
702+
- description: Pine64 SOQuartz
686703
items:
687704
- enum:
688705
- pine64,soquartz-blade
@@ -700,12 +717,17 @@ properties:
700717
- powkiddy,x55
701718
- const: rockchip,rk3566
702719

720+
- description: Protonic MECSBC board
721+
items:
722+
- const: prt,mecsbc
723+
- const: rockchip,rk3568
724+
703725
- description: QNAP TS-433-4G 4-Bay NAS
704726
items:
705727
- const: qnap,ts433
706728
- const: rockchip,rk3568
707729

708-
- description: Radxa Compute Module 3(CM3)
730+
- description: Radxa Compute Module 3 (CM3)
709731
items:
710732
- enum:
711733
- radxa,cm3-io
@@ -767,22 +789,22 @@ properties:
767789
- const: radxa,rockpis
768790
- const: rockchip,rk3308
769791

770-
- description: Radxa Rock2 Square
792+
- description: Radxa Rock 2 Square
771793
items:
772794
- const: radxa,rock2-square
773795
- const: rockchip,rk3288
774796

775-
- description: Radxa ROCK3 Model A
797+
- description: Radxa ROCK 3A
776798
items:
777799
- const: radxa,rock3a
778800
- const: rockchip,rk3568
779801

780-
- description: Radxa ROCK 5 Model A
802+
- description: Radxa ROCK 5A
781803
items:
782804
- const: radxa,rock-5a
783805
- const: rockchip,rk3588s
784806

785-
- description: Radxa ROCK 5 Model B
807+
- description: Radxa ROCK 5B
786808
items:
787809
- const: radxa,rock-5b
788810
- const: rockchip,rk3588
@@ -927,6 +949,11 @@ properties:
927949
- const: turing,rk1
928950
- const: rockchip,rk3588
929951

952+
- description: WolfVision PF5 mainboard
953+
items:
954+
- const: wolfvision,rk3568-pf5
955+
- const: rockchip,rk3568
956+
930957
- description: Xunlong Orange Pi 5 Plus
931958
items:
932959
- const: xunlong,orangepi-5-plus

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ patternProperties:
151151
description: ARM Ltd.
152152
"^armadeus,.*":
153153
description: ARMadeus Systems SARL
154+
"^armsom,.*":
155+
description: ArmSoM Technology Co., Ltd.
154156
"^arrow,.*":
155157
description: Arrow Electronics
156158
"^artesyn,.*":
@@ -1627,6 +1629,8 @@ patternProperties:
16271629
description: Wondermedia Technologies, Inc.
16281630
"^wobo,.*":
16291631
description: Wobo
1632+
"^wolfvision,.*":
1633+
description: WolfVision GmbH
16301634
"^x-powers,.*":
16311635
description: X-Powers
16321636
"^xen,.*":

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
1010
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a95x-z2.dtb
1111
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-anbernic-rg351m.dtb
1212
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-anbernic-rg351v.dtb
13+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-gameforce-chi.dtb
1314
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb
1415
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2-v11.dtb
1516
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go3.dtb
@@ -100,20 +101,25 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
100101
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r66s.dtb
101102
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-fastrhino-r68s.dtb
102103
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-lubancat-2.dtb
104+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-mecsbc.dtb
103105
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5c.dtb
104106
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
105107
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
106108
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-qnap-ts433.dtb
107109
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
108110
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-roc-pc.dtb
109111
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
112+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5.dtb
113+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5-io-expander.dtbo
114+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-armsom-sige7.dtb
110115
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-coolpi-cm5-evb.dtb
111116
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb
112117
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-wifi.dtbo
113118
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb
114119
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
115120
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar.dtb
116121
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
122+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-ok3588-c.dtb
117123
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb
118124
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb
119125
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,48 @@
578578
#dma-cells = <1>;
579579
};
580580

581+
/*
582+
* - can be clock producer or consumer
583+
* - up to 8 capture channels and 2 playback channels
584+
* - connected internally to audio codec
585+
*/
586+
i2s_8ch_2: i2s@ff320000 {
587+
compatible = "rockchip,rk3308-i2s-tdm";
588+
reg = <0x0 0xff320000 0x0 0x1000>;
589+
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
590+
clock-names = "mclk_tx", "mclk_rx", "hclk";
591+
clocks = <&cru SCLK_I2S2_8CH_TX>,
592+
<&cru SCLK_I2S2_8CH_RX>,
593+
<&cru HCLK_I2S2_8CH>;
594+
dmas = <&dmac1 5>, <&dmac1 4>;
595+
dma-names = "rx", "tx";
596+
resets = <&cru SRST_I2S2_8CH_TX_M>, <&cru SRST_I2S2_8CH_RX_M>;
597+
reset-names = "tx-m", "rx-m";
598+
rockchip,grf = <&grf>;
599+
status = "disabled";
600+
};
601+
602+
/*
603+
* - can be clock consumer only
604+
* - up to 4 capture channels, no playback
605+
* - connected internally to audio codec
606+
*/
607+
i2s_8ch_3: i2s@ff330000 {
608+
compatible = "rockchip,rk3308-i2s-tdm";
609+
reg = <0x0 0xff330000 0x0 0x1000>;
610+
interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
611+
clock-names = "mclk_tx", "mclk_rx", "hclk";
612+
clocks = <&cru SCLK_I2S3_8CH_TX>,
613+
<&cru SCLK_I2S3_8CH_RX>,
614+
<&cru HCLK_I2S3_8CH>;
615+
dmas = <&dmac1 7>;
616+
dma-names = "rx";
617+
resets = <&cru SRST_I2S3_8CH_TX_M>, <&cru SRST_I2S3_8CH_RX_M>;
618+
reset-names = "tx-m", "rx-m";
619+
rockchip,grf = <&grf>;
620+
status = "disabled";
621+
};
622+
581623
i2s_2ch_0: i2s@ff350000 {
582624
compatible = "rockchip,rk3308-i2s", "rockchip,rk3066-i2s";
583625
reg = <0x0 0xff350000 0x0 0x1000>;
@@ -761,6 +803,20 @@
761803
assigned-clock-rates = <32768>;
762804
};
763805

806+
codec: codec@ff560000 {
807+
compatible = "rockchip,rk3308-codec";
808+
reg = <0x0 0xff560000 0x0 0x10000>;
809+
rockchip,grf = <&grf>;
810+
clock-names = "mclk_tx", "mclk_rx", "hclk";
811+
clocks = <&cru SCLK_I2S2_8CH_TX_OUT>,
812+
<&cru SCLK_I2S2_8CH_RX_OUT>,
813+
<&cru PCLK_ACODEC>;
814+
reset-names = "codec-reset";
815+
resets = <&cru SRST_ACODEC_P>;
816+
#sound-dai-cells = <0>;
817+
status = "disabled";
818+
};
819+
764820
gic: interrupt-controller@ff580000 {
765821
compatible = "arm,gic-400";
766822
reg = <0x0 0xff581000 0x0 0x1000>,

0 commit comments

Comments
 (0)