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

[alsa-devel] Regarding snd_soc_googlevoicechat_soundcard drivers and arecord on Raspberry PI
by Mantas Gridinas 18 Dec '18

18 Dec '18

Hi! I've been looking into how to record audio using arecord and the following audio card extension for Raspberry PI https://pinout.xyz/pinout/raspiaudio_audio_speakers_mic#. The guide in it seems to install snd_soc_googlevoicechat_soundcard driver and after recording for some minutes it throws this error: Dec 18 15:32:17 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: snd_pcm_avail() returned a value that is exceptionally large: 7022640 bytes (18288 ms). Dec 18 15:32:17 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: Most likely this is a bug in the ALSA driver 'snd_soc_googlevoicehat_soundcard'. Please report this issue to the ALSA developers. Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: snd_pcm_dump(): Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: Hardware PCM card 0 'snd_rpi_googlevoicehat_soundcar' device 0 subdevice 0 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: Its setup is: Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: stream : PLAYBACK Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: access : MMAP_INTERLEAVED Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: format : S32_LE Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: subformat : STD Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: channels : 2 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: rate : 48000 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: exact rate : 48000 (48000/1) Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: msbits : 32 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: buffer_size : 65536 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: period_size : 32768 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: period_time : 682666 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: tstamp_mode : ENABLE Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: tstamp_type : MONOTONIC Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: period_step : 1 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: avail_min : 65345 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: period_event : 0 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: start_threshold : -1 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: stop_threshold : 1073741824 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: silence_threshold: 0 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: silence_size : 0 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: boundary : 1073741824 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: appl_ptr : 7938534 Dec 18 15:32:22 homepie pulseaudio[8048]: [alsa-sink-Google voiceHAT SoundCard HiFi voicehat-hifi-0] alsa-util.c: hw_ptr : 8750828 And I start the recording with the following command arecord -c 2 -r 48000 -f s32_le AlsaInfo output is available at http://www.alsa-project.org/db/?f=17a71c8e22f097d844906274a0bd78dbf124513c. Although after inspecting the provided log it seems that the Raspberry PI board is not included in the DMI, which is supposed to be BCM2835. I can't say anything else on on other details.

1 0

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

18 Dec '18

