Alsa-devel May 2016

alsa-devel@alsa-project.org

118 participants
257 discussions

[alsa-devel] Volume control with mute in the wrong end
by Peter Rosin 02 May '16

02 May '16

Hi! I'm writing a driver for the max9860 codec https://datasheets.maximintegrated.com/en/ds/MAX9860.pdf and it has a digital sidetone control where it can mix in the left channel ADC into the (mono) DAC output. The register that controls the sidetone level makes me wonder how I should wire up DAPM for it. You set the gain for the sidetone in the same register field as you enable it. I have a problem though, since the mute value is at the wrong and of the scale, i.e. you turn the volume up and up and up, and when you reach "max" it is off. I did try to declare a TLV range like so: /* The dvst field has its mute in the wrong end. Sigh. */ static const DECLARE_TLV_DB_RANGE(dvst_tlv, 0, 30, TLV_DB_SCALE_ITEM(-6000, 200, 0), 31, 31, TLV_DB_SCALE_ITEM(0, 0, 1)); and then hook it that up with a dapm mixer: static const struct snd_kcontrol_new max9860_mixer_controls[] = { SOC_DAPM_SINGLE_TLV("Sidetone Volume", MAX9860_DACGAIN, MAX9860_DVST_SHIFT, 31, 1, dvst_tlv), }; static const struct snd_soc_dapm_widget max9860_dapm_widgets[] = { SND_SOC_DAPM_INPUT("MICL"), SND_SOC_DAPM_INPUT("MICR"), SND_SOC_DAPM_ADC("ADCL", NULL, MAX9860_PWRMAN, MAX9860_ADCLEN_SHIFT, 0), SND_SOC_DAPM_ADC("ADCR", NULL, MAX9860_PWRMAN, MAX9860_ADCREN_SHIFT, 0), SND_SOC_DAPM_AIF_OUT("AIFOUTL", "Capture", 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_OUT("AIFOUTR", "Capture", 1, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_MIXER("Mixer", SND_SOC_NOPM, 0, 0, max9860_mixer_controls, ARRAY_SIZE(max9860_mixer_controls)), SND_SOC_DAPM_AIF_IN("AIFINL", "Playback", 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_IN("AIFINR", "Playback", 1, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_DAC("DAC", NULL, MAX9860_PWRMAN, MAX9860_DACEN_SHIFT, 0), SND_SOC_DAPM_OUTPUT("OUT"), }; static const struct snd_soc_dapm_route max9860_dapm_routes[] = { { "ADCL", NULL, "MICL" }, { "ADCR", NULL, "MICR" }, { "AIFOUTL", NULL, "ADCL" }, { "AIFOUTR", NULL, "ADCR" }, { "OUT", NULL, "DAC" }, { "DAC", NULL, "Mixer" }, { "Mixer", "Sidetone Volume", "ADCL" }, { "Mixer", NULL, "AIFINL" }, { "Mixer", NULL, "AIFINR" }, }; But DAPM and some tools (e.g. alsamixer) do not properly recognize the mute value at the wrong end on the scale for the sidetone. So, the sidetone path is never off (in the dapm sense). I can use amixer to set the special mute value, and it states -99999.99dB, so I think the tlv declaration is correct, at least in theory. But as I said alsamixer is thoroughly confused by the control and behaves rather strange... If I change the tlv declaration so that DAPM thinks the mute is in the natural end of the scale, the paths are off in the dapm sense when the sidetone is muted (but the sidetone is not in fact muted, of course). Is there anything I can do to make DAPM handle this insane register field better? Cheers, Peter

1 0

[alsa-devel] [PATCH] ASoC: davinci-mcasp: Fix overwriting of ahclkx
by J.D. Schroeder 02 May '16

02 May '16

From: Jim Lodes <jim.lodes(a)garmin.com> The mcasp davinci_mcasp_set_dai_fmt function was overriding ahclkx input/output status that had already been set by the davinci_mcasp_set_sysclk function. This commit removes clearing of the ahclkx input/output status from davinci_mcasp_set_dai_fmt. Signed-off-by: Jim Lodes <jim.lodes(a)garmin.com> Signed-off-by: J.D. Schroeder <jay.schroeder(a)garmin.com> --- sound/soc/davinci/davinci-mcasp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index e132498..a1197ad 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -489,7 +489,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, AFSRE); mcasp_clr_bits(mcasp, DAVINCI_MCASP_PDIR_REG, - ACLKX | AHCLKX | AFSX | ACLKR | AHCLKR | AFSR); + ACLKX | AFSX | ACLKR | AHCLKR | AFSR); mcasp->bclk_master = 0; break; default: -- 1.9.1

3 2

[alsa-devel] [PATCH 0/5] ASoC: Intel: Skylake: Wov optimizations
by Vinod Koul 02 May '16

