diff options
| author | Jonghwa Lee <jonghwa3.lee@samsung.com> | 2014-03-19 00:41:36 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:47:12 +0900 |
| commit | b7492d142e235af56d92c6efdefadcdd5365b27a (patch) | |
| tree | e80d9d82f719c2b1d11f75041f5b391cb9825eb9 | |
| parent | a8c61ba3cf965b4c3c5229befe68274a7c63d4d3 (diff) | |
| download | linux-3.10-b7492d142e235af56d92c6efdefadcdd5365b27a.tar.gz linux-3.10-b7492d142e235af56d92c6efdefadcdd5365b27a.tar.bz2 linux-3.10-b7492d142e235af56d92c6efdefadcdd5365b27a.zip | |
Revert "extcon: max77693: Fix bug related to MAX77693 irq when set ADC debounce time"
This reverts commit b64315125400f4eec9f74f7536acca3e8eeca720.
Upcoming patch will fix a bug thus all related workaournds are now purged.
Change-Id: Iab88c25ef9470a5167be73990ceb7859e076ddd8
Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
| -rw-r--r-- | drivers/extcon/extcon-max77693.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index b69e336ece2..cd21d5fe1dc 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -285,14 +285,6 @@ static int max77693_muic_set_path(struct max77693_muic_info *info, int ret = 0; u8 ctrl1, ctrl2 = 0; - /* Set open state to path before changing hw path */ - ret = max77693_update_reg(info->max77693->regmap_muic, - MAX77693_MUIC_REG_CTRL1, CONTROL1_SW_OPEN, COMP_SW_MASK); - if (ret < 0) { - dev_err(info->dev, "failed to update MUIC register\n"); - return ret; - } - if (attached) ctrl1 = val; else @@ -1254,7 +1246,7 @@ static int max77693_muic_probe(struct platform_device *pdev) } /* Set initial path for UART */ - max77693_muic_set_path(info, info->path_uart, true); + max77693_muic_set_path(info, info->path_uart, true); /* Check revision number of MUIC device*/ ret = max77693_read_reg(info->max77693->regmap_muic, |