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

[alsa-devel] [PATCH 0/8] ASoC: Intel: Skylake: Add Broxton DSP support
by Vinod Koul 31 Mar '16

31 Mar '16

Broxton DSP is similar to Skylake with similar DSP capabilities but differs in a few subtle ways. It doesn't have Code Loader DMA and use HDA DMA. The DSP power up/down routines are also bit different in the two platforms. Also the FW needs to be downloaded only once and not on every power sequence as it is cached by DSP in protected memory region. All these changes for new DSP ops are abstracted in a new BXTN-dsp ops file. This patch series starts with moving code around to prepare for new code and also fix whitespace issue in existing code. Since we have different loader ops we move Skylake ones to newly defined ops. Then we add device IDs and lastly the broxton ops. Jayachandran B (1): ASoC: Intel: Skylake: Unstatify skl_dsp_enable_core Jeeja KP (4): ASoC: Intel: add dmabuffer to common sst_dsp ASoC: Intel: Skylake: Move Skylake dsp ops & loader ops ASoC: hdac_hdmi: Add broxton device ID ASoC: Intel: Bxtn: Add Broxton DSP support Senthilnathan Veppur (1): ASoC: Intel: Bxtn: Add Broxton PCI ID Vinod Koul (2): ASoC: Intel: Skylake: Move module id defines ASoC: Intel: Skylake: Fix whitepsace issues sound/soc/codecs/hdac_hdmi.c | 1 + sound/soc/intel/Kconfig | 1 + sound/soc/intel/common/sst-dsp-priv.h | 1 + sound/soc/intel/skylake/Makefile | 2 +- sound/soc/intel/skylake/bxt-sst.c | 328 +++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-messages.c | 182 +++++++++++++++++- sound/soc/intel/skylake/skl-sst-dsp.c | 14 +- sound/soc/intel/skylake/skl-sst-dsp.h | 20 +- sound/soc/intel/skylake/skl-sst.c | 3 - sound/soc/intel/skylake/skl.c | 7 + sound/soc/intel/skylake/skl.h | 12 +- 11 files changed, 549 insertions(+), 22 deletions(-) create mode 100644 sound/soc/intel/skylake/bxt-sst.c -- 1.9.1

2 16

[alsa-devel] [PATCH] ASoC: wm8960: Add I2C dependency
by Fabio Estevam 30 Mar '16

30 Mar '16

