Merge tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / boot / dts / tegra20-seaboard.dts

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 40e6fb280333ec190864a0c3ef55ba6007371ac4..315aae26c3cdb1e2ed84f741e8669cfadf870524 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -518,7 +518,7 @@
 
        pmc {
                nvidia,invert-interrupt;
-               nvidia,suspend-mode = <2>;
+               nvidia,suspend-mode = <1>;
                nvidia,cpu-pwr-good-time = <5000>;
                nvidia,cpu-pwr-off-time = <5000>;
                nvidia,core-pwr-good-time = <3845 3845>;
@@ -566,7 +566,6 @@
 
        usb@c5000000 {
                status = "okay";
-               nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                dr_mode = "otg";
        };
 
@@ -829,7 +828,7 @@
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        enable-active-high;
-                       gpio = <&gpio 24 0>; /* PD0 */
+                       gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
                        regulator-always-on;
                        regulator-boot-on;
                };