diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2019-12-09 11:09:12 +0000 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2019-12-09 20:18:14 +0900 |
| commit | f4ba6c0ba762e10b0bad42b5d28f7e2ab1fe5ff9 (patch) | |
| tree | 4f87af658afbd15d71de14f6de7b704e3fb40443 /drivers/extcon | |
| parent | d5aa46ddf9ed7cf0d7ea0b86bec20412733ac870 (diff) | |
| download | linux-next-f4ba6c0ba762e10b0bad42b5d28f7e2ab1fe5ff9.tar.gz | |
extcon: arizona: Remove unnecessary sets of ACCDET_MODE
arizona_start_mic sets ACCDET_MODE as required for the microphone
detection as such it is redundant to set this outside of this function.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-arizona.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 5ae111ee3d63..e7c198e798e2 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -668,11 +668,6 @@ done: if (id_gpio) gpio_set_value_cansleep(id_gpio, 0); - /* Revert back to MICDET mode */ - regmap_update_bits(arizona->regmap, - ARIZONA_ACCESSORY_DETECT_MODE_1, - ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC); - /* If we have a mic then reenable MICDET */ if (mic || info->mic) arizona_start_mic(info); @@ -732,9 +727,6 @@ err: arizona_extcon_hp_clamp(info, false); pm_runtime_put_autosuspend(info->dev); - regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1, - ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC); - /* Just report headphone */ ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true); if (ret != 0) @@ -789,9 +781,6 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info) return; err: - regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1, - ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC); - /* Just report headphone */ ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true); if (ret != 0) |