lkml.org 
[lkml]   [2021]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] arm64: dts: rockchip: move mmc aliases to board dts on rk3308
    Date
    From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>

    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>
    ---
    arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 6 ++++++
    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 3a035a189450..4ea32e8f33d2 100644
    --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
    +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
    @@ -24,9 +24,6 @@ aliases {
    i2c1 = &i2c1;
    i2c2 = &i2c2;
    i2c3 = &i2c3;
    - mmc0 = &sdmmc;
    - mmc1 = &emmc;
    - mmc2 = &sdio;
    serial0 = &uart0;
    serial1 = &uart1;
    serial2 = &uart2;
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-03-24 13:25    [W:3.019 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site