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

[alsa-devel] [PATCH alsa-lib v2 0/6] pcm: hw: optimization for v2.0.14 of PCM protocol/interface
by Takashi Sakamoto 30 Jun '17

30 Jun '17

Hi, This patchset is a revised version of my previous one: [PATCH alsa-lib 00/12] pcm: hw: optimization for v2.0.14 of PCM protocol/interface http://mailman.alsa-project.org/pipermail/alsa-devel/2017-June/122392.html Changes: - add a helper function, 'query_status_and_control_data()' to update appl_ptr in user space. - rename 'query_state()' to 'query_status_data()' - reduce two patches. - aggregate some patches for querying control data. I did quick mesurement by execute aplay on x86 machine with. 1. With Intel HDA driver with usual configuration. ``` poll([{fd=4, events=POLLOUT|POLLERR|POLLNVAL}], 1, -1) = 1 ([{fd=4, revents=POLLOUT}]) ioctl(4, SNDRV_PCM_IOCTL_HWSYNC, 0) = 0 read(3, "a\23IH\205\177z\257\276]\346\237\313\220L\5\337V\363\351\216\17\346s\22\245-yb\312\37D"..., 16384) = 16384 ioctl(4, SNDRV_PCM_IOCTL_HWSYNC, 0) = 0 poll([{fd=4, events=POLLOUT|POLLERR|POLLNVAL}], 1, -1) = 1 ([{fd=4, revents=POLLOUT}]) ``` 2. With Intel HDA driver with 'sync_ptr_ioctl' option to hw PCM plugin. ``` poll([{fd=4, events=POLLOUT|POLLERR|POLLNVAL}], 1, -1) = 1 ([{fd=4, revents=POLLOUT}]) ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55fe03539f80) = 0 ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55fe03539f80) = 0 ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55fe03539f80) = 0 ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55fe03539f80) = 0 read(3, "Rz\vB\v|A\275\356`\201)\335i3\r}\21Q^\30\324'\r'\375l\235&\3330\2"..., 16384) = 16384 ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55fe03539f80) = 0 ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55fe03539f80) = 0 ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55fe03539f80) = 0 poll([{fd=4, events=POLLOUT|POLLERR|POLLNVAL}], 1, -1) = 1 ([{fd=4, revents=POLLOUT}]) ``` 3. With Fireworks driver with a patch for snd-firewire-lib to add SNDRV_PCM_INFO_SYNC_APPLPTR support[1]. ``` poll([{fd=4, events=POLLOUT|POLLERR|POLLNVAL}], 1, -1) = 1 ([{fd=4, revents=POLLOUT}]) ioctl(4, SNDRV_PCM_IOCTL_HWSYNC, 0) = 0 ioctl(4, SNDRV_PCM_IOCTL_SYNC_PTR, 0x55b647ec9c00) = 0 read(3, "|\n*\336\322\252*&\377\312\372&\276\333.\207\21\343\362\3\5\363\201\266\3421lZ;\\\22*"..., 24576) = 24576 ioctl(4, SNDRV_PCM_IOCTL_HWSYNC, 0) = 0 poll([{fd=4, events=POLLOUT|POLLERR|POLLNVAL}], 1, -1) = 1 ([{fd=4, revents=POLLOUT}]) ``` We can see this optimization reduces some ioctl calls in case 3. This is due to status data mapping. [1] Below. diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index f8c2765..04fb3df 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -160,7 +160,8 @@ int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s, SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_JOINT_DUPLEX | SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID; + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_SYNC_APPLPTR; /* SNDRV_PCM_INFO_BATCH */ hw->periods_min = 2; Takashi Sakamoto (6): pcm: hw: add a helper function to query status/control data pcm: hw: add a helper function just to query status data pcm: hw: add a helper function to request hwsync without side-effects pcm: hw: add a helper function to issue appl_ptr without side-effects pcm: hw: add a helper function to issue avail_min without side-effects pcm: hw: remove superfluous code to call of SNDRV_PCM_IOCTL_SYNC_PTR in snd_pcm_hw_forward() src/pcm/pcm_hw.c | 116 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 30 deletions(-) -- 2.11.0

2 7

