Commit 23a52b0d authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Heiko Stuebner
Browse files

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: default avatarArnd Bergmann <arnd@kernel.org>
Signed-off-by: default avatarHeiko Stuebner <heiko.stuebner@theobroma-systems.com>
Link: https://lore.kernel.org/r/20210324122235.1059292-1-heiko@sntech.de
parent 398a4087

arch/arm/boot/dts/rk3228-evb.dts

+4 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/rk3229-evb.dts

+4 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/rk3229-xms6.dts

+6 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/rk322x.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
	interrupt-parent = <&gic>;



	aliases {

		mmc0 = &sdmmc;

		mmc1 = &sdio;

		mmc2 = &emmc;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;