| Message ID | 20210122222038.2888747-1-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f5e4bf9060d34f93519e319d71ee71d779a41084 |
| Headers | show |
| Series | ARM: dts: nomadik: Fix up MMC node names | expand |
From: Arnd Bergmann <arnd@arndb.de> On Fri, 22 Jan 2021 23:20:38 +0100, Linus Walleij wrote: > Fix the node names for the MMC/SD card controller to conform > to the standard node name mmc@.. Applied to arm/dt, thanks! [1/1] ARM: dts: nomadik: Fix up MMC node names commit: f5e4bf9060d34f93519e319d71ee71d779a41084 Arnd
Hello: This patch was applied to soc/soc.git (refs/heads/for-next): On Fri, 22 Jan 2021 23:20:38 +0100 you wrote: > Fix the node names for the MMC/SD card controller to conform > to the standard node name mmc@.. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > SoC maintainers: please apply this patch directly for > kernel v5.12, I have no other Nomadik patches queued. > > [...] Here is the summary with links: - ARM: dts: nomadik: Fix up MMC node names https://git.kernel.org/soc/soc/c/f5e4bf9060d3 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index 41ed21a4fdc1..8142c017882c 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts @@ -195,7 +195,7 @@ uart0: uart@101fd000 { pinctrl-0 = <&uart0_nhk_mode>; status = "okay"; }; - mmcsd: sdi@101f6000 { + mmcsd: mmc@101f6000 { cd-gpios = <&stmpe_gpio44 7 GPIO_ACTIVE_LOW>; wp-gpios = <&stmpe_gpio44 18 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 4445446fa828..f16314ffbf4b 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -139,7 +139,7 @@ uart0: uart@101fd000 { status = "okay"; }; /* Configure card detect for the uSD slot */ - mmcsd: sdi@101f6000 { + mmc@101f6000 { cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 4f38aeecadb3..c9b906432341 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -825,7 +825,7 @@ rtc: rtc@101e8000 { interrupts = <10>; }; - mmcsd: sdi@101f6000 { + mmcsd: mmc@101f6000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x101f6000 0x1000>; clocks = <&sdiclk>, <&pclksdi>;
Fix the node names for the MMC/SD card controller to conform to the standard node name mmc@.. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- SoC maintainers: please apply this patch directly for kernel v5.12, I have no other Nomadik patches queued. --- arch/arm/boot/dts/ste-nomadik-nhk15.dts | 2 +- arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)