summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-02 03:49:18 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-02 03:49:18 +0300
commit449a97d07a8d4ed4e8e3981ce6ae42c25e381b24 (patch)
treee95efe57f0cdeef3295da36bb0e88caf25399ac6 /arch/arm
parent523462df282fc527a01bceca5125017e2259fbf5 (diff)
parentae64e42cc2b3a17ac0c11815f53211093a54cf55 (diff)
downloadlinux-449a97d07a8d4ed4e8e3981ce6ae42c25e381b24.tar.xz
Merge tag 'extcon-next-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing
Chanwoo writes: Update extcon for 4.6 Detailed description for patchset: 1. Add new EXTCON_CHG_USB_SDP type - SDP (Standard Downstream Port) USB Charging Port means the charging connector.a 2. Add the VBUS detection by using GPIO on extcon-palmas - Beaglex15 board uses the extcon-palmas driver But, beaglex15 board need the GPIO support for VBUS detection. 3. Fix the minor issue of extcon drivers
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15.dts3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index a0986c65be0c..592e65c3a4e0 100644
--- 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>;
};
};