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

[alsa-devel] [PATCH 0/2] ASoC: cq93vc: enable compiling on COMPILE_TEST
by Kuninori Morimoto 05 Dec '16

05 Dec '16

Hi Lee, Mark Current cq93vc sound codec indicates that it has MFD_DAVINCI_VOICECODEC dependency, but it doesn't. This means we can compile it from non DAVINCE environment by COMPILE_TEST. These patches solve this issue. I tested this on ARCH=x86 + make allyesconfig, and ARCH=ARM + shmobile_defconfig + COMPILE_TEST. Kuninori Morimoto (2): mfd: davinci_voicecodec: tidyup header difinitions ASoC: cq93vc: remove MFD_DAVINCI_VOICECODEC dependency for CQ0093VC drivers/mfd/davinci_voicecodec.c | 1 + include/linux/mfd/davinci_voicecodec.h | 4 ---- sound/soc/codecs/Kconfig | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) -- 1.9.1

3 9

[alsa-devel] [alsa-utils] alsaucm should come with a man page
by Antonio Ospite 02 Dec '16

02 Dec '16

Hi, I used alsaucm to test mixer use cases for an Intel Baytrail tablet, I wanted to use bare alsa before bringing pulseaudio in, and it took some time to get my head around it. The output from the "alsaucm --help" is too terse, I had to look at the alsa-lib code[1] to see the possible IDENTIFIERs, and even then it was not clear to me that some operations, like for instance "list _devices", can only work after setting a _verb in the same _execution_, for instance this sequence doesn't work: # alsaucm -c bytcr-rt5640 set _verb HiFi # alsaucm -c bytcr-rt5640 list _devices But this command does: # alsaucm -c bytcr-rt5640 -b - <<EOM set _verb HiFi list _devces EOM Now that I know something more it makes sense: UCM just operates on mixer settings, it does not have its own external state. However, my point is that a man page explaining these things can make the life easier to new users. It would be better if alsa/UCM developers wrote the man page, but if no one steps up I guess I could draft a first version myself. Thanks, Antonio [1] http://git.alsa-project.org/?p=alsa-lib.git;a=blob;f=include/use-case.h -- Antonio Ospite http://ao2.it A: Because it messes up the order in which people normally read text. See http://en.wikipedia.org/wiki/Posting_style Q: Why is top-posting such a bad thing?

3 9

[alsa-devel] [PATCH v5 1/2] ASoC: samsung: Add DT bindings documentation for TM2 sound subsystem
by Sylwester Nawrocki 01 Dec '16

01 Dec '16

This patch adds DT binding documentation for Exnos5433 based TM2 and TM2E boards sound subsystem. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Changes since v4: - indentation changes. Changes since v2: - none. Changes since initial version: - dropped clocks, clock-names properties, instead properties from the CODEC node will be used, - property renames: 'samsung,model' -> 'model', 'samsung,i2s-controller' -> 'i2s-controller', 'samsung,speaker-amplifier' -> 'audio-amplifier', - added 'audio-codec' property. --- .../bindings/sound/samsung,tm2-audio.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt diff --git a/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt new file mode 100644 index 0000000..94442e5 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt @@ -0,0 +1,38 @@ +Samsung Exynos5433 TM2(E) audio complex with WM5110 codec + +Required properties: + + - compatible : "samsung,tm2-audio" + - model : the user-visible name of this sound complex + - audio-codec : the phandle of the wm5110 audio codec node, + as described in ../mfd/arizona.txt + - i2s-controller : the phandle of the I2S controller + - audio-amplifier : the phandle of the MAX98504 amplifier + - samsung,audio-routing : a list of the connections between audio components; + each entry is a pair of strings, the first being the + connection's sink, the second being the connection's + source; valid names for sources and sinks are the + WM5110's and MAX98504's pins and the jacks on the + board: HP, SPK, Main Mic, Sub Mic, Third Mic, + Headset Mic + - mic-bias-gpios : GPIO pin that enables the Main Mic bias regulator + + +Example: + +sound { + compatible = "samsung,tm2-audio"; + audio-codec = <&wm5110>; + i2s-controller = <&i2s0>; + audio-amplifier = <&max98504>; + mic-bias-gpios = <&gpr3 2 0>; + model = "wm5110"; + samsung,audio-routing = + "HP", "HPOUT1L", + "HP", "HPOUT1R", + "SPK", "SPKOUT", + "SPKOUT", "HPOUT2L", + "SPKOUT", "HPOUT2R", + "Main Mic", "MICBIAS2", + "IN1R", "Main Mic"; +}; -- 1.9.1

