Skip to contentSkip to conversation

arm: dts: socfpga: align mmc node names with dtschema

PATCH In review Dinh Nguyen 2 participants 4 messages Oct 24, 2022 Device tree bindings

lore
Share & tools
lore

Dinh Nguyen

author
#0 lore raw

PATCH v2 1/1 arm: dts: socfpga: align mmc node names with dtschema

dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: put back mmc0 for "linux,default-trigger"

---
 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  | 2 +-
 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, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +1 -1
index 2459f3cd7dd9..57a5d6c924b1 100644
@@ -755,7 +755,7 @@ l3regs@0xff800000 {
 			reg = <0xff800000 0x1000>;
 		};
 
-		mmc: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
 			compatible = "altr,socfpga-dw-mshc";
 			reg = <0xff704000 0x1000>;
 			interrupts = <0 139 4>;
arch/arm/boot/dts/socfpga_arria10.dtsi +1 -1
index 4370e3cbbb4b..a06211fcb5c3 100644
@@ -656,7 +656,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";
arch/arm/boot/dts/socfpga_arria5.dtsi +1 -1
index 22dbf07afcff..9ce4b4979ecb 100644
@@ -18,7 +18,7 @@ osc1 {
 			};
 		};
 
-		mmc0: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
 			broken-cd;
 			bus-width = <4>;
 			cap-mmc-highspeed;
arch/arm/boot/dts/socfpga_arria5_socdk.dts +1 -1
index 7f5458d8fccc..40f12232c150 100644
@@ -107,7 +107,7 @@ rtc@68 {
 	};
 };
 
