Message ID | 20211025015156.33133-4-brad@pensando.io (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Support Pensando Elba SoC | expand |
On Sun, 24 Oct 2021 18:51:48 -0700, Brad Larson wrote: > Pensando Elba ARM 64-bit SoC is integrated with this IP and > explicitly controls byte-lane enables resulting in an additional > reg property resource. > > Signed-off-by: Brad Larson <brad@pensando.io> > --- > .../devicetree/bindings/mmc/cdns,sdhci.yaml | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: ./Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml:20:9: [warning] wrong indentation: expected 10 but found 8 (indentation) dtschema/dtc warnings/errors: doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1545481 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. 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.
On Sun, Oct 24, 2021 at 06:51:48PM -0700, Brad Larson wrote: > Pensando Elba ARM 64-bit SoC is integrated with this IP and > explicitly controls byte-lane enables resulting in an additional > reg property resource. > > Signed-off-by: Brad Larson <brad@pensando.io> > --- > .../devicetree/bindings/mmc/cdns,sdhci.yaml | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml > index af7442f73881..6c68b7b5abec 100644 > --- a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml > +++ b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml > @@ -15,13 +15,16 @@ allOf: > > properties: > compatible: > - items: > - - enum: > - - socionext,uniphier-sd4hc > - - const: cdns,sd4hc > + oneOf: > + - items: > + - enum: > + - socionext,uniphier-sd4hc > + - pensando,elba-emmc > + - const: cdns,sd4hc > > reg: > - maxItems: 1 > + minItems: 1 > + maxItems: 2 If there is more than 1, then you need to describe what each entry is. > > interrupts: > maxItems: 1 > -- > 2.17.1 > >
Hi Rob, On Mon, Oct 25, 2021 at 5:54 AM Rob Herring <robh@kernel.org> wrote: > > On Sun, 24 Oct 2021 18:51:48 -0700, Brad Larson wrote: > > Pensando Elba ARM 64-bit SoC is integrated with this IP and > > explicitly controls byte-lane enables resulting in an additional > > reg property resource. > > > > Signed-off-by: Brad Larson <brad@pensando.io> > > --- > > .../devicetree/bindings/mmc/cdns,sdhci.yaml | 13 ++++++++----- > > 1 file changed, 8 insertions(+), 5 deletions(-) > > > > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' > on your patch (DT_CHECKER_FLAGS is new in v5.13): > > yamllint warnings/errors: > ./Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml:20:9: [warning] wrong indentation: expected 10 but found 8 (indentation) > > dtschema/dtc warnings/errors: > > doc reference errors (make refcheckdocs): > > See https://patchwork.ozlabs.org/patch/1545481 > > This check can fail if there are any dependencies. The base for a patch > series is generally the most recent rc1. > > 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. > yamllint was not installed, it is now and dtschema is updated to run again before re-submit. Thanks, Brad
Hi Rob, On Tue, Oct 26, 2021 at 11:10 AM Rob Herring <robh@kernel.org> wrote: > > On Sun, Oct 24, 2021 at 06:51:48PM -0700, Brad Larson wrote: > > Pensando Elba ARM 64-bit SoC is integrated with this IP and > > explicitly controls byte-lane enables resulting in an additional > > reg property resource. > > > > Signed-off-by: Brad Larson <brad@pensando.io> > > --- > > .../devicetree/bindings/mmc/cdns,sdhci.yaml | 13 ++++++++----- > > 1 file changed, 8 insertions(+), 5 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml > > index af7442f73881..6c68b7b5abec 100644 > > --- a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml > > +++ b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml > > @@ -15,13 +15,16 @@ allOf: > > > > properties: > > compatible: > > - items: > > - - enum: > > - - socionext,uniphier-sd4hc > > - - const: cdns,sd4hc > > + oneOf: > > + - items: > > + - enum: > > + - socionext,uniphier-sd4hc > > + - pensando,elba-emmc > > + - const: cdns,sd4hc > > > > reg: > > - maxItems: 1 > > + minItems: 1 > > + maxItems: 2 > > If there is more than 1, then you need to describe what each entry is. The dtschema update and yamllint install shows the errors your bot reported. With the updated cdns,sdhci.yaml to add the description for Elba's two reg items this is what I'm getting with in 5.16.0-rc1 (next-20211116): diff --git a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml index 4207fed62dfe..c01a7283c468 100644 --- a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +++ b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml @@ -12,17 +12,44 @@ maintainers: allOf: - $ref: mmc-controller.yaml + - if: + properties: + compatible: + contains: + enum: + - socionext,uniphier-sd4hc + then: + properties: + reg: + maxItems: 1 + items: + - description: SDHCI CDNS HRS registers + - if: + properties: + compatible: + contains: + enum: + - pensando,elba-emmc + then: + properties: + reg: + maxItems: 2 + items: + - description: SDHCI CDNS HRS registers + - description: Byte lane control register properties: compatible: - items: - - enum: - - microchip,mpfs-sd4hc - - socionext,uniphier-sd4hc - - const: cdns,sd4hc + oneOf: + - items: + - enum: + - socionext,uniphier-sd4hc + - pensando,elba-emmc + - const: cdns,sd4hc reg: - maxItems: 1 + minItems: 1 + maxItems: 2 interrupts: maxItems: 1 $ make DT_CHECKER_FLAGS=-m dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml LINT Documentation/devicetree/bindings CHKDT Documentation/devicetree/bindings/processed-schema-examples.json SCHEMA Documentation/devicetree/bindings/processed-schema-examples.json ... DTEX Documentation/devicetree/bindings/mmc/cdns,sdhci.example.dts DTC Documentation/devicetree/bindings/mmc/cdns,sdhci.example.dt.yaml CHECK Documentation/devicetree/bindings/mmc/cdns,sdhci.example.dt.yaml These errors are reported for unrelated files not on DT_SCHEMA_FILES bindings/net/qcom,ipa.yaml: ignoring, error in schema: properties: qcom,smem-state-names bindings/iio/adc/st,stm32-dfsdm-adc.yaml: ignoring, error in schema: patternProperties: ^filter@[0-9]+$: properties: st,adc-channel-names bindings/interconnect/qcom,rpmh.yaml: ignoring, error in schema: properties: qcom,bcm-voter-names Thanks, Brad
Hi Rob, On Tue, Nov 16, 2021 at 5:21 PM Brad Larson <brad@pensando.io> wrote: > > properties: > compatible: > - items: > - - enum: > - - microchip,mpfs-sd4hc "microchip,mpfs-sd4hc" was inadvertently removed in moving to 5.16.0-rc1 and won't be in the re-spin of the patchset, its recently added. Also, as you mentioned the patchset should be sent against rc1 Thanks Brad
diff --git a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml index af7442f73881..6c68b7b5abec 100644 --- a/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +++ b/Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml @@ -15,13 +15,16 @@ allOf: properties: compatible: - items: - - enum: - - socionext,uniphier-sd4hc - - const: cdns,sd4hc + oneOf: + - items: + - enum: + - socionext,uniphier-sd4hc + - pensando,elba-emmc + - const: cdns,sd4hc reg: - maxItems: 1 + minItems: 1 + maxItems: 2 interrupts: maxItems: 1
Pensando Elba ARM 64-bit SoC is integrated with this IP and explicitly controls byte-lane enables resulting in an additional reg property resource. Signed-off-by: Brad Larson <brad@pensando.io> --- .../devicetree/bindings/mmc/cdns,sdhci.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)