ARM: dt: tegra: pinmux changes for USB ULPI

Ensure that the USB ULPI signals are not tri-stated, and have no pull-
up or pull-down.

Ensure that the pingroup hosting the USB ULPI reset signal (GPIO PV0 or
PV1 depending on the board, so UAC) is not tri-stated, and has no pull-
up or pull-down.

This change appears larger than it is due to the grouping and sorting of
the pin configuration data.

Signed-off-by: Stephen Warren <swarren@nvidia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 71b73aab87ff..e4fcf9a8178a 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -182,23 +182,23 @@
                                 nvidia,tristate = <1>;
                         };
                         conf_atb {
-                                nvidia,pins = "atb", "cdev1", "dap1", "gma",
-                                        "gmc", "gmd", "gpu", "gpu7", "gpv",
-                                        "sdio1", "slxa", "slxk", "uac";
+                                nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
+                                        "gma", "gmc", "gmd", "gpu", "gpu7",
+                                        "gpv", "sdio1", "slxa", "slxk", "uac";
                                 nvidia,pull = <0>;
                                 nvidia,tristate = <0>;
                         };
-                        conf_cdev2 {
-                                nvidia,pins = "cdev2", "csus", "spia", "spib",
-                                        "spid", "spif";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <1>;
-                        };
                         conf_ck32 {
                                 nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
                                         "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
                                 nvidia,pull = <0>;
                         };
+                        conf_csus {
+                                nvidia,pins = "csus", "spia", "spib",
+                                        "spid", "spif";
+                                nvidia,pull = <1>;
+                                nvidia,tristate = <1>;
+                        };
                         conf_ddc {
                                 nvidia,pins = "ddc", "dtf", "rm", "sdc", "sdd";
                                 nvidia,pull = <2>;