diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 04:31:35 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-22 04:31:44 +0300 |
| commit | b89c940f2a1a6b928b6701ddb7b0a0f604ca104d (patch) | |
| tree | 4fc3567f66f2521469702d69189ff7bb1fbfef48 /Documentation/devicetree/bindings/arm | |
| parent | aa2951a8fa3a0e18db894285cdf7ba0d06ad6664 (diff) | |
| parent | a721e28dfad2dec895a5aada85fb0fac0223e2d2 (diff) | |
| download | linux-b89c940f2a1a6b928b6701ddb7b0a0f604ca104d.tar.xz | |
Merge tag 'v6.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards are the NanoPC T6, Firefly Station P2, Radxa Rock 4SE.
Many new peripherals for the still only basic supported rk3588 soc
(PCIe2, PCIe3, USB2, SATA, Combo-Phys).
Improvements to the Rock-5a development board based on this soc (saradc,
i2c on dsi and csi, fan, eeprom, analog audio, leds, sd-card,
some regulators, pmic).
Improvements for the edgeble-neu6b (rs485, rs232, pwm-fan, rtc, sata,
sata, sd-card, pmic)
RK3399 got the PCIe endpoint node when used as a PCIe-client.
And some minor changes for some boards: spi-flash for RockPi 4,
SATA and fixed PCIe regulators for Radxa E25 and using enable-gpios
on engicam and gru boards.
* tag 'v6.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (46 commits)
arm64: dts: rockchip: Add NanoPC T6 PCIe Ethernet support
arm64: dts: rockchip: add rk3588 PCIe2 support
arm64: dts: rockchip: Enable internal SPI flash for ROCK Pi 4A/B/C
arm64: dts: rockchip: Add NanoPC T6
dt-bindings: arm: rockchip: Add NanoPC T6
arm64: dts: rockchip: Enable SATA on Radxa E25
arm64: dts: rockchip: Fix PCIe regulators on Radxa E25
arm64: dts: rockchip: switch px30-engicam to enable-gpios
arm64: dts: rockchip: switch rk3399-gru boards to enable-gpios
arm64: dts: rockchip: add PCIe3 support for rk3588
arm64: dts: rockchip: fix/update sdmmc properties for rock-5a and -5b
arm64: dts: rockchip: add USB2 to rk3588s-rock5a
arm64: dts: rockchip: add USB2 to rk3588-rock5b
arm64: dts: rockchip: add USB2 to rk3588-evb1
arm64: dts: rockchip: add USB2 support for rk3588
arm64: dts: rockchip: Enable RS485 for edgeble-neu6b
arm64: dts: rockchip: Enable RS232 for edgeble-neu6b
arm64: dts: rockchip: Enable PWM FAN for edgeble-neu6b
arm64: dts: rockchip: Enable RTC for edgeble-neu6b
arm64: dts: rockchip: Enable SATA for edgeble-neu6b
...
Link: https://lore.kernel.org/r/7414564.rnE6jSC6OK@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/rockchip.yaml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index ecdb72a519cb..ca5389862887 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -196,6 +196,11 @@ properties: - const: firefly,rk3566-roc-pc - const: rockchip,rk3566 + - description: Firefly Station P2 + items: + - const: firefly,rk3568-roc-pc + - const: rockchip,rk3568 + - description: FriendlyElec NanoPi R2 series boards items: - enum: @@ -222,6 +227,11 @@ properties: - friendlyarm,nanopi-r5s - const: rockchip,rk3568 + - description: FriendlyElec NanoPC T6 + items: + - const: friendlyarm,nanopc-t6 + - const: rockchip,rk3588 + - description: GeekBuying GeekBox items: - const: geekbuying,geekbox @@ -694,6 +704,11 @@ properties: - const: radxa,rock-4c-plus - const: rockchip,rk3399 + - description: Radxa ROCK 4SE + items: + - const: radxa,rock-4se + - const: rockchip,rk3399 + - description: Radxa ROCK Pi E items: - const: radxa,rockpi-e |