June 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/6] soundwire: Add multi link support
by Shreyas NC 06 Jun '18

06 Jun '18

Currently, in the SoundWire subsystem, the concept of stream is limited to a Master and one or more Slaves(Codecs). This series aims to add support for multiple Master(s) sharing the same reference clock and synchronized in the hardware. This patch series adds: - Helpers to lock bus instances part of the stream - Boiler plate conversion of code to support a list of Master runtime - Support multi link bank switch to support synchronization between multiple masters - Add Intel platform ops for pre/post bank switch Sanyog Kale (2): Documentation: soundwire: Add documentation for Multi link soundwire: Add support to lock across bus instances Shreyas NC (3): soundwire: Initialize completion for defer messages soundwire: Add support for multilink bank switch soundwire: intel: Add pre/post bank switch ops Vinod Koul (1): soundwire: Handle multiple master instances in a stream Documentation/driver-api/soundwire/stream.rst | 30 +- drivers/soundwire/bus.c | 1 + drivers/soundwire/bus.h | 4 + drivers/soundwire/intel.c | 54 ++++ drivers/soundwire/stream.c | 429 ++++++++++++++++++-------- include/linux/soundwire/sdw.h | 6 +- 6 files changed, 390 insertions(+), 134 deletions(-) -- 2.7.4

3 10

[alsa-devel] [PATCH] ASoC: ssm2602: Fix ADC powerup sequencing
by Marco Felsch 05 Jun '18

05 Jun '18

From: Philipp Zabel <p.zabel(a)pengutronix.de> According to the ssm2603 data sheet (control register sequencing), the digital core should be activated only after all necessary bits in the power register are enabled, and a delay determined by the decoupling capacitor on the VMID pin has passed. If the digital core is activated too early, or even before the ADC is powered up, audible artifacts appear at the beginning of the recorded signal. The digital core is also needed for playback, so when recording starts it may already be enabled. This means we cannot get the power sequence correct when we want to be able to start recording after playback. As a workaround put the MIC mute switch into the DAPM routes. This way we can keep the recording disabled until the MIC Bias has settled and thus get rid of audible artifacts. The delay we have to wait depends on a board specific capacitor connected to the VMID pins, so make the delay configurable in the device tree. Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Signed-off-by: Marco Felsch <m.felsch(a)pengutronix.de> --- .../devicetree/bindings/sound/adi,ssm2602.txt | 7 +++++ sound/soc/codecs/ssm2602.c | 30 +++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/adi,ssm2602.txt b/Documentation/devicetree/bindings/sound/adi,ssm2602.txt index 3b3302fe399b..9334d48c0462 100644 --- a/Documentation/devicetree/bindings/sound/adi,ssm2602.txt +++ b/Documentation/devicetree/bindings/sound/adi,ssm2602.txt @@ -11,9 +11,16 @@ Required properties: - reg : the I2C address of the device for I2C, the chip select number for SPI. +Optional properties: + + - startup-delay-us : delay between powering on and activating the digital + core, determined by the decoupling capacitor C on the + VMID pin: delay [µs] = C [µF] * 25000 / 3.5 + Example: ssm2602: ssm2602@1a { compatible = "adi,ssm2602"; reg = <0x1a>; + startup-delay-us = <34000>; /* 4.7 µF * 25000 / 3.5 -> ~34 ms */ }; diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 501a4e73b185..1b99f5d44f8d 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -26,9 +26,11 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <linux/delay.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/slab.h> +#include <linux/of.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -46,6 +48,7 @@ struct ssm2602_priv { enum ssm2602_type type; unsigned int clk_out_pwr; + u32 startup_delay_us; }; /* @@ -111,7 +114,6 @@ SOC_SINGLE_TLV("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1, SOC_SINGLE("Mic Boost (+20dB)", SSM2602_APANA, 0, 1, 0), SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 8, 1, 0), -SOC_SINGLE("Mic Switch", SSM2602_APANA, 1, 1, 1), }; /* Output Mixer */ @@ -121,10 +123,26 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", SSM2602_APANA, 4, 1, 0), SOC_DAPM_SINGLE("Mic Sidetone Switch", SSM2602_APANA, 5, 1, 0), }; +static const struct snd_kcontrol_new mic_ctl = + SOC_DAPM_SINGLE("Switch", SSM2602_APANA, 1, 1, 1); + /* Input mux */ static const struct snd_kcontrol_new ssm2602_input_mux_controls = SOC_DAPM_ENUM("Input Select", ssm2602_enum[0]); +static int ssm2602_mic_switch_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); + + if (ssm2602->startup_delay_us) + usleep_range(ssm2602->startup_delay_us, + ssm2602->startup_delay_us * 2); + + return 0; +} + static const struct snd_soc_dapm_widget ssm260x_dapm_widgets[] = { SND_SOC_DAPM_DAC("DAC", "HiFi Playback", SSM2602_PWR, 3, 1), SND_SOC_DAPM_ADC("ADC", "HiFi Capture", SSM2602_PWR, 2, 1), @@ -146,6 +164,9 @@ SND_SOC_DAPM_MIXER("Output Mixer", SSM2602_PWR, 4, 1, SND_SOC_DAPM_MUX("Input Mux", SND_SOC_NOPM, 0, 0, &ssm2602_input_mux_controls), SND_SOC_DAPM_MICBIAS("Mic Bias", SSM2602_PWR, 1, 1), +SND_SOC_DAPM_SWITCH_E("Mic Switch", SSM2602_APANA, 1, 1, &mic_ctl, + ssm2602_mic_switch_event, SND_SOC_DAPM_PRE_PMU), + SND_SOC_DAPM_OUTPUT("LHPOUT"), SND_SOC_DAPM_OUTPUT("RHPOUT"), SND_SOC_DAPM_INPUT("MICIN"), @@ -178,9 +199,11 @@ static const struct snd_soc_dapm_route ssm2602_routes[] = { {"LHPOUT", NULL, "Output Mixer"}, {"Input Mux", "Line", "Line Input"}, - {"Input Mux", "Mic", "Mic Bias"}, + {"Input Mux", "Mic", "Mic Switch"}, {"ADC", NULL, "Input Mux"}, + {"Mic Switch", NULL, "Mic Bias"}, + {"Mic Bias", NULL, "MICIN"}, }; @@ -645,6 +668,9 @@ int ssm2602_probe(struct device *dev, enum ssm2602_type type, if (ssm2602 == NULL) return -ENOMEM; + of_property_read_u32(dev->of_node, "startup-delay-us", + &ssm2602->startup_delay_us); + dev_set_drvdata(dev, ssm2602); ssm2602->type = type; ssm2602->regmap = regmap; -- 2.17.0

5 12

[alsa-devel] [GIT PULL] ASoC updates for v4.18
by Mark Brown 05 Jun '18

05 Jun '18

