| Message ID | 20200609194030.17756-1-jonathan@marek.ca |
|---|---|
| Headers | show |
| Series | arm64: dts: qcom: smmu/USB nodes and HDK855/HDK865 dts | expand |
On Tue, 09 Jun 2020 15:40:19 -0400, Jonathan Marek wrote: > Add compatible strings for sm8150 and sm8250 iommus to documentation. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 2 ++ > 1 file changed, 2 insertions(+) > Acked-by: Rob Herring <robh@kernel.org>
On 2020-06-09 20:40, Jonathan Marek wrote: > Use the qcom implementation for IOMMU hardware on sm8150 and sm8250 SoCs. Given a promise that anyone who wants to add more of these in future converts it into an of_device_id table exported from arm-smmu-qcom, Reviewed-by Robin Murphy <robin.murphy@arm.com> > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > drivers/iommu/arm-smmu-impl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/arm-smmu-impl.c b/drivers/iommu/arm-smmu-impl.c > index c75b9d957b70..f5f6cab626be 100644 > --- a/drivers/iommu/arm-smmu-impl.c > +++ b/drivers/iommu/arm-smmu-impl.c > @@ -172,7 +172,9 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) > smmu->impl = &calxeda_impl; > > if (of_device_is_compatible(np, "qcom,sdm845-smmu-500") || > - of_device_is_compatible(np, "qcom,sc7180-smmu-500")) > + of_device_is_compatible(np, "qcom,sc7180-smmu-500") || > + of_device_is_compatible(np, "qcom,sm8150-smmu-500") || > + of_device_is_compatible(np, "qcom,sm8250-smmu-500")) > return qcom_smmu_impl_init(smmu); > > return smmu; >
On Tue 09 Jun 12:40 PDT 2020, Jonathan Marek wrote: > Use the qcom implementation for IOMMU hardware on sm8150 and sm8250 SoCs. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > drivers/iommu/arm-smmu-impl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/arm-smmu-impl.c b/drivers/iommu/arm-smmu-impl.c > index c75b9d957b70..f5f6cab626be 100644 > --- a/drivers/iommu/arm-smmu-impl.c > +++ b/drivers/iommu/arm-smmu-impl.c > @@ -172,7 +172,9 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) > smmu->impl = &calxeda_impl; > > if (of_device_is_compatible(np, "qcom,sdm845-smmu-500") || > - of_device_is_compatible(np, "qcom,sc7180-smmu-500")) > + of_device_is_compatible(np, "qcom,sc7180-smmu-500") || > + of_device_is_compatible(np, "qcom,sm8150-smmu-500") || > + of_device_is_compatible(np, "qcom,sm8250-smmu-500")) > return qcom_smmu_impl_init(smmu); > > return smmu; > -- > 2.26.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Fri 03 Jul 05:31 PDT 2020, Will Deacon wrote: > On Tue, Jun 09, 2020 at 03:40:18PM -0400, Jonathan Marek wrote: > > Add dts nodes for apps_smmu and USB for both sm8150 and sm8250. > > > > Also add initial dts files for HDK855 and HDK865, based on mtp dts, with a > > few changes. Notably, the HDK865 dts has regulator config changed a bit based > > on downstream (I think sm8250-mtp.dts is wrong and copied too much from sm8150). > > > > V2 changes: > > * Added two patches for sm8150 and sm8250 iommu compatibles > > * Changed apps_smmu node patches to use new compatibles > > * Updated commit messages for apps_smmu patches to be more correct > > * Updated HDK dts patches based on Bjorn's comments > > > > Jonathan Marek (8): > > dt-bindings: arm-smmu: Add sm8150 and sm8250 compatible strings > > iommu: arm-smmu-impl: Use qcom impl for sm8150 and sm8250 compatibles > > arm64: dts: qcom: sm8150: add apps_smmu node > > arm64: dts: qcom: sm8250: add apps_smmu node > > arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes > > arm64: dts: qcom: sm8250: Add USB and PHY device nodes > > arm64: dts: qcom: add sm8150 hdk dts > > arm64: dts: qcom: add sm8250 hdk dts > > What's your plan for merging this? I can take the first two patches > via arm-smmu, if you like. Please just let me know. > Please pick up the binding and driver patch through your tree. Regards, Bjorn
On Tue, 9 Jun 2020 15:40:18 -0400, Jonathan Marek wrote: > Add dts nodes for apps_smmu and USB for both sm8150 and sm8250. > > Also add initial dts files for HDK855 and HDK865, based on mtp dts, with a > few changes. Notably, the HDK865 dts has regulator config changed a bit based > on downstream (I think sm8250-mtp.dts is wrong and copied too much from sm8150). > > V2 changes: > * Added two patches for sm8150 and sm8250 iommu compatibles > * Changed apps_smmu node patches to use new compatibles > * Updated commit messages for apps_smmu patches to be more correct > * Updated HDK dts patches based on Bjorn's comments > > [...] Applied to will (for-joerg/arm-smmu/updates), thanks! [1/2] dt-bindings: arm-smmu: Add sm8150 and sm8250 compatible strings https://git.kernel.org/will/c/7b6b70d88b10 [2/2] iommu: arm-smmu-impl: Use qcom impl for sm8150 and sm8250 compatibles https://git.kernel.org/will/c/2c5c3cfb2da5 Cheers, -- Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev