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

[alsa-devel] [PATCH v2 0/5] rt5651: Enable jack detection
by Carlo Caione 26 Oct '17

26 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> Patchset to support jack detection for the rt5651 codec on the JD* pins and enable it on the KIANO cherry-trail laptop. Changelog: v2: - Added quirks for the KIANO laptop - Extended support to JD1_2 and JD2 pins - Reworked quirk logic in the codec driver - Codec driver can now differentiate between headphone and headset (thank you Bard Liao) Carlo Caione (5): ASoC: rt5651: Enable jack detection on JD* pins ASoC: intel: byt: Add headset jack ASoC: intel: byt: Enable IN2 map quirk for a KIANO laptop ASoC: rt5651: Rework quirk logic ASoC: rt5651: Enable JD1_1 quirk for KIANO laptopt include/sound/rt5651.h | 8 ++ sound/soc/codecs/rt5651.c | 215 +++++++++++++++++++++++++++++++++- sound/soc/codecs/rt5651.h | 4 + sound/soc/intel/boards/bytcr_rt5651.c | 31 +++++ 4 files changed, 252 insertions(+), 6 deletions(-) -- 2.14.2

2 11

[alsa-devel] [PATCH] dt-bindings: sgtl5000: Remove leading zero from '@0a' notation
by Marco Franchi 26 Oct '17

26 Oct '17

