November 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] ALSA/ASOC new device and routing
by Eli Britstein 30 Nov '14

30 Nov '14

Hi I'm a newbie to ALSA. I'm targeting to use ALSA or ASoC solution in order to route capture/playback streams of a USB headset (that uses ALSA) to/from my own DSP device. I saw DPCM which is a part of ASoC manages dynamically connections between FE and BE streams. In my product, I just need them to be connected. No need for the "dynamically" part. My questions: 1. Can someone please recommend a step by step guide, or an example how to make my DSP "look like" a BE? Do I need to write an ALSA driver for it or a ASOC driver? 2. After I have it as a BE, how can I connect the streams? I want the transfers to be done in kernel level, without need for application interventions for each buffer. 3. I'm using kernel 2.6.10 (quite old, I know). I don't want to port my entire kernel to a new one. As my requirement is not very complex, I don't think I'd encounter too many issues. However, if someone can point the important parts I need to back port, I'd appreciate it. Alternatively, if someone sees a showstopper in this approach, I'd be grateful to be aware of it. Thanks, Best regards, Eli ________________________________ This email and any files transmitted with it are confidential material. They are intended solely for the use of the designated individual or entity to whom they are addressed. If the reader of this message is not the intended recipient, you are hereby notified that any dissemination, use, distribution or copying of this communication is strictly prohibited and may be unlawful. If you have received this email in error please immediately notify the sender and delete or destroy any copy of this message

2 4

[alsa-devel] AKAI EIE PRO
by Loki Harfagr 28 Nov '14

28 Nov '14

