summaryrefslogtreecommitdiffstats
path: root/drivers/extcon
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2018-11-13 16:38:47 +0100
committerChanwoo Choi <cw00.choi@samsung.com>2018-11-14 09:06:32 +0900
commita2dc50914744eea9f83a70a5db0486be625e5dc0 (patch)
tree3c3e7c769882b081e1ff5e6782ca9c90ce71d945 /drivers/extcon
parent3e34c819896091d0f1bbf6ece8a620552f8dc04e (diff)
downloadlinux-a2dc50914744eea9f83a70a5db0486be625e5dc0.tar.gz
linux-a2dc50914744eea9f83a70a5db0486be625e5dc0.tar.bz2
linux-a2dc50914744eea9f83a70a5db0486be625e5dc0.zip
extcon: max8997: Fix lack of path setting in USB device mode
MAX8997 driver disables automatic path selection from MicroUSB connector and manually sets path to either UART or USB lines. However the code for setting USB path worked only for USB host mode (when ID pin is set to ground). When standard USB cable (USB device mode) is connected, path registers are not touched. This means that once the non-USB accessory is connected to MAX8997-operated micro USB port, the path is no longer set to USB and USB device mode doesn't work. This patch fixes it by setting USB path both for USB and USB host modes. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r--drivers/extcon/extcon-max8997.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 632192d027bf..172e116ac1ce 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -311,12 +311,10 @@ static int max8997_muic_handle_usb(struct max8997_muic_info *info,
{
int ret = 0;
- if (usb_type == MAX8997_USB_HOST) {
- ret = max8997_muic_set_path(info, info->path_usb, attached);
- if (ret < 0) {
- dev_err(info->dev, "failed to update muic register\n");
- return ret;
- }
+ ret = max8997_muic_set_path(info, info->path_usb, attached);
+ if (ret < 0) {
+ dev_err(info->dev, "failed to update muic register\n");
+ return ret;
}
switch (usb_type) {