[alsa-devel] [PATCH] ASoC: Intel: Add suspend_pre and resume_post for Braswell snd_soc_card
Jin, Yao
yao.jin at linux.intel.com
Thu Mar 12 13:42:55 CET 2015
Hi Bard, Mark,
I pull the for-next branch right now and I can see the following rt5670
patches have been integrated.
66454b3 ASoC: rt5670: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
cc3c340 ASoC: rt5670: export jack suspend/resume APIs
d3ef705 ASoC: rt5670: Add IRQ function
Then I build the for-next branch with my patches (reverted before):
ASoC: Intel: Add suspend_pre and resume_post for Braswell snd_soc_card
ASoC: Intel: move the jack creation to Braswell machine driver
The build is successful. So it looks we don't need to resend the patch
series, just re-applying my patches should be OK.
Thanks
Jin Yao
On 2015/3/12 10:38, Bard Liao wrote:
>> -----Original Message-----
>> From: Jin, Yao [mailto:yao.jin at linux.intel.com]
>> Sent: Thursday, March 12, 2015 8:52 AM
>> To: Mark Brown
>> Cc: lgirdwood at gmail.com; alsa-devel at alsa-project.org;
>> mengdong.lin at intel.com; subhransu.s.prusty at intel.com; Bard Liao
>> Subject: Re: [PATCH] ASoC: Intel: Add suspend_pre and resume_post for
>> Braswell snd_soc_card
>>
>> Hi Mark, Bard,
>>
>> This patch has dependency on Bard's patch "ASoC: rt5670: export jack
>> suspend/resume APIs". I pull the Mark's for-next branch right now and I
>> can see Bard's patch "ASoC: rt5670: export jack suspend/resume APIs" has
>> been integrated.
>
> I think we should send the dependency patches in a series.
>
>> function 'snd_soc_card_jack_new' [-Werror=implicit-function-declaration]
>> ret = snd_soc_card_jack_new(runtime->card, "Headset",
>> ^
>
> I think it is due to Lars-Peter's "ASoC: simple-card: Register jacks at
> the card level" patch is not applied on branch topic/intel.
>
>>
>> So there now is only one build error in rt5670.c:
>>
>> sound/soc/codecs/rt5670.c: In function 'is_sys_clk_from_pll':
>> sound/soc/codecs/rt5670.c:702:38: error: 'struct snd_soc_dapm_widget'
>> has no member named 'codec'
>> struct snd_soc_codec *codec = source->codec;
>> ^
>> After I fix it with my change as following, the build is successful.
>>
>> --- a/sound/soc/codecs/rt5670.c
>> +++ b/sound/soc/codecs/rt5670.c
>> @@ -699,7 +699,7 @@ static int set_dmic_clk(struct
>> snd_soc_dapm_widget *w, static int is_sys_clk_from_pll(struct
>> snd_soc_dapm_widget *source,
>> struct snd_soc_dapm_widget *sink) {
>> - struct snd_soc_codec *codec = source->codec;
>> + struct snd_soc_codec *codec =
>> + snd_soc_dapm_to_codec(source->dapm);
>> struct rt5670_priv *rt5670 =
>> snd_soc_codec_get_drvdata(codec);
>>
>> if (rt5670->sysclk_src == RT5670_SCLK_S_PLL1)
>>
>> Could Bard take a look at it?
>
> It is already in Lars-Peter's "ASoC: rt5670: Replace w->codec
> snd_soc_dapm_to_codec(w->dapm)" patch
>
>>
>> For my patch, the build is successful.
>>
>> ASoC: Intel: Add suspend_pre and resume_post for Braswell snd_soc_card
>> ASoC: Intel: move the jack creation to Braswell machine driver
>>
>> Thanks
>> Jin Yao
>>
>> On 2015/3/11 20:50, Mark Brown wrote:
>>> On Wed, Mar 11, 2015 at 11:48:33AM +0800, Jin Yao wrote:
>>>> On Braswell, we need to add some machine specific setting before
>>>> suspend and after resume. For example, disable/enable jack detection
>>>> in codec so use snd_soc_card suspend_pre and resume_post ops for
>> this purpose.
>>>
>>> Reverted since it doesn't build!
>>>
>>
>> ------Please consider the environment before printing this e-mail.
More information about the Alsa-devel
mailing list