Merge "Revert "ARM: dts: msm: Add MHI nodes for waipio endpoint""

This commit is contained in:
qctecmdr
2021-11-05 02:33:37 -07:00
committed by Gerrit - the friendly Code Review server
3 changed files with 1 additions and 59 deletions

View File

@@ -1,41 +0,0 @@
&pcie1 {
qcom,no-l1ss-supported;
};
&pcie1_rp {
#address-cells = <5>;
#size-cells = <0>;
mhi_0: qcom,mhi@0 {
reg = <0 0 0 0 0 >;
pci-ids = "17cb:0111";
/* controller specific configuration */
qcom,iommu-group = <&mhi_0_iommu_group>;
/* mhi bus specific settings */
mhi,max-channels = <2>;
mhi,timeout = <2000>;
mhi,name = "sxr";
#address-cells = <1>;
#size-cells = <1>;
interconnects = <&pcie_noc MASTER_PCIE_1 &mc_virt SLAVE_EBI1>;
interconnect-names = "pcie_to_ddr";
qcom,mhi-bus-bw-cfg = <0 0>, /* no vote */
<250000 0>, /* avg bw / AB: 2 GBps, peak bw / IB: no vote */
<500000 0>, /* avg bw / AB: 4 GBps, peak bw / IB: no vote */
<1000000 0>, /* avg bw / AB: 8 GBps, peak bw / IB: no vote */
<2000000 0>; /* avg bw / AB: 16 GBps, peak bw / IB: no vote */
mhi_0_iommu_group: mhi_0_iommu_group {
qcom,iommu-dma-addr-pool = <0x20000000 0x1fffffff>;
qcom,iommu-dma = "atomic";
qcom,iommu-pagetable = "coherent";
};
};
};

View File

@@ -653,7 +653,7 @@
interconnects = <&pcie_noc MASTER_PCIE_1 &mc_virt SLAVE_EBI1>;
qcom,pcie-vendor-id = /bits/ 16 <0x17cb>;
qcom,pcie-device-id = /bits/ 16 <0x0111>;
qcom,pcie-device-id = /bits/ 16 <0x0110>;
qcom,tcsr-not-supported;
qcom,pcie-aggregated-irq;
qcom,pcie-mhi-a7-irq;
@@ -805,20 +805,4 @@
status = "disabled";
};
mhi_device: mhi_dev@01c0b000 {
compatible = "qcom,msm-mhi-dev";
reg = <0x1c0b000 0x1000>;
reg-names = "mhi_mmio_base";
qcom,mhi-ep-msi = <0>;
qcom,mhi-version = <0x1000000>;
qcom,use-pcie-edma;
dmas = <&pcie1_edma 0 0>, <&pcie1_edma 1 0>;
dma-names = "tx", "rx";
interrupts = <0 440 0>;
interrupt-names = "mhi-device-inta";
qcom,mhi-ifc-id = <0x011117cb>;
qcom,mhi-interrupt;
status = "disabled";
};
};

View File

@@ -3222,7 +3222,6 @@
#include "waipio-debug.dtsi"
#include "waipio-eva.dtsi"
#include "waipio-pcie.dtsi"
#include "waipio-mhi.dtsi"
#include "msm-rdbg.dtsi"
#include "waipio-gpu.dtsi"
#include "waipio-thermal.dtsi"