The following changes since commit 7566ec393f4161572ba6f11ad5171fd5d59b0fbd: Linux 4.20-rc7 (2018-12-16 15:46:55 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.21 for you to fetch changes up to a7a850dba82498a1e050d8d153cae67ce0edb3b2: Merge branch 'asoc-4.21' into asoc-next (2018-12-18 12:23:59 +0000) ---------------------------------------------------------------- ASoC: Updates for v4.21 Not much work on the core this time around but we've seen quite a bit of driver work, including on the generic DT drivers. There's also a large part of the diff from a merge of the DaVinci and OMAP directories, along with some active development there: - Preparatory work from Morimoto-san for merging the audio-graph and audio-graph-scu cards. - A merge of the TI OMAP and DaVinci directories, the OMAP product line has been merged into the DaVinci product line so there is now a lot of IP sharing which meant that the split directories just got in the way. This has pulled in a few architecture changes as well. - A big cleanup of the Maxim MAX9867 driver from Ladislav Michl. - Support for Asahi Kaesi AKM4118, AMD ACP3x, Intel platforms with RT5660, Meson AXG S/PDIF inputs, several Qualcomm IPs and Xilinx I2S controllers. ---------------------------------------------------------------- Adrien Charruel (1): ASoC: ak4118: Add support for AK4118 S/PDIF transceiver Arnd Bergmann (5): ASoC: wm97xx: fix uninitialized regmap pointer problem ASoC: Intel: mrfld: fix uninitialized variable access ASoC: pxa: change ac97 dependencies ASoC: sdm845: add rt5663 codec select ASoC: simple-card-utils: fix build warning without CONFIG_OF Axel Lin (1): ASoC: ak5558: Remove redundant snd_soc_component_read32 calls Bard liao (2): ASoC: Intel: common: add SOF information for APL RVP ASoC: Intel: hdac_hdmi: add Icelake support Chen-Yu Tsai (2): ASoC: dt-bindings: sun50i-codec-analog: Add headphone amp regulator supply ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply Cheng-Yi Chiang (7): ASoC: rt5663: Add regulator support ASoC: rt5663: Add documentation for power supply support ASoC: rt5663: Fix error handling of regulator_set_load ASoC: qcom: sdm845: Add board specific dapm widgets ASoC: qcom: sdm845: Create and setup jack in init callback ASoC: sdm845: Add TDM configuration for speaker ASoC: sdm845: Add configuration for headset codec Clément Péron (1): ASoC: dt-bindings: add bindings for AK4118 transceiver Colin Ian King (7): ASoC: stm32: sai: fix less than zero comparison on unsigned int ASoC: amd: fix memory leak of i2s_data on error return ASoC: tlv320aic31xx: asihpi: clean up indentation, remove extraneous tab ASoC: tlv320dac33: clean up indentation, remove extraneous tab ASoC: arizona: fix indentation issue with return statement ASoC: qcom: clean up indentation, remove extraneous tab ASoC: amd: fix spelling mistake "Inavlid" -> "Invalid" Dan Carpenter (1): ASoC: amd: Fix a NULL vs IS_ERR() check in probe Daniel Mack (5): ASoC: pxa: remove raumfeld machine driver ASoC: dt-bindings: cs4270: use 'reset-gpios' rather than 'reset-gpio' ASoC: codecs: cs4270: move to GPIO consumer API ASoC: dt-bindings: ak4104: use 'reset-gpios' rather than 'reset-gpio' ASoC: codecs: ak4104: move to GPIO consumer API David Lin (2): ASoC: nau8822: convert to SPDX identifiers ASoC: nau8822: convert to SPDX identifiers Dimitris Papavasiliou (1): ASoC: pcm512x: Implement the digital_mute interface Fabio Estevam (2): ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M ASoC: fsl-sai: Fix typo in "transmitter" Fabrizio Castro (1): ASoC: rsnd: Add r8a774c0 support Hans de Goede (4): ASoC: intel: cht_bsw_max98090_ti: Add pmc_plt_clk_0 quirk for Chromebook Clapper ASoC: intel: cht_bsw_max98090_ti: Add pmc_plt_clk_0 quirk for Chromebook Gnawty ASoC: Intel: bytcr_rt5640: Add quirk for the Prowise PT301 tablet ASoC: Intel: bytcr_rt5640: Add quirk for the Point of View Mobii TAB-P1005W-232 Hiroyuki Yokoyama (1): ASoC: rsnd: Add device tree support for r8a77995 Hui Wang (2): ASoC: rt5660: Add a new ACPI match ID ASoC: Intel: kbl_rt5660: Add a new machine driver for kbl with rt5660 Jenny TC (2): ASoC: dmic: introduce mode switch delay ASoC: dmic: introduce module_param wakeup_delay Jerome Brunet (5): ASoC: meson: axg-toddr: add support for spdifin backend ASoC: meson: add axg spdif input DT binding documentation ASoC: meson: add axg spdif input MAINTAINERS: Add Amlogic sound drivers entry ASoC: meson: fix do_div warning in spdifin Jiada Wang (1): ASoC: pcm3168a: Don't disable pcm3168a when CONFIG_PM defined Julia Lawall (4): ASoC: smd845: constify snd_soc_ops structure ASoC: qdsp6: q6afe-dai: constify snd_soc_dai_ops structures ASoC: codecs: constify snd_soc_dai_ops structures ASoC: AMD: constify regulator_desc structure Kirill Marinushkin (3): ASoC: pcm3060: Add DT property for single-ended output ASoC: Add documentation for pcm3060 property out-single-ended ASoC: pcm3060: Add powersaving widgets for DAC and ADC Kuninori Morimoto (65): ASoC: pcm3168a: cleanup hw_constraint for LEFT_J/I2S ASoC: rsnd: move .get_status under rsnd_mod_ops ASoC: rsnd: add .get_id/.get_id_sub ASoC: rsnd: rsnd_mod_name() handles both name and ID ASoC: pcm3168a: remove read-only status register from snd_kcontrol_new ASoC: audio-graph-card: remove endpoint bidirectional check ASoC: audio-graph-scu-card: remove endpoint bidirectional check ASoC: audio-graph-scu-card: remove error check which never happen ASoC: rsnd: remove endpoint bidirectional check ASoC: rsnd: rename rsnd_runtime_is_ssi_xxx() ASoC: rsnd: use defined io_playback/io_capture ASoC: rsnd: move HDMI information from ssi.c to core.c ASoC: rsnd: handle DPCM converted rate/chan under core ASoC: rsnd: tidyup Document for DT binding ASoC: rsnd: add SSIU BUSIF support for Document ASoC: rsnd: add SSIU BUSIF support ASoC: rsnd: add TDM Split mode support for Document ASoC: rsnd: add TDM Split mode support ASoC: rsnd: use ring buffer for rsnd_mod_name() ASoC: rsnd: tidyup rsnd_parse_connect_ssiu_compatible() ASoC: rsnd: makes rsnd_ssi_is_dma_mode() static ASoC: simple-card-utils: remove asoc_simple_card_clk_register() ASoC: simple-card-utils: accept NULL parameter on asoc_simple_card_xxx() ASoC: simple-card-utils: tidyup asoc_simple_card_parse_convert() ASoC: simple_card_utils: remove "option" from asoc_simple_card_of_parse_routing() ASoC: soc-core: add snd_soc_of_parse_node_prefix() ASoC: simple-scu-card: tidyup "prefix" parsing on Doc ASoC: simple-scu-card: tidyup "prefix" parsing ASoC: audio-graph-scu-card: tidyup "prefix" parsing on Doc ASoC: audio-graph-scu-card: tidyup "prefix" parsing ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing on Doc ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing ASoC: audio-graph-scu-card: tidyup asoc_simple_card_parse_daifmt() timing ASoC: audio-graph-card: tidyup typo SND_AUDIO_GRAPH_CARD ASoC: audio-graph-card: tidyup define position ASoC: rsnd: tidyup for SSIU subnode ASoC: soc.h: makes snd_soc_of_parse_audio_prefix() inline ASoC: rsnd: tidyup registering method for rsnd_kctrl_new() ASoC: rsnd: indicates Channel and Mode for debug ASoC: rsnd: fixup mod ID for CTU regmap read/write ASoC: rsnd: add missing TDM Split mode support for simple-card ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() counting ASoC: audio-graph-scu-card: care link / dai count ASoC: audio-graph-scu-card: use cpu/codec pointer on graph_dai_props ASoC: audio-graph-scu-card: care multi DPCM codec_conf ASoC: audio-graph-card: use cpu/codec pointer on graph_dai_props ASoC: simple-card: use cpu/codec pointer on simple_dai_props ASoC: simple-scu-card: tidyup asoc_simple_card_parse_daifmt() timing ASoC: simple-scu-card: add dai-link support ASoC: simple-scu-card: care link / dai count ASoC: simple-scu-card: tidyup "convert-rate/channels" parsing ASoC: simple-scu-card: use cpu/codec pointer on graph_dai_props ASoC: simple-scu-card: care multi DPCM codec_conf ASoC: rsnd: remove RSND_REG_ from rsnd_reg ASoC: simple-card-utils: fixup asoc_simple_card_get_dai_id() ID method ASoC: audio-graph-card: merge audio-graph-scu-card on Doc ASoC: audio-graph-card: merge audio-graph-scu-card ASoC: audio-graph-card: tidyup mclk-fs method ASoC: audio-graph-card: tidyup convert_rate/channel method ASoC: audio-graph-card: tidyup prefix for snd_soc_codec_conf ASoC: simple-card: merge simple-scu-card on Doc ASoC: simple-card: merge simple-scu-card ASoC: simple-card: tidyup mclk-fs method ASoC: simple-card: tidyup convert_rate/channel method ASoC: simple-card: tidyup prefix for snd_soc_codec_conf Ladislav Michl (6): ASoC: max9867: Fix whitespace ASoC: max9867: Remove useless assignment ASoC: max9867: Fix power management ASoC: max9867: Calculate LRCLK divider ASoC: max9867: Fix signal paths ASoC: max9867: Add copyright and module author Lubomir Rintel (1): ASoC: dt-bindings: use a generic node name for rt5631 Mark Brown (3): Merge branch 'for-4.20' of https://git.kernel.org/.../broonie/sound into asoc-4.21 intel dep Merge branch 'asoc-4.20' into asoc-linus Merge branch 'asoc-4.21' into asoc-next Maruthi Srinivas Bayyavarapu (5): ASoC: AMD: add ACP 3.x IP register header ASoC: AMD: add ACP3.0 PCI driver dt-bindings: ASoC: xlnx, i2s: Document i2s bindings ASoC: xlnx: Add i2s driver ASoC: xlnx: enable i2s driver build Nathan Chancellor (1): ASoC: simple-card: Dereference pointer for memcpy sizeof in asoc_simple_card_probe Peter Ujfalusi (25): ASoC: omap-mcbsp: On OMAP1 and OMAP2420 only 16bit format is supported ASoC: omap: Remove unused machine driver for AM3517-evm ASoC: omap-mcbsp: Clean up dma_data addr initialization code ASoC: omap-mcbsp: Skip dma_data.maxburst initialization ASoC: omap-mcbsp: Clean up the interrupt handlers ASoC: omap-mcbsp: Simplify the mcbsp_start/_stop function parameters ASoC: omap-mcbsp: Move out the FIFO check from set_threshold and get_delay ASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split ASoC: omap-mcbsp: Remove redundant check for mcbsp->pdata ASoC: omap-mcbsp: No need to initialize max_xx_thres when it is not used ASoC: tlv320aic3x: Add support for CBM_CFS and CBS_CFM clocking modes ASoC: davinci-mcasp: Clear TXSTAT register before activating serializers ASoC: davinci-mcasp: Update PDIR (pin direction) register handling ASoC: davinci-mcasp: Document dismod optional property ASoC: davinci-mcasp: Implement configurable dismod handling dt-bindings: sound: omap-mcpdm: Update documentation for pdmclk ASoC: ti: Merge davinci and omap directories MAINTAINERS: Add entry for sound/soc/ti and update the OMAP audio support ARM: OMAP1: Makefile: Update for new MCBSP Kconfig option ARM: OMAP2: Update for new MCBSP Kconfig option ARM: davinci: dm365-evm: Update for the new ASoC Kcofnig options ARM: omap2plus_defconfig: Update the audio options ARM: omap1_defconfig: Do not select ASoC by default ARM: davinci_all_defconfig: Update the audio options ASoC: ti: Kconfig: Remove the deprecated options Pierre-Louis Bossart (14): ASoC: acpi: define common interface for machine driver configuration ASoC: Intel: use standard interface for Hdaudio machine driver ASoC: Intel: use standard interface for Atom machine drivers ASoC: Intel: boards: fix Skylake typo ASoC: Intel: remove GFP_ATOMIC, use GFP_KERNEL ASoC: Intel: common: add quirk for APL RVP boards ASoC: Intel: fix interface for Chromebook machine drivers ASoC: Intel: use platform_data for machine drivers ASoC: Intel: common: add ACPI matching tables for ICL ASoC: Intel: Skylake: Harden DSP detection with PCI class/subclass info ASoC: Intel: Skylake: stop probe if HDaudio capabilities don't exist ASoC: Intel: Skylake: remove useless tests on HDaudio capabilities ASoC: Intel: Skylake: add error logs on probe, remove dependency on NHLT ASoC: Intel: Skylake: Add more platform granularity Richard Fitzgerald (1): ASoC: wm_adsp: Factor out common init code Rob Herring (2): ASoC: Convert a few more users to using %pOFn instead of device_node.name ASoC: Use of_node_name_eq for node name comparisons Rohit kumar (7): ASoC: sdm845: Update slot_width for Quaternary TDM port ASoC: sdm845: Add support for Secondary MI2S interface ASoC: core: Invoke pcm_new() for all DAI-link ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding ASoC: qdsp6: qdafe: add support for display_port_rx ASoC: qdsp6: q6afe-dai: add support to Display port RX dais ASoC: qdsp6: q6routing: add display_port_rx port routing Ryan Lee (1): ASoC: max98373: Added max98373_reset for stable amp reset Srinivas Kandagatla (5): ALSA: soc-compress: add support to snd_compr_set_runtime_buffer() ALSA: compress: make use of runtime buffer for copy ASoC: q6asm-dai: dt-bindings: Add support to compress dais ASoC: qdsp6: q6asm: add support to MP3 format ASoC: qdsp6: q6asm-dai: Add support to compress offload Subhransu S. Prusty (2): ASoC: Intel: Skylake: Make DSP replies more human readable ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC Takashi Iwai (1): ASoC: Intel: Skylake: Add CFL-S support Vasily Khoruzhick (2): ASoC: dt-bindings: add regulator property to simple amplifier ASoC: simple-amplifier: add VCC regulator widget Vijendar Mukunda (11): ASoC: amd: create ACP3x PCM platform device ASoC: amd: add ACP3x PCM platform driver ASoC: amd: Interrupt handler changes for ACP3x DMA driver ASoC: amd: add acp3x pcm driver dma ops ASoC: amd: add acp3x i2s ops ASoC: amd: add acp3x tdm mode support ASoC: amd: add acp3x runtime pm ops ASoC: amd: add acp3x system resume pm op ASoC: amd: enable acp3x drivers build ASoC: amd: Fixed build errors ASoC: amd: Switch to SPDX identifier Wei Yongjun (1): ASoC: stm32: sai: fix invalid use of sizeof in stm32_sai_add_mclk_provider() Yangtao Li (2): ASoC: nau8825: remove unnecessary unlikely() ASoC: fsl_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro Young_X (1): ASoC: au8540: use 64-bit arithmetic instead of 32-bit Yu Zhao (2): ASoC: use DMA addr rather than CPU pa for acp_audio_dma ASoC: use dma_ops of parent device for acp_audio_dma YueHaibing (1): ASoC: amd: remove set but not used variable 'dma_buffer' Zhuohao Lee (1): ASoC: Intel: kbl_da7219_max98927: fix the audio jack button remapping Documentation/devicetree/bindings/sound/ak4104.txt | 4 +- Documentation/devicetree/bindings/sound/ak4118.txt | 22 + .../bindings/sound/amlogic,axg-spdifin.txt | 22 + .../devicetree/bindings/sound/audio-graph-card.txt | 205 ++++ .../bindings/sound/audio-graph-scu-card.txt | 4 +- Documentation/devicetree/bindings/sound/cs4270.txt | 4 +- .../bindings/sound/davinci-mcasp-audio.txt | 5 + Documentation/devicetree/bindings/sound/dmic.txt | 2 + .../devicetree/bindings/sound/fsl-sai.txt | 8 +- .../devicetree/bindings/sound/omap-mcpdm.txt | 10 + .../devicetree/bindings/sound/pcm3060.txt | 6 + .../devicetree/bindings/sound/qcom,q6asm.txt | 27 + .../devicetree/bindings/sound/renesas,rsnd.txt | 395 ++++--- Documentation/devicetree/bindings/sound/rt5631.txt | 4 +- Documentation/devicetree/bindings/sound/rt5663.txt | 6 + .../devicetree/bindings/sound/simple-amplifier.txt | 5 + .../devicetree/bindings/sound/simple-card.txt | 137 +++ .../devicetree/bindings/sound/simple-scu-card.txt | 2 +- .../bindings/sound/sun50i-codec-analog.txt | 2 + .../devicetree/bindings/sound/xlnx,i2s.txt | 28 + MAINTAINERS | 18 +- arch/arm/configs/davinci_all_defconfig | 5 +- arch/arm/configs/omap1_defconfig | 2 - arch/arm/configs/omap2plus_defconfig | 14 +- arch/arm/mach-davinci/board-dm365-evm.c | 4 +- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/pdata-quirks.c | 4 +- include/dt-bindings/sound/qcom,q6afe.h | 1 + include/linux/platform_data/davinci_asp.h | 1 + include/sound/compress_driver.h | 19 + include/sound/simple_card_utils.h | 6 +- include/sound/soc-acpi-intel-match.h | 1 + include/sound/soc-acpi.h | 15 + include/sound/soc.h | 14 +- sound/core/compress_offload.c | 18 +- sound/soc/Kconfig | 4 +- sound/soc/Makefile | 4 +- sound/soc/amd/Kconfig | 6 + sound/soc/amd/Makefile | 1 + sound/soc/amd/acp-da7219-max98357a.c | 2 +- sound/soc/amd/acp-pcm-dma.c | 22 +- sound/soc/amd/acp.h | 2 +- sound/soc/amd/raven/Makefile | 6 + sound/soc/amd/raven/acp3x-pcm-dma.c | 777 ++++++++++++++ sound/soc/amd/raven/acp3x.h | 58 + sound/soc/amd/raven/chip_offset_byte.h | 639 +++++++++++ sound/soc/amd/raven/pci-acp3x.c | 156 +++ sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak4104.c | 22 +- sound/soc/codecs/ak4118.c | 438 ++++++++ sound/soc/codecs/ak4458.c | 2 +- sound/soc/codecs/ak5558.c | 19 +- sound/soc/codecs/cs4270.c | 23 +- sound/soc/codecs/dmic.c | 40 + sound/soc/codecs/hdac_hda.c | 2 +- sound/soc/codecs/hdac_hdmi.c | 63 +- sound/soc/codecs/max98373.c | 35 +- sound/soc/codecs/max9867.c | 505 ++++----- sound/soc/codecs/max9867.h | 41 +- sound/soc/codecs/nau8540.c | 2 +- sound/soc/codecs/nau8822.c | 26 +- sound/soc/codecs/nau8822.h | 9 +- sound/soc/codecs/nau8825.c | 4 +- sound/soc/codecs/pcm3060.c | 28 +- sound/soc/codecs/pcm3060.h | 3 + sound/soc/codecs/pcm3168a.c | 40 +- sound/soc/codecs/pcm512x.c | 121 ++- sound/soc/codecs/pcm512x.h | 2 + sound/soc/codecs/rt5660.c | 1 + sound/soc/codecs/rt5663.c | 75 +- sound/soc/codecs/simple-amplifier.c | 4 + sound/soc/codecs/tas6424.c | 2 +- sound/soc/codecs/tlv320aic31xx.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 10 + sound/soc/codecs/tlv320dac33.c | 2 +- sound/soc/codecs/wm8998.c | 2 +- sound/soc/codecs/wm9705.c | 10 +- sound/soc/codecs/wm9712.c | 10 +- sound/soc/codecs/wm9713.c | 10 +- sound/soc/codecs/wm_adsp.c | 14 +- sound/soc/davinci/Kconfig | 106 -- sound/soc/davinci/Makefile | 16 - sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl-asoc-card.c | 6 +- sound/soc/fsl/fsl_ssi_dbg.c | 14 +- sound/soc/generic/Kconfig | 4 +- sound/soc/generic/audio-graph-card.c | 465 +++++++-- sound/soc/generic/audio-graph-scu-card.c | 262 +++-- sound/soc/generic/simple-card-utils.c | 45 +- sound/soc/generic/simple-card.c | 402 +++++-- sound/soc/generic/simple-scu-card.c | 264 +++-- sound/soc/intel/Kconfig | 73 +- sound/soc/intel/atom/sst/sst_acpi.c | 4 + sound/soc/intel/atom/sst/sst_loader.c | 8 +- sound/soc/intel/atom/sst/sst_pvt.c | 4 +- sound/soc/intel/boards/Kconfig | 26 +- sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bytcr_rt5640.c | 33 +- sound/soc/intel/boards/bytcr_rt5651.c | 6 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 14 + sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 14 +- sound/soc/intel/boards/kbl_rt5660.c | 543 ++++++++++ sound/soc/intel/boards/kbl_rt5663_max98927.c | 14 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 10 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 22 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 14 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 14 +- sound/soc/intel/common/Makefile | 2 +- sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 36 + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 32 + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 10 + sound/soc/intel/skylake/skl-messages.c | 8 + sound/soc/intel/skylake/skl-nhlt.c | 3 + sound/soc/intel/skylake/skl-sst-ipc.c | 50 +- sound/soc/intel/skylake/skl.c | 144 ++- sound/soc/intel/skylake/skl.h | 3 - sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- sound/soc/meson/Kconfig | 9 +- sound/soc/meson/Makefile | 2 + sound/soc/meson/axg-fifo.h | 3 +- sound/soc/meson/axg-spdifin.c | 521 +++++++++ sound/soc/meson/axg-toddr.c | 15 +- sound/soc/omap/Kconfig | 129 --- sound/soc/omap/Makefile | 32 - sound/soc/omap/am3517evm.c | 141 --- sound/soc/omap/mcbsp.c | 1104 -------------------- sound/soc/pxa/Kconfig | 26 +- sound/soc/pxa/Makefile | 1 - sound/soc/pxa/raumfeld.c | 318 ------ sound/soc/qcom/Kconfig | 2 + sound/soc/qcom/lpass-platform.c | 2 +- sound/soc/qcom/qdsp6/q6afe-dai.c | 30 +- sound/soc/qcom/qdsp6/q6afe.c | 4 + sound/soc/qcom/qdsp6/q6asm-dai.c | 372 ++++++- sound/soc/qcom/qdsp6/q6asm.c | 5 + sound/soc/qcom/qdsp6/q6routing.c | 9 + sound/soc/qcom/sdm845.c | 186 +++- sound/soc/sh/rcar/adg.c | 38 +- sound/soc/sh/rcar/cmd.c | 11 +- sound/soc/sh/rcar/core.c | 256 ++++- sound/soc/sh/rcar/ctu.c | 138 +-- sound/soc/sh/rcar/dma.c | 84 +- sound/soc/sh/rcar/dvc.c | 21 +- sound/soc/sh/rcar/gen.c | 49 +- sound/soc/sh/rcar/mix.c | 3 +- sound/soc/sh/rcar/rsnd.h | 382 +++---- sound/soc/sh/rcar/src.c | 67 +- sound/soc/sh/rcar/ssi.c | 269 ++--- sound/soc/sh/rcar/ssiu.c | 300 ++++-- sound/soc/soc-core.c | 13 +- sound/soc/stm/stm32_sai.c | 8 +- sound/soc/stm/stm32_sai_sub.c | 3 +- sound/soc/sunxi/sun50i-codec-analog.c | 2 + sound/soc/ti/Kconfig | 209 ++++ sound/soc/ti/Makefile | 44 + sound/soc/{omap => ti}/ams-delta.c | 0 sound/soc/{davinci => ti}/davinci-evm.c | 4 +- sound/soc/{davinci => ti}/davinci-i2s.c | 0 sound/soc/{davinci => ti}/davinci-i2s.h | 0 sound/soc/{davinci => ti}/davinci-mcasp.c | 123 ++- sound/soc/{davinci => ti}/davinci-mcasp.h | 30 +- sound/soc/{davinci => ti}/davinci-vcif.c | 0 sound/soc/{davinci => ti}/edma-pcm.c | 0 sound/soc/{davinci => ti}/edma-pcm.h | 4 +- sound/soc/{omap => ti}/n810.c | 0 sound/soc/{omap => ti}/omap-abe-twl6040.c | 0 sound/soc/{omap => ti}/omap-dmic.c | 0 sound/soc/{omap => ti}/omap-dmic.h | 0 .../soc/{omap/omap-hdmi-audio.c => ti/omap-hdmi.c} | 0 sound/soc/{omap/mcbsp.h => ti/omap-mcbsp-priv.h} | 126 +-- sound/soc/ti/omap-mcbsp-st.c | 516 +++++++++ sound/soc/{omap => ti}/omap-mcbsp.c | 857 ++++++++++++--- sound/soc/{omap => ti}/omap-mcbsp.h | 8 +- sound/soc/{omap => ti}/omap-mcpdm.c | 0 sound/soc/{omap => ti}/omap-mcpdm.h | 0 sound/soc/{omap => ti}/omap-twl4030.c | 0 sound/soc/{omap => ti}/omap3pandora.c | 0 sound/soc/{omap => ti}/osk5912.c | 0 sound/soc/{omap => ti}/rx51.c | 0 sound/soc/{omap => ti}/sdma-pcm.c | 0 sound/soc/{omap => ti}/sdma-pcm.h | 4 +- sound/soc/xilinx/Kconfig | 8 + sound/soc/xilinx/Makefile | 2 + sound/soc/xilinx/xlnx_i2s.c | 185 ++++ 190 files changed, 9619 insertions(+), 4021 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ak4118.txt create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-spdifin.txt create mode 100644 Documentation/devicetree/bindings/sound/xlnx,i2s.txt create mode 100644 sound/soc/amd/raven/Makefile create mode 100644 sound/soc/amd/raven/acp3x-pcm-dma.c create mode 100644 sound/soc/amd/raven/acp3x.h create mode 100644 sound/soc/amd/raven/chip_offset_byte.h create mode 100644 sound/soc/amd/raven/pci-acp3x.c create mode 100644 sound/soc/codecs/ak4118.c delete mode 100644 sound/soc/davinci/Kconfig delete mode 100644 sound/soc/davinci/Makefile create mode 100644 sound/soc/intel/boards/kbl_rt5660.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-icl-match.c create mode 100644 sound/soc/meson/axg-spdifin.c delete mode 100644 sound/soc/omap/Kconfig delete mode 100644 sound/soc/omap/Makefile delete mode 100644 sound/soc/omap/am3517evm.c delete mode 100644 sound/soc/omap/mcbsp.c delete mode 100644 sound/soc/pxa/raumfeld.c create mode 100644 sound/soc/ti/Kconfig create mode 100644 sound/soc/ti/Makefile rename sound/soc/{omap => ti}/ams-delta.c (100%) rename sound/soc/{davinci => ti}/davinci-evm.c (99%) rename sound/soc/{davinci => ti}/davinci-i2s.c (100%) rename sound/soc/{davinci => ti}/davinci-i2s.h (100%) rename sound/soc/{davinci => ti}/davinci-mcasp.c (94%) rename sound/soc/{davinci => ti}/davinci-mcasp.h (95%) rename sound/soc/{davinci => ti}/davinci-vcif.c (100%) rename sound/soc/{davinci => ti}/edma-pcm.c (100%) rename sound/soc/{davinci => ti}/edma-pcm.h (91%) rename sound/soc/{omap => ti}/n810.c (100%) rename sound/soc/{omap => ti}/omap-abe-twl6040.c (100%) rename sound/soc/{omap => ti}/omap-dmic.c (100%) rename sound/soc/{omap => ti}/omap-dmic.h (100%) rename sound/soc/{omap/omap-hdmi-audio.c => ti/omap-hdmi.c} (100%) rename sound/soc/{omap/mcbsp.h => ti/omap-mcbsp-priv.h} (70%) create mode 100644 sound/soc/ti/omap-mcbsp-st.c rename sound/soc/{omap => ti}/omap-mcbsp.c (51%) rename sound/soc/{omap => ti}/omap-mcbsp.h (92%) rename sound/soc/{omap => ti}/omap-mcpdm.c (100%) rename sound/soc/{omap => ti}/omap-mcpdm.h (100%) rename sound/soc/{omap => ti}/omap-twl4030.c (100%) rename sound/soc/{omap => ti}/omap3pandora.c (100%) rename sound/soc/{omap => ti}/osk5912.c (100%) rename sound/soc/{omap => ti}/rx51.c (100%) rename sound/soc/{omap => ti}/sdma-pcm.c (100%) rename sound/soc/{omap => ti}/sdma-pcm.h (85%) create mode 100644 sound/soc/xilinx/Kconfig create mode 100644 sound/soc/xilinx/Makefile create mode 100644 sound/soc/xilinx/xlnx_i2s.c

2 1

[alsa-devel] Applied "ASoC: ti: Merge davinci and omap directories" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch ASoC: ti: Merge davinci and omap directories has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f2055e145f2975a75dace8e386fad9364828cdb4 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:34 +0200 Subject: [PATCH] ASoC: ti: Merge davinci and omap directories Create new directory to contain all Texas Instruments specific DAI, platform and machine drivers instead of scattering them under davinci and omap directories. There is already inter dependency between the two directories becasue of McASP (on dra7x it is serviced by sDMA, not EDMA). With the upcoming AM654 we will need to introduce new platform driver for UDMA and it does not fit under davinci, nor under omap. With the move I have restructured the Kconfig to be more usable in the era of simple-sound-card: CPU DAIs can be selected individually and they will select the platform driver they can be served with. To avoid breakage, I have moved over deprecated Kconfig options so defconfig builds will work without regression. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> For sound/soc/{omap => ti}: Tested-by: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Acked-by: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/Kconfig | 3 +- sound/soc/Makefile | 3 +- sound/soc/davinci/Kconfig | 106 ----- sound/soc/davinci/Makefile | 16 - sound/soc/omap/Kconfig | 120 ------ sound/soc/omap/Makefile | 30 -- sound/soc/ti/Kconfig | 368 ++++++++++++++++++ sound/soc/ti/Makefile | 44 +++ sound/soc/{omap => ti}/ams-delta.c | 0 sound/soc/{davinci => ti}/davinci-evm.c | 4 +- sound/soc/{davinci => ti}/davinci-i2s.c | 0 sound/soc/{davinci => ti}/davinci-i2s.h | 0 sound/soc/{davinci => ti}/davinci-mcasp.c | 14 +- sound/soc/{davinci => ti}/davinci-mcasp.h | 0 sound/soc/{davinci => ti}/davinci-vcif.c | 0 sound/soc/{davinci => ti}/edma-pcm.c | 0 sound/soc/{davinci => ti}/edma-pcm.h | 4 +- sound/soc/{omap => ti}/n810.c | 0 sound/soc/{omap => ti}/omap-abe-twl6040.c | 0 sound/soc/{omap => ti}/omap-dmic.c | 0 sound/soc/{omap => ti}/omap-dmic.h | 0 .../omap-hdmi-audio.c => ti/omap-hdmi.c} | 0 sound/soc/{omap => ti}/omap-mcbsp-priv.h | 0 sound/soc/{omap => ti}/omap-mcbsp-st.c | 0 sound/soc/{omap => ti}/omap-mcbsp.c | 0 sound/soc/{omap => ti}/omap-mcbsp.h | 0 sound/soc/{omap => ti}/omap-mcpdm.c | 0 sound/soc/{omap => ti}/omap-mcpdm.h | 0 sound/soc/{omap => ti}/omap-twl4030.c | 0 sound/soc/{omap => ti}/omap3pandora.c | 0 sound/soc/{omap => ti}/osk5912.c | 0 sound/soc/{omap => ti}/rx51.c | 0 sound/soc/{omap => ti}/sdma-pcm.c | 0 sound/soc/{omap => ti}/sdma-pcm.h | 4 +- 34 files changed, 427 insertions(+), 289 deletions(-) delete mode 100644 sound/soc/davinci/Kconfig delete mode 100644 sound/soc/davinci/Makefile delete mode 100644 sound/soc/omap/Kconfig delete mode 100644 sound/soc/omap/Makefile create mode 100644 sound/soc/ti/Kconfig create mode 100644 sound/soc/ti/Makefile rename sound/soc/{omap => ti}/ams-delta.c (100%) rename sound/soc/{davinci => ti}/davinci-evm.c (99%) rename sound/soc/{davinci => ti}/davinci-i2s.c (100%) rename sound/soc/{davinci => ti}/davinci-i2s.h (100%) rename sound/soc/{davinci => ti}/davinci-mcasp.c (99%) rename sound/soc/{davinci => ti}/davinci-mcasp.h (100%) rename sound/soc/{davinci => ti}/davinci-vcif.c (100%) rename sound/soc/{davinci => ti}/edma-pcm.c (100%) rename sound/soc/{davinci => ti}/edma-pcm.h (91%) rename sound/soc/{omap => ti}/n810.c (100%) rename sound/soc/{omap => ti}/omap-abe-twl6040.c (100%) rename sound/soc/{omap => ti}/omap-dmic.c (100%) rename sound/soc/{omap => ti}/omap-dmic.h (100%) rename sound/soc/{omap/omap-hdmi-audio.c => ti/omap-hdmi.c} (100%) rename sound/soc/{omap => ti}/omap-mcbsp-priv.h (100%) rename sound/soc/{omap => ti}/omap-mcbsp-st.c (100%) rename sound/soc/{omap => ti}/omap-mcbsp.c (100%) rename sound/soc/{omap => ti}/omap-mcbsp.h (100%) rename sound/soc/{omap => ti}/omap-mcpdm.c (100%) rename sound/soc/{omap => ti}/omap-mcpdm.h (100%) rename sound/soc/{omap => ti}/omap-twl4030.c (100%) rename sound/soc/{omap => ti}/omap3pandora.c (100%) rename sound/soc/{omap => ti}/osk5912.c (100%) rename sound/soc/{omap => ti}/rx51.c (100%) rename sound/soc/{omap => ti}/sdma-pcm.c (100%) rename sound/soc/{omap => ti}/sdma-pcm.h (85%) diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index d21659f5a7e2..6592a422a047 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -46,13 +46,11 @@ source "sound/soc/atmel/Kconfig" source "sound/soc/au1x/Kconfig" source "sound/soc/bcm/Kconfig" source "sound/soc/cirrus/Kconfig" -source "sound/soc/davinci/Kconfig" source "sound/soc/dwc/Kconfig" source "sound/soc/fsl/Kconfig" source "sound/soc/hisilicon/Kconfig" source "sound/soc/jz4740/Kconfig" source "sound/soc/nuc900/Kconfig" -source "sound/soc/omap/Kconfig" source "sound/soc/kirkwood/Kconfig" source "sound/soc/img/Kconfig" source "sound/soc/intel/Kconfig" @@ -70,6 +68,7 @@ source "sound/soc/sti/Kconfig" source "sound/soc/stm/Kconfig" source "sound/soc/sunxi/Kconfig" source "sound/soc/tegra/Kconfig" +source "sound/soc/ti/Kconfig" source "sound/soc/txx9/Kconfig" source "sound/soc/uniphier/Kconfig" source "sound/soc/ux500/Kconfig" diff --git a/sound/soc/Makefile b/sound/soc/Makefile index aff7b1989436..48c48c1c893c 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -30,7 +30,6 @@ obj-$(CONFIG_SND_SOC) += atmel/ obj-$(CONFIG_SND_SOC) += au1x/ obj-$(CONFIG_SND_SOC) += bcm/ obj-$(CONFIG_SND_SOC) += cirrus/ -obj-$(CONFIG_SND_SOC) += davinci/ obj-$(CONFIG_SND_SOC) += dwc/ obj-$(CONFIG_SND_SOC) += fsl/ obj-$(CONFIG_SND_SOC) += hisilicon/ @@ -41,7 +40,6 @@ obj-$(CONFIG_SND_SOC) += mediatek/ obj-$(CONFIG_SND_SOC) += meson/ obj-$(CONFIG_SND_SOC) += mxs/ obj-$(CONFIG_SND_SOC) += nuc900/ -obj-$(CONFIG_SND_SOC) += omap/ obj-$(CONFIG_SND_SOC) += kirkwood/ obj-$(CONFIG_SND_SOC) += pxa/ obj-$(CONFIG_SND_SOC) += qcom/ @@ -54,6 +52,7 @@ obj-$(CONFIG_SND_SOC) += sti/ obj-$(CONFIG_SND_SOC) += stm/ obj-$(CONFIG_SND_SOC) += sunxi/ obj-$(CONFIG_SND_SOC) += tegra/ +obj-$(CONFIG_SND_SOC) += ti/ obj-$(CONFIG_SND_SOC) += txx9/ obj-$(CONFIG_SND_SOC) += uniphier/ obj-$(CONFIG_SND_SOC) += ux500/ diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig deleted file mode 100644 index 778faff28e0e..000000000000 --- a/sound/soc/davinci/Kconfig +++ /dev/null @@ -1,106 +0,0 @@ -config SND_DAVINCI_SOC - tristate - depends on ARCH_DAVINCI - select SND_EDMA_SOC - -config SND_EDMA_SOC - tristate "SoC Audio for Texas Instruments chips using eDMA" - depends on TI_EDMA - select SND_SOC_GENERIC_DMAENGINE_PCM - help - Say Y or M here if you want audio support for TI SoC which uses eDMA. - The following line of SoCs are supported by this platform driver: - - daVinci devices - - AM335x - - AM437x/AM438x - - DRA7xx family - -config SND_DAVINCI_SOC_I2S - tristate "DaVinci Multichannel Buffered Serial Port (McBSP) support" - depends on SND_EDMA_SOC - help - Say Y or M here if you want to have support for McBSP IP found in - Texas Instruments DaVinci DA850 SoCs. - -config SND_DAVINCI_SOC_MCASP - tristate "Multichannel Audio Serial Port (McASP) support" - depends on SND_SDMA_SOC || SND_EDMA_SOC - help - Say Y or M here if you want to have support for McASP IP found in - various Texas Instruments SoCs like: - - daVinci devices - - Sitara line of SoCs (AM335x, AM438x, etc) - - DRA7x devices - -config SND_DAVINCI_SOC_VCIF - tristate - -config SND_DAVINCI_SOC_GENERIC_EVM - tristate - select SND_SOC_TLV320AIC3X - select SND_DAVINCI_SOC_MCASP - -config SND_AM33XX_SOC_EVM - tristate "SoC Audio for the AM33XX chip based boards" - depends on SND_EDMA_SOC && SOC_AM33XX && I2C - select SND_DAVINCI_SOC_GENERIC_EVM - help - Say Y or M if you want to add support for SoC audio on AM33XX - boards using McASP and TLV320AIC3X codec. For example AM335X-EVM, - AM335X-EVMSK, and BeagelBone with AudioCape boards have this - setup. - -config SND_DAVINCI_SOC_EVM - tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" - depends on SND_EDMA_SOC && I2C - depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM - select SND_DAVINCI_SOC_GENERIC_EVM - help - Say Y if you want to add support for SoC audio on TI - DaVinci DM6446, DM355 or DM365 EVM platforms. - -choice - prompt "DM365 codec select" - depends on SND_DAVINCI_SOC_EVM - depends on MACH_DAVINCI_DM365_EVM - -config SND_DM365_AIC3X_CODEC - tristate "Audio Codec - AIC3101" - help - Say Y if you want to add support for AIC3101 audio codec - -config SND_DM365_VOICE_CODEC - tristate "Voice Codec - CQ93VC" - select MFD_DAVINCI_VOICECODEC - select SND_DAVINCI_SOC_VCIF - select SND_SOC_CQ0093VC - help - Say Y if you want to add support for SoC On-chip voice codec -endchoice - -config SND_DM6467_SOC_EVM - tristate "SoC Audio support for DaVinci DM6467 EVM" - depends on SND_EDMA_SOC && MACH_DAVINCI_DM6467_EVM && I2C - select SND_DAVINCI_SOC_GENERIC_EVM - select SND_SOC_SPDIF - - help - Say Y if you want to add support for SoC audio on TI - -config SND_DA830_SOC_EVM - tristate "SoC Audio support for DA830/OMAP-L137 EVM" - depends on SND_EDMA_SOC && MACH_DAVINCI_DA830_EVM && I2C - select SND_DAVINCI_SOC_GENERIC_EVM - - help - Say Y if you want to add support for SoC audio on TI - DA830/OMAP-L137 EVM - -config SND_DA850_SOC_EVM - tristate "SoC Audio support for DA850/OMAP-L138 EVM" - depends on SND_EDMA_SOC && MACH_DAVINCI_DA850_EVM && I2C - select SND_DAVINCI_SOC_GENERIC_EVM - help - Say Y if you want to add support for SoC audio on TI - DA850/OMAP-L138 EVM - diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile deleted file mode 100644 index 23c6592eb31a..000000000000 --- a/sound/soc/davinci/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# DAVINCI Platform Support -snd-soc-edma-objs := edma-pcm.o -snd-soc-davinci-i2s-objs := davinci-i2s.o -snd-soc-davinci-mcasp-objs:= davinci-mcasp.o -snd-soc-davinci-vcif-objs:= davinci-vcif.o - -obj-$(CONFIG_SND_EDMA_SOC) += snd-soc-edma.o -obj-$(CONFIG_SND_DAVINCI_SOC_I2S) += snd-soc-davinci-i2s.o -obj-$(CONFIG_SND_DAVINCI_SOC_MCASP) += snd-soc-davinci-mcasp.o -obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += snd-soc-davinci-vcif.o - -# Generic DAVINCI/AM33xx Machine Support -snd-soc-evm-objs := davinci-evm.o - -obj-$(CONFIG_SND_DAVINCI_SOC_GENERIC_EVM) += snd-soc-evm.o diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig deleted file mode 100644 index 3d418482d242..000000000000 --- a/sound/soc/omap/Kconfig +++ /dev/null @@ -1,120 +0,0 @@ -config SND_OMAP_SOC - tristate "SoC Audio for Texas Instruments OMAP chips (deprecated)" - depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST) - select SND_SDMA_SOC - -config SND_SDMA_SOC - tristate "SoC Audio for Texas Instruments chips using sDMA" - depends on DMA_OMAP || COMPILE_TEST - select SND_SOC_GENERIC_DMAENGINE_PCM - -config SND_OMAP_SOC_DMIC - tristate - -config SND_OMAP_SOC_MCBSP - tristate - -config SND_OMAP_SOC_MCPDM - tristate - -config SND_OMAP_SOC_HDMI_AUDIO - tristate "HDMI audio support for OMAP4+ based SoCs" - depends on SND_SDMA_SOC - help - For HDMI audio to work OMAPDSS HDMI support should be - enabled. - The hdmi audio driver implements cpu-dai component using the - callbacks provided by OMAPDSS and registers the component - under DSS HDMI device. Omap-pcm is registered for platform - component also under DSS HDMI device. Dummy codec is used as - as codec component. The hdmi audio driver implements also - the card and registers it under its own platform device. - The device for the driver is registered by OMAPDSS hdmi - driver. - -config SND_OMAP_SOC_N810 - tristate "SoC Audio support for Nokia N810" - depends on SND_SDMA_SOC && MACH_NOKIA_N810 && I2C - select SND_OMAP_SOC_MCBSP - select SND_SOC_TLV320AIC3X - help - Say Y if you want to add support for SoC audio on Nokia N810. - -config SND_OMAP_SOC_RX51 - tristate "SoC Audio support for Nokia N900 (RX-51)" - depends on SND_SDMA_SOC && ARM && I2C - select SND_OMAP_SOC_MCBSP - select SND_SOC_TLV320AIC3X - select SND_SOC_TPA6130A2 - depends on GPIOLIB - help - Say Y if you want to add support for SoC audio on Nokia N900 - cellphone. - -config SND_OMAP_SOC_AMS_DELTA - tristate "SoC Audio support for Amstrad E3 (Delta) videophone" - depends on SND_SDMA_SOC && MACH_AMS_DELTA && TTY - select SND_OMAP_SOC_MCBSP - select SND_SOC_CX20442 - help - Say Y if you want to add support for SoC audio device connected to - a handset and a speakerphone found on Amstrad E3 (Delta) videophone. - - Note that in order to get those devices fully supported, you have to - build the kernel with standard serial port driver included and - configured for at least 4 ports. Then, from userspace, you must load - a line discipline #19 on the modem (ttyS3) serial line. The simplest - way to achieve this is to install util-linux-ng and use the included - ldattach utility. This can be started automatically from udev, - a simple rule like this one should do the trick (it does for me): - ACTION=="add", KERNEL=="controlC0", \ - RUN+="/usr/sbin/ldattach 19 /dev/ttyS3" - -config SND_OMAP_SOC_OSK5912 - tristate "SoC Audio support for omap osk5912" - depends on SND_SDMA_SOC && MACH_OMAP_OSK && I2C - select SND_OMAP_SOC_MCBSP - select SND_SOC_TLV320AIC23_I2C - help - Say Y if you want to add support for SoC audio on osk5912. - -config SND_OMAP_SOC_OMAP_TWL4030 - tristate "SoC Audio support for TI SoC based boards with twl4030 codec" - depends on TWL4030_CORE && SND_SDMA_SOC - select SND_OMAP_SOC_MCBSP - select SND_SOC_TWL4030 - help - Say Y if you want to add support for SoC audio on TI SoC based boards - using twl4030 as c codec. This driver currently supports: - - Beagleboard or Devkit8000 - - Gumstix Overo or CompuLab CM-T35/CM-T3730 - - IGEP v2 - - OMAP3EVM - - SDP3430 - - Zoom2 - -config SND_OMAP_SOC_OMAP_ABE_TWL6040 - tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" - depends on TWL6040_CORE && SND_SDMA_SOC && COMMON_CLK - depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST - select SND_OMAP_SOC_DMIC - select SND_OMAP_SOC_MCPDM - select SND_SOC_TWL6040 - select SND_SOC_DMIC - select COMMON_CLK_PALMAS if (SOC_OMAP5 && MFD_PALMAS) - select CLK_TWL6040 - help - Say Y if you want to add support for SoC audio on OMAP boards using - ABE and twl6040 codec. This driver currently supports: - - SDP4430/Blaze boards - - PandaBoard (4430) - - PandaBoardES (4460) - - omap5-uevm (5432) - -config SND_OMAP_SOC_OMAP3_PANDORA - tristate "SoC Audio support for OMAP3 Pandora" - depends on TWL4030_CORE && SND_SDMA_SOC && MACH_OMAP3_PANDORA - select SND_OMAP_SOC_MCBSP - select SND_SOC_TWL4030 - help - Say Y if you want to add support for SoC audio on the OMAP3 Pandora. diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile deleted file mode 100644 index d005338dd13c..000000000000 --- a/sound/soc/omap/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# OMAP Platform Support -snd-soc-sdma-objs := sdma-pcm.o -snd-soc-omap-dmic-objs := omap-dmic.o -snd-soc-omap-mcbsp-objs := omap-mcbsp.o omap-mcbsp-st.o -snd-soc-omap-mcpdm-objs := omap-mcpdm.o -snd-soc-omap-hdmi-audio-objs := omap-hdmi-audio.o - -obj-$(CONFIG_SND_SDMA_SOC) += snd-soc-sdma.o -obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o -obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o -obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o -obj-$(CONFIG_SND_OMAP_SOC_HDMI_AUDIO) += snd-soc-omap-hdmi-audio.o - -# OMAP Machine Support -snd-soc-n810-objs := n810.o -snd-soc-rx51-objs := rx51.o -snd-soc-ams-delta-objs := ams-delta.o -snd-soc-osk5912-objs := osk5912.o -snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o -snd-soc-omap-twl4030-objs := omap-twl4030.o -snd-soc-omap3pandora-objs := omap3pandora.o - -obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o -obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o -obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o -obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o -obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o -obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o -obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig new file mode 100644 index 000000000000..698810c770f0 --- /dev/null +++ b/sound/soc/ti/Kconfig @@ -0,0 +1,368 @@ +menu "Audio support for Texas Instruments SoCs" +depends on DMA_OMAP || TI_EDMA || COMPILE_TEST + +config SND_SOC_TI_EDMA_PCM + tristate + select SND_SOC_GENERIC_DMAENGINE_PCM + +config SND_SOC_TI_SDMA_PCM + tristate + select SND_SOC_GENERIC_DMAENGINE_PCM + +comment "Texas Instruments DAI support for:" +config SND_SOC_DAVINCI_ASP + tristate "daVinci Audio Serial Port (ASP) or McBSP suport" + depends on ARCH_DAVINCI || COMPILE_TEST + select SND_SOC_TI_EDMA_PCM + help + Say Y or M here if you want audio support via daVinci ASP or McBSP. + The driver only implements the ASP support which is a subset of + daVinci McBSP (w/o the multichannel support). + +config SND_SOC_DAVINCI_MCASP + tristate "Multichannel Audio Serial Port (McASP) support" + select SND_SOC_TI_EDMA_PCM if TI_EDMA + select SND_SOC_TI_SDMA_PCM if DMA_OMAP + help + Say Y or M here if you want to have support for McASP IP found in + various Texas Instruments SoCs like: + - daVinci devices + - Sitara line of SoCs (AM335x, AM438x, etc) + - DRA7x devices + - Keystone devices + +config SND_SOC_DAVINCI_VCIF + tristate "daVinci Voice Interface (VCIF) suport" + depends on ARCH_DAVINCI || COMPILE_TEST + select SND_SOC_TI_EDMA_PCM + help + Say Y or M here if you want audio support via daVinci VCIF. + +config SND_SOC_OMAP_DMIC + tristate "Digital Microphone Module (DMIC) support" + depends on ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST + select SND_SOC_TI_SDMA_PCM + help + Say Y or M here if you want to have support for DMIC IP found in + OMAP4 and OMAP5. + +config SND_OMAP_SOC_MCBSP + tristate + +config SND_SOC_OMAP_MCBSP + tristate "Multichannel Buffered Serial Port (McBSP) support" + depends on ARCH_OMAP || ARCH_OMAP1 || COMPILE_TEST + select SND_SOC_TI_SDMA_PCM + select SND_OMAP_SOC_MCBSP + help + Say Y or M here if you want to have support for McBSP IP found in + Texas Instruments OMAP1/2/3/4/5 SoCs. + +config SND_SOC_OMAP_MCPDM + tristate "Multichannel PDM Controller (McPDM) support" + depends on ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST + select SND_SOC_TI_SDMA_PCM + help + Say Y or M here if you want to have support for McPDM IP found in + OMAP4 and OMAP5. + +comment "Audio support for boards with Texas Instruments SoCs" +config SND_SOC_NOKIA_N810 + tristate "SoC Audio support for Nokia N810" + depends on MACH_NOKIA_N810 && I2C + select SND_SOC_OMAP_MCBSP + select SND_SOC_TLV320AIC3X + help + Say Y or M if you want to add support for SoC audio on Nokia N810. + +config SND_SOC_NOKIA_RX51 + tristate "SoC Audio support for Nokia RX-51" + depends on ARCH_OMAP3 && I2C && GPIOLIB + select SND_SOC_OMAP_MCBSP + select SND_SOC_TLV320AIC3X + select SND_SOC_TPA6130A2 + help + Say Y or M if you want to add support for SoC audio on Nokia RX-51 + hardware. This is also known as Nokia N900 product. + +config SND_SOC_OMAP3_PANDORA + tristate "SoC Audio support for OMAP3 Pandora" + depends on ARCH_OMAP3 + depends on TWL4030_CORE + select SND_SOC_OMAP_MCBSP + select SND_SOC_TWL4030 + help + Say Y or M if you want to add support for SoC audio on the OMAP3 Pandora. + +config SND_SOC_OMAP3_TWL4030 + tristate "SoC Audio support for OMAP3 based boards with twl4030 codec" + depends on ARCH_OMAP3 || COMPILE_TEST + depends on TWL4030_CORE + select SND_SOC_OMAP_MCBSP + select SND_SOC_TWL4030 + help + Say Y or M if you want to add support for SoC audio on OMAP3 based + boards using twl4030 as codec. This driver currently supports: + - Beagleboard or Devkit8000 + - Gumstix Overo or CompuLab CM-T35/CM-T3730 + - IGEP v2 + - OMAP3EVM + - SDP3430 + - Zoom2 + +config SND_SOC_OMAP_ABE_TWL6040 + tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" + depends on TWL6040_CORE && COMMON_CLK + depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST + select SND_SOC_OMAP_DMIC + select SND_SOC_OMAP_MCPDM + select SND_SOC_TWL6040 + help + Say Y or M if you want to add support for SoC audio on OMAP boards + using ABE and twl6040 codec. This driver currently supports: + - SDP4430/Blaze boards + - PandaBoard (4430) + - PandaBoardES (4460) + - OMAP5 uEVM + +config SND_SOC_OMAP_AMS_DELTA + tristate "SoC Audio support for Amstrad E3 (Delta) videophone" + depends on MACH_AMS_DELTA && TTY + select SND_SOC_OMAP_MCBSP + select SND_SOC_CX20442 + help + Say Y or M if you want to add support for SoC audio device + connected to a handset and a speakerphone found on Amstrad E3 (Delta) + videophone. + + Note that in order to get those devices fully supported, you have to + build the kernel with standard serial port driver included and + configured for at least 4 ports. Then, from userspace, you must load + a line discipline #19 on the modem (ttyS3) serial line. The simplest + way to achieve this is to install util-linux-ng and use the included + ldattach utility. This can be started automatically from udev, + a simple rule like this one should do the trick (it does for me): + ACTION=="add", KERNEL=="controlC0", \ + RUN+="/usr/sbin/ldattach 19 /dev/ttyS3" + +config SND_SOC_OMAP_HDMI + tristate "OMAP4/5 HDMI audio support" + depends on OMAP4_DSS_HDMI || OMAP5_DSS_HDMI || COMPILE_TEST + select SND_SOC_TI_SDMA_PCM + help + For HDMI audio to work OMAPDSS HDMI support should be + enabled. + The hdmi audio driver implements cpu-dai component using the + callbacks provided by OMAPDSS and registers the component + under DSS HDMI device. Omap-pcm is registered for platform + component also under DSS HDMI device. Dummy codec is used as + as codec component. The hdmi audio driver implements also + the card and registers it under its own platform device. + The device for the driver is registered by OMAPDSS hdmi + driver. + +config SND_SOC_OMAP_OSK5912 + tristate "SoC Audio support for omap osk5912" + depends on MACH_OMAP_OSK && I2C + select SND_SOC_OMAP_MCBSP + select SND_SOC_TLV320AIC23_I2C + help + Say Y or M if you want to add support for SoC audio on osk5912. + +config SND_SOC_DAVINCI_EVM + tristate "SoC Audio support for DaVinci EVMs" + depends on ARCH_DAVINCI && I2C + select SND_SOC_DAVINCI_ASP if MACH_DAVINCI_DM355_EVM + select SND_SOC_DAVINCI_ASP if SND_SOC_DM365_AIC3X_CODEC + select SND_SOC_DAVINCI_VCIF if SND_SOC_DM365_VOICE_CODEC + select SND_SOC_DAVINCI_ASP if MACH_DAVINCI_EVM # DM6446 + select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DM6467_EVM + select SND_SOC_SPDIF if MACH_DAVINCI_DM6467_EVM + select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DA830_EVM + select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DA850_EVM + select SND_SOC_TLV320AIC3X + help + Say Y if you want to add support for SoC audio on the following TI + DaVinci EVM platforms: + - DM355 + - DM365 + - DM6446 + - DM6447 + - DM830 + - DM850 + +choice + prompt "DM365 codec select" + depends on SND_SOC_DAVINCI_EVM + depends on MACH_DAVINCI_DM365_EVM + +config SND_SOC_DM365_AIC3X_CODEC + bool "Audio Codec - AIC3101" + help + Say Y if you want to add support for AIC3101 audio codec + +config SND_SOC_DM365_VOICE_CODEC + bool "Voice Codec - CQ93VC" + select MFD_DAVINCI_VOICECODEC + select SND_SOC_CQ0093VC + help + Say Y if you want to add support for SoC On-chip voice codec +endchoice + +menu "Deprecated kconfig options:" + +config SND_AM33XX_SOC_EVM + tristate "SoC Audio for the AM33XX chip based boards" + depends on SOC_AM33XX && I2C + select SND_SOC_TLV320AIC3X + select SND_SOC_DAVINCI_MCASP + help + Say Y or M if you want to add support for SoC audio on AM33XX + boards using McASP and TLV320AIC3X codec. For example AM335X-EVM, + AM335X-EVMSK, and BeagelBone with AudioCape boards have this + setup. + +config SND_DAVINCI_SOC_EVM + tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" + depends on ARCH_DAVINCI && I2C + depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM + select SND_SOC_DAVINCI_EVM + help + Say Y if you want to add support for SoC audio on TI + DaVinci DM6446, DM355 or DM365 EVM platforms. + +choice + prompt "DM365 codec select" + depends on SND_DAVINCI_SOC_EVM + depends on MACH_DAVINCI_DM365_EVM + +config SND_DM365_AIC3X_CODEC + tristate "Audio Codec - AIC3101" + select SND_SOC_DM365_AIC3X_CODEC + help + Say Y if you want to add support for AIC3101 audio codec + +config SND_DM365_VOICE_CODEC + tristate "Voice Codec - CQ93VC" + select SND_SOC_DM365_VOICE_CODEC + help + Say Y if you want to add support for SoC On-chip voice codec +endchoice + +config SND_DM6467_SOC_EVM + tristate "SoC Audio support for DaVinci DM6467 EVM" + depends on MACH_DAVINCI_DM6467_EVM && I2C + select SND_SOC_DAVINCI_EVM + + help + Say Y if you want to add support for SoC audio on TI + +config SND_DA830_SOC_EVM + tristate "SoC Audio support for DA830/OMAP-L137 EVM" + depends on MACH_DAVINCI_DA830_EVM && I2C + select SND_SOC_DAVINCI_EVM + + help + Say Y if you want to add support for SoC audio on TI + DA830/OMAP-L137 EVM + +config SND_DA850_SOC_EVM + tristate "SoC Audio support for DA850/OMAP-L138 EVM" + depends on MACH_DAVINCI_DA850_EVM && I2C + select SND_SOC_DAVINCI_EVM + help + Say Y if you want to add support for SoC audio on TI + DA850/OMAP-L138 EVM + +config SND_OMAP_SOC_HDMI_AUDIO + tristate "HDMI audio support for OMAP4+ based SoCs" + select SND_SOC_OMAP_HDMI + help + For HDMI audio to work OMAPDSS HDMI support should be + enabled. + The hdmi audio driver implements cpu-dai component using the + callbacks provided by OMAPDSS and registers the component + under DSS HDMI device. Omap-pcm is registered for platform + component also under DSS HDMI device. Dummy codec is used as + as codec component. The hdmi audio driver implements also + the card and registers it under its own platform device. + The device for the driver is registered by OMAPDSS hdmi + driver. + +config SND_OMAP_SOC_N810 + tristate "SoC Audio support for Nokia N810" + depends on MACH_NOKIA_N810 && I2C + select SND_SOC_NOKIA_N810 + help + Say Y if you want to add support for SoC audio on Nokia N810. + +config SND_OMAP_SOC_RX51 + tristate "SoC Audio support for Nokia N900 (RX-51)" + depends on ARM && I2C && GPIOLIB && ARCH_OMAP3 + select SND_SOC_NOKIA_RX51 + help + Say Y if you want to add support for SoC audio on Nokia N900 + cellphone. + +config SND_OMAP_SOC_AMS_DELTA + tristate "SoC Audio support for Amstrad E3 (Delta) videophone" + depends on MACH_AMS_DELTA && TTY + select SND_SOC_OMAP_AMS_DELTA + help + Say Y if you want to add support for SoC audio device connected to + a handset and a speakerphone found on Amstrad E3 (Delta) videophone. + + Note that in order to get those devices fully supported, you have to + build the kernel with standard serial port driver included and + configured for at least 4 ports. Then, from userspace, you must load + a line discipline #19 on the modem (ttyS3) serial line. The simplest + way to achieve this is to install util-linux-ng and use the included + ldattach utility. This can be started automatically from udev, + a simple rule like this one should do the trick (it does for me): + ACTION=="add", KERNEL=="controlC0", \ + RUN+="/usr/sbin/ldattach 19 /dev/ttyS3" + +config SND_OMAP_SOC_OSK5912 + tristate "SoC Audio support for omap osk5912" + depends on MACH_OMAP_OSK && I2C + select SND_SOC_OMAP_OSK5912 + help + Say Y if you want to add support for SoC audio on osk5912. + +config SND_OMAP_SOC_OMAP_TWL4030 + tristate "SoC Audio support for TI SoC based boards with twl4030 codec" + depends on TWL4030_CORE + select SND_SOC_OMAP3_TWL4030 + help + Say Y if you want to add support for SoC audio on TI SoC based boards + using twl4030 as c codec. This driver currently supports: + - Beagleboard or Devkit8000 + - Gumstix Overo or CompuLab CM-T35/CM-T3730 + - IGEP v2 + - OMAP3EVM + - SDP3430 + - Zoom2 + +config SND_OMAP_SOC_OMAP_ABE_TWL6040 + tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" + depends on TWL6040_CORE && COMMON_CLK + depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST + select SND_SOC_OMAP_ABE_TWL6040 + help + Say Y if you want to add support for SoC audio on OMAP boards using + ABE and twl6040 codec. This driver currently supports: + - SDP4430/Blaze boards + - PandaBoard (4430) + - PandaBoardES (4460) + - omap5-uevm (5432) + +config SND_OMAP_SOC_OMAP3_PANDORA + tristate "SoC Audio support for OMAP3 Pandora" + depends on TWL4030_CORE + select SND_SOC_OMAP3_PANDORA + help + Say Y if you want to add support for SoC audio on the OMAP3 Pandora. +endmenu + +endmenu + diff --git a/sound/soc/ti/Makefile b/sound/soc/ti/Makefile new file mode 100644 index 000000000000..08c44d56ef3e --- /dev/null +++ b/sound/soc/ti/Makefile @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: GPL-2.0 + +# Platform drivers +snd-soc-ti-edma-objs := edma-pcm.o +snd-soc-ti-sdma-objs := sdma-pcm.o + +obj-$(CONFIG_SND_SOC_TI_EDMA_PCM) += snd-soc-ti-edma.o +obj-$(CONFIG_SND_SOC_TI_SDMA_PCM) += snd-soc-ti-sdma.o + +# CPU DAI drivers +snd-soc-davinci-asp-objs := davinci-i2s.o +snd-soc-davinci-mcasp-objs := davinci-mcasp.o +snd-soc-davinci-vcif-objs := davinci-vcif.o +snd-soc-omap-dmic-objs := omap-dmic.o +snd-soc-omap-mcbsp-objs := omap-mcbsp.o omap-mcbsp-st.o +snd-soc-omap-mcpdm-objs := omap-mcpdm.o + +obj-$(CONFIG_SND_SOC_DAVINCI_ASP) += snd-soc-davinci-asp.o +obj-$(CONFIG_SND_SOC_DAVINCI_MCASP) += snd-soc-davinci-mcasp.o +obj-$(CONFIG_SND_SOC_DAVINCI_VCIF) += snd-soc-davinci-vcif.o +obj-$(CONFIG_SND_SOC_OMAP_DMIC) += snd-soc-omap-dmic.o +obj-$(CONFIG_SND_SOC_OMAP_MCBSP) += snd-soc-omap-mcbsp.o +obj-$(CONFIG_SND_SOC_OMAP_MCPDM) += snd-soc-omap-mcpdm.o + +# Machine drivers +snd-soc-davinci-evm-objs := davinci-evm.o +snd-soc-n810-objs := n810.o +snd-soc-rx51-objs := rx51.o +snd-soc-omap3pandora-objs := omap3pandora.o +snd-soc-omap-twl4030-objs := omap-twl4030.o +snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o +snd-soc-ams-delta-objs := ams-delta.o +snd-soc-omap-hdmi-objs := omap-hdmi.o +snd-soc-osk5912-objs := osk5912.o + +obj-$(CONFIG_SND_SOC_DAVINCI_EVM) += snd-soc-davinci-evm.o +obj-$(CONFIG_SND_SOC_NOKIA_N810) += snd-soc-n810.o +obj-$(CONFIG_SND_SOC_NOKIA_RX51) += snd-soc-rx51.o +obj-$(CONFIG_SND_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o +obj-$(CONFIG_SND_SOC_OMAP3_TWL4030) += snd-soc-omap-twl4030.o +obj-$(CONFIG_SND_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o +obj-$(CONFIG_SND_SOC_OMAP_AMS_DELTA) += snd-soc-ams-delta.o +obj-$(CONFIG_SND_SOC_OMAP_HDMI) += snd-soc-omap-hdmi.o +obj-$(CONFIG_SND_SOC_OMAP_OSK5912) += snd-soc-osk5912.o diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/ti/ams-delta.c similarity index 100% rename from sound/soc/omap/ams-delta.c rename to sound/soc/ti/ams-delta.c diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/ti/davinci-evm.c similarity index 99% rename from sound/soc/davinci/davinci-evm.c rename to sound/soc/ti/davinci-evm.c index 7a369e0f2093..4869d6311510 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/ti/davinci-evm.c @@ -170,7 +170,7 @@ static struct snd_soc_dai_link dm355_evm_dai = { }; static struct snd_soc_dai_link dm365_evm_dai = { -#ifdef CONFIG_SND_DM365_AIC3X_CODEC +#ifdef CONFIG_SND_SOC_DM365_AIC3X_CODEC .name = "TLV320AIC3X", .stream_name = "AIC3X", .cpu_dai_name = "davinci-mcbsp", @@ -181,7 +181,7 @@ static struct snd_soc_dai_link dm365_evm_dai = { .ops = &evm_ops, .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF, -#elif defined(CONFIG_SND_DM365_VOICE_CODEC) +#elif defined(CONFIG_SND_SOC_DM365_VOICE_CODEC) .name = "Voice Codec - CQ93VC", .stream_name = "CQ93", .cpu_dai_name = "davinci-vcif", diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c similarity index 100% rename from sound/soc/davinci/davinci-i2s.c rename to sound/soc/ti/davinci-i2s.c diff --git a/sound/soc/davinci/davinci-i2s.h b/sound/soc/ti/davinci-i2s.h similarity index 100% rename from sound/soc/davinci/davinci-i2s.h rename to sound/soc/ti/davinci-i2s.h diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c similarity index 99% rename from sound/soc/davinci/davinci-mcasp.c rename to sound/soc/ti/davinci-mcasp.c index 40d3a916fb74..eeda6d5565bc 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -39,7 +39,7 @@ #include <sound/dmaengine_pcm.h> #include "edma-pcm.h" -#include "../omap/sdma-pcm.h" +#include "sdma-pcm.h" #include "davinci-mcasp.h" #define MCASP_MAX_AFIFO_DEPTH 64 @@ -2149,9 +2149,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ret = davinci_mcasp_get_dma_type(mcasp); switch (ret) { case PCM_EDMA: -#if IS_BUILTIN(CONFIG_SND_EDMA_SOC) || \ - (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \ - IS_MODULE(CONFIG_SND_EDMA_SOC)) +#if IS_BUILTIN(CONFIG_SND_SOC_TI_EDMA_PCM) || \ + (IS_MODULE(CONFIG_SND_SOC_DAVINCI_MCASP) && \ + IS_MODULE(CONFIG_SND_SOC_TI_EDMA_PCM)) ret = edma_pcm_platform_register(&pdev->dev); #else dev_err(&pdev->dev, "Missing SND_EDMA_SOC\n"); @@ -2160,9 +2160,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev) #endif break; case PCM_SDMA: -#if IS_BUILTIN(CONFIG_SND_SDMA_SOC) || \ - (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \ - IS_MODULE(CONFIG_SND_SDMA_SOC)) +#if IS_BUILTIN(CONFIG_SND_SOC_TI_SDMA_PCM) || \ + (IS_MODULE(CONFIG_SND_SOC_DAVINCI_MCASP) && \ + IS_MODULE(CONFIG_SND_SOC_TI_SDMA_PCM)) ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL); #else dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n"); diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/ti/davinci-mcasp.h similarity index 100% rename from sound/soc/davinci/davinci-mcasp.h rename to sound/soc/ti/davinci-mcasp.h diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/ti/davinci-vcif.c similarity index 100% rename from sound/soc/davinci/davinci-vcif.c rename to sound/soc/ti/davinci-vcif.c diff --git a/sound/soc/davinci/edma-pcm.c b/sound/soc/ti/edma-pcm.c similarity index 100% rename from sound/soc/davinci/edma-pcm.c rename to sound/soc/ti/edma-pcm.c diff --git a/sound/soc/davinci/edma-pcm.h b/sound/soc/ti/edma-pcm.h similarity index 91% rename from sound/soc/davinci/edma-pcm.h rename to sound/soc/ti/edma-pcm.h index b0957744851c..8058bdb0f032 100644 --- a/sound/soc/davinci/edma-pcm.h +++ b/sound/soc/ti/edma-pcm.h @@ -20,13 +20,13 @@ #ifndef __EDMA_PCM_H__ #define __EDMA_PCM_H__ -#if IS_ENABLED(CONFIG_SND_EDMA_SOC) +#if IS_ENABLED(CONFIG_SND_SOC_TI_EDMA_PCM) int edma_pcm_platform_register(struct device *dev); #else static inline int edma_pcm_platform_register(struct device *dev) { return 0; } -#endif /* CONFIG_SND_EDMA_SOC */ +#endif /* CONFIG_SND_SOC_TI_EDMA_PCM */ #endif /* __EDMA_PCM_H__ */ diff --git a/sound/soc/omap/n810.c b/sound/soc/ti/n810.c similarity index 100% rename from sound/soc/omap/n810.c rename to sound/soc/ti/n810.c diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/ti/omap-abe-twl6040.c similarity index 100% rename from sound/soc/omap/omap-abe-twl6040.c rename to sound/soc/ti/omap-abe-twl6040.c diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/ti/omap-dmic.c similarity index 100% rename from sound/soc/omap/omap-dmic.c rename to sound/soc/ti/omap-dmic.c diff --git a/sound/soc/omap/omap-dmic.h b/sound/soc/ti/omap-dmic.h similarity index 100% rename from sound/soc/omap/omap-dmic.h rename to sound/soc/ti/omap-dmic.h diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/ti/omap-hdmi.c similarity index 100% rename from sound/soc/omap/omap-hdmi-audio.c rename to sound/soc/ti/omap-hdmi.c diff --git a/sound/soc/omap/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h similarity index 100% rename from sound/soc/omap/omap-mcbsp-priv.h rename to sound/soc/ti/omap-mcbsp-priv.h diff --git a/sound/soc/omap/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c similarity index 100% rename from sound/soc/omap/omap-mcbsp-st.c rename to sound/soc/ti/omap-mcbsp-st.c diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c similarity index 100% rename from sound/soc/omap/omap-mcbsp.c rename to sound/soc/ti/omap-mcbsp.c diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/ti/omap-mcbsp.h similarity index 100% rename from sound/soc/omap/omap-mcbsp.h rename to sound/soc/ti/omap-mcbsp.h diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c similarity index 100% rename from sound/soc/omap/omap-mcpdm.c rename to sound/soc/ti/omap-mcpdm.c diff --git a/sound/soc/omap/omap-mcpdm.h b/sound/soc/ti/omap-mcpdm.h similarity index 100% rename from sound/soc/omap/omap-mcpdm.h rename to sound/soc/ti/omap-mcpdm.h diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/ti/omap-twl4030.c similarity index 100% rename from sound/soc/omap/omap-twl4030.c rename to sound/soc/ti/omap-twl4030.c diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/ti/omap3pandora.c similarity index 100% rename from sound/soc/omap/omap3pandora.c rename to sound/soc/ti/omap3pandora.c diff --git a/sound/soc/omap/osk5912.c b/sound/soc/ti/osk5912.c similarity index 100% rename from sound/soc/omap/osk5912.c rename to sound/soc/ti/osk5912.c diff --git a/sound/soc/omap/rx51.c b/sound/soc/ti/rx51.c similarity index 100% rename from sound/soc/omap/rx51.c rename to sound/soc/ti/rx51.c diff --git a/sound/soc/omap/sdma-pcm.c b/sound/soc/ti/sdma-pcm.c similarity index 100% rename from sound/soc/omap/sdma-pcm.c rename to sound/soc/ti/sdma-pcm.c diff --git a/sound/soc/omap/sdma-pcm.h b/sound/soc/ti/sdma-pcm.h similarity index 85% rename from sound/soc/omap/sdma-pcm.h rename to sound/soc/ti/sdma-pcm.h index 34a7f90b2587..cb0627c8dd34 100644 --- a/sound/soc/omap/sdma-pcm.h +++ b/sound/soc/ti/sdma-pcm.h @@ -7,7 +7,7 @@ #ifndef __SDMA_PCM_H__ #define __SDMA_PCM_H__ -#if IS_ENABLED(CONFIG_SND_SDMA_SOC) +#if IS_ENABLED(CONFIG_SND_SOC_TI_SDMA_PCM) int sdma_pcm_platform_register(struct device *dev, char *txdmachan, char *rxdmachan); #else @@ -16,6 +16,6 @@ static inline int sdma_pcm_platform_register(struct device *dev, { return -ENODEV; } -#endif /* CONFIG_SND_SDMA_SOC */ +#endif /* CONFIG_SND_SOC_TI_SDMA_PCM */ #endif /* __SDMA_PCM_H__ */ -- 2.19.0.rc2