4 8

[alsa-devel] [PATCH v2] clkdev: add devm_of_clk_get()
by Kuninori Morimoto 01 Dec '16

01 Dec '16

This is based on devm_clk_get() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v1 -> v2 - added "static" and "inline" on header drivers/clk/clkdev.c | 26 ++++++++++++++++++++++++++ include/linux/clk.h | 7 +++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 89cc700..93a613b 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -55,6 +55,32 @@ struct clk *of_clk_get(struct device_node *np, int index) } EXPORT_SYMBOL(of_clk_get); +static void devm_of_clk_release(struct device *dev, void *res) +{ + clk_put(*(struct clk **)res); +} + +struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index) +{ + struct clk **ptr, *clk; + + ptr = devres_alloc(devm_of_clk_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + clk = of_clk_get(np, index); + if (!IS_ERR(clk)) { + *ptr = clk; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return clk; +} +EXPORT_SYMBOL(devm_of_clk_get); + static struct clk *__of_clk_get_by_name(struct device_node *np, const char *dev_id, const char *name) diff --git a/include/linux/clk.h b/include/linux/clk.h index a89ba4e..33cd540 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -502,6 +502,8 @@ struct of_phandle_args; #if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) struct clk *of_clk_get(struct device_node *np, int index); +struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index); struct clk *of_clk_get_by_name(struct device_node *np, const char *name); struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec); #else @@ -509,6 +511,11 @@ static inline struct clk *of_clk_get(struct device_node *np, int index) { return ERR_PTR(-ENOENT); } +static inline struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index) +{ + return ERR_PTR(-ENOENT); +} static inline struct clk *of_clk_get_by_name(struct device_node *np, const char *name) { -- 1.9.1

4 15

[alsa-devel] [PATCH 1/2] ASoC: rt298: fix jack type detect error
by Bard Liao 29 Nov '16

29 Nov '16

rt298_jack_detect may be called before card is instantiated. And snd_soc_dapm_force_enable_pin will not work in that case. So, update bit manually by regmap_update_bits. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt298.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index f80cfe4..dceffe9 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -249,6 +249,11 @@ static int rt298_jack_detect(struct rt298_priv *rt298, bool *hp, bool *mic) snd_soc_dapm_force_enable_pin(dapm, "LDO1"); snd_soc_dapm_sync(dapm); + regmap_update_bits(rt298->regmap, + RT298_POWER_CTRL1, 0x1001, 0); + regmap_update_bits(rt298->regmap, + RT298_POWER_CTRL2, 0x4, 0x4); + regmap_write(rt298->regmap, RT298_SET_MIC1, 0x24); msleep(50); -- 1.8.1.1.439.g50a6b54

2 2

[alsa-devel] [PATCH] ASoC: nau8825: erase pop noise by soft mute
by John Hsu 28 Nov '16

28 Nov '16

The patch is a solution to fix the following issue. Chrome OS Issue 54078: Chell_headphone pop back from S3 When the system resume from S3 and playing music, there is a pop noise happened. It looks like system changes the sound immediately from maximum volume to the volume configured by user in playback beginning. The sound signal changes sharply, and there is a DC offset in the signal to make pop noise. Therefore, the driver introduces the soft mute to avoid the side effect of the unstable signal. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/nau8825.h | 3 +++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index e643be9..3bcba14 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -754,8 +754,9 @@ static void nau8825_xtalk_measure(struct nau8825 *nau8825) nau8825->imp_rms[NAU8825_XTALK_HPR_R2L], nau8825->imp_rms[NAU8825_XTALK_HPL_R2L]); dev_dbg(nau8825->dev, "cross talk sidetone: %x\n", sidetone); + nau8825->sidetone = (sidetone << 8) | sidetone; regmap_write(nau8825->regmap, NAU8825_REG_DAC_DGAIN_CTRL, - (sidetone << 8) | sidetone); + nau8825->sidetone); nau8825_xtalk_clean(nau8825); nau8825->xtalk_state = NAU8825_XTALK_DONE; break; @@ -1334,6 +1335,50 @@ int nau8825_enable_jack_detect(struct snd_soc_codec *codec, } EXPORT_SYMBOL_GPL(nau8825_enable_jack_detect); +/** + * nau8825_soft_mute - provide soft mute function + * + * @component: codec component + * @mute: 1 for mute; 0 for unmute + * + * Enable soft mute to gradually lower DAC volume to zero; + * Soft unmute will gradually increase DAC volume to volume setting. + * We found that signal at beginning is not stable in some application. + * That signal changes sharply will make pop noise; but the steps of soft + * mute is not enough in codec to cover the change period. Thus, the driver + * deffers 20ms to do soft unmute for the pop noise issue. + */ +int nau8825_soft_mute(struct snd_soc_codec *codec, int mute) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + + if (mute) { + cancel_delayed_work(&nau8825->softmute_work); + /* Disable sidetone to avoid it affect the mute function */ + regmap_write(nau8825->regmap, NAU8825_REG_DAC_DGAIN_CTRL, 0); + regmap_update_bits(nau8825->regmap, NAU8825_REG_MUTE_CTRL, + NAU8825_DAC_SOFT_MUTE, NAU8825_DAC_SOFT_MUTE); + } else { + /* Defer 20ms to do soft unmute to skip the unstable signal */ + schedule_delayed_work(&nau8825->softmute_work, + msecs_to_jiffies(20)); + } + + return 0; +} +EXPORT_SYMBOL_GPL(nau8825_soft_mute); + +static void nau8825_unmute_deferred(struct work_struct *work) +{ + struct nau8825 *nau8825 = container_of(work, + struct nau8825, softmute_work.work); + + /* Restore sidetone */ + regmap_write(nau8825->regmap, NAU8825_REG_DAC_DGAIN_CTRL, + nau8825->sidetone); + regmap_update_bits(nau8825->regmap, NAU8825_REG_MUTE_CTRL, + NAU8825_DAC_SOFT_MUTE, 0); +} static bool nau8825_is_jack_inserted(struct regmap *regmap) { @@ -2150,6 +2195,7 @@ static int nau8825_set_sysclk(struct snd_soc_codec *codec, int clk_id, static int nau8825_resume_setup(struct nau8825 *nau8825) { + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(nau8825->dapm); struct regmap *regmap = nau8825->regmap; /* Close clock when jack type detection at manual mode */ @@ -2169,6 +2215,8 @@ static int nau8825_resume_setup(struct nau8825 *nau8825) NAU8825_JACK_DET_DB_BYPASS, NAU8825_JACK_DET_DB_BYPASS); regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_DIS_CTRL, NAU8825_IRQ_INSERT_DIS | NAU8825_IRQ_EJECT_DIS, 0); + /* Enable codec soft mute */ + nau8825_soft_mute(codec, 1); return 0; } @@ -2393,8 +2441,10 @@ static int nau8825_i2c_probe(struct i2c_client *i2c, */ nau8825->xtalk_state = NAU8825_XTALK_DONE; nau8825->xtalk_protect = false; + nau8825->sidetone = 0; sema_init(&nau8825->xtalk_sem, 1); INIT_WORK(&nau8825->xtalk_work, nau8825_xtalk_work); + INIT_DELAYED_WORK(&nau8825->softmute_work, nau8825_unmute_deferred); nau8825_print_device_properties(nau8825); diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 1c63e2a..e15ea5c 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -433,6 +433,7 @@ struct nau8825 { struct snd_soc_dapm_context *dapm; struct snd_soc_jack *jack; struct clk *mclk; + struct delayed_work softmute_work; struct work_struct xtalk_work; struct semaphore xtalk_sem; int irq; @@ -459,10 +460,12 @@ struct nau8825 { int xtalk_event_mask; bool xtalk_protect; int imp_rms[NAU8825_XTALK_IMM]; + int sidetone; }; int nau8825_enable_jack_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack); +int nau8825_soft_mute(struct snd_soc_codec *codec, int mute); #endif /* __NAU8825_H__ */ -- 2.6.4

2 3

[alsa-devel] [PATCH 0/8] ASoC: rsnd: DMA power fix and IOMMU support
by Kuninori Morimoto 22 Nov '16

22 Nov '16

Hi Mark These patches are for Renesas sound DMA. 1st feature is that it can power save for Audio DMAC. 2nd feature is that it can support IOMMU 1) - 5) : cleanup for 6) - 8) 6) - 7) : Audio DMAC power save 8) : IOMMU support Kuninori Morimoto (8): 1) ASoC: rsnd: depends on OF 2) ASoC: rsnd: remove non DT support for DMA 3) ASoC: rsnd: don't use devm_request_irq() for SSI 4) ASoC: rsnd: remove rsnd_dma_detach() 5) ASoC: rsnd: don't call unneeded of_node_put() on dma.c 6) ASoC: rsnd: add nolock_start/stop callback 7) ASoC: rsnd: Request/Release DMA channel each time 8) ASoC: rsnd: use dma_sync_single_for_xxx() for IOMMU sound/soc/sh/Kconfig | 1 + sound/soc/sh/rcar/core.c | 30 +++++++++++++- sound/soc/sh/rcar/dma.c | 304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- sound/soc/sh/rcar/rsnd.h | 18 ++++++-- sound/soc/sh/rcar/src.c | 2 +- sound/soc/sh/rcar/ssi.c | 22 +++++----- 6 files changed, 248 insertions(+), 129 deletions(-) Best regards --- Kuninori Morimoto

