extcon: arizona: Use the micd_clamp for interrupts if it is available

Currently we only use the microphone clamp IRQ if GPIO5 is being used as
a second jack detection pin. But we should be using it on any system
where the clamp is available. This patch updates the driver to do so.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index ece5892824d176a87d6521d65b63d00aa61a571a..9255c1f1f2852c19b0f640057b3b5d400ecd306b 100644 (file)
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -1057,7 +1057,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
 
        mutex_lock(&info->lock);
 
-       if (arizona->pdata.jd_gpio5) {
+       if (info->micd_clamp) {
                mask = ARIZONA_MICD_CLAMP_STS;
                present = 0;
        } else {
@@ -1504,7 +1504,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
        pm_runtime_idle(&pdev->dev);
        pm_runtime_get_sync(&pdev->dev);
 
-       if (arizona->pdata.jd_gpio5) {
+       if (info->micd_clamp) {
                jack_irq_rise = ARIZONA_IRQ_MICD_CLAMP_RISE;
                jack_irq_fall = ARIZONA_IRQ_MICD_CLAMP_FALL;
        } else {
@@ -1609,7 +1609,7 @@ static int arizona_extcon_remove(struct platform_device *pdev)
                           ARIZONA_MICD_CLAMP_CONTROL,
                           ARIZONA_MICD_CLAMP_MODE_MASK, 0);
 
-       if (arizona->pdata.jd_gpio5) {
+       if (info->micd_clamp) {
                jack_irq_rise = ARIZONA_IRQ_MICD_CLAMP_RISE;
                jack_irq_fall = ARIZONA_IRQ_MICD_CLAMP_FALL;
        } else {