[PATCH 1/2] dt-bindings: mmc: brcm,sdhci-brcmstb: correct number of reg entries

[PATCH 1/2] dt-bindings: mmc: brcm,sdhci-brcmstb: correct number of reg entries

[Krzysztof Kozlowski]

The binding should not allow infinite number of 'reg' entries, so add
strict limit.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
index dccd5ad96981..54a0edab5f8c 100644
--- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
+++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
@@ -31,7 +31,7 @@ properties:
           - const: brcm,sdhci-brcmstb
 
   reg:
-    minItems: 2
+    maxItems: 2
 
   reg-names:
     items:
-- 
2.32.0

[PATCH 2/2] dt-bindings: mmc: brcm,sdhci-brcmstb: cleanup example

[Krzysztof Kozlowski]

Cleanup indentation and order of entries in example DTS.  The most
important when reading the DTS are compatible and reg.  By convention
they are usually to first entries.  No functional change.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../bindings/mmc/brcm,sdhci-brcmstb.yaml       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
index 54a0edab5f8c..b672202fff4e 100644
--- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
+++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
@@ -65,15 +65,15 @@ unevaluatedProperties: false
 examples:
   - |
     mmc@84b0000 {
-      sd-uhs-sdr50;
-      sd-uhs-ddr50;
-      sd-uhs-sdr104;
-      sdhci,auto-cmd12;
       compatible = "brcm,bcm7216-sdhci",
                    "brcm,bcm7445-sdhci",
                    "brcm,sdhci-brcmstb";
       reg = <0x84b0000 0x260>, <0x84b0300 0x200>;
       reg-names = "host", "cfg";
+      sd-uhs-sdr50;
+      sd-uhs-ddr50;
+      sd-uhs-sdr104;
+      sdhci,auto-cmd12;
       interrupts = <0x0 0x26 0x4>;
       interrupt-names = "sdio0_0";
       clocks = <&scmi_clk 245>;
@@ -81,6 +81,11 @@ examples:
     };
 
     mmc@84b1000 {
+      compatible = "brcm,bcm7216-sdhci",
+                   "brcm,bcm7445-sdhci",
+                   "brcm,sdhci-brcmstb";
+      reg = <0x84b1000 0x260>, <0x84b1300 0x200>;
+      reg-names = "host", "cfg";
       mmc-ddr-1_8v;
       mmc-hs200-1_8v;
       mmc-hs400-1_8v;
@@ -88,11 +93,6 @@ examples:
       supports-cqe;
       non-removable;
       bus-width = <0x8>;
-      compatible = "brcm,bcm7216-sdhci",
-           "brcm,bcm7445-sdhci",
-            "brcm,sdhci-brcmstb";
-      reg = <0x84b1000 0x260>, <0x84b1300 0x200>;
-      reg-names = "host", "cfg";
       interrupts = <0x0 0x27 0x4>;
       interrupt-names = "sdio1_0";
       clocks = <&scmi_clk 245>;
-- 
2.32.0

Re: [PATCH 1/2] dt-bindings: mmc: brcm,sdhci-brcmstb: correct number of reg entries

[Florian Fainelli]

On 4/28/2022 1:18 AM, Krzysztof Kozlowski wrote:
> The binding should not allow infinite number of 'reg' entries, so add
> strict limit.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Given Kamal's patch series:

https://lore.kernel.org/linux-devicetree/20220427180853.35970-1-kdasu.kdev@gmail.com/

we should probably merge those via Ulf's mmc tree to avoid conflicts.
-- 
Florian

Re: [PATCH 2/2] dt-bindings: mmc: brcm,sdhci-brcmstb: cleanup example

[Florian Fainelli]

On 4/28/2022 1:18 AM, Krzysztof Kozlowski wrote:
> Cleanup indentation and order of entries in example DTS.  The most
> important when reading the DTS are compatible and reg.  By convention
> they are usually to first entries.  No functional change.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 1/2] dt-bindings: mmc: brcm,sdhci-brcmstb: correct number of reg entries

[Ulf Hansson]

On Thu, 28 Apr 2022 at 10:18, Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> The binding should not allow infinite number of 'reg' entries, so add
> strict limit.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> index dccd5ad96981..54a0edab5f8c 100644
> --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> @@ -31,7 +31,7 @@ properties:
>            - const: brcm,sdhci-brcmstb
>
>    reg:
> -    minItems: 2
> +    maxItems: 2
>
>    reg-names:
>      items:
> --
> 2.32.0
>

Re: [PATCH 2/2] dt-bindings: mmc: brcm,sdhci-brcmstb: cleanup example

[Ulf Hansson]

On Thu, 28 Apr 2022 at 10:18, Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> Cleanup indentation and order of entries in example DTS.  The most
> important when reading the DTS are compatible and reg.  By convention
> they are usually to first entries.  No functional change.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  .../bindings/mmc/brcm,sdhci-brcmstb.yaml       | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> index 54a0edab5f8c..b672202fff4e 100644
> --- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> +++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
> @@ -65,15 +65,15 @@ unevaluatedProperties: false
>  examples:
>    - |
>      mmc@84b0000 {
> -      sd-uhs-sdr50;
> -      sd-uhs-ddr50;
> -      sd-uhs-sdr104;
> -      sdhci,auto-cmd12;
>        compatible = "brcm,bcm7216-sdhci",
>                     "brcm,bcm7445-sdhci",
>                     "brcm,sdhci-brcmstb";
>        reg = <0x84b0000 0x260>, <0x84b0300 0x200>;
>        reg-names = "host", "cfg";
> +      sd-uhs-sdr50;
> +      sd-uhs-ddr50;
> +      sd-uhs-sdr104;
> +      sdhci,auto-cmd12;
>        interrupts = <0x0 0x26 0x4>;
>        interrupt-names = "sdio0_0";
>        clocks = <&scmi_clk 245>;
> @@ -81,6 +81,11 @@ examples:
>      };
>
>      mmc@84b1000 {
> +      compatible = "brcm,bcm7216-sdhci",
> +                   "brcm,bcm7445-sdhci",
> +                   "brcm,sdhci-brcmstb";
> +      reg = <0x84b1000 0x260>, <0x84b1300 0x200>;
> +      reg-names = "host", "cfg";
>        mmc-ddr-1_8v;
>        mmc-hs200-1_8v;
>        mmc-hs400-1_8v;
> @@ -88,11 +93,6 @@ examples:
>        supports-cqe;
>        non-removable;
>        bus-width = <0x8>;
> -      compatible = "brcm,bcm7216-sdhci",
> -           "brcm,bcm7445-sdhci",
> -            "brcm,sdhci-brcmstb";
> -      reg = <0x84b1000 0x260>, <0x84b1300 0x200>;
> -      reg-names = "host", "cfg";
>        interrupts = <0x0 0x27 0x4>;
>        interrupt-names = "sdio1_0";
>        clocks = <&scmi_clk 245>;
> --
> 2.32.0
>