From: Bartosz Golaszewski <[email protected]>
The GPU SMMU will require the clocks property to be set so put the
relevant compatible into the adreno if-then block.
Signed-off-by: Bartosz Golaszewski <[email protected]>
Acked-by: Krzysztof Kozlowski <[email protected]>
---
Resending with all IOMMU maintainers in CC.
Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
index ba677d401e24..53bed0160be8 100644
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
@@ -79,6 +79,7 @@ properties:
- description: Qcom Adreno GPUs implementing "qcom,smmu-500" and "arm,mmu-500"
items:
- enum:
+ - qcom,sa8775p-smmu-500
- qcom,sc7280-smmu-500
- qcom,sm6115-smmu-500
- qcom,sm6125-smmu-500
@@ -331,7 +332,9 @@ allOf:
properties:
compatible:
contains:
- const: qcom,sc7280-smmu-500
+ enum:
+ - qcom,sa8775p-smmu-500
+ - qcom,sc7280-smmu-500
then:
properties:
clock-names:
@@ -413,7 +416,6 @@ allOf:
- nvidia,smmu-500
- qcom,qcm2290-smmu-500
- qcom,qdu1000-smmu-500
- - qcom,sa8775p-smmu-500
- qcom,sc7180-smmu-500
- qcom,sc8180x-smmu-500
- qcom,sc8280xp-smmu-500
--
2.39.2
On Tue, May 30, 2023 at 04:49:31PM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[email protected]>
>
> The GPU SMMU will require the clocks property to be set so put the
> relevant compatible into the adreno if-then block.
>
> Signed-off-by: Bartosz Golaszewski <[email protected]>
> Acked-by: Krzysztof Kozlowski <[email protected]>
> ---
> Resending with all IOMMU maintainers in CC.
I've picked up the earlier version (which is the same patch). There was
a trivial conflict with a similar change allowing clocks for the
'qcom,sc8280xp-smmu-500' device, so please check when I push out the
updated branch.
Will
On Mon, Jun 5, 2023 at 5:39 PM Will Deacon <[email protected]> wrote:
>
> On Tue, May 30, 2023 at 04:49:31PM +0200, Bartosz Golaszewski wrote:
> > From: Bartosz Golaszewski <[email protected]>
> >
> > The GPU SMMU will require the clocks property to be set so put the
> > relevant compatible into the adreno if-then block.
> >
> > Signed-off-by: Bartosz Golaszewski <[email protected]>
> > Acked-by: Krzysztof Kozlowski <[email protected]>
> > ---
> > Resending with all IOMMU maintainers in CC.
>
> I've picked up the earlier version (which is the same patch). There was
> a trivial conflict with a similar change allowing clocks for the
> 'qcom,sc8280xp-smmu-500' device, so please check when I push out the
> updated branch.
>
Looks good, thanks!
Bart