From: Chaoyi Chen <chaoyi.chen@rock-chips.com>
The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of
2 clock. Their clock names might differ, but I don't think that matters
much.
Add support for them.
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
---
Changes in v2:
- Rewrite dt binding.
.../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++---
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml
index 6ce41d11ff5e..dfa5e25476d9 100644
--- a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml
+++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml
@@ -27,6 +27,8 @@ properties:
- enum:
- rockchip,rk3576-iommu
- rockchip,rk3588-iommu
+ - rockchip,rk3576-npu-iommu
+ - rockchip,rk3576-rkvdec-iommu
- const: rockchip,rk3568-iommu
reg:
@@ -42,14 +44,12 @@ properties:
minItems: 1
clocks:
- items:
- - description: Core clock
- - description: Interface clock
+ minItems: 2
+ maxItems: 4
clock-names:
- items:
- - const: aclk
- - const: iface
+ minItems: 2
+ maxItems: 4
"#iommu-cells":
const: 0
@@ -64,6 +64,46 @@ properties:
Some mmu instances may produce unexpected results
when the reset operation is used.
+allOf:
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - rockchip,rk3576-npu-iommu
+ - rockchip,rk3576-rkvdec-iommu
+ then:
+ properties:
+ clocks:
+ minItems: 4
+ clock-names:
+ minItems: 4
+ - if:
+ properties:
+ compatible:
+ items:
+ - const: rockchip,iommu
+ - const: rockchip,rk3568-iommu
+ then:
+ properties:
+ clocks:
+ maxItems: 2
+ clock-names:
+ maxItems: 2
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - rockchip,rk3576-iommu
+ - rockchip,rk3588-iommu
+ then:
+ properties:
+ clocks:
+ maxItems: 2
+ clock-names:
+ maxItems: 2
+
required:
- compatible
- reg
--
2.51.1On 28/11/2025 08:13, Chaoyi Chen wrote: > From: Chaoyi Chen <chaoyi.chen@rock-chips.com> > > The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of > 2 clock. Their clock names might differ, but I don't think that matters > much. > > Add support for them. > > Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com> > --- > > Changes in v2: > - Rewrite dt binding. > > .../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- > 1 file changed, 46 insertions(+), 6 deletions(-) > > diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml > index 6ce41d11ff5e..dfa5e25476d9 100644 > --- a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml > +++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml > @@ -27,6 +27,8 @@ properties: > - enum: > - rockchip,rk3576-iommu > - rockchip,rk3588-iommu > + - rockchip,rk3576-npu-iommu > + - rockchip,rk3576-rkvdec-iommu > - const: rockchip,rk3568-iommu > > reg: > @@ -42,14 +44,12 @@ properties: > minItems: 1 > > clocks: > - items: > - - description: Core clock > - - description: Interface clock These go to specific variant if:then. > + minItems: 2 > + maxItems: 4 > > clock-names: > - items: > - - const: aclk > - - const: iface > + minItems: 2 > + maxItems: 4 So you just allow any names, like pink-pony. No, define common list here. Actually same for clocks. > > "#iommu-cells": > const: 0 > @@ -64,6 +64,46 @@ properties: > Some mmu instances may produce unexpected results > when the reset operation is used. > > +allOf: > + - if: > + properties: > + compatible: > + contains: > + enum: > + - rockchip,rk3576-npu-iommu > + - rockchip,rk3576-rkvdec-iommu > + then: > + properties: > + clocks: > + minItems: 4 > + clock-names: > + minItems: 4 > + - if: > + properties: > + compatible: > + items: > + - const: rockchip,iommu > + - const: rockchip,rk3568-iommu > + then: > + properties: > + clocks: > + maxItems: 2 Why this is unspecific now? Please look at other examples how it is done, e.g. Samsung clocks. Best regards, Krzysztof
Hi Krzysztof, On 12/1/2025 3:55 PM, Krzysztof Kozlowski wrote: > On 28/11/2025 08:13, Chaoyi Chen wrote: >> From: Chaoyi Chen <chaoyi.chen@rock-chips.com> >> >> The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of >> 2 clock. Their clock names might differ, but I don't think that matters >> much. >> >> Add support for them. >> >> Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com> >> --- >> >> Changes in v2: >> - Rewrite dt binding. >> >> .../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- >> 1 file changed, 46 insertions(+), 6 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml >> index 6ce41d11ff5e..dfa5e25476d9 100644 >> --- a/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml >> +++ b/Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml >> @@ -27,6 +27,8 @@ properties: >> - enum: >> - rockchip,rk3576-iommu >> - rockchip,rk3588-iommu >> + - rockchip,rk3576-npu-iommu >> + - rockchip,rk3576-rkvdec-iommu >> - const: rockchip,rk3568-iommu >> >> reg: >> @@ -42,14 +44,12 @@ properties: >> minItems: 1 >> >> clocks: >> - items: >> - - description: Core clock >> - - description: Interface clock > > These go to specific variant if:then. > >> + minItems: 2 >> + maxItems: 4 >> >> clock-names: >> - items: >> - - const: aclk >> - - const: iface >> + minItems: 2 >> + maxItems: 4 > > So you just allow any names, like pink-pony. > > No, define common list here. Actually same for clocks. Will fix in v3. > >> >> "#iommu-cells": >> const: 0 >> @@ -64,6 +64,46 @@ properties: >> Some mmu instances may produce unexpected results >> when the reset operation is used. >> >> +allOf: >> + - if: >> + properties: >> + compatible: >> + contains: >> + enum: >> + - rockchip,rk3576-npu-iommu >> + - rockchip,rk3576-rkvdec-iommu >> + then: >> + properties: >> + clocks: >> + minItems: 4 >> + clock-names: >> + minItems: 4 >> + - if: >> + properties: >> + compatible: >> + items: >> + - const: rockchip,iommu >> + - const: rockchip,rk3568-iommu >> + then: >> + properties: >> + clocks: >> + maxItems: 2 > > Why this is unspecific now? Please look at other examples how it is > done, e.g. Samsung clocks. I looked at some examples. Maybe it need to set both minItems and maxItems here? I'm not sure I understood your point. > > > Best regards, > Krzysztof > > -- Best, Chaoyi
On 01/12/2025 09:10, Chaoyi Chen wrote: >>> + - if: >>> + properties: >>> + compatible: >>> + items: >>> + - const: rockchip,iommu >>> + - const: rockchip,rk3568-iommu >>> + then: >>> + properties: >>> + clocks: >>> + maxItems: 2 >> >> Why this is unspecific now? Please look at other examples how it is >> done, e.g. Samsung clocks. > > I looked at some examples. Maybe it need to set both minItems and > maxItems here? I'm not sure I understood your point. Individual items were described before. Now they are not, so first item can be anything. You need to define the list. If the devices have completely different clocks, then you would go with Samsung approach. But devices should not have completely different clocks, so you should define common parts in top-level and just narrow number of items here. maxItems is enough in such case. Best regards, Krzysztof
On 12/1/2025 4:39 PM, Krzysztof Kozlowski wrote: > On 01/12/2025 09:10, Chaoyi Chen wrote: >>>> + - if: >>>> + properties: >>>> + compatible: >>>> + items: >>>> + - const: rockchip,iommu >>>> + - const: rockchip,rk3568-iommu >>>> + then: >>>> + properties: >>>> + clocks: >>>> + maxItems: 2 >>> >>> Why this is unspecific now? Please look at other examples how it is >>> done, e.g. Samsung clocks. >> >> I looked at some examples. Maybe it need to set both minItems and >> maxItems here? I'm not sure I understood your point. > > Individual items were described before. Now they are not, so first item > can be anything. > > You need to define the list. If the devices have completely different > clocks, then you would go with Samsung approach. But devices should not > have completely different clocks, so you should define common parts in > top-level and just narrow number of items here. maxItems is enough in > such case. Ah, it looks like Samsung's clock bindings rarely have common parts. At present, there are indeed some common parts for the IOMMU clock, but I'm not sure how other variants will change. I'll give this a try, thank you! -- Best, Chaoyi
On Fri, 28 Nov 2025 15:13:21 +0800, Chaoyi Chen wrote: > From: Chaoyi Chen <chaoyi.chen@rock-chips.com> > > The iommu found on RK3576 NPU and RK3576 RKVDEC have 4 clock instead of > 2 clock. Their clock names might differ, but I don't think that matters > much. > > Add support for them. > > Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com> > --- > > Changes in v2: > - Rewrite dt binding. > > .../bindings/iommu/rockchip,iommu.yaml | 52 ++++++++++++++++--- > 1 file changed, 46 insertions(+), 6 deletions(-) > My bot found errors running 'make dt_binding_check' on your patch: yamllint warnings/errors: dtschema/dtc warnings/errors: Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c263000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2'] Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c263000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2'] Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c265000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2'] Documentation/devicetree/bindings/thermal/thermal-sensor.example.dtb: /example-0/soc/thermal-sensor@c265000: failed to match any schema with compatible: ['qcom,sdm845-tsens', 'qcom,tsens-v2'] doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20251128071322.92-2-kernel@airkyi.com The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
© 2016 - 2025 Red Hat, Inc.