ASoC: arizona: Make the wm5102, wm5110, wm8997 and wm8998 drivers use the new jack...

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm8997.c

diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 99c3ebae6ba698e5516a75ede9610e78e0d10495..38ef631d1a1ff825a60064e822464d389e32aaa9 100644 (file)
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1096,6 +1096,7 @@ static const struct snd_soc_component_driver soc_component_dev_wm8997 = {
        .remove                 = wm8997_component_remove,
        .set_sysclk             = arizona_set_sysclk,
        .set_pll                = wm8997_set_fll,
+       .set_jack               = arizona_jack_set_jack,
        .controls               = wm8997_snd_controls,
        .num_controls           = ARRAY_SIZE(wm8997_snd_controls),
        .dapm_widgets           = wm8997_dapm_widgets,
@@ -1132,6 +1133,11 @@ static int wm8997_probe(struct platform_device *pdev)
 
        arizona_init_dvfs(&wm8997->core);
 
+       /* This may return -EPROBE_DEFER, so do this early on */
+       ret = arizona_jack_codec_dev_probe(&wm8997->core, &pdev->dev);
+       if (ret)
+               return ret;
+
        for (i = 0; i < ARRAY_SIZE(wm8997->fll); i++)
                wm8997->fll[i].vco_mult = 1;
 
@@ -1163,10 +1169,10 @@ static int wm8997_probe(struct platform_device *pdev)
 
        ret = arizona_init_vol_limit(arizona);
        if (ret < 0)
-               return ret;
+               goto err_jack_codec_dev;
        ret = arizona_init_spk_irqs(arizona);
        if (ret < 0)
-               return ret;
+               goto err_jack_codec_dev;
 
        ret = devm_snd_soc_register_component(&pdev->dev,
                                              &soc_component_dev_wm8997,
@@ -1181,6 +1187,8 @@ static int wm8997_probe(struct platform_device *pdev)
 
 err_spk_irqs:
        arizona_free_spk_irqs(arizona);
+err_jack_codec_dev:
+       arizona_jack_codec_dev_remove(&wm8997->core);
 
        return ret;
 }
@@ -1194,6 +1202,8 @@ static int wm8997_remove(struct platform_device *pdev)
 
        arizona_free_spk_irqs(arizona);
 
+       arizona_jack_codec_dev_remove(&wm8997->core);
+
        return 0;
 }