tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 <david@ixit.cz>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211020201440.229196-1-david@ixit.cz

authored by

David Heidelberg and committed by
Bjorn Andersson 1cd15986 14a1f6c9

+30 -30
+3 -3
arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
··· 899 899 }; 900 900 amba { 901 901 /* Internal 3.69 GiB eMMC */ 902 - sdcc@12400000 { 902 + mmc@12400000 { 903 903 status = "okay"; 904 904 pinctrl-names = "default"; 905 905 pinctrl-0 = <&dragon_sdcc1_pins>; ··· 908 908 }; 909 909 910 910 /* External micro SD card, directly connected, pulled up to 2.85 V */ 911 - sdcc@12180000 { 911 + mmc@12180000 { 912 912 status = "okay"; 913 913 /* Enable SSBI GPIO 22 as input, use for card detect */ 914 914 pinctrl-names = "default"; ··· 922 922 * Second external micro SD card, using two TXB104RGYR levelshifters 923 923 * to lift from 1.8 V to 2.85 V 924 924 */ 925 - sdcc@12200000 { 925 + mmc@12200000 { 926 926 status = "okay"; 927 927 /* Enable SSBI GPIO 26 as input, use for card detect */ 928 928 pinctrl-names = "default";
+1 -1
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
··· 335 335 336 336 amba { 337 337 /* eMMC */ 338 - sdcc@12400000 { 338 + mmc@12400000 { 339 339 status = "okay"; 340 340 vmmc-supply = <&pm8921_l5>; 341 341 vqmmc-supply = <&pm8921_s4>;
+3 -3
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
··· 220 220 221 221 amba { 222 222 /* eMMC */ 223 - sdcc1: sdcc@12400000 { 223 + sdcc1: mmc@12400000 { 224 224 status = "okay"; 225 225 vmmc-supply = <&pm8921_l5>; 226 226 vqmmc-supply = <&pm8921_s4>; 227 227 }; 228 228 229 229 /* External micro SD card */ 230 - sdcc3: sdcc@12180000 { 230 + sdcc3: mmc@12180000 { 231 231 status = "okay"; 232 232 vmmc-supply = <&v3p3_fixed>; 233 233 pinctrl-names = "default"; ··· 235 235 cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>; 236 236 }; 237 237 /* WLAN */ 238 - sdcc4: sdcc@121c0000 { 238 + sdcc4: mmc@121c0000 { 239 239 status = "okay"; 240 240 vmmc-supply = <&v3p3_fixed>; 241 241 vqmmc-supply = <&v3p3_fixed>;
+3 -3
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
··· 314 314 315 315 amba { 316 316 /* eMMC */ 317 - sdcc1: sdcc@12400000 { 317 + sdcc1: mmc@12400000 { 318 318 status = "okay"; 319 319 vmmc-supply = <&pm8921_l5>; 320 320 vqmmc-supply = <&pm8921_s4>; 321 321 }; 322 322 323 323 /* External micro SD card */ 324 - sdcc3: sdcc@12180000 { 324 + sdcc3: mmc@12180000 { 325 325 status = "okay"; 326 326 vmmc-supply = <&pm8921_l6>; 327 327 pinctrl-names = "default"; ··· 329 329 cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>; 330 330 }; 331 331 /* WLAN */ 332 - sdcc4: sdcc@121c0000 { 332 + sdcc4: mmc@121c0000 { 333 333 status = "okay"; 334 334 vmmc-supply = <&ext_3p3v>; 335 335 vqmmc-supply = <&pm8921_lvs1>;
+2 -2
arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
··· 374 374 }; 375 375 376 376 amba { 377 - sdcc1: sdcc@12400000 { 377 + sdcc1: mmc@12400000 { 378 378 status = "okay"; 379 379 380 380 vmmc-supply = <&pm8921_l5>; 381 381 vqmmc-supply = <&pm8921_s4>; 382 382 }; 383 383 384 - sdcc3: sdcc@12180000 { 384 + sdcc3: mmc@12180000 { 385 385 status = "okay"; 386 386 387 387 vmmc-supply = <&pm8921_l6>;
+3 -3
arch/arm/boot/dts/qcom-apq8064.dtsi
··· 1073 1073 #address-cells = <1>; 1074 1074 #size-cells = <1>; 1075 1075 ranges; 1076 - sdcc1: sdcc@12400000 { 1076 + sdcc1: mmc@12400000 { 1077 1077 status = "disabled"; 1078 1078 compatible = "arm,pl18x", "arm,primecell"; 1079 1079 pinctrl-names = "default"; ··· 1093 1093 dma-names = "tx", "rx"; 1094 1094 }; 1095 1095 1096 - sdcc3: sdcc@12180000 { 1096 + sdcc3: mmc@12180000 { 1097 1097 compatible = "arm,pl18x", "arm,primecell"; 1098 1098 arm,primecell-periphid = <0x00051180>; 1099 1099 status = "disabled"; ··· 1111 1111 dma-names = "tx", "rx"; 1112 1112 }; 1113 1113 1114 - sdcc4: sdcc@121c0000 { 1114 + sdcc4: mmc@121c0000 { 1115 1115 compatible = "arm,pl18x", "arm,primecell"; 1116 1116 arm,primecell-periphid = <0x00051180>; 1117 1117 status = "disabled";
+2 -2
arch/arm/boot/dts/qcom-ipq8064.dtsi
··· 1181 1181 #size-cells = <1>; 1182 1182 ranges; 1183 1183 1184 - sdcc1: sdcc@12400000 { 1184 + sdcc1: mmc@12400000 { 1185 1185 status = "disabled"; 1186 1186 compatible = "arm,pl18x", "arm,primecell"; 1187 1187 arm,primecell-periphid = <0x00051180>; ··· 1201 1201 dma-names = "tx", "rx"; 1202 1202 }; 1203 1203 1204 - sdcc3: sdcc@12180000 { 1204 + sdcc3: mmc@12180000 { 1205 1205 compatible = "arm,pl18x", "arm,primecell"; 1206 1206 arm,primecell-periphid = <0x00051180>; 1207 1207 status = "disabled";
+2 -2
arch/arm/boot/dts/qcom-mdm9615.dtsi
··· 354 354 #address-cells = <1>; 355 355 #size-cells = <1>; 356 356 ranges; 357 - sdcc1: sdcc@12180000 { 357 + sdcc1: mmc@12180000 { 358 358 status = "disabled"; 359 359 compatible = "arm,pl18x", "arm,primecell"; 360 360 arm,primecell-periphid = <0x00051180>; ··· 374 374 assigned-clock-rates = <400000>; 375 375 }; 376 376 377 - sdcc2: sdcc@12140000 { 377 + sdcc2: mmc@12140000 { 378 378 compatible = "arm,pl18x", "arm,primecell"; 379 379 arm,primecell-periphid = <0x00051180>; 380 380 status = "disabled";
+2 -2
arch/arm/boot/dts/qcom-msm8660-surf.dts
··· 35 35 36 36 amba { 37 37 /* eMMC */ 38 - sdcc1: sdcc@12400000 { 38 + sdcc1: mmc@12400000 { 39 39 status = "okay"; 40 40 vmmc-supply = <&vsdcc_fixed>; 41 41 }; 42 42 43 43 /* External micro SD card */ 44 - sdcc3: sdcc@12180000 { 44 + sdcc3: mmc@12180000 { 45 45 status = "okay"; 46 46 vmmc-supply = <&vsdcc_fixed>; 47 47 };
+5 -5
arch/arm/boot/dts/qcom-msm8660.dtsi
··· 483 483 #address-cells = <1>; 484 484 #size-cells = <1>; 485 485 ranges; 486 - sdcc1: sdcc@12400000 { 486 + sdcc1: mmc@12400000 { 487 487 status = "disabled"; 488 488 compatible = "arm,pl18x", "arm,primecell"; 489 489 arm,primecell-periphid = <0x00051180>; ··· 499 499 cap-mmc-highspeed; 500 500 }; 501 501 502 - sdcc2: sdcc@12140000 { 502 + sdcc2: mmc@12140000 { 503 503 status = "disabled"; 504 504 compatible = "arm,pl18x", "arm,primecell"; 505 505 arm,primecell-periphid = <0x00051180>; ··· 514 514 cap-mmc-highspeed; 515 515 }; 516 516 517 - sdcc3: sdcc@12180000 { 517 + sdcc3: mmc@12180000 { 518 518 compatible = "arm,pl18x", "arm,primecell"; 519 519 arm,primecell-periphid = <0x00051180>; 520 520 status = "disabled"; ··· 530 530 no-1-8-v; 531 531 }; 532 532 533 - sdcc4: sdcc@121c0000 { 533 + sdcc4: mmc@121c0000 { 534 534 compatible = "arm,pl18x", "arm,primecell"; 535 535 arm,primecell-periphid = <0x00051180>; 536 536 status = "disabled"; ··· 545 545 cap-mmc-highspeed; 546 546 }; 547 547 548 - sdcc5: sdcc@12200000 { 548 + sdcc5: mmc@12200000 { 549 549 compatible = "arm,pl18x", "arm,primecell"; 550 550 arm,primecell-periphid = <0x00051180>; 551 551 status = "disabled";
+2 -2
arch/arm/boot/dts/qcom-msm8960-cdp.dts
··· 26 26 27 27 amba { 28 28 /* eMMC */ 29 - sdcc1: sdcc@12400000 { 29 + sdcc1: mmc@12400000 { 30 30 status = "okay"; 31 31 }; 32 32 33 33 /* External micro SD card */ 34 - sdcc3: sdcc@12180000 { 34 + sdcc3: mmc@12180000 { 35 35 status = "okay"; 36 36 }; 37 37 };
+2 -2
arch/arm/boot/dts/qcom-msm8960.dtsi
··· 263 263 #address-cells = <1>; 264 264 #size-cells = <1>; 265 265 ranges; 266 - sdcc1: sdcc@12400000 { 266 + sdcc1: mmc@12400000 { 267 267 status = "disabled"; 268 268 compatible = "arm,pl18x", "arm,primecell"; 269 269 arm,primecell-periphid = <0x00051180>; ··· 280 280 vmmc-supply = <&vsdcc_fixed>; 281 281 }; 282 282 283 - sdcc3: sdcc@12180000 { 283 + sdcc3: mmc@12180000 { 284 284 compatible = "arm,pl18x", "arm,primecell"; 285 285 arm,primecell-periphid = <0x00051180>; 286 286 status = "disabled";