Commit 1ca6bc89 authored by Thierry Reding's avatar Thierry Reding
Browse files

arm64: tegra: Update USB connector nodes 



Use the preferred {id,vbus}-gpios over the {id,vbus}-gpio properties and
fix the ordering of compatible strings (most-specific ones should come
first).

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent c8d05184

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+7 −8
Original line number Diff line number Diff line
@@ -171,19 +171,18 @@ 
				status = "okay";

				mode = "otg";

				vbus-supply = <&vdd_usb0>;



				usb-role-switch;



				connector {

					compatible = "usb-b-connector",

						     "gpio-usb-b-connector";

					compatible = "gpio-usb-b-connector",

						     "usb-b-connector";

					label = "micro-USB";

					type = "micro";

					vbus-gpio = <&gpio

					vbus-gpios = <&gpio

						      TEGRA186_MAIN_GPIO(X, 7)

						      GPIO_ACTIVE_LOW>;

					id-gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;

					id-gpios = <&pmic 0 GPIO_ACTIVE_HIGH>;

				};



			};



			usb2-1 {

arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -1461,17 +1461,17 @@ 
			usb2-0 {

				status = "okay";

				vbus-supply = <&vdd_usb_vbus_otg>;

				usb-role-switch;

				mode = "otg";



				usb-role-switch;

				connector {

					compatible = "usb-b-connector",

						     "gpio-usb-b-connector";

					compatible = "gpio-usb-b-connector",

						     "usb-b-connector";

					label = "micro-USB";

					type = "micro";

					vbus-gpio = <&gpio TEGRA_GPIO(Z, 0)

					vbus-gpios = <&gpio TEGRA_GPIO(Z, 0)

						      GPIO_ACTIVE_LOW>;

					id-gpio = <&pmic 0 0>;

					id-gpios = <&pmic 0 GPIO_ACTIVE_HIGH>;

				};

			};

arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts

+5 −5
Original line number Diff line number Diff line
@@ -513,14 +513,14 @@ 
			usb2-0 {

				status = "okay";

				mode = "peripheral";



				usb-role-switch;



				connector {

					compatible = "usb-b-connector",

						     "gpio-usb-b-connector";

					compatible = "gpio-usb-b-connector",

						     "usb-b-connector";

					label = "micro-USB";

					type = "micro";

					vbus-gpio = <&gpio TEGRA_GPIO(CC, 4)

					vbus-gpios = <&gpio TEGRA_GPIO(CC, 4)

						      GPIO_ACTIVE_LOW>;

				};

			};