| Message ID | 20231207185543.2699697-2-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] arm64: dts: imx8mp-verdin: Fix USB connector description | expand |
On Thu, Dec 7, 2023 at 10:55 AM Fabio Estevam <festevam@gmail.com> wrote: > > From: Fabio Estevam <festevam@denx.de> > > The USB connector should not be placed under the dwc3 node. > > Move the USB connector out of the SoC level and use port to describe > the connection to the dwc3 controller. > > This fixes the following dt-schema warning: > > imx8mp-venice-gw72xx-2x.dtb: usb@38100000: Unevaluated properties are not allowed ('connector' was unexpected) > from schema $id: http://devicetree.org/schemas/usb/snps,dwc3.yaml# > Fabio, Thank you for this. There is an extra leading blank line before 'connector' that should probably be fixed: > Signed-off-by: Fabio Estevam <festevam@denx.de> > --- > .../dts/freescale/imx8mp-venice-gw71xx.dtsi | 26 +++++++++++++----- > .../dts/freescale/imx8mp-venice-gw72xx.dtsi | 27 ++++++++++++++----- > .../dts/freescale/imx8mp-venice-gw73xx.dtsi | 27 ++++++++++++++----- > .../dts/freescale/imx8mp-venice-gw74xx.dts | 27 ++++++++++++++----- > 4 files changed, 79 insertions(+), 28 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi > index bf47b5e9dd8c..0e8d0f3c7ea8 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi > @@ -8,6 +8,21 @@ > #include <dt-bindings/phy/phy-imx8-pcie.h> > > / { > + connector { > + compatible = "gpio-usb-b-connector", "usb-b-connector"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usbcon1>; > + type = "micro"; > + label = "Type-C"; > + id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; > + > + port { > + usb_dr_connector: endpoint { > + remote-endpoint = <&usb3_dwc>; > + }; > + }; > + }; > + > led-controller { > compatible = "gpio-leds"; > pinctrl-names = "default"; > @@ -132,13 +147,10 @@ &usb_dwc3_0 { > role-switch-default-mode = "peripheral"; > status = "okay"; > > - connector { > - compatible = "gpio-usb-b-connector", "usb-b-connector"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_usbcon1>; > - type = "micro"; > - label = "Type-C"; > - id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; > + port { > + usb3_dwc: endpoint { > + remote-endpoint = <&usb_dr_connector>; > + }; > }; > }; > > diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi > index 28eb7c00a1d9..f8ad5ea96330 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi > @@ -8,6 +8,22 @@ > #include <dt-bindings/phy/phy-imx8-pcie.h> > > / { > + leading blank line > + connector { > + compatible = "gpio-usb-b-connector", "usb-b-connector"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usbcon1>; > + type = "micro"; > + label = "otg"; > + id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; > + > + port { > + usb_dr_connector: endpoint { > + remote-endpoint = <&usb3_dwc>; > + }; > + }; > + }; > + > led-controller { > compatible = "gpio-leds"; > pinctrl-names = "default"; > @@ -182,13 +198,10 @@ &usb_dwc3_0 { > role-switch-default-mode = "peripheral"; > status = "okay"; > > - connector { > - compatible = "gpio-usb-b-connector", "usb-b-connector"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_usbcon1>; > - type = "micro"; > - label = "otg"; > - id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; > + port { > + usb3_dwc: endpoint { > + remote-endpoint = <&usb_dr_connector>; > + }; > }; > }; > > diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi > index b0d42b18c5ce..0b89aa73998c 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi > @@ -8,6 +8,22 @@ > #include <dt-bindings/phy/phy-imx8-pcie.h> > > / { > + leading blank line > + connector { > + compatible = "gpio-usb-b-connector", "usb-b-connector"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usbcon1>; > + type = "micro"; > + label = "otg"; > + id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; > + > + port { > + usb_dr_connector: endpoint { > + remote-endpoint = <&usb3_dwc>; > + }; > + }; > + }; > + > led-controller { > compatible = "gpio-leds"; > pinctrl-names = "default"; > @@ -201,13 +217,10 @@ &usb_dwc3_0 { > role-switch-default-mode = "peripheral"; > status = "okay"; > > - connector { > - compatible = "gpio-usb-b-connector", "usb-b-connector"; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_usbcon1>; > - type = "micro"; > - label = "otg"; > - id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; > + port { > + usb3_dwc: endpoint { > + remote-endpoint = <&usb_dr_connector>; > + }; > }; > }; > > diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts > index dcf9bababffc..b323711fa090 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts > +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts > @@ -35,6 +35,22 @@ memory@40000000 { > reg = <0x0 0x40000000 0 0x80000000>; > }; > > + leading blank line > + connector { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usbcon1>; > + compatible = "gpio-usb-b-connector", "usb-b-connector"; > + type = "micro"; > + label = "Type-C"; > + id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; > + > + port { > + usb_dr_connector: endpoint { > + remote-endpoint = <&usb3_dwc>; > + }; > + }; > + }; > + > gpio-keys { > compatible = "gpio-keys"; > > @@ -692,13 +708,10 @@ &usb_dwc3_0 { > role-switch-default-mode = "peripheral"; > status = "okay"; > > - connector { > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_usbcon1>; > - compatible = "gpio-usb-b-connector", "usb-b-connector"; > - type = "micro"; > - label = "Type-C"; > - id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; > + port { > + usb3_dwc: endpoint { > + remote-endpoint = <&usb_dr_connector>; > + }; > }; > }; > with those minor changes (if we even care to make them): Acked-by: Tim Harvey <tharvey@gateworks.com> Best regards, Tim
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi index bf47b5e9dd8c..0e8d0f3c7ea8 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi @@ -8,6 +8,21 @@ #include <dt-bindings/phy/phy-imx8-pcie.h> / { + connector { + compatible = "gpio-usb-b-connector", "usb-b-connector"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbcon1>; + type = "micro"; + label = "Type-C"; + id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + + port { + usb_dr_connector: endpoint { + remote-endpoint = <&usb3_dwc>; + }; + }; + }; + led-controller { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -132,13 +147,10 @@ &usb_dwc3_0 { role-switch-default-mode = "peripheral"; status = "okay"; - connector { - compatible = "gpio-usb-b-connector", "usb-b-connector"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbcon1>; - type = "micro"; - label = "Type-C"; - id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + port { + usb3_dwc: endpoint { + remote-endpoint = <&usb_dr_connector>; + }; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi index 28eb7c00a1d9..f8ad5ea96330 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi @@ -8,6 +8,22 @@ #include <dt-bindings/phy/phy-imx8-pcie.h> / { + + connector { + compatible = "gpio-usb-b-connector", "usb-b-connector"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbcon1>; + type = "micro"; + label = "otg"; + id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + + port { + usb_dr_connector: endpoint { + remote-endpoint = <&usb3_dwc>; + }; + }; + }; + led-controller { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -182,13 +198,10 @@ &usb_dwc3_0 { role-switch-default-mode = "peripheral"; status = "okay"; - connector { - compatible = "gpio-usb-b-connector", "usb-b-connector"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbcon1>; - type = "micro"; - label = "otg"; - id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + port { + usb3_dwc: endpoint { + remote-endpoint = <&usb_dr_connector>; + }; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi index b0d42b18c5ce..0b89aa73998c 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi @@ -8,6 +8,22 @@ #include <dt-bindings/phy/phy-imx8-pcie.h> / { + + connector { + compatible = "gpio-usb-b-connector", "usb-b-connector"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbcon1>; + type = "micro"; + label = "otg"; + id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + + port { + usb_dr_connector: endpoint { + remote-endpoint = <&usb3_dwc>; + }; + }; + }; + led-controller { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -201,13 +217,10 @@ &usb_dwc3_0 { role-switch-default-mode = "peripheral"; status = "okay"; - connector { - compatible = "gpio-usb-b-connector", "usb-b-connector"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbcon1>; - type = "micro"; - label = "otg"; - id-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + port { + usb3_dwc: endpoint { + remote-endpoint = <&usb_dr_connector>; + }; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts index dcf9bababffc..b323711fa090 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts @@ -35,6 +35,22 @@ memory@40000000 { reg = <0x0 0x40000000 0 0x80000000>; }; + + connector { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbcon1>; + compatible = "gpio-usb-b-connector", "usb-b-connector"; + type = "micro"; + label = "Type-C"; + id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + + port { + usb_dr_connector: endpoint { + remote-endpoint = <&usb3_dwc>; + }; + }; + }; + gpio-keys { compatible = "gpio-keys"; @@ -692,13 +708,10 @@ &usb_dwc3_0 { role-switch-default-mode = "peripheral"; status = "okay"; - connector { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbcon1>; - compatible = "gpio-usb-b-connector", "usb-b-connector"; - type = "micro"; - label = "Type-C"; - id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + port { + usb3_dwc: endpoint { + remote-endpoint = <&usb_dr_connector>; + }; }; };