lkml.org 
[lkml]   [2021]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 163/179] riscv: dts: microchip: drop duplicated MMC/SDHC node
    Date
    From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

    [ Upstream commit 42a57a47bb0c0f531321a7001972a3ca121409bd ]

    Devicetree source is a description of hardware and hardware has only one
    block @20008000 which can be configured either as eMMC or SDHC. Having
    two node for different modes is an obscure, unusual and confusing way to
    configure it. Instead the board file is supposed to customize the block
    to its needs, e.g. to SDHC mode.

    This fixes dtbs_check warning:
    arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: sdhc@20008000: $nodename:0: 'sdhc@20008000' does not match '^mmc(@.*)?$'

    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../microchip/microchip-mpfs-icicle-kit.dts | 11 ++++++-
    .../boot/dts/microchip/microchip-mpfs.dtsi | 29 ++-----------------
    2 files changed, 12 insertions(+), 28 deletions(-)

    diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
    index be0d77624cf53..cce5eca31f257 100644
    --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
    +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
    @@ -56,8 +56,17 @@ &serial3 {
    status = "okay";
    };

    -&sdcard {
    +&mmc {
    status = "okay";
    +
    + bus-width = <4>;
    + disable-wp;
    + cap-sd-highspeed;
    + card-detect-delay = <200>;
    + sd-uhs-sdr12;
    + sd-uhs-sdr25;
    + sd-uhs-sdr50;
    + sd-uhs-sdr104;
    };

    &emac0 {
    diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
    index 446f41d6a87e9..b12fd594e7172 100644
    --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
    +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
    @@ -262,39 +262,14 @@ serial3: serial@20104000 {
    status = "disabled";
    };

    - emmc: mmc@20008000 {
    + /* Common node entry for emmc/sd */
    + mmc: mmc@20008000 {
    compatible = "cdns,sd4hc";
    reg = <0x0 0x20008000 0x0 0x1000>;
    interrupt-parent = <&plic>;
    interrupts = <88 89>;
    pinctrl-names = "default";
    clocks = <&clkcfg 6>;
    - bus-width = <4>;
    - cap-mmc-highspeed;
    - mmc-ddr-3_3v;
    - max-frequency = <200000000>;
    - non-removable;
    - no-sd;
    - no-sdio;
    - voltage-ranges = <3300 3300>;
    - status = "disabled";
    - };
    -
    - sdcard: sdhc@20008000 {
    - compatible = "cdns,sd4hc";
    - reg = <0x0 0x20008000 0x0 0x1000>;
    - interrupt-parent = <&plic>;
    - interrupts = <88>;
    - pinctrl-names = "default";
    - clocks = <&clkcfg 6>;
    - bus-width = <4>;
    - disable-wp;
    - cap-sd-highspeed;
    - card-detect-delay = <200>;
    - sd-uhs-sdr12;
    - sd-uhs-sdr25;
    - sd-uhs-sdr50;
    - sd-uhs-sdr104;
    max-frequency = <200000000>;
    status = "disabled";
    };
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-29 19:44    [W:4.290 / U:0.908 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site