(hope that's correct to post that way through email since I'm just adding an answer to a specific question in a specific thread), here we go: > Daniel Mack daniel at zonque.org > Sun Sep 7 13:39:12 CEST 2014 > Previous message: [alsa-devel] AKAI EIE PRO > Next message: [alsa-devel] AKAI EIE PRO > Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] > On 09/07/2014 01:30 PM, humbert.olivier.1 at free.fr wrote: > > if that can help, we had an user on http://www.linuxmao.org with an EIE PRO. > > Here you have his lsusb -v : > > > > Bus 001 Device 006: ID 09e8:0010 AKAI Professional M.I. Corp. > > Couldn't open device, some information will be missing > > Device Descriptor: > > bLength 18 > > bDescriptorType 1 > > bcdUSB 2.00 > > bDeviceClass 255 Vendor Specific Class > > bDeviceSubClass 255 Vendor Specific Subclass > > bDeviceProtocol 255 Vendor Specific Protocol > > According to the tech specs, this should be a USB hub, but it isn't. Or > is this just one of the sub-devices? What does 'lsusb -t' say, and does > Linux see something like a mouse or mass storage device when connected > to one of the hub ports? To test accordingly to the question a USB device (Webcam C905) is plugged in one of the EIE Pro. hub ports 1) AKAI EIE Pro *OFF*: ------------------- $ lsusb Bus 002 Device 002: ID 152d:0551 JMicron Technology Corp. / JMicron USA Technology Corp. Bus 005 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 006 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 005 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 006 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 005 Device 003: ID 05e3:0608 Genesys Logic, Inc. USB-2.0 4-Port HUB Bus 005 Device 004: ID 174c:5106 ASMedia Technology Inc. Transcend StoreJet 25M3 Bus 006 Device 003: ID 058f:6362 Alcor Micro Corp. Flash Card Reader/Writer Bus 005 Device 006: ID 046d:c318 Logitech, Inc. Illuminated Keyboard Bus 005 Device 007: ID 047d:1020 Kensington Expert Mouse Trackball Bus 005 Device 012: ID 058f:9254 Alcor Micro Corp. Hub ------------------- 2) AKAI EIE Pro *ON*: ------------------- $ lsusb Bus 002 Device 002: ID 152d:0551 JMicron Technology Corp. / JMicron USA Technology Corp. Bus 005 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub ven. nov. 28 19:27:58 CET 2014 Bus 006 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 005 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 006 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 005 Device 003: ID 05e3:0608 Genesys Logic, Inc. USB-2.0 4-Port HUB Bus 005 Device 004: ID 174c:5106 ASMedia Technology Inc. Transcend StoreJet 25M3 Bus 005 Device 018: ID 0409:005a NEC Corp. HighSpeed Hub Bus 006 Device 003: ID 058f:6362 Alcor Micro Corp. Flash Card Reader/Writer Bus 005 Device 006: ID 046d:c318 Logitech, Inc. Illuminated Keyboard Bus 005 Device 007: ID 047d:1020 Kensington Expert Mouse Trackball Bus 005 Device 012: ID 058f:9254 Alcor Micro Corp. Hub Bus 005 Device 019: ID 046d:080a Logitech, Inc. Portable Webcam C905 Bus 005 Device 020: ID 09e8:0010 AKAI Professional M.I. Corp. ------------------- ------------------- $ lsusb -t /: Bus 06.Port 1: Dev 1, Class=root_hub, Driver=ehci-pci/2p, 480M |__ Port 1: Dev 2, If 0, Class=Hub, Driver=hub/8p, 480M |__ Port 7: Dev 3, If 0, Class=Mass Storage, Driver=usb-storage, 480M /: Bus 05.Port 1: Dev 1, Class=root_hub, Driver=ehci-pci/2p, 480M |__ Port 1: Dev 2, If 0, Class=Hub, Driver=hub/6p, 480M |__ Port 1: Dev 3, If 0, Class=Hub, Driver=hub/4p, 480M |__ Port 1: Dev 6, If 0, Class=Human Interface Device, Driver=usbhid, 12M |__ Port 1: Dev 6, If 1, Class=Human Interface Device, Driver=usbhid, 12M |__ Port 2: Dev 7, If 0, Class=Human Interface Device, Driver=usbhid, 1.5M |__ Port 3: Dev 12, If 0, Class=Hub, Driver=hub/4p, 12M |__ Port 2: Dev 4, If 0, Class=Mass Storage, Driver=usb-storage, 480M |__ Port 4: Dev 18, If 0, Class=Hub, Driver=hub/4p, 480M |__ Port 1: Dev 19, If 0, Class=Video, Driver=uvcvideo, 480M |__ Port 1: Dev 19, If 1, Class=Video, Driver=uvcvideo, 480M |__ Port 1: Dev 19, If 2, Class=Audio, Driver=snd-usb-audio, 480M |__ Port 1: Dev 19, If 3, Class=Audio, Driver=snd-usb-audio, 480M |__ Port 4: Dev 20, If 0, Class=Vendor Specific Class, Driver=, 480M |__ Port 4: Dev 20, If 1, Class=Vendor Specific Class, Driver=, 480M /: Bus 04.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 5000M /: Bus 03.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 480M /: Bus 02.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 5000M |__ Port 2: Dev 2, If 0, Class=Mass Storage, Driver=usb-storage, 5000M /: Bus 01.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 480M ------------------- 3) Then, the Webcam plugged in the EIE Pro. has been unplugged: ------------------- $ lsusb -t /: Bus 06.Port 1: Dev 1, Class=root_hub, Driver=ehci-pci/2p, 480M |__ Port 1: Dev 2, If 0, Class=Hub, Driver=hub/8p, 480M |__ Port 7: Dev 3, If 0, Class=Mass Storage, Driver=usb-storage, 480M /: Bus 05.Port 1: Dev 1, Class=root_hub, Driver=ehci-pci/2p, 480M |__ Port 1: Dev 2, If 0, Class=Hub, Driver=hub/6p, 480M |__ Port 1: Dev 3, If 0, Class=Hub, Driver=hub/4p, 480M |__ Port 1: Dev 6, If 0, Class=Human Interface Device, Driver=usbhid, 12M |__ Port 1: Dev 6, If 1, Class=Human Interface Device, Driver=usbhid, 12M |__ Port 2: Dev 7, If 0, Class=Human Interface Device, Driver=usbhid, 1.5M |__ Port 3: Dev 12, If 0, Class=Hub, Driver=hub/4p, 12M |__ Port 2: Dev 4, If 0, Class=Mass Storage, Driver=usb-storage, 480M |__ Port 4: Dev 18, If 0, Class=Hub, Driver=hub/4p, 480M |__ Port 4: Dev 20, If 0, Class=Vendor Specific Class, Driver=, 480M |__ Port 4: Dev 20, If 1, Class=Vendor Specific Class, Driver=, 480M /: Bus 04.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 5000M /: Bus 03.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 480M /: Bus 02.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 5000M |__ Port 2: Dev 2, If 0, Class=Mass Storage, Driver=usb-storage, 5000M /: Bus 01.Port 1: Dev 1, Class=root_hub, Driver=xhci_hcd/2p, 480M ------------------- ------------------- $ lsusb Bus 002 Device 002: ID 152d:0551 JMicron Technology Corp. / JMicron USA Technology Corp. Bus 005 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 006 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 005 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 006 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 005 Device 003: ID 05e3:0608 Genesys Logic, Inc. USB-2.0 4-Port HUB Bus 005 Device 004: ID 174c:5106 ASMedia Technology Inc. Transcend StoreJet 25M3 Bus 005 Device 018: ID 0409:005a NEC Corp. HighSpeed Hub Bus 006 Device 003: ID 058f:6362 Alcor Micro Corp. Flash Card Reader/Writer Bus 005 Device 006: ID 046d:c318 Logitech, Inc. Illuminated Keyboard Bus 005 Device 007: ID 047d:1020 Kensington Expert Mouse Trackball Bus 005 Device 012: ID 058f:9254 Alcor Micro Corp. Hub Bus 005 Device 020: ID 09e8:0010 AKAI Professional M.I. Corp. ------------------- Sincerely hoping it'll help to include full support in ALSA for the AKAI EIE Pro as it's very good stuff, nicely built and convenient (for its hub) to USB ports eaters as we're all in the music phylum :-) Cheers! -- < °/_ /| ¹

