2021-05-12 13:05:04

by Johan Jonker

[permalink] [raw]
Subject: [PATCH v5 0/4] convert grf.txt to YAML

Changed V5:
changed compatibles for rk3066/rk3188
add rockchip-usb-phy.yaml
move and restyle grf nodes rk3066/rk3188
remove applied patches

Changed V4:
revert separate schemas for each 'if' subset
add additionalProperties
move properties to top level

Changed V3:
remove select
change unevaluatedProperties
add separate schemas for each 'if' subset

Changed V2:
add rockchip,rk3328-grf-gpio.yaml
rename grf-gpio nodename

Johan Jonker (4):
dt-bindings: phy: convert rockchip-usb-phy.txt to YAML
dt-bindings: soc: rockchip: convert grf.txt to YAML
ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188
arm64: dts: rename grf-gpio nodename in rk3328.dtsi

.../devicetree/bindings/phy/rockchip-usb-phy.txt | 52 -----
.../devicetree/bindings/phy/rockchip-usb-phy.yaml | 86 +++++++
.../devicetree/bindings/soc/rockchip/grf.txt | 61 -----
.../devicetree/bindings/soc/rockchip/grf.yaml | 260 +++++++++++++++++++++
arch/arm/boot/dts/rk3066a.dtsi | 53 +++--
arch/arm/boot/dts/rk3188.dtsi | 53 +++--
arch/arm/boot/dts/rk3xxx.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
8 files changed, 406 insertions(+), 163 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
create mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt
create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.yaml

--
2.11.0


2021-05-12 13:09:08

by Johan Jonker

[permalink] [raw]
Subject: [PATCH v5 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi

A test with the command below gives this error:

/arch/arm64/boot/dts/rockchip/rk3328-a1.dt.yaml: [email protected]:
grf-gpio: {'compatible': ['rockchip,rk3328-grf-gpio'],
'gpio-controller': True, '#gpio-cells': [[2]], 'phandle': [[68]]} is not
of type 'array'

Due to the regex "(?<!,nr)-gpios?$" anything that ends on
'-gpio', '-gpios' gives a match.

Rename 'grf-gpio' nodename to generic 'gpio'

make ARCH=arm64 dtbs_check
DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/
schemas/gpio/gpio-consumer.yaml

Signed-off-by: Johan Jonker <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 4ce49aae7..2e458fb87 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -291,7 +291,7 @@
status = "disabled";
};

- grf_gpio: grf-gpio {
+ grf_gpio: gpio {
compatible = "rockchip,rk3328-grf-gpio";
gpio-controller;
#gpio-cells = <2>;
--
2.11.0

2021-05-14 19:47:34

by Heiko Stübner

[permalink] [raw]
Subject: Re: (subset) [PATCH v5 0/4] convert grf.txt to YAML

On Wed, 12 May 2021 14:23:42 +0200, Johan Jonker wrote:
> Changed V5:
> changed compatibles for rk3066/rk3188
> add rockchip-usb-phy.yaml
> move and restyle grf nodes rk3066/rk3188
> remove applied patches
>
> Changed V4:
> revert separate schemas for each 'if' subset
> add additionalProperties
> move properties to top level
>
> [...]

Applied, thanks!

[2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML
commit: f2ffa8f9e32d38f5c37e3c61c5b02d434057f3db
[3/4] ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188
commit: a082a4ba218457fd52256e4357184b58d3fcaa49
[4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi
commit: 19486fe587b8ed17daf87a6419b51e3a65ce565c

Best regards,
--
Heiko Stuebner <[email protected]>

2021-05-19 20:12:38

by Rob Herring

[permalink] [raw]
Subject: Re: (subset) [PATCH v5 0/4] convert grf.txt to YAML

On Fri, May 14, 2021 at 11:37 AM Heiko Stuebner <[email protected]> wrote:
>
> On Wed, 12 May 2021 14:23:42 +0200, Johan Jonker wrote:
> > Changed V5:
> > changed compatibles for rk3066/rk3188
> > add rockchip-usb-phy.yaml
> > move and restyle grf nodes rk3066/rk3188
> > remove applied patches
> >
> > Changed V4:
> > revert separate schemas for each 'if' subset
> > add additionalProperties
> > move properties to top level
> >
> > [...]
>
> Applied, thanks!
>
> [2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML
> commit: f2ffa8f9e32d38f5c37e3c61c5b02d434057f3db

Patch 1 is a dependency of this, so now linux-next is broken.

> [3/4] ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188
> commit: a082a4ba218457fd52256e4357184b58d3fcaa49
> [4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi
> commit: 19486fe587b8ed17daf87a6419b51e3a65ce565c
>
> Best regards,
> --
> Heiko Stuebner <[email protected]>

2021-05-19 23:19:50

by Heiko Stübner

[permalink] [raw]
Subject: Re: (subset) [PATCH v5 0/4] convert grf.txt to YAML

Am Mittwoch, 19. Mai 2021, 17:17:44 CEST schrieb Rob Herring:
> On Fri, May 14, 2021 at 11:37 AM Heiko Stuebner <[email protected]> wrote:
> >
> > On Wed, 12 May 2021 14:23:42 +0200, Johan Jonker wrote:
> > > Changed V5:
> > > changed compatibles for rk3066/rk3188
> > > add rockchip-usb-phy.yaml
> > > move and restyle grf nodes rk3066/rk3188
> > > remove applied patches
> > >
> > > Changed V4:
> > > revert separate schemas for each 'if' subset
> > > add additionalProperties
> > > move properties to top level
> > >
> > > [...]
> >
> > Applied, thanks!
> >
> > [2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML
> > commit: f2ffa8f9e32d38f5c37e3c61c5b02d434057f3db
>
> Patch 1 is a dependency of this, so now linux-next is broken.

dang ... I've dropped the patch and recreated the for-next
branch, so hopefully this will go away with the next run.

I'll reapply it once the phy-yaml gets applied.

Sorry the breakage
Heiko

>
> > [3/4] ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188
> > commit: a082a4ba218457fd52256e4357184b58d3fcaa49
> > [4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi
> > commit: 19486fe587b8ed17daf87a6419b51e3a65ce565c
> >
> > Best regards,
> > --
> > Heiko Stuebner <[email protected]>
>





2021-05-31 12:00:30

by Heiko Stübner

[permalink] [raw]
Subject: Re: (subset) [PATCH v5 0/4] convert grf.txt to YAML

On Wed, 12 May 2021 14:23:42 +0200, Johan Jonker wrote:
> Changed V5:
> changed compatibles for rk3066/rk3188
> add rockchip-usb-phy.yaml
> move and restyle grf nodes rk3066/rk3188
> remove applied patches
>
> Changed V4:
> revert separate schemas for each 'if' subset
> add additionalProperties
> move properties to top level
>
> [...]

Applied, thanks!

[2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML
commit: 2ed2732ef28aefdc3b495409fbd05cc388a73c62

Reapplied this, as the phy-related patch also got applies to
the phy tree now.

dtbs-check was happy with me in my test right now as well.


Best regards,
--
Heiko Stuebner <[email protected]>