1 0

[alsa-devel] Applied "MAINTAINERS: Add entry for sound/soc/ti and update the OMAP audio support" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch MAINTAINERS: Add entry for sound/soc/ti and update the OMAP audio support has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From ca1c4d6535249ad43068834687f78d0db82d9e2e Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:35 +0200 Subject: [PATCH] MAINTAINERS: Add entry for sound/soc/ti and update the OMAP audio support The sound/soc/davinci and omap directories are merged under sound/soc/ti. Add myself as maintainer and update the OMAP audio support section with the new path and file names. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- MAINTAINERS | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index ef17863af710..a6068f1f4b81 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10710,7 +10710,10 @@ M: Jarkko Nikula <jarkko.nikula(a)bitmer.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) L: linux-omap(a)vger.kernel.org S: Maintained -F: sound/soc/omap/ +F: sound/soc/ti/omap* +F: sound/soc/ti/rx51.c +F: sound/soc/ti/n810.c +F: sound/soc/ti/sdma-pcm.* OMAP CLOCK FRAMEWORK SUPPORT M: Paul Walmsley <paul(a)pwsan.com> @@ -14737,6 +14740,12 @@ F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt F: drivers/clk/keystone/sci-clk.c F: drivers/reset/reset-ti-sci.c +Texas Instruments ASoC drivers +M: Peter Ujfalusi <peter.ujfalusi(a)ti.com> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Maintained +F: sound/soc/ti/ + THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER M: Hans Verkuil <hverkuil(a)xs4all.nl> L: linux-media(a)vger.kernel.org -- 2.19.0.rc2

