ARM: dts: rockchip: move rv1108 mmcx aliases to board dts

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: Tue, 23 Mar 2021 17:11:52 +0100

Commit-Message

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

Patch-Comment

arch/arm/boot/dts/rv1108-elgin-r1.dts | 4 ++++ arch/arm/boot/dts/rv1108-evb.dts | 4 ++++ arch/arm/boot/dts/rv1108.dtsi | 3 --- 3 files changed, 8 insertions(+), 3 deletions(-)

Statistics

  • 8 lines added
  • 3 lines removed

Changes

-------------------- arch/arm/boot/dts/rv1108-elgin-r1.dts ---------------------
index b1db924710c8..f62c9f7af79d 100644
@@ -12,6 +12,10 @@ / {
model = "Elgin RV1108 R1 board";
compatible = "elgin,rv1108-r1", "rockchip,rv1108";
+ aliases {
+ mmc0 = &emmc;
+ };
+
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x08000000>;
----------------------- arch/arm/boot/dts/rv1108-evb.dts -----------------------
index 30f3d0470ad9..fe5fc9bf75c9 100644
@@ -8,6 +8,10 @@ / {
model = "Rockchip RV1108 Evaluation board";
compatible = "rockchip,rv1108-evb", "rockchip,rv1108";
+ aliases {
+ mmc0 = &sdmmc;
+ };
+
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x08000000>;
------------------------ arch/arm/boot/dts/rv1108.dtsi -------------------------
index 7319a2473b80..15fa25585ea4 100644
@@ -19,9 +19,6 @@ aliases {
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
- mmc0 = &emmc;
- mmc1 = &sdio;
- mmc2 = &sdmmc;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
 
 

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...