| Message ID | 20231213224227.2191897-1-robh@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: dt-bindings: samsung,s5p-mfc: Fix iommu properties schemas | expand |
On Thu, Dec 14, 2023 at 1:42 AM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 13/12/2023 23:42, Rob Herring wrote: > > The iommus and iommu-names property schemas have several issues. First, > > 'iommus-names' in the if/then schemas is the wrong name. As all the names > > are the same, they can be defined at the top level instead. Then the > > if/then schemas just need to define how many entries. The iommus if/then > > schemas are also redundant. Best I can tell, the desire was to require 2 > > entries for "samsung,exynos5433-mfc", "samsung,mfc-v5", "samsung,mfc-v6", > > and "samsung,mfc-v8". > > > > ... > > > - iommus-names: false > > + iommu-names: false > > > > - if: > > properties: > > @@ -102,11 +104,9 @@ allOf: > > - const: aclk > > - const: aclk_xiu > > iommus: > > - maxItems: 2 > > - iommus-names: > > - items: > > - - const: left > > - - const: right > > + minItems: 2 > > + iommu-names: > > + minItems: 2 > > > > - if: > > properties: > > @@ -123,11 +123,9 @@ allOf: > > - const: mfc > > - const: sclk_mfc > > iommus: > > - maxItems: 2 > > + minItems: 2 > > iommus-names: > > Also here -> iommu-names Sigh. I got distracted with everything else that needed fixing. Rob
diff --git a/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml b/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml index 084b44582a43..a970d80692d3 100644 --- a/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml +++ b/Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml @@ -49,7 +49,9 @@ properties: iommu-names: minItems: 1 - maxItems: 2 + items: + - const: left + - const: right power-domains: maxItems: 1 @@ -84,7 +86,7 @@ allOf: - const: sclk_mfc iommus: maxItems: 1 - iommus-names: false + iommu-names: false - if: properties: @@ -102,11 +104,9 @@ allOf: - const: aclk - const: aclk_xiu iommus: - maxItems: 2 - iommus-names: - items: - - const: left - - const: right + minItems: 2 + iommu-names: + minItems: 2 - if: properties: @@ -123,11 +123,9 @@ allOf: - const: mfc - const: sclk_mfc iommus: - maxItems: 2 + minItems: 2 iommus-names: - items: - - const: left - - const: right + minItems: 2 - if: properties: @@ -144,11 +142,9 @@ allOf: items: - const: mfc iommus: - maxItems: 2 + minItems: 2 iommus-names: - items: - - const: left - - const: right + minItems: 2 - if: properties: @@ -161,9 +157,6 @@ allOf: clocks: minItems: 1 maxItems: 2 - iommus: - minItems: 1 - maxItems: 2 examples: - |
The iommus and iommu-names property schemas have several issues. First, 'iommus-names' in the if/then schemas is the wrong name. As all the names are the same, they can be defined at the top level instead. Then the if/then schemas just need to define how many entries. The iommus if/then schemas are also redundant. Best I can tell, the desire was to require 2 entries for "samsung,exynos5433-mfc", "samsung,mfc-v5", "samsung,mfc-v6", and "samsung,mfc-v8". Signed-off-by: Rob Herring <robh@kernel.org> --- .../bindings/media/samsung,s5p-mfc.yaml | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-)