Compatible string doesn't really match with compatible string listed in the
driver itself. While binding was converted from txt to yaml
xlnx,zynq-pinctrl was listed as compatible string but example was using
xlnx,pinctrl-zynq and also this string is used in all DTSes.
xlnx,zynq-pinctrl is used only in dt binding and not present in any DT
which is stable for quite a long time that's why use old compatible string
and update binding document instead of starting to use unused compatible
string.
Fixes: 153df45acda0 ("dt-bindings: pinctrl: pinctrl-zynq: Convert to yaml")
Signed-off-by: Michal Simek <[email protected]>
---
.../{xlnx,zynq-pinctrl.yaml => xlnx,pinctrl-zynq.yaml} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename Documentation/devicetree/bindings/pinctrl/{xlnx,zynq-pinctrl.yaml => xlnx,pinctrl-zynq.yaml} (98%)
diff --git a/Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/xlnx,pinctrl-zynq.yaml
similarity index 98%
rename from Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.yaml
rename to Documentation/devicetree/bindings/pinctrl/xlnx,pinctrl-zynq.yaml
index d2676f92ef5b..de6c10ba36c4 100644
--- a/Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/xlnx,pinctrl-zynq.yaml
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
-$id: http://devicetree.org/schemas/pinctrl/xlnx,zynq-pinctrl.yaml#
+$id: http://devicetree.org/schemas/pinctrl/xlnx,pinctrl-zynq.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Xilinx Zynq Pinctrl
@@ -28,7 +28,7 @@ description: |
properties:
compatible:
- const: xlnx,zynq-pinctrl
+ const: xlnx,pinctrl-zynq
reg:
description: Specifies the base address and size of the SLCR space.
@@ -181,7 +181,7 @@ examples:
- |
#include <dt-bindings/pinctrl/pinctrl-zynq.h>
pinctrl0: pinctrl@700 {
- compatible = "xlnx,zynq-pinctrl";
+ compatible = "xlnx,pinctrl-zynq";
reg = <0x700 0x200>;
syscon = <&slcr>;
--
2.36.1
On Wed, Jan 24, 2024 at 10:07:46AM +0100, Michal Simek wrote:
> Compatible string doesn't really match with compatible string listed in the
> driver itself. While binding was converted from txt to yaml
> xlnx,zynq-pinctrl was listed as compatible string but example was using
> xlnx,pinctrl-zynq and also this string is used in all DTSes.
> xlnx,zynq-pinctrl is used only in dt binding and not present in any DT
> which is stable for quite a long time that's why use old compatible string
> and update binding document instead of starting to use unused compatible
> string.
>
> Fixes: 153df45acda0 ("dt-bindings: pinctrl: pinctrl-zynq: Convert to yaml")
> Signed-off-by: Michal Simek <[email protected]>
I assume that U-Boot etc all use the "incorrect" compatible as was in
the example? If they do, then the patch seems good to me.
Thanks,
Conor.
> ---
>
> .../{xlnx,zynq-pinctrl.yaml => xlnx,pinctrl-zynq.yaml} | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> rename Documentation/devicetree/bindings/pinctrl/{xlnx,zynq-pinctrl.yaml => xlnx,pinctrl-zynq.yaml} (98%)
>
> diff --git a/Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/xlnx,pinctrl-zynq.yaml
> similarity index 98%
> rename from Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.yaml
> rename to Documentation/devicetree/bindings/pinctrl/xlnx,pinctrl-zynq.yaml
> index d2676f92ef5b..de6c10ba36c4 100644
> --- a/Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.yaml
> +++ b/Documentation/devicetree/bindings/pinctrl/xlnx,pinctrl-zynq.yaml
> @@ -1,7 +1,7 @@
> # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> %YAML 1.2
> ---
> -$id: http://devicetree.org/schemas/pinctrl/xlnx,zynq-pinctrl.yaml#
> +$id: http://devicetree.org/schemas/pinctrl/xlnx,pinctrl-zynq.yaml#
> $schema: http://devicetree.org/meta-schemas/core.yaml#
>
> title: Xilinx Zynq Pinctrl
> @@ -28,7 +28,7 @@ description: |
>
> properties:
> compatible:
> - const: xlnx,zynq-pinctrl
> + const: xlnx,pinctrl-zynq
>
> reg:
> description: Specifies the base address and size of the SLCR space.
> @@ -181,7 +181,7 @@ examples:
> - |
> #include <dt-bindings/pinctrl/pinctrl-zynq.h>
> pinctrl0: pinctrl@700 {
> - compatible = "xlnx,zynq-pinctrl";
> + compatible = "xlnx,pinctrl-zynq";
> reg = <0x700 0x200>;
> syscon = <&slcr>;
>
> --
> 2.36.1
>
On 1/24/24 17:16, Conor Dooley wrote:
> On Wed, Jan 24, 2024 at 10:07:46AM +0100, Michal Simek wrote:
>> Compatible string doesn't really match with compatible string listed in the
>> driver itself. While binding was converted from txt to yaml
>> xlnx,zynq-pinctrl was listed as compatible string but example was using
>> xlnx,pinctrl-zynq and also this string is used in all DTSes.
>> xlnx,zynq-pinctrl is used only in dt binding and not present in any DT
>> which is stable for quite a long time that's why use old compatible string
>> and update binding document instead of starting to use unused compatible
>> string.
>>
>> Fixes: 153df45acda0 ("dt-bindings: pinctrl: pinctrl-zynq: Convert to yaml")
>> Signed-off-by: Michal Simek <[email protected]>
>
> I assume that U-Boot etc all use the "incorrect" compatible as was in
> the example? If they do, then the patch seems good to me.
Yes. U-Boot is using "incorrect" compatible string from 2015.
Thanks,
Michal
On Thu, Jan 25, 2024 at 08:06:35AM +0100, Michal Simek wrote:
>
>
> On 1/24/24 17:16, Conor Dooley wrote:
> > On Wed, Jan 24, 2024 at 10:07:46AM +0100, Michal Simek wrote:
> > > Compatible string doesn't really match with compatible string listed in the
> > > driver itself. While binding was converted from txt to yaml
> > > xlnx,zynq-pinctrl was listed as compatible string but example was using
> > > xlnx,pinctrl-zynq and also this string is used in all DTSes.
> > > xlnx,zynq-pinctrl is used only in dt binding and not present in any DT
> > > which is stable for quite a long time that's why use old compatible string
> > > and update binding document instead of starting to use unused compatible
> > > string.
> > >
> > > Fixes: 153df45acda0 ("dt-bindings: pinctrl: pinctrl-zynq: Convert to yaml")
> > > Signed-off-by: Michal Simek <[email protected]>
> >
> > I assume that U-Boot etc all use the "incorrect" compatible as was in
> > the example? If they do, then the patch seems good to me.
>
> Yes. U-Boot is using "incorrect" compatible string from 2015.
Okay. Assuming U-Boot is the only other user, it eems reasonable to
document the defacto compatible then.
Acked-by: Conor Dooley <[email protected]>
Cheers,
Conor.
On Wed, Jan 24, 2024 at 10:08 AM Michal Simek <[email protected]> wrote:
> Compatible string doesn't really match with compatible string listed in the
> driver itself. While binding was converted from txt to yaml
> xlnx,zynq-pinctrl was listed as compatible string but example was using
> xlnx,pinctrl-zynq and also this string is used in all DTSes.
> xlnx,zynq-pinctrl is used only in dt binding and not present in any DT
> which is stable for quite a long time that's why use old compatible string
> and update binding document instead of starting to use unused compatible
> string.
>
> Fixes: 153df45acda0 ("dt-bindings: pinctrl: pinctrl-zynq: Convert to yaml")
> Signed-off-by: Michal Simek <[email protected]>
Patch applied!
Yours,
Linus Walleij