July 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/5] topology: Enhance support for private data
by mengdong.lin＠linux.intel.com 13 Jul '16

13 Jul '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> There is no ABI change in this series. We finished verification on latest Intel platforms. There will be 4 or 5 series. Later series will come with some ABI update for topology. The size check on ABI objects in current ASoC kernel will detect possible ABI version mismatch between user space and kernel. Mengdong Lin (5): topology: An element can refer to multipe data sections in text conf file topology: Merge lookup for data reference into tplg_copy_data() topology: Change uuid value to 16 separate characters in text conf file topology: Parse vendor private data for manifest topology: Tuple type can have an extenstion include/topology.h | 69 ++++++++++- src/topology/ctl.c | 52 ++++---- src/topology/dapm.c | 17 ++- src/topology/data.c | 296 +++++++++++++++++++++++++++++++++++++++------- src/topology/elem.c | 4 + src/topology/parser.c | 28 ++++- src/topology/tplg_local.h | 14 ++- 7 files changed, 389 insertions(+), 91 deletions(-) -- 2.5.0

2 8

[alsa-devel] [alsa-lib][PATCH] ctl: add compatibility information for snd_ctl_elem_info_set_dimension()
by Takashi Sakamoto 13 Jul '16

13 Jul '16

I forgot it when committing to the API. Fixes: 16812b70daeb('ctl: add an API to set dimension levels to element information') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/control/control.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/control/control.c b/src/control/control.c index a88f7a1..aa05130 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -2515,6 +2515,9 @@ use_default_symbol_version(__snd_ctl_elem_info_get_dimension, snd_ctl_elem_info_ * <dt>-EINVAL * <dd>Invalid arguments are given as parameters. * </dl> + * + * \par Compatibility: + * This function is added in version 1.1.2. */ int snd_ctl_elem_info_set_dimension(snd_ctl_elem_info_t *info, const int dimension[4]) -- 2.7.4

2 1

[alsa-devel] [GIT PULL] Add Kabylake audio firmware
by Vinod Koul 12 Jul '16

12 Jul '16

Hello, Please PULL to recive the audio firmware for Kabylake Intel SoC. The following changes since commit 1dc99be22222fbf88adc98d85f8ffb7529c6c4e3: amdgpu: update vce firmware for VI asics (2016-07-11 15:18:20 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/firmware.git kbl for you to fetch changes up to 11e3390b4fac69b50a5f88861d295fd94e51ba6c: linux-firmware: intel: Add Kabylake audio firmware (2016-07-12 14:50:59 +0530) ---------------------------------------------------------------- Vinod Koul (1): linux-firmware: intel: Add Kabylake audio firmware WHENCE | 6 ++++++ intel/dsp_fw_kbl.bin | 1 + intel/dsp_fw_kbl_v701.bin | Bin 0 -> 238920 bytes 3 files changed, 7 insertions(+) create mode 120000 intel/dsp_fw_kbl.bin create mode 100644 intel/dsp_fw_kbl_v701.bin Thanks -- ~Vinod

2 1

[alsa-devel] [PATCH] ALSA: ak4114: remove redundant check on err being < 0
by Colin King 12 Jul '16

12 Jul '16

From: Colin Ian King <colin.king(a)canonical.com> snd_ak4114_create checks if the error return err is less than zero or not. This is a redundant check, err can only be < 0 to get to the __fail label, in which case just return err and remove the redundant check (since we never return -EIO). Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/i2c/other/ak4114.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c index 5a4cf3f..d53c9bb 100644 --- a/sound/i2c/other/ak4114.c +++ b/sound/i2c/other/ak4114.c @@ -121,7 +121,7 @@ int snd_ak4114_create(struct snd_card *card, __fail: snd_ak4114_free(chip); - return err < 0 ? err : -EIO; + return err; } EXPORT_SYMBOL(snd_ak4114_create); -- 2.8.1

2 1

[alsa-devel] [PATCH] ALSA: ak4117: remove redundant check on err being < 0
by Colin King 12 Jul '16

12 Jul '16

From: Colin Ian King <colin.king(a)canonical.com> snd_ak4117_create checks if the error return err is less than zero or not. This is a redundant check, err can only be < 0 to get to the __fail label, in which case just return err and remove the redundant check (since we never return -EIO). Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/i2c/other/ak4117.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index 48848909..0702f05 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c @@ -110,7 +110,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t __fail: snd_ak4117_free(chip); - return err < 0 ? err : -EIO; + return err; } void snd_ak4117_reg_write(struct ak4117 *chip, unsigned char reg, unsigned char mask, unsigned char val) -- 2.8.1

2 1

[alsa-devel] [PATCH] ALSA: hda: add AMD Stoney PCI ID with proper driver caps
by Awais Belal 12 Jul '16

12 Jul '16

This allows the device to correctly show up as ATI HDMI rather than a generic one and allows the driver to use the available caps. Signed-off-by: Awais Belal <awais_belal(a)mentor.com> --- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 09920ba..4b80b16 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2106,6 +2106,8 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, { PCI_DEVICE(0x1002, 0x157a), .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, + { PCI_DEVICE(0x1002, 0x15b3), + .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, { PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI }, { PCI_DEVICE(0x1002, 0x7919), -- 1.9.1

2 1

[alsa-devel] Problem getting USB DAC to work
by John Westwood 12 Jul '16

12 Jul '16

Dear ALSA Developers I have a problem getting my obscure USB DAC (Starting Point Systems DAC3) to work in Linux. I believe the problem may be similar to this one, but am not sure: https://groups.google.com/forum/#!topic/linux.debian.kernel/HwwkRkbL5aY If I try to use aplay to play a wav I receive the following error: aplay -D default test.wav Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, Stereo aplay: pcm_write:1939: write error: No such device syslog shows the following: Jul 9 15:38:31 atlas kernel: [ 4805.148059] usb 7-2: USB disconnect, device number 19 Jul 9 15:38:32 atlas kernel: [ 4805.532022] usb 7-2: new full-speed USB device number 20 using uhci_hcd Jul 9 15:38:32 atlas kernel: [ 4805.725024] usb 7-2: New USB device found, idVendor=2504, idProduct=0201 Jul 9 15:38:32 atlas kernel: [ 4805.725029] usb 7-2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 Jul 9 15:38:32 atlas kernel: [ 4805.725032] usb 7-2: Product: TDA 1543 DAC 3 v1.4 Jul 9 15:38:32 atlas kernel: [ 4805.725034] usb 7-2: Manufacturer: STARTING POINT SYSTEMS Jul 9 15:38:32 atlas kernel: [ 4805.725035] usb 7-2: SerialNumber: Jul 9 15:38:32 atlas kernel: [ 4805.745018] usb 7-2: Warning! Unlikely big volume range (=65535), cval->res is probably wrong. Jul 9 15:38:32 atlas kernel: [ 4805.745023] usb 7-2: [2] FU [PCM Playback Volume] ch = 1, val = -32768/32767/1 Jul 9 15:38:32 atlas mtp-probe: checking bus 7, device 20: "/sys/devices/pci0000:00/0000:00:1d.1/usb7/7-2" Jul 9 15:38:32 atlas mtp-probe: bus: 7, device: 20 was not an MTP device I have another USB DAC that works fine, in syslog the working DAC has the following lines which are not present with the non-working DAC: Jul 11 19:56:35 atlas kernel: [83940.049124] input: Lakewest Audio Audiolab M-DAC as /devices/pci0000:00/0000:00:1d.1/usb7/7-2/7-2:1.0/0003:0451:ADAC.0002/input/input12 Jul 11 19:56:35 atlas kernel: [83940.104367] hid-generic 0003:0451:ADAC.0002:input,hiddev0,hidraw1: USB HID v1.11 Device [Lakewest Audio Audiolab M-DAC] on usb-0000:00:1d.1-2/input0 With the non-working DAC I get these lines instead: Jul 11 19:56:25 atlas kernel: [83930.079063] usb 7-2: Warning! Unlikely big volume range (=65535), cval->res is probably wrong. Jul 11 19:56:25 atlas kernel: [83930.079067] usb 7-2: [2] FU [PCM Playback Volume] ch = 1, val = -32768/32767/1 I am using Linux Mint 17.3 64bit, kernel 3.19.0-32. I have also tried kernel 4.4.0-28 but to no avail. The ALSA version is 1.0.27.2 . Any help or suggestions would be greatly appreciated. Thanks very much. Best regards John Westwood

1 0

[alsa-devel] Fwd: Audio capture on OMAP3530/DM3730 (Yocto Poky Linux 3.18+) occasionally swaps channels
by Akram Hameed 12 Jul '16

12 Jul '16

Hello there, (Apologies for cross-posting from user list if you are seeing this twice). I have a fairly serious problem using ALSA for capture on an Gumstix Overo based system. The audio device in question is a TWL4030 device. It is connected to a TI DM3730 (or in some cases, an OMAP3530). Previously I was using a 3.0 kernel and my audio capture worked just fine with no extra tweaks to ALSA. Now for other reasons I have to move to a more recent kernel, and have tried with 3.18 and 4.4 stable releases. Using these kernels, at random times, the audio capture channels will swap. They will remain swapped for an unpredictable period of time, and then they will swap back. This will continue forever, again, with the swapping occurring at random times. Our system totally relies on predictable audio capture - so for this random behaviour to occur means we must seek a different platform unless we can either: a) Find a solution for 3.18 or newer kernel (the problem is still occurring with ALSA 1.1 on kernel 4.4) or, b) Make some code change to solve the issue. I found this alsa-devel thread regarding the 2.6.32 kernel that seems to be almost exactly what I am experiencing: http://mailman.alsa-project.org/pipermail/alsa-devel/2011-February/036895.h… I also found this one which is probably more closely related: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-March/060557.html My current thought is that it is indeed a DMA issue, but I am not familiar with that area of the kernel source and therefore hoping someone might have some suggestions about what to try next. Best regards, Akram

1 0

[alsa-devel] [PATCH v2] sound: oss: Remove useless initialisation
by Amitoj Kaur Chawla 12 Jul '16

12 Jul '16

Remove useless initialisation of variable whose value is reinitialised later. The Coccinelle semantic patch used to make this change is as follows: @@ type T; identifier x; constant C; expression e; @@ T x - = C ; x = e; Signed-off-by: Amitoj Kaur Chawla <amitoj1606(a)gmail.com> --- Changes in v2: -Modify commit message sound/oss/ad1848.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 10c8de1..6368e5c 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -254,7 +254,7 @@ static void ad_write(ad1848_info * devc, int reg, int data) static void wait_for_calibration(ad1848_info * devc) { - int timeout = 0; + int timeout; /* * Wait until the auto calibration process has finished. -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: intel: Fix sst-dsp dependency on dw stuff
by Takashi Iwai 12 Jul '16

12 Jul '16

The recent commit [a92ea59b74e2: ASoC: Intel: sst: only select sst-firmware when DW DMAC is built-in] introduced more strict kconfig dependency (depends on DW_DMAC_CORE=y) for avoiding the build failures due to dependency messes in intel-sst. This makes, however, it impossible to use this driver with the modularized systems, i.e. typically on Linux distros. The problem addressed in the commit above is that sst_dsp_new() and sst_dsp_free() includes the firmware init / finish that call dw_*() functions. Thus building it as built-in with DW_DMAC_CORE module results in the missing symbols. However, these sst_dsp functions are basically called only from the drivers that depend on DW_DMAC_CORE already. That is, once when these functions are split out, the rest can be independent from dw stuff. This patch attempts to solve the issue by the following: - Split sst-dsp stuff into two modules: snd-soc-sst-dsp and snd-soc-sst-firmware. - Move sst_dsp_new() and sst_dsp_free() to the latter module so that the former module can be independent from DW_DMAC_CORE. - Add a new kconfig SND_SOC_INTEL_SST_FIRMWARE to select the latter module by machine drivers. One only remaining pitfall is that each machine driver has to select SND_SOC_INTEL_SST_FIRMWARE carefully depending on DW_DMAC_CORE. This can't be done cleanly due to the restriction of the current kbuild. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=988117 Fixes: a92ea59b74e2 ('ASoC: Intel: sst: only select sst-firmware when DW DMAC is built-in') Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/intel/Kconfig | 18 +++++++--- sound/soc/intel/common/Makefile | 4 +-- sound/soc/intel/common/sst-dsp-priv.h | 4 --- sound/soc/intel/common/sst-dsp.c | 67 ---------------------------------- sound/soc/intel/common/sst-dsp.h | 2 +- sound/soc/intel/common/sst-firmware.c | 68 +++++++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 78 deletions(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 9c86459d0fc3..a20c3dfbcb5d 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -32,6 +32,12 @@ config SND_SOC_INTEL_SST select SND_SOC_INTEL_SST_MATCH if ACPI depends on (X86 || COMPILE_TEST) +# firmware stuff depends DW_DMAC_CORE; since there is no depends-on from +# the reverse selection, each machine driver needs to select +# SND_SOC_INTEL_SST_FIRMWARE carefully depending on DW_DMAC_CORE +config SND_SOC_INTEL_SST_FIRMWARE + tristate + config SND_SOC_INTEL_SST_ACPI tristate @@ -47,8 +53,9 @@ config SND_SOC_INTEL_BAYTRAIL config SND_SOC_INTEL_HASWELL_MACH tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM - depends on DW_DMAC_CORE=y + depends on DW_DMAC_CORE select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT5640 help @@ -91,8 +98,9 @@ config SND_SOC_INTEL_BXT_RT298_MACH config SND_SOC_INTEL_BYT_RT5640_MACH tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" depends on X86_INTEL_LPSS && I2C - depends on DW_DMAC_CORE=y && (SND_SST_IPC_ACPI = n) + depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n) select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_BAYTRAIL select SND_SOC_RT5640 help @@ -103,8 +111,9 @@ config SND_SOC_INTEL_BYT_RT5640_MACH config SND_SOC_INTEL_BYT_MAX98090_MACH tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" depends on X86_INTEL_LPSS && I2C - depends on DW_DMAC_CORE=y && (SND_SST_IPC_ACPI = n) + depends on DW_DMAC_CORE && (SND_SST_IPC_ACPI = n) select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_BAYTRAIL select SND_SOC_MAX98090 help @@ -115,8 +124,9 @@ config SND_SOC_INTEL_BROADWELL_MACH tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint" depends on X86_INTEL_LPSS && I2C && DW_DMAC && \ I2C_DESIGNWARE_PLATFORM - depends on DW_DMAC_CORE=y + depends on DW_DMAC_CORE select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SST_FIRMWARE select SND_SOC_INTEL_HASWELL select SND_SOC_RT286 help diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index fbbb25c2ceed..1a35149bcad7 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -2,9 +2,9 @@ snd-soc-sst-dsp-objs := sst-dsp.o snd-soc-sst-acpi-objs := sst-acpi.o snd-soc-sst-match-objs := sst-match-acpi.o snd-soc-sst-ipc-objs := sst-ipc.o - -snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o +snd-soc-sst-firmware-objs := sst-firmware.o obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o obj-$(CONFIG_SND_SOC_INTEL_SST_MATCH) += snd-soc-sst-match.o +obj-$(CONFIG_SND_SOC_INTEL_SST_FIRMWARE) += snd-soc-sst-firmware.o diff --git a/sound/soc/intel/common/sst-dsp-priv.h b/sound/soc/intel/common/sst-dsp-priv.h index 97dc1ae05e69..d13c84364c3c 100644 --- a/sound/soc/intel/common/sst-dsp-priv.h +++ b/sound/soc/intel/common/sst-dsp-priv.h @@ -383,10 +383,6 @@ struct sst_mem_block *sst_mem_block_register(struct sst_dsp *dsp, u32 offset, u32 index, void *private); void sst_mem_block_unregister_all(struct sst_dsp *dsp); -/* Create/Free DMA resources */ -int sst_dma_new(struct sst_dsp *sst); -void sst_dma_free(struct sst_dma *dma); - u32 sst_dsp_get_offset(struct sst_dsp *dsp, u32 offset, enum sst_mem_type type); #endif diff --git a/sound/soc/intel/common/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c index ff2196ef359f..c00ede4ea4d7 100644 --- a/sound/soc/intel/common/sst-dsp.c +++ b/sound/soc/intel/common/sst-dsp.c @@ -420,73 +420,6 @@ void sst_dsp_inbox_read(struct sst_dsp *sst, void *message, size_t bytes) } EXPORT_SYMBOL_GPL(sst_dsp_inbox_read); -#ifdef CONFIG_DW_DMAC_CORE -struct sst_dsp *sst_dsp_new(struct device *dev, - struct sst_dsp_device *sst_dev, struct sst_pdata *pdata) -{ - struct sst_dsp *sst; - int err; - - dev_dbg(dev, "initialising audio DSP id 0x%x\n", pdata->id); - - sst = devm_kzalloc(dev, sizeof(*sst), GFP_KERNEL); - if (sst == NULL) - return NULL; - - spin_lock_init(&sst->spinlock); - mutex_init(&sst->mutex); - sst->dev = dev; - sst->dma_dev = pdata->dma_dev; - sst->thread_context = sst_dev->thread_context; - sst->sst_dev = sst_dev; - sst->id = pdata->id; - sst->irq = pdata->irq; - sst->ops = sst_dev->ops; - sst->pdata = pdata; - INIT_LIST_HEAD(&sst->used_block_list); - INIT_LIST_HEAD(&sst->free_block_list); - INIT_LIST_HEAD(&sst->module_list); - INIT_LIST_HEAD(&sst->fw_list); - INIT_LIST_HEAD(&sst->scratch_block_list); - - /* Initialise SST Audio DSP */ - if (sst->ops->init) { - err = sst->ops->init(sst, pdata); - if (err < 0) - return NULL; - } - - /* Register the ISR */ - err = request_threaded_irq(sst->irq, sst->ops->irq_handler, - sst_dev->thread, IRQF_SHARED, "AudioDSP", sst); - if (err) - goto irq_err; - - err = sst_dma_new(sst); - if (err) - dev_warn(dev, "sst_dma_new failed %d\n", err); - - return sst; - -irq_err: - if (sst->ops->free) - sst->ops->free(sst); - - return NULL; -} -EXPORT_SYMBOL_GPL(sst_dsp_new); - -void sst_dsp_free(struct sst_dsp *sst) -{ - free_irq(sst->irq, sst); - if (sst->ops->free) - sst->ops->free(sst); - - sst_dma_free(sst->dma); -} -EXPORT_SYMBOL_GPL(sst_dsp_free); -#endif - /* Module information */ MODULE_AUTHOR("Liam Girdwood"); MODULE_DESCRIPTION("Intel SST Core"); diff --git a/sound/soc/intel/common/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h index 0b84c719ec48..859f0de00339 100644 --- a/sound/soc/intel/common/sst-dsp.h +++ b/sound/soc/intel/common/sst-dsp.h @@ -216,7 +216,7 @@ struct sst_pdata { void *dsp; }; -#ifdef CONFIG_DW_DMAC_CORE +#if IS_ENABLED(CONFIG_DW_DMAC_CORE) /* Initialization */ struct sst_dsp *sst_dsp_new(struct device *dev, struct sst_dsp_device *sst_dev, struct sst_pdata *pdata); diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c index 25993527370b..a086c35f91bb 100644 --- a/sound/soc/intel/common/sst-firmware.c +++ b/sound/soc/intel/common/sst-firmware.c @@ -1211,3 +1211,71 @@ u32 sst_dsp_get_offset(struct sst_dsp *dsp, u32 offset, } } EXPORT_SYMBOL_GPL(sst_dsp_get_offset); + +struct sst_dsp *sst_dsp_new(struct device *dev, + struct sst_dsp_device *sst_dev, struct sst_pdata *pdata) +{ + struct sst_dsp *sst; + int err; + + dev_dbg(dev, "initialising audio DSP id 0x%x\n", pdata->id); + + sst = devm_kzalloc(dev, sizeof(*sst), GFP_KERNEL); + if (sst == NULL) + return NULL; + + spin_lock_init(&sst->spinlock); + mutex_init(&sst->mutex); + sst->dev = dev; + sst->dma_dev = pdata->dma_dev; + sst->thread_context = sst_dev->thread_context; + sst->sst_dev = sst_dev; + sst->id = pdata->id; + sst->irq = pdata->irq; + sst->ops = sst_dev->ops; + sst->pdata = pdata; + INIT_LIST_HEAD(&sst->used_block_list); + INIT_LIST_HEAD(&sst->free_block_list); + INIT_LIST_HEAD(&sst->module_list); + INIT_LIST_HEAD(&sst->fw_list); + INIT_LIST_HEAD(&sst->scratch_block_list); + + /* Initialise SST Audio DSP */ + if (sst->ops->init) { + err = sst->ops->init(sst, pdata); + if (err < 0) + return NULL; + } + + /* Register the ISR */ + err = request_threaded_irq(sst->irq, sst->ops->irq_handler, + sst_dev->thread, IRQF_SHARED, "AudioDSP", sst); + if (err) + goto irq_err; + + err = sst_dma_new(sst); + if (err) + dev_warn(dev, "sst_dma_new failed %d\n", err); + + return sst; + +irq_err: + if (sst->ops->free) + sst->ops->free(sst); + + return NULL; +} +EXPORT_SYMBOL_GPL(sst_dsp_new); + +void sst_dsp_free(struct sst_dsp *sst) +{ + free_irq(sst->irq, sst); + if (sst->ops->free) + sst->ops->free(sst); + + sst_dma_free(sst->dma); +} +EXPORT_SYMBOL_GPL(sst_dsp_free); + +MODULE_DESCRIPTION("Intel SST Firmware Loader"); +MODULE_LICENSE("GPL v2"); -- 2.9.0

3 3