From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Lee Jones <lee.jones@linaro.org>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Jie Yang <yang.jie@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
patches@opensource.cirrus.com,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Charles Keepax <ckeepax@opensource.cirrus.com>,
ALSA Development Mailing List <alsa-devel@alsa-project.org>
Subject: Re: [PATCH v3 12/13] ASoC: arizona: Make the wm5102, wm5110, wm8997 and wm8998 drivers use the new jack library
Date: Fri, 22 Jan 2021 22:58:28 +0200 [thread overview]
Message-ID: <CAHp75VdUU=qf=Uh4htyYqcHeQTLwadznXO=dJcVQxpKrQv6a5g@mail.gmail.com> (raw)
In-Reply-To: <20210122164107.361939-13-hdegoede@redhat.com>
On Fri, Jan 22, 2021 at 6:41 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Make all arizona codec drivers for which drivers/mfd/arizona-core.c used
> to instantiate a "arizona-extcon" child-device use the new arizona-jack.c
> library for jack-detection.
>
> This has been tested on a Lenovo Yoga Tablet 2 1051L with a WM5102 codec.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> sound/soc/codecs/wm5102.c | 12 +++++++++++-
> sound/soc/codecs/wm5110.c | 12 +++++++++++-
> sound/soc/codecs/wm8997.c | 14 ++++++++++++--
> sound/soc/codecs/wm8998.c | 9 +++++++++
> 4 files changed, 43 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
> index 70d353b63fe0..b77595fb3ea8 100644
> --- a/sound/soc/codecs/wm5102.c
> +++ b/sound/soc/codecs/wm5102.c
> @@ -2004,6 +2004,7 @@ static const struct snd_soc_component_driver soc_component_dev_wm5102 = {
> .remove = wm5102_component_remove,
> .set_sysclk = arizona_set_sysclk,
> .set_pll = wm5102_set_fll,
> + .set_jack = arizona_jack_set_jack,
> .name = DRV_NAME,
> .compress_ops = &wm5102_compress_ops,
> .controls = wm5102_snd_controls,
> @@ -2057,6 +2058,11 @@ static int wm5102_probe(struct platform_device *pdev)
> if (ret != 0)
> return ret;
>
> + /* This may return -EPROBE_DEFER, so do this early on */
> + ret = arizona_jack_codec_dev_probe(&wm5102->core, &pdev->dev);
> + if (ret)
> + return ret;
> +
> for (i = 0; i < ARRAY_SIZE(wm5102->fll); i++)
> wm5102->fll[i].vco_mult = 1;
>
> @@ -2089,7 +2095,7 @@ static int wm5102_probe(struct platform_device *pdev)
> wm5102);
> if (ret != 0) {
> dev_err(&pdev->dev, "Failed to request DSP IRQ: %d\n", ret);
> - return ret;
> + goto err_jack_codec_dev;
> }
>
> ret = arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 1);
> @@ -2123,6 +2129,8 @@ static int wm5102_probe(struct platform_device *pdev)
> err_dsp_irq:
> arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
> arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5102);
> +err_jack_codec_dev:
> + arizona_jack_codec_dev_remove(&wm5102->core);
>
> return ret;
> }
> @@ -2141,6 +2149,8 @@ static int wm5102_remove(struct platform_device *pdev)
> arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
> arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5102);
>
> + arizona_jack_codec_dev_remove(&wm5102->core);
> +
> return 0;
> }
>
> diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
> index 4238929b2375..ef22051a3599 100644
> --- a/sound/soc/codecs/wm5110.c
> +++ b/sound/soc/codecs/wm5110.c
> @@ -2370,6 +2370,7 @@ static const struct snd_soc_component_driver soc_component_dev_wm5110 = {
> .remove = wm5110_component_remove,
> .set_sysclk = arizona_set_sysclk,
> .set_pll = wm5110_set_fll,
> + .set_jack = arizona_jack_set_jack,
> .name = DRV_NAME,
> .compress_ops = &wm5110_compress_ops,
> .controls = wm5110_snd_controls,
> @@ -2424,6 +2425,11 @@ static int wm5110_probe(struct platform_device *pdev)
> return ret;
> }
>
> + /* This may return -EPROBE_DEFER, so do this early on */
> + ret = arizona_jack_codec_dev_probe(&wm5110->core, &pdev->dev);
> + if (ret)
> + return ret;
> +
> for (i = 0; i < ARRAY_SIZE(wm5110->fll); i++)
> wm5110->fll[i].vco_mult = 3;
>
> @@ -2456,7 +2462,7 @@ static int wm5110_probe(struct platform_device *pdev)
> wm5110);
> if (ret != 0) {
> dev_err(&pdev->dev, "Failed to request DSP IRQ: %d\n", ret);
> - return ret;
> + goto err_jack_codec_dev;
> }
>
> ret = arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 1);
> @@ -2490,6 +2496,8 @@ static int wm5110_probe(struct platform_device *pdev)
> err_dsp_irq:
> arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
> arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5110);
> +err_jack_codec_dev:
> + arizona_jack_codec_dev_remove(&wm5110->core);
>
> return ret;
> }
> @@ -2510,6 +2518,8 @@ static int wm5110_remove(struct platform_device *pdev)
> arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
> arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5110);
>
> + arizona_jack_codec_dev_remove(&wm5110->core);
> +
> return 0;
> }
>
> diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
> index 229f2986cd96..4f5a848960e0 100644
> --- 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;
> }
>
> diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
> index 5413254295b7..f74af1c46933 100644
> --- a/sound/soc/codecs/wm8998.c
> +++ b/sound/soc/codecs/wm8998.c
> @@ -1316,6 +1316,7 @@ static const struct snd_soc_component_driver soc_component_dev_wm8998 = {
> .remove = wm8998_component_remove,
> .set_sysclk = arizona_set_sysclk,
> .set_pll = wm8998_set_fll,
> + .set_jack = arizona_jack_set_jack,
> .controls = wm8998_snd_controls,
> .num_controls = ARRAY_SIZE(wm8998_snd_controls),
> .dapm_widgets = wm8998_dapm_widgets,
> @@ -1350,6 +1351,11 @@ static int wm8998_probe(struct platform_device *pdev)
> wm8998->core.arizona = arizona;
> wm8998->core.num_inputs = 3; /* IN1L, IN1R, IN2 */
>
> + /* This may return -EPROBE_DEFER, so do this early on */
> + ret = arizona_jack_codec_dev_probe(&wm8998->core, &pdev->dev);
> + if (ret)
> + return ret;
> +
> for (i = 0; i < ARRAY_SIZE(wm8998->fll); i++)
> wm8998->fll[i].vco_mult = 1;
>
> @@ -1392,6 +1398,7 @@ static int wm8998_probe(struct platform_device *pdev)
> arizona_free_spk_irqs(arizona);
> err_pm_disable:
> pm_runtime_disable(&pdev->dev);
> + arizona_jack_codec_dev_remove(&wm8998->core);
>
> return ret;
> }
> @@ -1405,6 +1412,8 @@ static int wm8998_remove(struct platform_device *pdev)
>
> arizona_free_spk_irqs(arizona);
>
> + arizona_jack_codec_dev_remove(&wm8998->core);
> +
> return 0;
> }
>
> --
> 2.28.0
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2021-01-22 21:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 16:40 [PATCH v3 00/13] MFD/extcon/ASoC: Rework arizona codec jack-detect support Hans de Goede
2021-01-22 16:40 ` [PATCH v3 01/13] mfd: arizona: Drop arizona-extcon cells Hans de Goede
2021-01-22 16:40 ` [PATCH v3 02/13] extcon: arizona: Fix some issues when HPDET IRQ fires after the jack has been unplugged Hans de Goede
2021-01-22 16:40 ` [PATCH v3 03/13] extcon: arizona: Fix various races on driver unbind Hans de Goede
2021-01-22 16:40 ` [PATCH v3 04/13] extcon: arizona: Fix flags parameter to the gpiod_get("wlf,micd-pol") call Hans de Goede
2021-01-22 16:40 ` [PATCH v3 05/13] extcon: arizona: Always use pm_runtime_get_sync() when we need the device to be awake Hans de Goede
2021-01-22 20:38 ` Andy Shevchenko
2021-01-22 20:47 ` Hans de Goede
2021-01-22 16:41 ` [PATCH v3 06/13] ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c Hans de Goede
2021-01-22 20:40 ` Andy Shevchenko
2021-01-22 21:17 ` Hans de Goede
2021-01-22 16:41 ` [PATCH v3 07/13] ASoC: arizona-jack: Move jack-detect variables to struct arizona_priv Hans de Goede
2021-01-22 16:41 ` [PATCH v3 08/13] ASoC: arizona-jack: Use arizona->dev for runtime-pm Hans de Goede
2021-01-22 20:43 ` Andy Shevchenko
2021-01-22 16:41 ` [PATCH v3 09/13] ASoC: arizona-jack: convert into a helper library for codec drivers Hans de Goede
2021-01-22 20:47 ` Andy Shevchenko
2021-01-22 16:41 ` [PATCH v3 10/13] ASoC: arizona-jack: Use snd_soc_jack to report jack events Hans de Goede
2021-01-22 20:50 ` Andy Shevchenko
2021-01-22 16:41 ` [PATCH v3 11/13] ASoC: arizona-jack: Cleanup logging Hans de Goede
2021-01-22 20:56 ` Andy Shevchenko
2021-01-22 21:33 ` Hans de Goede
2021-01-22 16:41 ` [PATCH v3 12/13] ASoC: arizona: Make the wm5102, wm5110, wm8997 and wm8998 drivers use the new jack library Hans de Goede
2021-01-22 20:58 ` Andy Shevchenko [this message]
2021-01-22 16:41 ` [PATCH v3 13/13] ASoC: Intel: bytcr_wm5102: Add jack detect support Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHp75VdUU=qf=Uh4htyYqcHeQTLwadznXO=dJcVQxpKrQv6a5g@mail.gmail.com' \
--to=andy.shevchenko@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=ckeepax@opensource.cirrus.com \
--cc=hdegoede@redhat.com \
--cc=lee.jones@linaro.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=yang.jie@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).