diff options
| author | Greg Kroah-Hartman | 2016-03-02 01:49:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-03-02 01:49:18 +0100 |
| commit | 449a97d07a8d4ed4e8e3981ce6ae42c25e381b24 (patch) | |
| tree | e95efe57f0cdeef3295da36bb0e88caf25399ac6 /arch/arm | |
| parent | Merge 4.5-rc6 into char-misc-next (diff) | |
| parent | extcon: palmas: Drop IRQF_EARLY_RESUME flag (diff) | |
| download | kernel-qcow2-linux-449a97d07a8d4ed4e8e3981ce6ae42c25e381b24.tar.gz kernel-qcow2-linux-449a97d07a8d4ed4e8e3981ce6ae42c25e381b24.tar.xz kernel-qcow2-linux-449a97d07a8d4ed4e8e3981ce6ae42c25e381b24.zip | |
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.dts | 3 |
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>; }; }; |