On 01/27/2015 03:32 PM, Pavel Machek wrote: > On Tue 2015-01-27 15:27:58, Peter Ujfalusi wrote: >> 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. > > Fix the documentation, then :-).
You mean document a workaround for qemu, right? AFAIK the documentation is fine ;) > [Actually, GPIO is provided, it just can't be requested, AFAICT.] So what about the other GPIOs in the machine driver? Why is this jack-detection GPIO is special for qemu? > > It is quite important to keep qemu working, really. Debugging early > boot on hardware is very hard, for example. I understand, but looking at the history of the driver, if it fails now with the jack-detection GPIO, it should have been failing in the past as well. What triggered this sudden qemu does not like jack-detection GPIO? Before the devm_gpiod_get() conversion the driver should have failed in snd_soc_jack_add_gpios() phase. -- Péter > And yes, some day we may need different dts for n900-qemu > (vs. n900-hw), but lets not do it just yet. > Pavel > >> >>> Signed-off-by: Pali Rohár <[email protected]> >>> --- >>> 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"); >>> >> >> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
