LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: "Pali Rohár" <pali.rohar@gmail.com>,
	"Jarkko Nikula" <jarkko.nikula@bitmer.com>,
	"Liam Girdwood" <lgirdwood@gmail.com>,
	"Mark Brown" <broonie@kernel.org>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Takashi Iwai" <tiwai@suse.de>
Cc: <linux-omap@vger.kernel.org>, <alsa-devel@alsa-project.org>,
	<linux-kernel@vger.kernel.org>, Pavel Machek <pavel@ucw.cz>,
	Sebastian Reichel <sre@debian.org>,
	Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>,
	Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: Re: [PATCH] ASoC: rx51: do not fail if could not get jack detection gpio
Date: Tue, 27 Jan 2015 15:27:58 +0200	[thread overview]
Message-ID: <54C7925E.3020303@ti.com> (raw)
In-Reply-To: <1422305507-10533-1-git-send-email-pali.rohar@gmail.com>

Hi,

On 01/26/2015 10:51 PM, Pali Rohár wrote:
> qemu does not emulate it

Not sure about this... How does qemu emulate tlv320aic3106, tpa6130a2a, McBSP,
sDMA for audio to work? What about the other three GPIOs in this machine driver?

The "nokia,n900-audio" compatible mandates that the jack-detection GPIO must
be provided (Documentation/devicetree/bindings/sound/nokia,rx51.txt) since it
means that the driver is running on the Nokia n900 HW.


> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> ---
>  sound/soc/omap/rx51.c |   45 +++++++++++++++++++++++++--------------------
>  1 file changed, 25 insertions(+), 20 deletions(-)
> 
> diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
> index 04896d6..a689021 100644
> --- a/sound/soc/omap/rx51.c
> +++ b/sound/soc/omap/rx51.c
> @@ -310,25 +310,27 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
>  		return err;
>  	}
>  
> -	/* AV jack detection */
> -	err = snd_soc_jack_new(codec, "AV Jack",
> -			       SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
> -			       &rx51_av_jack);
> -	if (err) {
> -		dev_err(card->dev, "Failed to add AV Jack\n");
> -		return err;
> -	}
> +	if (!IS_ERR(pdata->jack_detection_gpio)) {
> +		/* AV jack detection */
> +		err = snd_soc_jack_new(codec, "AV Jack",
> +				       SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
> +				       &rx51_av_jack);
> +		if (err) {
> +			dev_err(card->dev, "Failed to add AV Jack\n");
> +			return err;
> +		}
>  
> -	/* prepare gpio for snd_soc_jack_add_gpios */
> -	rx51_av_jack_gpios[0].gpio = desc_to_gpio(pdata->jack_detection_gpio);
> -	devm_gpiod_put(card->dev, pdata->jack_detection_gpio);
> +		/* prepare gpio for snd_soc_jack_add_gpios */
> +		rx51_av_jack_gpios[0].gpio = desc_to_gpio(pdata->jack_detection_gpio);
> +		devm_gpiod_put(card->dev, pdata->jack_detection_gpio);
>  
> -	err = snd_soc_jack_add_gpios(&rx51_av_jack,
> -				     ARRAY_SIZE(rx51_av_jack_gpios),
> -				     rx51_av_jack_gpios);
> -	if (err) {
> -		dev_err(card->dev, "Failed to add GPIOs\n");
> -		return err;
> +		err = snd_soc_jack_add_gpios(&rx51_av_jack,
> +					     ARRAY_SIZE(rx51_av_jack_gpios),
> +					     rx51_av_jack_gpios);
> +		if (err) {
> +			dev_err(card->dev, "Failed to add GPIOs\n");
> +			return err;
> +		}
>  	}
>  
>  	return err;
> @@ -336,8 +338,11 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
>  
>  static int rx51_card_remove(struct snd_soc_card *card)
>  {
> -	snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
> -				rx51_av_jack_gpios);
> +	struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card);
> +
> +	if (!IS_ERR(pdata->jack_detection_gpio))
> +		snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
> +					rx51_av_jack_gpios);
>  
>  	return 0;
>  }
> @@ -470,8 +475,8 @@ static int rx51_soc_probe(struct platform_device *pdev)
>  	pdata->jack_detection_gpio = devm_gpiod_get(card->dev,
>  						    "jack-detection");
>  	if (IS_ERR(pdata->jack_detection_gpio)) {
> +		/* Do not fail, qemu does not emulate jack detection gpio */
>  		dev_err(card->dev, "could not get jack detection gpio\n");
> -		return PTR_ERR(pdata->jack_detection_gpio);
>  	}
>  
>  	pdata->eci_sw_gpio = devm_gpiod_get(card->dev, "eci-switch");
> 


-- 
Péter

  reply	other threads:[~2015-01-27 13:28 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-26 20:51 Pali Rohár
2015-01-27 13:27 ` Peter Ujfalusi [this message]
2015-01-27 13:32   ` Pavel Machek
2015-01-27 13:41     ` Peter Ujfalusi
2015-01-27 14:11       ` Pali Rohár
2015-01-28 14:09         ` Pali Rohár

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=54C7925E.3020303@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=aaro.koskinen@iki.fi \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=ivo.g.dimitrov.75@gmail.com \
    --cc=jarkko.nikula@bitmer.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=pali.rohar@gmail.com \
    --cc=pavel@ucw.cz \
    --cc=perex@perex.cz \
    --cc=sre@debian.org \
    --cc=tiwai@suse.de \
    --subject='Re: [PATCH] ASoC: rx51: do not fail if could not get jack detection gpio' \
    /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

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).