diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 17:44:52 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 17:44:52 +0200 |
| commit | ff68e816856383c2a31f45a94d5b55f18e90de03 (patch) | |
| tree | afe11689e1bebb9a8f3721faee6ef6ce267ea1fd /Documentation/devicetree/bindings/watchdog | |
| parent | 8f09b5ec4177d52e9c6a32e930bc12256603c14b (diff) | |
| parent | 07099a551803e05d3ee42fae152bf404f8dc21f9 (diff) | |
Merge tag 'v6.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards: OrangePi R1 Plus, NanoPi R2C + R5C + R5S, Khadas Edge2.
General RK3588 additions: audio, thermal management, sdmmc, clock fixes,
watchdog; RK3588-Rock5b: rtc, pwm, audio.
Display support for Odroid Go Super and PinephonePro.
And some misc adaptions for recently merged yaml binding conversions.
* tag 'v6.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (35 commits)
arm64: dts: rockchip: correct panel supplies on Odroid Go Super
arm64: dts: rockchip: Add rk3588-rock-5b analog audio
arm64: dts: rockchip: Add I2S rk3588 nodes
arm64: dts: rockchip: Add rk3588s I2S nodes
arm64: dts: rockchip: Assign PLL_PPLL clock rate to 1.1 GHz on rk3588s
arm64: dts: rockchip: Fix SCMI assigned clocks on rk3588s
arm64: dts: rockchip: add rk3588 thermal sensor
arm64: dts: rockchip: Add pwm-fan to rk3588-rock-5b
arm64: dts: rockchip: Enable RTC support for Rock 5B
arm64: dts: rockchip: Add Xunlong OrangePi R1 Plus LTS
dt-bindings: Add doc for Xunlong OrangePi R1 Plus LTS
arm64: dts: rockchip: Add FriendlyARM NanoPi R2C
dt-bindings: Add doc for FriendlyARM NanoPi R2C
arm64: dts: rockchip: Add touchscreen support to rk3399-pinephone-pro
arm64: dts: rockchip: Add internal display support to rk3399-pinephone-pro
dt-bindings: watchdog: rockchip: Add rockchip,rk3588-wdt string
arm64: dts: rockchip: Enable watchdog support for RK3588
arm64: dts: rockchip: remove hclk from dsi node on rk356x
arm64: dts: rockchip: rename vbus-supply to phy-supply in rk3566-box-demo.dts
arm64: dts: rockchip: fix rk3399 dp node
...
Link: https://lore.kernel.org/r/7289562.MhkbZ0Pkbq@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/watchdog')
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml b/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml index 92df6e453f64..e7a87ce94772 100644 --- a/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml @@ -29,6 +29,7 @@ properties: - rockchip,rk3368-wdt - rockchip,rk3399-wdt - rockchip,rk3568-wdt + - rockchip,rk3588-wdt - rockchip,rv1108-wdt - const: snps,dw-wdt |