2019-05-20 18:13:01

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: [PATCH 08/10] dt: fix refs that were renamed to json with the same file name

This file was converted to json, but the references weren't
renamed.

Fixes: 66ed144f147a ("dt-bindings: interrupt-controller: Convert ARM GIC to json-schema")
(and other similar commits)

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
Documentation/devicetree/bindings/arm/omap/crossbar.txt | 2 +-
.../devicetree/bindings/clock/samsung,s5pv210-clock.txt | 2 +-
.../bindings/interrupt-controller/marvell,odmi-controller.txt | 2 +-
Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt | 2 +-
MAINTAINERS | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/omap/crossbar.txt b/Documentation/devicetree/bindings/arm/omap/crossbar.txt
index 4cd5d873fc3a..a43e4c7aba3d 100644
--- a/Documentation/devicetree/bindings/arm/omap/crossbar.txt
+++ b/Documentation/devicetree/bindings/arm/omap/crossbar.txt
@@ -41,7 +41,7 @@ Examples:
Consumer:
========
See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt and
-Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt for
+Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml for
further details.

An interrupt consumer on an SoC using crossbar will use:
diff --git a/Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt b/Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt
index 15b48e20a061..a86c83bf9d4e 100644
--- a/Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt
+++ b/Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt
@@ -35,7 +35,7 @@ board device tree, including the system base clock, as selected by XOM[0]
pin of the SoC. Refer to generic fixed rate clock bindings
documentation[1] for more information how to specify these clocks.

-[1] Documentation/devicetree/bindings/clock/fixed-clock.txt
+[1] Documentation/devicetree/bindings/clock/fixed-clock.yaml

Example: Clock controller node:

diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt b/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt
index 930fb462fd9f..0ebfc952cb34 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt
@@ -23,7 +23,7 @@ Required properties:
- marvell,spi-base : List of GIC base SPI interrupts, one for each
ODMI frame. Those SPI interrupts are 0-based,
i.e marvell,spi-base = <128> will use SPI #96.
- See Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
+ See Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml
for details about the GIC Device Tree binding.

Example:
diff --git a/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt b/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt
index 896b6997cf30..21882c8d4b0c 100644
--- a/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt
+++ b/Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt
@@ -15,7 +15,7 @@ Optional properties:
- power-supply: specifies the power source. It can either be a regulator
or a gpio which enables a regulator, i.e. a regulator-fixed as
described in
- Documentation/devicetree/bindings/regulator/fixed-regulator.txt
+ Documentation/devicetree/bindings/regulator/fixed-regulator.yaml

Example:

diff --git a/MAINTAINERS b/MAINTAINERS
index 5cfbea4ce575..0c84bf76d165 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2768,7 +2768,7 @@ AVIA HX711 ANALOG DIGITAL CONVERTER IIO DRIVER
M: Andreas Klinger <[email protected]>
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
+F: Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml
F: drivers/iio/adc/hx711.c

AX.25 NETWORK LAYER
@@ -14353,7 +14353,7 @@ SIMPLEFB FB DRIVER
M: Hans de Goede <[email protected]>
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/display/simple-framebuffer.txt
+F: Documentation/devicetree/bindings/display/simple-framebuffer.yaml
F: drivers/video/fbdev/simplefb.c
F: include/linux/platform_data/simplefb.h

--
2.21.0



2019-05-20 18:17:50

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH 08/10] dt: fix refs that were renamed to json with the same file name

On Mon, May 20, 2019 at 9:48 AM Mauro Carvalho Chehab
<[email protected]> wrote:
>
> This file was converted to json, but the references weren't

Technically, converted to json-schema (the language) or yaml (the format).

> renamed.
>
> Fixes: 66ed144f147a ("dt-bindings: interrupt-controller: Convert ARM GIC to json-schema")
> (and other similar commits)
>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> ---
> Documentation/devicetree/bindings/arm/omap/crossbar.txt | 2 +-
> .../devicetree/bindings/clock/samsung,s5pv210-clock.txt | 2 +-
> .../bindings/interrupt-controller/marvell,odmi-controller.txt | 2 +-
> Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt | 2 +-
> MAINTAINERS | 4 ++--
> 5 files changed, 6 insertions(+), 6 deletions(-)