1 0

[alsa-devel] Applied "ARM: OMAP1: Makefile: Update for new MCBSP Kconfig option" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch ARM: OMAP1: Makefile: Update for new MCBSP Kconfig option has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c27ace2e95a29c3b359123363d4f88864452917d Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:36 +0200 Subject: [PATCH] ARM: OMAP1: Makefile: Update for new MCBSP Kconfig option The MCBSP config option has been changed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- arch/arm/mach-omap1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index e8ccf51c6f29..a7e9c6d19fb5 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -8,7 +8,7 @@ obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \ serial.o devices.o dma.o fb.o obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o -ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) +ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),) obj-y += mcbsp.o endif -- 2.19.0.rc2

1 0

[alsa-devel] Applied "ARM: OMAP2: Update for new MCBSP Kconfig option" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch ARM: OMAP2: Update for new MCBSP Kconfig option has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 558eb0bfb271323cfd9f864f34d3253a65f352dd Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:37 +0200 Subject: [PATCH] ARM: OMAP2: Update for new MCBSP Kconfig option The MCBSP config option has been changed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/pdata-quirks.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 01377c292db4..899c60fac159 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common) obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common) obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common) -ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) +ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),) obj-y += mcbsp.o endif diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 9fec5f84bf77..8a5b6ed4ec36 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -524,7 +524,7 @@ void omap_auxdata_legacy_init(struct device *dev) dev->platform_data = &twl_gpio_auxdata; } -#if IS_ENABLED(CONFIG_SND_OMAP_SOC_MCBSP) +#if IS_ENABLED(CONFIG_SND_SOC_OMAP_MCBSP) static struct omap_mcbsp_platform_data mcbsp_pdata; static void __init omap3_mcbsp_init(void) { @@ -572,7 +572,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0", &am35xx_emac_pdata), /* McBSP modules with sidetone core */ -#if IS_ENABLED(CONFIG_SND_OMAP_SOC_MCBSP) +#if IS_ENABLED(CONFIG_SND_SOC_OMAP_MCBSP) OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49022000, "49022000.mcbsp", &mcbsp_pdata), OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49024000, "49024000.mcbsp", &mcbsp_pdata), #endif -- 2.19.0.rc2

