Merge "ARM: dts: msm: Add upstream compatible iommu-addresses property" into wlan-platform.lnx.2.0
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
2ae1df1e6e
@@ -145,20 +145,23 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&pcie0_rp {
|
&pcie0_rp {
|
||||||
#address-cells = <5>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
cnss_pci0: cnss_pci0 {
|
cnss_pci0: cnss_pci0 {
|
||||||
reg = <0 0 0 0 0>;
|
reg = <0 0 0 0 0>;
|
||||||
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
||||||
memory-region = <&cnss_wlan_mem>;
|
memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>;
|
||||||
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
|
cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition {
|
||||||
|
/* address-cells =3 size-cells=2 from sun-pcie.dtsi */
|
||||||
|
iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>,
|
||||||
|
<&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>;
|
||||||
|
};
|
||||||
|
|
||||||
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
||||||
qcom,iommu-msi-size = <0x1000>;
|
qcom,iommu-msi-size = <0x1000>;
|
||||||
qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
|
|
||||||
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
||||||
qcom,iommu-dma = "fastmap";
|
qcom,iommu-dma = "fastmap";
|
||||||
qcom,iommu-pagetable = "coherent";
|
qcom,iommu-pagetable = "coherent";
|
||||||
|
@@ -147,20 +147,23 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&pcie0_rp {
|
&pcie0_rp {
|
||||||
#address-cells = <5>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
cnss_pci0: cnss_pci0 {
|
cnss_pci0: cnss_pci0 {
|
||||||
reg = <0 0 0 0 0>;
|
reg = <0 0 0 0 0>;
|
||||||
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
||||||
memory-region = <&cnss_wlan_mem>;
|
memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>;
|
||||||
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
|
cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition {
|
||||||
|
/* address-cells =3 size-cells=2 from sun-pcie.dtsi */
|
||||||
|
iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>,
|
||||||
|
<&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>;
|
||||||
|
};
|
||||||
|
|
||||||
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
||||||
qcom,iommu-msi-size = <0x1000>;
|
qcom,iommu-msi-size = <0x1000>;
|
||||||
qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
|
|
||||||
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
||||||
qcom,iommu-dma = "fastmap";
|
qcom,iommu-dma = "fastmap";
|
||||||
qcom,iommu-pagetable = "coherent";
|
qcom,iommu-pagetable = "coherent";
|
||||||
|
@@ -146,20 +146,23 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&pcie0_rp {
|
&pcie0_rp {
|
||||||
#address-cells = <5>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
cnss_pci0: cnss_pci0 {
|
cnss_pci0: cnss_pci0 {
|
||||||
reg = <0 0 0 0 0>;
|
reg = <0 0 0 0 0>;
|
||||||
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
||||||
memory-region = <&cnss_wlan_mem>;
|
memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>;
|
||||||
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
|
cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition {
|
||||||
|
/* address-cells =3 size-cells=2 from sun-pcie.dtsi */
|
||||||
|
iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>,
|
||||||
|
<&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>;
|
||||||
|
};
|
||||||
|
|
||||||
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
||||||
qcom,iommu-msi-size = <0x1000>;
|
qcom,iommu-msi-size = <0x1000>;
|
||||||
qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
|
|
||||||
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
||||||
qcom,iommu-dma = "fastmap";
|
qcom,iommu-dma = "fastmap";
|
||||||
qcom,iommu-pagetable = "coherent";
|
qcom,iommu-pagetable = "coherent";
|
||||||
|
@@ -139,20 +139,23 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&pcie0_rp {
|
&pcie0_rp {
|
||||||
#address-cells = <5>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
cnss_pci0: cnss_pci0 {
|
cnss_pci0: cnss_pci0 {
|
||||||
reg = <0 0 0 0 0>;
|
reg = <0 0 0 0 0>;
|
||||||
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
qcom,iommu-group = <&cnss_pci_iommu_group0>;
|
||||||
memory-region = <&cnss_wlan_mem>;
|
memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>;
|
||||||
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
|
cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition {
|
||||||
|
/* address-cells =3 size-cells=2 from sun-pcie.dtsi */
|
||||||
|
iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>,
|
||||||
|
<&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>;
|
||||||
|
};
|
||||||
|
|
||||||
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
|
||||||
qcom,iommu-msi-size = <0x1000>;
|
qcom,iommu-msi-size = <0x1000>;
|
||||||
qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
|
|
||||||
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
qcom,iommu-geometry = <0xa0000000 0x10010000>;
|
||||||
qcom,iommu-dma = "fastmap";
|
qcom,iommu-dma = "fastmap";
|
||||||
qcom,iommu-pagetable = "coherent";
|
qcom,iommu-pagetable = "coherent";
|
||||||
|
Reference in New Issue
Block a user