Commit ad9a12f7 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

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: default avatarFabio Estevam <festevam@denx.de>
Acked-by: default avatarTim Harvey <tharvey@gateworks.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 742e163a

arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi

+19 −7
Original line number Diff line number Diff line
@@ -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>;

		};

	};

};

arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi

+19 −7
Original line number Diff line number Diff line
@@ -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 @@ &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>;

		};

	};

};

arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi

+19 −7
Original line number Diff line number Diff line
@@ -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 @@ &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>;

		};

	};

};

arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts

+19 −7
Original line number Diff line number Diff line
@@ -35,6 +35,21 @@ 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 +707,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>;

		};

	};

};