1 0

[alsa-devel] Applied "ARM: davinci: dm365-evm: Update for the new ASoC Kcofnig options" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch ARM: davinci: dm365-evm: Update for the new ASoC Kcofnig options has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 4d8c1e7efb9f915034c3dba2bc85ed1f8509ae0c Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:38 +0200 Subject: [PATCH] ARM: davinci: dm365-evm: Update for the new ASoC Kcofnig options The codec selection config options for DMA365 has been changed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- arch/arm/mach-davinci/board-dm365-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 8143756ff38b..09e439d4abf5 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -794,9 +794,9 @@ static __init void dm365_evm_init(void) /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); -#ifdef CONFIG_SND_DM365_AIC3X_CODEC +#ifdef CONFIG_SND_SOC_DM365_AIC3X_CODEC dm365_init_asp(); -#elif defined(CONFIG_SND_DM365_VOICE_CODEC) +#elif defined(CONFIG_SND_SOC_DM365_VOICE_CODEC) dm365_init_vc(); #endif dm365_init_rtc(); -- 2.19.0.rc2

1 0

[alsa-devel] Applied "ARM: omap2plus_defconfig: Update the audio options" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch ARM: omap2plus_defconfig: Update the audio options has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3162b05fb74cd107b2a66f20485c62514b20048f Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:39 +0200 Subject: [PATCH] ARM: omap2plus_defconfig: Update the audio options Use the new options for default audio support and enable Nokia n900 audio as well. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- arch/arm/configs/omap2plus_defconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 6491419b1dad..2274e45623f9 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -381,13 +381,13 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m -CONFIG_SND_EDMA_SOC=m -CONFIG_SND_AM33XX_SOC_EVM=m -CONFIG_SND_OMAP_SOC=m -CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m -CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m -CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m -CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_DAVINCI_MCASP=m +CONFIG_SND_SOC_NOKIA_RX51=m +CONFIG_SND_SOC_OMAP_HDMI=m +CONFIG_SND_SOC_OMAP_ABE_TWL6040=m +CONFIG_SND_SOC_OMAP3_PANDORA=m +CONFIG_SND_SOC_OMAP3_TWL4030=m CONFIG_SND_SOC_CPCAP=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m -- 2.19.0.rc2

