From: Gregory CLEMENT <gregory.clement@bootlin.com>
To: Chris Packham <chris.packham@alliedtelesis.co.nz>,
ulf.hansson@linaro.org, robh+dt@kernel.org, krzk+dt@kernel.org,
huziji@marvell.com, andrew@lunn.ch,
sebastian.hesselbarth@gmail.com
Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: Re: [PATCH v5 1/2] arm64: dts: marvell: Update sdhci node names to match schema
Date: Mon, 09 May 2022 11:26:35 +0200 [thread overview]
Message-ID: <87bkw7rr90.fsf@BL-laptop> (raw)
In-Reply-To: <20220329220544.2132135-2-chris.packham@alliedtelesis.co.nz>
Chris Packham <chris.packham@alliedtelesis.co.nz> writes:
> Update the node names of the sdhci@ interfaces to be mmc@ to match the
> node name enforced by the mmc-controller.yaml schema.
>
> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Applied on mvebu/dt64
Thanks,
Gregory
> ---
>
> Notes:
> This has been sent separately [1] but on Krzysztof's advice I've
> included it in v3 of this series.
>
> [1] - https://lore.kernel.org/linux-arm-kernel/20220321212007.2961581-1-chris.packham@alliedtelesis.co.nz/
> Changes in v5:
> - None
> Changes in v4:
> - None
> Changes in v3:
> - New
>
> arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 ++--
> arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +-
> arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
> index 30233de58bb3..78adb803df26 100644
> --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
> @@ -434,7 +434,7 @@ rwtm: mailbox@b0000 {
> #mbox-cells = <1>;
> };
>
> - sdhci1: sdhci@d0000 {
> + sdhci1: mmc@d0000 {
> compatible = "marvell,armada-3700-sdhci",
> "marvell,sdhci-xenon";
> reg = <0xd0000 0x300>,
> @@ -445,7 +445,7 @@ sdhci1: sdhci@d0000 {
> status = "disabled";
> };
>
> - sdhci0: sdhci@d8000 {
> + sdhci0: mmc@d8000 {
> compatible = "marvell,armada-3700-sdhci",
> "marvell,sdhci-xenon";
> reg = <0xd8000 0x300>,
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> index 6614472100c2..a06a0a889c43 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> @@ -250,7 +250,7 @@ watchdog: watchdog@610000 {
> interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
> };
>
> - ap_sdhci0: sdhci@6e0000 {
> + ap_sdhci0: mmc@6e0000 {
> compatible = "marvell,armada-ap806-sdhci";
> reg = <0x6e0000 0x300>;
> interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> index 3bd2182817fb..d6c0990a267d 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> @@ -493,7 +493,7 @@ CP11X_LABEL(trng): trng@760000 {
> status = "okay";
> };
>
> - CP11X_LABEL(sdhci0): sdhci@780000 {
> + CP11X_LABEL(sdhci0): mmc@780000 {
> compatible = "marvell,armada-cp110-sdhci";
> reg = <0x780000 0x300>;
> interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
> --
> 2.35.1
>
--
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
next prev parent reply other threads:[~2022-05-09 9:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 22:05 [PATCH v5 0/2] mmc: xenon: Convert to JSON schema Chris Packham
2022-03-29 22:05 ` [PATCH v5 1/2] arm64: dts: marvell: Update sdhci node names to match schema Chris Packham
2022-05-09 9:26 ` Gregory CLEMENT [this message]
2022-03-29 22:05 ` [PATCH v5 2/2] dt-bindings: mmc: xenon: Convert to JSON schema Chris Packham
2022-03-30 7:20 ` Krzysztof Kozlowski
2022-03-31 9:38 ` Krzysztof Kozlowski
2022-04-06 14:55 ` 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=87bkw7rr90.fsf@BL-laptop \
--to=gregory.clement@bootlin.com \
--cc=andrew@lunn.ch \
--cc=chris.packham@alliedtelesis.co.nz \
--cc=devicetree@vger.kernel.org \
--cc=huziji@marvell.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=ulf.hansson@linaro.org \
/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