diff options
| author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2014-03-19 00:41:20 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-03-20 17:44:20 +0900 |
| commit | a3be88bd98b32fea05b3d5a66d5db594802153c5 (patch) | |
| tree | 1085bbf35f7aa2dd5b9d3d2ea760dd7c041aa0e4 /drivers | |
| parent | 20c5bd4e0cc2ee861ff4a99242db7c87731b3fce (diff) | |
| download | linux-3.10-a3be88bd98b32fea05b3d5a66d5db594802153c5.tar.gz linux-3.10-a3be88bd98b32fea05b3d5a66d5db594802153c5.tar.bz2 linux-3.10-a3be88bd98b32fea05b3d5a66d5db594802153c5.zip | |
Revert "extcon: max77693: Force using UART path for jig"
This reverts commit ec05e8de55043b87a1dafccec5477db9a6ecf9a1.
Upcoming patch will fix a bug thus all related workaournds are now purged.
Change-Id: I52b4456867dd887c7d29a4f485c952860c6dc45c
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/extcon/extcon-max77693.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 903c5078f12..3cde41b4a9e 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -293,18 +293,10 @@ static int max77693_muic_set_path(struct max77693_muic_info *info, return ret; } - if (attached) { - if (info->prev_cable_type == - MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF) { - /* if cable_type is jig, then force UART */ - dev_info(info->dev, "For jig force using UART path\n"); - ctrl1 = CONTROL1_SW_UART; - } else { - ctrl1 = val; - } - } else { + if (attached) + ctrl1 = val; + else ctrl1 = CONTROL1_SW_OPEN; - } ret = max77693_update_reg(info->max77693->regmap_muic, MAX77693_MUIC_REG_CTRL1, ctrl1, COMP_SW_MASK); |