All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: nomadik: Fix up MMC node names
@ 2021-01-22 22:20 ` Linus Walleij
  0 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2021-01-22 22:20 UTC (permalink / raw)
  To: arm, soc; +Cc: linux-arm-kernel, Linus Walleij

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(-)

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>;
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] ARM: dts: nomadik: Fix up MMC node names
@ 2021-01-22 22:20 ` Linus Walleij
  0 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2021-01-22 22:20 UTC (permalink / raw)
  To: arm, soc; +Cc: Linus Walleij, linux-arm-kernel

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(-)

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>;
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: dts: nomadik: Fix up MMC node names
@ 2021-01-22 22:43   ` Arnd Bergmann
  0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2021-01-22 22:43 UTC (permalink / raw)
  To: soc, arm, Linus Walleij; +Cc: Arnd Bergmann, linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: dts: nomadik: Fix up MMC node names
@ 2021-01-22 22:43   ` Arnd Bergmann
  0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2021-01-22 22:43 UTC (permalink / raw)
  To: soc, arm, Linus Walleij; +Cc: linux-arm-kernel, Arnd Bergmann

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: dts: nomadik: Fix up MMC node names
  2021-01-22 22:20 ` Linus Walleij
  (?)
  (?)
@ 2021-01-22 23:00 ` patchwork-bot+linux-soc
  -1 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+linux-soc @ 2021-01-22 23:00 UTC (permalink / raw)
  To: Linus Walleij; +Cc: soc

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



^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-22 23:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-22 22:20 [PATCH] ARM: dts: nomadik: Fix up MMC node names Linus Walleij
2021-01-22 22:20 ` Linus Walleij
2021-01-22 22:43 ` Arnd Bergmann
2021-01-22 22:43   ` Arnd Bergmann
2021-01-22 23:00 ` patchwork-bot+linux-soc

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.