diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-13 11:54:16 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-13 11:54:16 +0300 |
| commit | 91f059a0fc238a11acd9af062c22e000f4656ded (patch) | |
| tree | 8ee5f14db077cb551b6d1e400bc9b956dbbb9d75 /arch/arm/boot/dts/rk322x.dtsi | |
| parent | e4379d649e0e546da73f3af5d01f18832044cc09 (diff) | |
| parent | e89db2b4c706b9ca1293e7025ef5e8730b5d1b5b (diff) | |
| download | linux-91f059a0fc238a11acd9af062c22e000f4656ded.tar.xz | |
Merge tag 'v5.13-rockchip-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
MMC aliases fixups and some property/compatible cleanups.
* tag 'v5.13-rockchip-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: move rv1108 mmcx aliases to board dts files
ARM: dts: rockchip: move rk322x mmcx aliases to board dts files
ARM: dts: rockchip: remove clock-names property from watchdog node in rv1108.dtsi
ARM: dts: rockchip: add new watchdog compatible to rk322x.dtsi
ARM: dts: rockchip: add new watchdog compatible to rv1108.dtsi
Link: https://lore.kernel.org/r/4638723.31r3eYUQgx@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/rk322x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/rk322x.dtsi | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index a4dd50aaf3fc..208f21245095 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -14,9 +14,6 @@ interrupt-parent = <&gic>; aliases { - mmc0 = &sdmmc; - mmc1 = &sdio; - mmc2 = &emmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; @@ -370,7 +367,7 @@ }; wdt: watchdog@110a0000 { - compatible = "snps,dw-wdt"; + compatible = "rockchip,rk3228-wdt", "snps,dw-wdt"; reg = <0x110a0000 0x100>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cru PCLK_CPU>; |