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

A patch from »ARM: dts: rockchip: move rk322x mmcx aliases to board dts« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko.stuebner@...> Date: Mon, 22 Mar 2021 20:50:59 +0100

Commit-Message

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: Arnd Bergmann <arnd@...> Signed-off-by: Heiko Stuebner <heiko.stuebner@...>

Patch-Comment

arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi | 5 +++++ arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi | 4 ++++ arch/arm64/boot/dts/rockchip/px30-evb.dts | 6 ++++++ arch/arm64/boot/dts/rockchip/px30.dtsi | 3 --- arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 4 ++++ 5 files changed, 19 insertions(+), 3 deletions(-)

Statistics

  • 19 lines added
  • 3 lines removed

Changes

------------ arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi -------------
index 08b0b9fbcbc9..3429e124d95a 100644
@@ -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 -----------
index cdacd3483600..7249871530ab 100644
@@ -11,6 +11,10 @@
/ {
compatible = "engicam,px30-core", "rockchip,px30";
+
+ aliases {
+ mmc0 = &emmc;
+ };
};
&cpu0 {
------------------ arch/arm64/boot/dts/rockchip/px30-evb.dts -------------------
index 52e788e983af..65c016ef5fa5 100644
@@ -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 --------------------
index 04d0399bcd74..2ea8aa1a2c6d 100644
@@ -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 --------------
index 2638b332409c..63fbe9704141 100644
@@ -14,6 +14,10 @@ / {
model = "ODROID-GO Advance";
compatible = "hardkernel,rk3326-odroid-go2", "rockchip,rk3326";
+ aliases {
+ mmc0 = &sdmmc;
+ };
+
chosen {
stdout-path = "serial2:115200n8";
};
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...