* [PATCH v5 1/4] dt-bindings: phy: convert rockchip-usb-phy.txt to YAML
2021-05-12 12:23 [PATCH v5 0/4] convert grf.txt to YAML Johan Jonker
@ 2021-05-12 12:23 ` Johan Jonker
2021-05-18 1:04 ` Rob Herring
2021-05-12 12:23 ` [PATCH v5 2/4] dt-bindings: soc: rockchip: convert grf.txt " Johan Jonker
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Johan Jonker @ 2021-05-12 12:23 UTC (permalink / raw)
To: heiko
Cc: robh+dt, linus.walleij, kishon, vkoul, jay.xu, shawn.lin,
david.wu, zhangqing, huangtao, cl, linux-phy, linux-rockchip,
devicetree, linux-arm-kernel, linux-kernel
Current dts files with Rockchip 'usbphy' nodes are manually verified.
In order to automate this process rockchip-usb-phy.txt has to be
converted to YAML.
Add "#phy-cells", because it is a required property
by phy-provider.yaml
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
.../devicetree/bindings/phy/rockchip-usb-phy.txt | 52 -------------
.../devicetree/bindings/phy/rockchip-usb-phy.yaml | 86 ++++++++++++++++++++++
2 files changed, 86 insertions(+), 52 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
create mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
deleted file mode 100644
index 4ed569046..000000000
--- a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ROCKCHIP USB2 PHY
-
-Required properties:
- - compatible: matching the soc type, one of
- "rockchip,rk3066a-usb-phy"
- "rockchip,rk3188-usb-phy"
- "rockchip,rk3288-usb-phy"
- - #address-cells: should be 1
- - #size-cells: should be 0
-
-Deprecated properties:
- - rockchip,grf : phandle to the syscon managing the "general
- register files" - phy should be a child of the GRF instead
-
-Sub-nodes:
-Each PHY should be represented as a sub-node.
-
-Sub-nodes
-required properties:
-- #phy-cells: should be 0
-- reg: PHY configure reg address offset in GRF
- "0x320" - for PHY attach to OTG controller
- "0x334" - for PHY attach to HOST0 controller
- "0x348" - for PHY attach to HOST1 controller
-
-Optional Properties:
-- clocks : phandle + clock specifier for the phy clocks
-- clock-names: string, clock name, must be "phyclk"
-- #clock-cells: for users of the phy-pll, should be 0
-- reset-names: Only allow the following entries:
- - phy-reset
-- resets: Must contain an entry for each entry in reset-names.
-- vbus-supply: power-supply phandle for vbus power source
-
-Example:
-
-grf: syscon@ff770000 {
- compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
-
-...
-
- usbphy: phy {
- compatible = "rockchip,rk3288-usb-phy";
- #address-cells = <1>;
- #size-cells = <0>;
-
- usbphy0: usb-phy0 {
- #phy-cells = <0>;
- reg = <0x320>;
- };
- };
-};
diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
new file mode 100644
index 000000000..3b6b39da0
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
@@ -0,0 +1,86 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/phy/rockchip-usb-phy.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Rockchip USB2.0 phy
+
+maintainers:
+ - Heiko Stuebner <heiko@sntech.de>
+
+properties:
+ compatible:
+ oneOf:
+ - const: rockchip,rk3288-usb-phy
+ - items:
+ - enum:
+ - rockchip,rk3066a-usb-phy
+ - rockchip,rk3188-usb-phy
+ - const: rockchip,rk3288-usb-phy
+
+ "#phy-cells":
+ const: 0
+
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 0
+
+required:
+ - compatible
+ - "#phy-cells"
+ - "#address-cells"
+ - "#size-cells"
+
+additionalProperties: false
+
+patternProperties:
+ "usb-phy@[0-9a-f]+$":
+ type: object
+
+ properties:
+ reg:
+ maxItems: 1
+
+ "#phy-cells":
+ const: 0
+
+ clocks:
+ maxItems: 1
+
+ clock-names:
+ const: phyclk
+
+ "#clock-cells":
+ const: 0
+
+ resets:
+ maxItems: 1
+
+ reset-names:
+ const: phy-reset
+
+ vbus-supply:
+ description: phandle for vbus power source
+
+ required:
+ - reg
+ - "#phy-cells"
+
+ additionalProperties: false
+
+examples:
+ - |
+ usbphy: usbphy {
+ compatible = "rockchip,rk3288-usb-phy";
+ #phy-cells = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ usbphy0: usb-phy@320 {
+ reg = <0x320>;
+ #phy-cells = <0>;
+ };
+ };
--
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 v5 1/4] dt-bindings: phy: convert rockchip-usb-phy.txt to YAML
2021-05-12 12:23 ` [PATCH v5 1/4] dt-bindings: phy: convert rockchip-usb-phy.txt " Johan Jonker
@ 2021-05-18 1:04 ` Rob Herring
0 siblings, 0 replies; 11+ messages in thread
From: Rob Herring @ 2021-05-18 1:04 UTC (permalink / raw)
To: Johan Jonker
Cc: heiko, linus.walleij, kishon, vkoul, jay.xu, shawn.lin, david.wu,
zhangqing, huangtao, cl, linux-phy, linux-rockchip, devicetree,
linux-arm-kernel, linux-kernel
On Wed, May 12, 2021 at 02:23:43PM +0200, Johan Jonker wrote:
> Current dts files with Rockchip 'usbphy' nodes are manually verified.
> In order to automate this process rockchip-usb-phy.txt has to be
> converted to YAML.
>
> Add "#phy-cells", because it is a required property
> by phy-provider.yaml
Maybe we should relax that. Or changing the node name would solve it.
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
> .../devicetree/bindings/phy/rockchip-usb-phy.txt | 52 -------------
> .../devicetree/bindings/phy/rockchip-usb-phy.yaml | 86 ++++++++++++++++++++++
> 2 files changed, 86 insertions(+), 52 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
> create mode 100644 Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
>
> diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
> deleted file mode 100644
> index 4ed569046..000000000
> --- a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -ROCKCHIP USB2 PHY
> -
> -Required properties:
> - - compatible: matching the soc type, one of
> - "rockchip,rk3066a-usb-phy"
> - "rockchip,rk3188-usb-phy"
> - "rockchip,rk3288-usb-phy"
> - - #address-cells: should be 1
> - - #size-cells: should be 0
> -
> -Deprecated properties:
> - - rockchip,grf : phandle to the syscon managing the "general
> - register files" - phy should be a child of the GRF instead
> -
> -Sub-nodes:
> -Each PHY should be represented as a sub-node.
> -
> -Sub-nodes
> -required properties:
> -- #phy-cells: should be 0
> -- reg: PHY configure reg address offset in GRF
> - "0x320" - for PHY attach to OTG controller
> - "0x334" - for PHY attach to HOST0 controller
> - "0x348" - for PHY attach to HOST1 controller
> -
> -Optional Properties:
> -- clocks : phandle + clock specifier for the phy clocks
> -- clock-names: string, clock name, must be "phyclk"
> -- #clock-cells: for users of the phy-pll, should be 0
> -- reset-names: Only allow the following entries:
> - - phy-reset
> -- resets: Must contain an entry for each entry in reset-names.
> -- vbus-supply: power-supply phandle for vbus power source
> -
> -Example:
> -
> -grf: syscon@ff770000 {
> - compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
> -
> -...
> -
> - usbphy: phy {
> - compatible = "rockchip,rk3288-usb-phy";
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - usbphy0: usb-phy0 {
> - #phy-cells = <0>;
> - reg = <0x320>;
> - };
> - };
> -};
> diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
> new file mode 100644
> index 000000000..3b6b39da0
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.yaml
> @@ -0,0 +1,86 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/phy/rockchip-usb-phy.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Rockchip USB2.0 phy
> +
> +maintainers:
> + - Heiko Stuebner <heiko@sntech.de>
> +
> +properties:
> + compatible:
> + oneOf:
> + - const: rockchip,rk3288-usb-phy
> + - items:
> + - enum:
> + - rockchip,rk3066a-usb-phy
> + - rockchip,rk3188-usb-phy
> + - const: rockchip,rk3288-usb-phy
> +
> + "#phy-cells":
> + const: 0
If we did add this, we'd want it to be 1 so we could identify which phy.
> +
> + "#address-cells":
> + const: 1
> +
> + "#size-cells":
> + const: 0
> +
> +required:
> + - compatible
> + - "#phy-cells"
> + - "#address-cells"
> + - "#size-cells"
> +
> +additionalProperties: false
> +
> +patternProperties:
> + "usb-phy@[0-9a-f]+$":
> + type: object
> +
> + properties:
> + reg:
> + maxItems: 1
> +
> + "#phy-cells":
> + const: 0
> +
> + clocks:
> + maxItems: 1
> +
> + clock-names:
> + const: phyclk
> +
> + "#clock-cells":
> + const: 0
> +
> + resets:
> + maxItems: 1
> +
> + reset-names:
> + const: phy-reset
> +
> + vbus-supply:
> + description: phandle for vbus power source
> +
> + required:
> + - reg
> + - "#phy-cells"
> +
> + additionalProperties: false
> +
> +examples:
> + - |
> + usbphy: usbphy {
> + compatible = "rockchip,rk3288-usb-phy";
> + #phy-cells = <0>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + usbphy0: usb-phy@320 {
> + reg = <0x320>;
> + #phy-cells = <0>;
> + };
> + };
> --
> 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 v5 2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML
2021-05-12 12:23 [PATCH v5 0/4] convert grf.txt to YAML Johan Jonker
2021-05-12 12:23 ` [PATCH v5 1/4] dt-bindings: phy: convert rockchip-usb-phy.txt " Johan Jonker
@ 2021-05-12 12:23 ` Johan Jonker
2021-05-13 2:28 ` Rob Herring
2021-05-12 12:23 ` [PATCH v5 3/4] ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188 Johan Jonker
` (3 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Johan Jonker @ 2021-05-12 12:23 UTC (permalink / raw)
To: heiko
Cc: robh+dt, linus.walleij, kishon, vkoul, jay.xu, shawn.lin,
david.wu, zhangqing, huangtao, cl, linux-phy, 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.
Changed compatibles:
"rockchip,rk3066-grf", "syscon", "simple-mfd"
"rockchip,rk3188-grf", "syscon", "simple-mfd"
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 V5:
changed compatibles for rk3066/rk3188
add rockchip-usb-phy.yaml
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
---
.../devicetree/bindings/soc/rockchip/grf.txt | 61 -----
.../devicetree/bindings/soc/rockchip/grf.yaml | 260 +++++++++++++++++++++
2 files changed, 260 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..84bdaf88d
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
@@ -0,0 +1,260 @@
+# 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>
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - 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,rk3066-grf
+ - rockchip,rk3188-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
+
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 1
+
+required:
+ - compatible
+ - reg
+
+additionalProperties:
+ type: object
+
+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
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - rockchip,rk3066-grf
+ - rockchip,rk3188-grf
+ - rockchip,rk3288-grf
+
+ then:
+ properties:
+ usbphy:
+ type: object
+
+ $ref: "/schemas/phy/rockchip-usb-phy.yaml#"
+
+ unevaluatedProperties: false
+
+ - 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:
+ 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
+
+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 v5 2/4] dt-bindings: soc: rockchip: convert grf.txt to YAML
2021-05-12 12:23 ` [PATCH v5 2/4] dt-bindings: soc: rockchip: convert grf.txt " Johan Jonker
@ 2021-05-13 2:28 ` Rob Herring
0 siblings, 0 replies; 11+ messages in thread
From: Rob Herring @ 2021-05-13 2:28 UTC (permalink / raw)
To: Johan Jonker
Cc: kishon, vkoul, huangtao, cl, linux-arm-kernel, jay.xu, heiko,
david.wu, linus.walleij, zhangqing, linux-phy, devicetree,
linux-kernel, shawn.lin, robh+dt, linux-rockchip
On Wed, 12 May 2021 14:23:44 +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.
>
> Changed compatibles:
> "rockchip,rk3066-grf", "syscon", "simple-mfd"
> "rockchip,rk3188-grf", "syscon", "simple-mfd"
>
> 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 V5:
> changed compatibles for rk3066/rk3188
> add rockchip-usb-phy.yaml
>
> 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
> ---
> .../devicetree/bindings/soc/rockchip/grf.txt | 61 -----
> .../devicetree/bindings/soc/rockchip/grf.yaml | 260 +++++++++++++++++++++
> 2 files changed, 260 insertions(+), 61 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt
> create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.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
* [PATCH v5 3/4] ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188
2021-05-12 12:23 [PATCH v5 0/4] convert grf.txt to YAML Johan Jonker
2021-05-12 12:23 ` [PATCH v5 1/4] dt-bindings: phy: convert rockchip-usb-phy.txt " Johan Jonker
2021-05-12 12:23 ` [PATCH v5 2/4] dt-bindings: soc: rockchip: convert grf.txt " Johan Jonker
@ 2021-05-12 12:23 ` Johan Jonker
2021-05-12 12:23 ` [PATCH v5 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi Johan Jonker
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Johan Jonker @ 2021-05-12 12:23 UTC (permalink / raw)
To: heiko
Cc: robh+dt, linus.walleij, kishon, vkoul, jay.xu, shawn.lin,
david.wu, zhangqing, huangtao, cl, linux-phy, linux-rockchip,
devicetree, linux-arm-kernel, linux-kernel
With grf.txt converted to YAML a lot of compatibles
did not have 'simple-mfd' added in the old binding.
That implies that if you have child nodes they need
to be documented.
Make the new layout fit for rk3066/rk3188,
move and restyle the grf nodes.
Remove rockchip,grf from usbphy node.
Add "#phy-cells", because it is a required property
by phy-provider.yaml
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 "syscon", "simple-mfd"
compatible for rk3066/rk3188 to reduce notifications produced with:
make ARCH=arm dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/mfd/syscon.yaml
Changed compatibles:
"rockchip,rk3066-grf", "syscon", "simple-mfd"
"rockchip,rk3188-grf", "syscon", "simple-mfd"
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
arch/arm/boot/dts/rk3066a.dtsi | 53 +++++++++++++++++++++++-------------------
arch/arm/boot/dts/rk3188.dtsi | 53 +++++++++++++++++++++++-------------------
arch/arm/boot/dts/rk3xxx.dtsi | 2 +-
3 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 8e087c34b..30dcf557e 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -266,30 +266,6 @@
status = "disabled";
};
- usbphy: phy {
- compatible = "rockchip,rk3066a-usb-phy", "rockchip,rk3288-usb-phy";
- rockchip,grf = <&grf>;
- #address-cells = <1>;
- #size-cells = <0>;
- status = "disabled";
-
- usbphy0: usb-phy@17c {
- #phy-cells = <0>;
- reg = <0x17c>;
- clocks = <&cru SCLK_OTGPHY0>;
- clock-names = "phyclk";
- #clock-cells = <0>;
- };
-
- usbphy1: usb-phy@188 {
- #phy-cells = <0>;
- reg = <0x188>;
- clocks = <&cru SCLK_OTGPHY1>;
- clock-names = "phyclk";
- #clock-cells = <0>;
- };
- };
-
pinctrl: pinctrl {
compatible = "rockchip,rk3066a-pinctrl";
rockchip,grf = <&grf>;
@@ -702,6 +678,35 @@
power-domains = <&power RK3066_PD_GPU>;
};
+&grf {
+ compatible = "rockchip,rk3066-grf", "syscon", "simple-mfd";
+
+ usbphy: usbphy {
+ compatible = "rockchip,rk3066a-usb-phy",
+ "rockchip,rk3288-usb-phy";
+ #phy-cells = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+
+ usbphy0: usb-phy@17c {
+ reg = <0x17c>;
+ clocks = <&cru SCLK_OTGPHY0>;
+ clock-names = "phyclk";
+ #clock-cells = <0>;
+ #phy-cells = <0>;
+ };
+
+ usbphy1: usb-phy@188 {
+ reg = <0x188>;
+ clocks = <&cru SCLK_OTGPHY1>;
+ clock-names = "phyclk";
+ #clock-cells = <0>;
+ #phy-cells = <0>;
+ };
+ };
+};
+
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_xfer>;
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index f438170b4..41a912acb 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -214,30 +214,6 @@
};
};
- usbphy: phy {
- compatible = "rockchip,rk3188-usb-phy", "rockchip,rk3288-usb-phy";
- rockchip,grf = <&grf>;
- #address-cells = <1>;
- #size-cells = <0>;
- status = "disabled";
-
- usbphy0: usb-phy@10c {
- #phy-cells = <0>;
- reg = <0x10c>;
- clocks = <&cru SCLK_OTGPHY0>;
- clock-names = "phyclk";
- #clock-cells = <0>;
- };
-
- usbphy1: usb-phy@11c {
- #phy-cells = <0>;
- reg = <0x11c>;
- clocks = <&cru SCLK_OTGPHY1>;
- clock-names = "phyclk";
- #clock-cells = <0>;
- };
- };
-
pinctrl: pinctrl {
compatible = "rockchip,rk3188-pinctrl";
rockchip,grf = <&grf>;
@@ -637,6 +613,35 @@
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
};
+&grf{
+ compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd";
+
+ usbphy: usbphy {
+ compatible = "rockchip,rk3188-usb-phy",
+ "rockchip,rk3288-usb-phy";
+ #phy-cells = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+
+ usbphy0: usb-phy@10c {
+ reg = <0x10c>;
+ clocks = <&cru SCLK_OTGPHY0>;
+ clock-names = "phyclk";
+ #clock-cells = <0>;
+ #phy-cells = <0>;
+ };
+
+ usbphy1: usb-phy@11c {
+ reg = <0x11c>;
+ clocks = <&cru SCLK_OTGPHY1>;
+ clock-names = "phyclk";
+ #clock-cells = <0>;
+ #phy-cells = <0>;
+ };
+ };
+};
+
&gpu {
compatible = "rockchip,rk3188-mali", "arm,mali-400";
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 755c946f1..d473552e8 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 = "syscon", "simple-mfd";
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 v5 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi
2021-05-12 12:23 [PATCH v5 0/4] convert grf.txt to YAML Johan Jonker
` (2 preceding siblings ...)
2021-05-12 12:23 ` [PATCH v5 3/4] ARM: dts: rockchip: move and restyle grf nodes rk3066/rk3188 Johan Jonker
@ 2021-05-12 12:23 ` Johan Jonker
2021-05-14 16:37 ` (subset) [PATCH v5 0/4] convert grf.txt to YAML Heiko Stuebner
2021-05-31 11:57 ` Heiko Stuebner
5 siblings, 0 replies; 11+ messages in thread
From: Johan Jonker @ 2021-05-12 12:23 UTC (permalink / raw)
To: heiko
Cc: robh+dt, linus.walleij, kishon, vkoul, jay.xu, shawn.lin,
david.wu, zhangqing, huangtao, cl, linux-phy, 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'
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* Re: (subset) [PATCH v5 0/4] convert grf.txt to YAML
2021-05-12 12:23 [PATCH v5 0/4] convert grf.txt to YAML Johan Jonker
` (3 preceding siblings ...)
2021-05-12 12:23 ` [PATCH v5 4/4] arm64: dts: rename grf-gpio nodename in rk3328.dtsi Johan Jonker
@ 2021-05-14 16:37 ` Heiko Stuebner
2021-05-19 15:17 ` Rob Herring
2021-05-31 11:57 ` Heiko Stuebner
5 siblings, 1 reply; 11+ messages in thread
From: Heiko Stuebner @ 2021-05-14 16:37 UTC (permalink / raw)
To: Johan Jonker
Cc: Heiko Stuebner, linux-kernel, devicetree, robh+dt, linus.walleij,
linux-phy, linux-rockchip, vkoul, shawn.lin, david.wu, cl,
linux-arm-kernel, kishon, huangtao, zhangqing, jay.xu
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 <heiko@sntech.de>
_______________________________________________
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: (subset) [PATCH v5 0/4] convert grf.txt to YAML
2021-05-14 16:37 ` (subset) [PATCH v5 0/4] convert grf.txt to YAML Heiko Stuebner
@ 2021-05-19 15:17 ` Rob Herring
2021-05-19 23:18 ` Heiko Stübner
0 siblings, 1 reply; 11+ messages in thread
From: Rob Herring @ 2021-05-19 15:17 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Johan Jonker, linux-kernel, devicetree, Linus Walleij, linux-phy,
open list:ARM/Rockchip SoC...,
Vinod, Shawn Lin, David Wu, Liang Chen, linux-arm-kernel,
Kishon Vijay Abraham I, Tao Huang, Elaine Zhang, Jianqun Xu
On Fri, May 14, 2021 at 11:37 AM Heiko Stuebner <heiko@sntech.de> 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 <heiko@sntech.de>
_______________________________________________
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: (subset) [PATCH v5 0/4] convert grf.txt to YAML
2021-05-19 15:17 ` Rob Herring
@ 2021-05-19 23:18 ` Heiko Stübner
0 siblings, 0 replies; 11+ messages in thread
From: Heiko Stübner @ 2021-05-19 23:18 UTC (permalink / raw)
To: Rob Herring
Cc: Johan Jonker, linux-kernel, devicetree, Linus Walleij, linux-phy,
open list:ARM/Rockchip SoC...,
Vinod, Shawn Lin, David Wu, Liang Chen, linux-arm-kernel,
Kishon Vijay Abraham I, Tao Huang, Elaine Zhang, Jianqun Xu
Am Mittwoch, 19. Mai 2021, 17:17:44 CEST schrieb Rob Herring:
> On Fri, May 14, 2021 at 11:37 AM Heiko Stuebner <heiko@sntech.de> 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 <heiko@sntech.de>
>
_______________________________________________
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: (subset) [PATCH v5 0/4] convert grf.txt to YAML
2021-05-12 12:23 [PATCH v5 0/4] convert grf.txt to YAML Johan Jonker
` (4 preceding siblings ...)
2021-05-14 16:37 ` (subset) [PATCH v5 0/4] convert grf.txt to YAML Heiko Stuebner
@ 2021-05-31 11:57 ` Heiko Stuebner
5 siblings, 0 replies; 11+ messages in thread
From: Heiko Stuebner @ 2021-05-31 11:57 UTC (permalink / raw)
To: Johan Jonker
Cc: Heiko Stuebner, huangtao, kishon, linux-phy, devicetree,
david.wu, jay.xu, zhangqing, shawn.lin, cl, linus.walleij,
robh+dt, linux-kernel, linux-arm-kernel, linux-rockchip, vkoul
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 <heiko@sntech.de>
_______________________________________________
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