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: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding
2020-06-12 09:31:55 +02:00
parent c8d05184a0
commit 1ca6bc896a
3 changed files with 18 additions and 19 deletions

View File

@@ -171,19 +171,18 @@ usb2-0 {
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
TEGRA186_MAIN_GPIO(X, 7)
GPIO_ACTIVE_LOW>;
id-gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
vbus-gpios = <&gpio
TEGRA186_MAIN_GPIO(X, 7)
GPIO_ACTIVE_LOW>;
id-gpios = <&pmic 0 GPIO_ACTIVE_HIGH>;
};
};
usb2-1 {

View File

@@ -1461,17 +1461,17 @@ ports {
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)
GPIO_ACTIVE_LOW>;
id-gpio = <&pmic 0 0>;
vbus-gpios = <&gpio TEGRA_GPIO(Z, 0)
GPIO_ACTIVE_LOW>;
id-gpios = <&pmic 0 GPIO_ACTIVE_HIGH>;
};
};

View File

@@ -513,15 +513,15 @@ ports {
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)
GPIO_ACTIVE_LOW>;
vbus-gpios = <&gpio TEGRA_GPIO(CC, 4)
GPIO_ACTIVE_LOW>;
};
};