-&mmc0 {
+&mmc {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
 	status = "okay";
arch/arm/boot/dts/socfpga_cyclone5.dtsi +1 -1
index 319a71e41ea4..34422616f545 100644
@@ -18,7 +18,7 @@ osc1 {
 			};
 		};
 
-		mmc0: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
 			broken-cd;
 			bus-width = <4>;
 			cap-mmc-highspeed;
arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts +1 -1
index 76262f1e5e03..a746a8a2b6f5 100644
@@ -91,7 +91,7 @@ &i2c3 {
 	status = "okay";
 };
 
-&mmc0 {
+&mmc {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
 	status = "okay";
arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts +1 -1
index c8f051fb2bf6..77d08b77cc1e 100644
@@ -86,7 +86,7 @@ adxl345: adxl345@53 {
 	};
 };
 
-&mmc0 {
+&mmc {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
 	status = "okay";
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi +1 -1
index bd92806ffc12..4c7a0d908e27 100644
@@ -16,7 +16,7 @@ memory@0 {
 	};
 };
 
-&mmc0 {	/* On-SoM eMMC */
+&mmc {	/* On-SoM eMMC */
 	bus-width = <8>;
 	status = "okay";
 };
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +1 -1
index b2241205c7a9..c2ed96cfdb0b 100644
@@ -111,7 +111,7 @@ rtc@68 {
 	};
 };
 
-&mmc0 {
+&mmc {
 	cd-gpios = <&portb 18 0>;
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +1 -1
index 3dd99c7c95e0..1c459d739a1c 100644
@@ -157,7 +157,7 @@ accel1: accelerometer@53 {
 	};
 };
 
-&mmc0 {
+&mmc {
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
 	status = "okay";
arch/arm/boot/dts/socfpga_cyclone5_sodia.dts +1 -1
index 2564671fc1c6..6610b5bfd58d 100644
@@ -99,7 +99,7 @@ rtc@68 {
 	};
 };
 
-&mmc0 {
+&mmc {
 	cd-gpios = <&portb 18 0>;
 	vmmc-supply = <&regulator_3_3v>;
 	vqmmc-supply = <&regulator_3_3v>;
arch/arm/boot/dts/socfpga_vt.dts +1 -1
index a77846f73b34..3d0d806888b7 100644
@@ -29,7 +29,7 @@ osc1 {
 			};
 		};
 
-		dwmmc0@ff704000 {
+		mmc@ff704000 {
 			broken-cd;
 			bus-width = <4>;
 			cap-mmc-highspeed;
Signature · 1 line
2.25.1
#1 lore raw
Quoted 64 lines · Dinh Nguyen

dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: put back mmc0 for "linux,default-trigger"

---
 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  | 2 +-
 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, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +1 -1
index 2459f3cd7dd9..57a5d6c924b1 100644
@@ -755,7 +755,7 @@ l3regs@0xff800000 {
 			reg = <0xff800000 0x1000>;
 		};
 
-		mmc: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
 			compatible = "altr,socfpga-dw-mshc";
 			reg = <0xff704000 0x1000>;
 			interrupts = <0 139 4>;
arch/arm/boot/dts/socfpga_arria10.dtsi +1 -1
index 4370e3cbbb4b..a06211fcb5c3 100644
@@ -656,7 +656,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";
arch/arm/boot/dts/socfpga_arria5.dtsi +1 -1
index 22dbf07afcff..9ce4b4979ecb 100644
@@ -18,7 +18,7 @@ osc1 {
 			};
 		};
 
-		mmc0: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
 			broken-cd;
 			bus-width = <4>;
 			cap-mmc-highspeed;
arch/arm/boot/dts/socfpga_arria5_socdk.dts +0 -0
index 7f5458d8fccc..40f12232c150 100644

arch/arm/boot/dts/socfpga_arria5_socdk.dts rtc@68 { · line 110

Quoted 5 lines
arch/arm/boot/dts/socfpga_arria5_socdk.dts +1 -1
@@ -107,7 +107,7 @@ rtc@68 {
 	};
 };
 
-&mmc0 {
+&mmc {

This does not look related and was not mentioned in commit msg,

Best regards,
Krzysztof

author
#2 lore raw
Quoted 68 lines · Krzysztof Kozlowski
Quoted 67 lines · Dinh Nguyen

dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: put back mmc0 for "linux,default-trigger"

---
  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  | 2 +-
  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, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +1 -1
index 2459f3cd7dd9..57a5d6c924b1 100644
@@ -755,7 +755,7 @@ l3regs@0xff800000 {
  			reg = <0xff800000 0x1000>;
  		};
 
-		mmc: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
  			compatible = "altr,socfpga-dw-mshc";
  			reg = <0xff704000 0x1000>;
  			interrupts = <0 139 4>;
arch/arm/boot/dts/socfpga_arria10.dtsi +1 -1
index 4370e3cbbb4b..a06211fcb5c3 100644
@@ -656,7 +656,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";
arch/arm/boot/dts/socfpga_arria5.dtsi +1 -1
index 22dbf07afcff..9ce4b4979ecb 100644
@@ -18,7 +18,7 @@ osc1 {
  			};
  		};
 
-		mmc0: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
  			broken-cd;
  			bus-width = <4>;
  			cap-mmc-highspeed;
arch/arm/boot/dts/socfpga_arria5_socdk.dts +0 -0
index 7f5458d8fccc..40f12232c150 100644
@@ -107,7 +107,7 @@ rtc@68 {
  	};
  };
Quoted 5 lines

arch/arm/boot/dts/socfpga_arria5_socdk.dts rtc@68 { · line 110

Quoted 2 lines
arch/arm/boot/dts/socfpga_arria5_socdk.dts +1 -1
-&mmc0 {
+&mmc {

This does not look related and was not mentioned in commit msg,

Because I've changed the mmc0 node to 'mmc', this is needed, otherwise the build will break.

Dinh

#3 lore raw
Quoted 71 lines · Dinh Nguyen
Quoted 68 lines · Krzysztof Kozlowski
Quoted 67 lines · Dinh Nguyen

dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: put back mmc0 for "linux,default-trigger"

---
  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  | 2 +-
  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, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +1 -1
index 2459f3cd7dd9..57a5d6c924b1 100644
@@ -755,7 +755,7 @@ l3regs@0xff800000 {
  			reg = <0xff800000 0x1000>;
  		};
 
-		mmc: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
  			compatible = "altr,socfpga-dw-mshc";
  			reg = <0xff704000 0x1000>;
  			interrupts = <0 139 4>;
arch/arm/boot/dts/socfpga_arria10.dtsi +1 -1
index 4370e3cbbb4b..a06211fcb5c3 100644
@@ -656,7 +656,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";
arch/arm/boot/dts/socfpga_arria5.dtsi +1 -1
index 22dbf07afcff..9ce4b4979ecb 100644
@@ -18,7 +18,7 @@ osc1 {
  			};
  		};
 
-		mmc0: dwmmc0@ff704000 {
+		mmc: mmc@ff704000 {
  			broken-cd;
  			bus-width = <4>;
  			cap-mmc-highspeed;
arch/arm/boot/dts/socfpga_arria5_socdk.dts +0 -0
index 7f5458d8fccc..40f12232c150 100644
@@ -107,7 +107,7 @@ rtc@68 {
  	};
  };
Quoted 8 lines
Quoted 5 lines

arch/arm/boot/dts/socfpga_arria5_socdk.dts rtc@68 { · line 110

Quoted 2 lines
arch/arm/boot/dts/socfpga_arria5_socdk.dts +1 -1
-&mmc0 {
+&mmc {

This does not look related and was not mentioned in commit msg,

Because I've changed the mmc0 node to 'mmc', this is needed, otherwise the build will break.

I know.

Why changing label to mmc? It's not related to this commit and not explained in commit msg.

Best regards,
Krzysztof