Building wm8960 codec without I2C support causes build issues: sound/soc/codecs/wm8960.c:1388:1: warning: data definition has no type or storage class module_i2c_driver(wm8960_i2c_driver); ^ sound/soc/codecs/wm8960.c:1388:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int] sound/soc/codecs/wm8960.c:1388:1: warning: parameter names (without types) in function declaration sound/soc/codecs/wm8960.c:1378:26: warning: 'wm8960_i2c_driver' defined but not used [-Wunused-variable] static struct i2c_driver wm8960_i2c_driver = { , so add the I2C dependency to fix this problem. Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index ba835b6..09e8c39 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -911,6 +911,7 @@ config SND_SOC_WM8955 config SND_SOC_WM8960 tristate "Wolfson Microelectronics WM8960 CODEC" + depends on I2C config SND_SOC_WM8961 tristate -- 1.9.1

2 1

[alsa-devel] [RFC][PATCH] ALSA: firewire-lib: support Linux tracing to dump a part of packet data
by Takashi Sakamoto 30 Mar '16

30 Mar '16

When audio and music units have some quirks in their sequence of packet, it's really hard for non-owners to identify the quirks. To handle the quirks, developers need a dump for sequence of packets at least, however it's difficult to users who have no knowledge and equipment for this purpose. This commit adds tracepoints for this situation. When users encounter the issue, they can dump a part of packet data via Linux tracing framework as long as using drivers in ALSA firewire stack. This commit adds 'snd-firewire-lib' subsystem with 'in_packet' and 'out_packet' events. In the events, the content of CIP headers, the number of included quadlets and the index of packet managed by this module are recorded per packet. This is a sample: $ trace-cmd record -e snd_firewire_lib:out_packet -e snd_firewire_lib:in_packet /sys/kernel/tracing/events/snd_firewire_lib/out_packet/filter /sys/kernel/tracing/events/snd_firewire_lib/in_packet/filter Hit Ctrl^C to stop recording ^C $ trace-cmd report trace.dat ... <idle>-0 [002] 40398.221702: out_packet: 00070008 9001427a: 058: 31 <idle>-0 [002] 40398.221703: in_packet: 01020010 9001ffff: 002: 15 <idle>-0 [002] 40398.221703: out_packet: 00070010 9001ffff: 002: 32 <idle>-0 [002] 40398.223679: in_packet: 010b0010 900157e4: 090: 16 <idle>-0 [002] 40398.223681: out_packet: 00070010 900157e4: 058: 33 <idle>-0 [002] 40398.223681: in_packet: 010b0018 9001714f: 090: 17 ... One line represent one packet. The legend for the last four fields is: - The first quadlet of CIP header - The second quadlet of CIP header - The number of included quadlets - The index of packet inner buffer maintained by this module Currently, when detecting packet discontinuity, this module stops packet streaming. This is reasonable to packet streaming implementation. However, to identify the quirks, packet streaming should continue to dump enough sequence of packet. This commit adds a condition statement and a marker for this purpose. --- sound/firewire/Makefile | 3 ++ sound/firewire/amdtp-stream-trace.h | 68 +++++++++++++++++++++++++++++++++++++ sound/firewire/amdtp-stream.c | 17 +++++++++- 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 sound/firewire/amdtp-stream-trace.h diff --git a/sound/firewire/Makefile b/sound/firewire/Makefile index 003c090..0ee1fb1 100644 --- a/sound/firewire/Makefile +++ b/sound/firewire/Makefile @@ -1,3 +1,6 @@ +# To find a header included by define_trace.h. +CFLAGS_amdtp-stream.o := -I$(src) + snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \ fcp.o cmp.o amdtp-stream.o amdtp-am824.o snd-isight-objs := isight.o diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h new file mode 100644 index 0000000..316d495 --- /dev/null +++ b/sound/firewire/amdtp-stream-trace.h @@ -0,0 +1,68 @@ +/* + * amdtp-stream-trace.h - Linux tracing application for ALSA AMDTP engine + * + * Copyright (c) 2016 Takashi Sakamoto + * Licensed under the terms of the GNU General Public License, version 2. + */ + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM snd_firewire_lib + +#if !defined(_AMDTP_STREAM_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) +#define _AMDTP_STREAM_TRACE_H + +#include <linux/tracepoint.h> + +TRACE_EVENT(in_packet, + TP_PROTO(u32 cip_header0, u32 cip_header1, unsigned int payload_quadlets, unsigned int index), + TP_ARGS(cip_header0, cip_header1, payload_quadlets, index), + TP_STRUCT__entry( + __field(u32, cip_header0) + __field(u32, cip_header1) + __field(unsigned int, payload_quadlets) + __field(unsigned int, index) + ), + TP_fast_assign( + __entry->cip_header0 = cip_header0; + __entry->cip_header1 = cip_header1; + __entry->payload_quadlets = payload_quadlets; + __entry->index = index; + ), + TP_printk( + "%08x %08x: %03u: %02u", + __entry->cip_header0, + __entry->cip_header1, + __entry->payload_quadlets, + __entry->index) +); + +TRACE_EVENT(out_packet, + TP_PROTO(u32 cip_header0, u32 cip_header1, unsigned int payload_quadlets, unsigned int index), + TP_ARGS(cip_header0, cip_header1, payload_quadlets, index), + TP_STRUCT__entry( + __field(u32, cip_header0) + __field(u32, cip_header1) + __field(unsigned int, payload_quadlets) + __field(unsigned int, index) + ), + TP_fast_assign( + __entry->cip_header0 = cip_header0; + __entry->cip_header1 = cip_header1; + __entry->payload_quadlets = payload_quadlets; + __entry->index = index; + ), + TP_printk( + "%08x %08x: %03u: %02u", + __entry->cip_header0, + __entry->cip_header1, + __entry->payload_quadlets, + __entry->index) +); + +#endif + +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE amdtp-stream-trace +#include <trace/define_trace.h> diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index ed29026..152375f 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -15,6 +15,10 @@ #include <sound/pcm_params.h> #include "amdtp-stream.h" +/* Always support tracepoints enabled by Linux tracing subsystem. */ +#define CREATE_TRACE_POINTS +#include "amdtp-stream-trace.h" + #define TICKS_PER_CYCLE 3072 #define CYCLES_PER_SECOND 8000 #define TICKS_PER_SECOND (TICKS_PER_CYCLE * CYCLES_PER_SECOND) @@ -426,6 +430,10 @@ static int handle_out_packet(struct amdtp_stream *s, unsigned int data_blocks, s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff; payload_length = 8 + data_blocks * 4 * s->data_block_quadlets; + + trace_out_packet(be32_to_cpu(buffer[0]), be32_to_cpu(buffer[1]), + payload_length / 4, s->packet_index); + if (queue_out_packet(s, payload_length, false) < 0) return -EIO; @@ -451,6 +459,9 @@ static int handle_in_packet(struct amdtp_stream *s, cip_header[0] = be32_to_cpu(buffer[0]); cip_header[1] = be32_to_cpu(buffer[1]); + trace_in_packet(cip_header[0], cip_header[1], payload_quadlets, + s->packet_index); + /* * This module supports 'Two-quadlet CIP header with SYT field'. * For convenience, also check FMT field is AM824 or not. @@ -523,7 +534,11 @@ static int handle_in_packet(struct amdtp_stream *s, dev_err(&s->unit->device, "Detect discontinuity of CIP: %02X %02X\n", s->data_block_counter, data_block_counter); - return -EIO; + if (!trace_in_packet_enabled()) + return -EIO; + + /* To identifying this situation. */ + trace_in_packet(0xffffffff, 0xffffffff, 999, 99); } pcm_frames = s->process_data_blocks(s, buffer + 2, *data_blocks, &syt); -- 2.7.3

3 5

[alsa-devel] [PATCH] ASoC: rt5677: Avoid duplicate the same test in each switch case
by Axel Lin 30 Mar '16

30 Mar '16

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/rt5677.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 33e290b..b3f1db5 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -1241,60 +1241,46 @@ static int rt5677_dmic_use_asrc(struct snd_soc_dapm_widget *source, regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting); asrc_setting = (asrc_setting & RT5677_AD_STO1_CLK_SEL_MASK) >> RT5677_AD_STO1_CLK_SEL_SFT; - if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC && - asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC) - return 1; break; case 10: regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting); asrc_setting = (asrc_setting & RT5677_AD_STO2_CLK_SEL_MASK) >> RT5677_AD_STO2_CLK_SEL_SFT; - if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC && - asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC) - return 1; break; case 9: regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting); asrc_setting = (asrc_setting & RT5677_AD_STO3_CLK_SEL_MASK) >> RT5677_AD_STO3_CLK_SEL_SFT; - if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC && - asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC) - return 1; break; case 8: regmap_read(rt5677->regmap, RT5677_ASRC_5, &asrc_setting); asrc_setting = (asrc_setting & RT5677_AD_STO4_CLK_SEL_MASK) >> RT5677_AD_STO4_CLK_SEL_SFT; - if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC && - asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC) - return 1; break; case 7: regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting); asrc_setting = (asrc_setting & RT5677_AD_MONOL_CLK_SEL_MASK) >> RT5677_AD_MONOL_CLK_SEL_SFT; - if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC && - asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC) - return 1; break; case 6: regmap_read(rt5677->regmap, RT5677_ASRC_6, &asrc_setting); asrc_setting = (asrc_setting & RT5677_AD_MONOR_CLK_SEL_MASK) >> RT5677_AD_MONOR_CLK_SEL_SFT; - if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC && - asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC) - return 1; break; default: - break; + return 0; } + if (asrc_setting >= RT5677_CLK_SEL_I2S1_ASRC && + asrc_setting <= RT5677_CLK_SEL_I2S6_ASRC) + return 1; + return 0; } -- 2.1.4

