ASoC: Intel: boards: add stereo playback by woofer speaker
Subsystems (3)
PATCH v2 1/1 ASoC: Intel: boards: add stereo playback by woofer speaker
From: Mac Chiang <[email protected]>
support woofer stereo speakers individually
---
Changelog:
v2:
- considering woofer speakers settings as general.
- separate out the tweeter speakers and consistency of woofer+tweeter when hardware-specific.
- check NULL condition if devm_kzalloc is failed
--- sound/soc/intel/boards/cml_rt1011_rt5682.c | 215 +++++++++++++++++++++++------ 1 file changed, 172 insertions(+), 43 deletions(-)
sound/soc/intel/boards/cml_rt1011_rt5682.c +172 -43
@@ -30,6 +30,35 @@#define CML_RT5682_CODEC_DAI "rt5682-aif1"#define NAME_SIZE 32 +#define SOF_RT1011_SPEAKER_WL BIT(0) +#define SOF_RT1011_SPEAKER_WR BIT(1) +#define SOF_RT1011_SPEAKER_TL BIT(2) +#define SOF_RT1011_SPEAKER_TR BIT(3) +#define SPK_CH 4 + +/* Default: Woofer speakers */ +static unsigned long sof_rt1011_quirk =SOF_RT1011_SPEAKER_WL |SOF_RT1011_SPEAKER_WR ; + +static int sof_rt1011_quirk_cb (const struct dmi_system_id *id) +{ + sof_rt1011_quirk = (unsigned long )id->driver_data; +return 1 ; +} + +static const struct dmi_system_id sof_rt1011_quirk_table[] = { + { + .callback = sof_rt1011_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Google" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Helios" ), + }, + .driver_data = (void *)(SOF_RT1011_SPEAKER_WL |SOF_RT1011_SPEAKER_WR | +SOF_RT1011_SPEAKER_TL |SOF_RT1011_SPEAKER_TR ), + }, + { + } +}; +static struct snd_soc_jack hdmi_jack[3 ];struct hdmi_pcm {
@@ -48,15 +77,16 @@ struct card_private {static const struct snd_kcontrol_new cml_controls[] = {SOC_DAPM_PIN_SWITCH ("Headphone Jack" ),SOC_DAPM_PIN_SWITCH ("Headset Mic" ), -SOC_DAPM_PIN_SWITCH ("TL Ext Spk" ), -SOC_DAPM_PIN_SWITCH ("TR Ext Spk" ),SOC_DAPM_PIN_SWITCH ("WL Ext Spk" ),SOC_DAPM_PIN_SWITCH ("WR Ext Spk" ), }; +static const struct snd_kcontrol_new cml_rt1011_tt_controls[] = { +SOC_DAPM_PIN_SWITCH ("TL Ext Spk" ), +SOC_DAPM_PIN_SWITCH ("TR Ext Spk" ), +}; +static const struct snd_soc_dapm_widget cml_rt1011_rt5682_widgets[] = { -SND_SOC_DAPM_SPK ("TL Ext Spk" ,NULL ), -SND_SOC_DAPM_SPK ("TR Ext Spk" ,NULL ),SND_SOC_DAPM_SPK ("WL Ext Spk" ,NULL ),SND_SOC_DAPM_SPK ("WR Ext Spk" ,NULL ),SND_SOC_DAPM_HP ("Headphone Jack" ,NULL ),
@@ -64,10 +94,13 @@ static const struct snd_soc_dapm_widget cml_rt1011_rt5682_widgets[] = { SND_SOC_DAPM_MIC("SoC DMIC", NULL), }; +static const struct snd_soc_dapm_widget cml_rt1011_tt_widgets[] = { +SND_SOC_DAPM_SPK ("TL Ext Spk" ,NULL ), +SND_SOC_DAPM_SPK ("TR Ext Spk" ,NULL ), +}; +static const struct snd_soc_dapm_route cml_rt1011_rt5682_map[] = { -/*speaker*/ - {"TL Ext Spk" ,NULL ,"TL SPO" }, - {"TR Ext Spk" ,NULL ,"TR SPO" }, +/*WL/WR speaker*/ {"WL Ext Spk" ,NULL ,"WL SPO" }, {"WR Ext Spk" ,NULL ,"WR SPO" },
@@ -82,6 +115,12 @@ static const struct snd_soc_dapm_route cml_rt1011_rt5682_map[] = { {"DMic", NULL, "SoC DMIC"}, }; +static const struct snd_soc_dapm_route cml_rt1011_tt_map[] = { +/*TL/TR speaker*/ + {"TL Ext Spk" ,NULL ,"TL SPO" }, + {"TR Ext Spk" ,NULL ,"TR SPO" }, +}; +static int cml_rt5682_codec_init (struct snd_soc_pcm_runtime *rtd) {struct card_private *ctx =snd_soc_card_get_drvdata (rtd->card);
@@ -121,6 +160,35 @@ static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd)return ret; }; +static int cml_rt1011_spk_init (struct snd_soc_pcm_runtime *rtd) +{ +int ret =0 ; +struct snd_soc_card *card = rtd->card; + +if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL | +SOF_RT1011_SPEAKER_TR )) { + + ret =snd_soc_add_card_controls (card, cml_rt1011_tt_controls, +ARRAY_SIZE (cml_rt1011_tt_controls)); +if (ret) +return ret; + + ret =snd_soc_dapm_new_controls (&card->dapm, + cml_rt1011_tt_widgets, +ARRAY_SIZE (cml_rt1011_tt_widgets)); +if (ret) +return ret; + + ret =snd_soc_dapm_add_routes (&card->dapm, cml_rt1011_tt_map, +ARRAY_SIZE (cml_rt1011_tt_map)); + +if (ret) +return ret; + } + +return ret; +} +static int cml_rt5682_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params) {
@@ -192,30 +260,38 @@ static int cml_rt1011_hw_params(struct snd_pcm_substream *substream,* The feedback is captured for each codec individually. * Hence all 4 codecs use 1 Tx slot each for feedback. */ -if (!strcmp (codec_dai->component->name,"i2c-10EC1011:00" )) { - ret =snd_soc_dai_set_tdm_slot (codec_dai, -0x4 ,0x1 ,4 ,24 ); -if (ret <0 ) -break ; - } -if (!strcmp (codec_dai->component->name,"i2c-10EC1011:02" )) { - ret =snd_soc_dai_set_tdm_slot (codec_dai, -0x1 ,0x1 ,4 ,24 ); -if (ret <0 ) -break ; - } -/* TDM Rx slot 2 is used for Right Woofer & Tweeters pair */ -if (!strcmp (codec_dai->component->name,"i2c-10EC1011:01" )) { - ret =snd_soc_dai_set_tdm_slot (codec_dai, -0x8 ,0x2 ,4 ,24 ); -if (ret <0 ) -break ; +if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_WL | +SOF_RT1011_SPEAKER_WR )) { +if (!strcmp (codec_dai->component->name,"i2c-10EC1011:00" )) { + ret =snd_soc_dai_set_tdm_slot (codec_dai, +0x4 ,0x1 ,4 ,24 ); +if (ret <0 ) +break ; + } + +if (!strcmp (codec_dai->component->name,"i2c-10EC1011:01" )) { + ret =snd_soc_dai_set_tdm_slot (codec_dai, +0x8 ,0x2 ,4 ,24 ); +if (ret <0 ) +break ; + } } -if (!strcmp (codec_dai->component->name,"i2c-10EC1011:03" )) { - ret =snd_soc_dai_set_tdm_slot (codec_dai, -0x2 ,0x2 ,4 ,24 ); -if (ret <0 ) -break ; + +if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL | +SOF_RT1011_SPEAKER_TR )) { +if (!strcmp (codec_dai->component->name,"i2c-10EC1011:02" )) { + ret =snd_soc_dai_set_tdm_slot (codec_dai, +0x1 ,0x1 ,4 ,24 ); +if (ret <0 ) +break ; + } + +if (!strcmp (codec_dai->component->name,"i2c-10EC1011:03" )) { + ret =snd_soc_dai_set_tdm_slot (codec_dai, +0x2 ,0x2 ,4 ,24 ); +if (ret <0 ) +break ; + } } }if (ret <0 )
@@ -302,10 +378,8 @@ SND_SOC_DAILINK_DEF(ssp1_pin, DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin")));SND_SOC_DAILINK_DEF (ssp1_codec,DAILINK_COMP_ARRAY ( -/* WL */ COMP_CODEC ("i2c-10EC1011:00" ,CML_RT1011_CODEC_DAI ), -/* WR */ COMP_CODEC ("i2c-10EC1011:01" ,CML_RT1011_CODEC_DAI ), -/* TL */ COMP_CODEC ("i2c-10EC1011:02" ,CML_RT1011_CODEC_DAI ), -/* TR */ COMP_CODEC ("i2c-10EC1011:03" ,CML_RT1011_CODEC_DAI ))); +/* WL */ COMP_CODEC ("i2c-10EC1011:00" ,CML_RT1011_CODEC_DAI ), +/* WR */ COMP_CODEC ("i2c-10EC1011:01" ,CML_RT1011_CODEC_DAI )));SND_SOC_DAILINK_DEF (dmic_pin,DAILINK_COMP_ARRAY (COMP_CPU ("DMIC01 Pin" )));
@@ -399,6 +473,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .dpcm_playback = 1, .dpcm_capture = 1, /* Capture stream provides Feedback */ .no_pcm = 1, + .init = cml_rt1011_spk_init, .ops = &cml_rt1011_ops, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), },
@@ -413,14 +488,6 @@ static struct snd_soc_codec_conf rt1011_conf[] = { .dlc = COMP_CODEC_CONF("i2c-10EC1011:01"), .name_prefix = "WR", }, - { - .dlc = COMP_CODEC_CONF("i2c-10EC1011:02"), - .name_prefix = "TL", - }, - { - .dlc = COMP_CODEC_CONF("i2c-10EC1011:03"), - .name_prefix = "TR", - }, };/* Cometlake audio machine driver for RT1011 and RT5682 */
@@ -442,10 +509,12 @@ static struct snd_soc_card snd_soc_card_cml = {static int snd_cml_rt1011_probe (struct platform_device *pdev) { +struct snd_soc_dai_link_component *rt1011_dais_components; +struct snd_soc_codec_conf *rt1011_dais_confs;struct card_private *ctx;struct snd_soc_acpi_mach *mach;const char *platform_name; -int ret; +int ret, i; ctx =devm_kzalloc (&pdev->dev,sizeof (*ctx),GFP_ATOMIC );if (!ctx)
@@ -456,6 +525,65 @@ static int snd_cml_rt1011_probe(struct platform_device *pdev) snd_soc_card_cml.dev = &pdev->dev; platform_name = mach->mach_params.platform; +dmi_check_system (sof_rt1011_quirk_table); + +dev_info (&pdev->dev,"sof_rt1011_quirk = %lx\n" , sof_rt1011_quirk); + +if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL | +SOF_RT1011_SPEAKER_TR )) { + rt1011_dais_confs =devm_kzalloc (&pdev->dev, +sizeof (struct snd_soc_codec_conf ) * +SPK_CH ,GFP_KERNEL ); + +if (!rt1011_dais_confs) +return -ENOMEM ; + + rt1011_dais_components =devm_kzalloc (&pdev->dev, +sizeof (struct snd_soc_dai_link_component ) * +SPK_CH ,GFP_KERNEL ); + +if (!rt1011_dais_components) +return -ENOMEM ; + +for (i =0 ; i <SPK_CH ; i++) { + rt1011_dais_confs[i].dlc.name =devm_kasprintf (&pdev->dev, +GFP_KERNEL , +"i2c-10EC1011:0%d" , + i); +switch (i) { +case 0 : + rt1011_dais_confs[i].name_prefix ="WL" ; +break ; + +case 1 : + rt1011_dais_confs[i].name_prefix ="WR" ; +break ; +case 2 : + rt1011_dais_confs[i].name_prefix ="TL" ; +break ; +case 3 : + rt1011_dais_confs[i].name_prefix ="TR" ; +break ; + } + rt1011_dais_components[i].name =devm_kasprintf (&pdev->dev, +GFP_KERNEL , +"i2c-10EC1011:0%d" , + i); + rt1011_dais_components[i].dai_name =CML_RT1011_CODEC_DAI ; + } + + snd_soc_card_cml.codec_conf = rt1011_dais_confs; + snd_soc_card_cml.num_configs =SPK_CH ; + +for (i =0 ; i <ARRAY_SIZE (cml_rt1011_rt5682_dailink); i++) { +if (!strcmp (cml_rt1011_rt5682_dailink[i].codecs->dai_name, +CML_RT1011_CODEC_DAI )) { + cml_rt1011_rt5682_dailink[i].codecs = rt1011_dais_components; + cml_rt1011_rt5682_dailink[i].num_codecs =SPK_CH ; + } + } + } +/* set platform name for each dailink */ ret =snd_soc_fixup_dai_links_platform_name (&snd_soc_card_cml, platform_name);
@@ -483,5 +611,6 @@ MODULE_DESCRIPTION("Cometlake Audio Machine driver - RT1011 and RT5682 in I2S moMODULE_AUTHOR ("Naveen Manohar <[email protected]>" );MODULE_AUTHOR ("Sathya Prakash M R <[email protected]>" );MODULE_AUTHOR ("Shuming Fan <[email protected]>" ); +MODULE_AUTHOR ("Mac Chiang <[email protected]>" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:cml_rt1011_rt5682" );
Signature · 1 line
2.7.4
On 3/17/20 11:10 PM, "[email protected]=pierre-louis.bossart"@linux.intel.com wrote:
Fixed email
Quoted 3 lines
From: Mac Chiang <[email protected]>
support woofer stereo speakers individually
Both the commit title and message are a bit misleading. should be something like
"
ASoC: Intel: boards: cml_rt1011: split woofer and tweeter support
Support Woofer stereo speakers by default and optionally Tweeter stereo speakers with a DMI quirk "
The rest looks mostly good except for one memory allocation test and a couple of nitpicks. Care to send a v3?
Thanks.
-Pierre
sound/soc/intel/boards/cml_rt1011_rt5682.c SND_SOC_DAILINK_DEF(ssp1_pin, · line 382
Quoted 10 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +2
-4@@ -302,10 +378,8 @@ SND_SOC_DAILINK_DEF(ssp1_pin, DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin")));SND_SOC_DAILINK_DEF (ssp1_codec,DAILINK_COMP_ARRAY ( -/* WL */ COMP_CODEC ("i2c-10EC1011:00" ,CML_RT1011_CODEC_DAI ), -/* WR */ COMP_CODEC ("i2c-10EC1011:01" ,CML_RT1011_CODEC_DAI ), -/* TL */ COMP_CODEC ("i2c-10EC1011:02" ,CML_RT1011_CODEC_DAI ), -/* TR */ COMP_CODEC ("i2c-10EC1011:03" ,CML_RT1011_CODEC_DAI ))); +/* WL */ COMP_CODEC ("i2c-10EC1011:00" ,CML_RT1011_CODEC_DAI ), +/* WR */ COMP_CODEC ("i2c-10EC1011:01" ,CML_RT1011_CODEC_DAI )));
is the alignment change needed?
Quoted 19 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +15
-0@@ -456,6 +525,65 @@ static int snd_cml_rt1011_probe(struct platform_device *pdev) snd_soc_card_cml.dev = &pdev->dev; platform_name = mach->mach_params.platform; +dmi_check_system (sof_rt1011_quirk_table); + +dev_info (&pdev->dev,"sof_rt1011_quirk = %lx\n" , sof_rt1011_quirk); + +if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL | +SOF_RT1011_SPEAKER_TR )) { + rt1011_dais_confs =devm_kzalloc (&pdev->dev, +sizeof (struct snd_soc_codec_conf ) * +SPK_CH ,GFP_KERNEL ); + +if (!rt1011_dais_confs) +return -ENOMEM ; + + rt1011_dais_components = devm_kzalloc(&pdev->dev, + sizeof(struct snd_soc_dai_link_component) *
sound/soc/intel/boards/cml_rt1011_rt5682.c static int snd_cml_rt1011_probe(struct platform_device *pdev) · line 552
Quoted 10 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +10
-0+ SPK_CH, GFP_KERNEL); + +if (!rt1011_dais_components) +return -ENOMEM ; + +for (i =0 ; i <SPK_CH ; i++) { + rt1011_dais_confs[i].dlc.name =devm_kasprintf (&pdev->dev, +GFP_KERNEL , +"i2c-10EC1011:0%d" , + i);
if (!rt1011_dais_confs[i].dlc.name)
return -ENOMEM;
sound/soc/intel/boards/cml_rt1011_rt5682.c static int snd_cml_rt1011_probe(struct platform_device *pdev) · line 557
Quoted 5 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +5
-0+switch (i) { +case 0 : + rt1011_dais_confs[i].name_prefix ="WL" ; +break ; +
spurious newline?
Quoted 1 line
sound/soc/intel/boards/cml_rt1011_rt5682.c +1
-0+case 1 :
Thanks Pierre.
I will modify these changes. And as previously as you mentioned, I reply below to be confirmed. If they are all good as well, I will send the v3 patch.
Quoted 7 lines
Quoted 7 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +0
-3@@ -413,14 +488,6 @@ static struct snd_soc_codec_conf rt1011_conf[] = { .dlc = COMP_CODEC_CONF("i2c-10EC1011:01"), .name_prefix = "WR", }, - { - .dlc = COMP_CODEC_CONF("i2c-10EC1011:02"), - .name_prefix = "TL",
Quoted 8 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c static struct snd_soc_codec_conf rt1011_conf[] = { · line 423
Quoted 5 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +0
-5- }, - { - .dlc = COMP_CODEC_CONF("i2c-10EC1011:03"), - .name_prefix = "TR", - },is there a reason to remove the prefixes for Tweeters? Or is this handled somewhere else?
Yes, the "TL", "TR" name_prefix handling is moving to snd_cml_rt1011_probe() allocated by rt1011_dais_confs[]
Quoted 11 lines
Review static struct snd_soc_codec_conf rt1011_conf[] = { · line 492
Quoted 2 lines
(quoted diff) +2
-0+ for (i = 0; i < SPK_CH; i++) { + rt1011_dais_confs[i].dlc.name =devm_kasprintf(&pdev->dev,
Review static struct snd_soc_codec_conf rt1011_conf[] = {
Quoted 2 lines
(quoted diff) +2
-0+ GFP_KERNEL, + "i2c-10EC1011:0%d",
Review
Quoted 1 line
(quoted diff) +1
-0+ i);if (!rt1011_dais_confs[i].dlc.name)
return -ENOMEM;
Quoted 14 lines
Quoted 4 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +4
-0+switch (i) { +case 0 : + rt1011_dais_confs[i].name_prefix ="WL" ; +break ;sound/soc/intel/boards/cml_rt1011_rt5682.c static int snd_cml_rt1011_probe(struct platform_device *pdev) · line 566
Quoted 10 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +10
-0+ +case 1 : + rt1011_dais_confs[i].name_prefix ="WR" ; +break ; +case 2 : + rt1011_dais_confs[i].name_prefix ="TL" ; +break ; +case 3 : + rt1011_dais_confs[i].name_prefix ="TR" ; +break ;
default: return -EINVAL;
Quoted 5 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ }How does this work? the
rt1011_dais_confsonly has 2 components now? This would probably generate a NULL access or generate an out-of-bounds access in the array.
By default there were 2 components allocated by rt1011_conf[]. However, rt1011_dais_confs has 4 components when woofers+tweeters support. BTW, I should add the default case to handle the invalid values as well.
Quoted 7 lines
Quoted 3 lines
Subject: [PATCH v2] ASoC: Intel: boards: add stereo playback by woofer speaker
support woofer stereo speakers individuallyBoth the commit title and message are a bit misleading. should be something like
"
ASoC: Intel: boards:cml_rt1011: split woofer and tweeter support
Support Woofer stereo speakers by default and optionally Tweeter stereo speakers with a DMI quirk "
Modified the title and messages.
Quoted 10 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c SND_SOC_DAILINK_DEF(ssp1_pin, · line 305
Quoted 5 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +0
-1@@ -302,10 +378,8 @@ SND_SOC_DAILINK_DEF(ssp1_pin, DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin"))); SND_SOC_DAILINK_DEF(ssp1_codec, DAILINK_COMP_ARRAY( - /* WL */ COMP_CODEC("i2c-10EC1011:00",
CML_RT1011_CODEC_DAI),Review SND_SOC_DAILINK_DEF(ssp1_pin, · line 306
Quoted 1 line
(quoted diff) +0
-1- /* WR */ COMP_CODEC("i2c-10EC1011:01",
CML_RT1011_CODEC_DAI),Review SND_SOC_DAILINK_DEF(ssp1_pin, · line 307
Quoted 1 line
(quoted diff) +0
-1- /* TL */ COMP_CODEC("i2c-10EC1011:02",
CML_RT1011_CODEC_DAI),
Quoted 8 lines
Review SND_SOC_DAILINK_DEF(ssp1_pin, · line 308
Quoted 1 line
(quoted diff) +0
-1- /* TR */ COMP_CODEC("i2c-10EC1011:03",
CML_RT1011_CODEC_DAI)));Review SND_SOC_DAILINK_DEF(ssp1_pin, · line 381
Quoted 1 line
(quoted diff) +1
-0+ /* WL */ COMP_CODEC("i2c-10EC1011:00",
CML_RT1011_CODEC_DAI),Review SND_SOC_DAILINK_DEF(ssp1_pin, · line 383
Quoted 2 lines
(quoted diff) +2
-0+ /* WR */ COMP_CODEC("i2c-10EC1011:01", + CML_RT1011_CODEC_DAI)));is the alignment change needed?
No. Fixed.
Quoted 30 lines
Review static int snd_cml_rt1011_probe(struct
Quoted 2 lines
(quoted diff) +0
-0@@ -456,6 +525,65 @@ static int snd_cml_rt1011_probe(struct
platform_device*pdev)Quoted 8 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +5
-0snd_soc_card_cml.dev = &pdev->dev; platform_name = mach->mach_params.platform; +dmi_check_system (sof_rt1011_quirk_table); + +dev_info (&pdev->dev,"sof_rt1011_quirk = %lx\n" , sof_rt1011_quirk); + + if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL |sound/soc/intel/boards/cml_rt1011_rt5682.c static int snd_cml_rt1011_probe(struct platform_device *pdev)
Quoted 10 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +10
-0+ SOF_RT1011_SPEAKER_TR)) { + rt1011_dais_confs =devm_kzalloc (&pdev->dev, +sizeof (struct snd_soc_codec_conf ) * +SPK_CH ,GFP_KERNEL ); + +if (!rt1011_dais_confs) +return -ENOMEM ; + + rt1011_dais_components = devm_kzalloc(&pdev->dev, + sizeof(struct
snd_soc_dai_link_component) *sound/soc/intel/boards/cml_rt1011_rt5682.c static int snd_cml_rt1011_probe(struct platform_device *pdev)
Quoted 7 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +7
-0+ SPK_CH, GFP_KERNEL); + +if (!rt1011_dais_components) +return -ENOMEM ; + +for (i =0 ; i <SPK_CH ; i++) { + rt1011_dais_confs[i].dlc.name =devm_kasprintf(&pdev->dev,
Quoted 7 lines
Review static int snd_cml_rt1011_probe(struct · line 551
Quoted 2 lines
(quoted diff) +2
-0+ GFP_KERNEL, + "i2c-10EC1011:0%d",
Review static int snd_cml_rt1011_probe(struct · line 552
Quoted 1 line
(quoted diff) +1
-0+ i);if (!rt1011_dais_confs[i].dlc.name)
return -ENOMEM;
added the checks.
Quoted 8 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c static int snd_cml_rt1011_probe(struct platform_device *pdev) · line 557
Quoted 6 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +5
-0+switch (i) { +case 0 : + rt1011_dais_confs[i].name_prefix ="WL" ; +break ; +spurious newline?
Removed the newline.
Quoted 2 lines
Quoted 2 lines
sound/soc/intel/boards/cml_rt1011_rt5682.c +1
-0+case 1 :