The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338: Linux 4.17-rc1 (2018-04-15 18:24:20 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.18 for you to fetch changes up to aac521e880f221e6d4e67b7061022dbecace0df0: Merge branch 'asoc-4.17' into asoc-4.18 merge window (2018-06-05 15:25:41 +0100) ---------------------------------------------------------------- ASoC: Updates for v4.18 This is a very big update, mainly due to a huge set of new drivers some of which are individually very large. We also have a lot of fixes for the topology stuff, several of the users have stepped up and fixed some the serious issues there, and continued progress on the transition away from CODEC specific drivers to generic component drivers. - Many fixes for the topology code, including fixes for the half done v4 ABI compatibility from Guenter Roeck and other ABI fixes from Kirill Marinushkin. - Lots of cleanup for Intel platforms based on Realtek CODECs from Hans de Goode. - More followups on removing legacy CODEC things and transitioning to components from Morimoto-san. - Conversion of OMAP DMA to the new, more standard SDMA-PCM driver. - A series of fixes and updates to the rather elderly Cirrus Logic SoC drivers from Alexander Sverdlin. - Qualcomm DSP support from Srinivas Kandagatla. - New drivers for Analog SSM2305, Atmel I2S controllers, Mediatek MT6351, MT6797 and MT7622, Qualcomm DSPs, Realtek RT1305, RT1306 and RT5668 and TI TSCS454 ---------------------------------------------------------------- Agrawal, Akshu (2): ASoC: AMD: Support headset button on Stoney DA7219 ASoC: AMD: make channel 1 dma as circular Akshu Agrawal (3): ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown ASoC: AMD: Fix clocks in CZ DA7219 machine driver ASoC: AMD: Add const to snd_soc_ops instances Alexander Sverdlin (5): ASoC: cirrus: i2s: Fix LRCLK configuration ASoC: cirrus: i2s: Fix {TX|RX}LinCtrlData setup ASoC: cirrus: i2s: Stop enabling I2S2 and I2S3 FIFOs ARM: ep93xx: i2s: Add IRQ to platform device resources ASoC: cirrus: i2s: IRQ-based stream watchdog Andy Shevchenko (1): ASoC: rt5677: Convert I2C driver to ->probe_new() Arnd Bergmann (4): ASoC: rsnd: mark PM functions __maybe_unused ASoC: omap: fix compile-test building ASoC: codecs: PCM1789: include gpio/consumer.h ASoC: mediatek: export mtk-afe symbols as needed Bard Liao (2): ASoC: rt5668: add rt5668B codec driver ASoC: rt5670: improve PLL function's stability Charles Keepax (7): ASoC: wm_adsp: Account for name prefixes when toggling preloader ASoC: compress: Only call free for components which have been opened ASoC: Remove platform code now everything is componentised ASoC: compress: Add helper functions for component open/free ASoC: core: Allow codec_conf DT lookups to match parent of_node ASoC: compress: Only assign compr->ops->copy once ASoC: compress: Fix up some trivial formatting issues Colin Ian King (10): ASoC: atmel_ssc_dai: fix spelling mistake: "Stoping" -> "Stopping" ASoC: rt5668: fix incorrect 'and' operator ASoC: amd: fix spelling mistake: "failer" -> "failure" ASoC: Intel: bytcr_rt565: fix missing assignment to ret_val ASoC: nau8824: fix spelling mistake: "semaphone" -> "semaphore" ASoC: zx-i2s: fix spelling mistake: "timeing" -> "timing" ASoC: hisilicon: fix spelling mistake: "uknown" -> "unknown" ASoC: wm8904: fix spelling mistake: "Caputure" -> "Capture" ASoC: wm2200,wm5100: fix spelling mistake: "Coefficeints" -> "Coefficients" ASoC: intel: skylake: fix spelling mistake: "Homogenous" -> "Homogeneous" Cyrille Pitchen (2): ASoC: atmel-i2s: dt-bindings: add DT bindings for I2S controller ASoC: atmel-i2s: add driver for the new Atmel I2S controller Dan Carpenter (1): ASoC: topology: fix some tiny memory leaks Daniel Mack (6): ASoC: core: fix return code in error message ASoC: pxa-ssp: allow more flexible setup order ASoC: pxa-ssp: simplify pxa_ssp_set_dai_sysclk() ASoC: wm8782: add device-tree matching table ASoC: make wm8782 codec selectable in Kconfig ASoC: simple-card: set cpu dai clk in hw_params Danny Smith (2): ASoC: adau17x1: Handling of DSP_RUN register during fw setup ASoC: adau17x1: Do not reload dsp-fw if samplerate has not changed Divya Prakash (1): ASoC: Intel: Skylake: Reset DSP pipe in skl_pcm_hw_free Fabio Estevam (14): ASoC: sgtl5000: Fix the spelling of 'exceed' ASoC: sgtl5000: Switch to SPDX identifier ASoC: fsl_ssi: Use u32 variable type when using regmap_read() ASoC: fsl_ssi: Switch to SPDX identifier ASoC: fsl_sai: Switch to SPDX identifier ASoC: fsl_esai: Switch to SPDX identifier ASoC: fsl_spdif: Switch to SPDX identifier ASoC: sgtl5000: Make the node name generic ASoC: wm8962: Make the node name generic ASoC: wm8960: Make the node name generic ASoC: cs42xx8: Make the node name generic ASoC: fsl: Mark 'big-endian' property as optional ASoC: codec: wolfson: Make the node name generic ASoC: codec: realtek: Make the node name generic Fengguang Wu (1): ASoC: rt1305: fix platform_no_drv_owner.cocci warnings Geert Uytterhoeven (3): ASoC: Remove depends on HAS_DMA in case of platform dependency ASoC: sh: Drop SUPERH platform dependency ASoC: sh: Update menu title and platform dependency Guenter Roeck (3): ASoC: topology: Improve backwards compatibility with v4 topology files ASoC: topology: Move v4 manifest header data structures to uapi ASoC: topology: Move skl-tplg-interface.h to uapi Hans de Goede (26): ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_PLATFORM is enabled ASoC: rt5640: Remove is_sys_clk_from_pll, it has ordering issues ASoC: rt5640: Add devicetree-bindings for dmic, jack-detect ASoC: rt5640: Remove unused rt5640_platform_data ASoC: rt5640: Move checking of device-properties to component probe callback ASoC: rt5640: Allow specifying dmic data pins through device-properties ASoC: rt5640: Add jack-detect support ASoC: rt5640: Add button press support ASoC: Intel: bytcr_rt5640: Configure PLL1 before using it ASoC: Intel: bytcr_rt5640: Use device-property for differential mics ASoC: rt5645: Add platform-data for Lenovo Ideapad Mixx 310 ASoC: rt5645: Add platform-data for Lenovo Ideapad Mixx 320 ASoC: Intel: bytcr_rt5640: Fix compile error ASoC: Intel: bytcr_rt5640: Use device properties for setting up dmic ASoC: Intel: bytcr_rt5640: Fix Dell Venue 8 5830 Pro quirk ASoC: Intel: bytcr_rt5640: Enable jack detection ASoC: Intel: bytcr_rt5640: Change BYTCR default input to IN3 ASoC: Intel: bytcr_rt5640: Unify BYTCR input defaults ASoC: Intel: bytcr_rt5640: Add default jack-detect settings ASoC: Intel: bytcr_rt5640: Sort DMI quirk list alphabetically ASoC: Intel: bytcr_rt5640: Use dmi_first_match() for DMI quirk handling ASoC: Intel: bytcr_rt5640: Add quirks for various devices ASoC: Intel: bytcr_rt5640: Set card long_name based on quirks ASoC: Intel: cht_bsw_nau8824: Fix jack_type to include SND_JACK_MICROPHONE ASoC: Intel: bytcr_rt5640: Add quirk for the ARCHOS 80 Cesium 8" windows tablet ASoC: Intel: bytcr_rt5651: Set card long_name based on quirks Jarkko Nikula (1): ASoC: omap: Remove OMAP_MUX dependency from Nokia N810 audio support Jean-Jacques Hiblot (3): ASoC: tas6424: Add support for the standby pin ASoC: tas6424: Add support for the mute pin ASoC: tas6424: Allow disabling auto diagnostics for faster power-on Jerome Brunet (1): ASoC: dai playback and capture active may be greater than 1 Jia-Ju Bai (8): ASoC: intel: bxt_da7219_max98357a: Replace GFP_ATOMIC with GFP_KERNEL in broxton_audio_probe ASoC: intel: bxt_rt298: Replace GFP_ATOMIC with GFP_KERNEL in broxton_audio_probe ASoC: intel: bytcr_rt5640: Replace GFP_ATOMIC with GFP_KERNEL in snd_byt_rt5640_mc_probe ASoC: intel: cht_bsw_max98090_ti: Replace GFP_ATOMIC with GFP_KERNEL in snd_cht_mc_probe ASoC: intel: cht_bsw_rt5645: Replace GFP_ATOMIC with GFP_KERNEL in snd_cht_mc_probe ASoC: intel: skl_nau88l25_max98357a: Replace GFP_ATOMIC with GFP_KERNEL in skylake_audio_probe ASoC: intel: skl_nau88l25_ssm4567: Replace GFP_ATOMIC with GFP_KERNEL in skylake_audio_probe ASoC: intel: skl_rt286: Replace GFP_ATOMIC with GFP_KERNEL in skylake_audio_probe John Hsu (2): ASoC: nau8824: user configuration of key detection ASoC: nau8810: change input PGA mixer stage Jon Hunter (1): ASoC: core: Fix return code shown on error for hw_params Kai Chieh Chuang (15): ASoC: mt6797: add mt6797 platform driver ASoC: mediatek: add documents for mt6797 ASoC: add mt6351 codec driver ASoC: mt6351 switch to SPDX license tag ASoC: add mt6797-mt6351 driver and config option ASoC: mt6797: add structure define and clock control function for 6797 ASoC: mt6797: switch to SPDX license tag ASoC: mediatek: preallocate pages use platform device ASoC: mediatek: preallocate pages use platform device ASoC: mediatek: avoid using snd_soc_platform ASoC: dpcm: fix BE dai not hw_free and shutdown ASoC: dpcm: symmetry constraint on FE substream ASoC: mt6797: add PCM interface ASoC: mt6797: add Hostless DAI ASoC: mt6797-mt6351: add hostless phone call path KaiChieh Chuang (3): ASoC: mediatek: add sub dai to mtk_base_afe ASoC: mt6797: extract DAI adda in separate file ASoC: mt6797: combine DAI to register component Katsuhiro Suzuki (3): ASoC: uniphier: remove boilerplate from lisence comment ASoC: uniphier: evea: use DAPM to change source of line-in ASoC: uniphier: add digital output volume for UniPhier sound system Kirill Marinushkin (4): ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format() ASoC: topology: Add missing clock gating parameter when parsing hw_configs ASoC: topology: Add definitions for mclk_direction values ASoC: topology: Modify clock gating parameter parsing to switch Kuninori Morimoto (19): ASoC: doc: replace codec to component ASoC: trace: remove snd_soc_codec ASoC: wm8350: remove snd_soc_codec ASoC: rsnd: makes rsnd_cmd_mod_get() static ASoC: rsnd: add RSND_GEN3 for R-Car Gen3 ASoC: rsnd: don't assume node full path name for HDMI probing ASoC: rsnd: Enable IPMMU v2 ASoC: rsnd: ssi: wait maximum 5ms for status check media: i2c: tda1997: replace codec to component ASoC: remove codec hw_write/control_data ASoC: remove codec reg_cache ASoC: remove .get_regmap ASoC: remove unneeded .pcm_new/free ASoC: remove Codec related code ASoC: add component_list_show() ASoC: convert platform explanation to component ASoC: soc.h: merge CONFIG_DEBUG_FS ASoC: soc-core: remove snd_soc_component_add_unlocked() ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais() Liam Girdwood (6): ASoC: topology: Check widget kcontrols before deref ASoC: core: Allow topology to override machine driver FE DAI link config. ASoC: core: Add name prefix for machines with topology rewrites ASoC: topology: Give more data to clients via callbacks ASoC: topology: Add callback for DAPM route load/unload ASoC: topology: Add support for compressed PCMs Lin Huang (1): ASoC: rockchip: cdn-dp sound output use spdif Mac Chiang (1): ASoC: Intel: kbl: Move codec sysclk config to codec_init function Marco Felsch (2): ASoC: ssm2305: Add amplifier driver ASoC: ssm2305: fix header layout Mark Brown (7): Merge branch 'asoc-4.17' into asoc-4.18 to get adau17x1 changes so further patches can be applied. ASoC: topology: Fix build errors ASoC: topology: Revert recent changes while boot errors are investigated Merge branch 'asoc-4.17' into asoc-4.18 for compress dependencies Merge branch 'asoc-4.17' into asoc-4.18 n810 dependencies Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a conflict between a fix and new development in mtk Merge branch 'asoc-4.17' into asoc-4.18 merge window Mukunda, Vijendar (6): ASoC: amd: fixed checkpatch pl warnings ASoC: amd: rename audio_substream_data variable ASoC: amd: pte offset related dma driver changes ASoC: amd: sram bank update changes ASoC: amd: memory release for rtd structure ASoC: amd: dma driver changes for bt i2s instance Nicolin Chen (3): ASoC: fsl_esai: Fix divisor calculation failure at lower ratio ASoC: fsl_ssi: Fix mode setting when changing channel number ASoC: fsl_esai: Add freq check in set_dai_sysclk() Oder Chiou (1): ASoC: rt5663: Use the set_jack() instead of the export function Pardha Saradhi K (1): ASoC: Intel: Skylake: Reset DSP Pipelines in prepare Paul Handrigan (1): ASoC: cs35l35: Add use_single_rw to regmap config Peter Rosin (6): ASoC: max9860: switch to using .probe_new ASoC: max9860: fix whitespace issues caused by mindless conversion ASoC: tfa9879: fix whitespace issues caused by mindless conversion ASoC: tfa9879: switch to using .probe_new ASoC: tfa9879: switch to SPDX license tag ASoC: max9860: switch to SPDX license tag Peter Ujfalusi (12): ASoC: omap: n810: Correct the card level dapm_route ASoC: omap: n810: Correct the cpu_dai, platform and codec name ASoC: omap: n810: HS mic is not working, add a widget for it with comment ASoC: omap: Introduce the generic_dmaengine_pcm based sdma-pcm ASoC: omap-hdmi-audio: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-dmic: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm ASoC: davinci-mcasp: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap: Delete the obsolete omap-pcm ASoC: omap: sdma-pcm: Fix modpost warning ASoC: omap: sdma-pcm: Correction for the include files Philipp Zabel (1): ASoC: imx-audmux: add RXFS/RXCLK defines for 6-wire connections Pierre-Louis Bossart (5): ASoC: Intel: atom: fix ACPI/PCI Kconfig ASoC: Intel: cht-bsw-rt5672: allow for topology-defined codec-dai setup MAINTAINERS: update sound/soc/intel maintainers ASoC: pcm512x: Add ACPI support ASoC: fix 0-day warnings with snd_soc_new_compress() Pradeep Tewani (1): ASoC: Intel: Skylake: Unify the fw ops for SKL and KBL Pravin Shedge (1): ASoC: zte: remove duplicate includes Rakesh Ughreja (1): ASoC: Intel: Skylake: Reset stream to link mapping Ryder Lee (7): ASoC: mediatek: use snd_soc_dai_get_drvdata() to get the private data ASoC: mediatek: simplify the control logic of MT2701 I2S ASoC: mediatek: Add MTK_STREAM_NUM to mtk-base-afe.h ASoC: mediatek: add MT7622 AFE support ASoC: mediatek: add MT7622 AFE compatible in documentation ASoC: mediatek: switch to SPDX license tag ASoC: mediatek: add the .probe() callback in mt2701_afe_pcm_dai_component Shuming Fan (2): ASoC: rt1305: Add RT1305/RT1306 amplifier driver ASoC: rt1305: fix ACPI_PTR compile error Srinivas Kandagatla (32): ASoC: msm8916-wcd-analog: use threaded context for mbhc events soc: qcom dt-bindings: Add APR bus bindings soc: qcom: Add APR bus driver ASoC: qdsp6: dt-bindings: Add q6core dt bindings ASoC: qdsp6: dt-bindings: Add q6afe dt bindings ASoC: qdsp6: dt-bindings: Add q6adm dt bindings ASoC: qdsp6: dt-bindings: Add q6asm dt bindings ASoC: qdsp6: q6common: Add qdsp6 helper functions ASoC: qdsp6: q6core: Add q6core driver soc: qcom: apr: fix invalid msg_type check ASoC: qdsp6: q6afe: Add q6afe driver ASoC: qdsp6: qdafe: Add SLIMBus port Support ASoC: qdsp6: q6afe: Add support to MI2S ports ASoC: qdsp6: q6afe: Add support to MI2S sysclks ASoC: qdsp6: q6adm: Add q6adm driver ASoC: qdsp6: q6asm: Add q6asm driver ASoC: qdsp6: q6asm: Add support to memory map and unmap ASoC: qdsp6: q6asm: Add support to audio stream apis ASoC: qdsp6: q6routing: Add q6routing driver ASoC: qdsp6: q6routing: Add support to all SLIMBus Mixers ASoC: qdsp6: q6routing: Add support to MI2S Mixers ASoC: qdsp6: q6afe: Add q6afe dai driver ASoC: qdsp6: q6asm: Add q6asm dai driver ASoC: qdsp6: dt-bindings: Add apq8096 machine bindings ASoC: qcom: apq8096: Add db820c machine driver ASoC: qdsp6: dt-bindings: Add q6afe tdm dt binding ASoC: qdsp6: qdafe: add support to tdm ports ASoC: qdsp6: q6afe-dai: use q6afe_dai_prepare() for MI2S ASoC: qdsp6: q6afe-dai: add support to tdm dais ASoC: qdsp6: q6routing: Add macros for mixers ASoC: qdsp6: q6routing: Add support to all TDM Mixers ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it Steven Eckhoff (4): ASoC: TSCS42xx: Shorten lines and other cleanup ASoC: TSCS42xx: Cleanup private data members ASoC: TSCS42xx: Add CCF support to get sysclk ASoC: TSCS454: Add Support Tero Kristo (1): ASoC: dmic: Fix clock parenting Vijendar Mukunda (3): ASoC: amd: dma config parameters changes ASoC: amd: added byte count register offset variables to rtd ASoC: amd: removed separate byte count variables for playback and capture Vinod Koul (8): ASoC: Intel: byt-max98090: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: bytcht_es8316: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: bytcr_rt5651: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: cht_bsw_nau8824: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_da7219_max98357a: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_rt5663_max98927: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Intel: kbl_rt5663_rt5514_max98927: Replace GFP_ATOMIC with GFP_KERNEL ASoC: Update email address for Vinod Vishal Thanki (1): ASoC: davinci-mcasp: Only disable inactive serializer Wei Yongjun (3): ASoC: amd: acp-da7219-max98357: Make symbol da7219_dai_clk static ASoC: amd: acp-da7219-max98357: Make symbol da7219_dai_clk static ASoC: fix return value check in mt6351_codec_driver_probe() Wolfram Sang (1): ASoC: atmel: simplify getting .drvdata Xie Yisheng (3): ASoC: max98088: use match_string() helper ASoC: max98095: use match_string() helper ASoC: dapm: use match_string() helper Yan Wang (1): ASoC: topology: Fix bugs of freeing soc topology kbuild test robot (1): ASoC: rt5663: rt5663_set_jack_detect() can be static oder_chiou(a)realtek.com (2): ASoC: rt5514: Add the missing register in the readable table ASoC: rt5663: Optimize the power consumption .mailmap | 3 + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 84 + .../devicetree/bindings/sound/adi,ssm2305.txt | 14 + .../devicetree/bindings/sound/atmel-i2s.txt | 47 + .../devicetree/bindings/sound/cs42xx8.txt | 2 +- .../devicetree/bindings/sound/fsl,asrc.txt | 10 +- .../devicetree/bindings/sound/fsl,esai.txt | 2 + .../devicetree/bindings/sound/fsl,spdif.txt | 2 + .../devicetree/bindings/sound/fsl-sai.txt | 8 +- .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 4 +- Documentation/devicetree/bindings/sound/mt6351.txt | 16 + .../devicetree/bindings/sound/mt6797-afe-pcm.txt | 42 + .../devicetree/bindings/sound/mt6797-mt6351.txt | 14 + .../devicetree/bindings/sound/qcom,apq8096.txt | 109 + .../devicetree/bindings/sound/qcom,q6adm.txt | 33 + .../devicetree/bindings/sound/qcom,q6afe.txt | 172 + .../devicetree/bindings/sound/qcom,q6asm.txt | 33 + .../devicetree/bindings/sound/qcom,q6core.txt | 21 + Documentation/devicetree/bindings/sound/rt274.txt | 2 +- Documentation/devicetree/bindings/sound/rt5514.txt | 2 +- Documentation/devicetree/bindings/sound/rt5616.txt | 2 +- Documentation/devicetree/bindings/sound/rt5640.txt | 35 + Documentation/devicetree/bindings/sound/rt5645.txt | 2 +- Documentation/devicetree/bindings/sound/rt5651.txt | 2 +- Documentation/devicetree/bindings/sound/rt5663.txt | 2 +- Documentation/devicetree/bindings/sound/rt5668.txt | 50 + .../devicetree/bindings/sound/sgtl5000.txt | 2 +- .../devicetree/bindings/sound/simple-card.txt | 5 + .../devicetree/bindings/sound/ti,tas6424.txt | 2 + .../devicetree/bindings/sound/tscs42xx.txt | 6 + .../devicetree/bindings/sound/tscs454.txt | 23 + Documentation/devicetree/bindings/sound/wm8510.txt | 2 +- Documentation/devicetree/bindings/sound/wm8523.txt | 2 +- Documentation/devicetree/bindings/sound/wm8524.txt | 2 +- Documentation/devicetree/bindings/sound/wm8580.txt | 2 +- Documentation/devicetree/bindings/sound/wm8711.txt | 2 +- Documentation/devicetree/bindings/sound/wm8728.txt | 2 +- Documentation/devicetree/bindings/sound/wm8731.txt | 2 +- Documentation/devicetree/bindings/sound/wm8737.txt | 2 +- Documentation/devicetree/bindings/sound/wm8741.txt | 2 +- Documentation/devicetree/bindings/sound/wm8750.txt | 2 +- Documentation/devicetree/bindings/sound/wm8753.txt | 2 +- Documentation/devicetree/bindings/sound/wm8770.txt | 2 +- Documentation/devicetree/bindings/sound/wm8776.txt | 2 +- Documentation/devicetree/bindings/sound/wm8804.txt | 2 +- Documentation/devicetree/bindings/sound/wm8903.txt | 2 +- Documentation/devicetree/bindings/sound/wm8960.txt | 2 +- Documentation/devicetree/bindings/sound/wm8962.txt | 2 +- Documentation/devicetree/bindings/sound/wm8994.txt | 2 +- Documentation/sound/soc/codec.rst | 8 +- Documentation/sound/soc/platform.rst | 30 +- MAINTAINERS | 11 +- arch/arm/mach-ep93xx/core.c | 1 + drivers/media/i2c/tda1997x.c | 25 +- drivers/soc/qcom/Kconfig | 9 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/apr.c | 378 +++ include/dt-bindings/soc/qcom,apr.h | 28 + include/dt-bindings/sound/fsl-imx-audmux.h | 7 + include/dt-bindings/sound/qcom,q6afe.h | 111 + include/dt-bindings/sound/qcom,q6asm.h | 22 + include/dt-bindings/sound/rt5640.h | 25 + include/linux/mfd/wm8350/audio.h | 3 - include/linux/mod_devicetable.h | 11 + include/linux/soc/qcom/apr.h | 128 + include/sound/omap-pcm.h | 30 - include/sound/rt5640.h | 27 - include/sound/rt5668.h | 40 + include/sound/soc-dai.h | 5 +- include/sound/soc.h | 397 +-- include/trace/events/asoc.h | 1 - include/uapi/sound/asoc.h | 86 +- .../uapi/sound}/skl-tplg-interface.h | 85 +- sound/soc/Makefile | 2 +- sound/soc/amd/acp-da7219-max98357a.c | 92 +- sound/soc/amd/acp-pcm-dma.c | 623 ++-- sound/soc/amd/acp.h | 97 +- sound/soc/atmel/Kconfig | 9 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel-i2s.c | 765 +++++ sound/soc/atmel/atmel_ssc_dai.c | 8 +- sound/soc/bcm/Kconfig | 3 +- sound/soc/cirrus/Kconfig | 17 + sound/soc/cirrus/edb93xx.c | 2 +- sound/soc/cirrus/ep93xx-i2s.c | 106 +- sound/soc/cirrus/snappercl15.c | 2 +- sound/soc/codecs/Kconfig | 33 +- sound/soc/codecs/Makefile | 10 + sound/soc/codecs/adau17x1.c | 35 +- sound/soc/codecs/adau17x1.h | 3 +- sound/soc/codecs/cs35l35.c | 1 + sound/soc/codecs/max98088.c | 13 +- sound/soc/codecs/max98095.c | 13 +- sound/soc/codecs/max9860.c | 44 +- sound/soc/codecs/max9860.h | 10 +- sound/soc/codecs/msm8916-wcd-analog.c | 9 +- sound/soc/codecs/mt6351.c | 1505 +++++++++ sound/soc/codecs/mt6351.h | 105 + sound/soc/codecs/nau8810.c | 19 +- sound/soc/codecs/nau8824.c | 13 +- sound/soc/codecs/pcm1789.c | 2 +- sound/soc/codecs/pcm512x-i2c.c | 17 +- sound/soc/codecs/rt1305.c | 1191 +++++++ sound/soc/codecs/rt1305.h | 276 ++ sound/soc/codecs/rt5514.c | 3 + sound/soc/codecs/rt5640.c | 553 +++- sound/soc/codecs/rt5640.h | 46 +- sound/soc/codecs/rt5645.c | 23 + sound/soc/codecs/rt5663.c | 55 +- sound/soc/codecs/rt5663.h | 2 - sound/soc/codecs/rt5668.c | 2639 +++++++++++++++ sound/soc/codecs/rt5668.h | 1318 ++++++++ sound/soc/codecs/rt5670.c | 2 +- sound/soc/codecs/rt5677.c | 13 +- sound/soc/codecs/sgtl5000.c | 18 +- sound/soc/codecs/sgtl5000.h | 5 +- sound/soc/codecs/ssm2305.c | 104 + sound/soc/codecs/tas6424.c | 72 +- sound/soc/codecs/tas6424.h | 4 + sound/soc/codecs/tfa9879.c | 48 +- sound/soc/codecs/tfa9879.h | 7 +- sound/soc/codecs/tscs42xx.c | 203 +- sound/soc/codecs/tscs42xx.h | 2 +- sound/soc/codecs/tscs454.c | 3497 ++++++++++++++++++++ sound/soc/codecs/tscs454.h | 2323 +++++++++++++ sound/soc/codecs/wm2200.c | 4 +- sound/soc/codecs/wm5100.c | 8 +- sound/soc/codecs/wm8782.c | 9 + sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm_adsp.c | 8 +- sound/soc/davinci/Kconfig | 2 +- sound/soc/davinci/davinci-mcasp.c | 10 +- sound/soc/fsl/fsl_esai.c | 27 +- sound/soc/fsl/fsl_esai.h | 5 +- sound/soc/fsl/fsl_sai.c | 16 +- sound/soc/fsl/fsl_sai.h | 5 +- sound/soc/fsl/fsl_spdif.c | 24 +- sound/soc/fsl/fsl_spdif.h | 5 +- sound/soc/fsl/fsl_ssi.c | 74 +- sound/soc/fsl/fsl_ssi.h | 6 +- sound/soc/fsl/fsl_ssi_dbg.c | 18 +- sound/soc/generic/simple-card.c | 21 + sound/soc/hisilicon/hi6210-i2s.c | 2 +- sound/soc/intel/Kconfig | 24 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/byt-max98090.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 568 +++- sound/soc/intel/boards/bytcr_rt5651.c | 18 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 30 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 19 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 5 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/skl_rt286.c | 2 +- sound/soc/intel/skylake/skl-debug.c | 6 +- sound/soc/intel/skylake/skl-messages.c | 4 +- sound/soc/intel/skylake/skl-pcm.c | 36 +- sound/soc/intel/skylake/skl-sst-dsp.h | 3 - sound/soc/intel/skylake/skl-sst.c | 34 +- sound/soc/intel/skylake/skl-topology.c | 171 +- sound/soc/intel/skylake/skl-topology.h | 2 +- sound/soc/intel/skylake/skl.c | 7 + sound/soc/kirkwood/Kconfig | 1 - sound/soc/mediatek/Kconfig | 20 + sound/soc/mediatek/Makefile | 2 + sound/soc/mediatek/common/Makefile | 14 +- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 30 +- sound/soc/mediatek/common/mtk-afe-fe-dai.h | 10 +- .../soc/mediatek/common/mtk-afe-platform-driver.c | 103 +- .../soc/mediatek/common/mtk-afe-platform-driver.h | 22 +- sound/soc/mediatek/common/mtk-base-afe.h | 30 +- sound/soc/mediatek/mt2701/Makefile | 14 +- sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 66 +- sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 23 +- sound/soc/mediatek/mt2701/mt2701-afe-common.h | 38 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 349 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 13 +- sound/soc/mediatek/mt2701/mt2701-reg.h | 11 +- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 10 +- sound/soc/mediatek/mt6797/Makefile | 14 + sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 123 + sound/soc/mediatek/mt6797/mt6797-afe-clk.h | 17 + sound/soc/mediatek/mt6797/mt6797-afe-common.h | 58 + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 914 +++++ sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 396 +++ sound/soc/mediatek/mt6797/mt6797-dai-hostless.c | 112 + sound/soc/mediatek/mt6797/mt6797-dai-pcm.c | 312 ++ sound/soc/mediatek/mt6797/mt6797-interconnection.h | 33 + sound/soc/mediatek/mt6797/mt6797-mt6351.c | 223 ++ sound/soc/mediatek/mt6797/mt6797-reg.h | 1015 ++++++ sound/soc/mediatek/mt8173/mt8173-afe-common.h | 10 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 38 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +- sound/soc/omap/Kconfig | 28 +- sound/soc/omap/Makefile | 4 +- sound/soc/omap/n810.c | 21 +- sound/soc/omap/omap-dmic.c | 18 +- sound/soc/omap/omap-hdmi-audio.c | 5 +- sound/soc/omap/omap-mcbsp.c | 4 +- sound/soc/omap/omap-mcpdm.c | 4 +- sound/soc/omap/omap-pcm.c | 262 -- sound/soc/omap/sdma-pcm.c | 74 + sound/soc/omap/sdma-pcm.h | 21 + sound/soc/pxa/Kconfig | 1 - sound/soc/pxa/pxa-ssp.c | 88 +- sound/soc/qcom/Kconfig | 57 +- sound/soc/qcom/Makefile | 5 + sound/soc/qcom/apq8096.c | 255 ++ sound/soc/qcom/qdsp6/Makefile | 8 + sound/soc/qcom/qdsp6/q6adm.c | 646 ++++ sound/soc/qcom/qdsp6/q6adm.h | 27 + sound/soc/qcom/qdsp6/q6afe-dai.c | 1303 ++++++++ sound/soc/qcom/qdsp6/q6afe.c | 1495 +++++++++ sound/soc/qcom/qdsp6/q6afe.h | 211 ++ sound/soc/qcom/qdsp6/q6asm-dai.c | 624 ++++ sound/soc/qcom/qdsp6/q6asm.c | 1399 ++++++++ sound/soc/qcom/qdsp6/q6asm.h | 69 + sound/soc/qcom/qdsp6/q6core.c | 380 +++ sound/soc/qcom/qdsp6/q6core.h | 15 + sound/soc/qcom/qdsp6/q6dsp-common.c | 66 + sound/soc/qcom/qdsp6/q6dsp-common.h | 24 + sound/soc/qcom/qdsp6/q6dsp-errno.h | 51 + sound/soc/qcom/qdsp6/q6routing.c | 1006 ++++++ sound/soc/qcom/qdsp6/q6routing.h | 9 + sound/soc/rockchip/rk3399_gru_sound.c | 46 +- sound/soc/sh/Kconfig | 6 +- sound/soc/sh/rcar/cmd.c | 15 +- sound/soc/sh/rcar/core.c | 53 +- sound/soc/sh/rcar/dma.c | 11 +- sound/soc/sh/rcar/gen.c | 3 +- sound/soc/sh/rcar/rsnd.h | 4 +- sound/soc/sh/rcar/ssi.c | 13 +- sound/soc/soc-cache.c | 53 - sound/soc/soc-compress.c | 385 +-- sound/soc/soc-core.c | 794 +---- sound/soc/soc-dapm.c | 20 +- sound/soc/soc-devres.c | 35 - sound/soc/soc-io.c | 83 - sound/soc/soc-jack.c | 22 - sound/soc/soc-pcm.c | 147 +- sound/soc/soc-topology.c | 107 +- sound/soc/uniphier/aio-compress.c | 13 - sound/soc/uniphier/aio-core.c | 71 +- sound/soc/uniphier/aio-cpu.c | 153 +- sound/soc/uniphier/aio-dma.c | 13 - sound/soc/uniphier/aio-ld11.c | 13 - sound/soc/uniphier/aio-reg.h | 46 +- sound/soc/uniphier/aio.h | 20 +- sound/soc/uniphier/evea.c | 55 +- sound/soc/zte/zx-i2s.c | 5 +- 259 files changed, 29849 insertions(+), 3997 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2305.txt create mode 100644 Documentation/devicetree/bindings/sound/atmel-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/mt6351.txt create mode 100644 Documentation/devicetree/bindings/sound/mt6797-afe-pcm.txt create mode 100644 Documentation/devicetree/bindings/sound/mt6797-mt6351.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8096.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.txt create mode 100644 Documentation/devicetree/bindings/sound/rt5668.txt create mode 100644 Documentation/devicetree/bindings/sound/tscs454.txt create mode 100644 drivers/soc/qcom/apr.c create mode 100644 include/dt-bindings/soc/qcom,apr.h create mode 100644 include/dt-bindings/sound/qcom,q6afe.h create mode 100644 include/dt-bindings/sound/qcom,q6asm.h create mode 100644 include/dt-bindings/sound/rt5640.h create mode 100644 include/linux/soc/qcom/apr.h delete mode 100644 include/sound/omap-pcm.h delete mode 100644 include/sound/rt5640.h create mode 100644 include/sound/rt5668.h rename {sound/soc/intel/skylake => include/uapi/sound}/skl-tplg-interface.h (71%) create mode 100644 sound/soc/atmel/atmel-i2s.c create mode 100644 sound/soc/codecs/mt6351.c create mode 100644 sound/soc/codecs/mt6351.h create mode 100644 sound/soc/codecs/rt1305.c create mode 100644 sound/soc/codecs/rt1305.h create mode 100644 sound/soc/codecs/rt5668.c create mode 100644 sound/soc/codecs/rt5668.h create mode 100644 sound/soc/codecs/ssm2305.c create mode 100644 sound/soc/codecs/tscs454.c create mode 100644 sound/soc/codecs/tscs454.h create mode 100644 sound/soc/mediatek/mt6797/Makefile create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-clk.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-clk.h create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-common.h create mode 100644 sound/soc/mediatek/mt6797/mt6797-afe-pcm.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-dai-adda.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-dai-hostless.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-dai-pcm.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-interconnection.h create mode 100644 sound/soc/mediatek/mt6797/mt6797-mt6351.c create mode 100644 sound/soc/mediatek/mt6797/mt6797-reg.h delete mode 100644 sound/soc/omap/omap-pcm.c create mode 100644 sound/soc/omap/sdma-pcm.c create mode 100644 sound/soc/omap/sdma-pcm.h create mode 100644 sound/soc/qcom/apq8096.c create mode 100644 sound/soc/qcom/qdsp6/Makefile create mode 100644 sound/soc/qcom/qdsp6/q6adm.c create mode 100644 sound/soc/qcom/qdsp6/q6adm.h create mode 100644 sound/soc/qcom/qdsp6/q6afe-dai.c create mode 100644 sound/soc/qcom/qdsp6/q6afe.c create mode 100644 sound/soc/qcom/qdsp6/q6afe.h create mode 100644 sound/soc/qcom/qdsp6/q6asm-dai.c create mode 100644 sound/soc/qcom/qdsp6/q6asm.c create mode 100644 sound/soc/qcom/qdsp6/q6asm.h create mode 100644 sound/soc/qcom/qdsp6/q6core.c create mode 100644 sound/soc/qcom/qdsp6/q6core.h create mode 100644 sound/soc/qcom/qdsp6/q6dsp-common.c create mode 100644 sound/soc/qcom/qdsp6/q6dsp-common.h create mode 100644 sound/soc/qcom/qdsp6/q6dsp-errno.h create mode 100644 sound/soc/qcom/qdsp6/q6routing.c create mode 100644 sound/soc/qcom/qdsp6/q6routing.h delete mode 100644 sound/soc/soc-cache.c