2 1

[alsa-devel] Applied "ASoC: wm8960: Depends on I2C" to the asoc tree
by Mark Brown 30 Mar '16

30 Mar '16

The patch ASoC: wm8960: Depends on I2C has been applied to the asoc tree at git://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 3fcdfc9dad07c2a6ea19dfb98a2151cd86d06c6a Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Wed, 30 Mar 2016 11:02:49 -0700 Subject: [PATCH] ASoC: wm8960: Depends on I2C Now that this is directly user selectable it needs to care about its dependencies. Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 196101b2eab5..3ebf29bc87d3 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -910,6 +910,7 @@ config SND_SOC_WM8955 config SND_SOC_WM8960 tristate "Wolfson Microelectronics WM8960 CODEC" + depends on I2C config SND_SOC_WM8961 tristate -- 2.8.0.rc3

1 0

[alsa-devel] [PATCH 0/2] ALSA: bebob/fireworks: remove module parameters to reduce maintenance work
by Takashi Sakamoto 30 Mar '16

30 Mar '16

Hi, This patchset removes some module parameters from ALSA bebob and fireworks driver. These two modules have three parameters for users to assign preferable number and strings to a sound card as some modules in ALSA kernel land. However, they're not used so widely, and practically I suspect their advantages. To simplify and unify the shape of modules in ALSA firewire stack, I'd like to remove them. Takashi Sakamoto (2): ALSA: bebob: remove module parameters to reduce maintenance work ALSA: fireworks: remove module parameters to reduce maintenance work sound/firewire/bebob/bebob.c | 49 +++++------------------------------- sound/firewire/bebob/bebob.h | 1 - sound/firewire/fireworks/fireworks.c | 43 +++---------------------------- sound/firewire/fireworks/fireworks.h | 1 - 4 files changed, 10 insertions(+), 84 deletions(-) -- 2.7.3

