diff options
| author | Heiko Stuebner <heiko.stuebner@theobroma-systems.com> | 2021-03-24 13:22:32 +0100 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2021-04-11 11:13:06 +0200 |
| commit | 3f6c22987c0bdfb42b497e346d77b6cdaed55de3 (patch) | |
| tree | bcf79b70d546b52d1ae4ef747b2a10702d99c0c2 | |
| parent | 78b8513b763c121d0ac5ed8fef3188ea065913bb (diff) | |
| download | linux-stable-3f6c22987c0bdfb42b497e346d77b6cdaed55de3.tar.gz linux-stable-3f6c22987c0bdfb42b497e346d77b6cdaed55de3.tar.bz2 linux-stable-3f6c22987c0bdfb42b497e346d77b6cdaed55de3.zip | |
arm64: dts: rockchip: move mmc aliases to board dts on rk3308
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.
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-4-heiko@sntech.de
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3308.dtsi | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts index 7a96be10eaf0..3dddd4742c3a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts @@ -9,6 +9,12 @@ / { model = "Firefly ROC-RK3308-CC board"; compatible = "firefly,roc-rk3308-cc", "rockchip,rk3308"; + + aliases { + mmc0 = &sdmmc; + mmc1 = &emmc; + }; + chosen { stdout-path = "serial2:1500000n8"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi index 00844a0e0021..0c5fa9801e6f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -24,9 +24,6 @@ i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; - mmc0 = &sdmmc; - mmc1 = &emmc; - mmc2 = &sdio; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; |