of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
gpios not probed yet. This patch adjusts tegra_wm8903 to this.
Signed-off-by: Roland Stigge <[email protected]>
---
Applies to git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git,
branch for-next
sound/soc/tegra/tegra_wm8903.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 0c5bb33..d4f14e4 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -284,27 +284,27 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
} else if (np) {
pdata->gpio_spkr_en = of_get_named_gpio(np,
"nvidia,spkr-en-gpios", 0);
- if (pdata->gpio_spkr_en == -ENODEV)
+ if (pdata->gpio_spkr_en == -EPROBE_DEFER)
return -EPROBE_DEFER;
pdata->gpio_hp_mute = of_get_named_gpio(np,
"nvidia,hp-mute-gpios", 0);
- if (pdata->gpio_hp_mute == -ENODEV)
+ if (pdata->gpio_hp_mute == -EPROBE_DEFER)
return -EPROBE_DEFER;
pdata->gpio_hp_det = of_get_named_gpio(np,
"nvidia,hp-det-gpios", 0);
- if (pdata->gpio_hp_det == -ENODEV)
+ if (pdata->gpio_hp_det == -EPROBE_DEFER)
return -EPROBE_DEFER;
pdata->gpio_int_mic_en = of_get_named_gpio(np,
"nvidia,int-mic-en-gpios", 0);
- if (pdata->gpio_int_mic_en == -ENODEV)
+ if (pdata->gpio_int_mic_en == -EPROBE_DEFER)
return -EPROBE_DEFER;
pdata->gpio_ext_mic_en = of_get_named_gpio(np,
"nvidia,ext-mic-en-gpios", 0);
- if (pdata->gpio_ext_mic_en == -ENODEV)
+ if (pdata->gpio_ext_mic_en == -EPROBE_DEFER)
return -EPROBE_DEFER;
}
--
1.7.10
of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
gpios not probed yet. This patch adjusts tegra_alc5632 to this.
Signed-off-by: Roland Stigge <[email protected]>
---
Applies to git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git,
branch for-next
sound/soc/tegra/tegra_alc5632.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index d684df2..e463529 100644
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -177,7 +177,7 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev)
}
alc5632->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
- if (alc5632->gpio_hp_det == -ENODEV)
+ if (alc5632->gpio_hp_det == -EPROBE_DEFER)
return -EPROBE_DEFER;
ret = snd_soc_of_parse_card_name(card, "nvidia,model");
--
1.7.10
On Mon, Jun 18, 2012 at 06:42:21PM +0200, Roland Stigge wrote:
> of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
> gpios not probed yet. This patch adjusts tegra_wm8903 to this.
So, I saw from the other thread that this didn't actually happen yet - I
guess the best thing is to merge this along with the changes for
introducing -EPROBE_DEFER.
Acked-by: Mark Brown <[email protected]>
On 06/18/2012 06:46 PM, Mark Brown wrote:
> On Mon, Jun 18, 2012 at 06:42:21PM +0200, Roland Stigge wrote:
>> of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
>> gpios not probed yet. This patch adjusts tegra_wm8903 to this.
>
> So, I saw from the other thread that this didn't actually happen yet - I
> guess the best thing is to merge this along with the changes for
> introducing -EPROBE_DEFER.
Basically, yes. But this would mean that doing via gpio, we would need
to pull other stuff from the sound tree over to gpio to build upon
because "my" tegra_* sound patches won't apply to the gpio branch currently.
Any hint welcome.
Thanks in advance,
Roland
On Mon, Jun 18, 2012 at 07:00:14PM +0200, Roland Stigge wrote:
> Basically, yes. But this would mean that doing via gpio, we would need
> to pull other stuff from the sound tree over to gpio to build upon
> because "my" tegra_* sound patches won't apply to the gpio branch currently.
Oh, yes. Stephen's gone and reorganised all that code which means it's
not a trivial merge. Ho hum. I'm happy to apply them if folks are
comfortable with it, I guess ideally I'd be able to pull a branch with
the gpio changes in and then apply on top of that.
On 06/18/2012 07:04 PM, Mark Brown wrote:
> On Mon, Jun 18, 2012 at 07:00:14PM +0200, Roland Stigge wrote:
>
>> Basically, yes. But this would mean that doing via gpio, we would
>> need to pull other stuff from the sound tree over to gpio to
>> build upon because "my" tegra_* sound patches won't apply to the
>> gpio branch currently.
>
> Oh, yes. Stephen's gone and reorganised all that code which means
> it's not a trivial merge. Ho hum. I'm happy to apply them if
> folks are comfortable with it, I guess ideally I'd be able to pull
> a branch with the gpio changes in and then apply on top of that.
Depending on what else changes will come via gpio for 3.6, maybe you
don't even need to merge gpio to sound?
Can you please coordinate between sound and gpio?
Thanks in advance!
Roland
PS: I'm posting a combined patch suitable for the sound subsystem.
Please tell me if you also need the gpiolib-of patch singled out.
On Mon, Jun 18, 2012 at 1:42 PM, Roland Stigge <[email protected]> wrote:
> of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
> gpios not probed yet. This patch adjusts tegra_wm8903 to this.
>
> Signed-off-by: Roland Stigge <[email protected]>
Acked-by: Alexandre Pereira da Silva <[email protected]>
On Mon, Jun 18, 2012 at 1:42 PM, Roland Stigge <[email protected]> wrote:
> of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
> gpios not probed yet. This patch adjusts tegra_alc5632 to this.
>
> Signed-off-by: Roland Stigge <[email protected]>
Acked-by: Alexandre Pereira da Silva <[email protected]>
On Mon, Jun 18, 2012 at 8:28 PM, Alexandre Pereira da Silva
<[email protected]> wrote:
> On Mon, Jun 18, 2012 at 1:42 PM, Roland Stigge <[email protected]> wrote:
>> of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
>> gpios not probed yet. This patch adjusts tegra_alc5632 to this.
>>
>> Signed-off-by: Roland Stigge <[email protected]>
> Acked-by: Alexandre Pereira da Silva <[email protected]>
Hi Alexandre,
Sorry to be rude, but can you explain me why did you "Acked-by" on this patch ?
I don't see your name in git log for tegra_alc5632.c file:
http://git.kernel.org/?p=linux/kernel/git/broonie/sound.git;a=history;f=sound/soc/tegra/tegra_alc5632.c;h=d684df294c0c5c80458b6de591c16965027db14b;hb=refs/heads/for-next
Thanks.
--
Leon Romanovsky | Independent Linux Consultant
http://www.leon.nu | [email protected]
On Tue, Jun 19, 2012 at 3:29 AM, Leon Romanovsky <[email protected]> wrote:
> On Mon, Jun 18, 2012 at 8:28 PM, Alexandre Pereira da Silva
> <[email protected]> wrote:
>> On Mon, Jun 18, 2012 at 1:42 PM, Roland Stigge <[email protected]> wrote:
>>> of_get_named_gpio() was changed to return -EPROBE_DEFER in case of
>>> gpios not probed yet. This patch adjusts tegra_alc5632 to this.
>>>
>>> Signed-off-by: Roland Stigge <[email protected]>
>> Acked-by: Alexandre Pereira da Silva <[email protected]>
> Hi Alexandre,
> Sorry to be rude, but can you explain me why did you "Acked-by" on this patch ?
> I don't see your name in git log for tegra_alc5632.c file:
> http://git.kernel.org/?p=linux/kernel/git/broonie/sound.git;a=history;f=sound/soc/tegra/tegra_alc5632.c;h=d684df294c0c5c80458b6de591c16965027db14b;hb=refs/heads/for-next
I'm tracking Roland's work on Probe defer.
On 06/19/2012 12:03 PM, Alexandre Pereira da Silva wrote:
> On Tue, Jun 19, 2012 at 3:29 AM, Leon Romanovsky <[email protected]> wrote:
>> Hi Alexandre,
>> Sorry to be rude, but can you explain me why did you "Acked-by" on this patch ?
>> I don't see your name in git log for tegra_alc5632.c file:
>> http://git.kernel.org/?p=linux/kernel/git/broonie/sound.git;a=history;f=sound/soc/tegra/tegra_alc5632.c;h=d684df294c0c5c80458b6de591c16965027db14b;hb=refs/heads/for-next
>
> I'm tracking Roland's work on Probe defer.
Yes, that's valuable. Thanks!
Roland