2 4

[alsa-devel] [PATCH] ASoC: nau8825: reduce standby power consumption
by John Hsu 30 Mar '16

30 Mar '16

Decrease internal clock frequency for power saving when standby. But clock divider needs restore when MCLK as system clock in playback. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 3e7bee2..4c8572c 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1116,6 +1116,9 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_MCLK); regmap_update_bits(regmap, NAU8825_REG_FLL6, NAU8825_DCO_EN, 0); + /* MCLK not changed by clock tree */ + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, 0); ret = nau8825_mclk_prepare(nau8825, freq); if (ret) return ret; @@ -1126,6 +1129,13 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, NAU8825_DCO_EN); regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_VCO); + /* Decrease the VCO frequency for power saving */ + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, 0xf); + regmap_update_bits(regmap, NAU8825_REG_FLL1, + NAU8825_FLL_RATIO_MASK, 0x10); + regmap_update_bits(regmap, NAU8825_REG_FLL6, + NAU8825_SDM_EN, NAU8825_SDM_EN); if (nau8825->mclk_freq) { clk_disable_unprepare(nau8825->mclk); nau8825->mclk_freq = 0; -- 2.6.4

2 3

[alsa-devel] [PATCH v8 0/6] Implement generic ASoC HDMI codec and use it in tda998x
by Jyri Sarha 30 Mar '16

30 Mar '16

The only change to v7: Remove the unused variable from tda998x_configure_audio(). Not much have changed since v6[1] patch series. I did everything addressed every comment, mostly by robots :), to previous series and there was one bug fixed in tda998x side. Unless there is any significant reaction to this series, I am going to put it to rest for a while now. I have other things to do. There is currently two other patch series[2][3] that depend on the first two (ALSA-) patches of this series. The third ("ASoC: hdmi-codec: Add audio abort() callback for video side to use") is currently not used and can be dropped if so decided. The rest depends on those the first two and adds hdmi-audio support for Beaglebone-black. Best regards, Jyri [1] "[PATCH v6 0/6] Implement generic ASoC HDMI codec and use it in tda998x" http://mailman.alsa-project.org/pipermail/alsa-devel/2016-March/105524.html [2] "[PATCH v6 00/10] ASoC: Add mediatek HDMI codec support" by Philipp Zabel http://mailman.alsa-project.org/pipermail/alsa-devel/2016-March/105509.html [3] "[RFC v2 0/6] sti: add audio interface to the hdmi driver" http://mailman.alsa-project.org/pipermail/alsa-devel/2016-January/103374.ht… and "[PATCH v4 0/6] add IEC958 channel status control helpers" http://mailman.alsa-project.org/pipermail/alsa-devel/2016-March/105502.html by Arnaud Pouliquen Changes since v7 * "drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding" - Remove the unused "int ret" variable from tda998x_configure_audio() Changes since v6 * "ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders" - Add "Acked-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com>" and "Tested-by: Philipp Zabel <p.zabel(a)pengutronix.de>", no other changes * "ALSA: pcm: add IEC958 channel status helper for hw_param" - Added kernel-doc for snd_pcm_create_iec958_consumer_hw_params() * "drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding" - Use PTR_ERR_OR_ZERO() in tda998x_audio_codec_init() - Fix possible uninitialized use of 'size' in tda998x_get_audio_ports() - Store audio configuration in tda998x_audio_hw_params() instead of tda998x_configure_audio(). Changes since v5 - Rebased on top of the latest drm-next branch - Allow 32 bit samplewidth in snd_pcm_create_iec958_consumer() and snd_pcm_create_iec958_consumer_hw_params() - Propose new simpler DT binding for tda998x audio - Squash tda998x audio DT binding together with hdmi-codec integration Changes since RFC v4, - Rebased on top of the latest drm-next branch - Split the hdmi-codec abort functionality into a separate patch for better visibility of what it is all about - This does not affect the tda998x patches as the abort functionality is not used - Drop S18_3* formats from I2S_FORMATS and add a comment about formats not supported by HDMI Changes since RFC v3, ASoC side: - Add "ALSA: pcm: add IEC958 channel status helper for hw_params" - Add "tda998x: Improve tda998x_configure_audio() audio related pdata" - use snd_pcm_create_iec958_consumer_hw_params() to construct the stream header - Remove set_clk() callback from hdmi-codec. It is not needed for now. - Refer to stream header in AIF as specified in HDMI standard - Set current_stream to NULL only after video side audio_shutdown() has been called. Avoid potential race if video side attempts to abort audio at the same time. - No need to have video side device pointer in the hdmi codec's pdata as it is found from dev->parent. - Fix hdmi-codec enum: DAI_ID_I2C > DAI_ID_I2S - Improve audio_startup API comment - Make improved checkpatch happy - BUG_ON > WARN_ON - put */ ending the block comment to a separate line DRM side: - Fix tda998x get_eld() locking - Change tda998x audio parameters in pdata to more generic, that can be readily used in tda998x_audio_config() - Rename and restructure audio port related private data members to be more descriptive - Require audio configuration trough ASoC hdmi-codec if HDMI audio is configured trough DT binding. DTS: - Increase McASP fifo usage form 1 to 32 Jyri Sarha (6): ALSA: pcm: add IEC958 channel status helper for hw_params ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders ASoC: hdmi-codec: Add audio abort() callback for video side to use drm/i2c: tda998x: Improve tda998x_configure_audio() audio related pdata drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding ARM: dts: am335x-boneblack: Add HDMI audio support .../devicetree/bindings/display/bridge/tda998x.txt | 18 + arch/arm/boot/dts/am335x-boneblack.dts | 71 +++- drivers/gpu/drm/i2c/Kconfig | 1 + drivers/gpu/drm/i2c/tda998x_drv.c | 275 ++++++++++++-- include/drm/i2c/tda998x.h | 24 +- include/dt-bindings/display/tda998x.h | 7 + include/sound/hdmi-codec.h | 104 ++++++ include/sound/pcm_iec958.h | 2 + sound/core/pcm_iec958.c | 65 +++- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdmi-codec.c | 411 +++++++++++++++++++++ 12 files changed, 914 insertions(+), 72 deletions(-) create mode 100644 include/dt-bindings/display/tda998x.h create mode 100644 include/sound/hdmi-codec.h create mode 100644 sound/soc/codecs/hdmi-codec.c -- 1.9.1

