This patch adds USBPHY 2.0/3.0 devices support for r8a77961
(R-Car M3-W+).
Changes from v1:
- Rebase these patches on top of my patches of convert bindings to
json-schema.
- Add Reviewed-by.
https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=261195
Yoshihiro Shimoda (4):
dt-bindings: phy: renesas: usb2-phy: convert bindings to json-schema
dt-bindings: phy: renesas: usb2-phy: add r8a77961 support
dt-bindings: phy: renesas: usb3-phy: convert bindings to json-schema
dt-bindings: phy: renesas: usb3-phy: add r8a77961 support
.../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 70 --------------
.../devicetree/bindings/phy/rcar-gen3-phy-usb3.txt | 52 -----------
.../devicetree/bindings/phy/renesas,usb2-phy.yaml | 104 +++++++++++++++++++++
.../devicetree/bindings/phy/renesas,usb3-phy.yaml | 79 ++++++++++++++++
4 files changed, 183 insertions(+), 122 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb3.txt
create mode 100644 Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
create mode 100644 Documentation/devicetree/bindings/phy/renesas,usb3-phy.yaml
--
2.7.4
Convert Renesas R-Car generation 3 USB 2.0 PHY bindings documentation
to json-schema.
Signed-off-by: Yoshihiro Shimoda <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
.../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 70 --------------
.../devicetree/bindings/phy/renesas,usb2-phy.yaml | 103 +++++++++++++++++++++
2 files changed, 103 insertions(+), 70 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
create mode 100644 Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
diff --git a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
deleted file mode 100644
index 7734b21..00000000
--- a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-* Renesas R-Car generation 3 USB 2.0 PHY
-
-This file provides information on what the device node for the R-Car generation
-3, RZ/G1C, RZ/G2 and RZ/A2 USB 2.0 PHY contain.
-
-Required properties:
-- compatible: "renesas,usb2-phy-r7s9210" if the device is a part of an R7S9210
- SoC.
- "renesas,usb2-phy-r8a77470" if the device is a part of an R8A77470
- SoC.
- "renesas,usb2-phy-r8a774a1" if the device is a part of an R8A774A1
- SoC.
- "renesas,usb2-phy-r8a774b1" if the device is a part of an R8A774B1
- SoC.
- "renesas,usb2-phy-r8a774c0" if the device is a part of an R8A774C0
- SoC.
- "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795
- SoC.
- "renesas,usb2-phy-r8a7796" if the device is a part of an R8A7796
- SoC.
- "renesas,usb2-phy-r8a77965" if the device is a part of an
- R8A77965 SoC.
- "renesas,usb2-phy-r8a77990" if the device is a part of an
- R8A77990 SoC.
- "renesas,usb2-phy-r8a77995" if the device is a part of an
- R8A77995 SoC.
- "renesas,rcar-gen3-usb2-phy" for a generic R-Car Gen3, RZ/G2 or
- RZ/A2 compatible device.
-
- When compatible with the generic version, nodes must list the
- SoC-specific version corresponding to the platform first
- followed by the generic version.
-
-- reg: offset and length of the partial USB 2.0 Host register block.
-- clocks: clock phandle and specifier pair(s).
-- #phy-cells: see phy-bindings.txt in the same directory, must be <1> (and
- using <0> is deprecated).
-
-The phandle's argument in the PHY specifier is the INT_STATUS bit of controller:
-- 1 = USBH_INTA (OHCI)
-- 2 = USBH_INTB (EHCI)
-- 3 = UCOM_INT (OTG and BC)
-
-Optional properties:
-To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are
-combined, the device tree node should set interrupt properties to use the
-channel as USB OTG:
-- interrupts: interrupt specifier for the PHY.
-- vbus-supply: Phandle to a regulator that provides power to the VBUS. This
- regulator will be managed during the PHY power on/off sequence.
-- renesas,no-otg-pins: boolean, specify when a board does not provide proper
- otg pins.
-- dr_mode: string, indicates the working mode for the PHY. Can be "host",
- "peripheral", or "otg". Should be set if otg controller is not used.
-
-
-Example (R-Car H3):
-
- usb-phy@ee080200 {
- compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
- reg = <0 0xee080200 0 0x700>;
- interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&cpg CPG_MOD 703>;
- };
-
- usb-phy@ee0a0200 {
- compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
- reg = <0 0xee0a0200 0 0x700>;
- clocks = <&cpg CPG_MOD 702>;
- };
diff --git a/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
new file mode 100644
index 00000000..c0e1af6
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
@@ -0,0 +1,103 @@
+# SPDX-License-Identifier: GPL-2.0-only
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/phy/renesas,usb2-phy.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Renesas R-Car generation 3 USB 2.0 PHY
+
+maintainers:
+ - Yoshihiro Shimoda <[email protected]>
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - const: renesas,usb2-phy-r8a77470 # RZ/G1C
+
+ - items:
+ - enum:
+ - renesas,usb2-phy-r7s9210 # RZ/A2
+ - renesas,usb2-phy-r8a774a1 # RZ/G2M
+ - renesas,usb2-phy-r8a774b1 # RZ/G2N
+ - renesas,usb2-phy-r8a774c0 # RZ/G2E
+ - renesas,usb2-phy-r8a7795 # R-Car H3
+ - renesas,usb2-phy-r8a7796 # R-Car M3-W
+ - renesas,usb2-phy-r8a77965 # R-Car M3-N
+ - renesas,usb2-phy-r8a77990 # R-Car E3
+ - renesas,usb2-phy-r8a77995 # R-Car D3
+ - const: renesas,rcar-gen3-usb2-phy
+
+ reg:
+ # base address and length of the registers block for the PHY.
+ maxItems: 1
+
+ clocks:
+ # clock phandle and specifier pair(s).
+ minItems: 1
+ maxItems: 2
+
+ clock-names:
+ # for RZ/A2
+ minItems: 1
+ maxItems: 2
+ items:
+ - const: fck
+ - const: usb_x1
+
+ '#phy-cells':
+ enum: [0, 1] # and 0 is deprecated.
+
+ interrupts:
+ maxItems: 1
+
+ power-domains:
+ maxItems: 1
+
+ resets:
+ minItems: 1
+ maxItems: 2
+ items:
+ - description: reset of USB 2.0 host side
+ - description: reset of USB 2.0 peripheral side
+
+ vbus-supply:
+ description: |
+ Phandle to a regulator that provides power to the VBUS. This regulator
+ will be managed during the PHY power on/off sequence.
+
+ renesas,no-otg-pins:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description: |
+ specify when a board does not provide proper otg pins.
+
+ dr_mode: true
+
+required:
+ - compatible
+ - reg
+ - clocks
+ - '#phy-cells'
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/power/r8a7795-sysc.h>
+
+ usb-phy@ee080200 {
+ compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
+ reg = <0 0xee080200 0 0x700>;
+ interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 703>;
+ #phy-cells = <1>;
+ };
+
+ usb-phy@ee0a0200 {
+ compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
+ reg = <0 0xee0a0200 0 0x700>;
+ clocks = <&cpg CPG_MOD 702>;
+ #phy-cells = <1>;
+ };
--
2.7.4
Hi Shimoda-san,
On Thu, Mar 26, 2020 at 6:30 AM Yoshihiro Shimoda
<[email protected]> wrote:
> Convert Renesas R-Car generation 3 USB 2.0 PHY bindings documentation
> to json-schema.
>
> Signed-off-by: Yoshihiro Shimoda <[email protected]>
> Reviewed-by: Rob Herring <[email protected]>
Thanks for your patch!
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
> @@ -0,0 +1,103 @@
> +# SPDX-License-Identifier: GPL-2.0-only
I think Rob would prefer to see
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> + reg:
> + # base address and length of the registers block for the PHY.
The comment is not needed.
> + maxItems: 1
> +
> + clocks:
> + # clock phandle and specifier pair(s).
Likewise.
> + minItems: 1
> + maxItems: 2
> +
> + clock-names:
> + # for RZ/A2
if:
properties:
compatible:
items:
enum:
- renesas,usb2-phy-r7s9210
> + minItems: 1
> + maxItems: 2
> + items:
> + - const: fck
> + - const: usb_x1
> +examples:
> + - |
> + #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> + #include <dt-bindings/power/r8a7795-sysc.h>
> +
> + usb-phy@ee080200 {
> + compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
> + reg = <0 0xee080200 0 0x700>;
Examples are built with #{address,size}-cells = <1>, so
reg = <0xee080200 0x700>;
> + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&cpg CPG_MOD 703>;
> + #phy-cells = <1>;
> + };
> +
> + usb-phy@ee0a0200 {
> + compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
> + reg = <0 0xee0a0200 0 0x700>;
reg = <0xee0a0200 0x700>;
> + clocks = <&cpg CPG_MOD 702>;
> + #phy-cells = <1>;
> + };
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert-san,
Thank you for your review!
> From: Geert Uytterhoeven, Sent: Thursday, March 26, 2020 6:00 PM
<snip>
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/phy/renesas,usb2-phy.yaml
> > @@ -0,0 +1,103 @@
> > +# SPDX-License-Identifier: GPL-2.0-only
>
> I think Rob would prefer to see
>
> # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
I'll fix it.
> > + reg:
> > + # base address and length of the registers block for the PHY.
>
> The comment is not needed.
OK. I'll remove it.
> > + maxItems: 1
> > +
> > + clocks:
> > + # clock phandle and specifier pair(s).
>
> Likewise.
I got it.
> > + minItems: 1
> > + maxItems: 2
> > +
> > + clock-names:
> > + # for RZ/A2
>
> if:
> properties:
> compatible:
> items:
> enum:
> - renesas,usb2-phy-r7s9210
Thank you for the proposal. I'll fix it.
> > + minItems: 1
> > + maxItems: 2
> > + items:
> > + - const: fck
> > + - const: usb_x1
>
> > +examples:
> > + - |
> > + #include <dt-bindings/clock/r8a7795-cpg-mssr.h>
> > + #include <dt-bindings/interrupt-controller/arm-gic.h>
> > + #include <dt-bindings/power/r8a7795-sysc.h>
> > +
> > + usb-phy@ee080200 {
> > + compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
> > + reg = <0 0xee080200 0 0x700>;
>
> Examples are built with #{address,size}-cells = <1>, so
>
> reg = <0xee080200 0x700>;
I got it. I'll fix it.
> > + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> > + clocks = <&cpg CPG_MOD 703>;
> > + #phy-cells = <1>;
> > + };
> > +
> > + usb-phy@ee0a0200 {
> > + compatible = "renesas,usb2-phy-r8a7795", "renesas,rcar-gen3-usb2-phy";
> > + reg = <0 0xee0a0200 0 0x700>;
>
> reg = <0xee0a0200 0x700>;
Yes, I'll fix it.
Best regards,
Yoshihiro Shimoda