From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932200AbbA0N2r (ORCPT ); Tue, 27 Jan 2015 08:28:47 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:56976 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751824AbbA0N2o (ORCPT ); Tue, 27 Jan 2015 08:28:44 -0500 Message-ID: <54C7925E.3020303@ti.com> Date: Tue, 27 Jan 2015 15:27:58 +0200 From: Peter Ujfalusi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: =?UTF-8?B?UGFsaSBSb2jDoXI=?= , Jarkko Nikula , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai CC: , , , Pavel Machek , Sebastian Reichel , Ivaylo Dimitrov , Aaro Koskinen Subject: Re: [PATCH] ASoC: rx51: do not fail if could not get jack detection gpio References: <1422305507-10533-1-git-send-email-pali.rohar@gmail.com> In-Reply-To: <1422305507-10533-1-git-send-email-pali.rohar@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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