2 1

[alsa-devel] Control that can't be set on Arturia AudioFuse
by Ricard Wanderlof 05 Jun '18

05 Jun '18

Hi, We recently purchased an Arturia AudioFuse USB sound card, and one thing is strange on this device. It exposes a single mixer control called 'ARTURIA Clock Selector Clock Source': $ amixer -c 4 Simple mixer control 'ARTURIA Clock Selector Clock Source',0 Capabilities: enum Items: 'ARTURIA Internal Clock' 'ARTURIA S/PDIF Clock' 'ARTURIA ADAT Clock' 'ARTURIA WORD Clock' Item0: 'ARTURIA Internal Clock' However, attempting to set the control to any value has no effect; when reading using sget the original value is always returned. $ amixer -c 4 sset 'ARTURIA Clock Selector Clock Source' 'ARTURIA S/PDIF Clock' Simple mixer control 'ARTURIA Clock Selector Clock Source',0 Capabilities: enum Items: 'ARTURIA Internal Clock' 'ARTURIA S/PDIF Clock' 'ARTURIA ADAT Clock' 'ARTURIA WORD Clock' Item0: 'ARTURIA Internal Clock' There is no error message (which there is if for instance attempting to set the control to an invalid value), it just doesn't 'stick'. By using the proprietary configuration software in [a virtual] MS Windows I can change the value and also see the new value in Linux using amixer. I've had the same problem with a completely different USB soundcard (minidsp USB streamer), so I'm suspecting it's a Linux thing rather than something specific for this soundcard. Is there something I'm missing here from a Linux point of view? /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

