* [PATCH] arm: dts: socfpga: align mmc node names with dtschema
@ 2022-10-21 15:32 Dinh Nguyen
2022-10-22 0:56 ` Krzysztof Kozlowski
0 siblings, 1 reply; 2+ messages in thread
From: Dinh Nguyen @ 2022-10-21 15:32 UTC (permalink / raw)
To: robh+dt; +Cc: dinguyen, krzysztof.kozlowski+dt, devicetree
dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
---
arch/arm/boot/dts/socfpga.dtsi | 2 +-
arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
arch/arm/boot/dts/socfpga_arria5.dtsi | 2 +-
arch/arm/boot/dts/socfpga_arria5_socdk.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5.dtsi | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts | 4 ++--
arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 2 +-
arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 2 +-
arch/arm/boot/dts/socfpga_vt.dts | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index a2419a5c6c26..6eda6fdc101b 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -754,7 +754,7 @@ l3regs@0xff800000 {
reg = <0xff800000 0x1000>;
};
- mmc: dwmmc0@ff704000 {
+ mmc: mmc@ff704000 {
compatible = "altr,socfpga-dw-mshc";
reg = <0xff704000 0x1000>;
interrupts = <0 139 4>;
diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index eb528c103d70..3b2a2c9c6547 100644
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -655,7 +655,7 @@ L2: cache-controller@fffff000 {
arm,shared-override;
};
- mmc: dwmmc0@ff808000 {
+ mmc: mmc@ff808000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "altr,socfpga-dw-mshc";
diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
index b531639ce7dc..c20a1f04f29a 100644
--- a/arch/arm/boot/dts/socfpga_arria5.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
@@ -18,7 +18,7 @@ osc1 {
};
};
- mmc0: dwmmc0@ff704000 {
+ mmc: mmc@ff704000 {
broken-cd;
bus-width = <4>;
cap-mmc-highspeed;
diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
index 7f5458d8fccc..40f12232c150 100644
--- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
@@ -107,7 +107,7 @@ rtc@68 {
};
};
-&mmc0 {
+&mmc {
vmmc-supply = <®ulator_3_3v>;
vqmmc-supply = <®ulator_3_3v>;
status = "okay";
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
index a9d1ba66f1ff..1d08d48559e5 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
@@ -18,7 +18,7 @@ osc1 {
};
};
- mmc0: dwmmc0@ff704000 {
+ mmc: mmc@ff704000 {
broken-cd;
bus-width = <4>;
cap-mmc-highspeed;
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts b/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
index 76262f1e5e03..f3e7169bc93a 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
@@ -43,7 +43,7 @@ user_led1 {
user_led2 {
label = "green:user2";
gpios = <&porta 22 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "mmc0";
+ linux,default-trigger = "mmc";
};
user_led3 {
@@ -91,7 +91,7 @@ &i2c3 {
status = "okay";
};
-&mmc0 {
+&mmc {
vmmc-supply = <®ulator_3_3v>;
vqmmc-supply = <®ulator_3_3v>;
status = "okay";
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
index c8f051fb2bf6..77d08b77cc1e 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
@@ -86,7 +86,7 @@ adxl345: adxl345@53 {
};
};
-&mmc0 {
+&mmc {
vmmc-supply = <®ulator_3_3v>;
vqmmc-supply = <®ulator_3_3v>;
status = "okay";
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi b/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi
index 3b9daddf91cd..92ff1b257279 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi
+++ b/arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi
@@ -16,7 +16,7 @@ memory@0 {
};
};
-&mmc0 { /* On-SoM eMMC */
+&mmc { /* On-SoM eMMC */
bus-width = <8>;
clk-phase-sd-hs = <0>, <135>;
status = "okay";
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
index b2241205c7a9..c2ed96cfdb0b 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
@@ -111,7 +111,7 @@ rtc@68 {
};
};
-&mmc0 {
+&mmc {
cd-gpios = <&portb 18 0>;
vmmc-supply = <®ulator_3_3v>;
vqmmc-supply = <®ulator_3_3v>;
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
index 3dd99c7c95e0..1c459d739a1c 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
@@ -157,7 +157,7 @@ accel1: accelerometer@53 {
};
};
-&mmc0 {
+&mmc {
vmmc-supply = <®ulator_3_3v>;
vqmmc-supply = <®ulator_3_3v>;
status = "okay";
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts b/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts
index 2564671fc1c6..6610b5bfd58d 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_sodia.dts
@@ -99,7 +99,7 @@ rtc@68 {
};
};
-&mmc0 {
+&mmc {
cd-gpios = <&portb 18 0>;
vmmc-supply = <®ulator_3_3v>;
vqmmc-supply = <®ulator_3_3v>;
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index a77846f73b34..3d0d806888b7 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -29,7 +29,7 @@ osc1 {
};
};
- dwmmc0@ff704000 {
+ mmc@ff704000 {
broken-cd;
bus-width = <4>;
cap-mmc-highspeed;
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] arm: dts: socfpga: align mmc node names with dtschema
2022-10-21 15:32 [PATCH] arm: dts: socfpga: align mmc node names with dtschema Dinh Nguyen
@ 2022-10-22 0:56 ` Krzysztof Kozlowski
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-22 0:56 UTC (permalink / raw)
To: Dinh Nguyen, robh+dt; +Cc: krzysztof.kozlowski+dt, devicetree
On 21/10/2022 11:32, Dinh Nguyen wrote:
> dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'
>
> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
> ---
> arch/arm/boot/dts/socfpga.dtsi | 2 +-
> arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
> arch/arm/boot/dts/socfpga_arria5.dtsi | 2 +-
> arch/arm/boot/dts/socfpga_arria5_socdk.dts | 2 +-
> arch/arm/boot/dts/socfpga_cyclone5.dtsi | 2 +-
> arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts | 4 ++--
> arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts | 2 +-
> arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 2 +-
> arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +-
> arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 2 +-
> arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 2 +-
> arch/arm/boot/dts/socfpga_vt.dts | 2 +-
> 12 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
> index a2419a5c6c26..6eda6fdc101b 100644
> --- a/arch/arm/boot/dts/socfpga.dtsi
> +++ b/arch/arm/boot/dts/socfpga.dtsi
> @@ -754,7 +754,7 @@ l3regs@0xff800000 {
> reg = <0xff800000 0x1000>;
> };
>
> - mmc: dwmmc0@ff704000 {
> + mmc: mmc@ff704000 {
> compatible = "altr,socfpga-dw-mshc";
> reg = <0xff704000 0x1000>;
> interrupts = <0 139 4>;
> diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
> index eb528c103d70..3b2a2c9c6547 100644
> --- a/arch/arm/boot/dts/socfpga_arria10.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
> @@ -655,7 +655,7 @@ L2: cache-controller@fffff000 {
> arm,shared-override;
> };
>
> - mmc: dwmmc0@ff808000 {
> + mmc: mmc@ff808000 {
> #address-cells = <1>;
> #size-cells = <0>;
> compatible = "altr,socfpga-dw-mshc";
> diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
> index b531639ce7dc..c20a1f04f29a 100644
> --- a/arch/arm/boot/dts/socfpga_arria5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
> @@ -18,7 +18,7 @@ osc1 {
> };
> };
>
> - mmc0: dwmmc0@ff704000 {
> + mmc: mmc@ff704000 {
> broken-cd;
> bus-width = <4>;
> cap-mmc-highspeed;
> diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
> index 7f5458d8fccc..40f12232c150 100644
> --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
> +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
> @@ -107,7 +107,7 @@ rtc@68 {
> };
> };
>
> -&mmc0 {
> +&mmc {
> vmmc-supply = <®ulator_3_3v>;
> vqmmc-supply = <®ulator_3_3v>;
> status = "okay";
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> index a9d1ba66f1ff..1d08d48559e5 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> @@ -18,7 +18,7 @@ osc1 {
> };
> };
>
> - mmc0: dwmmc0@ff704000 {
> + mmc: mmc@ff704000 {
> broken-cd;
> bus-width = <4>;
> cap-mmc-highspeed;
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts b/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
> index 76262f1e5e03..f3e7169bc93a 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
> +++ b/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
> @@ -43,7 +43,7 @@ user_led1 {
> user_led2 {
> label = "green:user2";
> gpios = <&porta 22 GPIO_ACTIVE_LOW>;
> - linux,default-trigger = "mmc0";
> + linux,default-trigger = "mmc";
I think this is not correct... or at least not really related to this
commit.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-22 0:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-21 15:32 [PATCH] arm: dts: socfpga: align mmc node names with dtschema Dinh Nguyen
2022-10-22 0:56 ` Krzysztof Kozlowski
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).