1 0

[alsa-devel] Applied "ARM: omap1_defconfig: Do not select ASoC by default" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch ARM: omap1_defconfig: Do not select ASoC by default has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From eab5b50a13de4717cad5eda3d26d889f2f4ea37d Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:40 +0200 Subject: [PATCH] ARM: omap1_defconfig: Do not select ASoC by default No audio support is enabled by default via ASoC, disable the code as well. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- arch/arm/configs/omap1_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index 72f4bc83f467..cfc00b0961ec 100644 --- a/arch/arm/configs/omap1_defconfig +++ b/arch/arm/configs/omap1_defconfig @@ -175,8 +175,6 @@ CONFIG_SND_PCM_OSS=y # CONFIG_SND_VERBOSE_PROCFS is not set CONFIG_SND_DUMMY=y CONFIG_SND_USB_AUDIO=y -CONFIG_SND_SOC=y -CONFIG_SND_OMAP_SOC=y # CONFIG_USB_HID is not set CONFIG_USB=y CONFIG_USB_PHY=y -- 2.19.0.rc2

1 0

[alsa-devel] Applied "ARM: davinci_all_defconfig: Update the audio options" to the asoc tree
by Mark Brown 18 Dec '18

18 Dec '18

The patch ARM: davinci_all_defconfig: Update the audio options has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 41e95652ee225f121d38916d8d6849e3c15a924a Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Date: Mon, 17 Dec 2018 14:21:41 +0200 Subject: [PATCH] ARM: davinci_all_defconfig: Update the audio options Use the new options for default audio support. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Tony Lindgren <tony(a)atomide.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- arch/arm/configs/davinci_all_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 07b2eadac3dd..207962a656a2 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -167,8 +167,9 @@ CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m -CONFIG_SND_EDMA_SOC=m -CONFIG_SND_DA850_SOC_EVM=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_DAVINCI_MCASP=m +CONFIG_SND_SOC_DAVINCI_EVM=m CONFIG_SND_SIMPLE_CARD=m CONFIG_HID=m CONFIG_HID_A4TECH=m -- 2.19.0.rc2

1 0