| Message ID | 20230411121533.22454-1-manivannan.sadhasivam@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Revert "dt-bindings: PCI: qcom: Add iommu-map properties" | expand |
On Wed, Apr 12, 2023 at 03:27:24PM +0200, Lorenzo Pieralisi wrote: > On Wed, Apr 12, 2023 at 04:59:18PM +0530, Manivannan Sadhasivam wrote: > > [...] > > > > > This is fine. The plan is to remove the "iommus" property from Qcom PCI binding > > > > since we have removed the usage of that property from devicetree [1]. Initially > > > > the iommu properties were not documented at all in the binding. But commit, > > > > "dt-bindings: PCI: qcom: Add SM8550 compatible" added them to the binding to > > > > satisfy dtbs check. But in parallel, the patch removing "iommus" property from > > > > dts got merged to qcom tree. > > > > > > > > So now we have 2 options here: > > > > > > > > 1. Amend the commit "dt-bindings: PCI: qcom: Add SM8550 compatible" to remove > > > > the "iommus" property. > > > > > > > > 2. I will submit a separate patch removing that property. > > > > > > > > Lorenzo, let me know what works for you. Sorry for the mess! Confusion happened > > > > due to patches getting applied without sync. > > > > > > You can inline a diff here for (1), I will amend the commit. > > > > > > > Here you go: > > > > diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml > > index a1318a4ecadf..1548a7114732 100644 > > --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml > > +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml > > @@ -60,9 +60,6 @@ properties: > > minItems: 1 > > maxItems: 8 > > > > - iommus: > > - maxItems: 1 > > - > > iommu-map: > > maxItems: 2 > > Done, please check, thanks. > LGTM, thanks! - Mani > Lorenzo
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml index 5d236bac99b6..a1318a4ecadf 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml @@ -78,8 +78,6 @@ properties: dma-coherent: true - iommu-map: true - interconnects: maxItems: 2
This reverts commit 6ebfa40b63ae65eac20834ef4f45355fc5ef6899. "iommu-map" property is already documented in commit ("dt-bindings: PCI: qcom: Add SM8550 compatible") along with the "iommus" property. So let's revert the commit that just added "iommu-map" to avoid duplication. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 -- 1 file changed, 2 deletions(-)