Commit 78b8513b authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

arm64: dts: rockchip: move mmc aliases to board dts on px30 



As suggested by Arnd Bergmann, the newly added mmc aliases
should be board specific, so move them from the general dtsi
to the individual boards.

For the Engicam-boards this means a split as the core
boards contains the emmc while the commit baseboard handles
sdmmc and sdio.

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-3-heiko@sntech.de
parent 6b5c5086

arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 
 */



/ {

	aliases {

		mmc1 = &sdmmc;

		mmc2 = &sdio;

	};



	vcc5v0_sys: vcc5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";	/* +5V */

arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 


/ {

	compatible = "engicam,px30-core", "rockchip,px30";



	aliases {

		mmc0 = &emmc;

	};

};



&cpu0 {

arch/arm64/boot/dts/rockchip/px30-evb.dts

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ / { 
	model = "Rockchip PX30 EVB";

	compatible = "rockchip,px30-evb", "rockchip,px30";



	aliases {

		mmc0 = &sdmmc;

		mmc1 = &sdio;

		mmc2 = &emmc;

	};



	chosen {

		stdout-path = "serial5:115200n8";

	};

arch/arm64/boot/dts/rockchip/px30.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ aliases { 
		i2c1 = &i2c1;

		i2c2 = &i2c2;

		i2c3 = &i2c3;

		mmc0 = &sdmmc;

		mmc1 = &sdio;

		mmc2 = &emmc;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ / { 
	model = "ODROID-GO Advance";

	compatible = "hardkernel,rk3326-odroid-go2", "rockchip,rk3326";



	aliases {

		mmc0 = &sdmmc;

	};



	chosen {

		stdout-path = "serial2:115200n8";

	};