1 0

[alsa-devel] [PATCH v2] DMA: OMAP: fix OMAP1510 incorrect residue_granularity
by Janusz Krzysztofik 05 Jun '18

05 Jun '18

Commit 0198d7bb8a0c ("ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm") resulted in broken audio playback on OMAP1510 (discovered on Amstrad Delta). When running on OMAP1510, omap-pcm used to obtain DMA offset from snd_dmaengine_pcm_pointer_no_residue() based on DMA interrupt triggered software calculations instead of snd_dmaengine_pcm_pointer() which depended on residue value calculated from omap_dma_get_src_pos(). Similar code path is still available in now used sound/soc/soc-generic-dmaengine-pcm.c but it is not triggered. It was verified already before that omap_get_dma_src_pos() from arch/arm/plat-omap/dma.c didn't work correctly for OMAP1510 - see commit 1bdd7419910c ("ASoC: OMAP: fix OMAP1510 broken PCM pointer callback") for details. Apparently the same applies to its successor, omap_dma_get_src_pos() from drivers/dma/ti/omap-dma.c. On the other hand, snd_dmaengine_pcm_pointer_no_residue() is described as depreciated and discouraged for use in new drivers because of its unreliable accuracy. However, it seems the only working option for OPAM1510 now, as long as a software calculated residue is not implemented as OMAP1510 fallback in omap-dma. Using snd_dmaengine_pcm_pointer_no_residue() code path instead of snd_dmaengine_pcm_pointer() in sound/soc/soc-generic-dmaengine-pcm.c can be triggered in two ways: - by passing pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE from sound/soc/omap/sdma-pcm.c, - by passing dma_caps.residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR from DMA engine. Let's do the latter. Created and tested against next-20180531 tag from linux-next tree. Signed-off-by: Janusz Krzysztofik <jmkrzyszt(a)gmail.com> --- Changelog: v2: apply the patch against omap-dma.c moved to drivers/dma/ti/ drivers/dma/ti/omap-dma.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c index b73fb51fbc81..96b5096c26dd 100644 --- a/drivers/dma/ti/omap-dma.c +++ b/drivers/dma/ti/omap-dma.c @@ -1485,7 +1485,11 @@ static int omap_dma_probe(struct platform_device *pdev) od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); - od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; + if (__dma_omap15xx(od->plat->dma_attr)) + od->ddev.residue_granularity = + DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + else + od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */ od->ddev.dev = &pdev->dev; INIT_LIST_HEAD(&od->ddev.channels); -- 2.16.1

