aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-05-20 03:09:58 -0400
committerSimon Horman <horms+renesas@verge.net.au>2016-05-29 20:37:10 -0400
commitad53f5f00b095a0d42b65bf578eb1c1b026c5b99 (patch)
tree1cc77a5cf43f365c336ad9befc255ae2289810f6
parent6f9314ce258c8504975d96fa509763245fff287b (diff)
ARM: dts: r8a7793: Fix W=1 dtc warnings
Warning (unit_address_vs_reg): Node /cache-controller@0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,dvc/dvc@0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,dvc/dvc@1 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@1 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@2 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@3 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@4 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@5 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@6 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@7 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@8 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,src/src@9 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@0 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@1 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@2 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@3 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@4 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@5 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@6 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@7 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@8 has a unit name, but no reg property Warning (unit_address_vs_reg): Node /sound@ec500000/rcar_sound,ssi/ssi@9 has a unit name, but no reg property Move the cache-controller node under the cpus node, and make its unit name and reg property match the MPIDR values. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat
-rw-r--r--arch/arm/boot/dts/r8a7793.dtsi59
1 files changed, 30 insertions, 29 deletions
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 5f50e9b5d804..9b55c1c6ee31 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -55,6 +55,14 @@
55 < 375000 1000000>; 55 < 375000 1000000>;
56 next-level-cache = <&L2_CA15>; 56 next-level-cache = <&L2_CA15>;
57 }; 57 };
58
59 L2_CA15: cache-controller@0 {
60 compatible = "cache";
61 reg = <0>;
62 power-domains = <&sysc R8A7793_PD_CA15_SCU>;
63 cache-unified;
64 cache-level = <2>;
65 };
58 }; 66 };
59 67
60 thermal-zones { 68 thermal-zones {
@@ -76,13 +84,6 @@
76 }; 84 };
77 }; 85 };
78 86
79 L2_CA15: cache-controller@0 {
80 compatible = "cache";
81 power-domains = <&sysc R8A7793_PD_CA15_SCU>;
82 cache-unified;
83 cache-level = <2>;
84 };
85
86 gic: interrupt-controller@f1001000 { 87 gic: interrupt-controller@f1001000 {
87 compatible = "arm,gic-400"; 88 compatible = "arm,gic-400";
88 #interrupt-cells = <3>; 89 #interrupt-cells = <3>;
@@ -1369,63 +1370,63 @@
1369 status = "disabled"; 1370 status = "disabled";
1370 1371
1371 rcar_sound,dvc { 1372 rcar_sound,dvc {
1372 dvc0: dvc@0 { 1373 dvc0: dvc-0 {
1373 dmas = <&audma0 0xbc>; 1374 dmas = <&audma0 0xbc>;
1374 dma-names = "tx"; 1375 dma-names = "tx";
1375 }; 1376 };
1376 dvc1: dvc@1 { 1377 dvc1: dvc-1 {
1377 dmas = <&audma0 0xbe>; 1378 dmas = <&audma0 0xbe>;
1378 dma-names = "tx"; 1379 dma-names = "tx";
1379 }; 1380 };
1380 }; 1381 };
1381 1382
1382 rcar_sound,src { 1383 rcar_sound,src {
1383 src0: src@0 { 1384 src0: src-0 {
1384 interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>; 1385 interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
1385 dmas = <&audma0 0x85>, <&audma1 0x9a>; 1386 dmas = <&audma0 0x85>, <&audma1 0x9a>;
1386 dma-names = "rx", "tx"; 1387 dma-names = "rx", "tx";
1387 }; 1388 };
1388 src1: src@1 { 1389 src1: src-1 {
1389 interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; 1390 interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
1390 dmas = <&audma0 0x87>, <&audma1 0x9c>; 1391 dmas = <&audma0 0x87>, <&audma1 0x9c>;
1391 dma-names = "rx", "tx"; 1392 dma-names = "rx", "tx";
1392 }; 1393 };
1393 src2: src@2 { 1394 src2: src-2 {
1394 interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; 1395 interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
1395 dmas = <&audma0 0x89>, <&audma1 0x9e>; 1396 dmas = <&audma0 0x89>, <&audma1 0x9e>;
1396 dma-names = "rx", "tx"; 1397 dma-names = "rx", "tx";
1397 }; 1398 };
1398 src3: src@3 { 1399 src3: src-3 {
1399 interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; 1400 interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
1400 dmas = <&audma0 0x8b>, <&audma1 0xa0>; 1401 dmas = <&audma0 0x8b>, <&audma1 0xa0>;
1401 dma-names = "rx", "tx"; 1402 dma-names = "rx", "tx";
1402 }; 1403 };
1403 src4: src@4 { 1404 src4: src-4 {
1404 interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; 1405 interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
1405 dmas = <&audma0 0x8d>, <&audma1 0xb0>; 1406 dmas = <&audma0 0x8d>, <&audma1 0xb0>;
1406 dma-names = "rx", "tx"; 1407 dma-names = "rx", "tx";
1407 }; 1408 };
1408 src5: src@5 { 1409 src5: src-5 {
1409 interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; 1410 interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
1410 dmas = <&audma0 0x8f>, <&audma1 0xb2>; 1411 dmas = <&audma0 0x8f>, <&audma1 0xb2>;
1411 dma-names = "rx", "tx"; 1412 dma-names = "rx", "tx";
1412 }; 1413 };
1413 src6: src@6 { 1414 src6: src-6 {
1414 interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; 1415 interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
1415 dmas = <&audma0 0x91>, <&audma1 0xb4>; 1416 dmas = <&audma0 0x91>, <&audma1 0xb4>;
1416 dma-names = "rx", "tx"; 1417 dma-names = "rx", "tx";
1417 }; 1418 };
1418 src7: src@7 { 1419 src7: src-7 {
1419 interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; 1420 interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
1420 dmas = <&audma0 0x93>, <&audma1 0xb6>; 1421 dmas = <&audma0 0x93>, <&audma1 0xb6>;
1421 dma-names = "rx", "tx"; 1422 dma-names = "rx", "tx";
1422 }; 1423 };
1423 src8: src@8 { 1424 src8: src-8 {
1424 interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; 1425 interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
1425 dmas = <&audma0 0x95>, <&audma1 0xb8>; 1426 dmas = <&audma0 0x95>, <&audma1 0xb8>;
1426 dma-names = "rx", "tx"; 1427 dma-names = "rx", "tx";
1427 }; 1428 };
1428 src9: src@9 { 1429 src9: src-9 {
1429 interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>; 1430 interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
1430 dmas = <&audma0 0x97>, <&audma1 0xba>; 1431 dmas = <&audma0 0x97>, <&audma1 0xba>;
1431 dma-names = "rx", "tx"; 1432 dma-names = "rx", "tx";
@@ -1433,52 +1434,52 @@
1433 }; 1434 };
1434 1435
1435 rcar_sound,ssi { 1436 rcar_sound,ssi {
1436 ssi0: ssi@0 { 1437 ssi0: ssi-0 {
1437 interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>; 1438 interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
1438 dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; 1439 dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
1439 dma-names = "rx", "tx", "rxu", "txu"; 1440 dma-names = "rx", "tx", "rxu", "txu";
1440 }; 1441 };
1441 ssi1: ssi@1 { 1442 ssi1: ssi-1 {
1442 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>; 1443 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
1443 dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; 1444 dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
1444 dma-names = "rx", "tx", "rxu", "txu"; 1445 dma-names = "rx", "tx", "rxu", "txu";
1445 }; 1446 };
1446 ssi2: ssi@2 { 1447 ssi2: ssi-2 {
1447 interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>; 1448 interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
1448 dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; 1449 dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
1449 dma-names = "rx", "tx", "rxu", "txu"; 1450 dma-names = "rx", "tx", "rxu", "txu";
1450 }; 1451 };
1451 ssi3: ssi@3 { 1452 ssi3: ssi-3 {
1452 interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>; 1453 interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
1453 dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; 1454 dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
1454 dma-names = "rx", "tx", "rxu", "txu"; 1455 dma-names = "rx", "tx", "rxu", "txu";
1455 }; 1456 };
1456 ssi4: ssi@4 { 1457 ssi4: ssi-4 {
1457 interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>; 1458 interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
1458 dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; 1459 dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
1459 dma-names = "rx", "tx", "rxu", "txu"; 1460 dma-names = "rx", "tx", "rxu", "txu";
1460 }; 1461 };
1461 ssi5: ssi@5 { 1462 ssi5: ssi-5 {
1462 interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>; 1463 interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
1463 dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; 1464 dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
1464 dma-names = "rx", "tx", "rxu", "txu"; 1465 dma-names = "rx", "tx", "rxu", "txu";
1465 }; 1466 };
1466 ssi6: ssi@6 { 1467 ssi6: ssi-6 {
1467 interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>; 1468 interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
1468 dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; 1469 dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
1469 dma-names = "rx", "tx", "rxu", "txu"; 1470 dma-names = "rx", "tx", "rxu", "txu";
1470 }; 1471 };
1471 ssi7: ssi@7 { 1472 ssi7: ssi-7 {
1472 interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>; 1473 interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
1473 dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; 1474 dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
1474 dma-names = "rx", "tx", "rxu", "txu"; 1475 dma-names = "rx", "tx", "rxu", "txu";
1475 }; 1476 };
1476 ssi8: ssi@8 { 1477 ssi8: ssi-8 {
1477 interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>; 1478 interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
1478 dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; 1479 dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
1479 dma-names = "rx", "tx", "rxu", "txu"; 1480 dma-names = "rx", "tx", "rxu", "txu";
1480 }; 1481 };
1481 ssi9: ssi@9 { 1482 ssi9: ssi-9 {
1482 interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>; 1483 interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
1483 dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; 1484 dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
1484 dma-names = "rx", "tx", "rxu", "txu"; 1485 dma-names = "rx", "tx", "rxu", "txu";
generated by cgit v1.2.2 (git 2.25.0) at 2025-10-01 08:02:23 -0400