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

ARM: dts: renesas: Fix SD Card/eMMC interface device node names

Fix the device node names as "mmc@".

Fixes: 66474697923c ("ARM: dts: r7s72100: add sdhi to device tree")
Fixes: a49f76cddaee ("ARM: dts: r7s9210: Add SDHI support")
Fixes: 43304a5f5106 ("ARM: shmobile: r8a73a4: tidyup DT node naming")
Fixes: 7d907894bfe3 ("ARM: shmobile: r8a7740: tidyup DT node naming")
Fixes: 3ab2ea5fd1ce ("ARM: dts: r8a7742: Add SDHI nodes")
Fixes: 63ce8a617b51 ("ARM: dts: r8a7743: Add SDHI controllers")
Fixes: b591e323b271 ("ARM: dts: r8a7744: Add SDHI nodes")
Fixes: d83010f87ab3 ("ARM: dts: r8a7744: Initial SoC device tree")
Fixes: 7079131ef9b9 ("ARM: dts: r8a7745: Add SDHI controllers")
Fixes: 0485da788028 ("ARM: dts: r8a77470: Add SDHI1 support")
Fixes: 15aa5a95e820 ("ARM: dts: r8a77470: Add SDHI0 support")
Fixes: f068cc816015 ("ARM: dts: r8a77470: Add SDHI2 support")
Fixes: 14e1d9147d96 ("ARM: shmobile: r8a7778: tidyup DT node naming")
Fixes: 2624705ceb7b ("ARM: shmobile: r8a7779: tidyup DT node naming")
Fixes: b718aa448378 ("ARM: shmobile: r8a7790: tidyup DT node naming")
Fixes: b7ed8a0dd4f1 ("ARM: shmobile: Add SDHI devices to r8a7791 DTSI")
Fixes: ce01b14ecf19 ("ARM: dts: r8a7792: add SDHI support")
Fixes: fc9ee228f500 ("ARM: dts: r8a7793: Add SDHI controllers")
Fixes: b8e8ea127d00 ("ARM: shmobile: r8a7794: add SDHI DT support")
Fixes: 33f6be3bf6b7 ("ARM: shmobile: sh73a0: tidyup DT node naming")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/1594382936-14114-1-git-send-email-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

authored by

Yoshihiro Shimoda and committed by
Geert Uytterhoeven
d8293670 a6cb262a

