summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2024-11-12 22:32:05 +0100
committerArnd Bergmann <arnd@arndb.de>2024-11-12 22:32:06 +0100
commit9edd162c920d182428d2a6862d117d084e65e18d (patch)
tree54d5e8c140bfb28b628a10f1cfdf678e4a3d5ff7 /Documentation
parentc78a5066ff4a463b9b4f49681a409ec234648c22 (diff)
parent46fa3fee0b1c027862b04717b51630195c253a30 (diff)
Merge tag 'v6.13-armsoc/dts64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New SoCs: basic RK3528 support, RK3399S - a variant made specifically for the Pinephone Pro and for consistencies sake it gets its own SoC dtsi to not hide the specifics in the Pinephone Pro devicetree. New boards: OrangePi-5b, NanoPi R3S, ArmSom Sige 5 (first rk3576 board), Radxa e20c (first rk3528 board), Powkiddy RGB20SX, RK3588S-EVB1 and the ArmSoM LM7 SoM with W3 carrier board. HDMI support for rk3588 brings the first graphical output capability there. This includes of course needed changes to a number of boards. And finally a bunch of newly enabled peripherals on different boards, as well as changes to adhere better to bindings and removal/change of deprecated properties. * tag 'v6.13-armsoc/dts64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (64 commits) arm64: dts: rockchip: Add rk3588-orangepi-5b device tree dt-bindings: arm: rockchip: Add Orange Pi 5b enum to Orange Pi 5 entry arm64: dts: rockchip: refactor common Orange Pi 5 board arm64: dts: rockchip: Remove 'enable-active-low' from two boards arm64: dts: rockchip: add HDMI support to rk3588-jaguar arm64: dts: rockchip: add HDMI support to rk3588-tiger-haikou arm64: dts: rockchip: add HDMI pinctrl to rk3588-tiger SoM arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S arm64: dts: rockchip: enable eMMC HS200 mode for NanoPi R3S arm64: dts: rockchip: sort props in pmu_io_domains node for NanoPi R3S arm64: dts: rockchip: replace deprecated snps,reset props for NanoPi R3S arm64: dts: rockchip: fix model name for FriendlyElec NanoPi R3S arm64: dts: rockchip: Enable HDMI0 on rock-5a arm64: dts: rockchip: Enable HDMI0 on rk3588-nanopc-t6 arm64: dts: rockchip: pwm-leds for Orange Pi 5 arm64: dts: rockchip: reorder audio/hdmi nodes in Orange Pi 5 arm64: dts: rockchip: analog audio on Orange Pi 5 arm64: dts: rockchip: Add dtsi file for RK3399S SoC variant arm64: dts: rockchip: Convert dts files used as parents to dtsi files arm64: dts: rockchip: fix the pcie refclock oscillator on Rock 5 ITX ... Link: https://lore.kernel.org/r/12542111.O9o76ZdvQC@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/rockchip.yaml32
1 files changed, 31 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 687823e58c22..2f9fcc6347f4 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -49,11 +49,23 @@ properties:
- anbernic,rg-arc-s
- const: rockchip,rk3566
+ - description: ArmSoM Sige5 board
+ items:
+ - const: armsom,sige5
+ - const: rockchip,rk3576
+
- description: ArmSoM Sige7 board
items:
- const: armsom,sige7
- const: rockchip,rk3588
+ - description: ArmSoM LM7 SoM
+ items:
+ - enum:
+ - armsom,w3
+ - const: armsom,lm7
+ - const: rockchip,rk3588
+
- description: Asus Tinker board
items:
- const: asus,rk3288-tinker
@@ -232,6 +244,11 @@ properties:
- friendlyarm,nanopi-r2s-plus
- const: rockchip,rk3328
+ - description: FriendlyElec NanoPi R3S
+ items:
+ - const: friendlyarm,nanopi-r3s
+ - const: rockchip,rk3566
+
- description: FriendlyElec NanoPi4 series boards
items:
- enum:
@@ -760,6 +777,7 @@ properties:
items:
- enum:
- powkiddy,rgb10max3
+ - powkiddy,rgb20sx
- powkiddy,rgb30
- powkiddy,rk2023
- powkiddy,x55
@@ -789,6 +807,11 @@ properties:
- const: radxa,cm3i
- const: rockchip,rk3568
+ - description: Radxa E20C
+ items:
+ - const: radxa,e20c
+ - const: rockchip,rk3528
+
- description: Radxa Rock
items:
- const: radxa,rock
@@ -978,6 +1001,11 @@ properties:
- const: rockchip,rk3588-evb1-v10
- const: rockchip,rk3588
+ - description: Rockchip RK3588S Evaluation board
+ items:
+ - const: rockchip,rk3588s-evb1-v10
+ - const: rockchip,rk3588s
+
- description: Rockchip RV1108 Evaluation board
items:
- const: rockchip,rv1108-evb
@@ -1051,7 +1079,9 @@ properties:
- description: Xunlong Orange Pi 5
items:
- - const: xunlong,orangepi-5
+ - enum:
+ - xunlong,orangepi-5
+ - xunlong,orangepi-5b
- const: rockchip,rk3588s
- description: Zkmagic A95X Z2