2 19

[alsa-devel] sound: bebop: strncmp length oddity
by Joe Perches 17 Nov '16

17 Nov '16

15 isn't the length of the string, is that really what's desired? linux/next/sound/firewire/bebob/bebop.c ----------------------------- static bool check_audiophile_booted(struct fw_unit *unit) { char name[24] = {0}; if (fw_csr_string(unit->directory, CSR_MODEL, name, sizeof(name)) < 0) return false; return strncmp(name, "FW Audiophile Bootloader", 15) != 0; }

4 3

[alsa-devel] Accurate delay reporting from dshare
by Alan Young 17 Nov '16

17 Nov '16

Hi, When the kernel reports current (playback) delay via a call to snd_pcm_status() or snd_pcm_delay() for a normal hardware PCM, then the delay value reported is the sum of space used in the ring buffer plus any delay reported from the underlying runtime driver. snd_pcm_dshare_status() and snd_pcm_dshare_delay() discard this refinement and simply report the use of some ring buffer. Why does it do this and how could the reporting be improved? In particular I am struggling to understand the relationship between a dshare instance's (view of a) ring buffer and the slave (hw) PCM's ring buffer. I understand that the *slowptr* configuration item can be set to get more accurate position updates as part of this reporting but I get the feeling that this will not on its own solve the problem. If it did then one could simply use the delay value reported by the slave PCM. The context of these questions is using dshare to expose 4 logical stereo devices on a platform using an ARM-based SoC with a single 8-channel hardware driver. I need to get the same level of delay report accuracy as I would do without using dshare. Alan.