1 0

[alsa-devel] [PATCH v3 0/2] usb: Add native DSD support for Denon/Marantz
by Jurgen Kramer 28 Nov '14

28 Nov '14

This patchset adds native DSD support for Denon/Marantz devices. A specific vendor command is needed to switch between PCM and DSD mode. This is implemented as a new quirk function. Changes from v2: - switch) -> switch ( - combine PCM and DSD mode select to a single USB ctrl msg Changes from v1: - fix compare in err check - remove unneeded brackets Jurgen Kramer (2): usb: Add native DSD support for Denon/Marantz DACs usb: Add mode select quirk for Denon/Marantz DACs sound/usb/pcm.c | 5 +++++ sound/usb/quirks.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.h | 3 +++ 3 files changed, 55 insertions(+) -- 1.9.3

2 3

[alsa-devel] [PATCH v2 0/2] usb: add native DSD support for Denon/Marantz
by Jurgen Kramer 28 Nov '14

28 Nov '14

This patchset adds native DSD support for Denon/Marantz devices. A specific vendor command is needed to switch between PCM and DSD mode. This is implemented as a new quirk function. Changes from v1: - fix compare in err check - remove unneeded brackets Jurgen Kramer (2): usb: Add native DSD support for Denon/Marantz DACs usb: Add mode select quirk for Denon/Marantz DACs sound/usb/pcm.c | 5 +++++ sound/usb/quirks.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.h | 3 +++ 3 files changed, 61 insertions(+) -- 1.9.3

2 4

[alsa-devel] [PATCH] ASoC: Intel: Move capture PCM pin to PCM0 for Broadwell
by Jie Yang 28 Nov '14

28 Nov '14

Move capture PCM pin from PCM4 to PCM0 for Broadwell. This will allow us to integrate with pulseaudio better for usually default device is set to 0. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/broadwell.c | 15 ++------------- sound/soc/intel/sst-haswell-pcm.c | 34 ++++++++++++++++------------------ 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/broadwell.c index 52cb764..c256764 100644 --- a/sound/soc/intel/broadwell.c +++ b/sound/soc/intel/broadwell.c @@ -171,7 +171,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { /* Front End DAI links */ { .name = "System PCM", - .stream_name = "System Playback", + .stream_name = "System Playback/Capture", .cpu_dai_name = "System Pin", .platform_name = "haswell-pcm-audio", .dynamic = 1, @@ -180,6 +180,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .init = broadwell_rtd_init, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dpcm_playback = 1, + .dpcm_capture = 1, }, { .name = "Offload0", @@ -214,18 +215,6 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dpcm_capture = 1, }, - { - .name = "Capture PCM", - .stream_name = "Capture", - .cpu_dai_name = "Capture Pin", - .platform_name = "haswell-pcm-audio", - .dynamic = 1, - .codec_name = "snd-soc-dummy", - .codec_dai_name = "snd-soc-dummy-dai", - .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, - }, - /* Back End DAI links */ { /* SSP0 - Codec */ diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index 5f70d81..0180b38 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -309,7 +309,7 @@ static const struct snd_kcontrol_new hsw_volume_controls[] = { ARRAY_SIZE(volume_map) - 1, 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), /* Mic Capture volume */ - SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 4, 0, 8, + SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 0, 0, 8, ARRAY_SIZE(volume_map) - 1, 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), }; @@ -396,8 +396,14 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream, /* DSP stream type depends on DAI ID */ switch (rtd->cpu_dai->id) { case 0: - stream_type = SST_HSW_STREAM_TYPE_SYSTEM; - module_id = SST_HSW_MODULE_PCM_SYSTEM; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + stream_type = SST_HSW_STREAM_TYPE_SYSTEM; + module_id = SST_HSW_MODULE_PCM_SYSTEM; + } + else { + stream_type = SST_HSW_STREAM_TYPE_CAPTURE; + module_id = SST_HSW_MODULE_PCM_CAPTURE; + } break; case 1: case 2: @@ -410,10 +416,6 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream, path_id = SST_HSW_STREAM_PATH_SSP0_OUT; module_id = SST_HSW_MODULE_PCM_REFERENCE; break; - case 4: - stream_type = SST_HSW_STREAM_TYPE_CAPTURE; - module_id = SST_HSW_MODULE_PCM_CAPTURE; - break; default: dev_err(rtd->dev, "error: invalid DAI ID %d\n", rtd->cpu_dai->id); @@ -779,6 +781,13 @@ static struct snd_soc_dai_driver hsw_dais[] = { .rates = SNDRV_PCM_RATE_48000, .formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE, }, + .capture = { + .stream_name = "Analog Capture", + .channels_min = 2, + .channels_max = 4, + .rates = SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE, + }, }, { /* PCM */ @@ -815,17 +824,6 @@ static struct snd_soc_dai_driver hsw_dais[] = { .formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE, }, }, - { - .name = "Capture Pin", - .id = HSW_PCM_DAI_ID_CAPTURE, - .capture = { - .stream_name = "Analog Capture", - .channels_min = 2, - .channels_max = 4, - .rates = SNDRV_PCM_RATE_48000, - .formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE, - }, - }, }; static const struct snd_soc_dapm_widget widgets[] = { -- 1.9.1

3 3

[alsa-devel] [PATCH 0/2] usb: add native DSD support for Denon/Marantz
by Jurgen Kramer 28 Nov '14

28 Nov '14

This patchset adds native DSD support for Denon/Marantz devices. A specific vendor command is needed to switch between PCM and DSD mode. This is implemented as a new quirk function. Jurgen Kramer (2): Add native DSD support for Denon/Marantz DACs Add mode select quirk for Denon/Marantz DACs sound/usb/pcm.c | 6 ++++++ sound/usb/quirks.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.h | 3 +++ 3 files changed, 62 insertions(+) -- 1.9.3

3 5

[alsa-devel] [PATCH] ASoC: Intel: Correct the xmax volume
by Jie Yang 28 Nov '14

28 Nov '14

The xmax volume should be corrected to ARRAY_SIZE(volume_map)-1, otherwise, the xmax value will be mapped to 0 wrongly. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/sst-haswell-pcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index 20561ca..5f70d81 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -298,19 +298,19 @@ static const DECLARE_TLV_DB_SCALE(hsw_vol_tlv, -9000, 300, 1); static const struct snd_kcontrol_new hsw_volume_controls[] = { /* Global DSP volume */ SOC_DOUBLE_EXT_TLV("Master Playback Volume", 0, 0, 8, - ARRAY_SIZE(volume_map) -1, 0, + ARRAY_SIZE(volume_map) - 1, 0, hsw_volume_get, hsw_volume_put, hsw_vol_tlv), /* Offload 0 volume */ SOC_DOUBLE_EXT_TLV("Media0 Playback Volume", 1, 0, 8, - ARRAY_SIZE(volume_map), 0, + ARRAY_SIZE(volume_map) - 1, 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), /* Offload 1 volume */ SOC_DOUBLE_EXT_TLV("Media1 Playback Volume", 2, 0, 8, - ARRAY_SIZE(volume_map), 0, + ARRAY_SIZE(volume_map) - 1, 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), /* Mic Capture volume */ SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 4, 0, 8, - ARRAY_SIZE(volume_map), 0, + ARRAY_SIZE(volume_map) - 1, 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), }; -- 1.9.1

