Revision | 41d7f6744894a464785fa4589a648f1151685978 (tree) |
---|---|
Time | 2022-07-26 15:23:54 |
Author | Ayan Kumar Halder <ayankuma@amd....> |
Commiter | Michal Simek |
xilinx: Remove the legacy property "#stream-id-cells"
"#stream-id-cells" was being used with "mmu-masters" for Xen specific
device trees.
With Xen commit 2278d2cbb0b7c1b48b298c6c4c6a7de2271ac928 (Link below)
Xen is able to support smmu bindings in both formats ie :
1. Using iommus (linux format)
2. Using mmu-masters (legacy format).
Thus, "#stream-id-cells" which was used for the legacy format, can be
removed as Xen can use smmu bindings in linux format.
Link: https://www.mail-archive.com/xen-devel@lists.xenproject.org/msg101649.html
Signed-off-by: Ayan Kumar Halder <ayankuma@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/1e062acb233dee47cd7dd2429cb482132617cbc8.1655886415.git.michal.simek@amd.com
@@ -47,7 +47,6 @@ | ||
47 | 47 | xlnx,device_id = <0>; |
48 | 48 | no-1-8-v; |
49 | 49 | xlnx,mio-bank = <0>; |
50 | - #stream-id-cells = <1>; | |
51 | 50 | }; |
52 | 51 | }; |
53 | 52 |
@@ -47,7 +47,6 @@ | ||
47 | 47 | xlnx,device_id = <1>; |
48 | 48 | no-1-8-v; |
49 | 49 | xlnx,mio-bank = <0>; |
50 | - #stream-id-cells = <1>; | |
51 | 50 | }; |
52 | 51 | }; |
53 | 52 |
@@ -281,7 +281,6 @@ | ||
281 | 281 | interrupts = <0 124 4>; |
282 | 282 | clock-names = "clk_main", "clk_apb"; |
283 | 283 | xlnx,bus-width = <128>; |
284 | - #stream-id-cells = <1>; | |
285 | 284 | iommus = <&smmu 0x14e8>; |
286 | 285 | power-domains = <&zynqmp_firmware PD_GDMA>; |
287 | 286 | #dma-cells = <1>; |
@@ -295,7 +294,6 @@ | ||
295 | 294 | interrupts = <0 125 4>; |
296 | 295 | clock-names = "clk_main", "clk_apb"; |
297 | 296 | xlnx,bus-width = <128>; |
298 | - #stream-id-cells = <1>; | |
299 | 297 | iommus = <&smmu 0x14e9>; |
300 | 298 | power-domains = <&zynqmp_firmware PD_GDMA>; |
301 | 299 | #dma-cells = <1>; |
@@ -309,7 +307,6 @@ | ||
309 | 307 | interrupts = <0 126 4>; |
310 | 308 | clock-names = "clk_main", "clk_apb"; |
311 | 309 | xlnx,bus-width = <128>; |
312 | - #stream-id-cells = <1>; | |
313 | 310 | iommus = <&smmu 0x14ea>; |
314 | 311 | power-domains = <&zynqmp_firmware PD_GDMA>; |
315 | 312 | #dma-cells = <1>; |
@@ -323,7 +320,6 @@ | ||
323 | 320 | interrupts = <0 127 4>; |
324 | 321 | clock-names = "clk_main", "clk_apb"; |
325 | 322 | xlnx,bus-width = <128>; |
326 | - #stream-id-cells = <1>; | |
327 | 323 | iommus = <&smmu 0x14eb>; |
328 | 324 | power-domains = <&zynqmp_firmware PD_GDMA>; |
329 | 325 | #dma-cells = <1>; |
@@ -337,7 +333,6 @@ | ||
337 | 333 | interrupts = <0 128 4>; |
338 | 334 | clock-names = "clk_main", "clk_apb"; |
339 | 335 | xlnx,bus-width = <128>; |
340 | - #stream-id-cells = <1>; | |
341 | 336 | iommus = <&smmu 0x14ec>; |
342 | 337 | power-domains = <&zynqmp_firmware PD_GDMA>; |
343 | 338 | #dma-cells = <1>; |
@@ -351,7 +346,6 @@ | ||
351 | 346 | interrupts = <0 129 4>; |
352 | 347 | clock-names = "clk_main", "clk_apb"; |
353 | 348 | xlnx,bus-width = <128>; |
354 | - #stream-id-cells = <1>; | |
355 | 349 | iommus = <&smmu 0x14ed>; |
356 | 350 | power-domains = <&zynqmp_firmware PD_GDMA>; |
357 | 351 | #dma-cells = <1>; |
@@ -365,7 +359,6 @@ | ||
365 | 359 | interrupts = <0 130 4>; |
366 | 360 | clock-names = "clk_main", "clk_apb"; |
367 | 361 | xlnx,bus-width = <128>; |
368 | - #stream-id-cells = <1>; | |
369 | 362 | iommus = <&smmu 0x14ee>; |
370 | 363 | power-domains = <&zynqmp_firmware PD_GDMA>; |
371 | 364 | #dma-cells = <1>; |
@@ -379,7 +372,6 @@ | ||
379 | 372 | interrupts = <0 131 4>; |
380 | 373 | clock-names = "clk_main", "clk_apb"; |
381 | 374 | xlnx,bus-width = <128>; |
382 | - #stream-id-cells = <1>; | |
383 | 375 | iommus = <&smmu 0x14ef>; |
384 | 376 | power-domains = <&zynqmp_firmware PD_GDMA>; |
385 | 377 | #dma-cells = <1>; |
@@ -420,7 +412,6 @@ | ||
420 | 412 | interrupts = <0 77 4>; |
421 | 413 | clock-names = "clk_main", "clk_apb"; |
422 | 414 | xlnx,bus-width = <64>; |
423 | - #stream-id-cells = <1>; | |
424 | 415 | iommus = <&smmu 0x868>; |
425 | 416 | power-domains = <&zynqmp_firmware PD_ADMA>; |
426 | 417 | #dma-cells = <1>; |
@@ -434,7 +425,6 @@ | ||
434 | 425 | interrupts = <0 78 4>; |
435 | 426 | clock-names = "clk_main", "clk_apb"; |
436 | 427 | xlnx,bus-width = <64>; |
437 | - #stream-id-cells = <1>; | |
438 | 428 | iommus = <&smmu 0x869>; |
439 | 429 | power-domains = <&zynqmp_firmware PD_ADMA>; |
440 | 430 | #dma-cells = <1>; |
@@ -448,7 +438,6 @@ | ||
448 | 438 | interrupts = <0 79 4>; |
449 | 439 | clock-names = "clk_main", "clk_apb"; |
450 | 440 | xlnx,bus-width = <64>; |
451 | - #stream-id-cells = <1>; | |
452 | 441 | iommus = <&smmu 0x86a>; |
453 | 442 | power-domains = <&zynqmp_firmware PD_ADMA>; |
454 | 443 | #dma-cells = <1>; |
@@ -462,7 +451,6 @@ | ||
462 | 451 | interrupts = <0 80 4>; |
463 | 452 | clock-names = "clk_main", "clk_apb"; |
464 | 453 | xlnx,bus-width = <64>; |
465 | - #stream-id-cells = <1>; | |
466 | 454 | iommus = <&smmu 0x86b>; |
467 | 455 | power-domains = <&zynqmp_firmware PD_ADMA>; |
468 | 456 | #dma-cells = <1>; |
@@ -476,7 +464,6 @@ | ||
476 | 464 | interrupts = <0 81 4>; |
477 | 465 | clock-names = "clk_main", "clk_apb"; |
478 | 466 | xlnx,bus-width = <64>; |
479 | - #stream-id-cells = <1>; | |
480 | 467 | iommus = <&smmu 0x86c>; |
481 | 468 | power-domains = <&zynqmp_firmware PD_ADMA>; |
482 | 469 | #dma-cells = <1>; |
@@ -490,7 +477,6 @@ | ||
490 | 477 | interrupts = <0 82 4>; |
491 | 478 | clock-names = "clk_main", "clk_apb"; |
492 | 479 | xlnx,bus-width = <64>; |
493 | - #stream-id-cells = <1>; | |
494 | 480 | iommus = <&smmu 0x86d>; |
495 | 481 | power-domains = <&zynqmp_firmware PD_ADMA>; |
496 | 482 | #dma-cells = <1>; |
@@ -504,7 +490,6 @@ | ||
504 | 490 | interrupts = <0 83 4>; |
505 | 491 | clock-names = "clk_main", "clk_apb"; |
506 | 492 | xlnx,bus-width = <64>; |
507 | - #stream-id-cells = <1>; | |
508 | 493 | iommus = <&smmu 0x86e>; |
509 | 494 | power-domains = <&zynqmp_firmware PD_ADMA>; |
510 | 495 | #dma-cells = <1>; |
@@ -518,7 +503,6 @@ | ||
518 | 503 | interrupts = <0 84 4>; |
519 | 504 | clock-names = "clk_main", "clk_apb"; |
520 | 505 | xlnx,bus-width = <64>; |
521 | - #stream-id-cells = <1>; | |
522 | 506 | iommus = <&smmu 0x86f>; |
523 | 507 | power-domains = <&zynqmp_firmware PD_ADMA>; |
524 | 508 | #dma-cells = <1>; |
@@ -540,7 +524,6 @@ | ||
540 | 524 | interrupts = <0 14 4>; |
541 | 525 | #address-cells = <1>; |
542 | 526 | #size-cells = <0>; |
543 | - #stream-id-cells = <1>; | |
544 | 527 | iommus = <&smmu 0x872>; |
545 | 528 | power-domains = <&zynqmp_firmware PD_NAND>; |
546 | 529 | }; |
@@ -554,7 +537,6 @@ | ||
554 | 537 | clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk"; |
555 | 538 | #address-cells = <1>; |
556 | 539 | #size-cells = <0>; |
557 | - #stream-id-cells = <1>; | |
558 | 540 | iommus = <&smmu 0x874>; |
559 | 541 | power-domains = <&zynqmp_firmware PD_ETH_0>; |
560 | 542 | resets = <&zynqmp_reset ZYNQMP_RESET_GEM0>; |
@@ -569,7 +551,6 @@ | ||
569 | 551 | clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk"; |
570 | 552 | #address-cells = <1>; |
571 | 553 | #size-cells = <0>; |
572 | - #stream-id-cells = <1>; | |
573 | 554 | iommus = <&smmu 0x875>; |
574 | 555 | power-domains = <&zynqmp_firmware PD_ETH_1>; |
575 | 556 | resets = <&zynqmp_reset ZYNQMP_RESET_GEM1>; |
@@ -584,7 +565,6 @@ | ||
584 | 565 | clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk"; |
585 | 566 | #address-cells = <1>; |
586 | 567 | #size-cells = <0>; |
587 | - #stream-id-cells = <1>; | |
588 | 568 | iommus = <&smmu 0x876>; |
589 | 569 | power-domains = <&zynqmp_firmware PD_ETH_2>; |
590 | 570 | resets = <&zynqmp_reset ZYNQMP_RESET_GEM2>; |
@@ -599,7 +579,6 @@ | ||
599 | 579 | clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk"; |
600 | 580 | #address-cells = <1>; |
601 | 581 | #size-cells = <0>; |
602 | - #stream-id-cells = <1>; | |
603 | 582 | iommus = <&smmu 0x877>; |
604 | 583 | power-domains = <&zynqmp_firmware PD_ETH_3>; |
605 | 584 | resets = <&zynqmp_reset ZYNQMP_RESET_GEM3>; |
@@ -676,7 +655,6 @@ | ||
676 | 655 | <0x0 0x0 0x0 0x2 &pcie_intc 0x2>, |
677 | 656 | <0x0 0x0 0x0 0x3 &pcie_intc 0x3>, |
678 | 657 | <0x0 0x0 0x0 0x4 &pcie_intc 0x4>; |
679 | - #stream-id-cells = <1>; | |
680 | 658 | iommus = <&smmu 0x4d0>; |
681 | 659 | power-domains = <&zynqmp_firmware PD_PCIE>; |
682 | 660 | pcie_intc: legacy-interrupt-controller { |
@@ -698,7 +676,6 @@ | ||
698 | 676 | <0x0 0xc0000000 0x0 0x8000000>; |
699 | 677 | #address-cells = <1>; |
700 | 678 | #size-cells = <0>; |
701 | - #stream-id-cells = <1>; | |
702 | 679 | iommus = <&smmu 0x873>; |
703 | 680 | power-domains = <&zynqmp_firmware PD_QSPI>; |
704 | 681 | }; |
@@ -730,7 +707,6 @@ | ||
730 | 707 | interrupts = <0 133 4>; |
731 | 708 | power-domains = <&zynqmp_firmware PD_SATA>; |
732 | 709 | resets = <&zynqmp_reset ZYNQMP_RESET_SATA>; |
733 | - #stream-id-cells = <4>; | |
734 | 710 | iommus = <&smmu 0x4c0>, <&smmu 0x4c1>, |
735 | 711 | <&smmu 0x4c2>, <&smmu 0x4c3>; |
736 | 712 | /* dma-coherent; */ |
@@ -745,7 +721,6 @@ | ||
745 | 721 | reg = <0x0 0xff160000 0x0 0x1000>; |
746 | 722 | clock-names = "clk_xin", "clk_ahb"; |
747 | 723 | xlnx,device_id = <0>; |
748 | - #stream-id-cells = <1>; | |
749 | 724 | iommus = <&smmu 0x870>; |
750 | 725 | #clock-cells = <1>; |
751 | 726 | clock-output-names = "clk_out_sd0", "clk_in_sd0"; |
@@ -762,7 +737,6 @@ | ||
762 | 737 | reg = <0x0 0xff170000 0x0 0x1000>; |
763 | 738 | clock-names = "clk_xin", "clk_ahb"; |
764 | 739 | xlnx,device_id = <1>; |
765 | - #stream-id-cells = <1>; | |
766 | 740 | iommus = <&smmu 0x871>; |
767 | 741 | #clock-cells = <1>; |
768 | 742 | clock-output-names = "clk_out_sd1", "clk_in_sd1"; |
@@ -892,7 +866,6 @@ | ||
892 | 866 | interrupt-parent = <&gic>; |
893 | 867 | interrupt-names = "dwc_usb3", "otg", "hiber"; |
894 | 868 | interrupts = <0 65 4>, <0 69 4>, <0 75 4>; |
895 | - #stream-id-cells = <1>; | |
896 | 869 | iommus = <&smmu 0x860>; |
897 | 870 | snps,quirk-frame-length-adjustment = <0x20>; |
898 | 871 | snps,refclk_fladj; |
@@ -924,7 +897,6 @@ | ||
924 | 897 | interrupt-parent = <&gic>; |
925 | 898 | interrupt-names = "dwc_usb3", "otg", "hiber"; |
926 | 899 | interrupts = <0 70 4>, <0 74 4>, <0 76 4>; |
927 | - #stream-id-cells = <1>; | |
928 | 900 | iommus = <&smmu 0x861>; |
929 | 901 | snps,quirk-frame-length-adjustment = <0x20>; |
930 | 902 | snps,refclk_fladj; |