2 1

[alsa-devel] [PATCH v2] ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it
by Srinivas Kandagatla 04 Jun '18

04 Jun '18

dapm_kcontrol_data is freed as part of dapm_kcontrol_free(), leaving the paths pointer dangling in the list. This leads to system crash when we try to unload and reload sound card. I hit this bug during ADSP crash/reboot test case on Dragon board DB410c. Without this patch, on SLAB Poisoning enabled build, kernel crashes with "BUG kmalloc-128 (Tainted: G W ): Poison overwritten" Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes since v1: -remove unnecessary very long bug trace. sound/soc/soc-dapm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1e9a36389667..36a39ba30226 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -433,6 +433,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, static void dapm_kcontrol_free(struct snd_kcontrol *kctl) { struct dapm_kcontrol_data *data = snd_kcontrol_chip(kctl); + + list_del(&data->paths); kfree(data->wlist); kfree(data); } -- 2.16.2

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: remove redundant check on err
by Colin King 04 Jun '18

04 Jun '18

From: Colin Ian King <colin.king(a)canonical.com> The check on err is redundant as both the true and false paths end up on a break statement. Remove the redundant check. Detected by CoverityScan, CID#1268773 ("Identical code for different branches") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/usb/mixer_quirks.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 4149543f613e..e82a72fea9a1 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -1849,8 +1849,6 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) /* EMU0204 */ case USB_ID(0x041e, 0x3f19): err = snd_emu0204_controls_create(mixer); - if (err < 0) - break; break; case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */ -- 2.17.0

