From: Lubomir Rintel <lkundrak@v3.sk>
To: soc@kernel.org
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
linux-kernel@vger.kernel.org, Lubomir Rintel <lkundrak@v3.sk>,
Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH 11/15] ARM: dts: berlin*: Fix up the SDHCI node names
Date: Sun, 19 Apr 2020 19:11:53 +0200 [thread overview]
Message-ID: <20200419171157.672999-12-lkundrak@v3.sk> (raw)
In-Reply-To: <20200419171157.672999-1-lkundrak@v3.sk>
The node name preferred by mmc-controller.yaml binding spec is "mmc":
berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab0000: $nodename:0:
'sdhci@ab0000' does not match '^mmc(@.*)?$'
berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab0800: $nodename:0:
'sdhci@ab0800' does not match '^mmc(@.*)?$'
berlin2-sony-nsz-gs7.dt.yaml: sdhci@ab1000: $nodename:0:
'sdhci@ab1000' does not match '^mmc(@.*)?$'
berlin2cd-google-chromecast.dt.yaml: sdhci@ab0000: $nodename:0:
'sdhci@ab0000' does not match '^mmc(@.*)?$'
berlin2cd-valve-steamlink.dt.yaml: sdhci@ab0000: $nodename:0:
'sdhci@ab0000' does not match '^mmc(@.*)?$'
berlin2q-marvell-dmp.dt.yaml: sdhci@ab0000: $nodename:0:
'sdhci@ab0000' does not match '^mmc(@.*)?$'
berlin2q-marvell-dmp.dt.yaml: sdhci@ab0800: $nodename:0:
'sdhci@ab0800' does not match '^mmc(@.*)?$'
berlin2q-marvell-dmp.dt.yaml: sdhci@ab1000: $nodename:0:
'sdhci@ab1000' does not match '^mmc(@.*)?$'
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/berlin2.dtsi | 6 +++---
arch/arm/boot/dts/berlin2cd.dtsi | 2 +-
arch/arm/boot/dts/berlin2q.dtsi | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index d2f7d984bba5c..3ab3cd250da70 100644
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -77,7 +77,7 @@ soc@f7000000 {
ranges = <0 0xf7000000 0x1000000>;
- sdhci0: sdhci@ab0000 {
+ sdhci0: mmc@ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
clocks = <&chip_clk CLKID_SDIO0XIN>, <&chip_clk CLKID_SDIO0>;
@@ -86,7 +86,7 @@ sdhci0: sdhci@ab0000 {
status = "disabled";
};
- sdhci1: sdhci@ab0800 {
+ sdhci1: mmc@ab0800 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0800 0x200>;
clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO1>;
@@ -95,7 +95,7 @@ sdhci1: sdhci@ab0800 {
status = "disabled";
};
- sdhci2: sdhci@ab1000 {
+ sdhci2: mmc@ab1000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab1000 0x200>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index e5c1f4213ff90..7cf3e6302d75c 100644
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -62,7 +62,7 @@ soc@f7000000 {
ranges = <0 0xf7000000 0x1000000>;
- sdhci0: sdhci@ab0000 {
+ sdhci0: mmc@ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
clocks = <&chip_clk CLKID_SDIO0XIN>, <&chip_clk CLKID_SDIO0>;
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 99d6872a6dfcc..c44a32e873f44 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -122,7 +122,7 @@ soc@f7000000 {
ranges = <0 0xf7000000 0x1000000>;
interrupt-parent = <&gic>;
- sdhci0: sdhci@ab0000 {
+ sdhci0: mmc@ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
@@ -131,7 +131,7 @@ sdhci0: sdhci@ab0000 {
status = "disabled";
};
- sdhci1: sdhci@ab0800 {
+ sdhci1: mmc@ab0800 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0800 0x200>;
clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
@@ -140,7 +140,7 @@ sdhci1: sdhci@ab0800 {
status = "disabled";
};
- sdhci2: sdhci@ab1000 {
+ sdhci2: mmc@ab1000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab1000 0x200>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
--
2.26.0
next prev parent reply other threads:[~2020-04-19 17:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-19 17:11 [PATCH 00/15] ARM: dts: Marvell SoC Device Tree updates (for 5.8) Lubomir Rintel
2020-04-19 17:11 ` [PATCH 01/15] ARM: dts: kirkwood: Fix interrupt controller node name Lubomir Rintel
2020-04-19 17:11 ` [PATCH 02/15] ARM: dts: dove: " Lubomir Rintel
2020-04-19 17:11 ` [PATCH 03/15] ARM: dts: pxa168: Add missing address/size cells to i2c nodes Lubomir Rintel
2020-04-19 17:11 ` [PATCH 04/15] ARM: dts: pxa168: Fix the gpio interrupt cell number Lubomir Rintel
2020-04-19 17:11 ` [PATCH 05/15] ARM: dts: pxa3xx: Fix up encoding of the /gpio interrupts property Lubomir Rintel
2020-04-19 17:11 ` [PATCH 06/15] ARM: dts: pxa910: Fix the gpio interrupt cell number Lubomir Rintel
2020-04-19 17:11 ` [PATCH 07/15] ARM: dts: pxa*: Fix up encoding of the /rtc interrupts property Lubomir Rintel
2020-04-19 17:11 ` [PATCH 08/15] ARM: dts: mmp*: " Lubomir Rintel
2020-04-19 17:11 ` [PATCH 09/15] ARM: dts: mmp3: Fix L2 cache controller node name Lubomir Rintel
2020-04-19 17:11 ` [PATCH 10/15] ARM: dts: mmp3: Fix USB & USB PHY node names Lubomir Rintel
2020-04-19 17:11 ` Lubomir Rintel [this message]
2020-04-19 17:11 ` [PATCH 12/15] ARM: dts: mmp3: Add the fifth SD HCI Lubomir Rintel
2020-04-19 17:11 ` [PATCH 13/15] ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy Lubomir Rintel
2020-04-19 17:11 ` [PATCH 14/15] ARM: dts: mmp3: Use the MMP3 compatible string for /clocks Lubomir Rintel
2020-04-19 17:11 ` [PATCH 15/15] ARM: dts: mmp3-dell-ariel: Fix the SPI devices Lubomir Rintel
2020-04-20 15:35 ` [PATCH 00/15] ARM: dts: Marvell SoC Device Tree updates (for 5.8) Arnd Bergmann
2020-04-23 22:29 ` Lubomir Rintel
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=20200419171157.672999-12-lkundrak@v3.sk \
--to=lkundrak@v3.sk \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=daniel@zonque.org \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=robert.jarzmik@free.fr \
--cc=soc@kernel.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;
as well as URLs for NNTP newsgroup(s).