02 May '16

This series starts with two minor fixes on driver to fix a memory leak and one NULL pointer exception and then adds power optimization to driver for WOV case by suspending the stream DMA and keeping only DSP pipe and endpoint On during that case Dharageswari.R (2): ASoC: Intel: Skylake: Fix the NULL pointer exception in dsp_clean up ASoC: Intel: Skylake: Prevent sending Set DMA Control IPC if the widget is "On" Jeeja KP (2): ASoC: Intel: Skylake: Suspend PCMs when marked as active suspend ASoC: Intel: Boards: remove ignore_suspend for WoV streams Mousumi Jana (1): ASoC: Intel: Skylake: Fix memory leak during init instance sound/soc/intel/boards/skl_nau88l25_max98357a.c | 1 - sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 1 - sound/soc/intel/boards/skl_rt286.c | 1 - sound/soc/intel/skylake/skl-messages.c | 2 +- sound/soc/intel/skylake/skl-pcm.c | 32 ++++++++++++++++--------- sound/soc/intel/skylake/skl-sst-dsp.c | 2 -- sound/soc/intel/skylake/skl-sst.c | 4 ++++ 7 files changed, 26 insertions(+), 17 deletions(-) -- 1.9.1

2 10

Re: [alsa-devel] [PATCH 1/2] ASoC: rockchip: i2s: separate capture and playback
by Enric Balletbo Serra 02 May '16

02 May '16

