• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision41d7f6744894a464785fa4589a648f1151685978 (tree)
Time2022-07-26 15:23:54
AuthorAyan Kumar Halder <ayankuma@amd....>
CommiterMichal Simek

Log Message

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

Change Summary

Incremental Difference

--- a/arch/arm/dts/versal-mini-emmc0.dts
+++ b/arch/arm/dts/versal-mini-emmc0.dts
@@ -47,7 +47,6 @@
4747 xlnx,device_id = <0>;
4848 no-1-8-v;
4949 xlnx,mio-bank = <0>;
50- #stream-id-cells = <1>;
5150 };
5251 };
5352
--- a/arch/arm/dts/versal-mini-emmc1.dts
+++ b/arch/arm/dts/versal-mini-emmc1.dts
@@ -47,7 +47,6 @@
4747 xlnx,device_id = <1>;
4848 no-1-8-v;
4949 xlnx,mio-bank = <0>;
50- #stream-id-cells = <1>;
5150 };
5251 };
5352
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -281,7 +281,6 @@
281281 interrupts = <0 124 4>;
282282 clock-names = "clk_main", "clk_apb";
283283 xlnx,bus-width = <128>;
284- #stream-id-cells = <1>;
285284 iommus = <&smmu 0x14e8>;
286285 power-domains = <&zynqmp_firmware PD_GDMA>;
287286 #dma-cells = <1>;
@@ -295,7 +294,6 @@
295294 interrupts = <0 125 4>;
296295 clock-names = "clk_main", "clk_apb";
297296 xlnx,bus-width = <128>;
298- #stream-id-cells = <1>;
299297 iommus = <&smmu 0x14e9>;
300298 power-domains = <&zynqmp_firmware PD_GDMA>;
301299 #dma-cells = <1>;
@@ -309,7 +307,6 @@
309307 interrupts = <0 126 4>;
310308 clock-names = "clk_main", "clk_apb";
311309 xlnx,bus-width = <128>;
312- #stream-id-cells = <1>;
313310 iommus = <&smmu 0x14ea>;
314311 power-domains = <&zynqmp_firmware PD_GDMA>;
315312 #dma-cells = <1>;
@@ -323,7 +320,6 @@
323320 interrupts = <0 127 4>;
324321 clock-names = "clk_main", "clk_apb";
325322 xlnx,bus-width = <128>;
326- #stream-id-cells = <1>;
327323 iommus = <&smmu 0x14eb>;
328324 power-domains = <&zynqmp_firmware PD_GDMA>;
329325 #dma-cells = <1>;
@@ -337,7 +333,6 @@
337333 interrupts = <0 128 4>;
338334 clock-names = "clk_main", "clk_apb";
339335 xlnx,bus-width = <128>;
340- #stream-id-cells = <1>;
341336 iommus = <&smmu 0x14ec>;
342337 power-domains = <&zynqmp_firmware PD_GDMA>;
343338 #dma-cells = <1>;
@@ -351,7 +346,6 @@
351346 interrupts = <0 129 4>;
352347 clock-names = "clk_main", "clk_apb";
353348 xlnx,bus-width = <128>;
354- #stream-id-cells = <1>;
355349 iommus = <&smmu 0x14ed>;
356350 power-domains = <&zynqmp_firmware PD_GDMA>;
357351 #dma-cells = <1>;
@@ -365,7 +359,6 @@
365359 interrupts = <0 130 4>;
366360 clock-names = "clk_main", "clk_apb";
367361 xlnx,bus-width = <128>;
368- #stream-id-cells = <1>;
369362 iommus = <&smmu 0x14ee>;
370363 power-domains = <&zynqmp_firmware PD_GDMA>;
371364 #dma-cells = <1>;
@@ -379,7 +372,6 @@
379372 interrupts = <0 131 4>;
380373 clock-names = "clk_main", "clk_apb";
381374 xlnx,bus-width = <128>;
382- #stream-id-cells = <1>;
383375 iommus = <&smmu 0x14ef>;
384376 power-domains = <&zynqmp_firmware PD_GDMA>;
385377 #dma-cells = <1>;
@@ -420,7 +412,6 @@
420412 interrupts = <0 77 4>;
421413 clock-names = "clk_main", "clk_apb";
422414 xlnx,bus-width = <64>;
423- #stream-id-cells = <1>;
424415 iommus = <&smmu 0x868>;
425416 power-domains = <&zynqmp_firmware PD_ADMA>;
426417 #dma-cells = <1>;
@@ -434,7 +425,6 @@
434425 interrupts = <0 78 4>;
435426 clock-names = "clk_main", "clk_apb";
436427 xlnx,bus-width = <64>;
437- #stream-id-cells = <1>;
438428 iommus = <&smmu 0x869>;
439429 power-domains = <&zynqmp_firmware PD_ADMA>;
440430 #dma-cells = <1>;
@@ -448,7 +438,6 @@
448438 interrupts = <0 79 4>;
449439 clock-names = "clk_main", "clk_apb";
450440 xlnx,bus-width = <64>;
451- #stream-id-cells = <1>;
452441 iommus = <&smmu 0x86a>;
453442 power-domains = <&zynqmp_firmware PD_ADMA>;
454443 #dma-cells = <1>;
@@ -462,7 +451,6 @@
462451 interrupts = <0 80 4>;
463452 clock-names = "clk_main", "clk_apb";
464453 xlnx,bus-width = <64>;
465- #stream-id-cells = <1>;
466454 iommus = <&smmu 0x86b>;
467455 power-domains = <&zynqmp_firmware PD_ADMA>;
468456 #dma-cells = <1>;
@@ -476,7 +464,6 @@
476464 interrupts = <0 81 4>;
477465 clock-names = "clk_main", "clk_apb";
478466 xlnx,bus-width = <64>;
479- #stream-id-cells = <1>;
480467 iommus = <&smmu 0x86c>;
481468 power-domains = <&zynqmp_firmware PD_ADMA>;
482469 #dma-cells = <1>;
@@ -490,7 +477,6 @@
490477 interrupts = <0 82 4>;
491478 clock-names = "clk_main", "clk_apb";
492479 xlnx,bus-width = <64>;
493- #stream-id-cells = <1>;
494480 iommus = <&smmu 0x86d>;
495481 power-domains = <&zynqmp_firmware PD_ADMA>;
496482 #dma-cells = <1>;
@@ -504,7 +490,6 @@
504490 interrupts = <0 83 4>;
505491 clock-names = "clk_main", "clk_apb";
506492 xlnx,bus-width = <64>;
507- #stream-id-cells = <1>;
508493 iommus = <&smmu 0x86e>;
509494 power-domains = <&zynqmp_firmware PD_ADMA>;
510495 #dma-cells = <1>;
@@ -518,7 +503,6 @@
518503 interrupts = <0 84 4>;
519504 clock-names = "clk_main", "clk_apb";
520505 xlnx,bus-width = <64>;
521- #stream-id-cells = <1>;
522506 iommus = <&smmu 0x86f>;
523507 power-domains = <&zynqmp_firmware PD_ADMA>;
524508 #dma-cells = <1>;
@@ -540,7 +524,6 @@
540524 interrupts = <0 14 4>;
541525 #address-cells = <1>;
542526 #size-cells = <0>;
543- #stream-id-cells = <1>;
544527 iommus = <&smmu 0x872>;
545528 power-domains = <&zynqmp_firmware PD_NAND>;
546529 };
@@ -554,7 +537,6 @@
554537 clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
555538 #address-cells = <1>;
556539 #size-cells = <0>;
557- #stream-id-cells = <1>;
558540 iommus = <&smmu 0x874>;
559541 power-domains = <&zynqmp_firmware PD_ETH_0>;
560542 resets = <&zynqmp_reset ZYNQMP_RESET_GEM0>;
@@ -569,7 +551,6 @@
569551 clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
570552 #address-cells = <1>;
571553 #size-cells = <0>;
572- #stream-id-cells = <1>;
573554 iommus = <&smmu 0x875>;
574555 power-domains = <&zynqmp_firmware PD_ETH_1>;
575556 resets = <&zynqmp_reset ZYNQMP_RESET_GEM1>;
@@ -584,7 +565,6 @@
584565 clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
585566 #address-cells = <1>;
586567 #size-cells = <0>;
587- #stream-id-cells = <1>;
588568 iommus = <&smmu 0x876>;
589569 power-domains = <&zynqmp_firmware PD_ETH_2>;
590570 resets = <&zynqmp_reset ZYNQMP_RESET_GEM2>;
@@ -599,7 +579,6 @@
599579 clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
600580 #address-cells = <1>;
601581 #size-cells = <0>;
602- #stream-id-cells = <1>;
603582 iommus = <&smmu 0x877>;
604583 power-domains = <&zynqmp_firmware PD_ETH_3>;
605584 resets = <&zynqmp_reset ZYNQMP_RESET_GEM3>;
@@ -676,7 +655,6 @@
676655 <0x0 0x0 0x0 0x2 &pcie_intc 0x2>,
677656 <0x0 0x0 0x0 0x3 &pcie_intc 0x3>,
678657 <0x0 0x0 0x0 0x4 &pcie_intc 0x4>;
679- #stream-id-cells = <1>;
680658 iommus = <&smmu 0x4d0>;
681659 power-domains = <&zynqmp_firmware PD_PCIE>;
682660 pcie_intc: legacy-interrupt-controller {
@@ -698,7 +676,6 @@
698676 <0x0 0xc0000000 0x0 0x8000000>;
699677 #address-cells = <1>;
700678 #size-cells = <0>;
701- #stream-id-cells = <1>;
702679 iommus = <&smmu 0x873>;
703680 power-domains = <&zynqmp_firmware PD_QSPI>;
704681 };
@@ -730,7 +707,6 @@
730707 interrupts = <0 133 4>;
731708 power-domains = <&zynqmp_firmware PD_SATA>;
732709 resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;
733- #stream-id-cells = <4>;
734710 iommus = <&smmu 0x4c0>, <&smmu 0x4c1>,
735711 <&smmu 0x4c2>, <&smmu 0x4c3>;
736712 /* dma-coherent; */
@@ -745,7 +721,6 @@
745721 reg = <0x0 0xff160000 0x0 0x1000>;
746722 clock-names = "clk_xin", "clk_ahb";
747723 xlnx,device_id = <0>;
748- #stream-id-cells = <1>;
749724 iommus = <&smmu 0x870>;
750725 #clock-cells = <1>;
751726 clock-output-names = "clk_out_sd0", "clk_in_sd0";
@@ -762,7 +737,6 @@
762737 reg = <0x0 0xff170000 0x0 0x1000>;
763738 clock-names = "clk_xin", "clk_ahb";
764739 xlnx,device_id = <1>;
765- #stream-id-cells = <1>;
766740 iommus = <&smmu 0x871>;
767741 #clock-cells = <1>;
768742 clock-output-names = "clk_out_sd1", "clk_in_sd1";
@@ -892,7 +866,6 @@
892866 interrupt-parent = <&gic>;
893867 interrupt-names = "dwc_usb3", "otg", "hiber";
894868 interrupts = <0 65 4>, <0 69 4>, <0 75 4>;
895- #stream-id-cells = <1>;
896869 iommus = <&smmu 0x860>;
897870 snps,quirk-frame-length-adjustment = <0x20>;
898871 snps,refclk_fladj;
@@ -924,7 +897,6 @@
924897 interrupt-parent = <&gic>;
925898 interrupt-names = "dwc_usb3", "otg", "hiber";
926899 interrupts = <0 70 4>, <0 74 4>, <0 76 4>;
927- #stream-id-cells = <1>;
928900 iommus = <&smmu 0x861>;
929901 snps,quirk-frame-length-adjustment = <0x20>;
930902 snps,refclk_fladj;