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>

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index 482ed7b..4a7a022 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -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
-                                                    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 {

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index 98f8f97..83f74ff 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -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)
-                                                    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>;
                                };
                        };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
index 4916bed..f9fdacd 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
@@ -513,15 +513,15 @@
                        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>;
                                };
                        };