2 1

[alsa-devel] [PATCH 1/3] ASoC: mxs-sgtl5000: Remove MCLK restriction
by Fabio Estevam 27 Nov '14

27 Nov '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> According to the sgtl5000 datasheet the MCLK frequency range restriction of 8 to 27 MHz only applies when the PLL is used - synchronous SYS_MCLK input mode. mxs-sgtl5000 machine sets the codec as slave, and mx28 generates MCLK in the range of 256*fs, 384*fs or 512*fs, which is called asynchronous SYS_MCLK input. In asynchronous SYS_MCLK we cannot have the 8 to 27 MHz check because if we want to play a 8KHz sample rate track, with a MCLK of 8k * 512 = 4.096MHz the current check would return -EINVAL, which is not correct. Remove the 8 to 27MHz frequency check, since this only applies to the synchronous SYS_MCLK input case. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/mxs/mxs-sgtl5000.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 7515cd4..6f1916b 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -49,13 +49,6 @@ static int mxs_sgtl5000_hw_params(struct snd_pcm_substream *substream, break; } - /* Sgtl5000 sysclk should be >= 8MHz and <= 27M */ - if (mclk < 8000000 || mclk > 27000000) { - dev_err(codec_dai->dev, "Invalid mclk frequency: %u.%03uMHz\n", - mclk / 1000000, mclk / 1000 % 1000); - return -EINVAL; - } - /* Set SGTL5000's SYSCLK (provided by SAIF MCLK) */ ret = snd_soc_dai_set_sysclk(codec_dai, SGTL5000_SYSCLK, mclk, 0); if (ret) { -- 1.9.1

2 3

[alsa-devel] [PATCH 01/11] ASoC: cq93vc: Remove unused state struct
by Lars-Peter Clausen 27 Nov '14

27 Nov '14

While two of the fields in the cq93vc driver state struct are initialized none of them are ever acutally read again. So remove the whole struct. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/linux/mfd/davinci_voicecodec.h | 7 ------- sound/soc/codecs/cq93vc.c | 8 -------- 2 files changed, 15 deletions(-) diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h index cb01496..8e1cdbe 100644 --- a/include/linux/mfd/davinci_voicecodec.h +++ b/include/linux/mfd/davinci_voicecodec.h @@ -99,12 +99,6 @@ struct davinci_vcif { dma_addr_t dma_rx_addr; }; -struct cq93vc { - struct platform_device *pdev; - struct snd_soc_codec *codec; - u32 sysclk; -}; - struct davinci_vc; struct davinci_vc { @@ -122,7 +116,6 @@ struct davinci_vc { /* Client devices */ struct davinci_vcif davinci_vcif; - struct cq93vc cq93vc; }; #endif diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 537327c..036a877 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -62,14 +62,10 @@ static int cq93vc_mute(struct snd_soc_dai *dai, int mute) static int cq93vc_set_dai_sysclk(struct snd_soc_dai *codec_dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec = codec_dai->codec; - struct davinci_vc *davinci_vc = codec->dev->platform_data; - switch (freq) { case 22579200: case 27000000: case 33868800: - davinci_vc->cq93vc.sysclk = freq; return 0; } @@ -135,10 +131,6 @@ static int cq93vc_resume(struct snd_soc_codec *codec) static int cq93vc_probe(struct snd_soc_codec *codec) { - struct davinci_vc *davinci_vc = codec->dev->platform_data; - - davinci_vc->cq93vc.codec = codec; - /* Off, with power on */ cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY); -- 1.8.0

3 22

[alsa-devel] [PATCH] ASoC: Intel: Remove useless loopback volume control for Broadwell
by Jie Yang 27 Nov '14

27 Nov '14

On Broadwell, the ADSP FW don't support loopback record volume tuning, so here remove this control. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/sst-haswell-pcm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index 331237f..20561ca 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -308,10 +308,6 @@ static const struct snd_kcontrol_new hsw_volume_controls[] = { SOC_DOUBLE_EXT_TLV("Media1 Playback Volume", 2, 0, 8, ARRAY_SIZE(volume_map), 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), - /* Loopback volume */ - SOC_DOUBLE_EXT_TLV("Loopback Capture Volume", 3, 0, 8, - ARRAY_SIZE(volume_map), 0, - hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), /* Mic Capture volume */ SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 4, 0, 8, ARRAY_SIZE(volume_map), 0, -- 1.9.1

2 1