Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[deliverable/linux.git] / arch / arm / boot / dts / am57xx-beagle-x15.dts

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index a0986c65be0cfa71856947c58f57abe8df61c7fd..592e65c3a4e0cd4c2116537c84afc0cabe79cd61 100644 (file)
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -562,8 +562,7 @@
                extcon_usb2: tps659038_usb {
                        compatible = "ti,palmas-usb-vid";
                        ti,enable-vbus-detection;
-                       ti,enable-id-detection;
-                       id-gpios = <&gpio7 24 GPIO_ACTIVE_HIGH>;
+                       vbus-gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
                };
 
        };