Skip to content

Commit 1cd1598

Browse files
okiasandersson
okias
authored and
andersson
committed
ARM: dts: qcom: correct mmc node naming
MMC nodes has to be named mmc@ to comply with dt-bindings. Fix warnings as: arch/arm/boot/dts/qcom-msm8660-surf.dt.yaml: sdcc@12400000: $nodename:0: 'sdcc@12400000' does not match '^mmc(@.*)?$' From schema: Documentation/devicetree/bindings/mmc/arm,pl18x.yaml Signed-off-by: David Heidelberg <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 14a1f6c commit 1cd1598

12 files changed

+30
-30
lines changed

‎arch/arm/boot/dts/qcom-apq8060-dragonboard.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@
899899
};
900900
amba {
901901
/* Internal 3.69 GiB eMMC */
902-
sdcc@12400000 {
902+
mmc@12400000 {
903903
status = "okay";
904904
pinctrl-names = "default";
905905
pinctrl-0 = <&dragon_sdcc1_pins>;
@@ -908,7 +908,7 @@
908908
};
909909

910910
/* External micro SD card, directly connected, pulled up to 2.85 V */
911-
sdcc@12180000 {
911+
mmc@12180000 {
912912
status = "okay";
913913
/* Enable SSBI GPIO 22 as input, use for card detect */
914914
pinctrl-names = "default";
@@ -922,7 +922,7 @@
922922
* Second external micro SD card, using two TXB104RGYR levelshifters
923923
* to lift from 1.8 V to 2.85 V
924924
*/
925-
sdcc@12200000 {
925+
mmc@12200000 {
926926
status = "okay";
927927
/* Enable SSBI GPIO 26 as input, use for card detect */
928928
pinctrl-names = "default";

‎arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335

336336
amba {
337337
/* eMMC */
338-
sdcc@12400000 {
338+
mmc@12400000 {
339339
status = "okay";
340340
vmmc-supply = <&pm8921_l5>;
341341
vqmmc-supply = <&pm8921_s4>;

‎arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,22 +220,22 @@
220220

221221
amba {
222222
/* eMMC */
223-
sdcc1: sdcc@12400000 {
223+
sdcc1: mmc@12400000 {
224224
status = "okay";
225225
vmmc-supply = <&pm8921_l5>;
226226
vqmmc-supply = <&pm8921_s4>;
227227
};
228228

229229
/* External micro SD card */
230-
sdcc3: sdcc@12180000 {
230+
sdcc3: mmc@12180000 {
231231
status = "okay";
232232
vmmc-supply = <&v3p3_fixed>;
233233
pinctrl-names = "default";
234234
pinctrl-0 = <&card_detect>;
235235
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
236236
};
237237
/* WLAN */
238-
sdcc4: sdcc@121c0000 {
238+
sdcc4: mmc@121c0000 {
239239
status = "okay";
240240
vmmc-supply = <&v3p3_fixed>;
241241
vqmmc-supply = <&v3p3_fixed>;

‎arch/arm/boot/dts/qcom-apq8064-ifc6410.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,22 +314,22 @@
314314

315315
amba {
316316
/* eMMC */
317-
sdcc1: sdcc@12400000 {
317+
sdcc1: mmc@12400000 {
318318
status = "okay";
319319
vmmc-supply = <&pm8921_l5>;
320320
vqmmc-supply = <&pm8921_s4>;
321321
};
322322

323323
/* External micro SD card */
324-
sdcc3: sdcc@12180000 {
324+
sdcc3: mmc@12180000 {
325325
status = "okay";
326326
vmmc-supply = <&pm8921_l6>;
327327
pinctrl-names = "default";
328328
pinctrl-0 = <&card_detect>;
329329
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
330330
};
331331
/* WLAN */
332-
sdcc4: sdcc@121c0000 {
332+
sdcc4: mmc@121c0000 {
333333
status = "okay";
334334
vmmc-supply = <&ext_3p3v>;
335335
vqmmc-supply = <&pm8921_lvs1>;

‎arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,14 +374,14 @@
374374
};
375375

376376
amba {
377-
sdcc1: sdcc@12400000 {
377+
sdcc1: mmc@12400000 {
378378
status = "okay";
379379

380380
vmmc-supply = <&pm8921_l5>;
381381
vqmmc-supply = <&pm8921_s4>;
382382
};
383383

384-
sdcc3: sdcc@12180000 {
384+
sdcc3: mmc@12180000 {
385385
status = "okay";
386386

387387
vmmc-supply = <&pm8921_l6>;

‎arch/arm/boot/dts/qcom-apq8064.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@
10731073
#address-cells = <1>;
10741074
#size-cells = <1>;
10751075
ranges;
1076-
sdcc1: sdcc@12400000 {
1076+
sdcc1: mmc@12400000 {
10771077
status = "disabled";
10781078
compatible = "arm,pl18x", "arm,primecell";
10791079
pinctrl-names = "default";
@@ -1093,7 +1093,7 @@
10931093
dma-names = "tx", "rx";
10941094
};
10951095

1096-
sdcc3: sdcc@12180000 {
1096+
sdcc3: mmc@12180000 {
10971097
compatible = "arm,pl18x", "arm,primecell";
10981098
arm,primecell-periphid = <0x00051180>;
10991099
status = "disabled";
@@ -1111,7 +1111,7 @@
11111111
dma-names = "tx", "rx";
11121112
};
11131113

1114-
sdcc4: sdcc@121c0000 {
1114+
sdcc4: mmc@121c0000 {
11151115
compatible = "arm,pl18x", "arm,primecell";
11161116
arm,primecell-periphid = <0x00051180>;
11171117
status = "disabled";

‎arch/arm/boot/dts/qcom-ipq8064.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@
11811181
#size-cells = <1>;
11821182
ranges;
11831183

1184-
sdcc1: sdcc@12400000 {
1184+
sdcc1: mmc@12400000 {
11851185
status = "disabled";
11861186
compatible = "arm,pl18x", "arm,primecell";
11871187
arm,primecell-periphid = <0x00051180>;
@@ -1201,7 +1201,7 @@
12011201
dma-names = "tx", "rx";
12021202
};
12031203

1204-
sdcc3: sdcc@12180000 {
1204+
sdcc3: mmc@12180000 {
12051205
compatible = "arm,pl18x", "arm,primecell";
12061206
arm,primecell-periphid = <0x00051180>;
12071207
status = "disabled";

‎arch/arm/boot/dts/qcom-mdm9615.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
#address-cells = <1>;
355355
#size-cells = <1>;
356356
ranges;
357-
sdcc1: sdcc@12180000 {
357+
sdcc1: mmc@12180000 {
358358
status = "disabled";
359359
compatible = "arm,pl18x", "arm,primecell";
360360
arm,primecell-periphid = <0x00051180>;
@@ -374,7 +374,7 @@
374374
assigned-clock-rates = <400000>;
375375
};
376376

377-
sdcc2: sdcc@12140000 {
377+
sdcc2: mmc@12140000 {
378378
compatible = "arm,pl18x", "arm,primecell";
379379
arm,primecell-periphid = <0x00051180>;
380380
status = "disabled";

‎arch/arm/boot/dts/qcom-msm8660-surf.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535

3636
amba {
3737
/* eMMC */
38-
sdcc1: sdcc@12400000 {
38+
sdcc1: mmc@12400000 {
3939
status = "okay";
4040
vmmc-supply = <&vsdcc_fixed>;
4141
};
4242

4343
/* External micro SD card */
44-
sdcc3: sdcc@12180000 {
44+
sdcc3: mmc@12180000 {
4545
status = "okay";
4646
vmmc-supply = <&vsdcc_fixed>;
4747
};

‎arch/arm/boot/dts/qcom-msm8660.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
#address-cells = <1>;
484484
#size-cells = <1>;
485485
ranges;
486-
sdcc1: sdcc@12400000 {
486+
sdcc1: mmc@12400000 {
487487
status = "disabled";
488488
compatible = "arm,pl18x", "arm,primecell";
489489
arm,primecell-periphid = <0x00051180>;
@@ -499,7 +499,7 @@
499499
cap-mmc-highspeed;
500500
};
501501

502-
sdcc2: sdcc@12140000 {
502+
sdcc2: mmc@12140000 {
503503
status = "disabled";
504504
compatible = "arm,pl18x", "arm,primecell";
505505
arm,primecell-periphid = <0x00051180>;
@@ -514,7 +514,7 @@
514514
cap-mmc-highspeed;
515515
};
516516

517-
sdcc3: sdcc@12180000 {
517+
sdcc3: mmc@12180000 {
518518
compatible = "arm,pl18x", "arm,primecell";
519519
arm,primecell-periphid = <0x00051180>;
520520
status = "disabled";
@@ -530,7 +530,7 @@
530530
no-1-8-v;
531531
};
532532

533-
sdcc4: sdcc@121c0000 {
533+
sdcc4: mmc@121c0000 {
534534
compatible = "arm,pl18x", "arm,primecell";
535535
arm,primecell-periphid = <0x00051180>;
536536
status = "disabled";
@@ -545,7 +545,7 @@
545545
cap-mmc-highspeed;
546546
};
547547

548-
sdcc5: sdcc@12200000 {
548+
sdcc5: mmc@12200000 {
549549
compatible = "arm,pl18x", "arm,primecell";
550550
arm,primecell-periphid = <0x00051180>;
551551
status = "disabled";

0 commit comments

Comments
 (0)