2023-03-23 03:52:49

by Peng Fan (OSS)

Subject: [PATCH linux-next V3 1/2] dt-bindings: usb: snps,dwc3: correct i.MX8MQ support

From: Peng Fan <[email protected]>

The previous i.MX8MQ support breaks rockchip,dwc3 support,
so use select to restrict i.MX8MQ support and avoid break others.

Fixes: 3754c41c7686 ("dt-bindings: usb: snps,dwc3: support i.MX8MQ")
Signed-off-by: Peng Fan <[email protected]>
---

V3:
Drop duplicated ones. with patch 2/2 there is no error anymore
V2:
Add a new yaml

.../bindings/usb/fsl,imx8mq-dwc3.yaml | 48 +++++++++++++++++++
.../devicetree/bindings/usb/snps,dwc3.yaml | 12 ++---
2 files changed, 53 insertions(+), 7 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml

diff --git a/Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml b/Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml
new file mode 100644
index 000000000000..d2ccfb35b392
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/usb/fsl,imx8mq-dwc3.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NXP iMX8MQ Soc USB Controller
+
+maintainers:
+ - Li Jun <[email protected]>
+ - Peng Fan <[email protected]>
+
+select:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - fsl,imx8mq-dwc3
+ required:
+ - compatible
+
+properties:
+ compatible:
+ items:
+ - const: fsl,imx8mq-dwc3
+ - const: snps,dwc3
+
+allOf:
+ - $ref: snps,dwc3.yaml#
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/imx8mq-clock.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ usb_dwc3_1: usb@38200000 {
+ compatible = "fsl,imx8mq-dwc3", "snps,dwc3";
+ reg = <0x38200000 0x10000>;
+ clocks = <&clk IMX8MQ_CLK_USB2_CTRL_ROOT>,
+ <&clk IMX8MQ_CLK_USB_CORE_REF>,
+ <&clk IMX8MQ_CLK_32K>;
+ clock-names = "bus_early", "ref", "suspend";
+ interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+ phys = <&usb3_phy1>, <&usb3_phy1>;
+ phy-names = "usb2-phy", "usb3-phy";
+ };
diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
index 16c7d06c9172..c167fd577cae 100644
--- a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
@@ -30,13 +30,11 @@ allOf:

properties:
compatible:
- oneOf:
- - items:
- - const: fsl,imx8mq-dwc3
- - const: snps,dwc3
- - const: snps,dwc3
- - const: synopsys,dwc3
- deprecated: true
+ contains:
+ oneOf:
+ - const: snps,dwc3
+ - const: synopsys,dwc3
+ deprecated: true

reg:
maxItems: 1
--
2.37.1

2023-03-23 03:54:11

by Peng Fan (OSS)

Subject: [PATCH linux-next V3 2/2] arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb

From: Peng Fan <[email protected]>

The property is NXP downstream property that there is no user
in upstream, drop it.

Signed-off-by: Peng Fan <[email protected]>
---

V3:
New patch

arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index cd925c0ac911..0492556a10db 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -1453,7 +1453,6 @@ usb_dwc3_0: usb@38100000 {
phys = <&usb3_phy0>, <&usb3_phy0>;
phy-names = "usb2-phy", "usb3-phy";
power-domains = <&pgc_otg1>;
- usb3-resume-missing-cas;
status = "disabled";
};

@@ -1485,7 +1484,6 @@ usb_dwc3_1: usb@38200000 {
phys = <&usb3_phy1>, <&usb3_phy1>;
phy-names = "usb2-phy", "usb3-phy";
power-domains = <&pgc_otg2>;
- usb3-resume-missing-cas;
status = "disabled";
};

--
2.37.1

2023-03-23 16:02:25

by Rob Herring (Arm)

Subject: Re: [PATCH linux-next V3 1/2] dt-bindings: usb: snps,dwc3: correct i.MX8MQ support

On Thu, 23 Mar 2023 11:55:30 +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <[email protected]>
>
> The previous i.MX8MQ support breaks rockchip,dwc3 support,
> so use select to restrict i.MX8MQ support and avoid break others.
>
> Fixes: 3754c41c7686 ("dt-bindings: usb: snps,dwc3: support i.MX8MQ")
> Signed-off-by: Peng Fan <[email protected]>
> ---
>
> V3:
> Drop duplicated ones. with patch 2/2 there is no error anymore
> V2:
> Add a new yaml
>
> .../bindings/usb/fsl,imx8mq-dwc3.yaml | 48 +++++++++++++++++++
> .../devicetree/bindings/usb/snps,dwc3.yaml | 12 ++---
> 2 files changed, 53 insertions(+), 7 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml
>

Reviewed-by: Rob Herring <[email protected]>

2023-03-27 05:12:47

by Shawn Guo

Subject: Re: [PATCH linux-next V3 2/2] arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb

On Thu, Mar 23, 2023 at 11:55:31AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <[email protected]>
>
> The property is NXP downstream property that there is no user
> in upstream, drop it.
>
> Signed-off-by: Peng Fan <[email protected]>

Applied, thanks!