[alsa-devel] [PATCH alsa-lib] pcm: hw: minor refactoring for initialization of control data
by Takashi Sakamoto 30 Jun '17

30 Jun '17

At failure of control data mapping, alsa-lib goes to fallback mode. In this mode, a buffer is kept in user space and executes ioctl(2) with SNDRV_PCM_IOCTL_SYNC_PTR for the buffer to synchronize the control data. In current implementation, no helper function is used for initialize the control data. This commit use an proper helper function instead of a direct call of ioctl(2). Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- src/pcm/pcm_hw.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index e0931577..f03bc589 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -957,11 +957,9 @@ static int map_status_and_control_data(snd_pcm_t *pcm, bool force_fallback) snd_pcm_set_appl_ptr(pcm, &hw->mmap_control->appl_ptr, hw->fd, SNDRV_PCM_MMAP_OFFSET_CONTROL); if (hw->mmap_control_fallbacked) { - if (ioctl(hw->fd, SNDRV_PCM_IOCTL_SYNC_PTR, hw->sync_ptr) < 0) { - err = -errno; - SYSMSG("SNDRV_PCM_IOCTL_SYNC_PTR failed (%i)", err); + err = sync_ptr1(hw, 0); + if (err < 0) return err; - } } return 0; -- 2.11.0

2 1

[alsa-devel] [PATCH] alsalib: topology: Add support for new widget types
by Liam Girdwood 30 Jun '17

30 Jun '17

Add topology support for new DSP widget types. This allows the new widgets to be added to the driver and firmware DAPM graphs. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- Kernel part now upstream in Mark's ASoC for-next branch. include/sound/asoc.h | 10 +++++++++- src/topology/dapm.c | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/sound/asoc.h b/include/sound/asoc.h index 082c5429..0f5d9f9a 100644 --- a/include/sound/asoc.h +++ b/include/sound/asoc.h @@ -70,7 +70,15 @@ #define SND_SOC_TPLG_DAPM_DAI_IN 13 #define SND_SOC_TPLG_DAPM_DAI_OUT 14 #define SND_SOC_TPLG_DAPM_DAI_LINK 15 -#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK +#define SND_SOC_TPLG_DAPM_BUFFER 16 +#define SND_SOC_TPLG_DAPM_SCHEDULER 17 +#define SND_SOC_TPLG_DAPM_EFFECT 18 +#define SND_SOC_TPLG_DAPM_SIGGEN 19 +#define SND_SOC_TPLG_DAPM_SRC 20 +#define SND_SOC_TPLG_DAPM_ASRC 21 +#define SND_SOC_TPLG_DAPM_ENCODER 22 +#define SND_SOC_TPLG_DAPM_DECODER 23 +#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DECODER /* Header magic number and string sizes */ #define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */ diff --git a/src/topology/dapm.c b/src/topology/dapm.c index 6af750b9..66892a66 100644 --- a/src/topology/dapm.c +++ b/src/topology/dapm.c @@ -38,6 +38,14 @@ static const struct map_elem widget_map[] = { {"dai_in", SND_SOC_TPLG_DAPM_DAI_IN}, {"dai_out", SND_SOC_TPLG_DAPM_DAI_OUT}, {"dai_link", SND_SOC_TPLG_DAPM_DAI_LINK}, + {"buffer", SND_SOC_TPLG_DAPM_BUFFER}, + {"scheduler", SND_SOC_TPLG_DAPM_SCHEDULER}, + {"effect", SND_SOC_TPLG_DAPM_EFFECT}, + {"siggen", SND_SOC_TPLG_DAPM_SIGGEN}, + {"src", SND_SOC_TPLG_DAPM_SRC}, + {"asrc", SND_SOC_TPLG_DAPM_ASRC}, + {"encoder", SND_SOC_TPLG_DAPM_ENCODER}, + {"decoder", SND_SOC_TPLG_DAPM_DECODER}, }; static int lookup_widget(const char *w) -- 2.11.0

2 3

[alsa-devel] [asoc:topic/intel 40/40] sound/soc/intel/skylake/../common/sst-dsp-priv.h:63:42: warning: 'struct sst_pdata' declared inside parameter list will not be visible outside of this definition or declaration
by kbuild test robot 30 Jun '17

