usb: cdns,usb3: Convert DT binding to YAML
v2 cover usb: cdns,usb3: Convert DT binding to YAML
Hi,
This series converts DT binding to YAML schema. Then adds a new property to enable workaround for USB2.0 PHY Rx compliance issues.
cheers,
-roger
Changelog:
v2:
- updated commit log to better describe why DT property is required for the quirk.
Pawel Laszczak (1):
usb: cdns3: Enable workaround for USB2.0 PHY Rx compliance test PHY
lockup
Roger Quadros (2):
dt-bindings: usb: Convert cdns-usb3.txt to YAML schema
dt-bindings: usb: cdns,usb3: Add cdns,phyrst-a-enable property
.../devicetree/bindings/usb/cdns,usb3.yaml | 93 +++++++++++++++++++ .../devicetree/bindings/usb/cdns-usb3.txt | 45 --------- drivers/usb/cdns3/core.c | 2 + drivers/usb/cdns3/core.h | 1 + drivers/usb/cdns3/drd.c | 12 +++ drivers/usb/cdns3/drd.h | 5 +- 6 files changed, 112 insertions(+), 46 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/cdns,usb3.yaml delete mode 100644 Documentation/devicetree/bindings/usb/cdns-usb3.txt
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
PATCH v2 1/3 dt-bindings: usb: Convert cdns-usb3.txt to YAML schema
Converts cdns-usb3.txt to YAML schema cdns,usb3.yaml
--- .../devicetree/bindings/usb/cdns,usb3.yaml | 89 +++++++++++++++++++ .../devicetree/bindings/usb/cdns-usb3.txt | 45 ---------- 2 files changed, 89 insertions(+), 45 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/cdns,usb3.yaml delete mode 100644 Documentation/devicetree/bindings/usb/cdns-usb3.txt
Documentation/devicetree/bindings/usb/cdns,usb3.yaml new file +89 -0
@@ -0,0 +1,89 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/cdns,usb3.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence USBSS-DRD controller bindings + +maintainers: + - Pawel Laszczak <[email protected]> + +properties: + compatible: + oneOf: + - const: cdns,usb3 + + reg: + items: + - description: OTG controller registers + - description: XHCI Host controller registers + - description: DEVICE controller registers + + reg-names: + items: + - const: otg + - const: xhci + - const: dev + + interrupts: + items: + - description: OTG/DRD controller interrupt + - description: XHCI host controller interrupt + - description: Device controller interrupt + + interrupt-names: + items: + - const: host + - const: peripheral + - const: otg + + dr_mode: + enum: [host, otg, peripheral] + + maximum-speed: + enum: [super-speed, high-speed, full-speed] + + phys: + minItems: 1 + maxItems: 2 + + phy-names: + minItems: 1 + maxItems: 2 + + cdns,on-chip-buff-size: + description: + size of memory intended as internal memory for endpoints + buffers expressed in KB + $ref: /schemas/types.yaml#/definitions/uint32 + +required: + - compatible + - reg + - reg-names + - interrupts + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + bus { + #address-cells = <2>; + #size-cells = <2>; + + usb@6000000 { + compatible = "cdns,usb3"; + reg = <0x00 0x6000000 0x00 0x10000>, + <0x00 0x6010000 0x00 0x10000>, + <0x00 0x6020000 0x00 0x10000>; + reg-names = "otg", "xhci", "dev"; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "host", "peripheral", "otg"; + maximum-speed = "super-speed"; + dr_mode = "otg"; + }; + };
Documentation/devicetree/bindings/usb/cdns-usb3.txt deleted +0 -45
45 lines not on this page · raw message
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v2 1/3] dt-bindings: usb: Convert cdns-usb3.txt to YAML schema
Hi,
Quoted 6 lines · Roger Quadros
Converts cdns-usb3.txt to YAML schema cdns,usb3.yaml
Signed-off-by Roger Quadros <[email protected]>--- .../devicetree/bindings/usb/cdns,usb3.yaml | 89 +++++++++++++++++++ .../devicetree/bindings/usb/cdns-usb3.txt | 45 ----------
Rob, should I wait for your Ack on yaml conversions?
Signature · 1 line
balbi
Rob Herring
maintainerRe: [PATCH v2 1/3] dt-bindings: usb: Convert cdns-usb3.txt to YAML schema
In reply to Roger QuadrosQuoted 21 lines · Roger Quadros
Converts cdns-usb3.txt to YAML schema cdns,usb3.yaml
Signed-off-by Roger Quadros <[email protected]>--- .../devicetree/bindings/usb/cdns,usb3.yaml | 89 +++++++++++++++++++ .../devicetree/bindings/usb/cdns-usb3.txt | 45 ---------- 2 files changed, 89 insertions(+), 45 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/cdns,usb3.yaml delete mode 100644 Documentation/devicetree/bindings/usb/cdns-usb3.txtDocumentation/devicetree/bindings/usb/cdns,usb3.yaml new file +5
-0@@ -0,0 +1,89 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/usb/cdns,usb3.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml#
Documentation/devicetree/bindings/usb/cdns,usb3.yaml line 15
Quoted 10 lines
Documentation/devicetree/bindings/usb/cdns,usb3.yaml new file +10
-0+ +title: Cadence USBSS-DRD controller bindings + +maintainers: + - Pawel Laszczak <[email protected]> + +properties: + compatible: + oneOf: + - const: cdns,usb3
Don't need 'oneOf' with only 1 entry.
Quoted 28 lines
Documentation/devicetree/bindings/usb/cdns,usb3.yaml new file +28
-0+ + reg: + items: + - description: OTG controller registers + - description: XHCI Host controller registers + - description: DEVICE controller registers + + reg-names: + items: + - const: otg + - const: xhci + - const: dev + + interrupts: + items: + - description: OTG/DRD controller interrupt + - description: XHCI host controller interrupt + - description: Device controller interrupt + + interrupt-names: + items: + - const: host + - const: peripheral + - const: otg + + dr_mode: + enum: [host, otg, peripheral] +
Documentation/devicetree/bindings/usb/cdns,usb3.yaml line 53
Quoted 10 lines
Documentation/devicetree/bindings/usb/cdns,usb3.yaml new file +10
-0+ maximum-speed: + enum: [super-speed, high-speed, full-speed] + + phys: + minItems: 1 + maxItems: 2 + + phy-names: + minItems: 1 + maxItems: 2
Need to define the names and what each entry is.
Quoted 91 lines
Documentation/devicetree/bindings/usb/cdns,usb3.yaml new file +36
-0+ + cdns,on-chip-buff-size: + description: + size of memory intended as internal memory for endpoints + buffers expressed in KB + $ref: /schemas/types.yaml#/definitions/uint32 + +required: + - compatible + - reg + - reg-names + - interrupts + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + bus { + #address-cells = <2>; + #size-cells = <2>; + + usb@6000000 { + compatible = "cdns,usb3"; + reg = <0x00 0x6000000 0x00 0x10000>, + <0x00 0x6010000 0x00 0x10000>, + <0x00 0x6020000 0x00 0x10000>; + reg-names = "otg", "xhci", "dev"; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "host", "peripheral", "otg"; + maximum-speed = "super-speed"; + dr_mode = "otg"; + }; + };Documentation/devicetree/bindings/usb/cdns-usb3.txt deleted +0
-45@@ -1,45 +0,0 @@ -Binding for the Cadence USBSS-DRD controller - -Required properties: - - reg: Physical base address and size of the controller's register areas. - Controller has 3 different regions: - - HOST registers area - - DEVICE registers area - - OTG/DRD registers area - - reg-names - register memory area names: - "xhci" - for HOST registers space - "dev" - for DEVICE registers space - "otg" - for OTG/DRD registers space - - compatible: Should contain: "cdns,usb3" - - interrupts: Interrupts used by cdns3 controller: - "host" - interrupt used by XHCI driver. - "peripheral" - interrupt used by device driver - "otg" - interrupt used by DRD/OTG part of driver - -Optional properties: - - maximum-speed : valid arguments are "super-speed", "high-speed" and - "full-speed"; refer to usb/generic.txt - - dr_mode: Should be one of "host", "peripheral" or "otg". - - phys: reference to the USB PHY - - phy-names: from the *Generic PHY* bindings; - Supported names are: - - cdns3,usb2-phy - - cdns3,usb3-phy - - - cdns,on-chip-buff-size : size of memory intended as internal memory for endpoints - buffers expressed in KB - -Example: - usb@f3000000 { - compatible = "cdns,usb3"; - interrupts = <GIC_USB_IRQ 7 IRQ_TYPE_LEVEL_HIGH>, - <GIC_USB_IRQ 7 IRQ_TYPE_LEVEL_HIGH>, - <GIC_USB_IRQ 8 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "host", "peripheral", "otg"; - reg = <0xf3000000 0x10000>, /* memory area for HOST registers */ - <0xf3010000 0x10000>, /* memory area for DEVICE registers */ - <0xf3020000 0x10000>; /* memory area for OTG/DRD registers */ - reg-names = "xhci", "dev", "otg"; - phys = <&usb2_phy>, <&usb3_phy>; - phy-names = "cdns3,usb2-phy", "cnds3,usb3-phy"; - };Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
PATCH v2 2/3 dt-bindings: usb: cdns,usb3: Add cdns,phyrst-a-enable property
In reply to Roger QuadrosController version 0x0002450D has USB2 PHY RX sensitivity issues that needs to be worked around by enabling phyrst-a-enable bit in PHYRST_CFG register.
There is no way to know controller version before device controller is started and the workaround needs to be applied for both host and device modes, so we add this DT property.
--- Documentation/devicetree/bindings/usb/cdns,usb3.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/usb/cdns,usb3.yaml +4 -0
@@ -58,6 +58,10 @@ properties: buffers expressed in KB $ref: /schemas/types.yaml#/definitions/uint32 + cdns,phyrst-a-enable: + description: Enable resetting of PHY if Rx fail is detected + type: boolean + required: - compatible - reg
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Re: [PATCH v2 2/3] dt-bindings: usb: cdns,usb3: Add cdns,phyrst-a-enable property
Quoted 4 lines · Roger Quadros
Controller version
0x0002450Dhas USB2 PHY RX sensitivity issues that needs to be worked around by enabling phyrst-a-enable bit inPHYRST_CFGregister.
Quoted 9 lines
There is no way to know controller version before device controller is started and the workaround needs to be applied for both host and device modes, so we add this DT property.
Signed-off-by Roger Quadros <[email protected]>--- Documentation/devicetree/bindings/usb/cdns,usb3.yaml | 4 ++++ 1 file changed, 4 insertions(+)
PATCH v2 3/3 usb: cdns3: Enable workaround for USB2.0 PHY Rx compliance test PHY lockup
In reply to Roger QuadrosFrom: Pawel Laszczak <[email protected]>
USB2.0 PHY hangs in Rx Compliance test when the incoming packet amplitude is varied below and above the Squelch Level of Receiver during the active packet multiple times.
Version 1 of the controller allows PHY to be reset when RX fail condition is detected to work around the above issue. This feature is disabled by default and needs to be enabled using a bit from the newly added PHYRST_CFG register. This patch enables the workaround.
There is no way to know controller version before device controller is started and the workaround needs to be applied for both host and device modes, so we rely on a DT property do decide when to apply the workaround.
--- drivers/usb/cdns3/core.c | 2 ++ drivers/usb/cdns3/core.h | 1 + drivers/usb/cdns3/drd.c | 12 ++++++++++++ drivers/usb/cdns3/drd.h | 5 ++++- 4 files changed, 19 insertions(+), 1 deletion(-)
drivers/usb/cdns3/core.c +2 -0
@@ -443,6 +443,8 @@ static int cdns3_probe(struct platform_device *pdev)return -ENXIO ; } + cdns->phyrst_a_enable =device_property_read_bool (dev,"cdns,phyrst-a-enable" ); + cdns->otg_res = *res;mutex_init (&cdns->mutex);
drivers/usb/cdns3/core.h +1 -0
@@ -76,6 +76,7 @@ struct cdns3 {#define CDNS3_CONTROLLER_V0 0#define CDNS3_CONTROLLER_V1 1u32 version; +bool phyrst_a_enable;int otg_irq;int dev_irq;
drivers/usb/cdns3/drd.c +12 -0
@@ -42,6 +42,18 @@ int cdns3_set_mode(struct cdns3 *cdns, enum usb_dr_mode mode) reg =readl (&cdns->otg_v1_regs->override); reg |=OVERRIDE_IDPULLUP ;writel (reg, &cdns->otg_v1_regs->override); + +/* +* Enable work around feature built into the +* controller to address issue with RX Sensitivity +* est (EL_17) for USB2 PHY. The issue only occures +* for 0x0002450D controller version. +*/ +if (cdns->phyrst_a_enable) { + reg =readl (&cdns->otg_v1_regs->phyrst_cfg); + reg |=PHYRST_CFG_PHYRST_A_ENABLE ; +writel (reg, &cdns->otg_v1_regs->phyrst_cfg); + } }else { reg =readl (&cdns->otg_v0_regs->ctrl1); reg |=OVERRIDE_IDPULLUP_V0 ;
drivers/usb/cdns3/drd.h +4 -1
@@ -31,7 +31,7 @@ struct cdns3_otg_regs {__le32 simulate;__le32 override;__le32 susp_ctrl; -__le32 reserved4; +__le32 phyrst_cfg;__le32 anasts;__le32 adp_ramp_time;__le32 ctrl1;
@@ -153,6 +153,9 @@ struct cdns3_otg_common_regs {/* Only for CDNS3_CONTROLLER_V0 version */ #define OVERRIDE_IDPULLUP_V0 BIT(24) +/* PHYRST_CFG - bitmasks */ +#define PHYRST_CFG_PHYRST_A_ENABLE BIT(0) +#define CDNS3_ID_PERIPHERAL 1#define CDNS3_ID_HOST 0
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki