Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Heiko Stuebner and committed by
Heiko Stuebner
23a52b0d 398a4087

+14 -3
+4
arch/arm/boot/dts/rk3228-evb.dts
··· 8 8 model = "Rockchip RK3228 Evaluation board"; 9 9 compatible = "rockchip,rk3228-evb", "rockchip,rk3228"; 10 10 11 + aliases { 12 + mmc0 = &emmc; 13 + }; 14 + 11 15 memory@60000000 { 12 16 device_type = "memory"; 13 17 reg = <0x60000000 0x40000000>;
+4
arch/arm/boot/dts/rk3229-evb.dts
··· 9 9 model = "Rockchip RK3229 Evaluation board"; 10 10 compatible = "rockchip,rk3229-evb", "rockchip,rk3229"; 11 11 12 + aliases { 13 + mmc0 = &emmc; 14 + }; 15 + 12 16 memory@60000000 { 13 17 device_type = "memory"; 14 18 reg = <0x60000000 0x40000000>;
+6
arch/arm/boot/dts/rk3229-xms6.dts
··· 9 9 model = "Mecer Xtreme Mini S6"; 10 10 compatible = "mecer,xms6", "rockchip,rk3229"; 11 11 12 + aliases { 13 + mmc0 = &sdmmc; 14 + mmc1 = &sdio; 15 + mmc2 = &emmc; 16 + }; 17 + 12 18 memory@60000000 { 13 19 device_type = "memory"; 14 20 reg = <0x60000000 0x40000000>;
-3
arch/arm/boot/dts/rk322x.dtsi
··· 14 14 interrupt-parent = <&gic>; 15 15 16 16 aliases { 17 - mmc0 = &sdmmc; 18 - mmc1 = &sdio; 19 - mmc2 = &emmc; 20 17 serial0 = &uart0; 21 18 serial1 = &uart1; 22 19 serial2 = &uart2;