30 Jun '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: bdd0384a5ada8bb5745e5f29c10a5ba88827efad commit: bdd0384a5ada8bb5745e5f29c10a5ba88827efad [40/40] ASoC: Intel: Skylake: Add support to read firmware registers config: x86_64-randconfig-x015-201726 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout bdd0384a5ada8bb5745e5f29c10a5ba88827efad # save the attached .config to linux build tree make ARCH=x86_64 All warnings (new ones prefixed by >>): In file included from sound/soc/intel/skylake/skl-debug.c:23:0: >> sound/soc/intel/skylake/../common/sst-dsp-priv.h:63:42: warning: 'struct sst_pdata' declared inside parameter list will not be visible outside of this definition or declaration int (*init)(struct sst_dsp *sst, struct sst_pdata *pdata); ^~~~~~~~~ vim +63 sound/soc/intel/skylake/../common/sst-dsp-priv.h a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 47 u32 (*read)(void __iomem *addr, u32 offset); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 48 void (*write64)(void __iomem *addr, u32 offset, u64 value); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 49 u64 (*read64)(void __iomem *addr, u32 offset); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 50 a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 51 /* DSP I/DRAM IO */ a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 52 void (*ram_read)(struct sst_dsp *sst, void *dest, void __iomem *src, a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 53 size_t bytes); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 54 void (*ram_write)(struct sst_dsp *sst, void __iomem *dest, void *src, a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 55 size_t bytes); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 56 a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 57 void (*dump)(struct sst_dsp *); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 58 a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 59 /* IRQ handlers */ a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 60 irqreturn_t (*irq_handler)(int irq, void *context); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 61 a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 62 /* SST init and free */ a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 @63 int (*init)(struct sst_dsp *sst, struct sst_pdata *pdata); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 64 void (*free)(struct sst_dsp *sst); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 65 a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 66 /* FW module parser/loader */ a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 67 int (*parse_fw)(struct sst_fw *sst_fw); a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 68 }; a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 69 a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 70 /* a4b12990 sound/soc/intel/sst-dsp-priv.h Mark Brown 2014-03-12 71 * Audio DSP memory offsets and addresses. :::::: The code at line 63 was first introduced by commit :::::: a4b12990b68079290ab62799035afe175b4bdc23 Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next :::::: TO: Mark Brown <broonie(a)linaro.org> :::::: CC: Mark Brown <broonie(a)linaro.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:topic/drm 2/2] drivers/gpu//drm/bridge/adv7511/adv7511_audio.c:210:2: error: unknown field 'get_dai_id' specified in initializer
by kbuild test robot 30 Jun '17

30 Jun '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/drm head: 7204e97685634813d8456f1900b7f38fa7701e60 commit: 7204e97685634813d8456f1900b7f38fa7701e60 [2/2] drm: adv7511_audio: Add .get_dai_id callback to map port number to dai id config: x86_64-randconfig-x004-201726 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout 7204e97685634813d8456f1900b7f38fa7701e60 # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): >> drivers/gpu//drm/bridge/adv7511/adv7511_audio.c:210:2: error: unknown field 'get_dai_id' specified in initializer .get_dai_id = adv7511_hdmi_i2s_get_dai_id, ^ >> drivers/gpu//drm/bridge/adv7511/adv7511_audio.c:210:16: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .get_dai_id = adv7511_hdmi_i2s_get_dai_id, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu//drm/bridge/adv7511/adv7511_audio.c:210:16: note: (near initialization for 'adv7511_codec_ops.hw_params') cc1: some warnings being treated as errors vim +/get_dai_id +210 drivers/gpu//drm/bridge/adv7511/adv7511_audio.c 204 } 205 206 static const struct hdmi_codec_ops adv7511_codec_ops = { 207 .hw_params = adv7511_hdmi_hw_params, 208 .audio_shutdown = audio_shutdown, 209 .audio_startup = audio_startup, > 210 .get_dai_id = adv7511_hdmi_i2s_get_dai_id, 211 }; 212 213 static struct hdmi_codec_pdata codec_data = { --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v3 0/4] [PATCH v3 0/4] Add debugfs support for skylake driver
by Guneshwor Singh 30 Jun '17

