November 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v2 0/6] ASoC: Add HDA HDMI codec driver
by Vinod Koul 21 Nov '15

21 Nov '15

Hi all, This is second series of the HDA HDMI patches. This attempts to add HDA based HDMI driver and uses i915 component framework to interact with display for power up/down. The communication to codec is over HDA link If at all we need a change in interface, we can i915 interface which can be made transparent to users Due to dependency on already merged patches in ALSA tree, it would be best if this get merged thru ALSA tree Changes in v2: - remove infoframe open code and use video one - add pm on/off i915 triggers - add ext_dma_params struct Subhransu S. Prusty (6): ALSA: hdac: structure definition for ext_dma_params ASoC: hdac-hdmi: Add hdmi driver ASoC: hdac_hdmi: Add PM support for HDMI ASoC: hdac_hdmi: Add hdac hdmi dai ops ASoC: hdac_hdmi: Setup and start infoframe ASoC: hdac_hdmi: Use i915 component framework for PM include/sound/hdaudio_ext.h | 6 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hdmi.c | 659 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 672 insertions(+) create mode 100644 sound/soc/codecs/hdac_hdmi.c -- 2.4.3

4 9

[alsa-devel] [PATCH V2 0/3] add spba clock for fsl audio IP
by Shengjiu Wang 20 Nov '15

20 Nov '15

add spba clock for fsl audio IP Changes in v2 - spba is a optional clock, compatible with previous devicetree. - change the name from "dma" to "spba" Shengjiu Wang (3): ASoC: fsl_esai: spba clock is needed by esai device ASoC: fsl_spdif: spba clk is needed by spdif device ASoC: fsl_asrc: spba clock is needed by asrc device Documentation/devicetree/bindings/sound/fsl,asrc.txt | 2 ++ Documentation/devicetree/bindings/sound/fsl,esai.txt | 2 ++ Documentation/devicetree/bindings/sound/fsl,spdif.txt | 2 ++ sound/soc/fsl/fsl_asrc.c | 10 ++++++++++ sound/soc/fsl/fsl_asrc.h | 1 + sound/soc/fsl/fsl_esai.c | 12 ++++++++++++ sound/soc/fsl/fsl_spdif.c | 14 ++++++++++++++ 7 files changed, 43 insertions(+) -- 1.9.1

3 6

[alsa-devel] [PATCH 1/2] ASoC: Intel: Skylake: Update the rtd query
by Vinod Koul 20 Nov '15

20 Nov '15

sound card rtd was an array and was updated to a list so update the driver to use a list Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index 3f5a96b585b8..65c65d4c422c 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c @@ -35,12 +35,10 @@ static struct snd_soc_card skylake_audio_card; static inline struct snd_soc_dai *skl_get_codec_dai(struct snd_soc_card *card) { - int i; + struct snd_soc_pcm_runtime *rtd; - for (i = 0; i < card->num_rtd; i++) { - struct snd_soc_pcm_runtime *rtd; + list_for_each_entry(rtd, &card->rtd_list, list) { - rtd = card->rtd + i; if (!strncmp(rtd->codec_dai->name, SKL_NUVOTON_CODEC_DAI, strlen(SKL_NUVOTON_CODEC_DAI))) return rtd->codec_dai; -- 1.9.1

2 4

[alsa-devel] [asoc:topic/dai-link 2/2] sound/soc/fsl/fsl-asoc-card.c:418:9: error: 'struct snd_soc_card' has no member named 'rtd_list'
by kbuild test robot 20 Nov '15

20 Nov '15

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/dai-link head: 38f87d0172e485ce68a8e40e55afc0723ffa94f6 commit: 38f87d0172e485ce68a8e40e55afc0723ffa94f6 [2/2] ASoC: fsl-asoc-card: Update the rtd query config: i386-allmodconfig (attached as .config) reproduce: git checkout 38f87d0172e485ce68a8e40e55afc0723ffa94f6 # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): In file included from include/linux/clk.h:16:0, from sound/soc/fsl/fsl-asoc-card.c:13: sound/soc/fsl/fsl-asoc-card.c: In function 'fsl_asoc_card_late_probe': include/linux/kernel.h:813:27: error: 'struct snd_soc_pcm_runtime' has no member named 'list' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ include/linux/list.h:352:2: note: in expansion of macro 'container_of' container_of(ptr, type, member) ^ include/linux/list.h:363:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^ >> sound/soc/fsl/fsl-asoc-card.c:417:36: note: in expansion of macro 'list_first_entry' struct snd_soc_pcm_runtime *rtd = list_first_entry( ^ >> sound/soc/fsl/fsl-asoc-card.c:418:9: error: 'struct snd_soc_card' has no member named 'rtd_list' &card->rtd_list, struct snd_soc_pcm_runtime, list); ^ include/linux/kernel.h:813:49: note: in definition of macro 'container_of' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ include/linux/list.h:363:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^ >> sound/soc/fsl/fsl-asoc-card.c:417:36: note: in expansion of macro 'list_first_entry' struct snd_soc_pcm_runtime *rtd = list_first_entry( ^ In file included from include/linux/compiler.h:56:0, from include/linux/err.h:4, from include/linux/clk.h:15, from sound/soc/fsl/fsl-asoc-card.c:13: include/linux/compiler-gcc.h:158:2: error: 'struct snd_soc_pcm_runtime' has no member named 'list' __builtin_offsetof(a, b) ^ include/linux/stddef.h:16:32: note: in expansion of macro '__compiler_offsetof' #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) ^ include/linux/kernel.h:814:29: note: in expansion of macro 'offsetof' (type *)( (char *)__mptr - offsetof(type,member) );}) ^ include/linux/list.h:352:2: note: in expansion of macro 'container_of' container_of(ptr, type, member) ^ include/linux/list.h:363:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^ >> sound/soc/fsl/fsl-asoc-card.c:417:36: note: in expansion of macro 'list_first_entry' struct snd_soc_pcm_runtime *rtd = list_first_entry( ^ vim +418 sound/soc/fsl/fsl-asoc-card.c 411 return 0; 412 } 413 414 static int fsl_asoc_card_late_probe(struct snd_soc_card *card) 415 { 416 struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card); > 417 struct snd_soc_pcm_runtime *rtd = list_first_entry( > 418 &card->rtd_list, struct snd_soc_pcm_runtime, list); 419 struct snd_soc_dai *codec_dai = rtd->codec_dai; 420 struct codec_priv *codec_priv = &priv->codec_priv; 421 struct device *dev = card->dev; --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:topic/intel 43/43] include/linux/kernel.h:813:27: error: 'struct snd_soc_pcm_runtime' has no member named 'list'
by kbuild test robot 20 Nov '15

20 Nov '15

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: dcc2fa34956a1cc2b84415b9ce3bbef4ae1aceb0 commit: dcc2fa34956a1cc2b84415b9ce3bbef4ae1aceb0 [43/43] ASoC: Intel: Skylake: Update the rtd query config: i386-allmodconfig (attached as .config) reproduce: git checkout dcc2fa34956a1cc2b84415b9ce3bbef4ae1aceb0 # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): In file included from include/linux/list.h:8:0, from include/linux/module.h:9, from sound/soc/intel/boards/skl_nau88l25_ssm4567.c:21: sound/soc/intel/boards/skl_nau88l25_ssm4567.c: In function 'skl_get_codec_dai': >> include/linux/kernel.h:813:27: error: 'struct snd_soc_pcm_runtime' has no member named 'list' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ include/linux/list.h:352:2: note: in expansion of macro 'container_of' container_of(ptr, type, member) ^ include/linux/list.h:363:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^ include/linux/list.h:447:13: note: in expansion of macro 'list_first_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(rtd, &card->rtd_list, list) { ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:32: error: 'struct snd_soc_card' has no member named 'rtd_list' list_for_each_entry(rtd, &card->rtd_list, list) { ^ include/linux/kernel.h:813:49: note: in definition of macro 'container_of' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ include/linux/list.h:363:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^ include/linux/list.h:447:13: note: in expansion of macro 'list_first_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(rtd, &card->rtd_list, list) { ^ In file included from include/linux/compiler.h:56:0, from include/uapi/linux/stddef.h:1, from include/linux/stddef.h:4, from include/uapi/linux/posix_types.h:4, from include/uapi/linux/types.h:13, from include/linux/types.h:5, from include/linux/list.h:4, from include/linux/module.h:9, from sound/soc/intel/boards/skl_nau88l25_ssm4567.c:21: >> include/linux/compiler-gcc.h:158:2: error: 'struct snd_soc_pcm_runtime' has no member named 'list' __builtin_offsetof(a, b) ^ include/linux/stddef.h:16:32: note: in expansion of macro '__compiler_offsetof' #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) ^ include/linux/kernel.h:814:29: note: in expansion of macro 'offsetof' (type *)( (char *)__mptr - offsetof(type,member) );}) ^ include/linux/list.h:352:2: note: in expansion of macro 'container_of' container_of(ptr, type, member) ^ include/linux/list.h:363:2: note: in expansion of macro 'list_entry' list_entry((ptr)->next, type, member) ^ include/linux/list.h:447:13: note: in expansion of macro 'list_first_entry' for (pos = list_first_entry(head, typeof(*pos), member); \ ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(rtd, &card->rtd_list, list) { ^ In file included from include/linux/module.h:9:0, from sound/soc/intel/boards/skl_nau88l25_ssm4567.c:21: >> include/linux/list.h:448:11: error: 'struct snd_soc_pcm_runtime' has no member named 'list' &pos->member != (head); \ ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(rtd, &card->rtd_list, list) { ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:32: error: 'struct snd_soc_card' has no member named 'rtd_list' list_for_each_entry(rtd, &card->rtd_list, list) { ^ include/linux/list.h:448:24: note: in definition of macro 'list_for_each_entry' &pos->member != (head); \ ^ In file included from include/linux/list.h:8:0, from include/linux/module.h:9, from sound/soc/intel/boards/skl_nau88l25_ssm4567.c:21: >> include/linux/kernel.h:813:27: error: 'struct snd_soc_pcm_runtime' has no member named 'list' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ include/linux/list.h:352:2: note: in expansion of macro 'container_of' container_of(ptr, type, member) ^ include/linux/list.h:393:2: note: in expansion of macro 'list_entry' list_entry((pos)->member.next, typeof(*(pos)), member) ^ include/linux/list.h:449:13: note: in expansion of macro 'list_next_entry' pos = list_next_entry(pos, member)) ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(rtd, &card->rtd_list, list) { ^ include/linux/list.h:393:18: error: 'struct snd_soc_pcm_runtime' has no member named 'list' list_entry((pos)->member.next, typeof(*(pos)), member) ^ include/linux/kernel.h:813:49: note: in definition of macro 'container_of' const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^ include/linux/list.h:393:2: note: in expansion of macro 'list_entry' list_entry((pos)->member.next, typeof(*(pos)), member) ^ include/linux/list.h:449:13: note: in expansion of macro 'list_next_entry' pos = list_next_entry(pos, member)) ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(rtd, &card->rtd_list, list) { ^ In file included from include/linux/compiler.h:56:0, from include/uapi/linux/stddef.h:1, from include/linux/stddef.h:4, from include/uapi/linux/posix_types.h:4, from include/uapi/linux/types.h:13, from include/linux/types.h:5, from include/linux/list.h:4, from include/linux/module.h:9, from sound/soc/intel/boards/skl_nau88l25_ssm4567.c:21: >> include/linux/compiler-gcc.h:158:2: error: 'struct snd_soc_pcm_runtime' has no member named 'list' __builtin_offsetof(a, b) ^ include/linux/stddef.h:16:32: note: in expansion of macro '__compiler_offsetof' #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) ^ include/linux/kernel.h:814:29: note: in expansion of macro 'offsetof' (type *)( (char *)__mptr - offsetof(type,member) );}) ^ include/linux/list.h:352:2: note: in expansion of macro 'container_of' container_of(ptr, type, member) ^ include/linux/list.h:393:2: note: in expansion of macro 'list_entry' list_entry((pos)->member.next, typeof(*(pos)), member) ^ include/linux/list.h:449:13: note: in expansion of macro 'list_next_entry' pos = list_next_entry(pos, member)) ^ >> sound/soc/intel/boards/skl_nau88l25_ssm4567.c:40:2: note: in expansion of macro 'list_for_each_entry' list_for_each_entry(rtd, &card->rtd_list, list) { ^ vim +813 include/linux/kernel.h ^1da177e Linus Torvalds 2005-04-16 807 * @ptr: the pointer to the member. ^1da177e Linus Torvalds 2005-04-16 808 * @type: the type of the container struct this is embedded in. ^1da177e Linus Torvalds 2005-04-16 809 * @member: the name of the member within the struct. ^1da177e Linus Torvalds 2005-04-16 810 * ^1da177e Linus Torvalds 2005-04-16 811 */ ^1da177e Linus Torvalds 2005-04-16 812 #define container_of(ptr, type, member) ({ \ ^1da177e Linus Torvalds 2005-04-16 @813 const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ^1da177e Linus Torvalds 2005-04-16 814 (type *)( (char *)__mptr - offsetof(type,member) );}) ^1da177e Linus Torvalds 2005-04-16 815 b9d4f426 Arnaud Lacombe 2011-07-25 816 /* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ :::::: The code at line 813 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2 :::::: TO: Linus Torvalds <torvalds(a)ppc970.osdl.org> :::::: CC: Linus Torvalds <torvalds(a)ppc970.osdl.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: rt5645: Add dmi_system_id "Google Wizpig"
by Bard Liao 20 Nov '15

20 Nov '15

Add platform specific data for Wizpig project. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5645.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 177f6d0..2c4f06f 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3565,6 +3565,13 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Edgar"), }, }, + { + .ident = "Google Wizpig", + .callback = strago_quirk_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_NAME, "Wizpig"), + }, + }, { } }; -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] Applied "ASoC: es8328: Fix shifts for mixer switches" to the asoc tree
by Mark Brown 20 Nov '15

20 Nov '15

The patch ASoC: es8328: Fix shifts for mixer switches 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 113b0b20fc123bc522ded68ea710d789b0415ebe Mon Sep 17 00:00:00 2001 From: John Keeping <john(a)metanate.com> Date: Fri, 20 Nov 2015 11:42:22 +0000 Subject: [PATCH] ASoC: es8328: Fix shifts for mixer switches These are all off by one; the playback and bypass switches are the top two bits of the registers, which are at shifts 7 and 6 not 8 and 7. Signed-off-by: John Keeping <john(a)metanate.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/es8328.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c index 969e337dc17c..84f5eb07a91b 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -205,18 +205,18 @@ static const struct snd_kcontrol_new es8328_right_line_controls = /* Left Mixer */ static const struct snd_kcontrol_new es8328_left_mixer_controls[] = { - SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL17, 8, 1, 0), - SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL17, 7, 1, 0), - SOC_DAPM_SINGLE("Right Playback Switch", ES8328_DACCONTROL18, 8, 1, 0), - SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL18, 7, 1, 0), + SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL17, 7, 1, 0), + SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL17, 6, 1, 0), + SOC_DAPM_SINGLE("Right Playback Switch", ES8328_DACCONTROL18, 7, 1, 0), + SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL18, 6, 1, 0), }; /* Right Mixer */ static const struct snd_kcontrol_new es8328_right_mixer_controls[] = { - SOC_DAPM_SINGLE("Left Playback Switch", ES8328_DACCONTROL19, 8, 1, 0), - SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL19, 7, 1, 0), - SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL20, 8, 1, 0), - SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL20, 7, 1, 0), + SOC_DAPM_SINGLE("Left Playback Switch", ES8328_DACCONTROL19, 7, 1, 0), + SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL19, 6, 1, 0), + SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL20, 7, 1, 0), + SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL20, 6, 1, 0), }; static const char * const es8328_pga_sel[] = { -- 2.6.2

1 0

[alsa-devel] [PATCH] ASoC: ak4613: tidyup vendor prefix from ak4613 to asahi-kasei
by Kuninori Morimoto 20 Nov '15

20 Nov '15

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> a3af0c65("ASoC: ak4613: add single-end optional property for IN/OUT pins") added IN/OUT pin single-end optional property, but it used "ak4613" as vendor prefix. This patch fixup to asahi-kasei. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- Documentation/devicetree/bindings/sound/ak4613.txt | 16 ++++++++-------- sound/soc/codecs/ak4613.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/ak4613.txt b/Documentation/devicetree/bindings/sound/ak4613.txt index 3cf63e7..1783f9e 100644 --- a/Documentation/devicetree/bindings/sound/ak4613.txt +++ b/Documentation/devicetree/bindings/sound/ak4613.txt @@ -8,14 +8,14 @@ Required properties: - reg : The chip select number on the I2C bus Optional properties: -- ak4613,in1-single-end : Boolean. Indicate input / output pins are single-ended. -- ak4613,in2-single-end rather than differential. -- ak4613,out1-single-end -- ak4613,out2-single-end -- ak4613,out3-single-end -- ak4613,out4-single-end -- ak4613,out5-single-end -- ak4613,out6-single-end +- asahi-kasei,in1-single-end : Boolean. Indicate input / output pins are single-ended. +- asahi-kasei,in2-single-end rather than differential. +- asahi-kasei,out1-single-end +- asahi-kasei,out2-single-end +- asahi-kasei,out3-single-end +- asahi-kasei,out4-single-end +- asahi-kasei,out5-single-end +- asahi-kasei,out6-single-end Example: diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 62c08a6..647f69d 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -464,14 +464,14 @@ static void ak4613_parse_of(struct ak4613_priv *priv, /* Input 1 - 2 */ for (i = 0; i < 2; i++) { - snprintf(prop, sizeof(prop), "ak4613,in%d-single-end", i + 1); + snprintf(prop, sizeof(prop), "asahi-kasei,in%d-single-end", i + 1); if (!of_get_property(np, prop, NULL)) priv->ic |= 1 << i; } /* Output 1 - 6 */ for (i = 0; i < 6; i++) { - snprintf(prop, sizeof(prop), "ak4613,out%d-single-end", i + 1); + snprintf(prop, sizeof(prop), "asahi-kasei,out%d-single-end", i + 1); if (!of_get_property(np, prop, NULL)) priv->oc |= 1 << i; } -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: rsnd: tidyup void* cast for 64bit compiler
by Kuninori Morimoto 20 Nov '15

20 Nov '15

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> 64bit compiler indicates this without this patch linux/sound/soc/sh/rcar/core.c: In function 'rsnd_probe': linux/sound/soc/sh/rcar/core.c:1002:16: warning: cast from pointer to\ integer of different size [-Wpointer-to-int-cast] Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/core.c | 2 +- sound/soc/sh/rcar/rsnd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 8dceae4..81a6bdb 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -999,7 +999,7 @@ static int rsnd_probe(struct platform_device *pdev) } priv->pdev = pdev; - priv->flags = (u32)of_id->data; + priv->flags = (unsigned long)of_id->data; spin_lock_init(&priv->lock); /* diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index ae69670..42d2ac5 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -379,7 +379,7 @@ struct rsnd_priv { struct platform_device *pdev; spinlock_t lock; - u32 flags; + unsigned long flags; #define RSND_GEN_MASK (0xF << 0) #define RSND_GEN1 (1 << 0) #define RSND_GEN2 (2 << 0) -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: Atmel: ClassD: supports mono audio
by Songjun Wu 20 Nov '15

20 Nov '15

Modify the code to support mono audio. Signed-off-by: Songjun Wu <songjun.wu(a)atmel.com> --- sound/soc/atmel/atmel-classd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c index 2f5190b..10ac47d 100644 --- a/sound/soc/atmel/atmel-classd.c +++ b/sound/soc/atmel/atmel-classd.c @@ -106,7 +106,7 @@ static const struct snd_pcm_hardware atmel_classd_hw = { .rates = ATMEL_CLASSD_RATES, .rate_min = 8000, .rate_max = 96000, - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .buffer_bytes_max = 64 * 1024, .period_bytes_min = 256, @@ -145,7 +145,7 @@ static const struct snd_soc_dai_ops atmel_classd_cpu_dai_ops = { static struct snd_soc_dai_driver atmel_classd_cpu_dai = { .playback = { - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = ATMEL_CLASSD_RATES, .formats = SNDRV_PCM_FMTBIT_S16_LE,}, @@ -171,9 +171,13 @@ atmel_classd_platform_configure_dma(struct snd_pcm_substream *substream, return -EINVAL; } + if (params_channels(params) == 1) + slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; + else + slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + slave_config->direction = DMA_MEM_TO_DEV; slave_config->dst_addr = dd->phy_base + CLASSD_THR; - slave_config->dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; slave_config->dst_maxburst = 1; slave_config->src_maxburst = 1; slave_config->device_fc = false; @@ -486,7 +490,7 @@ static struct snd_soc_dai_driver atmel_classd_codec_dai = { .name = ATMEL_CLASSD_CODEC_DAI_NAME, .playback = { .stream_name = "Playback", - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = ATMEL_CLASSD_RATES, .formats = SNDRV_PCM_FMTBIT_S16_LE, -- 1.7.9.5

2 1