+50 -50
+2 -2
arch/arm/boot/dts/r7s72100.dtsi
··· 323 323 status = "disabled"; 324 324 }; 325 325 326 - sdhi0: sd@e804e000 { 326 + sdhi0: mmc@e804e000 { 327 327 compatible = "renesas,sdhi-r7s72100"; 328 328 reg = <0xe804e000 0x100>; 329 329 interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH>, ··· 339 339 status = "disabled"; 340 340 }; 341 341 342 - sdhi1: sd@e804e800 { 342 + sdhi1: mmc@e804e800 { 343 343 compatible = "renesas,sdhi-r7s72100"; 344 344 reg = <0xe804e800 0x100>; 345 345 interrupts = <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH>,
+2 -2
arch/arm/boot/dts/r7s9210.dtsi
··· 416 416 status = "disabled"; 417 417 }; 418 418 419 - sdhi0: sd@e8228000 { 419 + sdhi0: mmc@e8228000 { 420 420 compatible = "renesas,sdhi-r7s9210"; 421 421 reg = <0xe8228000 0x8c0>; 422 422 interrupts = <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>; ··· 428 428 status = "disabled"; 429 429 }; 430 430 431 - sdhi1: sd@e822a000 { 431 + sdhi1: mmc@e822a000 { 432 432 compatible = "renesas,sdhi-r7s9210"; 433 433 reg = <0xe822a000 0x8c0>; 434 434 interrupts = <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>;
+3 -3
arch/arm/boot/dts/r8a73a4.dtsi
··· 409 409 status = "disabled"; 410 410 }; 411 411 412 - sdhi0: sd@ee100000 { 412 + sdhi0: mmc@ee100000 { 413 413 compatible = "renesas,sdhi-r8a73a4"; 414 414 reg = <0 0xee100000 0 0x100>; 415 415 interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>; ··· 419 419 status = "disabled"; 420 420 }; 421 421 422 - sdhi1: sd@ee120000 { 422 + sdhi1: mmc@ee120000 { 423 423 compatible = "renesas,sdhi-r8a73a4"; 424 424 reg = <0 0xee120000 0 0x100>; 425 425 interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>; ··· 429 429 status = "disabled"; 430 430 }; 431 431 432 - sdhi2: sd@ee140000 { 432 + sdhi2: mmc@ee140000 { 433 433 compatible = "renesas,sdhi-r8a73a4"; 434 434 reg = <0 0xee140000 0 0x100>; 435 435 interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+3 -3
arch/arm/boot/dts/r8a7740.dtsi
··· 349 349 status = "disabled"; 350 350 }; 351 351 352 - sdhi0: sd@e6850000 { 352 + sdhi0: mmc@e6850000 { 353 353 compatible = "renesas,sdhi-r8a7740"; 354 354 reg = <0xe6850000 0x100>; 355 355 interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, ··· 362 362 status = "disabled"; 363 363 }; 364 364 365 - sdhi1: sd@e6860000 { 365 + sdhi1: mmc@e6860000 { 366 366 compatible = "renesas,sdhi-r8a7740"; 367 367 reg = <0xe6860000 0x100>; 368 368 interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, ··· 375 375 status = "disabled"; 376 376 }; 377 377 378 - sdhi2: sd@e6870000 { 378 + sdhi2: mmc@e6870000 { 379 379 compatible = "renesas,sdhi-r8a7740"; 380 380 reg = <0xe6870000 0x100>; 381 381 interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+4 -4
arch/arm/boot/dts/r8a7742.dtsi
··· 1286 1286 }; 1287 1287 }; 1288 1288 1289 - sdhi0: sd@ee100000 { 1289 + sdhi0: mmc@ee100000 { 1290 1290 compatible = "renesas,sdhi-r8a7742", 1291 1291 "renesas,rcar-gen2-sdhi"; 1292 1292 reg = <0 0xee100000 0 0x328>; ··· 1301 1301 status = "disabled"; 1302 1302 }; 1303 1303 1304 - sdhi1: sd@ee120000 { 1304 + sdhi1: mmc@ee120000 { 1305 1305 compatible = "renesas,sdhi-r8a7742", 1306 1306 "renesas,rcar-gen2-sdhi"; 1307 1307 reg = <0 0xee120000 0 0x328>; ··· 1316 1316 status = "disabled"; 1317 1317 }; 1318 1318 1319 - sdhi2: sd@ee140000 { 1319 + sdhi2: mmc@ee140000 { 1320 1320 compatible = "renesas,sdhi-r8a7742", 1321 1321 "renesas,rcar-gen2-sdhi"; 1322 1322 reg = <0 0xee140000 0 0x100>; ··· 1331 1331 status = "disabled"; 1332 1332 }; 1333 1333 1334 - sdhi3: sd@ee160000 { 1334 + sdhi3: mmc@ee160000 { 1335 1335 compatible = "renesas,sdhi-r8a7742", 1336 1336 "renesas,rcar-gen2-sdhi"; 1337 1337 reg = <0 0xee160000 0 0x100>;
+3 -3
arch/arm/boot/dts/r8a7743.dtsi
··· 1520 1520 }; 1521 1521 }; 1522 1522 1523 - sdhi0: sd@ee100000 { 1523 + sdhi0: mmc@ee100000 { 1524 1524 compatible = "renesas,sdhi-r8a7743", 1525 1525 "renesas,rcar-gen2-sdhi"; 1526 1526 reg = <0 0xee100000 0 0x328>; ··· 1535 1535 status = "disabled"; 1536 1536 }; 1537 1537 1538 - sdhi1: sd@ee140000 { 1538 + sdhi1: mmc@ee140000 { 1539 1539 compatible = "renesas,sdhi-r8a7743", 1540 1540 "renesas,rcar-gen2-sdhi"; 1541 1541 reg = <0 0xee140000 0 0x100>; ··· 1550 1550 status = "disabled"; 1551 1551 }; 1552 1552 1553 - sdhi2: sd@ee160000 { 1553 + sdhi2: mmc@ee160000 { 1554 1554 compatible = "renesas,sdhi-r8a7743", 1555 1555 "renesas,rcar-gen2-sdhi"; 1556 1556 reg = <0 0xee160000 0 0x100>;
+3 -3
arch/arm/boot/dts/r8a7744.dtsi
··· 1520 1520 }; 1521 1521 }; 1522 1522 1523 - sdhi0: sd@ee100000 { 1523 + sdhi0: mmc@ee100000 { 1524 1524 compatible = "renesas,sdhi-r8a7744", 1525 1525 "renesas,rcar-gen2-sdhi"; 1526 1526 reg = <0 0xee100000 0 0x328>; ··· 1535 1535 status = "disabled"; 1536 1536 }; 1537 1537 1538 - sdhi1: sd@ee140000 { 1538 + sdhi1: mmc@ee140000 { 1539 1539 compatible = "renesas,sdhi-r8a7744", 1540 1540 "renesas,rcar-gen2-sdhi"; 1541 1541 reg = <0 0xee140000 0 0x100>; ··· 1550 1550 status = "disabled"; 1551 1551 }; 1552 1552 1553 - sdhi2: sd@ee160000 { 1553 + sdhi2: mmc@ee160000 { 1554 1554 compatible = "renesas,sdhi-r8a7744", 1555 1555 "renesas,rcar-gen2-sdhi"; 1556 1556 reg = <0 0xee160000 0 0x100>;
+3 -3
arch/arm/boot/dts/r8a7745.dtsi
··· 1396 1396 }; 1397 1397 }; 1398 1398 1399 - sdhi0: sd@ee100000 { 1399 + sdhi0: mmc@ee100000 { 1400 1400 compatible = "renesas,sdhi-r8a7745", 1401 1401 "renesas,rcar-gen2-sdhi"; 1402 1402 reg = <0 0xee100000 0 0x328>; ··· 1411 1411 status = "disabled"; 1412 1412 }; 1413 1413 1414 - sdhi1: sd@ee140000 { 1414 + sdhi1: mmc@ee140000 { 1415 1415 compatible = "renesas,sdhi-r8a7745", 1416 1416 "renesas,rcar-gen2-sdhi"; 1417 1417 reg = <0 0xee140000 0 0x100>; ··· 1426 1426 status = "disabled"; 1427 1427 }; 1428 1428 1429 - sdhi2: sd@ee160000 { 1429 + sdhi2: mmc@ee160000 { 1430 1430 compatible = "renesas,sdhi-r8a7745", 1431 1431 "renesas,rcar-gen2-sdhi"; 1432 1432 reg = <0 0xee160000 0 0x100>;
+3 -3
arch/arm/boot/dts/r8a77470.dtsi
··· 882 882 status = "disabled"; 883 883 }; 884 884 885 - sdhi0: sd@ee100000 { 885 + sdhi0: mmc@ee100000 { 886 886 compatible = "renesas,sdhi-r8a77470", 887 887 "renesas,rcar-gen2-sdhi"; 888 888 reg = <0 0xee100000 0 0x328>; ··· 897 897 status = "disabled"; 898 898 }; 899 899 900 - sdhi1: sd@ee300000 { 900 + sdhi1: mmc@ee300000 { 901 901 compatible = "renesas,sdhi-mmc-r8a77470"; 902 902 reg = <0 0xee300000 0 0x2000>; 903 903 interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>; ··· 908 908 status = "disabled"; 909 909 }; 910 910 911 - sdhi2: sd@ee160000 { 911 + sdhi2: mmc@ee160000 { 912 912 compatible = "renesas,sdhi-r8a77470", 913 913 "renesas,rcar-gen2-sdhi"; 914 914 reg = <0 0xee160000 0 0x328>;
+3 -3
arch/arm/boot/dts/r8a7778.dtsi
··· 401 401 status = "disabled"; 402 402 }; 403 403 404 - sdhi0: sd@ffe4c000 { 404 + sdhi0: mmc@ffe4c000 { 405 405 compatible = "renesas,sdhi-r8a7778", 406 406 "renesas,rcar-gen1-sdhi"; 407 407 reg = <0xffe4c000 0x100>; ··· 411 411 status = "disabled"; 412 412 }; 413 413 414 - sdhi1: sd@ffe4d000 { 414 + sdhi1: mmc@ffe4d000 { 415 415 compatible = "renesas,sdhi-r8a7778", 416 416 "renesas,rcar-gen1-sdhi"; 417 417 reg = <0xffe4d000 0x100>; ··· 421 421 status = "disabled"; 422 422 }; 423 423 424 - sdhi2: sd@ffe4f000 { 424 + sdhi2: mmc@ffe4f000 { 425 425 compatible = "renesas,sdhi-r8a7778", 426 426 "renesas,rcar-gen1-sdhi"; 427 427 reg = <0xffe4f000 0x100>;
+4 -4
arch/arm/boot/dts/r8a7779.dtsi
··· 385 385 status = "disabled"; 386 386 }; 387 387 388 - sdhi0: sd@ffe4c000 { 388 + sdhi0: mmc@ffe4c000 { 389 389 compatible = "renesas,sdhi-r8a7779", 390 390 "renesas,rcar-gen1-sdhi"; 391 391 reg = <0xffe4c000 0x100>; ··· 395 395 status = "disabled"; 396 396 }; 397 397 398 - sdhi1: sd@ffe4d000 { 398 + sdhi1: mmc@ffe4d000 { 399 399 compatible = "renesas,sdhi-r8a7779", 400 400 "renesas,rcar-gen1-sdhi"; 401 401 reg = <0xffe4d000 0x100>; ··· 405 405 status = "disabled"; 406 406 }; 407 407 408 - sdhi2: sd@ffe4e000 { 408 + sdhi2: mmc@ffe4e000 { 409 409 compatible = "renesas,sdhi-r8a7779", 410 410 "renesas,rcar-gen1-sdhi"; 411 411 reg = <0xffe4e000 0x100>; ··· 415 415 status = "disabled"; 416 416 }; 417 417 418 - sdhi3: sd@ffe4f000 { 418 + sdhi3: mmc@ffe4f000 { 419 419 compatible = "renesas,sdhi-r8a7779", 420 420 "renesas,rcar-gen1-sdhi"; 421 421 reg = <0xffe4f000 0x100>;
+4 -4
arch/arm/boot/dts/r8a7790.dtsi
··· 1467 1467 }; 1468 1468 }; 1469 1469 1470 - sdhi0: sd@ee100000 { 1470 + sdhi0: mmc@ee100000 { 1471 1471 compatible = "renesas,sdhi-r8a7790", 1472 1472 "renesas,rcar-gen2-sdhi"; 1473 1473 reg = <0 0xee100000 0 0x328>; ··· 1482 1482 status = "disabled"; 1483 1483 }; 1484 1484 1485 - sdhi1: sd@ee120000 { 1485 + sdhi1: mmc@ee120000 { 1486 1486 compatible = "renesas,sdhi-r8a7790", 1487 1487 "renesas,rcar-gen2-sdhi"; 1488 1488 reg = <0 0xee120000 0 0x328>; ··· 1497 1497 status = "disabled"; 1498 1498 }; 1499 1499 1500 - sdhi2: sd@ee140000 { 1500 + sdhi2: mmc@ee140000 { 1501 1501 compatible = "renesas,sdhi-r8a7790", 1502 1502 "renesas,rcar-gen2-sdhi"; 1503 1503 reg = <0 0xee140000 0 0x100>; ··· 1512 1512 status = "disabled"; 1513 1513 }; 1514 1514 1515 - sdhi3: sd@ee160000 { 1515 + sdhi3: mmc@ee160000 { 1516 1516 compatible = "renesas,sdhi-r8a7790", 1517 1517 "renesas,rcar-gen2-sdhi"; 1518 1518 reg = <0 0xee160000 0 0x100>;
+3 -3
arch/arm/boot/dts/r8a7791.dtsi
··· 1563 1563 }; 1564 1564 }; 1565 1565 1566 - sdhi0: sd@ee100000 { 1566 + sdhi0: mmc@ee100000 { 1567 1567 compatible = "renesas,sdhi-r8a7791", 1568 1568 "renesas,rcar-gen2-sdhi"; 1569 1569 reg = <0 0xee100000 0 0x328>; ··· 1578 1578 status = "disabled"; 1579 1579 }; 1580 1580 1581 - sdhi1: sd@ee140000 { 1581 + sdhi1: mmc@ee140000 { 1582 1582 compatible = "renesas,sdhi-r8a7791", 1583 1583 "renesas,rcar-gen2-sdhi"; 1584 1584 reg = <0 0xee140000 0 0x100>; ··· 1593 1593 status = "disabled"; 1594 1594 }; 1595 1595 1596 - sdhi2: sd@ee160000 { 1596 + sdhi2: mmc@ee160000 { 1597 1597 compatible = "renesas,sdhi-r8a7791", 1598 1598 "renesas,rcar-gen2-sdhi"; 1599 1599 reg = <0 0xee160000 0 0x100>;
+1 -1
arch/arm/boot/dts/r8a7792.dtsi
··· 780 780 status = "disabled"; 781 781 }; 782 782 783 - sdhi0: sd@ee100000 { 783 + sdhi0: mmc@ee100000 { 784 784 compatible = "renesas,sdhi-r8a7792", 785 785 "renesas,rcar-gen2-sdhi"; 786 786 reg = <0 0xee100000 0 0x328>;
+3 -3
arch/arm/boot/dts/r8a7793.dtsi
··· 1227 1227 dma-channels = <13>; 1228 1228 }; 1229 1229 1230 - sdhi0: sd@ee100000 { 1230 + sdhi0: mmc@ee100000 { 1231 1231 compatible = "renesas,sdhi-r8a7793", 1232 1232 "renesas,rcar-gen2-sdhi"; 1233 1233 reg = <0 0xee100000 0 0x328>; ··· 1242 1242 status = "disabled"; 1243 1243 }; 1244 1244 1245 - sdhi1: sd@ee140000 { 1245 + sdhi1: mmc@ee140000 { 1246 1246 compatible = "renesas,sdhi-r8a7793", 1247 1247 "renesas,rcar-gen2-sdhi"; 1248 1248 reg = <0 0xee140000 0 0x100>; ··· 1257 1257 status = "disabled"; 1258 1258 }; 1259 1259 1260 - sdhi2: sd@ee160000 { 1260 + sdhi2: mmc@ee160000 { 1261 1261 compatible = "renesas,sdhi-r8a7793", 1262 1262 "renesas,rcar-gen2-sdhi"; 1263 1263 reg = <0 0xee160000 0 0x100>;
+3 -3
arch/arm/boot/dts/r8a7794.dtsi
··· 1232 1232 }; 1233 1233 }; 1234 1234 1235 - sdhi0: sd@ee100000 { 1235 + sdhi0: mmc@ee100000 { 1236 1236 compatible = "renesas,sdhi-r8a7794", 1237 1237 "renesas,rcar-gen2-sdhi"; 1238 1238 reg = <0 0xee100000 0 0x328>; ··· 1247 1247 status = "disabled"; 1248 1248 }; 1249 1249 1250 - sdhi1: sd@ee140000 { 1250 + sdhi1: mmc@ee140000 { 1251 1251 compatible = "renesas,sdhi-r8a7794", 1252 1252 "renesas,rcar-gen2-sdhi"; 1253 1253 reg = <0 0xee140000 0 0x100>; ··· 1262 1262 status = "disabled"; 1263 1263 }; 1264 1264 1265 - sdhi2: sd@ee160000 { 1265 + sdhi2: mmc@ee160000 { 1266 1266 compatible = "renesas,sdhi-r8a7794", 1267 1267 "renesas,rcar-gen2-sdhi"; 1268 1268 reg = <0 0xee160000 0 0x100>;
+3 -3
arch/arm/boot/dts/sh73a0.dtsi
··· 321 321 status = "disabled"; 322 322 }; 323 323 324 - sdhi0: sd@ee100000 { 324 + sdhi0: mmc@ee100000 { 325 325 compatible = "renesas,sdhi-sh73a0"; 326 326 reg = <0xee100000 0x100>; 327 327 interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>, ··· 334 334 }; 335 335 336 336 /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */ 337 - sdhi1: sd@ee120000 { 337 + sdhi1: mmc@ee120000 { 338 338 compatible = "renesas,sdhi-sh73a0"; 339 339 reg = <0xee120000 0x100>; 340 340 interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>, ··· 346 346 status = "disabled"; 347 347 }; 348 348 349 - sdhi2: sd@ee140000 { 349 + sdhi2: mmc@ee140000 { 350 350 compatible = "renesas,sdhi-sh73a0"; 351 351 reg = <0xee140000 0x100>; 352 352 interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,