arm64: dts: imx8mp-venice: Fix USB connector description

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#

Signed-off-by: Fabio Estevam <festevam@denx.de>
Acked-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi
index bf47b5e9dd8cc0edfa1bb01ad10ec55e3fb8ebbd..0e8d0f3c7ea87194187f127975256657b4f6221b 100644 (file)
--- 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 @@
        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 28eb7c00a1d9b40403d2a1e353880dbd28fcd322..c24587c895e1f9734da4c4f4cf7becb697825f59 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.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 = "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 +197,10 @@
        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 b0d42b18c5ced7d79f503c48b807f24b090f7862..628ffba69862ad51f2072e88fc812b3a84e1b71c 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.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 = "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 +216,10 @@
        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 dcf9bababffc55dc2b37f0a4dca8e9a8f0a91df8..9caf7ca25444600a4a7979b3749d5175e32b0bbe 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts
@@ -35,6 +35,21 @@
                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 +707,10 @@
        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>;
+               };
        };
 };