5 14

[alsa-devel] [PATCH] ASoC: nau8825: fix interrupt fails and unstable after resume
by John Hsu 30 Mar '16

30 Mar '16

Modify power management function to sync behavior with set bias function. And codec needs to config interrupt setting again to recover interrupt. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 70 ++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 106c391..b8af46b 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1204,6 +1204,42 @@ static int nau8825_set_sysclk(struct snd_soc_codec *codec, int clk_id, return nau8825_configure_sysclk(nau8825, clk_id, freq); } +static void nau8825_configure_interrupt(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + + /* IRQ Output Enable */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_OUTPUT_EN, NAU8825_IRQ_OUTPUT_EN); + + /* Enable internal VCO needed for interruptions */ + nau8825_configure_sysclk(nau8825, NAU8825_CLK_INTERNAL, 0); + + /* Enable ADC needed for interrupts + * It is the same as force_enable_pin("ADC") we do later + */ + regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_ADC, NAU8825_ENABLE_ADC); + + /* Chip needs one FSCLK cycle in order to generate interrupts, + * as we cannot guarantee one will be provided by the system. Turning + * master mode on then off enables us to generate that FSCLK cycle + * with a minimum of contention on the clock bus. + */ + regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_MASTER); + regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_SLAVE); +} + +static void nau8825_resume_setup(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + + nau8825_configure_interrupt(nau8825); + nau8825_restart_jack_detection(regmap); +} + static int nau8825_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { @@ -1233,6 +1269,8 @@ static int nau8825_set_bias_level(struct snd_soc_codec *codec, "Failed to sync cache: %d\n", ret); return ret; } + if (nau8825->irq) + nau8825_resume_setup(nau8825); } break; @@ -1346,29 +1384,9 @@ static int nau8825_read_device_properties(struct device *dev, static int nau8825_setup_irq(struct nau8825 *nau8825) { - struct regmap *regmap = nau8825->regmap; int ret; - /* IRQ Output Enable */ - regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, - NAU8825_IRQ_OUTPUT_EN, NAU8825_IRQ_OUTPUT_EN); - - /* Enable internal VCO needed for interruptions */ - nau8825_configure_sysclk(nau8825, NAU8825_CLK_INTERNAL, 0); - - /* Enable ADC needed for interrupts */ - regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, - NAU8825_ENABLE_ADC, NAU8825_ENABLE_ADC); - - /* Chip needs one FSCLK cycle in order to generate interrupts, - * as we cannot guarantee one will be provided by the system. Turning - * master mode on then off enables us to generate that FSCLK cycle - * with a minimum of contention on the clock bus. - */ - regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, - NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_MASTER); - regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, - NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_SLAVE); + nau8825_configure_interrupt(nau8825); ret = devm_request_threaded_irq(nau8825->dev, nau8825->irq, NULL, nau8825_interrupt, IRQF_TRIGGER_LOW | IRQF_ONESHOT, @@ -1440,24 +1458,22 @@ static int nau8825_i2c_remove(struct i2c_client *client) #ifdef CONFIG_PM_SLEEP static int nau8825_suspend(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); struct nau8825 *nau8825 = dev_get_drvdata(dev); + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(nau8825->dapm); - disable_irq(client->irq); + disable_irq(nau8825->irq); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); regcache_cache_only(nau8825->regmap, true); - regcache_mark_dirty(nau8825->regmap); return 0; } static int nau8825_resume(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); struct nau8825 *nau8825 = dev_get_drvdata(dev); regcache_cache_only(nau8825->regmap, false); - regcache_sync(nau8825->regmap); - enable_irq(client->irq); + enable_irq(nau8825->irq); return 0; } -- 2.6.4

2 2

[alsa-devel] [PATCH V2 1/1] ASoC: add a core API to share more product information with user space
by han.lu＠intel.com 30 Mar '16

30 Mar '16

From: "Lu, Han" <han.lu(a)intel.com> Add a core API to share more machine/board information, for user space apps such as PA and UCM to distinguish various products. Previously on ASoC, the card short name, driver name and long name are all the same as the machine driver name. For example, on T100TA: $ cat /proc/asound/cards 0 [bytcr-rt5640]: bytcr-rt5640 - bytcr-rt5640 bytcr-rt5640 The patch adds more board information: card driver name ---> machine driver name card short name ---> DMI_PRODUCT_NAME or DMI_BOARD_NAME card long name and card component ---> short name:driver name(:DMI_SYS_VENDOR if available)(:firmware name if available) For example, on T100TA: $ cat /proc/asound/cards 0 [T100TA ]: bytcr-rt5640 - T100TA T100TA:bytcr-rt5640:ASUSTek COMPUTER INC.:intel/fw_ sst_0f28.bin $ amixer -c0 info Card hw:0 'T100TA'/'T100TA:bytcr-rt5640:ASUSTek COMPUTER INC.:intel/fw_ sst_0f28.bin' Mixer name : '' Components : 'T100TA:bytcr-rt5640:ASUSTek COMPUTER INC.:intel/fw_s st_0f28.bin' Controls : 256 Simple ctrls : 228 Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/include/sound/soc.h b/include/sound/soc.h index 02b4a21..4e80444 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -486,6 +486,9 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream); int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, unsigned int dai_fmt); +int snd_soc_set_card_names(struct snd_soc_card *card, const char *board, + const char *vendor, const char *firmware); + /* Utility functions to get clock rates from various things */ int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params); diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 032a2e7..3162f3e 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -152,6 +152,8 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { {} }; +static struct snd_soc_card byt_rt5640_card; + static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) { int ret; @@ -159,6 +161,19 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) struct snd_soc_card *card = runtime->card; const struct snd_soc_dapm_route *custom_map; int num_routes; + const char *board, *vendor; + struct sst_acpi_mach *mach = byt_rt5640_card.dev->platform_data; + + /* Add machine/board information for userspace */ + board = dmi_get_system_info(DMI_PRODUCT_NAME); + if (!board) + board = dmi_get_system_info(DMI_BOARD_NAME); + vendor = dmi_get_system_info(DMI_SYS_VENDOR); + ret = snd_soc_set_card_names(card, board, vendor, mach->fw_filename); + if (ret < 0) { + dev_err(card->dev, "unable to set card names\n"); + return ret; + } card->dapm.idle_bias_off = true; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d2e62b15..ab8e7e3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1828,6 +1828,58 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, } EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt); +/** + * snd_soc_set_card_names() - Set the shortname/drivername/longname/component + * of a ASoC card. + * @card: The card to set names + * @board: The board name or product name + * @vendor: The vendor name + * @firmware: The firmware name + * + * This function adds more information for the userspace to distinguish + * different products: + * card driver name ---> machine driver name + * card short name ---> DMI_PRODUCT_NAME or DMI_BOARD_NAME + * card long name and + * card component ---> short name:driver name(:DMI_SYS_VENDOR) + * (:firmware name) + * + * Returns 0 on success, otherwise a negative error code. + */ +int snd_soc_set_card_names(struct snd_soc_card *card, const char *board, + const char *vendor, const char *firmware) +{ + int ret = 0; + char *name; + + if (!board) { + dev_err(card->dev, "ASoC: the board/product name is empty!\n"); + return -1; + } + /* card driver name */ + card->driver_name = card->name; + /* card short name */ + card->name = board; + /* card long name / card component */ + name = kstrdup(card->name, GFP_KERNEL); + if (!name) + return -ENOMEM; + strcat(name, ":"); + strcat(name, card->driver_name); + strcat(name, ":"); + if (vendor) + strcat(name, vendor); + strcat(name, ":"); + if (firmware) + strcat(name, firmware); + ret = snd_component_add(card->snd_card, name); + card->long_name = card->snd_card->components; + + kfree(name); + return ret; +} +EXPORT_SYMBOL_GPL(snd_soc_set_card_names); + static int snd_soc_instantiate_card(struct snd_soc_card *card) { struct snd_soc_codec *codec; -- 2.5.0

3 2