Improve the binding example by removing the leading 0 from '@0a' notation, which fixes the following build warning: Warning (unit_address_format): Node /sgtl5000@0a unit name should not have leading 0s Signed-off-by: Marco Franchi <marco.franchi(a)nxp.com> --- Documentation/devicetree/bindings/sound/sgtl5000.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt index 7a73a9d..060cb4a 100644 --- a/Documentation/devicetree/bindings/sound/sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt @@ -37,7 +37,7 @@ VDDIO 1.8V 2.5V 3.3V Example: -codec: sgtl5000@0a { +codec: sgtl5000@a { compatible = "fsl,sgtl5000"; reg = <0x0a>; clocks = <&clks 150>; -- 2.7.4

2 2

Re: [alsa-devel] ALC700 in the Intel chipset
by Pshou 26 Oct '17

26 Oct '17

Hi alsa-devel ML: Could you merge this 000-alc700-intel.patch file to your ALSA driver? I changed "Intel debug" to "Intel Reference board". Best regards Pshou -----Original Message----- From: Takashi Iwai [mailto:tiwai@suse.de] Sent: Friday, September 01, 2017 4:13 PM To: Pshou Cc: CHLin; Kailang; Singh, Guneshwor O Subject: Re: ALC700 in the Intel chipset On Fri, 01 Sep 2017 10:06:13 +0200, Pshou wrote: > > Hi Takashi: > > This is 0000-alc700-intel.patch file. Thanks, it looks good now. One thing to be changed is the name "Intel debug". Maybe "Intel Reference board" or such would fit better. In anyway, could you submit the patch to alsa-devel ML? Once after it's submitted, I'll merge it. thanks, Takashi > > Best regards > pshou > > -----Original Message----- > From: Takashi Iwai [mailto:tiwai@suse.de] > Sent: Tuesday, August 22, 2017 5:04 PM > To: CHLin > Cc: Pshou; Kailang; Singh, Guneshwor O > Subject: Re: ALC700 in the Intel chipset > > On Tue, 22 Aug 2017 10:05:18 +0200, > CHLin wrote: > > > > Hi Takashi > > > > ALC 700 needs this patch for jack detection function. > > Because ALC700's jack detect function defaults is disable. > > So alc700 needs pathc to enable jack detection function. > > OK, then could you update the patch description for giving more such information, prepare the proper patch in a form described in Documentation/SubmittingPatches with signed-off-by tags? > This is mandatory for merging to upstream. > > > thanks, > > Takashi > > > Thanks. > > > > ======================= > > Realtek Semiconductor Corp. > > 林家賢 CH_Lin > > System Design Dept II PCBG > > Tel: 886-3-578-0211 ext:13162 > > ======================= > > > > > > -----Original Message----- > > From: Takashi Iwai [mailto:tiwai@suse.de] > > Sent: Monday, August 21, 2017 6:23 PM > > To: Pshou > > Cc: Kailang; Singh, Guneshwor O; CHLin > > Subject: Re: ALC700 in the Intel chipset > > > > On Mon, 21 Aug 2017 10:05:25 +0200, > > Pshou wrote: > > > > > > Hi Tiwai: > > > > > > Nice to meet you. > > > > > > This is the case of intel. > > > Fixing Jack detection on ALC700 > > > > Could you give more information about this patch? > > For which platform and for what problem? At best, please add more information in the patch changelog itself. > > > > > > thanks, > > > > Takashi > > > > ------Please consider the environment before printing this e-mail.

2 5

[alsa-devel] [PATCH] sound: Convert timers to use timer_setup()
by Kees Cook 26 Oct '17

26 Oct '17

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. These are all the "mechanical" changes remaining in the sound subsystem. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Bard Liao <bardliao(a)realtek.com> Cc: Oder Chiou <oder_chiou(a)realtek.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Cc: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- sound/i2c/other/ak4117.c | 8 ++++---- sound/pci/ctxfi/cttimer.c | 7 +++---- sound/pci/echoaudio/midi.c | 10 +++++----- sound/pci/korg1212/korg1212.c | 7 +++---- sound/pci/rme9652/hdsp.c | 8 ++++---- sound/pci/rme9652/hdspm.c | 8 ++++---- sound/soc/codecs/rt5645.c | 7 +++---- sound/soc/omap/ams-delta.c | 4 ++-- 8 files changed, 28 insertions(+), 31 deletions(-) diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index 3ab099fb8c15..b923342cadf4 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c @@ -35,7 +35,7 @@ MODULE_LICENSE("GPL"); #define AK4117_ADDR 0x00 /* fixed address */ -static void snd_ak4117_timer(unsigned long data); +static void snd_ak4117_timer(struct timer_list *t); static void reg_write(struct ak4117 *ak4117, unsigned char reg, unsigned char val) { @@ -91,7 +91,7 @@ int snd_ak4117_create(struct snd_card *card, ak4117_read_t *read, ak4117_write_t chip->read = read; chip->write = write; chip->private_data = private_data; - setup_timer(&chip->timer, snd_ak4117_timer, (unsigned long)chip); + timer_setup(&chip->timer, snd_ak4117_timer, 0); for (reg = 0; reg < 5; reg++) chip->regmap[reg] = pgm[reg]; @@ -529,9 +529,9 @@ int snd_ak4117_check_rate_and_errors(struct ak4117 *ak4117, unsigned int flags) return res; } -static void snd_ak4117_timer(unsigned long data) +static void snd_ak4117_timer(struct timer_list *t) { - struct ak4117 *chip = (struct ak4117 *)data; + struct ak4117 *chip = from_timer(chip, t, timer); if (chip->init) return; diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c index 8f945341720b..08e874e9a7f6 100644 --- a/sound/pci/ctxfi/cttimer.c +++ b/sound/pci/ctxfi/cttimer.c @@ -63,9 +63,9 @@ struct ct_timer { * system-timer-based updates */ -static void ct_systimer_callback(unsigned long data) +static void ct_systimer_callback(struct timer_list *t) { - struct ct_timer_instance *ti = (struct ct_timer_instance *)data; + struct ct_timer_instance *ti = from_timer(ti, t, timer); struct snd_pcm_substream *substream = ti->substream; struct snd_pcm_runtime *runtime = substream->runtime; struct ct_atc_pcm *apcm = ti->apcm; @@ -93,8 +93,7 @@ static void ct_systimer_callback(unsigned long data) static void ct_systimer_init(struct ct_timer_instance *ti) { - setup_timer(&ti->timer, ct_systimer_callback, - (unsigned long)ti); + timer_setup(&ti->timer, ct_systimer_callback, 0); } static void ct_systimer_start(struct ct_timer_instance *ti) diff --git a/sound/pci/echoaudio/midi.c b/sound/pci/echoaudio/midi.c index 8c685ddb1a41..6045a115cffe 100644 --- a/sound/pci/echoaudio/midi.c +++ b/sound/pci/echoaudio/midi.c @@ -199,9 +199,9 @@ static int snd_echo_midi_output_open(struct snd_rawmidi_substream *substream) -static void snd_echo_midi_output_write(unsigned long data) +static void snd_echo_midi_output_write(struct timer_list *t) { - struct echoaudio *chip = (struct echoaudio *)data; + struct echoaudio *chip = from_timer(chip, t, timer); unsigned long flags; int bytes, sent, time; unsigned char buf[MIDI_OUT_BUFFER_SIZE - 1]; @@ -257,8 +257,8 @@ static void snd_echo_midi_output_trigger(struct snd_rawmidi_substream *substream spin_lock_irq(&chip->lock); if (up) { if (!chip->tinuse) { - setup_timer(&chip->timer, snd_echo_midi_output_write, - (unsigned long)chip); + timer_setup(&chip->timer, snd_echo_midi_output_write, + 0); chip->tinuse = 1; } } else { @@ -273,7 +273,7 @@ static void snd_echo_midi_output_trigger(struct snd_rawmidi_substream *substream spin_unlock_irq(&chip->lock); if (up && !chip->midi_full) - snd_echo_midi_output_write((unsigned long)chip); + snd_echo_midi_output_write(&chip->timer); } diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 04cd71c74e5c..c7b007164c99 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -599,9 +599,9 @@ static void snd_korg1212_SendStopAndWait(struct snd_korg1212 *korg1212) } /* timer callback for checking the ack of stop request */ -static void snd_korg1212_timer_func(unsigned long data) +static void snd_korg1212_timer_func(struct timer_list *t) { - struct snd_korg1212 *korg1212 = (struct snd_korg1212 *) data; + struct snd_korg1212 *korg1212 = from_timer(korg1212, t, timer); unsigned long flags; spin_lock_irqsave(&korg1212->lock, flags); @@ -2189,8 +2189,7 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, init_waitqueue_head(&korg1212->wait); spin_lock_init(&korg1212->lock); mutex_init(&korg1212->open_mutex); - setup_timer(&korg1212->timer, snd_korg1212_timer_func, - (unsigned long)korg1212); + timer_setup(&korg1212->timer, snd_korg1212_timer_func, 0); korg1212->irq = -1; korg1212->clkSource = K1212_CLKIDX_Local; diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 9f0f73875f01..1bff4b1b39cd 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -1410,9 +1410,9 @@ static void snd_hdsp_midi_input_trigger(struct snd_rawmidi_substream *substream, spin_unlock_irqrestore (&hdsp->lock, flags); } -static void snd_hdsp_midi_output_timer(unsigned long data) +static void snd_hdsp_midi_output_timer(struct timer_list *t) { - struct hdsp_midi *hmidi = (struct hdsp_midi *) data; + struct hdsp_midi *hmidi = from_timer(hmidi, t, timer); unsigned long flags; snd_hdsp_midi_output_write(hmidi); @@ -1439,8 +1439,8 @@ static void snd_hdsp_midi_output_trigger(struct snd_rawmidi_substream *substream spin_lock_irqsave (&hmidi->lock, flags); if (up) { if (!hmidi->istimer) { - setup_timer(&hmidi->timer, snd_hdsp_midi_output_timer, - (unsigned long) hmidi); + timer_setup(&hmidi->timer, snd_hdsp_midi_output_timer, + 0); mod_timer(&hmidi->timer, 1 + jiffies); hmidi->istimer++; } diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index f20d42714e4d..4c59983158e0 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -1946,9 +1946,9 @@ snd_hdspm_midi_input_trigger(struct snd_rawmidi_substream *substream, int up) spin_unlock_irqrestore (&hdspm->lock, flags); } -static void snd_hdspm_midi_output_timer(unsigned long data) +static void snd_hdspm_midi_output_timer(struct timer_list *t) { - struct hdspm_midi *hmidi = (struct hdspm_midi *) data; + struct hdspm_midi *hmidi = from_timer(hmidi, t, timer); unsigned long flags; snd_hdspm_midi_output_write(hmidi); @@ -1976,8 +1976,8 @@ snd_hdspm_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) spin_lock_irqsave (&hmidi->lock, flags); if (up) { if (!hmidi->istimer) { - setup_timer(&hmidi->timer, snd_hdspm_midi_output_timer, - (unsigned long) hmidi); + timer_setup(&hmidi->timer, + snd_hdspm_midi_output_timer, 0); mod_timer(&hmidi->timer, 1 + jiffies); hmidi->istimer++; } diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index a98647ac497c..735f2d0033dd 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3340,9 +3340,9 @@ static irqreturn_t rt5645_irq(int irq, void *data) return IRQ_HANDLED; } -static void rt5645_btn_check_callback(unsigned long data) +static void rt5645_btn_check_callback(struct timer_list *t) { - struct rt5645_priv *rt5645 = (struct rt5645_priv *)data; + struct rt5645_priv *rt5645 = from_timer(rt5645, t, btn_check_timer); queue_delayed_work(system_power_efficient_wq, &rt5645->jack_detect_work, msecs_to_jiffies(5)); @@ -3934,8 +3934,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2, RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV); } - setup_timer(&rt5645->btn_check_timer, - rt5645_btn_check_callback, (unsigned long)rt5645); + timer_setup(&rt5645->btn_check_timer, rt5645_btn_check_callback, 0); INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work); INIT_DELAYED_WORK(&rt5645->rcclock_work, rt5645_rcclock_work); diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 6c49f3d6fd96..d40219678700 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -260,7 +260,7 @@ static bool cx81801_cmd_pending; static bool ams_delta_muted; static DEFINE_SPINLOCK(ams_delta_lock); -static void cx81801_timeout(unsigned long data) +static void cx81801_timeout(struct timer_list *unused) { int muted; @@ -349,7 +349,7 @@ static void cx81801_receive(struct tty_struct *tty, /* First modem response, complete setup procedure */ /* Initialize timer used for config pulse generation */ - setup_timer(&cx81801_timer, cx81801_timeout, 0); + timer_setup(&cx81801_timer, cx81801_timeout, 0); v253_ops.receive_buf(tty, cp, fp, count); -- 2.7.4 -- Kees Cook Pixel Security

3 3

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Decrease loglevel for topology loading
by Chintan Patel 25 Oct '17

25 Oct '17

In case of failure in loading customize topology firmware, dfw_sst.bin gets loaded. However, current log provides this message as error even after successfully falling back to default topology "dfw_sst.bin". Hence to convey proper message, changing log level and message. Signed-off-by: Chintan Patel <chintan.m.patel(a)intel.com> --- sound/soc/intel/skylake/skl-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 22f768ca3c73..12f383fd7c39 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3404,7 +3404,7 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) ret = request_firmware(&fw, skl->tplg_name, bus->dev); if (ret < 0) { - dev_err(bus->dev, "tplg fw %s load failed with %d\n", + dev_info(bus->dev, "tplg fw %s load failed with %d, falling back to dfw_sst.bin", skl->tplg_name, ret); ret = request_firmware(&fw, "dfw_sst.bin", bus->dev); if (ret < 0) { -- 1.9.1

2 1

[alsa-devel] [PATCH v2 0/7] ASoC: Intel: Skylake: Add a clk driver to enable ssp clks early
by Subhransu S. Prusty 25 Oct '17

25 Oct '17

For certain platforms clocks (mclk/sclk/fs) are required to be up before the stream start. Example: some codecs needs the mclk/sclk/fs to be enabled early for a successful clock synchronization. Some patforms require clock to be enabled at boot and be always ON By sending set_dma_control IPC (with the i2s blobs queried from NHLT), these clocks can be enabled early after the firmware is downloaded. With this series, a virtual clock driver is created which provides interface to send the required IPCs from machine driver to enable the clocks. NHLT is parsed during probe and the clock information is populated. The pointer to blob is cached and sent along with the set_dma_control IPC structure during the clk prepare/unprepare callback. Clocks are created for a ssp if the nhlt table has endpoint configuration for that particular ssp. Skylake driver creates a platform driver with the clock information and register the clk ops callback. kabylake machine driver uses the clock interface to enable the clocks early as it is required by the rt5663 driver for clock synchronization. set_dma_control API can be used with different payload configuration. Modify the arguments to take configurable parameters. v1 -> v2 - Register parent clocks with skylake device. With the patch "clk: Add support for runtime PM" soon to be merged will help DSP to stay active on call to clock enable. Reference: (https://patchwork.kernel.org/patch/9911741/) - Fix the machine driver to enable clocks early for headphone playback path as well to fix a pop noise issue - Include the eve machine driver changes as well Harsha Priya (1): ASoC: Intel: kbl: Enable mclk and ssp sclk early Jaikrishna Nemallapudi (5): ASoC: Intel: Skylake: Modify skl_dsp_set_dma_control API arguments ASoC: Intel: Skylake: Parse nhlt to populate clock information ASoC: Intel: Skylake: Prepare DMA control IPC to enable/disable clock ASoC: Intel: Skylake: Register clock device and ops ASoC: Intel: Skylake: Add ssp clock driver Naveen M (1): ASoC: Intel: eve: Enable mclk and ssp sclk early sound/soc/intel/Kconfig | 9 + sound/soc/intel/boards/kbl_rt5663_max98927.c | 98 ++++++- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 97 +++++++ sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/skl-i2s.h | 56 ++++ sound/soc/intel/skylake/skl-messages.c | 109 +++++++- sound/soc/intel/skylake/skl-nhlt.c | 148 +++++++++++ sound/soc/intel/skylake/skl-ssp-clk.c | 288 +++++++++++++++++++++ sound/soc/intel/skylake/skl-ssp-clk.h | 124 +++++++++ sound/soc/intel/skylake/skl-topology.h | 4 +- sound/soc/intel/skylake/skl.c | 235 +++++++++++++++++ sound/soc/intel/skylake/skl.h | 12 + 12 files changed, 1173 insertions(+), 12 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-i2s.h create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h -- 1.9.1

3 10

[alsa-devel] [PATCH] sound: oss: waveartist: Convert timers to use timer_setup()
by Kees Cook 25 Oct '17

25 Oct '17

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: David Howells <dhowells(a)redhat.com> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- sound/oss/waveartist.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index 4f0c3a232e41..c051c8e6023e 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c @@ -151,6 +151,7 @@ static DEFINE_SPINLOCK(waveartist_lock); #define machine_is_netwinder() 0 #else static struct timer_list vnc_timer; +static int timer_nr_waveartist_devs; static void vnc_configure_mixer(struct wavnc_info *devc, unsigned int input_mask); static int vnc_private_ioctl(int dev, unsigned int cmd, int __user *arg); @@ -1414,8 +1415,8 @@ attach_waveartist(struct address_info *hw, const struct waveartist_mixer_info *m else { #ifdef CONFIG_ARCH_NETWINDER if (machine_is_netwinder()) { - setup_timer(&vnc_timer, vnc_slider_tick, - nr_waveartist_devs); + timer_nr_waveartist_devs = nr_waveartist_devs; + timer_setup(&vnc_timer, vnc_slider_tick, 0); mod_timer(&vnc_timer, jiffies); vnc_configure_mixer(devc, 0); @@ -1799,11 +1800,11 @@ vnc_slider(struct wavnc_info *devc) } static void -vnc_slider_tick(unsigned long data) +vnc_slider_tick(struct timer_list *unused) { int next_timeout; - if (vnc_slider(adev_info + data)) + if (vnc_slider(adev_info + timer_nr_waveartist_devs)) next_timeout = 5; // mixer reported change else next_timeout = VNC_TIMER_PERIOD; -- 2.7.4 -- Kees Cook Pixel Security

2 5

[alsa-devel] [PATCH] conf/ucm: rt5651: Add UCM config for bytcr-rt5651
by Carlo Caione 25 Oct '17

25 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> Add a UCM configuration for the rt5651 codec on Intel's Cherry-Trail platform. Adapted from [0]. [0] https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 Signed-off-by: Carlo Caione <carlo(a)endlessm.com> --- configure.ac | 1 + src/conf/ucm/Makefile.am | 2 +- src/conf/ucm/bytcr-rt5651/HiFi.conf | 126 +++++++++++++++++++++++++ src/conf/ucm/bytcr-rt5651/Makefile.am | 4 + src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf | 138 ++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 src/conf/ucm/bytcr-rt5651/HiFi.conf create mode 100644 src/conf/ucm/bytcr-rt5651/Makefile.am create mode 100644 src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf diff --git a/configure.ac b/configure.ac index fbcfa829..c16f2461 100644 --- a/configure.ac +++ b/configure.ac @@ -703,6 +703,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/VEYRON-I2S/Makefile \ src/conf/ucm/chtrt5645/Makefile \ src/conf/ucm/DB410c/Makefile \ + src/conf/ucm/bytcr-rt5651/Makefile \ src/conf/topology/Makefile \ src/conf/topology/broadwell/Makefile \ modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index ea9b3850..2bd4ebe7 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c broxton-rt298 +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c broxton-rt298 bytcr-rt5651 diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf new file mode 100644 index 00000000..b9da30f7 --- /dev/null +++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf @@ -0,0 +1,126 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 + +SectionVerb { + EnableSequence [ + cdev "hw:bytcrrt5651" + exec "echo HiFi enable sequence" + ] + + DisableSequence [ + exec "echo HiFi disable sequence" + ] + + Value { + PlaybackPCM "hw:bytcrrt5651" + CapturePCM "hw:bytcrrt5651" + } +} + +SectionDevice."Headphones" { + Comment "Headphones playback" + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Headphones playback enable sequence" + cset "name='Headphone Switch' on" + cset "name='HPO L Playback Switch' on" + cset "name='HPO R Playback Switch' on" + cset "name='HP Playback Volume' 100" + ] + + DisableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Headphones playback disable sequence" + cset "name='Headphone Switch' off" + cset "name='HPO L Playback Switch' off" + cset "name='HPO R Playback Switch' off" + cset "name='HP Playback Volume' 0" + ] + + Value { + PlaybackChannels "2" + JackControl "Headphone Jack" + } +} + +SectionDevice."Speaker" { + Comment "Speaker playback" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Speaker enable sequence" + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Speaker disable sequence" + cset "name='Speaker Switch' off" + ] + + Value { + PlaybackChannels "2" + } +} + +SectionDevice."Handset" { + Comment "Handset Microphone" + + ConflictingDevice [ + "Mainmic" + ] + + EnableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Handset Microphone enable sequence" + cset "name='RECMIXL BST1 Switch' on" + cset "name='RECMIXR BST1 Switch' on" + ] + + DisableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Handset Microphone disable sequence" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + ] + + Value { + CaptureChannels "2" + JackControl "Headset Mic Jack" + } +} + + +SectionDevice."Mainmic" { + Comment "Main Microphone" + + ConflictingDevice [ + "Handset" + ] + + EnableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Main Microphone enable sequence" + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' on" + ] + + DisableSequence [ + cdev "hw:bytcrrt5651" + exec "echo Main Microphone disable sequence" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" + ] + + Value { + CaptureChannels "2" + } +} diff --git a/src/conf/ucm/bytcr-rt5651/Makefile.am b/src/conf/ucm/bytcr-rt5651/Makefile.am new file mode 100644 index 00000000..95aec978 --- /dev/null +++ b/src/conf/ucm/bytcr-rt5651/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5651 +ucm_DATA = bytcr-rt5651.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf new file mode 100644 index 00000000..2dcc72cc --- /dev/null +++ b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf @@ -0,0 +1,138 @@ +# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 + +SectionUseCase."HiFi" { + File "HiFi" + Comment "Play HiFi quality Music" +} + +SectionDefaults [ + cdev "hw:bytcrrt5651" + + # media mixer settings + # compress + cset "name='media0_in Gain 0 Switch' on" + cset "name='media0_in Gain 0 Volume' 0" + # normal + cset "name='media1_in Gain 0 Switch' on" + cset "name='media1_in Gain 0 Volume' 0" + # swm loopback + cset "name='media2_in Gain 0 Switch' off" + cset "name='media2_in Gain 0 Volume' 0%" + # deep buffer + cset "name='media3_in Gain 0 Switch' on" + cset "name='media3_in Gain 0 Volume' 0" + cset "name='media0_out mix 0 media0_in Switch' on" + cset "name='media0_out mix 0 media1_in Switch' on" + cset "name='media0_out mix 0 media2_in Switch' off" + cset "name='media0_out mix 0 media3_in Switch' on" + cset "name='media1_out mix 0 media0_in Switch' off" + cset "name='media1_out mix 0 media1_in Switch' off" + cset "name='media1_out mix 0 media2_in Switch' off" + cset "name='media1_out mix 0 media3_in Switch' off" + cset "name='pcm0_in Gain 0 Switch' on" + cset "name='pcm0_in Gain 0 Volume' 0" + cset "name='pcm1_in Gain 0 Switch' off" + cset "name='pcm1_in Gain 0 Volume' 0%" + + # codec0_out settings + cset "name='codec_out0 mix 0 codec_in0 Switch' off" + cset "name='codec_out0 mix 0 codec_in1 Switch' off" + cset "name='codec_out0 mix 0 media_loop1_in Switch' off" + cset "name='codec_out0 mix 0 media_loop2_in Switch' off" + cset "name='codec_out0 mix 0 pcm0_in Switch' on" + cset "name='codec_out0 mix 0 pcm1_in Switch' off" + cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" + cset "name='codec_out0 Gain 0 Switch' on" + cset "name='codec_out0 Gain 0 Volume' 0" + + # input settings + # pcm1_out settings + cset "name='codec_in0 Gain 0 Switch' on" + cset "name='codec_in0 Gain 0 Volume' 0" + cset "name='pcm1_out mix 0 codec_in0 Switch' on" + cset "name='pcm1_out mix 0 codec_in1 Switch' off" + cset "name='pcm1_out mix 0 media_loop1_in Switch' off" + cset "name='pcm1_out mix 0 media_loop2_in Switch' off" + cset "name='pcm1_out mix 0 pcm0_in Switch' off" + cset "name='pcm1_out mix 0 pcm1_in Switch' off" + cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" + cset "name='pcm1_out Gain 0 Switch' on" + cset "name='pcm1_out Gain 0 Volume' 0" + + # disable codec_out1 + cset "name='codec_out1 mix 0 codec_in0 Switch' off" + cset "name='codec_out1 mix 0 codec_in1 Switch' off" + cset "name='codec_out1 mix 0 media_loop1_in Switch' off" + cset "name='codec_out1 mix 0 media_loop2_in Switch' off" + cset "name='codec_out1 mix 0 pcm0_in Switch' off" + cset "name='codec_out1 mix 0 pcm1_in Switch' off" + cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" + cset "name='codec_out1 Gain 0 Switch' off" + cset "name='codec_out1 Gain 0 Volume' 0%" + + # disable codec_in1 + cset "name='codec_in1 Gain 0 Switch' off" + cset "name='codec_in1 Gain 0 Volume' 0%" + + # disable all loops + cset "name='media_loop1_out mix 0 codec_in0 Switch' off" + cset "name='media_loop1_out mix 0 codec_in1 Switch' off" + cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" + cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop1_out mix 0 pcm0_in Switch' off" + cset "name='media_loop1_out mix 0 pcm1_in Switch' off" + cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" + cset "name='media_loop2_out mix 0 codec_in0 Switch' off" + cset "name='media_loop2_out mix 0 codec_in1 Switch' off" + cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" + cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop2_out mix 0 pcm0_in Switch' off" + cset "name='media_loop2_out mix 0 pcm1_in Switch' off" + cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" + cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" + cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" + cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" + cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" + cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" + cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" + cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" + + # default state + cset "name='ADC Capture Volume' 126" + cset "name='HP Playback Volume' 29" + cset "name='HPO L Playback Switch' on" + cset "name='HPO MIX DAC1 Switch' on" + cset "name='HPO MIX HPVOL Switch' on" + cset "name='HPO R Playback Switch' on" + cset "name='HPOVOL L Switch' on" + cset "name='HPOVOL R Switch' on" + cset "name='IF1 ASRC Switch' on" + cset "name='IN Capture Volume' 27" + cset "name='IN2 Boost' 1" + cset "name='IN1 Boost' 1" + cset "name='LOUT L Playback Switch' on" + cset "name='LOUT MIX DAC L1 Switch' on" + cset "name='LOUT MIX DAC R1 Switch' on" + cset "name='LOUT R Playback Switch' on" + cset "name='OUT Playback Volume' 33" + cset "name='Stereo DAC MIXL DAC L1 Switch' on" + cset "name='Stereo DAC MIXR DAC R1 Switch' on" + cset "name='Stereo1 ADC MIXR ADC1 Switch' on" + cset "name='Stereo1 ADC MIXR ADC2 Switch' on" + cset "name='Stereo2 ADC MIXL ADC1 Switch' on" + cset "name='Stereo2 ADC MIXL ADC2 Switch' on" + cset "name='Stereo2 ADC MIXR ADC1 Switch' on" + cset "name='Stereo2 ADC MIXR ADC2 Switch' on" + + # input + cset "name='Stereo1 ADC L1 Mux' ADC" + cset "name='Stereo1 ADC R1 Mux' ADC" + cset "name='Stereo1 ADC MIXL ADC1 Switch' on" + cset "name='Stereo1 ADC MIXR ADC1 Switch' on" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='RECMIXL BST3 Switch' off" + cset "name='RECMIXR BST3 Switch' off" + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" +] -- 2.14.2

3 5

[alsa-devel] [PATCH] ALSA: sb: Minor optimization / fix of timer usage in sb8_midi.c
by Takashi Iwai 25 Oct '17

25 Oct '17

Currently the SB8 MIDI code sets up the timer object at each time before scheduling it at trigger callback, but basically this is superfluous once after set up. Also, the code misses the del_timer_sync() call that may leave a race condition for use-after-free. This patch addresses these issues, moving timer_setup() to snd_sb8dsp_midi(), and adding the del_timer_sync() call at snd_sb8dsp_midi_output_trigger() to make sure. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/sb/sb8_midi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c index 05ba2c6b1a8c..4affdcb78f72 100644 --- a/sound/isa/sb/sb8_midi.c +++ b/sound/isa/sb/sb8_midi.c @@ -138,6 +138,7 @@ static int snd_sb8dsp_midi_output_close(struct snd_rawmidi_substream *substream) struct snd_sb *chip; chip = substream->rmidi->private_data; + del_timer_sync(&chip->midi_timer); spin_lock_irqsave(&chip->open_lock, flags); chip->open &= ~(SB_OPEN_MIDI_OUTPUT | SB_OPEN_MIDI_OUTPUT_TRIGGER); chip->midi_substream_output = NULL; @@ -230,8 +231,6 @@ static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substre spin_lock_irqsave(&chip->open_lock, flags); if (up) { if (!(chip->open & SB_OPEN_MIDI_OUTPUT_TRIGGER)) { - timer_setup(&chip->midi_timer, - snd_sb8dsp_midi_output_timer, 0); mod_timer(&chip->midi_timer, 1 + jiffies); chip->open |= SB_OPEN_MIDI_OUTPUT_TRIGGER; } @@ -274,6 +273,7 @@ int snd_sb8dsp_midi(struct snd_sb *chip, int device) if (chip->hardware >= SB_HW_20) rmidi->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX; rmidi->private_data = chip; + timer_setup(&chip->midi_timer, snd_sb8dsp_midi_output_timer, 0); chip->rmidi = rmidi; return 0; } -- 2.14.2

1 0

[alsa-devel] [RFCv3][PATCH 00/39] axfer: rewrite aplay, adding 'timer-based scheduling' option
by Takashi Sakamoto 25 Oct '17

25 Oct '17

Hi, This 3rd RFC patchset updates my previous one: [alsa-devel] [RFCv2][PATCH 00/38] alsa-utils: axfer: rewrite aplay http://mailman.alsa-project.org/pipermail/alsa-devel/2017-September/125574.… For aim of this rewrite and its intension, please refer to my former posts. In this version, I add an option to support 'timer-based scheduling' scenario, which PulseAudio developers introduced. Please refer to patch 32: * axfer: add support for timer-based MMAP operation You can use this mode by adding '-sched-type=timer' option into command line. The other difference from my previous one: - fix some bugs to handle non-interleaved buffer on mapped page frame. - use snd_pcm_status() instead of snd_pcm_state() to execute hwsync. - minor fixes. In my plan, this is the last version including below patches. In next post, options added by below patches are categorized as obsoleted: * axfer: add an option to support volume unit meter * axfer: add a unit test for vumeter calculation * axfer: add an option for formatted filename * axfer: add an option to handle key events * axfer: add a parser for channel map API * axfer: add a feature to generate a file for process id Additionally, for next post, I'll prepare for help messages and man for this program. Regards Takashi Sakamoto (39): axfer: add an entry point for this command axfer: add a sub-command to print list of PCMs/devices axfer: add a common interface to handle a file with audio-specific data format axfer: add support for a container of Microsoft/IBM RIFF/Wave format axfer: add support for a container of Sparc AU format axfer: add support for a container of Creative Tech. voice format axfer: add support for a container of raw data axfer: add unit test for container interface axfer: add a common interface to align data frames on different layout axfer: add support for a mapper for single target axfer: add support for a mapper for multiple target axfer: add a unit test for mapper interface axfer: add a parser for command-line options axfer: add a common interface to transfer data frames axfer: add support to transfer data frames by alsa-lib PCM APIs axfer: add support for blocking data transmission operation of alsa-lib PCM API axfer: add a sub-command to transfer data frames axfer: add informative output and an option to suppress it axfer: add an option to dump available hardware parameters axfer: add options related to duration and obsolete '--max-file-size' option axfer: add an option to finish transmission at XRUN axfer: add a common interface of waiter for I/O event notification axfer: add support of waiter for poll(2) axfer: add support for non-blocking operation axfer: add support for MMAP PCM operation axfer: add an option to suppress event waiting axfer: add options for buffer arrangement axfer: add options for software parameters of PCM substream axfer: add options for plugins in alsa-lib axfer: add an implementation of waiter for epoll(7) axfer: add an option for waiter type axfer: add support for timer-based MMAP operation axfer: add an option to support volume unit meter axfer: add a unit test for vumeter calculation axfer: add an option for formatted filename axfer: add an option to handle key events axfer: add a parser for channel map API axfer: add a feature to generate a file for process id axfer: obsolete some test options Makefile.am | 2 +- axfer/Makefile.am | 61 +++ axfer/container-au.c | 207 ++++++++ axfer/container-raw.c | 66 +++ axfer/container-riff-wave.c | 581 ++++++++++++++++++++++ axfer/container-voc.c | 843 ++++++++++++++++++++++++++++++++ axfer/container.c | 470 ++++++++++++++++++ axfer/container.h | 126 +++++ axfer/key-event.c | 121 +++++ axfer/key-event.h | 19 + axfer/main.c | 194 ++++++++ axfer/mapper-multiple.c | 271 +++++++++++ axfer/mapper-single.c | 195 ++++++++ axfer/mapper.c | 152 ++++++ axfer/mapper.h | 87 ++++ axfer/misc.h | 16 + axfer/options.c | 980 ++++++++++++++++++++++++++++++++++++++ axfer/options.h | 92 ++++ axfer/subcmd-list.c | 234 +++++++++ axfer/subcmd-transfer.c | 525 ++++++++++++++++++++ axfer/subcmd.h | 18 + axfer/test/Makefile.am | 39 ++ axfer/test/container-test.c | 299 ++++++++++++ axfer/test/generator.c | 260 ++++++++++ axfer/test/generator.h | 47 ++ axfer/test/mapper-test.c | 491 +++++++++++++++++++ axfer/test/vumeter-test.c | 184 +++++++ axfer/vumeter.c | 546 +++++++++++++++++++++ axfer/vumeter.h | 55 +++ axfer/waiter-epoll.c | 81 ++++ axfer/waiter-poll.c | 68 +++ axfer/waiter.c | 84 ++++ axfer/waiter.h | 52 ++ axfer/xfer-libasound-irq-mmap.c | 271 +++++++++++ axfer/xfer-libasound-irq-rw.c | 520 ++++++++++++++++++++ axfer/xfer-libasound-timer-mmap.c | 474 ++++++++++++++++++ axfer/xfer-libasound.c | 737 ++++++++++++++++++++++++++++ axfer/xfer-libasound.h | 60 +++ axfer/xfer.c | 191 ++++++++ axfer/xfer.h | 76 +++ configure.ac | 3 +- 41 files changed, 9796 insertions(+), 2 deletions(-) create mode 100644 axfer/Makefile.am create mode 100644 axfer/container-au.c create mode 100644 axfer/container-raw.c create mode 100644 axfer/container-riff-wave.c create mode 100644 axfer/container-voc.c create mode 100644 axfer/container.c create mode 100644 axfer/container.h create mode 100644 axfer/key-event.c create mode 100644 axfer/key-event.h create mode 100644 axfer/main.c create mode 100644 axfer/mapper-multiple.c create mode 100644 axfer/mapper-single.c create mode 100644 axfer/mapper.c create mode 100644 axfer/mapper.h create mode 100644 axfer/misc.h create mode 100644 axfer/options.c create mode 100644 axfer/options.h create mode 100644 axfer/subcmd-list.c create mode 100644 axfer/subcmd-transfer.c create mode 100644 axfer/subcmd.h create mode 100644 axfer/test/Makefile.am create mode 100644 axfer/test/container-test.c create mode 100644 axfer/test/generator.c create mode 100644 axfer/test/generator.h create mode 100644 axfer/test/mapper-test.c create mode 100644 axfer/test/vumeter-test.c create mode 100644 axfer/vumeter.c create mode 100644 axfer/vumeter.h create mode 100644 axfer/waiter-epoll.c create mode 100644 axfer/waiter-poll.c create mode 100644 axfer/waiter.c create mode 100644 axfer/waiter.h create mode 100644 axfer/xfer-libasound-irq-mmap.c create mode 100644 axfer/xfer-libasound-irq-rw.c create mode 100644 axfer/xfer-libasound-timer-mmap.c create mode 100644 axfer/xfer-libasound.c create mode 100644 axfer/xfer-libasound.h create mode 100644 axfer/xfer.c create mode 100644 axfer/xfer.h -- 2.11.0

2 40