30 Jun '17

This series introduces debugfs support for skylake driver. It helps in debugging by providing module configurations which is loaded from topology. It also allows to read the firmware registers which are a part of SRAM memory area accessible by host CPU through a memory window. Changes in v3: - Change debugfs parent from debugfs root to ASoC platform component Changes in v2: - Re-ordered patch and squashed platform changes Guneshwor Singh (1): ASoC: Intel: Skylake: Add sram address to sst_addr structure Vinod Koul (2): ASoC: Intel: Skylake: Add debugfs support ASoC: Intel: Skylake: Debugfs facility to dump module config Vunny Sodhi (1): ASoC: Intel: Skylake: Add support to read firmware registers sound/soc/intel/common/sst-dsp-priv.h | 4 + sound/soc/intel/skylake/Makefile | 4 + sound/soc/intel/skylake/bxt-sst.c | 4 + sound/soc/intel/skylake/skl-debug.c | 268 +++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-pcm.c | 6 +- sound/soc/intel/skylake/skl-sst.c | 5 + sound/soc/intel/skylake/skl-topology.c | 3 + sound/soc/intel/skylake/skl.c | 2 + sound/soc/intel/skylake/skl.h | 26 ++++ 9 files changed, 321 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/skylake/skl-debug.c -- 2.13.0

3 6

[alsa-devel] [PATCH 0/5] Add debugfs support for skylake driver
by Guneshwor Singh 30 Jun '17

30 Jun '17

This series introduces debugfs support for skylake driver. It helps in debugging by providing module configurations which is loaded from topology. It also allows to read the firmware registers which are a part of SRAM memory area accessible by host CPU through a memory window. Guneshwor Singh (2): ASoC: Intel: bxtn: Assign sram address to sst structure ASoC: Intel: Skylake: Assign sram address to sst structure Sodhi, VunnyX (1): ASoC: Intel: Skylake: Add support to read firmware registers Vinod Koul (2): ASoC: Intel: Skylake: Add debugfs support ASoC: Intel: Skylake: Debugfs facility to dump module config sound/soc/intel/common/sst-dsp-priv.h | 4 + sound/soc/intel/skylake/Makefile | 4 + sound/soc/intel/skylake/bxt-sst.c | 4 + sound/soc/intel/skylake/skl-debug.c | 269 +++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-sst.c | 5 + sound/soc/intel/skylake/skl-topology.c | 3 + sound/soc/intel/skylake/skl.c | 5 + sound/soc/intel/skylake/skl.h | 26 ++++ 8 files changed, 320 insertions(+) create mode 100644 sound/soc/intel/skylake/skl-debug.c -- 2.13.0

3 7

[alsa-devel] [PATCH v3 0/4] Add debugfs support for skylake driver
by Guneshwor Singh 30 Jun '17

30 Jun '17

This series introduces debugfs support for skylake driver. It helps in debugging by providing module configurations which is loaded from topology. It also allows to read the firmware registers which are a part of SRAM memory area accessible by host CPU through a memory window. Changes in v3: - Change debugfs parent from debugfs root to ASoC platform component Changes in v2: - Re-ordered patch and squashed platform changes Guneshwor Singh (1): ASoC: Intel: Skylake: Add sram address to sst_addr structure Sodhi, VunnyX (1): ASoC: Intel: Skylake: Add support to read firmware registers Vinod Koul (2): ASoC: Intel: Skylake: Add debugfs support ASoC: Intel: Skylake: Debugfs facility to dump module config sound/soc/intel/common/sst-dsp-priv.h | 4 + sound/soc/intel/skylake/Makefile | 4 + sound/soc/intel/skylake/bxt-sst.c | 4 + sound/soc/intel/skylake/skl-debug.c | 268 +++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-pcm.c | 6 +- sound/soc/intel/skylake/skl-sst.c | 5 + sound/soc/intel/skylake/skl-topology.c | 3 + sound/soc/intel/skylake/skl.c | 2 + sound/soc/intel/skylake/skl.h | 26 ++++ 9 files changed, 321 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/skylake/skl-debug.c -- 2.13.0