2 11

[alsa-devel] [PATCH v5 0/7] ARM: ASoC: drm: sun8i: Add DE2 HDMI audio and video
by Jean-Francois Moine 17 Nov '16

17 Nov '16

This patchset series adds HDMI audio and video support to the Allwinner sun8i SoCs which include the display engine 2 (DE2). A first submission in January for video on the H3 could not enter into the mainline kernel due to the lack of license headers in Allwinner's sources. Recently, an announce about Tina OS for the R series https://www.youtube.com/watch?v=h7KD-6HblAU was followed by the upload of a new linux-3.4 source tree https://github.com/tinalinux/linux-3.4 with files containing GPL headers. Well, I don't know if these sources are really from Allwinner, but anyway, this is the opportunity to propose a new version of my DRM HDMI driver. v5: - add overlay plane - add audio support - add support for the A83T - add back the HDMI driver - many bug fixes v4: - drivers/clk/sunxi/Makefile was missing (Emil Velikov) v3: - add the hardware cursor - simplify and fix the DE2 init sequences - generation for all SUNXI SoCs (Andre Przywara) v2: - remove the HDMI driver - remarks from Chen-Yu Tsai and Russell King - DT documentation added Jean-Francois Moine (7): drm: sunxi: Add a basic DRM driver for Allwinner DE2 ASoC: sunxi: Add a simple HDMI CODEC drm: sunxi: add DE2 HDMI support ASoC: sunxi: Add sun8i I2S driver ARM: dts: sun8i-h3: add HDMI audio and video nodes ARM: dts: sun8i-h3: Add HDMI audio and video to the Banana Pi M2+ ARM: dts: sun8i-h3: Add HDMI audio and video to the Orange PI 2 .../devicetree/bindings/display/sunxi/hdmi.txt | 52 ++ .../bindings/display/sunxi/sunxi-de2.txt | 83 ++ .../devicetree/bindings/sound/sun4i-i2s.txt | 38 +- arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 17 + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 17 + arch/arm/boot/dts/sun8i-h3.dtsi | 67 ++ drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/sunxi/Kconfig | 29 + drivers/gpu/drm/sunxi/Makefile | 9 + drivers/gpu/drm/sunxi/de2_crtc.c | 475 +++++++++++ drivers/gpu/drm/sunxi/de2_crtc.h | 63 ++ drivers/gpu/drm/sunxi/de2_de.c | 591 +++++++++++++ drivers/gpu/drm/sunxi/de2_drm.h | 47 ++ drivers/gpu/drm/sunxi/de2_drv.c | 378 +++++++++ drivers/gpu/drm/sunxi/de2_hdmi.c | 396 +++++++++ drivers/gpu/drm/sunxi/de2_hdmi.h | 40 + drivers/gpu/drm/sunxi/de2_hdmi_io.c | 927 +++++++++++++++++++++ drivers/gpu/drm/sunxi/de2_hdmi_io.h | 25 + drivers/gpu/drm/sunxi/de2_plane.c | 119 +++ include/sound/sunxi_hdmi.h | 23 + sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sunxi-hdmi.c | 106 +++ sound/soc/sunxi/Kconfig | 8 + sound/soc/sunxi/Makefile | 3 + sound/soc/sunxi/sun8i-i2s.c | 700 ++++++++++++++++ 27 files changed, 4222 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/sunxi/hdmi.txt create mode 100644 Documentation/devicetree/bindings/display/sunxi/sunxi-de2.txt create mode 100644 drivers/gpu/drm/sunxi/Kconfig create mode 100644 drivers/gpu/drm/sunxi/Makefile create mode 100644 drivers/gpu/drm/sunxi/de2_crtc.c create mode 100644 drivers/gpu/drm/sunxi/de2_crtc.h create mode 100644 drivers/gpu/drm/sunxi/de2_de.c create mode 100644 drivers/gpu/drm/sunxi/de2_drm.h create mode 100644 drivers/gpu/drm/sunxi/de2_drv.c create mode 100644 drivers/gpu/drm/sunxi/de2_hdmi.c create mode 100644 drivers/gpu/drm/sunxi/de2_hdmi.h create mode 100644 drivers/gpu/drm/sunxi/de2_hdmi_io.c create mode 100644 drivers/gpu/drm/sunxi/de2_hdmi_io.h create mode 100644 drivers/gpu/drm/sunxi/de2_plane.c create mode 100644 include/sound/sunxi_hdmi.h create mode 100644 sound/soc/codecs/sunxi-hdmi.c create mode 100644 sound/soc/sunxi/sun8i-i2s.c -- 2.10.1

7 37