extcon: arizona: Disable mic detect if running when driver is removed
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Thu, 4 Apr 2019 16:33:56 +0000 (17:33 +0100)
committerChanwoo Choi <cw00.choi@samsung.com>
Fri, 12 Apr 2019 00:38:40 +0000 (09:38 +0900)
Microphone detection provides the button detection features on the
Arizona CODECs as such it will be running if the jack is currently
inserted. If the driver is unbound whilst the jack is still inserted
this will cause warnings from the regulator framework as the MICVDD
regulator is put but was never disabled.

Correct this by disabling microphone detection on driver removal and if
the microphone detection was running disable the regulator and put the
runtime reference that was currently held.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-arizona.c

index da0e9bc4262fad1a0eac36b0747766655b9d7fe7..9327479c719c23b3653eb0572a1750ed5b06ee4a 100644 (file)
@@ -1726,6 +1726,16 @@ static int arizona_extcon_remove(struct platform_device *pdev)
        struct arizona_extcon_info *info = platform_get_drvdata(pdev);
        struct arizona *arizona = info->arizona;
        int jack_irq_rise, jack_irq_fall;
+       bool change;
+
+       regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
+                                ARIZONA_MICD_ENA, 0,
+                                &change);
+
+       if (change) {
+               regulator_disable(info->micvdd);
+               pm_runtime_put(info->dev);
+       }
 
        gpiod_put(info->micd_pol_gpio);