diff options
| author |   Heiko Stuebner <heiko.stuebner@theobroma-systems.com> | 2021-03-24 13:22:29 +0100 |
|---|---|---|
| committer |   Heiko Stuebner <heiko@sntech.de> | 2021-04-11 11:11:42 +0200 |
| commit | 23a52b0dfebf8b9ae44829c561c3d82d8b9c48e3 (patch) | |
| tree | dd152c75876c5c091201f3fe2807ab93fef1b11a /arch | |
| parent | ARM: dts: rockchip: remove clock-names property from watchdog node in rv1108.dtsi (diff) | |
| download | linux-dev-23a52b0dfebf8b9ae44829c561c3d82d8b9c48e3.tar.xz linux-dev-23a52b0dfebf8b9ae44829c561c3d82d8b9c48e3.zip | |
ARM: dts: rockchip: move rk322x mmcx aliases to board dts files
As suggested by Arnd Bergmann, mmc-aliases are supposed to be
board-specific, so move the newly added general aliases to
the board-level on rk322x-based boards.
Suggested-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
Link: https://lore.kernel.org/r/20210324122235.1059292-1-heiko@sntech.de
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/rk3228-evb.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3229-evb.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3229-xms6.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk322x.dtsi | 3 |
4 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts index aed879db6c15..69a5e239ed1a 100644 --- a/arch/arm/boot/dts/rk3228-evb.dts +++ b/arch/arm/boot/dts/rk3228-evb.dts @@ -8,6 +8,10 @@ model = "Rockchip RK3228 Evaluation board"; compatible = "rockchip,rk3228-evb", "rockchip,rk3228"; + aliases { + mmc0 = &emmc; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x40000000>; 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>; diff --git a/arch/arm/boot/dts/rk3229-xms6.dts b/arch/arm/boot/dts/rk3229-xms6.dts index 263393ac4fa6..7bfbfd11fb55 100644 --- a/arch/arm/boot/dts/rk3229-xms6.dts +++ b/arch/arm/boot/dts/rk3229-xms6.dts @@ -9,6 +9,12 @@ model = "Mecer Xtreme Mini S6"; compatible = "mecer,xms6", "rockchip,rk3229"; + aliases { + mmc0 = &sdmmc; + mmc1 = &sdio; + mmc2 = &emmc; + }; + memory@60000000 { device_type = "memory"; reg = <0x60000000 0x40000000>; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index 118d9642470b..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; |