diff options
| author |   Heiko Stuebner <heiko.stuebner@theobroma-systems.com> | 2021-03-24 13:22:30 +0100 |
|---|---|---|
| committer |   Heiko Stuebner <heiko@sntech.de> | 2021-04-11 11:11:42 +0200 |
| commit | e89db2b4c706b9ca1293e7025ef5e8730b5d1b5b (patch) | |
| tree | 580a9725f30aa5a4260a20d8c18a779acc26bee1 | |
| parent | ARM: dts: rockchip: move rk322x mmcx aliases to board dts files (diff) | |
| download | linux-dev-e89db2b4c706b9ca1293e7025ef5e8730b5d1b5b.tar.xz linux-dev-e89db2b4c706b9ca1293e7025ef5e8730b5d1b5b.zip | |
ARM: dts: rockchip: move rv1108 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 rv1108-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-2-heiko@sntech.de
| -rw-r--r-- | arch/arm/boot/dts/rv1108-elgin-r1.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rv1108-evb.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rv1108.dtsi | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/rv1108-elgin-r1.dts b/arch/arm/boot/dts/rv1108-elgin-r1.dts index b1db924710c8..f62c9f7af79d 100644 --- a/arch/arm/boot/dts/rv1108-elgin-r1.dts +++ b/arch/arm/boot/dts/rv1108-elgin-r1.dts @@ -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>; diff --git a/arch/arm/boot/dts/rv1108-evb.dts b/arch/arm/boot/dts/rv1108-evb.dts index 30f3d0470ad9..fe5fc9bf75c9 100644 --- a/arch/arm/boot/dts/rv1108-evb.dts +++ b/arch/arm/boot/dts/rv1108-evb.dts @@ -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>; diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi index 68e2282f7e86..884872ca5207 100644 --- a/arch/arm/boot/dts/rv1108.dtsi +++ b/arch/arm/boot/dts/rv1108.dtsi @@ -19,9 +19,6 @@ i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; - mmc0 = &emmc; - mmc1 = &sdio; - mmc2 = &sdmmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; |