2 1

[alsa-devel] [PATCH] ASoC: dapm: delete dapm_kcontrol_data paths entry before freeing
by Srinivas Kandagatla 04 Jun '18

04 Jun '18

dapm_kcontrol_data is freed as part of dapm_kcontrol_free(), leaving the paths list pointer dangling in the list. This leads to system crash when we try to unload and reload sound card. I hit this bug during ADSP crash/reboot test case on Dragon board DB410c. Below is the kernel BUG with SLAB Poisoning ============================================================================= BUG kmalloc-128 (Tainted: G W ): Poison overwritten ----------------------------------------------------------------------------- Disabling lock debugging due to kernel taint INFO: 0xffff80003cf1c310-0xffff80003cf1c31f. First byte 0x10 instead of 0x6b INFO: Allocated in dapm_kcontrol_data_alloc.isra.37+0x34/0x2a8 age=6929 cpu=0 pid=50 __slab_alloc.isra.24+0x24/0x38 kmem_cache_alloc+0x190/0x1d8 dapm_kcontrol_data_alloc.isra.37+0x34/0x2a8 dapm_create_or_share_kcontrol+0x1d4/0x290 snd_soc_dapm_new_widgets+0x410/0x568 snd_soc_register_card+0xa58/0xcd0 apq8016_sbc_bind+0x31c/0x458 try_to_bring_up_master+0x204/0x2e8 component_add+0x94/0x178 q6pcm_routing_probe+0x38/0x48 platform_drv_probe+0x58/0xb8 driver_probe_device+0x324/0x478 __device_attach_driver+0xa8/0x160 bus_for_each_drv+0x48/0x98 __device_attach+0xc0/0x158 device_initial_probe+0x10/0x18 INFO: Freed in dapm_kcontrol_free+0x40/0x50 age=3135 cpu=1 pid=1792 kfree+0x1bc/0x1d0 dapm_kcontrol_free+0x40/0x50 snd_ctl_free_one+0x20/0x38 snd_ctl_remove+0xf0/0x108 snd_ctl_dev_free+0x3c/0x70 __snd_device_free+0x50/0x88 snd_device_free_all+0x2c/0x50 release_card_device+0x1c/0x78 device_release+0x34/0x98 kobject_put+0x90/0x1f0 put_device+0x14/0x20 snd_card_free+0x54/0x70 snd_soc_unregister_card+0x84/0x138 snd_soc_unregister_component+0xa4/0xd0 q6routing_dai_unbind+0x44/0x78 component_unbind.isra.4+0x28/0x50 INFO: Slab 0xffff7e0000f3c700 objects=25 used=0 fp=0xffff80003cf1fc80 flags=0xfffc00000008100 INFO: Object 0x (ptrval) @offset=768 fp=0x (ptrval) Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Redzone (ptrval): bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ Object (ptrval): 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object (ptrval): 10 c3 f1 3c 00 80 ff ff 10 c3 f1 3c 00 80 ff ff ...<.......<.... Object (ptrval): 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object (ptrval): 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object (ptrval): 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object (ptrval): 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object (ptrval): 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object (ptrval): 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b a5 kkkkkkkkkkkkkkk. Redzone (ptrval): bb bb bb bb bb bb bb bb ........ Padding (ptrval): 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ Padding (ptrval): 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ Padding (ptrval): 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ Padding (ptrval): 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ CPU: 1 PID: 1792 Comm: sh Tainted: G B W 4.17.0-rc7-02229-gb429ee402d16-dirty #202 Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT) Call trace: dump_backtrace+0x0/0x1b0 show_stack+0x14/0x20 dump_stack+0x9c/0xbc print_trailer+0x124/0x1d8 check_bytes_and_report+0xe8/0x120 check_object+0x24c/0x288 __free_slab+0x9c/0x2f0 discard_slab+0x60/0x88 __slab_free+0x35c/0x3e8 kfree+0x1bc/0x1d0 snd_soc_dapm_free_widget+0xac/0xd0 snd_soc_dapm_free+0x64/0xb8 soc_remove_component+0x50/0x80 soc_remove_dai_links+0x110/0x208 snd_soc_unregister_card+0x9c/0x138 snd_soc_unregister_component+0xa4/0xd0 q6routing_dai_unbind+0x44/0x78 component_unbind.isra.4+0x28/0x50 component_unbind_all+0xc0/0xe8 apq8016_sbc_unbind+0x50/0xa0 take_down_master+0x24/0x48 component_del+0x90/0x130 q6afe_dai_dev_remove+0x40/0x68 platform_drv_remove+0x24/0x50 device_release_driver_internal+0x170/0x208 device_release_driver+0x14/0x20 bus_remove_device+0xcc/0x150 device_del+0x10c/0x310 platform_device_del.part.3+0x24/0x90 platform_device_unregister+0x18/0x30 of_platform_device_destroy+0x94/0x98 q6afe_remove+0x20/0x38 apr_device_remove+0x30/0x70 device_release_driver_internal+0x170/0x208 device_release_driver+0x14/0x20 bus_remove_device+0xcc/0x150 device_del+0x10c/0x310 device_unregister+0x1c/0x70 apr_remove_device+0xc/0x18 device_for_each_child+0x50/0x80 apr_remove+0x18/0x20 rpmsg_dev_remove+0x38/0x68 device_release_driver_internal+0x170/0x208 device_release_driver+0x14/0x20 bus_remove_device+0xcc/0x150 device_del+0x10c/0x310 device_unregister+0x1c/0x70 qcom_smd_remove_device+0xc/0x18 device_for_each_child+0x50/0x80 qcom_smd_unregister_edge+0x3c/0x70 smd_subdev_remove+0x18/0x28 rproc_stop+0x48/0xd8 rproc_shutdown+0x60/0xe8 state_store+0xbc/0xf8 dev_attr_store+0x18/0x28 sysfs_kf_write+0x3c/0x50 kernfs_fop_write+0x118/0x1e0 __vfs_write+0x18/0x110 vfs_write+0xa4/0x1a8 ksys_write+0x48/0xb0 sys_write+0xc/0x18 el0_svc_naked+0x30/0x34 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/soc-dapm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1e9a36389667..36a39ba30226 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -433,6 +433,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, static void dapm_kcontrol_free(struct snd_kcontrol *kctl) { struct dapm_kcontrol_data *data = snd_kcontrol_chip(kctl); + + list_del(&data->paths); kfree(data->wlist); kfree(data); } -- 2.16.2