Hi John, Thanks for answer. 2016-04-30 9:00 GMT+02:00 John Keeping <john(a)keeping.me.uk>: > Hi Enric, > > On Fri, Apr 29, 2016 at 04:59:27PM +0200, Enric Balletbo Serra wrote: >> 2015-12-09 11:32 GMT+01:00 John Keeping <john(a)metanate.com>: >> > If we only clear the tx/rx state when both are disabled it is not >> > possible to start/stop one multiple times while the other is running. >> > Since the two are independently controlled, treat them as such and >> > remove the false dependency between capture and playback. >> > >> > Signed-off-by: John Keeping <john(a)metanate.com> >> > --- >> > sound/soc/rockchip/rockchip_i2s.c | 72 +++++++++++++++++---------------------- >> > 1 file changed, 32 insertions(+), 40 deletions(-) >> > >> > diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c >> > index 83b1b9c..acc6225 100644 >> > --- a/sound/soc/rockchip/rockchip_i2s.c >> > +++ b/sound/soc/rockchip/rockchip_i2s.c >> > @@ -82,8 +82,8 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) >> > I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE); >> > >> > regmap_update_bits(i2s->regmap, I2S_XFER, >> > - I2S_XFER_TXS_START | I2S_XFER_RXS_START, >> > - I2S_XFER_TXS_START | I2S_XFER_RXS_START); >> > + I2S_XFER_TXS_START, >> > + I2S_XFER_TXS_START); >> > >> > i2s->tx_start = true; >> > } else { >> > @@ -92,27 +92,23 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) >> > regmap_update_bits(i2s->regmap, I2S_DMACR, >> > I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE); >> > >> > - if (!i2s->rx_start) { >> > - regmap_update_bits(i2s->regmap, I2S_XFER, >> > - I2S_XFER_TXS_START | >> > - I2S_XFER_RXS_START, >> > - I2S_XFER_TXS_STOP | >> > - I2S_XFER_RXS_STOP); >> > + regmap_update_bits(i2s->regmap, I2S_XFER, >> > + I2S_XFER_TXS_START, >> > + I2S_XFER_TXS_STOP); >> > >> > - regmap_update_bits(i2s->regmap, I2S_CLR, >> > - I2S_CLR_TXC | I2S_CLR_RXC, >> > - I2S_CLR_TXC | I2S_CLR_RXC); >> > + regmap_update_bits(i2s->regmap, I2S_CLR, >> > + I2S_CLR_TXC, >> > + I2S_CLR_TXC); >> > >> > - regmap_read(i2s->regmap, I2S_CLR, &val); >> > + regmap_read(i2s->regmap, I2S_CLR, &val); >> > >> > - /* Should wait for clear operation to finish */ >> > - while (val) { >> > - regmap_read(i2s->regmap, I2S_CLR, &val); >> > - retry--; >> > - if (!retry) { >> > - dev_warn(i2s->dev, "fail to clear\n"); >> > - break; >> > - } >> > + /* Should wait for clear operation to finish */ >> > + while (val & I2S_CLR_TXC) { >> > + regmap_read(i2s->regmap, I2S_CLR, &val); >> > + retry--; >> > + if (!retry) { >> > + dev_warn(i2s->dev, "fail to clear\n"); >> > + break; >> > } >> > } >> > } >> > @@ -128,8 +124,8 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) >> > I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE); >> > >> > regmap_update_bits(i2s->regmap, I2S_XFER, >> > - I2S_XFER_TXS_START | I2S_XFER_RXS_START, >> > - I2S_XFER_TXS_START | I2S_XFER_RXS_START); >> > + I2S_XFER_RXS_START, >> > + I2S_XFER_RXS_START); >> > >> > i2s->rx_start = true; >> > } else { >> > @@ -138,27 +134,23 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) >> > regmap_update_bits(i2s->regmap, I2S_DMACR, >> > I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE); >> > >> > - if (!i2s->tx_start) { >> > - regmap_update_bits(i2s->regmap, I2S_XFER, >> > - I2S_XFER_TXS_START | >> > - I2S_XFER_RXS_START, >> > - I2S_XFER_TXS_STOP | >> > - I2S_XFER_RXS_STOP); >> > + regmap_update_bits(i2s->regmap, I2S_XFER, >> > + I2S_XFER_RXS_START, >> > + I2S_XFER_RXS_STOP); >> > >> > - regmap_update_bits(i2s->regmap, I2S_CLR, >> > - I2S_CLR_TXC | I2S_CLR_RXC, >> > - I2S_CLR_TXC | I2S_CLR_RXC); >> > + regmap_update_bits(i2s->regmap, I2S_CLR, >> > + I2S_CLR_RXC, >> > + I2S_CLR_RXC); >> > >> > - regmap_read(i2s->regmap, I2S_CLR, &val); >> > + regmap_read(i2s->regmap, I2S_CLR, &val); >> > >> > - /* Should wait for clear operation to finish */ >> > - while (val) { >> > - regmap_read(i2s->regmap, I2S_CLR, &val); >> > - retry--; >> > - if (!retry) { >> > - dev_warn(i2s->dev, "fail to clear\n"); >> > - break; >> > - } >> > + /* Should wait for clear operation to finish */ >> > + while (val & I2S_CLR_RXC) { >> > + regmap_read(i2s->regmap, I2S_CLR, &val); >> > + retry--; >> > + if (!retry) { >> > + dev_warn(i2s->dev, "fail to clear\n"); >> > + break; >> > } >> > } >> > } >> > -- >> > 2.6.3.462.gbe2c914 >> >> Using my Veyron Jerry Chromebook wiht latest kernel I found that the >> speakers doesn't work. Bisect points to this patch as the offending >> commit. However your changes looks reasonable the fact is that >> reverting the patch makes the audio work again on my device. I need to >> dig a bit more into the issue, but meanwhile, any idea on what is >> happening ? Can I ask which device did you test? > > I tested this on a Radxa Rock2 square. This change fixed an issue I > found when running separate processes for playback and recording (I was > testing with arecord and speaker-test IIRC) but I don't think that > should be relevant. I just read through the patch again and I can't see > anything obviously wrong so I'm afraid I don't have any idea what's > causing the problem you're seeing. > By chance, do you have a git repo containing the changes required to test the sound on Radxa Rock2? Guess this is not in mainline. Thanks, Enric > > John

1 0

[alsa-devel] [PATCH 0/2] ASoC: Intel: Skylake: Add HDA link management
by Vinod Koul 02 May '16

02 May '16

HDA links are always kept On, this patch adds link management routines in hdac extended core and it's use in Skylake driver. One more patch to add support in codec will follow this The aim of serial is to shut down the links when not in use and keep them active when a user is active. The user can activate link by taking reference to the link when required. When all links are shutdown, the command DMAs are turned off as well. On first link power up, the command DMAs are turned on first. First patch touches HDA core, and second one is dependent on it so Takashi if you are okay, pls ACK it and we cna merge thru ASoC tree Vinod Koul (2): ALSA: hdac: add link pm and ref counting ASoC: Intel: Skylake: add link mangement include/sound/hdaudio_ext.h | 13 ++++++++ sound/hda/ext/hdac_ext_bus.c | 3 ++ sound/hda/ext/hdac_ext_controller.c | 62 +++++++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-pcm.c | 1 - sound/soc/intel/skylake/skl.c | 34 ++++++++++++++++++++ 5 files changed, 112 insertions(+), 1 deletion(-) -- 1.9.1

2 4

[alsa-devel] [PATCH v4 0/3]: conf: topology: Add the conf for SKL-rt286
by Vinod Koul 02 May '16

02 May '16

This series adds SKL-i2c conf for simple PCM topology graph Changes in v4: - add back the pre-compiled binary blobs - remove running the binary on intsall step Changes in v3: - remove bin blobs, now they are generated in install step - hook the tool compilation to alsa-lib and run it on install - add u8 in alsa type_compat.h Shreyas NC (3): conf: topology: Add Skylake i2s conf Add u8 in type_compat.h conf: topology: Generate Private data binary blobs configure.ac | 2 + include/sound/type_compat.h | 2 + src/conf/topology/Makefile.am | 2 +- src/conf/topology/sklrt286/Makefile.am | 5 + src/conf/topology/sklrt286/codec0_in-cpr-1.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/codec0_in-mi.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/codec0_out-cpr-4.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/codec0_out-mo.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/codec1_out-cpr-5.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/codec1_out-mo.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/data/Makefile.am | 4 + src/conf/topology/sklrt286/data/pvt.c | 1815 ++++++++++++++++++++ src/conf/topology/sklrt286/data/pvt_data.c | 90 + src/conf/topology/sklrt286/data/pvt_local.h | 9 + .../topology/sklrt286/data/skl-tplg-interface.h | 232 +++ .../topology/sklrt286/dmic01_hifi_in-cpr-3.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/media0_in-cpr-0.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/media0_in-mi.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/media0_out-cpr-6.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/media0_out-mo.bin | Bin 0 -> 4244 bytes src/conf/topology/sklrt286/skl_i2s.conf | 342 ++++ 28 files changed, 2502 insertions(+), 1 deletion(-) create mode 100644 src/conf/topology/sklrt286/Makefile.am create mode 100644 src/conf/topology/sklrt286/codec0_in-cpr-1.bin create mode 100644 src/conf/topology/sklrt286/codec0_in-mi.bin create mode 100644 src/conf/topology/sklrt286/codec0_out-cpr-4.bin create mode 100644 src/conf/topology/sklrt286/codec0_out-mo.bin create mode 100644 src/conf/topology/sklrt286/codec1_out-cpr-5.bin create mode 100644 src/conf/topology/sklrt286/codec1_out-mo.bin create mode 100644 src/conf/topology/sklrt286/data/Makefile.am create mode 100644 src/conf/topology/sklrt286/data/pvt.c create mode 100644 src/conf/topology/sklrt286/data/pvt_data.c create mode 100644 src/conf/topology/sklrt286/data/pvt_local.h create mode 100644 src/conf/topology/sklrt286/data/skl-tplg-interface.h create mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-cpr-3.bin create mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin create mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin create mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin create mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin create mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin create mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin create mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin create mode 100644 src/conf/topology/sklrt286/media0_in-cpr-0.bin create mode 100644 src/conf/topology/sklrt286/media0_in-mi.bin create mode 100644 src/conf/topology/sklrt286/media0_out-cpr-6.bin create mode 100644 src/conf/topology/sklrt286/media0_out-mo.bin create mode 100644 src/conf/topology/sklrt286/skl_i2s.conf -- 1.9.1

2 5

[alsa-devel] [PATCH 0/4] Decouple X86_32 dependency from the ISA Kconfig option
by William Breathitt Gray 01 May '16

01 May '16

This patchset is based on top of commit 3a3a5fece6f2 ("fs: kernfs: Replace CURRENT_TIME by current_fs_time()") of the driver-core-testing branch of the driver-core repository. The introduction of the ISA_BUS option in commit b3c1be1b789c ("base: isa: Remove X86_32 dependency") blocks the compilation of ISA drivers on non-x86 platforms. The ISA_BUS configuration option should not be necessary if the X86_32 dependency can be decoupled from the ISA configuration option. This patchset both removes the ISA_BUS configuration option entirely and decouples the X86_32 dependency from the ISA configuration option. The PNPBIOS driver requires preprocessor defines (located in include/asm/segment.h) only declared if the architecture is set to X86_32. If the architecture is set to X86_64, the PNPBIOS driver will not build properly. The X86 dependecy for the PNPBIOS configuration option is changed to an explicit X86_32 dependency in order to prevent an attempt to build for an unsupported architecture. Changes to the ISA SSCAPE and SCSI ULTRASTOR drivers are also included. The relevant patches simply fix format string identifier mismatches exposed during an attempted X86_64 compilation after the decoupling of the X86_32 dependency from the ISA configuration option. These patches fix compilation warnings rather than errors, but the solutions were so trivial that I decided to include them in this patchset. If it would be inappropriate to include them in this patchset, let me know and I will rebase to remove the relevant patches. William Breathitt Gray (4): pnp: pnpbios: Add explicit X86_32 dependency to PNPBIOS sound: isa: sscape: Use correct format identifier for size_t scsi: ultrastor: Use correct format identifier for kernel pointer isa: Remove the ISA_BUS Kconfig option arch/x86/Kconfig | 10 ++-------- drivers/base/Makefile | 2 +- drivers/pnp/pnpbios/Kconfig | 2 +- drivers/scsi/ultrastor.c | 8 ++++---- include/linux/isa.h | 2 +- sound/isa/sscape.c | 2 +- 6 files changed, 10 insertions(+), 16 deletions(-) -- 2.7.3

5 15

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Alsa-devel May 2016