* [PATCH v2 0/4] convert grf.txt to YAML
@ 2021-05-05 13:40 Johan Jonker
2021-05-05 13:40 ` [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt " Johan Jonker
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Johan Jonker @ 2021-05-05 13:40 UTC (permalink / raw)
To: heiko
Cc: robh+dt, linus.walleij, bgolaszewski, jay.xu, shawn.lin,
david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip,
devicetree, linux-arm-kernel, linux-kernel
Changed V2:
add rockchip,rk3328-grf-gpio.yaml
rename grf-gpio nodename
Johan Jonker (4):
dt-bindings: gpio: convert rk3328-grf-gpio.txt to YAML
dt-bindings: soc: rockchip: convert grf.txt to YAML
ARM: dts: rockchip: add grf register compatible for rk3066/rk3188
arm64: dts: rename grf-gpio nodename in rk3328.dtsi
.../bindings/gpio/rockchip,rk3328-grf-gpio.txt | 32 ---
.../bindings/gpio/rockchip,rk3328-grf-gpio.yaml | 51 ++++
.../devicetree/bindings/soc/rockchip/grf.txt | 61 -----
.../devicetree/bindings/soc/rockchip/grf.yaml | 280 +++++++++++++++++++++
arch/arm/boot/dts/rk3xxx.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
6 files changed, 333 insertions(+), 95 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt
create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml
delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt
create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.yaml
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt to YAML 2021-05-05 13:40 [PATCH v2 0/4] convert grf.txt to YAML Johan Jonker @ 2021-05-05 13:40 ` Johan Jonker 2021-05-07 20:48 ` Rob Herring ` (2 more replies) 2021-05-05 13:40 ` [PATCH v2 2/4] dt-bindings: soc: rockchip: convert grf.txt " Johan Jonker ` (2 subsequent siblings) 3 siblings, 3 replies; 11+ messages in thread From: Johan Jonker @ 2021-05-05 13:40 UTC (permalink / raw) To: heiko Cc: robh+dt, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel Current dts files with RK3328 GRF 'gpio' nodes are manually verified. In order to automate this process rk3328-grf-gpio.txt has to be converted to YAML. Rename 'grf-gpio' nodename to 'gpio'. Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- .../bindings/gpio/rockchip,rk3328-grf-gpio.txt | 32 -------------- .../bindings/gpio/rockchip,rk3328-grf-gpio.yaml | 51 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 32 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml diff --git a/Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt b/Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt deleted file mode 100644 index f9231df17..000000000 --- a/Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt +++ /dev/null @@ -1,32 +0,0 @@ -Rockchip RK3328 GRF (General Register Files) GPIO controller. - -In Rockchip RK3328, the output only GPIO_MUTE pin, originally for codec mute -control, can also be used for general purpose. It is manipulated by the -GRF_SOC_CON10 register in GRF. Aside from the GPIO_MUTE pin, the HDMI pins can -also be set in the same way. - -Currently this GPIO controller only supports the mute pin. If needed in the -future, the HDMI pins support can also be added. - -Required properties: -- compatible: Should contain "rockchip,rk3328-grf-gpio". -- gpio-controller: Marks the device node as a gpio controller. -- #gpio-cells: Should be 2. The first cell is the pin number and - the second cell is used to specify the gpio polarity: - 0 = Active high, - 1 = Active low. - -Example: - - grf: syscon@ff100000 { - compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd"; - - grf_gpio: grf-gpio { - compatible = "rockchip,rk3328-grf-gpio"; - gpio-controller; - #gpio-cells = <2>; - }; - }; - -Note: The grf_gpio node should be declared as the child of the GRF (General -Register File) node. The GPIO_MUTE pin is referred to as <&grf_gpio 0>. diff --git a/Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml b/Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml new file mode 100644 index 000000000..ea169f6fb --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/gpio/rockchip,rk3328-grf-gpio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip RK3328 General Register Files GPIO controller + +description: + The Rockchip RK3328 General Register File (GRF) outputs only the + GPIO_MUTE pin, originally for codec mute control, but it can also be used + for general purpose. It is manipulated by the GRF_SOC_CON10 register. + If needed in the future support for the HDMI pins can also be added. + The GPIO node should be declared as the child of the GRF node. + + The GPIO_MUTE pin is referred to in the format + + <&grf_gpio 0 GPIO_ACTIVE_LOW> + + The first cell is the pin number and + the second cell is used to specify the GPIO polarity + 0 = Active high + 1 = Active low + +maintainers: + - Heiko Stuebner <heiko@sntech.de> + +properties: + compatible: + const: rockchip,rk3328-grf-gpio + + gpio-controller: true + + "#gpio-cells": + const: 2 + +required: + - compatible + - gpio-controller + - "#gpio-cells" + +additionalProperties: false + +examples: + - | + grf_gpio: gpio { + compatible = "rockchip,rk3328-grf-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt to YAML 2021-05-05 13:40 ` [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt " Johan Jonker @ 2021-05-07 20:48 ` Rob Herring 2021-05-07 20:59 ` Heiko Stuebner 2021-05-07 21:26 ` Linus Walleij 2 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2021-05-07 20:48 UTC (permalink / raw) To: Johan Jonker Cc: cl, jay.xu, linux-arm-kernel, bgolaszewski, linux-kernel, zhangqing, linux-rockchip, devicetree, huangtao, linux-gpio, linus.walleij, david.wu, robh+dt, shawn.lin, heiko On Wed, 05 May 2021 15:40:25 +0200, Johan Jonker wrote: > Current dts files with RK3328 GRF 'gpio' nodes are manually verified. > In order to automate this process rk3328-grf-gpio.txt has to be > converted to YAML. > > Rename 'grf-gpio' nodename to 'gpio'. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > --- > .../bindings/gpio/rockchip,rk3328-grf-gpio.txt | 32 -------------- > .../bindings/gpio/rockchip,rk3328-grf-gpio.yaml | 51 ++++++++++++++++++++++ > 2 files changed, 51 insertions(+), 32 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.txt > create mode 100644 Documentation/devicetree/bindings/gpio/rockchip,rk3328-grf-gpio.yaml > Reviewed-by: Rob Herring <robh@kernel.org> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt to YAML 2021-05-05 13:40 ` [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt " Johan Jonker 2021-05-07 20:48 ` Rob Herring @ 2021-05-07 20:59 ` Heiko Stuebner 2021-05-07 21:02 ` Rob Herring 2021-05-07 21:26 ` Linus Walleij 2 siblings, 1 reply; 11+ messages in thread From: Heiko Stuebner @ 2021-05-07 20:59 UTC (permalink / raw) To: Johan Jonker Cc: robh+dt, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel Hi Bartosz, Am Mittwoch, 5. Mai 2021, 15:40:25 CEST schrieb Johan Jonker: > Current dts files with RK3328 GRF 'gpio' nodes are manually verified. > In order to automate this process rk3328-grf-gpio.txt has to be > converted to YAML. > > Rename 'grf-gpio' nodename to 'gpio'. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> just to not step on any toes, do you plan to apply this patch1 later on? Patches 2-4 are in my domain so I'll get them after -rc1, but in theory the gpio binding should go through the gpio tree. Heiko _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt to YAML 2021-05-07 20:59 ` Heiko Stuebner @ 2021-05-07 21:02 ` Rob Herring 2021-05-07 21:06 ` Heiko Stuebner 0 siblings, 1 reply; 11+ messages in thread From: Rob Herring @ 2021-05-07 21:02 UTC (permalink / raw) To: Heiko Stuebner Cc: Johan Jonker, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel On Fri, May 07, 2021 at 10:59:09PM +0200, Heiko Stuebner wrote: > Hi Bartosz, > > Am Mittwoch, 5. Mai 2021, 15:40:25 CEST schrieb Johan Jonker: > > Current dts files with RK3328 GRF 'gpio' nodes are manually verified. > > In order to automate this process rk3328-grf-gpio.txt has to be > > converted to YAML. > > > > Rename 'grf-gpio' nodename to 'gpio'. > > > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > > just to not step on any toes, do you plan to apply this patch1 later on? > Patches 2-4 are in my domain so I'll get them after -rc1, but in theory > the gpio binding should go through the gpio tree. Different trees will break the schema checks because the grf schema refers to the gpio schema. Rob _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt to YAML 2021-05-07 21:02 ` Rob Herring @ 2021-05-07 21:06 ` Heiko Stuebner 0 siblings, 0 replies; 11+ messages in thread From: Heiko Stuebner @ 2021-05-07 21:06 UTC (permalink / raw) To: Rob Herring Cc: Johan Jonker, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel Am Freitag, 7. Mai 2021, 23:02:39 CEST schrieb Rob Herring: > On Fri, May 07, 2021 at 10:59:09PM +0200, Heiko Stuebner wrote: > > Hi Bartosz, > > > > Am Mittwoch, 5. Mai 2021, 15:40:25 CEST schrieb Johan Jonker: > > > Current dts files with RK3328 GRF 'gpio' nodes are manually verified. > > > In order to automate this process rk3328-grf-gpio.txt has to be > > > converted to YAML. > > > > > > Rename 'grf-gpio' nodename to 'gpio'. > > > > > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > > > > just to not step on any toes, do you plan to apply this patch1 later on? > > Patches 2-4 are in my domain so I'll get them after -rc1, but in theory > > the gpio binding should go through the gpio tree. > > Different trees will break the schema checks because the grf schema > refers to the gpio schema. Ah, thanks for the heads up. I guess we need to agree on one then. Bartosz, gpio tree or the rockchip tree for patches 1+2? ;-) Heiko _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt to YAML 2021-05-05 13:40 ` [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt " Johan Jonker 2021-05-07 20:48 ` Rob Herring 2021-05-07 20:59 ` Heiko Stuebner @ 2021-05-07 21:26 ` Linus Walleij 2 siblings, 0 replies; 11+ messages in thread From: Linus Walleij @ 2021-05-07 21:26 UTC (permalink / raw) To: Johan Jonker Cc: Heiko Stübner, Rob Herring, Bartosz Golaszewski, Jianqun Xu, Shawn Lin, David Wu, Elaine Zhang, Tao Huang, cl, open list:GPIO SUBSYSTEM, open list:ARM/Rockchip SoC..., open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, linux-kernel On Wed, May 5, 2021 at 3:40 PM Johan Jonker <jbx6244@gmail.com> wrote: > Current dts files with RK3328 GRF 'gpio' nodes are manually verified. > In order to automate this process rk3328-grf-gpio.txt has to be > converted to YAML. > > Rename 'grf-gpio' nodename to 'gpio'. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML 2021-05-05 13:40 [PATCH v2 0/4] convert grf.txt to YAML Johan Jonker 2021-05-05 13:40 ` [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt " Johan Jonker @ 2021-05-05 13:40 ` Johan Jonker 2021-05-07 20:47 ` Rob Herring 2021-05-05 13:40 ` [PATCH v2 3/4] ARM: dts: rockchip: add grf register compatible for rk3066/rk3188 Johan Jonker 2021-05-05 13:40 ` [PATCH v2 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi Johan Jonker 3 siblings, 1 reply; 11+ messages in thread From: Johan Jonker @ 2021-05-05 13:40 UTC (permalink / raw) To: heiko Cc: robh+dt, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel Current dts files with 'grf' nodes are manually verified. In order to automate this process grf.txt has to be converted to YAML. Most compatibility strings are in use with "simple-mfd" added. Add description already in use: "rockchip,rv1108-pmugrf", "syscon" Add new descriptions for: "rockchip,rk3568-grf", "syscon", "simple-mfd" "rockchip,rk3568-pmugrf", "syscon", "simple-mfd" Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- Changed V2: add rockchip,rk3328-grf-gpio.yaml rename grf-gpio nodename --- .../devicetree/bindings/soc/rockchip/grf.txt | 61 ----- .../devicetree/bindings/soc/rockchip/grf.yaml | 280 +++++++++++++++++++++ 2 files changed, 280 insertions(+), 61 deletions(-) delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.yaml diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.txt b/Documentation/devicetree/bindings/soc/rockchip/grf.txt deleted file mode 100644 index f96511aa3..000000000 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.txt +++ /dev/null @@ -1,61 +0,0 @@ -* Rockchip General Register Files (GRF) - -The general register file will be used to do static set by software, which -is composed of many registers for system control. - -From RK3368 SoCs, the GRF is divided into two sections, -- GRF, used for general non-secure system, -- SGRF, used for general secure system, -- PMUGRF, used for always on system - -On RK3328 SoCs, the GRF adds a section for USB2PHYGRF, - -ON RK3308 SoC, the GRF is divided into four sections: -- GRF, used for general non-secure system, -- SGRF, used for general secure system, -- DETECTGRF, used for audio codec system, -- COREGRF, used for pvtm, - -Required Properties: - -- compatible: GRF should be one of the following: - - "rockchip,px30-grf", "syscon": for px30 - - "rockchip,rk3036-grf", "syscon": for rk3036 - - "rockchip,rk3066-grf", "syscon": for rk3066 - - "rockchip,rk3188-grf", "syscon": for rk3188 - - "rockchip,rk3228-grf", "syscon": for rk3228 - - "rockchip,rk3288-grf", "syscon": for rk3288 - - "rockchip,rk3308-grf", "syscon": for rk3308 - - "rockchip,rk3328-grf", "syscon": for rk3328 - - "rockchip,rk3368-grf", "syscon": for rk3368 - - "rockchip,rk3399-grf", "syscon": for rk3399 - - "rockchip,rv1108-grf", "syscon": for rv1108 -- compatible: DETECTGRF should be one of the following: - - "rockchip,rk3308-detect-grf", "syscon": for rk3308 -- compatilbe: COREGRF should be one of the following: - - "rockchip,rk3308-core-grf", "syscon": for rk3308 -- compatible: PMUGRF should be one of the following: - - "rockchip,px30-pmugrf", "syscon": for px30 - - "rockchip,rk3368-pmugrf", "syscon": for rk3368 - - "rockchip,rk3399-pmugrf", "syscon": for rk3399 -- compatible: SGRF should be one of the following: - - "rockchip,rk3288-sgrf", "syscon": for rk3288 -- compatible: USB2PHYGRF should be one of the following: - - "rockchip,px30-usb2phy-grf", "syscon": for px30 - - "rockchip,rk3328-usb2phy-grf", "syscon": for rk3328 -- compatible: USBGRF should be one of the following: - - "rockchip,rv1108-usbgrf", "syscon": for rv1108 -- reg: physical base address of the controller and length of memory mapped - region. - -Example: GRF and PMUGRF of RK3399 SoCs - - pmugrf: syscon@ff320000 { - compatible = "rockchip,rk3399-pmugrf", "syscon"; - reg = <0x0 0xff320000 0x0 0x1000>; - }; - - grf: syscon@ff770000 { - compatible = "rockchip,rk3399-grf", "syscon"; - reg = <0x0 0xff770000 0x0 0x10000>; - }; diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml new file mode 100644 index 000000000..c7916beb4 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -0,0 +1,280 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/rockchip/grf.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip General Register Files (GRF) + +maintainers: + - Heiko Stuebner <heiko@sntech.de> + +select: + properties: + compatible: + contains: + enum: + - rockchip,px30-grf + - rockchip,px30-pmugrf + - rockchip,px30-usb2phy-grf + - rockchip,rk3036-grf + - rockchip,rk3066-grf + - rockchip,rk3188-grf + - rockchip,rk3228-grf + - rockchip,rk3288-grf + - rockchip,rk3288-sgrf + - rockchip,rk3308-core-grf + - rockchip,rk3308-detect-grf + - rockchip,rk3308-grf + - rockchip,rk3328-grf + - rockchip,rk3328-usb2phy-grf + - rockchip,rk3368-grf + - rockchip,rk3368-pmugrf + - rockchip,rk3399-grf + - rockchip,rk3399-pmugrf + - rockchip,rk3568-grf + - rockchip,rk3568-pmugrf + - rockchip,rv1108-grf + - rockchip,rv1108-pmugrf + - rockchip,rv1108-usbgrf + + required: + - compatible + +properties: + compatible: + oneOf: + - items: + - enum: + - rockchip,rk3066-grf + - rockchip,rk3188-grf + - rockchip,rk3288-sgrf + - rockchip,rv1108-pmugrf + - rockchip,rv1108-usbgrf + - const: syscon + - items: + - enum: + - rockchip,px30-grf + - rockchip,px30-pmugrf + - rockchip,px30-usb2phy-grf + - rockchip,rk3036-grf + - rockchip,rk3228-grf + - rockchip,rk3288-grf + - rockchip,rk3308-core-grf + - rockchip,rk3308-detect-grf + - rockchip,rk3308-grf + - rockchip,rk3328-grf + - rockchip,rk3328-usb2phy-grf + - rockchip,rk3368-grf + - rockchip,rk3368-pmugrf + - rockchip,rk3399-grf + - rockchip,rk3399-pmugrf + - rockchip,rk3568-grf + - rockchip,rk3568-pmugrf + - rockchip,rv1108-grf + - const: syscon + - const: simple-mfd + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: true + +allOf: + - if: + properties: + compatible: + contains: + const: rockchip,px30-grf + + then: + properties: + lvds: + description: + Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt + + - if: + properties: + compatible: + contains: + const: rockchip,rk3288-grf + + then: + properties: + edp-phy: + description: + Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt + + usbphy: + description: + Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt + + - if: + properties: + compatible: + contains: + const: rockchip,rk3328-grf + + then: + properties: + gpio: + type: object + + $ref: "/schemas/gpio/rockchip,rk3328-grf-gpio.yaml#" + + unevaluatedProperties: false + + power-controller: + type: object + + $ref: "/schemas/power/rockchip,power-controller.yaml#" + + unevaluatedProperties: false + + - if: + properties: + compatible: + contains: + const: rockchip,rk3399-grf + + then: + properties: + mipi-dphy-rx0: + type: object + + $ref: "/schemas/phy/rockchip-mipi-dphy-rx0.yaml#" + + unevaluatedProperties: false + + pcie-phy: + description: + Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt + + patternProperties: + "phy@[0-9a-f]+$": + description: + Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt + + - if: + properties: + compatible: + contains: + enum: + - rockchip,px30-pmugrf + - rockchip,rk3036-grf + - rockchip,rk3308-grf + - rockchip,rk3368-pmugrf + + then: + properties: + reboot-mode: + type: object + + $ref: "/schemas/power/reset/syscon-reboot-mode.yaml#" + + unevaluatedProperties: false + + - if: + properties: + compatible: + contains: + enum: + - rockchip,px30-usb2phy-grf + - rockchip,rk3228-grf + - rockchip,rk3328-usb2phy-grf + - rockchip,rk3399-grf + - rockchip,rv1108-grf + + then: + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 1 + + required: + - "#address-cells" + - "#size-cells" + + patternProperties: + "usb2-phy@[0-9a-f]+$": + type: object + + $ref: "/schemas/phy/phy-rockchip-inno-usb2.yaml#" + + unevaluatedProperties: false + + - if: + properties: + compatible: + contains: + enum: + - rockchip,px30-pmugrf + - rockchip,px30-grf + - rockchip,rk3228-grf + - rockchip,rk3288-grf + - rockchip,rk3328-grf + - rockchip,rk3368-pmugrf + - rockchip,rk3368-grf + - rockchip,rk3399-pmugrf + - rockchip,rk3399-grf + + then: + properties: + io-domains: + description: + Documentation/devicetree/bindings/power/rockchip-io-domain.txt + + unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/rk3399-cru.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/power/rk3399-power.h> + grf: syscon@ff770000 { + compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; + reg = <0xff770000 0x10000>; + #address-cells = <1>; + #size-cells = <1>; + + mipi_dphy_rx0: mipi-dphy-rx0 { + compatible = "rockchip,rk3399-mipi-dphy-rx0"; + clocks = <&cru SCLK_MIPIDPHY_REF>, + <&cru SCLK_DPHY_RX0_CFG>, + <&cru PCLK_VIO_GRF>; + clock-names = "dphy-ref", "dphy-cfg", "grf"; + power-domains = <&power RK3399_PD_VIO>; + #phy-cells = <0>; + }; + + u2phy0: usb2-phy@e450 { + compatible = "rockchip,rk3399-usb2phy"; + reg = <0xe450 0x10>; + clocks = <&cru SCLK_USB2PHY0_REF>; + clock-names = "phyclk"; + #clock-cells = <0>; + clock-output-names = "clk_usbphy0_480m"; + #phy-cells = <0>; + + u2phy0_host: host-port { + #phy-cells = <0>; + interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>; + interrupt-names = "linestate"; + }; + + u2phy0_otg: otg-port { + #phy-cells = <0>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>, + <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>, + <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>; + interrupt-names = "otg-bvalid", "otg-id", + "linestate"; + }; + }; + }; -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML 2021-05-05 13:40 ` [PATCH v2 2/4] dt-bindings: soc: rockchip: convert grf.txt " Johan Jonker @ 2021-05-07 20:47 ` Rob Herring 0 siblings, 0 replies; 11+ messages in thread From: Rob Herring @ 2021-05-07 20:47 UTC (permalink / raw) To: Johan Jonker Cc: heiko, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel On Wed, May 05, 2021 at 03:40:26PM +0200, Johan Jonker wrote: > Current dts files with 'grf' nodes are manually verified. > In order to automate this process grf.txt has to be > converted to YAML. > > Most compatibility strings are in use with "simple-mfd" added. > > Add description already in use: > "rockchip,rv1108-pmugrf", "syscon" > > Add new descriptions for: > "rockchip,rk3568-grf", "syscon", "simple-mfd" > "rockchip,rk3568-pmugrf", "syscon", "simple-mfd" > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > --- > Changed V2: > add rockchip,rk3328-grf-gpio.yaml > rename grf-gpio nodename > --- > .../devicetree/bindings/soc/rockchip/grf.txt | 61 ----- > .../devicetree/bindings/soc/rockchip/grf.yaml | 280 +++++++++++++++++++++ > 2 files changed, 280 insertions(+), 61 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt > create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.yaml > diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > new file mode 100644 > index 000000000..c7916beb4 > --- /dev/null > +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml > @@ -0,0 +1,280 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/soc/rockchip/grf.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Rockchip General Register Files (GRF) > + > +maintainers: > + - Heiko Stuebner <heiko@sntech.de> > + > +select: > + properties: > + compatible: > + contains: > + enum: > + - rockchip,px30-grf > + - rockchip,px30-pmugrf > + - rockchip,px30-usb2phy-grf > + - rockchip,rk3036-grf > + - rockchip,rk3066-grf > + - rockchip,rk3188-grf > + - rockchip,rk3228-grf > + - rockchip,rk3288-grf > + - rockchip,rk3288-sgrf > + - rockchip,rk3308-core-grf > + - rockchip,rk3308-detect-grf > + - rockchip,rk3308-grf > + - rockchip,rk3328-grf > + - rockchip,rk3328-usb2phy-grf > + - rockchip,rk3368-grf > + - rockchip,rk3368-pmugrf > + - rockchip,rk3399-grf > + - rockchip,rk3399-pmugrf > + - rockchip,rk3568-grf > + - rockchip,rk3568-pmugrf > + - rockchip,rv1108-grf > + - rockchip,rv1108-pmugrf > + - rockchip,rv1108-usbgrf > + > + required: > + - compatible You shouldn't need 'select' here. The tools handle not matching every syscon or simple-mfd. > + > +properties: > + compatible: > + oneOf: > + - items: > + - enum: > + - rockchip,rk3066-grf > + - rockchip,rk3188-grf > + - rockchip,rk3288-sgrf > + - rockchip,rv1108-pmugrf > + - rockchip,rv1108-usbgrf > + - const: syscon > + - items: > + - enum: > + - rockchip,px30-grf > + - rockchip,px30-pmugrf > + - rockchip,px30-usb2phy-grf > + - rockchip,rk3036-grf > + - rockchip,rk3228-grf > + - rockchip,rk3288-grf > + - rockchip,rk3308-core-grf > + - rockchip,rk3308-detect-grf > + - rockchip,rk3308-grf > + - rockchip,rk3328-grf > + - rockchip,rk3328-usb2phy-grf > + - rockchip,rk3368-grf > + - rockchip,rk3368-pmugrf > + - rockchip,rk3399-grf > + - rockchip,rk3399-pmugrf > + - rockchip,rk3568-grf > + - rockchip,rk3568-pmugrf > + - rockchip,rv1108-grf > + - const: syscon > + - const: simple-mfd > + > + reg: > + maxItems: 1 > + > +required: > + - compatible > + - reg > + > +additionalProperties: true Never correct for a schema defining a whole node (IOW, only correct for collections of shared properties). unevaluatedProperties: false > + > +allOf: > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,px30-grf > + > + then: > + properties: > + lvds: > + description: > + Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt > + > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3288-grf > + > + then: > + properties: > + edp-phy: > + description: > + Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt > + > + usbphy: > + description: > + Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt > + > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3328-grf > + > + then: > + properties: > + gpio: > + type: object > + > + $ref: "/schemas/gpio/rockchip,rk3328-grf-gpio.yaml#" > + > + unevaluatedProperties: false > + > + power-controller: > + type: object > + > + $ref: "/schemas/power/rockchip,power-controller.yaml#" > + > + unevaluatedProperties: false > + > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3399-grf > + > + then: > + properties: > + mipi-dphy-rx0: > + type: object > + > + $ref: "/schemas/phy/rockchip-mipi-dphy-rx0.yaml#" > + > + unevaluatedProperties: false > + > + pcie-phy: > + description: > + Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt > + > + patternProperties: > + "phy@[0-9a-f]+$": > + description: > + Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - rockchip,px30-pmugrf > + - rockchip,rk3036-grf > + - rockchip,rk3308-grf > + - rockchip,rk3368-pmugrf > + > + then: > + properties: > + reboot-mode: > + type: object > + > + $ref: "/schemas/power/reset/syscon-reboot-mode.yaml#" > + > + unevaluatedProperties: false > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - rockchip,px30-usb2phy-grf > + - rockchip,rk3228-grf > + - rockchip,rk3328-usb2phy-grf > + - rockchip,rk3399-grf > + - rockchip,rv1108-grf > + > + then: > + properties: > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 1 > + > + required: > + - "#address-cells" > + - "#size-cells" > + > + patternProperties: > + "usb2-phy@[0-9a-f]+$": > + type: object > + > + $ref: "/schemas/phy/phy-rockchip-inno-usb2.yaml#" > + > + unevaluatedProperties: false > + > + - if: > + properties: > + compatible: > + contains: > + enum: > + - rockchip,px30-pmugrf > + - rockchip,px30-grf > + - rockchip,rk3228-grf > + - rockchip,rk3288-grf > + - rockchip,rk3328-grf > + - rockchip,rk3368-pmugrf > + - rockchip,rk3368-grf > + - rockchip,rk3399-pmugrf > + - rockchip,rk3399-grf > + > + then: > + properties: > + io-domains: > + description: > + Documentation/devicetree/bindings/power/rockchip-io-domain.txt > + > + unevaluatedProperties: false These 'if' sections are probably a sign that this should be separate schemas for each 'if' subset. But fine to leave as-is. > + > +examples: > + - | > + #include <dt-bindings/clock/rk3399-cru.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + #include <dt-bindings/power/rk3399-power.h> > + grf: syscon@ff770000 { > + compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd"; > + reg = <0xff770000 0x10000>; > + #address-cells = <1>; > + #size-cells = <1>; > + > + mipi_dphy_rx0: mipi-dphy-rx0 { > + compatible = "rockchip,rk3399-mipi-dphy-rx0"; > + clocks = <&cru SCLK_MIPIDPHY_REF>, > + <&cru SCLK_DPHY_RX0_CFG>, > + <&cru PCLK_VIO_GRF>; > + clock-names = "dphy-ref", "dphy-cfg", "grf"; > + power-domains = <&power RK3399_PD_VIO>; > + #phy-cells = <0>; > + }; > + > + u2phy0: usb2-phy@e450 { > + compatible = "rockchip,rk3399-usb2phy"; > + reg = <0xe450 0x10>; > + clocks = <&cru SCLK_USB2PHY0_REF>; > + clock-names = "phyclk"; > + #clock-cells = <0>; > + clock-output-names = "clk_usbphy0_480m"; > + #phy-cells = <0>; > + > + u2phy0_host: host-port { > + #phy-cells = <0>; > + interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>; > + interrupt-names = "linestate"; > + }; > + > + u2phy0_otg: otg-port { > + #phy-cells = <0>; > + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>, > + <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>, > + <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>; > + interrupt-names = "otg-bvalid", "otg-id", > + "linestate"; > + }; > + }; > + }; > -- > 2.11.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 3/4] ARM: dts: rockchip: add grf register compatible for rk3066/rk3188 2021-05-05 13:40 [PATCH v2 0/4] convert grf.txt to YAML Johan Jonker 2021-05-05 13:40 ` [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt " Johan Jonker 2021-05-05 13:40 ` [PATCH v2 2/4] dt-bindings: soc: rockchip: convert grf.txt " Johan Jonker @ 2021-05-05 13:40 ` Johan Jonker 2021-05-05 13:40 ` [PATCH v2 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi Johan Jonker 3 siblings, 0 replies; 11+ messages in thread From: Johan Jonker @ 2021-05-05 13:40 UTC (permalink / raw) To: heiko Cc: robh+dt, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel With the conversion of syscon.yaml minItems for compatibles was set to 2. Current Rockchip rk3xxx.dtsi file only uses "syscon" for the grf registers. Add "rockchip,rk3066-grf", "syscon" compatible for rk3066/rk3188 to reduce notifications produced with: make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/mfd/syscon.yaml Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 755c946f1..c34bc59c9 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -256,7 +256,7 @@ }; grf: grf@20008000 { - compatible = "syscon"; + compatible = "rockchip,rk3066-grf", "syscon"; reg = <0x20008000 0x200>; }; -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi 2021-05-05 13:40 [PATCH v2 0/4] convert grf.txt to YAML Johan Jonker ` (2 preceding siblings ...) 2021-05-05 13:40 ` [PATCH v2 3/4] ARM: dts: rockchip: add grf register compatible for rk3066/rk3188 Johan Jonker @ 2021-05-05 13:40 ` Johan Jonker 3 siblings, 0 replies; 11+ messages in thread From: Johan Jonker @ 2021-05-05 13:40 UTC (permalink / raw) To: heiko Cc: robh+dt, linus.walleij, bgolaszewski, jay.xu, shawn.lin, david.wu, zhangqing, huangtao, cl, linux-gpio, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel A test with the command below gives this error: /arch/arm64/boot/dts/rockchip/rk3328-a1.dt.yaml: syscon@ff100000: grf-gpio: {'compatible': ['rockchip,rk3328-grf-gpio'], 'gpio-controller': True, '#gpio-cells': [[2]], 'phandle': [[68]]} is not of type 'array' From schema: ~/.local/lib/python3.5/site-packages/dtschema/schemas/gpio/gpio-consumer.yaml 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 <jbx6244@gmail.com> --- 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-05-07 21:28 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-05 13:40 [PATCH v2 0/4] convert grf.txt to YAML Johan Jonker 2021-05-05 13:40 ` [PATCH v2 1/4] dt-bindings: gpio: convert rk3328-grf-gpio.txt " Johan Jonker 2021-05-07 20:48 ` Rob Herring 2021-05-07 20:59 ` Heiko Stuebner 2021-05-07 21:02 ` Rob Herring 2021-05-07 21:06 ` Heiko Stuebner 2021-05-07 21:26 ` Linus Walleij 2021-05-05 13:40 ` [PATCH v2 2/4] dt-bindings: soc: rockchip: convert grf.txt " Johan Jonker 2021-05-07 20:47 ` Rob Herring 2021-05-05 13:40 ` [PATCH v2 3/4] ARM: dts: rockchip: add grf register compatible for rk3066/rk3188 Johan Jonker 2021-05-05 13:40 ` [PATCH v2 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi Johan Jonker
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).