From: <Conor.Dooley@microchip.com>
To: <krzysztof.kozlowski@canonical.com>, <ulf.hansson@linaro.org>,
<robh+dt@kernel.org>, <paul.walmsley@sifive.com>,
<palmer@dabbelt.com>, <aou@eecs.berkeley.edu>,
<geert@linux-m68k.org>, <yamada.masahiro@socionext.com>,
<piotrs@cadence.com>, <linux-mmc@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-riscv@lists.infradead.org>
Subject: Re: [PATCH v4 4/6] riscv: dts: microchip: drop duplicated MMC/SDHC node
Date: Tue, 5 Oct 2021 08:22:01 +0000 [thread overview]
Message-ID: <1ed22834-1b85-d8d7-dff5-6bab6df0c06a@microchip.com> (raw)
In-Reply-To: <20210927125044.20046-4-krzysztof.kozlowski@canonical.com>
On 27/09/2021 13:50, Krzysztof Kozlowski wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> 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>
>
> ---
>
> Changes since v3:
> 1. Keep two interrupts.
> 2. Add comment.
>
> Changes since v1:
> 1. Move also bus-width, suggested by Geert.
> ---
> .../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 07f1f3cab686..fc1e5869df1b 100644
> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
> @@ -51,8 +51,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 1d04c661bccf..b15e93d1702b 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.30.2
>
Reviewed-by: Conor Dooley<conor.dooley@microchip.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2021-10-05 8:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 12:50 [PATCH v4 1/6] dt-bindings: mmc: cdns: document Microchip MPFS MMC/SDHCI controller Krzysztof Kozlowski
2021-09-27 12:50 ` [PATCH v4 2/6] riscv: dts: microchip: drop duplicated nodes Krzysztof Kozlowski
2021-09-27 12:50 ` [PATCH v4 3/6] riscv: dts: microchip: fix board compatible Krzysztof Kozlowski
2021-09-27 12:50 ` [PATCH v4 4/6] riscv: dts: microchip: drop duplicated MMC/SDHC node Krzysztof Kozlowski
2021-10-05 8:22 ` Conor.Dooley [this message]
2021-09-27 12:50 ` [PATCH v4 5/6] riscv: dts: microchip: drop unused pinctrl-names Krzysztof Kozlowski
2021-09-27 12:50 ` [PATCH v4 6/6] riscv: dts: microchip: use vendor compatible for Cadence SD4HC Krzysztof Kozlowski
2021-09-27 22:32 ` [PATCH v4 1/6] dt-bindings: mmc: cdns: document Microchip MPFS MMC/SDHCI controller Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1ed22834-1b85-d8d7-dff5-6bab6df0c06a@microchip.com \
--to=conor.dooley@microchip.com \
--cc=aou@eecs.berkeley.edu \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=krzysztof.kozlowski@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=piotrs@cadence.com \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox