Skip to content

Commit cbe240a

Browse files
committed
Merge tag 'v6.10-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
Radxa Rock 3C board. More gpu+usb enablement on rk3588 boards as well as two new iommus on rk3588. * tag 'v6.10-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: add rk3588 pcie and php IOMMUs arm64: dts: rockchip: enable onboard spi flash for rock-3a arm64: dts: rockchip: add USB-C support to rk3588s-orangepi-5 arm64: dts: rockchip: Enable GPU on Orange Pi 5 arm64: dts: rockchip: enable GPU on khadas-edge2 arm64: dts: rockchip: Add USB3 on Edgeble NCM6A-IO board arm64: dts: rockchip: Support poweroff on Edgeble Neural Compute Module arm64: dts: rockchip: Add Radxa ROCK 3C dt-bindings: arm: rockchip: add Radxa ROCK 3C Link: https://lore.kernel.org/r/13810480.dW097sEU6C@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 8db93c2 + cd81d3a commit cbe240a

9 files changed

Lines changed: 884 additions & 0 deletions

File tree

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,11 @@ properties:
799799
- const: radxa,rock3a
800800
- const: rockchip,rk3568
801801

802+
- description: Radxa ROCK 3C
803+
items:
804+
- const: radxa,rock-3c
805+
- const: rockchip,rk3566
806+
802807
- description: Radxa ROCK 5A
803808
items:
804809
- const: radxa,rock-5a

arch/arm64/boot/dts/rockchip/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-a.dtb
9191
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-quartz64-b.dtb
9292
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-radxa-cm3-io.dtb
9393
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-roc-pc.dtb
94+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-rock-3c.dtb
9495
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-blade.dtb
9596
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-cm4.dtb
9697
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-soquartz-model-a.dtb

0 commit comments

Comments
 (0)