2 3

[alsa-devel] [PATCH] [PATCH v3] ASoC: Intel: kbl: Move codec sysclk config to codec_init function
by mac.chiang＠intel.com 04 Jun '18

04 Jun '18

From: Mac Chiang <mac.chiang(a)intel.com> On APL, commit fd0f237572ad ("ASoC: Intel: bxt: Move codec sysclk config to codec_init function") fixed an issue related to jack detection. The MCLK for DA7219 does not change in this platform, but is currently being configured everytime as part of the platform_clock event handler for DAPM. The upshot of this is that we have unnecessary calls to this function, and it also means that if a stream hasn't yet been started, DA7219 driver does not have the correct MCLK rates programmed and so the HP detection feature does not operate as expected. The same fix is needed on KBL. This patch rectifies this issue by moving the sysclk call to codec_init function so it's only called once at initialisation. Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> Notes(changelog): v2: - correct the MCLK to 24.576M v3: - described the comments clearly --- sound/soc/intel/boards/kbl_da7219_max98357a.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c index c332a32..ad3029d 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c @@ -66,14 +66,6 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, return -EIO; } - /* Configure sysclk for codec */ - ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 24576000, - SND_SOC_CLOCK_IN); - if (ret) { - dev_err(card->dev, "can't set codec sysclk configuration\n"); - return ret; - } - if (SND_SOC_DAPM_EVENT_OFF(event)) { ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_MCLK, 0, 0); @@ -170,9 +162,18 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) { struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_component *component = rtd->codec_dai->component; + struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_jack *jack; int ret; + /* Configure sysclk for codec */ + ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 24576000, + SND_SOC_CLOCK_IN); + if (ret) { + dev_err(rtd->dev, "can't set codec sysclk configuration\n"); + return ret; + } + /* * Headset buttons map to the google Reference headset. * These can be configured by userspace. -- 2.7.4

3 4

[alsa-devel] [PATCH v8] ASoC: pxa: switch to new ac97 bus support
by Robert Jarzmik 03 Jun '18

03 Jun '18

Switch to the new ac97 bus support in sound/ac97 instead of the legacy snd_ac97 one. Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- Since v7: added a NULL pointer check v7 was in https://patchwork.kernel.org/patch/9951919/ --- sound/arm/Kconfig | 1 - sound/soc/pxa/Kconfig | 5 ++--- sound/soc/pxa/pxa2xx-ac97.c | 48 +++++++++++++++++++++++---------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig index 65171f6657a2..f1f25704fe52 100644 --- a/sound/arm/Kconfig +++ b/sound/arm/Kconfig @@ -36,7 +36,6 @@ endif # SND_ARM config SND_PXA2XX_LIB tristate - select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97 select SND_DMAENGINE_PCM config SND_PXA2XX_LIB_AC97 diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 484ab3c2ad67..1a0b55beb282 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -20,13 +20,12 @@ config SND_MMP_SOC config SND_PXA2XX_AC97 tristate - select SND_AC97_CODEC config SND_PXA2XX_SOC_AC97 tristate - select AC97_BUS + select AC97_BUS_NEW select SND_PXA2XX_LIB_AC97 - select SND_SOC_AC97_BUS + select SND_SOC_AC97_BUS_NEW config SND_PXA2XX_SOC_I2S tristate diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 1b41c0f2a8fb..91ead9cbbb9d 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -17,6 +17,7 @@ #include <linux/dmaengine.h> #include <linux/dma/pxa-dma.h> +#include <sound/ac97/controller.h> #include <sound/core.h> #include <sound/ac97_codec.h> #include <sound/soc.h> @@ -27,43 +28,35 @@ #include <mach/regs-ac97.h> #include <mach/audio.h> -static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97) +static void pxa2xx_ac97_warm_reset(struct ac97_controller *adrv) { pxa2xx_ac97_try_warm_reset(); pxa2xx_ac97_finish_reset(); } -static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97) +static void pxa2xx_ac97_cold_reset(struct ac97_controller *adrv) { pxa2xx_ac97_try_cold_reset(); pxa2xx_ac97_finish_reset(); } -static unsigned short pxa2xx_ac97_legacy_read(struct snd_ac97 *ac97, - unsigned short reg) +static int pxa2xx_ac97_read_actrl(struct ac97_controller *adrv, int slot, + unsigned short reg) { - int ret; - - ret = pxa2xx_ac97_read(ac97->num, reg); - if (ret < 0) - return 0; - else - return (unsigned short)(ret & 0xffff); + return pxa2xx_ac97_read(slot, reg); } -static void pxa2xx_ac97_legacy_write(struct snd_ac97 *ac97, - unsigned short reg, unsigned short val) +static int pxa2xx_ac97_write_actrl(struct ac97_controller *adrv, int slot, + unsigned short reg, unsigned short val) { - int ret; - - ret = pxa2xx_ac97_write(ac97->num, reg, val); + return pxa2xx_ac97_write(slot, reg, val); } -static struct snd_ac97_bus_ops pxa2xx_ac97_ops = { - .read = pxa2xx_ac97_legacy_read, - .write = pxa2xx_ac97_legacy_write, +static struct ac97_controller_ops pxa2xx_ac97_ops = { + .read = pxa2xx_ac97_read_actrl, + .write = pxa2xx_ac97_write_actrl, .warm_reset = pxa2xx_ac97_warm_reset, .reset = pxa2xx_ac97_cold_reset, }; @@ -219,6 +212,9 @@ static const struct snd_soc_component_driver pxa_ac97_component = { static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { int ret; + struct ac97_controller *ctrl; + pxa2xx_audio_ops_t *pdata = pdev->dev.platform_data; + void **codecs_pdata; if (pdev->id != -1) { dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n"); @@ -231,10 +227,14 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_set_ac97_ops(&pxa2xx_ac97_ops); - if (ret != 0) - return ret; + codecs_pdata = pdata ? pdata->codecs_pdata : NULL; + ctrl = snd_ac97_controller_register(&pxa2xx_ac97_ops, &pdev->dev, + AC97_SLOTS_AVAILABLE_ALL, + codecs_pdata); + if (IS_ERR(ctrl)) + return PTR_ERR(ctrl); + platform_set_drvdata(pdev, ctrl); /* Punt most of the init to the SoC probe; we may need the machine * driver to do interesting things with the clocking to get us up * and running. @@ -245,8 +245,10 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) static int pxa2xx_ac97_dev_remove(struct platform_device *pdev) { + struct ac97_controller *ctrl = platform_get_drvdata(pdev); + snd_soc_unregister_component(&pdev->dev); - snd_soc_set_ac97_ops(NULL); + snd_ac97_controller_unregister(ctrl); pxa2xx_ac97_hw_remove(pdev); return 0; } -- 2.11.0

1 1