From: eero.nurkkala@offcode.fi Subject: Re: [PATCH] ASoC: msm8x60: enhance mixer interfaces Date: Mon, 21 Feb 2011 08:58:47 +0200 Message-ID: <20110221085847.35937iy9a4qqhfy8@webmail.offcode.fi> References: <1297334949-5168-1-git-send-email-eero.nurkkala@offcode.fi> <4D5F2442.5020107@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from oul135-36.netplaza.fi ([80.75.100.36]:56474 "EHLO lime.offcode.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750778Ab1BUGij (ORCPT ); Mon, 21 Feb 2011 01:38:39 -0500 In-Reply-To: <4D5F2442.5020107@codeaurora.org> Content-Disposition: inline Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Patrick Lai Cc: linux-arm-msm@vger.kernel.org Quoting Patrick Lai : > Hi, > > In your patch, snd_soc_cnew() is invoked. This function sets > index of snd_kcontrol_new to 0. You must have realized by now that > MSM audio drivers are not truly ALSA compliant. List of sound > devices(i.e speaker) is exposed to user-space as mixer controls. > Index of control is used to propagate native ID of a particular > sound device though you can still derive native ID from value > returned from control "Count". It is not as straight forward as > reading the index > Is it really necessary to call snd_soc_cnew()? > Right, this is the diff of 'amixer contents' without and with the patch: < numid=19,iface=MIXER,name='anc_headset_stereo_rx',index=5 --- > numid=19,iface=MIXER,name='anc_headset_stereo_rx' 43c43 < numid=20,iface=MIXER,name='bt_sco_rx',index=6 --- > numid=20,iface=MIXER,name='bt_sco_rx' 46c46 < numid=21,iface=MIXER,name='bt_sco_tx',index=7 --- > numid=21,iface=MIXER,name='bt_sco_tx' 49c49 < numid=23,iface=MIXER,name='fmradio_stereo_rx',index=9 --- > numid=23,iface=MIXER,name='fmradio_stereo_rx' 52c52 < numid=22,iface=MIXER,name='fmradio_stereo_tx',index=8 --- > numid=22,iface=MIXER,name='fmradio_stereo_tx' 58c58 < numid=15,iface=MIXER,name='handset_tx',index=1 --- > numid=15,iface=MIXER,name='handset_tx' 61c61 < numid=24,iface=MIXER,name='hdmi_stereo_rx',index=10 --- > numid=24,iface=MIXER,name='hdmi_stereo_rx' 64c64 < numid=18,iface=MIXER,name='headset_mono_tx',index=4 --- > numid=18,iface=MIXER,name='headset_mono_tx' 67c67 < numid=17,iface=MIXER,name='headset_stereo_rx',index=3 --- > numid=17,iface=MIXER,name='headset_stereo_rx' 70c70 < numid=16,iface=MIXER,name='speaker_stereo_rx',index=2 --- > numid=16,iface=MIXER,name='speaker_stereo_rx' -> so agreed it can cause headache. - Eero > On 2/10/2011 2:49 AM, eero.nurkkala@offcode.fi wrote: >> From: Eero Nurkkala >> >> Currenly, a simple access to any of the interfaces fail, >> when accessed in the following manner: >> "amixer set Volume 100%" -> no success. >> >> Simplify the initiation and fix the interfaces so that >> they may be altered in a more generic ways. >> With the patch: >> >> amixer set Volume 100% >> Simple mixer control 'Volume',0 >> Capabilities: volume penum >> Playback channels: Front Left - Front Right >> Capture channels: Front Left - Front Right >> Limits: 0 - 16383 >> Front Left: 16383 [100%] >> Front Right: 16383 [100%] >> >> Signed-off-by: Eero Nurkkala >> --- >> sound/soc/msm/msm8x60.c | 31 ++++++++++++------------------- >> 1 files changed, 12 insertions(+), 19 deletions(-) >> >> diff --git a/sound/soc/msm/msm8x60.c b/sound/soc/msm/msm8x60.c >> index 38c56de..eb0dab2 100644 >> --- a/sound/soc/msm/msm8x60.c >> +++ b/sound/soc/msm/msm8x60.c >> @@ -850,33 +850,26 @@ static struct snd_kcontrol_new >> snd_msm_secondary_controls[] = { >> pcm_route_info, pcm_route_get_tx, pcm_route_put_tx, 0), >> }; >> >> -static int msm_new_mixer(struct snd_card *card) >> +static int msm_new_mixer(struct snd_soc_codec *codec) >> { >> unsigned int idx; >> int err; >> int dev_cnt; >> >> - strcpy(card->mixername, "MSM Mixer"); >> - for (idx = 0; idx< ARRAY_SIZE(snd_msm_controls); idx++) { >> - err = snd_ctl_add(card, snd_ctl_new1(&snd_msm_controls[idx], >> - NULL)); >> - if (err< 0) >> - pr_err("%s:ERR adding ctl\n", __func__); >> - } >> - >> - for (idx = 0; idx< ARRAY_SIZE(snd_msm_secondary_controls); idx++) { >> - err = snd_ctl_add(card, >> - snd_ctl_new1(&snd_msm_secondary_controls[idx], >> - NULL)); >> - if (err< 0) >> - pr_err("%s:ERR adding secondary ctl\n", __func__); >> - } >> + strcpy(codec->card->mixername, "MSM Mixer"); >> + if (snd_soc_add_controls(codec, snd_msm_controls, >> + ARRAY_SIZE(snd_msm_controls))) >> + pr_err("%s:ERR adding ctl\n", __func__); >> dev_cnt = msm_snddev_devcount(); >> >> + if (snd_soc_add_controls(codec, snd_msm_secondary_controls, >> + ARRAY_SIZE(snd_msm_secondary_controls))) >> + pr_err("%s:ERR adding secondary ctl\n", __func__); >> + >> for (idx = 0; idx< dev_cnt; idx++) { >> if (!snd_dev_ctl_index(idx)) { >> - err = snd_ctl_add(card, snd_ctl_new1( >> - &snd_dev_controls[idx], NULL)); >> + err = snd_ctl_add(codec->card, snd_soc_cnew( > >> + &snd_dev_controls[idx], codec, NULL)); >> if (err< 0) >> pr_err("%s:ERR adding ctl\n", __func__); >> } else >> @@ -892,7 +885,7 @@ static int msm_soc_dai_init(struct snd_soc_codec *codec) >> { >> >> int ret = 0; >> - ret = msm_new_mixer(codec->card); >> + ret = msm_new_mixer(codec); >> if (ret< 0) >> pr_err("%s: ALSA MSM Mixer Fail\n", __func__); >> > > > -- > Sent by an employee of the Qualcomm Innovation Center, Inc. > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. >