* [PATCH] ARM: dts: Fix up MMC host node names
@ 2021-01-15 22:54 Linus Walleij
2021-01-21 15:09 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2021-01-15 22:54 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: Linus Walleij, Ulf Hansson
The standard mandates that these nodes be named
mmc@... not sdi_foo@...
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 ++++++------
arch/arm/boot/dts/ste-href.dtsi | 8 ++++----
arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +-
arch/arm/boot/dts/ste-hrefv60plus.dtsi | 2 +-
arch/arm/boot/dts/ste-snowball.dts | 8 ++++----
arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 6 +++---
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index 404b9c4a5fee..68607e4ad80c 100644
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -883,7 +883,7 @@ serial2: uart@80007000 {
status = "disabled";
};
- sdi0_per1@80126000 {
+ mmc@80126000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80126000 0x1000>;
interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@@ -899,7 +899,7 @@ sdi0_per1@80126000 {
status = "disabled";
};
- sdi1_per2@80118000 {
+ mmc@80118000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80118000 0x1000>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
@@ -915,7 +915,7 @@ sdi1_per2@80118000 {
status = "disabled";
};
- sdi2_per3@80005000 {
+ mmc@80005000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80005000 0x1000>;
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
@@ -931,7 +931,7 @@ sdi2_per3@80005000 {
status = "disabled";
};
- sdi3_per2@80119000 {
+ mmc@80119000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80119000 0x1000>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -947,7 +947,7 @@ sdi3_per2@80119000 {
status = "disabled";
};
- sdi4_per2@80114000 {
+ mmc@80114000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80114000 0x1000>;
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
@@ -963,7 +963,7 @@ sdi4_per2@80114000 {
status = "disabled";
};
- sdi5_per3@80008000 {
+ mmc@80008000 {
compatible = "arm,pl18x", "arm,primecell";
reg = <0x80008000 0x1000>;
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 8c03124b6960..83b179692dff 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -114,7 +114,7 @@ i2c@80110000 {
};
// External Micro SD slot
- sdi0_per1@80126000 {
+ mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -137,7 +137,7 @@ sdi0_per1@80126000 {
};
// WLAN SDIO channel
- sdi1_per2@80118000 {
+ mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -150,7 +150,7 @@ sdi1_per2@80118000 {
};
// PoP:ed eMMC
- sdi2_per3@80005000 {
+ mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
@@ -165,7 +165,7 @@ sdi2_per3@80005000 {
};
// On-board eMMC
- sdi4_per2@80114000 {
+ mmc@80114000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index 931998dd364b..29b67abfc461 100644
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -61,7 +61,7 @@ spi@80002000 {
};
// External Micro SD slot
- sdi0_per1@80126000 {
+ mmc@80126000 {
cd-gpios = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;
};
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 05ea12e6df1c..8f504edefd3f 100644
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -190,7 +190,7 @@ gpio@8011e080 {
};
// External Micro SD slot
- sdi0_per1@80126000 {
+ mmc@80126000 {
cd-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>; // 95
};
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index be90e73c923e..f32b07f31acf 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -213,7 +213,7 @@ vmmci: regulator-gpio {
};
// External Micro SD slot
- sdi0_per1@80126000 {
+ mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -241,7 +241,7 @@ sdi0_per1@80126000 {
};
// WLAN SDIO channel
- sdi1_per2@80118000 {
+ mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -253,7 +253,7 @@ sdi1_per2@80118000 {
};
// Unused PoP eMMC - register and put it to sleep by default */
- sdi2_per3@80005000 {
+ mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
pinctrl-names = "default";
pinctrl-0 = <&mc2_a_1_sleep>;
@@ -262,7 +262,7 @@ sdi2_per3@80005000 {
};
// On-board eMMC
- sdi4_per2@80114000 {
+ mmc@80114000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 496f9d3ba7b7..00ee013cbd1d 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -72,7 +72,7 @@ magnetometer@c {
soc {
/* External Micro SD card slot */
- sdi0_per1@80126000 {
+ mmc@80126000 {
status = "okay";
arm,primecell-periphid = <0x10480180>;
@@ -100,7 +100,7 @@ sdi0_per1@80126000 {
};
/* WLAN SDIO */
- sdi1_per2@80118000 {
+ mmc@80118000 {
status = "okay";
arm,primecell-periphid = <0x10480180>;
@@ -134,7 +134,7 @@ wifi@1 {
};
/* eMMC */
- sdi2_per3@80005000 {
+ mmc@80005000 {
status = "okay";
arm,primecell-periphid = <0x10480180>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
index 31ee34e79fe1..95d5abe5dc0d 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
@@ -329,7 +329,7 @@ nfc@30 {
soc {
/* External Micro SD slot */
- sdi0_per1@80126000 {
+ mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <4>;
@@ -352,7 +352,7 @@ sdi0_per1@80126000 {
};
/* WLAN SDIO channel */
- sdi1_per2@80118000 {
+ mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <4>;
@@ -390,7 +390,7 @@ wifi@1 {
};
/* eMMC */
- sdi2_per3@80005000 {
+ mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <8>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index b50634c81b44..36420492fd72 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -147,7 +147,7 @@ magnetometer@c {
soc {
// External Micro SD slot
- sdi0_per1@80126000 {
+ mmc@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
@@ -169,7 +169,7 @@ sdi0_per1@80126000 {
};
// WLAN SDIO channel
- sdi1_per2@80118000 {
+ mmc@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <50000000>;
bus-width = <4>;
@@ -196,7 +196,7 @@ wifi@1 {
};
// eMMC
- sdi2_per3@80005000 {
+ mmc@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
--
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] 2+ messages in thread
* Re: [PATCH] ARM: dts: Fix up MMC host node names
2021-01-15 22:54 [PATCH] ARM: dts: Fix up MMC host node names Linus Walleij
@ 2021-01-21 15:09 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2021-01-21 15:09 UTC (permalink / raw)
To: Linus Walleij; +Cc: Linux ARM
On Fri, 15 Jan 2021 at 23:54, Linus Walleij <linus.walleij@linaro.org> wrote:
>
> The standard mandates that these nodes be named
> mmc@... not sdi_foo@...
>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
FWIW:
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
> ---
> arch/arm/boot/dts/ste-dbx5x0.dtsi | 12 ++++++------
> arch/arm/boot/dts/ste-href.dtsi | 8 ++++----
> arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +-
> arch/arm/boot/dts/ste-hrefv60plus.dtsi | 2 +-
> arch/arm/boot/dts/ste-snowball.dts | 8 ++++----
> arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 6 +++---
> arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 6 +++---
> arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 6 +++---
> 8 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
> index 404b9c4a5fee..68607e4ad80c 100644
> --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
> +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
> @@ -883,7 +883,7 @@ serial2: uart@80007000 {
> status = "disabled";
> };
>
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> compatible = "arm,pl18x", "arm,primecell";
> reg = <0x80126000 0x1000>;
> interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
> @@ -899,7 +899,7 @@ sdi0_per1@80126000 {
> status = "disabled";
> };
>
> - sdi1_per2@80118000 {
> + mmc@80118000 {
> compatible = "arm,pl18x", "arm,primecell";
> reg = <0x80118000 0x1000>;
> interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
> @@ -915,7 +915,7 @@ sdi1_per2@80118000 {
> status = "disabled";
> };
>
> - sdi2_per3@80005000 {
> + mmc@80005000 {
> compatible = "arm,pl18x", "arm,primecell";
> reg = <0x80005000 0x1000>;
> interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
> @@ -931,7 +931,7 @@ sdi2_per3@80005000 {
> status = "disabled";
> };
>
> - sdi3_per2@80119000 {
> + mmc@80119000 {
> compatible = "arm,pl18x", "arm,primecell";
> reg = <0x80119000 0x1000>;
> interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
> @@ -947,7 +947,7 @@ sdi3_per2@80119000 {
> status = "disabled";
> };
>
> - sdi4_per2@80114000 {
> + mmc@80114000 {
> compatible = "arm,pl18x", "arm,primecell";
> reg = <0x80114000 0x1000>;
> interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
> @@ -963,7 +963,7 @@ sdi4_per2@80114000 {
> status = "disabled";
> };
>
> - sdi5_per3@80008000 {
> + mmc@80008000 {
> compatible = "arm,pl18x", "arm,primecell";
> reg = <0x80008000 0x1000>;
> interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
> index 8c03124b6960..83b179692dff 100644
> --- a/arch/arm/boot/dts/ste-href.dtsi
> +++ b/arch/arm/boot/dts/ste-href.dtsi
> @@ -114,7 +114,7 @@ i2c@80110000 {
> };
>
> // External Micro SD slot
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <4>;
> @@ -137,7 +137,7 @@ sdi0_per1@80126000 {
> };
>
> // WLAN SDIO channel
> - sdi1_per2@80118000 {
> + mmc@80118000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <4>;
> @@ -150,7 +150,7 @@ sdi1_per2@80118000 {
> };
>
> // PoP:ed eMMC
> - sdi2_per3@80005000 {
> + mmc@80005000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <8>;
> @@ -165,7 +165,7 @@ sdi2_per3@80005000 {
> };
>
> // On-board eMMC
> - sdi4_per2@80114000 {
> + mmc@80114000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <8>;
> diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
> index 931998dd364b..29b67abfc461 100644
> --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
> +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
> @@ -61,7 +61,7 @@ spi@80002000 {
> };
>
> // External Micro SD slot
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> cd-gpios = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;
> };
>
> diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
> index 05ea12e6df1c..8f504edefd3f 100644
> --- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
> +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
> @@ -190,7 +190,7 @@ gpio@8011e080 {
> };
>
> // External Micro SD slot
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> cd-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>; // 95
> };
>
> diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
> index be90e73c923e..f32b07f31acf 100644
> --- a/arch/arm/boot/dts/ste-snowball.dts
> +++ b/arch/arm/boot/dts/ste-snowball.dts
> @@ -213,7 +213,7 @@ vmmci: regulator-gpio {
> };
>
> // External Micro SD slot
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <4>;
> @@ -241,7 +241,7 @@ sdi0_per1@80126000 {
> };
>
> // WLAN SDIO channel
> - sdi1_per2@80118000 {
> + mmc@80118000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <4>;
> @@ -253,7 +253,7 @@ sdi1_per2@80118000 {
> };
>
> // Unused PoP eMMC - register and put it to sleep by default */
> - sdi2_per3@80005000 {
> + mmc@80005000 {
> arm,primecell-periphid = <0x10480180>;
> pinctrl-names = "default";
> pinctrl-0 = <&mc2_a_1_sleep>;
> @@ -262,7 +262,7 @@ sdi2_per3@80005000 {
> };
>
> // On-board eMMC
> - sdi4_per2@80114000 {
> + mmc@80114000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <8>;
> diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
> index 496f9d3ba7b7..00ee013cbd1d 100644
> --- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
> +++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
> @@ -72,7 +72,7 @@ magnetometer@c {
>
> soc {
> /* External Micro SD card slot */
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> status = "okay";
>
> arm,primecell-periphid = <0x10480180>;
> @@ -100,7 +100,7 @@ sdi0_per1@80126000 {
> };
>
> /* WLAN SDIO */
> - sdi1_per2@80118000 {
> + mmc@80118000 {
> status = "okay";
>
> arm,primecell-periphid = <0x10480180>;
> @@ -134,7 +134,7 @@ wifi@1 {
> };
>
> /* eMMC */
> - sdi2_per3@80005000 {
> + mmc@80005000 {
> status = "okay";
>
> arm,primecell-periphid = <0x10480180>;
> diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
> index 31ee34e79fe1..95d5abe5dc0d 100644
> --- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
> +++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
> @@ -329,7 +329,7 @@ nfc@30 {
>
> soc {
> /* External Micro SD slot */
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <50000000>;
> bus-width = <4>;
> @@ -352,7 +352,7 @@ sdi0_per1@80126000 {
> };
>
> /* WLAN SDIO channel */
> - sdi1_per2@80118000 {
> + mmc@80118000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <50000000>;
> bus-width = <4>;
> @@ -390,7 +390,7 @@ wifi@1 {
> };
>
> /* eMMC */
> - sdi2_per3@80005000 {
> + mmc@80005000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <50000000>;
> bus-width = <8>;
> diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
> index b50634c81b44..36420492fd72 100644
> --- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
> +++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
> @@ -147,7 +147,7 @@ magnetometer@c {
>
> soc {
> // External Micro SD slot
> - sdi0_per1@80126000 {
> + mmc@80126000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <4>;
> @@ -169,7 +169,7 @@ sdi0_per1@80126000 {
> };
>
> // WLAN SDIO channel
> - sdi1_per2@80118000 {
> + mmc@80118000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <50000000>;
> bus-width = <4>;
> @@ -196,7 +196,7 @@ wifi@1 {
> };
>
> // eMMC
> - sdi2_per3@80005000 {
> + mmc@80005000 {
> arm,primecell-periphid = <0x10480180>;
> max-frequency = <100000000>;
> bus-width = <8>;
> --
> 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 [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-21 15:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-15 22:54 [PATCH] ARM: dts: Fix up MMC host node names Linus Walleij
2021-01-21 15:09 ` Ulf Hansson
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.