diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-13 10:54:16 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-13 10:54:16 +0200 |
| commit | 91f059a0fc238a11acd9af062c22e000f4656ded (patch) | |
| tree | 8ee5f14db077cb551b6d1e400bc9b956dbbb9d75 /arch/arm/boot/dts/rk3229-evb.dts | |
| parent | ARM: dts: at91: sama5d2/trivial: fix letter case for etm hex address (diff) | |
| parent | ARM: dts: rockchip: move rv1108 mmcx aliases to board dts files (diff) | |
| download | linux-91f059a0fc238a11acd9af062c22e000f4656ded.tar.xz linux-91f059a0fc238a11acd9af062c22e000f4656ded.zip | |
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/rk3229-evb.dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3229-evb.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts index 350497a3ca86..797476e8bef1 100644 --- a/arch/arm/boot/dts/rk3229-evb.dts +++ b/arch/arm/boot/dts/rk3229-evb.dts @@ -9,6 +9,10 @@ model = "Rockchip RK3229 Evaluation board"; compatible = "rockchip,rk3229-evb", "rockchip,rk3229"; + aliases { + mmc0 = &emmc; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x40000000>; |