FYI, I'm actively looking for this in conversions now as we've had a
few of these. For cases where we have a lot of references, I'm fixing
this by keeping the .txt file with a reference to the .yaml file.

I'll pick up the DT patches in the series.

Rob

2019-05-20 18:18:05

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: Re: [PATCH 08/10] dt: fix refs that were renamed to json with the same file name

Em Mon, 20 May 2019 10:57:47 -0500
Rob Herring <[email protected]> escreveu:

> On Mon, May 20, 2019 at 9:48 AM Mauro Carvalho Chehab
> <[email protected]> wrote:
> >
> > This file was converted to json, but the references weren't
>
> Technically, converted to json-schema (the language) or yaml (the format).

Ok. Do you want me to change it at the patch and resend?

>
> > renamed.
> >
> > Fixes: 66ed144f147a ("dt-bindings: interrupt-controller: Convert ARM GIC to json-schema")
> > (and other similar commits)
> >
> > Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> > ---
> > Documentation/devicetree/bindings/arm/omap/crossbar.txt | 2 +-
> > .../devicetree/bindings/clock/samsung,s5pv210-clock.txt | 2 +-
> > .../bindings/interrupt-controller/marvell,odmi-controller.txt | 2 +-
> > Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt | 2 +-
> > MAINTAINERS | 4 ++--
> > 5 files changed, 6 insertions(+), 6 deletions(-)
>
> FYI, I'm actively looking for this in conversions now as we've had a
> few of these. For cases where we have a lot of references, I'm fixing
> this by keeping the .txt file with a reference to the .yaml file.

If the file name remains with the same name, except for the .txt -> .yaml,
you can just run the "scripts/documentation-file-ref-check --fix"
after this patch:

Subject: [PATCH 04/10] scripts/documentation-file-ref-check: teach about .txt -> .yaml renames

and it should detect and automatically fix all the references. As any
auto-hint script, you need to double-check the results.

> I'll pick up the DT patches in the series.

OK. There are a few such fixes inside patch 10/10. Do you want me
to split it or can it go through Jonathan's doc tree?

Thanks,
Mauro

2019-05-20 23:01:46

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH 08/10] dt: fix refs that were renamed to json with the same file name

On Mon, May 20, 2019 at 11:14 AM Mauro Carvalho Chehab
<[email protected]> wrote:
>
> Em Mon, 20 May 2019 10:57:47 -0500
> Rob Herring <[email protected]> escreveu:
>
> > On Mon, May 20, 2019 at 9:48 AM Mauro Carvalho Chehab
> > <[email protected]> wrote:
> > >
> > > This file was converted to json, but the references weren't
> >
> > Technically, converted to json-schema (the language) or yaml (the format).
>
> Ok. Do you want me to change it at the patch and resend?

No, I can fixup.

>
> >
> > > renamed.
> > >
> > > Fixes: 66ed144f147a ("dt-bindings: interrupt-controller: Convert ARM GIC to json-schema")
> > > (and other similar commits)
> > >
> > > Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> > > ---
> > > Documentation/devicetree/bindings/arm/omap/crossbar.txt | 2 +-
> > > .../devicetree/bindings/clock/samsung,s5pv210-clock.txt | 2 +-
> > > .../bindings/interrupt-controller/marvell,odmi-controller.txt | 2 +-
> > > Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt | 2 +-
> > > MAINTAINERS | 4 ++--
> > > 5 files changed, 6 insertions(+), 6 deletions(-)
> >
> > FYI, I'm actively looking for this in conversions now as we've had a
> > few of these. For cases where we have a lot of references, I'm fixing
> > this by keeping the .txt file with a reference to the .yaml file.
>
> If the file name remains with the same name, except for the .txt -> .yaml,
> you can just run the "scripts/documentation-file-ref-check --fix"
> after this patch:
>
> Subject: [PATCH 04/10] scripts/documentation-file-ref-check: teach about .txt -> .yaml renames
>
> and it should detect and automatically fix all the references. As any
> auto-hint script, you need to double-check the results.

Nice!

>
> > I'll pick up the DT patches in the series.
>
> OK. There are a few such fixes inside patch 10/10. Do you want me
> to split it or can it go through Jonathan's doc tree?

Jon's tree is fine.

Rob