3 7

[alsa-devel] [PATCH] drm: adv7511_audio: Add .get_dai_id callback to map port number to dai id
by John Stultz 30 Jun '17

30 Jun '17

ALSA SoC needs to know connected DAI ID for probing. Using the new audio-card-graph approach, ports/endpoints are used to describe how the links are connected. Unfortunately, since ports/endpoints are used as well for video linkages, there are some issues mixing the port ids to the two (video and audio) namespaces. To solve this issue, this patch adds new .get_dai_id callback on hdmi_codec_ops. The will assume that HDMI audio out will be connected to reg = <2>. This will then be remapped to the ALSA SoC side will as DAI 0. Allowing the adv7511's hdmi audio support to be used with the audio-card-graph. Credit to Kuninori Morimoto who's patch to dw-hdmi-i2s-audio.c was what this was mostly copy-pasted from. Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: Archit Taneja <architt(a)codeaurora.org> Cc: Mark Brown <broonie(a)kernel.org> Cc: Rob Herring <robh+dt(a)kernel.org> Cc: David Airlie <airlied(a)linux.ie> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Linux-ALSA <alsa-devel(a)alsa-project.org> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: John Stultz <john.stultz(a)linaro.org> --- .../bindings/display/bridge/adi,adv7511.txt | 8 ++++++++ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt b/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt index 00ea670..06668bc 100644 --- a/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt +++ b/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt @@ -78,6 +78,7 @@ graph bindings specified in Documentation/devicetree/bindings/graph.txt. remote endpoint phandle should be a reference to a valid mipi_dsi_host device node. - Video port 1 for the HDMI output +- Audio port 2 for the HDMI audio input Example @@ -112,5 +113,12 @@ Example remote-endpoint = <&hdmi_connector_in>; }; }; + + port@2 { + reg = <2>; + codec_endpoint: endpoint { + remote-endpoint = <&i2s0_cpu_endpoint>; + }; + }; }; }; diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c index cf92ebf..67469c2 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c @@ -11,6 +11,7 @@ #include <sound/hdmi-codec.h> #include <sound/pcm.h> #include <sound/soc.h> +#include <linux/of_graph.h> #include "adv7511.h" @@ -182,10 +183,31 @@ static void audio_shutdown(struct device *dev, void *data) { } +static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component, + struct device_node *endpoint) +{ + struct of_endpoint of_ep; + int ret; + + ret = of_graph_parse_endpoint(endpoint, &of_ep); + if (ret < 0) + return ret; + + /* + * HDMI sound should be located as reg = <2> + * Then, it is sound port 0 + */ + if (of_ep.port == 2) + return 0; + + return -EINVAL; +} + static const struct hdmi_codec_ops adv7511_codec_ops = { .hw_params = adv7511_hdmi_hw_params, .audio_shutdown = audio_shutdown, .audio_startup = audio_startup, + .get_dai_id = adv7511_hdmi_i2s_get_dai_id, }; static struct hdmi_codec_pdata codec_data = { -- 2.7.4

2 5

[alsa-devel] [PATCH] ASoC: ak4642: make arrays fs_list and ps_list static const
by Colin King 30 Jun '17

30 Jun '17

From: Colin Ian King <colin.king(a)canonical.com> Don't populate the arrays fs_list and ps_list on the stack but make them static const. Makes the object code smaller: Before: text data bss dec hex filename 12084 4888 64 17036 428c sound/soc/codecs/ak4642.o After: text data bss dec hex filename 11883 5032 64 16979 4253 sound/soc/codecs/ak4642.o Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/ak4642.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 23ab9646c351..66de8a2013a6 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -433,7 +433,7 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int ak4642_set_mcko(struct snd_soc_codec *codec, u32 frequency) { - u32 fs_list[] = { + static const u32 fs_list[] = { [0] = 8000, [1] = 12000, [2] = 16000, @@ -447,7 +447,7 @@ static int ak4642_set_mcko(struct snd_soc_codec *codec, [14] = 29400, [15] = 44100, }; - u32 ps_list[] = { + static const u32 ps_list[] = { [0] = 256, [1] = 128, [2] = 64, -- 2.11.0

2 1