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

Re: [alsa-devel] bytcr_rt5640.c:(.text+0x1593b4): undefined reference to `sst_acpi_find_name_from_hid'
by Randy Dunlap 02 May '16

02 May '16

On 03/29/16 07:21, Borislav Petkov wrote: > Hi guys, > > I'm seeing a bunch of those errors today on randconfig builds: > > sound/built-in.o: In function `snd_byt_rt5640_mc_probe': > bytcr_rt5640.c:(.text+0x1593b4): undefined reference to `sst_acpi_find_name_from_hid' > make: *** [vmlinux] Error 1 > > ERROR: "sst_acpi_find_name_from_hid" [sound/soc/intel/boards/snd-soc-sst-bytcr-rt5640.ko] undefined! > make[1]: *** [__modpost] Error 1 > make: *** [modules] Error 2 > make: *** Waiting for unfinished jobs.... > > Some of the failing configs attached. > I have 2 patches for this. I'll send them right away. -- ~Randy

2 1

[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

[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

[alsa-devel] strange link on alsa-project.org, possibly a spam link
by humbert.olivier.1＠free.fr 30 Apr '16

30 Apr '16

Hi all just to let you know that there is a strange link in http://www.alsa-project.org/main/index.php/Main_Page See this screenshot : http://pix.toile-libre.org/upload/original/1461883624.png This "strange link" is under the white pointing-down arrow on the blue background circle It is linking to a "cheap holiday" booking webpage and someone on alsa@freenode suggested it looks to be one of those 'domain not used' redirects which I do agree. This link has been introduced back in August 2007 the 10th following this change : http://www.alsa-project.org/main/index.php?title=Main_Page&diff=698&oldid=6… I thought you might want to know. All the best to you all and thanks for the work done on ALSA. Cheers, Olivier

2 2

[alsa-devel] [PATCH 1/2] ASoC: rockchip: i2s: separate capture and playback
by John Keeping 29 Apr '16

29 Apr '16

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

3 5

[alsa-devel] [PATCH] ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2)
by Takashi Iwai 29 Apr '16

29 Apr '16

Phoenix Audio MT202pcs (1de7:0114) and MT202exe (1de7:0013) need the same workaround as TMX320 for avoiding the firmware bug. It fixes the frequent error about the sample rate inquiries and the slow device probe as consequence. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=117321 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0adfd9537cf7..7b6dca2d7488 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1138,7 +1138,9 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */ case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ + case USB_ID(0x1de7, 0x0013): /* Phoenix Audio MT202exe */ case USB_ID(0x1de7, 0x0014): /* Phoenix Audio TMX320 */ + case USB_ID(0x1de7, 0x0114): /* Phoenix Audio MT202pcs */ case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */ return true; } -- 2.8.1

1 0

[alsa-devel] [PATCH] ALSA: usb-audio: Quirk for yet another Phoenix Audio device
by Takashi Iwai 29 Apr '16

29 Apr '16

Phoenix Audio MT202pcs (1de7:0114) needs the same workaround as TMX320 for avoiding the firmware bug. It fixes the frequent error about the sample rate inquiries and the slow device probe as consequence. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=117321 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0adfd9537cf7..c07facfe6699 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1139,6 +1139,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */ case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ case USB_ID(0x1de7, 0x0014): /* Phoenix Audio TMX320 */ + case USB_ID(0x1de7, 0x0114): /* Phoenix Audio MT202pcs */ case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */ return true; } -- 2.8.1

1 1

[alsa-devel] [PATCH 1/1] ASoC: fsl_ssi: add CCSR_SSI_SOR to volatile register list
by Caleb Crome 29 Apr '16

29 Apr '16

Due to caching, SOR wasn't written when it should have been. This patch simply adds SOR to the volatile list. Signed-off-by: Caleb Crome <caleb(a)crome.org> --- sound/soc/fsl/fsl_ssi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 216e3cb..2f3bf9c 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -151,6 +151,7 @@ static bool fsl_ssi_volatile_reg(struct device *dev, unsigned int reg) case CCSR_SSI_SACDAT: case CCSR_SSI_SATAG: case CCSR_SSI_SACCST: + case CCSR_SSI_SOR: return true; default: return false; -- 1.9.1

2 3

[alsa-devel] [PATCH] ALSA: usb-audio: Limit retrying sample rate reads
by Takashi Iwai 29 Apr '16

29 Apr '16

There are many USB audio devices with buggy firmware that don't react with the sample rate reading properly. This often results in the flood of error messages and slowing down the operation. The sample rate read back is basically only for confirming the sample rate setup, and it's not critically important. As a compromise, in this patch, we stop the sample rate read back once when the device gives errors more than tolerance (twice, as of now). This should improve most of error cases while we still can catch the firmware bugginess. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/clock.c | 4 ++++ sound/usb/usbaudio.h | 1 + 2 files changed, 5 insertions(+) diff --git a/sound/usb/clock.c b/sound/usb/clock.c index 7ccbcaf6a147..26dd5f20f149 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -309,6 +309,9 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface, * support reading */ if (snd_usb_get_sample_rate_quirk(chip)) return 0; + /* the firmware is likely buggy, don't repeat to fail too many times */ + if (chip->sample_rate_read_error > 2) + return 0; if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR, USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_IN, @@ -316,6 +319,7 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface, data, sizeof(data))) < 0) { dev_err(&dev->dev, "%d:%d: cannot get freq at ep %#x\n", iface, fmt->altsetting, ep); + chip->sample_rate_read_error++; return 0; /* some devices don't support reading */ } diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index a161c7c1b126..89b6853030de 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -50,6 +50,7 @@ struct snd_usb_audio { int num_interfaces; int num_suspended_intf; + int sample_rate_read_error; struct list_head pcm_list; /* list of pcm streams */ struct list_head ep_list; /* list of audio-related endpoints */ -- 2.8.1

1 0

[alsa-devel] [PATCH v2 1/1] ASoC: fsl_ssi: add CCSR_SSI_SOR to volatile register list
by Caleb Crome 29 Apr '16

29 Apr '16

The CCSR_SSI_SOR is a register that clears the TX and/or the RX fifo on the i.MX SSI port. The fsl_ssi_trigger writes this register in order to clear the fifo at trigger time. However, since the CCSR_SSI_SOR register is not in the volatile list, the caching mechanism prevented the register write in the trigger function. This caused the fifo to not be cleared (because the value was unchanged from the last time the register was written), and thus causes the channels in both TDM or simple I2S mode to slip and be in the wrong time slots on SSI restart. This has gone unnoticed for so long because with simple stereo mode, the consequence is that left and right are swapped, which isn't that noticeable. However, it's catestrophic in some systems that require the channels to be in the right slots. Signed-off-by: Caleb Crome <caleb(a)crome.org> Suggested-by: Arnaud Mouiche <arnaud.mouiche(a)invoxia.com> --- sound/soc/fsl/fsl_ssi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 216e3cb..2f3bf9c 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -151,6 +151,7 @@ static bool fsl_ssi_volatile_reg(struct device *dev, unsigned int reg) case CCSR_SSI_SACDAT: case CCSR_SSI_SATAG: case CCSR_SSI_SACCST: + case CCSR_SSI_SOR: return true; default: return false; -- 1.9.1

3 2

[alsa-devel] sound on asus x205ta
by Michele Curti 28 Apr '16

28 Apr '16

On Thu, Mar 03, 2016 at 10:20:55AM -0600, Pierre-Louis Bossart wrote: > On 3/3/16 5:27 AM, Vinod Koul wrote: > >On Thu, Mar 03, 2016 at 12:11:10PM +0100, Michele Curti wrote: > >>Hi Vinod, > >> > >>>>[ 7.970937] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 > >>>>[ 7.970964] intel_sst_acpi 80860F28:00: fw returned err -16 > >>>Yes this is a problem, which FW are you using > > > >Have you tried the recent kernels, Pierre did a bunch of update and got many > >things working. > > > >As for timeout, that simply means we have send a message to DSP which failed > >to get a response. Perhpas the message had some bad element of FW had a > >bug/crashed... > > The firmware timeout is due to a change in the BIOS for BYT-CR devices that > impacts the IPC interrupt number, I have a set of patches that fix this on > Asus T100TAF but I still can't get any sound out. > Hi! So, it seems I got dsp interrupts after the timeout errors. I added dev_dbg(drv->dev, "Interrupt received\n"); to the intel_sst_interrupt_mrfld() function [zio@asus ~]$ dmesg | grep "Interrupt received" | wc -l 105 [zio@asus ~]$ cat /proc/interrupts | grep sst 1: 105 0 0 0 IO-APIC 29-fasteoi intel_sst_driver [zio@asus ~]$ dmesg | grep intel_sst [ 3.003961] intel_sst_acpi 80860F28:00: LPE base: 0x90a00000 size:0x200000 [ 3.003970] intel_sst_acpi 80860F28:00: IRAM base: 0x90ac0000 [ 3.004002] intel_sst_acpi 80860F28:00: DRAM base: 0x90b00000 [ 3.004013] intel_sst_acpi 80860F28:00: SHIM base: 0x90b40000 [ 3.004024] intel_sst_acpi 80860F28:00: Mailbox base: 0x90b44000 [ 3.004033] intel_sst_acpi 80860F28:00: DDR base: 0x20000000 [ 3.004260] intel_sst_acpi 80860F28:00: Got drv data max stream 25 [ 3.004388] intel_sst_acpi 80860F28:00: Registered IRQ 0x1 [ 3.004396] intel_sst_acpi 80860F28:00: Requesting FW intel/fw_sst_0f28_ssp0.bin now... [ 3.004792] intel_sst_acpi 80860F28:00: LPE is already in RESET state, No action [ 3.024222] intel_sst_acpi 80860F28:00: Enter [ 3.024232] intel_sst_acpi 80860F28:00: Request Fw completed [ 3.024507] intel_sst_acpi 80860F28:00: copied fw to ffff88007a900000 [ 3.024514] intel_sst_acpi 80860F28:00: phys: 7a900000 [ 3.024933] intel_sst_acpi 80860F28:00: Enter [ 3.024943] intel_sst_acpi 80860F28:00: header sign=$SST\xffffff96\xffffffb4 [ 3.024949] intel_sst_acpi 80860F28:00: module sign $SST\xffffff82\xffffffb4 [ 3.024955] intel_sst_acpi 80860F28:00: module entrypoint 0x0 [ 4.905820] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 4.905833] intel_sst_acpi 80860F28:00: fw returned err -16 [ 5.905864] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 5.905891] intel_sst_acpi 80860F28:00: fw returned err -16 [ 6.905818] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 6.905838] intel_sst_acpi 80860F28:00: fw returned err -16 [ 7.905823] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 7.905849] intel_sst_acpi 80860F28:00: fw returned err -16 [ 8.905820] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 8.905847] intel_sst_acpi 80860F28:00: fw returned err -16 [ 9.905830] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 9.905857] intel_sst_acpi 80860F28:00: fw returned err -16 [ 10.905828] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 10.905855] intel_sst_acpi 80860F28:00: fw returned err -16 [ 11.905826] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 11.905853] intel_sst_acpi 80860F28:00: fw returned err -16 [ 12.905828] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 12.905854] intel_sst_acpi 80860F28:00: fw returned err -16 [ 13.905819] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 13.905843] intel_sst_acpi 80860F28:00: fw returned err -16 [ 14.925811] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 14.925836] intel_sst_acpi 80860F28:00: fw returned err -16 [ 15.925823] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 15.925850] intel_sst_acpi 80860F28:00: fw returned err -16 [ 16.925819] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 16.925844] intel_sst_acpi 80860F28:00: fw returned err -16 [ 17.925818] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 17.925841] intel_sst_acpi 80860F28:00: fw returned err -16 [ 18.925821] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 18.925845] intel_sst_acpi 80860F28:00: fw returned err -16 [ 19.925810] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 19.925834] intel_sst_acpi 80860F28:00: fw returned err -16 [ 20.925788] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 20.925809] intel_sst_acpi 80860F28:00: fw returned err -16 [ 21.925821] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 21.925846] intel_sst_acpi 80860F28:00: fw returned err -16 [ 22.920830] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 22.920856] intel_sst_acpi 80860F28:00: fw returned err -16 [ 23.884836] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 23.884859] intel_sst_acpi 80860F28:00: fw returned err -16 [ 24.853161] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 24.853174] intel_sst_acpi 80860F28:00: fw returned err -16 [ 25.825400] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 25.825427] intel_sst_acpi 80860F28:00: fw returned err -16 [ 26.800986] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 26.801008] intel_sst_acpi 80860F28:00: fw returned err -16 [ 27.779566] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 27.779592] intel_sst_acpi 80860F28:00: fw returned err -16 [ 28.760784] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 28.760809] intel_sst_acpi 80860F28:00: fw returned err -16 [ 29.744302] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 29.744328] intel_sst_acpi 80860F28:00: fw returned err -16 [ 30.729854] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 30.729881] intel_sst_acpi 80860F28:00: fw returned err -16 [ 31.717175] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 31.717202] intel_sst_acpi 80860F28:00: fw returned err -16 [ 32.706075] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 32.706102] intel_sst_acpi 80860F28:00: fw returned err -16 [ 33.696343] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 33.696367] intel_sst_acpi 80860F28:00: fw returned err -16 [ 34.687818] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 34.687844] intel_sst_acpi 80860F28:00: fw returned err -16 [ 35.680357] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 35.680383] intel_sst_acpi 80860F28:00: fw returned err -16 [ 36.673818] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 36.673844] intel_sst_acpi 80860F28:00: fw returned err -16 [ 37.668111] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 37.668135] intel_sst_acpi 80860F28:00: fw returned err -16 [ 38.663091] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 38.663118] intel_sst_acpi 80860F28:00: fw returned err -16 [ 39.658680] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 39.658691] intel_sst_acpi 80860F28:00: fw returned err -16 [ 40.654812] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 40.654824] intel_sst_acpi 80860F28:00: fw returned err -16 [ 41.651466] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 41.651479] intel_sst_acpi 80860F28:00: fw returned err -16 [ 42.648513] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3 [ 42.648525] intel_sst_acpi 80860F28:00: fw returned err -16 [ 43.645942] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 43.645952] intel_sst_acpi 80860F28:00: fw returned err -16 [ 45.052845] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 45.052873] intel_sst_acpi 80860F28:00: fw returned err -16 [ 46.050948] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 46.050960] intel_sst_acpi 80860F28:00: fw returned err -16 [ 47.049320] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 47.049331] intel_sst_acpi 80860F28:00: fw returned err -16 [ 48.047885] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 48.047896] intel_sst_acpi 80860F28:00: fw returned err -16 [ 49.046627] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 49.046638] intel_sst_acpi 80860F28:00: fw returned err -16 [ 50.045542] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 50.045553] intel_sst_acpi 80860F28:00: fw returned err -16 [ 51.044603] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 51.044632] intel_sst_acpi 80860F28:00: fw returned err -16 [ 52.043787] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 52.043815] intel_sst_acpi 80860F28:00: fw returned err -16 [ 53.043030] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 53.043056] intel_sst_acpi 80860F28:00: fw returned err -16 [ 54.042669] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 54.042696] intel_sst_acpi 80860F28:00: fw returned err -16 [ 55.045310] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 55.045337] intel_sst_acpi 80860F28:00: fw returned err -16 [ 56.047789] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 56.047815] intel_sst_acpi 80860F28:00: fw returned err -16 [ 57.050159] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 57.050185] intel_sst_acpi 80860F28:00: fw returned err -16 [ 58.052350] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 58.052362] intel_sst_acpi 80860F28:00: fw returned err -16 [ 59.054494] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 59.054521] intel_sst_acpi 80860F28:00: fw returned err -16 [ 60.056485] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 60.056511] intel_sst_acpi 80860F28:00: fw returned err -16 [ 61.058360] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 61.058385] intel_sst_acpi 80860F28:00: fw returned err -16 [ 62.060160] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 62.060189] intel_sst_acpi 80860F28:00: fw returned err -16 [ 63.061829] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 63.061840] intel_sst_acpi 80860F28:00: fw returned err -16 [ 64.063443] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 64.063469] intel_sst_acpi 80860F28:00: fw returned err -16 [ 65.064970] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 65.064997] intel_sst_acpi 80860F28:00: fw returned err -16 [ 66.066390] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 66.066403] intel_sst_acpi 80860F28:00: fw returned err -16 [ 67.067803] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 67.067829] intel_sst_acpi 80860F28:00: fw returned err -16 [ 68.069108] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 68.069134] intel_sst_acpi 80860F28:00: fw returned err -16 [ 69.070353] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 69.070380] intel_sst_acpi 80860F28:00: fw returned err -16 [ 70.071530] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 70.071553] intel_sst_acpi 80860F28:00: fw returned err -16 [ 71.072665] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 71.072692] intel_sst_acpi 80860F28:00: fw returned err -16 [ 72.077040] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 72.077050] intel_sst_acpi 80860F28:00: fw returned err -16 [ 73.078102] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 73.078128] intel_sst_acpi 80860F28:00: fw returned err -16 [ 74.079073] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 74.079099] intel_sst_acpi 80860F28:00: fw returned err -16 [ 75.080034] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 75.080060] intel_sst_acpi 80860F28:00: fw returned err -16 [ 76.080922] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 76.080949] intel_sst_acpi 80860F28:00: fw returned err -16 [ 77.081768] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 77.081794] intel_sst_acpi 80860F28:00: fw returned err -16 [ 78.082592] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 78.082617] intel_sst_acpi 80860F28:00: fw returned err -16 [ 79.083395] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 79.083422] intel_sst_acpi 80860F28:00: fw returned err -16 [ 80.084155] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 80.084181] intel_sst_acpi 80860F28:00: fw returned err -16 [ 81.084883] intel_sst_acpi 80860F28:00: Wait timed-out condition:0x0, msg_id:0x2 fw_state 0x3 [ 81.084910] intel_sst_acpi 80860F28:00: fw returned err -16 [ 81.187135] intel_sst_acpi 80860F28:00: sst_load_fw [ 81.187162] intel_sst_acpi 80860F28:00: sst: Resetting the DSP in mrfld [ 81.187174] intel_sst_acpi 80860F28:00: value:0x1e40001 [ 81.187184] intel_sst_acpi 80860F28:00: value:0x1e40007 [ 81.187193] intel_sst_acpi 80860F28:00: value:0x1e40006 [ 81.229015] intel_sst_acpi 80860F28:00: config written to DCCM [ 81.229024] intel_sst_acpi 80860F28:00: sst: Starting the DSP in mrfld LALALALA [ 81.229030] intel_sst_acpi 80860F28:00: value:0x1e40006 [ 81.229035] intel_sst_acpi 80860F28:00: value:0x1e40007 [ 81.229041] intel_sst_acpi 80860F28:00: sst: Starting the DSP_merrifield:1e40802 [ 81.239680] intel_sst_acpi 80860F28:00: Interrupt received [ 81.239999] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240040] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240113] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240165] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240232] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240252] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240322] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240357] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240423] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240451] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240517] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240538] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240601] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240632] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240695] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240719] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240785] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240817] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240883] intel_sst_acpi 80860F28:00: Interrupt received [ 81.240956] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241029] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241099] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241176] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241218] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241298] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241340] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241413] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241451] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241475] intel_sst_acpi 80860F28:00: FW sent error response 0x5000e [ 81.241528] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241552] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241580] intel_sst_acpi 80860F28:00: FW sent error response 0x5000e [ 81.241638] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241661] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241692] intel_sst_acpi 80860F28:00: FW sent error response 0x5000e [ 81.241734] intel_sst_acpi 80860F28:00: Interrupt received [ 81.241999] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242069] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242096] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242145] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242298] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242340] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242400] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242431] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242550] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242570] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242689] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242807] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242828] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242888] intel_sst_acpi 80860F28:00: Interrupt received [ 81.242919] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243012] intel_sst_acpi 80860F28:00: FW sent async error msg: [ 81.243029] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243048] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243163] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243277] intel_sst_acpi 80860F28:00: fw load successful!!! [ 81.243279] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243307] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243384] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243460] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243503] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243541] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243614] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243653] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243684] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243715] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243757] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243789] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243820] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243860] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243911] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243953] intel_sst_acpi 80860F28:00: Interrupt received [ 81.243994] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244036] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244078] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244120] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244170] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244213] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244257] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244298] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244340] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244382] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244423] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244472] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244517] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244639] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244769] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244792] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244915] intel_sst_acpi 80860F28:00: Interrupt received [ 81.244956] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245058] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245187] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245316] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245424] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245479] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245532] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245579] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245623] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245672] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245706] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245748] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245786] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245816] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245880] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245931] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245967] intel_sst_acpi 80860F28:00: Interrupt received [ 81.245997] intel_sst_acpi 80860F28:00: Interrupt received [ 81.246050] intel_sst_acpi 80860F28:00: Interrupt received [ 84.180360] intel_sst_acpi 80860F28:00: Interrupt received [ 84.180479] intel_sst_acpi 80860F28:00: sst: Resetting the DSP in mrfld [ 84.180507] intel_sst_acpi 80860F28:00: value:0x1e4080a [ 84.180524] intel_sst_acpi 80860F28:00: value:0x1e40807 [ 84.180539] intel_sst_acpi 80860F28:00: value:0x1e40806 Am I doing something wrong? Any hints? Thanks, Michele My changes: Signed-off-by: Michele Curti <michele.curti(a)gmail.com> --- sound/soc/codecs/rt5645.c | 2 + sound/soc/intel/Kconfig | 13 ++ sound/soc/intel/atom/sst/sst.c | 3 + sound/soc/intel/atom/sst/sst_acpi.c | 4 +- sound/soc/intel/atom/sst/sst_loader.c | 1 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bytcr_rt5645.c | 332 ++++++++++++++++++++++++++++++++++ 7 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/boards/bytcr_rt5645.c diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 7af5e73..c48e5c8 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3524,6 +3524,7 @@ static const struct regmap_config temp_regmap = { static const struct i2c_device_id rt5645_i2c_id[] = { { "rt5645", 0 }, + { "rt5648", 0 }, { "rt5650", 0 }, { } }; @@ -3532,6 +3533,7 @@ MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id); #ifdef CONFIG_ACPI static const struct acpi_device_id rt5645_acpi_match[] = { { "10EC5645", 0 }, + { "10EC5648", 0 }, { "10EC5650", 0 }, {}, }; diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index b3e6c23..46b7f8b 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -108,6 +108,19 @@ config SND_SOC_INTEL_BYTCR_RT5640_MACH Say Y if you have such a device If unsure select "N". +config SND_SOC_INTEL_BYTCR_RT5645_MACH + tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5645 codec" + depends on X86 && I2C + select SND_SOC_RT5645 + select SND_SST_MFLD_PLATFORM + select SND_SST_IPC_ACPI + select SND_SOC_INTEL_SST_MATCH if ACPI + help + This adds support for ASoC machine driver for Intel(R) Baytrail and Baytrail-CR + platforms with RT5645 audio codec. + Say Y if you have such a device + If unsure select "N". + config SND_SOC_INTEL_BYTCR_RT5651_MACH tristate "ASoC Audio driver for Intel Baytrail and Baytrail-CR with RT5651 codec" depends on X86 && I2C diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c index a4b458e..3ffdb2e 100644 --- a/sound/soc/intel/atom/sst/sst.c +++ b/sound/soc/intel/atom/sst/sst.c @@ -19,6 +19,7 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#define DEBUG 1 #include <linux/module.h> #include <linux/fs.h> #include <linux/interrupt.h> @@ -58,6 +59,8 @@ static irqreturn_t intel_sst_interrupt_mrfld(int irq, void *context) unsigned int size = 0; struct intel_sst_drv *drv = (struct intel_sst_drv *) context; irqreturn_t retval = IRQ_HANDLED; + + dev_dbg(drv->dev, "Interrupt received\n"); /* Interrupt arrived, check src */ isr.full = sst_shim_read64(drv->shim, SST_ISRX); diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index 3bc4b63..38447d2 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -109,7 +109,7 @@ static const struct sst_res_info byt_rvp_res_info = { .mbox_size = 0x1000, .acpi_lpe_res_index = 0, .acpi_ddr_index = 2, - .acpi_ipc_irq_index = 5, + .acpi_ipc_irq_index = 0, }; static struct sst_platform_info byt_rvp_platform_data = { @@ -327,6 +327,8 @@ static struct sst_acpi_mach sst_acpi_bytcr[] = { &byt_rvp_platform_data }, {"INTCCFFD", "bytcr_rt5640", "intel/fw_sst_0f28.bin", "bytcr_rt5640", NULL, &byt_rvp_platform_data }, + {"10EC5648", "bytcr_rt5645", "intel/fw_sst_0f28_ssp0.bin", "bytcr_rt5645", NULL, + &byt_rvp_platform_data }, {"10EC5651", "bytcr_rt5651", "intel/fw_sst_0f28.bin", "bytcr_rt5651", NULL, &byt_rvp_platform_data }, {}, diff --git a/sound/soc/intel/atom/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c index 3391714..9b750ed 100644 --- a/sound/soc/intel/atom/sst/sst_loader.c +++ b/sound/soc/intel/atom/sst/sst_loader.c @@ -22,6 +22,7 @@ * This file contains all dsp controlling functions like firmware download, * setting/resetting dsp cores, etc */ +#define DEBUG 1 #include <linux/pci.h> #include <linux/delay.h> #include <linux/fs.h> diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index 3310c0f..af24d39 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -3,6 +3,7 @@ snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o snd-soc-sst-broadwell-objs := broadwell.o snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o +snd-soc-sst-bytcr-rt5645-objs := bytcr_rt5645.o snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o @@ -16,6 +17,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o +obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5645_MACH) += snd-soc-sst-bytcr-rt5645.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o diff --git a/sound/soc/intel/boards/bytcr_rt5645.c b/sound/soc/intel/boards/bytcr_rt5645.c new file mode 100644 index 0000000..4974d6b --- /dev/null +++ b/sound/soc/intel/boards/bytcr_rt5645.c @@ -0,0 +1,332 @@ +/* + * bytcr_rt5645.c - ASoc Machine driver for Intel Byt CR platform + * (derived from bytcr_rt5640.c) + * + * Copyright (C) 2015 Intel Corp + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/acpi.h> +#include <linux/device.h> +#include <linux/dmi.h> +#include <linux/slab.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include "../../codecs/rt5645.h" +#include "../atom/sst-atom-controls.h" + +static const struct snd_soc_dapm_widget byt_rt5645_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("Internal Mic", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), +}; + +static const struct snd_soc_dapm_route byt_rt5645_audio_map[] = { + {"AIF1 Playback", NULL, "ssp2 Tx"}, + {"ssp2 Tx", NULL, "codec_out0"}, + {"ssp2 Tx", NULL, "codec_out1"}, + {"codec_in0", NULL, "ssp2 Rx"}, + {"codec_in1", NULL, "ssp2 Rx"}, + {"ssp2 Rx", NULL, "AIF1 Capture"}, + + {"Headset Mic", NULL, "micbias1"}, /* lowercase for rt5645 */ + {"IN2P", NULL, "Headset Mic"}, + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"Speaker", NULL, "LOUTL"}, + {"Speaker", NULL, "LOUTR"}, +}; + +static const struct snd_soc_dapm_route byt_rt5645_intmic_dmic1_map[] = { + {"DMIC1", NULL, "Internal Mic"}, +}; + +static const struct snd_soc_dapm_route byt_rt5645_intmic_dmic2_map[] = { + {"DMIC2", NULL, "Internal Mic"}, +}; + +static const struct snd_soc_dapm_route byt_rt5645_intmic_in1_map[] = { + {"Internal Mic", NULL, "micbias1"}, + {"IN1P", NULL, "Internal Mic"}, +}; + +enum { + BYT_RT5645_DMIC1_MAP, + BYT_RT5645_DMIC2_MAP, + BYT_RT5645_IN1_MAP, +}; + +#define BYT_RT5645_MAP(quirk) ((quirk) & 0xff) +#define BYT_RT5645_DMIC_EN BIT(16) + +static unsigned long byt_rt5645_quirk = BYT_RT5645_DMIC1_MAP | + BYT_RT5645_DMIC_EN; + +static const struct snd_kcontrol_new byt_rt5645_controls[] = { + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("Internal Mic"), + SOC_DAPM_PIN_SWITCH("Speaker"), +}; + +static int byt_rt5645_aif1_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + snd_soc_dai_set_bclk_ratio(codec_dai, 50); + + ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1, + params_rate(params) * 512, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec clock %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_BCLK1, + params_rate(params) * 50, + params_rate(params) * 512); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); + return ret; + } + + return 0; +} + +static const struct dmi_system_id byt_rt5645_quirk_table[] = { + {} +}; + +static int byt_rt5645_init(struct snd_soc_pcm_runtime *runtime) +{ + int ret; + struct snd_soc_card *card = runtime->card; + const struct snd_soc_dapm_route *custom_map; + int num_routes; + + card->dapm.idle_bias_off = true; + + dmi_check_system(byt_rt5645_quirk_table); + switch (BYT_RT5645_MAP(byt_rt5645_quirk)) { + case BYT_RT5645_IN1_MAP: + custom_map = byt_rt5645_intmic_in1_map; + num_routes = ARRAY_SIZE(byt_rt5645_intmic_in1_map); + break; + case BYT_RT5645_DMIC2_MAP: + custom_map = byt_rt5645_intmic_dmic2_map; + num_routes = ARRAY_SIZE(byt_rt5645_intmic_dmic2_map); + break; + default: + custom_map = byt_rt5645_intmic_dmic1_map; + num_routes = ARRAY_SIZE(byt_rt5645_intmic_dmic1_map); + } + + ret = snd_soc_add_card_controls(card, byt_rt5645_controls, + ARRAY_SIZE(byt_rt5645_controls)); + if (ret) { + dev_err(card->dev, "unable to add card controls\n"); + return ret; + } + snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone"); + snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker"); + + return ret; +} + +static const struct snd_soc_pcm_stream byt_rt5645_dai_params = { + .formats = SNDRV_PCM_FMTBIT_S24_LE, + .rate_min = 48000, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, +}; + +static int byt_rt5645_codec_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + int ret; + + /* The DSP will covert the FE rate to 48k, stereo, 24bits */ + rate->min = rate->max = 48000; + channels->min = channels->max = 2; + + /* set SSP2 to 24-bit */ + params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); + + /* + * Default mode for SSP configuration is TDM 4 slot, override config + * with explicit setting to I2S 2ch 24-bit. The word length is set with + * dai_set_tdm_slot() since there is no other API exposed + */ + ret = snd_soc_dai_set_fmt(rtd->cpu_dai, + SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_IF | + SND_SOC_DAIFMT_CBS_CFS + ); + + if (ret < 0) { + dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, 24); + if (ret < 0) { + dev_err(rtd->dev, "can't set I2S config, err %d\n", ret); + return ret; + } + + return 0; +} + +static unsigned int rates_48000[] = { + 48000, +}; + +static struct snd_pcm_hw_constraint_list constraints_48000 = { + .count = ARRAY_SIZE(rates_48000), + .list = rates_48000, +}; + +static int byt_rt5645_aif1_startup(struct snd_pcm_substream *substream) +{ + return snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_48000); +} + +static struct snd_soc_ops byt_rt5645_aif1_ops = { + .startup = byt_rt5645_aif1_startup, +}; + +static struct snd_soc_ops byt_rt5645_be_ssp2_ops = { + .hw_params = byt_rt5645_aif1_hw_params, +}; + +static struct snd_soc_dai_link byt_rt5645_dais[] = { + [MERR_DPCM_AUDIO] = { + .name = "Audio Port", + .stream_name = "Audio", + .cpu_dai_name = "media-cpu-dai", + .codec_dai_name = "snd-soc-dummy-dai", + .codec_name = "snd-soc-dummy", + .platform_name = "sst-mfld-platform", + .ignore_suspend = 1, + .nonatomic = true, + .dynamic = 1, + .dpcm_playback = 1, + .dpcm_capture = 1, + .ops = &byt_rt5645_aif1_ops, + }, + [MERR_DPCM_DEEP_BUFFER] = { + .name = "Deep-Buffer Audio Port", + .stream_name = "Deep-Buffer Audio", + .cpu_dai_name = "deepbuffer-cpu-dai", + .codec_dai_name = "snd-soc-dummy-dai", + .codec_name = "snd-soc-dummy", + .platform_name = "sst-mfld-platform", + .ignore_suspend = 1, + .nonatomic = true, + .dynamic = 1, + .dpcm_playback = 1, + .ops = &byt_rt5645_aif1_ops, + }, + [MERR_DPCM_COMPR] = { + .name = "Compressed Port", + .stream_name = "Compress", + .cpu_dai_name = "compress-cpu-dai", + .codec_dai_name = "snd-soc-dummy-dai", + .codec_name = "snd-soc-dummy", + .platform_name = "sst-mfld-platform", + }, + /* CODEC<->CODEC link */ + /* back ends */ + { + .name = "SSP2-Codec", + .be_id = 1, + .cpu_dai_name = "ssp2-port", + .platform_name = "sst-mfld-platform", + .no_pcm = 1, + .codec_dai_name = "rt5645-aif1", + .codec_name = "i2c-10EC5648:00", + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBS_CFS, + .be_hw_params_fixup = byt_rt5645_codec_fixup, + .ignore_suspend = 1, + .nonatomic = true, + .dpcm_playback = 1, + .dpcm_capture = 1, + .init = byt_rt5645_init, + .ops = &byt_rt5645_be_ssp2_ops, + }, +}; + +/* SoC card */ +static struct snd_soc_card byt_rt5645_card = { + .name = "bytcr-rt5645", + .owner = THIS_MODULE, + .dai_link = byt_rt5645_dais, + .num_links = ARRAY_SIZE(byt_rt5645_dais), + .dapm_widgets = byt_rt5645_widgets, + .num_dapm_widgets = ARRAY_SIZE(byt_rt5645_widgets), + .dapm_routes = byt_rt5645_audio_map, + .num_dapm_routes = ARRAY_SIZE(byt_rt5645_audio_map), + .fully_routed = true, +}; + +static int snd_byt_rt5645_mc_probe(struct platform_device *pdev) +{ + int ret_val = 0; + + /* register the soc card */ + byt_rt5645_card.dev = &pdev->dev; + + ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5645_card); + + if (ret_val) { + dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n", + ret_val); + return ret_val; + } + platform_set_drvdata(pdev, &byt_rt5645_card); + return ret_val; +} + +static struct platform_driver snd_byt_rt5645_mc_driver = { + .driver = { + .name = "bytcr_rt5645", + .pm = &snd_soc_pm_ops, + }, + .probe = snd_byt_rt5645_mc_probe, +}; + +module_platform_driver(snd_byt_rt5645_mc_driver); + +MODULE_DESCRIPTION("ASoC Intel(R) Baytrail CR Machine driver for RT5645"); +MODULE_AUTHOR("Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:bytcr_rt5645"); -- 2.8.0

1 0

[alsa-devel] [PATCH v2 0/9] ASoC: hdac_hdmi: Add multichannel support
by Subhransu S. Prusty 28 Apr '16

28 Apr '16

This series parses ELD to identify multichannel capability of the sync, and uses HDA framework to programs codec's channel map registers. Channel map controls are registered in patch 8, with which user can specify a specific channel order. chmap controls are registered inside jack_init callback. As PCMs need to be registered before registering chmap controls, jack_init call in the machine driver is moved to late_probe instead of init callback. Skylake driver is modified and buffer size calculation is fixed for multichannel support. Please note, patch 2 adds a small macro to read channel counts from cap bits in HDA headers. This needs Takashi's ack, so that it can be merged through ASoC. Patch 7 has dependency on commit#44fde3b ("ALSA: hda - Update chmap tlv to report sink's capability) which is merged in Takashi's tree. As Takashi suggested Mark may pull Takashi's for-next branch before applying this or may send a pull request, so that Takashi pull's Mark's tree before applying these with Mark's ack. Mark, please check how you want this to be merged. Changes in v2: * Dropped drm change and accommodate the change in driver * Fix one auto build test error Subhransu S. Prusty (9): ASoC: hdac_hdmi: parse eld for channel map capability ALSA: hda - add helper to get channels from cap bits ASoC: hdac_hdmi: Add multichannel support ASoC: skl_rt286: Fix to support hdmi channel map support ASoC: Intel: boards: Update skl_nau88l25_max98357a driver to support chmap ASoC: Intel: boards: Update skl_nau88l25_ssm4567 driver to support chmap ASoC: hdac_hdmi: Register chmap controls and ops ASoC: Intel: Skylake: Add multichannel support for HDMI ASoC: Intel: Skylake: Update channel map based on runtime params sound/hda/local.h | 10 ++ sound/soc/codecs/hdac_hdmi.c | 165 ++++++++++++++++++++++-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 74 ++++++++++- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 73 ++++++++++- sound/soc/intel/boards/skl_rt286.c | 48 ++++++- sound/soc/intel/skylake/skl-pcm.c | 14 +- sound/soc/intel/skylake/skl-topology.c | 21 ++- 7 files changed, 381 insertions(+), 24 deletions(-) -- 1.9.1

3 15

[alsa-devel] [PATCH v3 0/9] ASoC: hdac_hdmi: Add multichannel support
by Subhransu S. Prusty 28 Apr '16

28 Apr '16

This series parses ELD to identify multichannel capability of the sync, and uses HDA framework to programs codec's channel map registers. Channel map controls are registered in patch 8, with which user can specify a specific channel order. chmap controls are registered inside jack_init callback. As PCMs need to be registered before registering chmap controls, jack_init call in the machine driver is moved to late_probe instead of init callback. Skylake driver is modified and buffer size calculation is fixed for multichannel support. Please note, patch 2 adds a small macro to read channel counts from cap bits in HDA headers. This needs Takashi's ack, so that it can be merged through ASoC. Patch 7 has dependency on commit#44fde3b ("ALSA: hda - Update chmap tlv to report sink's capability) which is merged in Takashi's tree. As Takashi suggested Mark may pull Takashi's for-next branch before applying this or may send a pull request, so that Takashi pull's Mark's tree before applying these with Mark's ack. Mark, please check how you want this to be merged. Changes in v3: * As suggested, simplified channel calculation expression in get channel helper * Removed condition in max channel assignment expression Subhransu S. Prusty (9): ASoC: hdac_hdmi: parse eld for channel map capability ALSA: hda - add helper to get channels from cap bits ASoC: hdac_hdmi: Add multichannel support ASoC: skl_rt286: Fix to support hdmi channel map support ASoC: Intel: boards: Update skl_nau88l25_max98357a driver to support chmap ASoC: Intel: boards: Update skl_nau88l25_ssm4567 driver to support chmap ASoC: hdac_hdmi: Register chmap controls and ops ASoC: Intel: Skylake: Add multichannel support for HDMI ASoC: Intel: Skylake: Update channel map based on runtime params sound/hda/local.h | 10 ++ sound/soc/codecs/hdac_hdmi.c | 163 ++++++++++++++++++++++-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 74 ++++++++++- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 73 ++++++++++- sound/soc/intel/boards/skl_rt286.c | 48 ++++++- sound/soc/intel/skylake/skl-pcm.c | 14 +- sound/soc/intel/skylake/skl-topology.c | 21 ++- 7 files changed, 379 insertions(+), 24 deletions(-) -- 1.9.1

3 15

[alsa-devel] [PATCH 00/11] ASoC: hdac_hdmi: Add multichannel support
by Subhransu S. Prusty 28 Apr '16

28 Apr '16

This series parses ELD to identify multichannel capability of the sync, and uses HDA framework to programs codec's channel map registers. Channel map controls are registered in patch 8, with which user can specify a specific channel order. chmap controls are registered inside jack_init callback. As PCMs need to be registered before registering chmap controls, jack_init call in the machine driver is moved to late_probe instead of init callback. Skylake driver is modified and buffer size calculation is fixed for multichannel support. Please note, patch 2 and 4 adds small macros to read speaker allocation from ELD and channel counts from cap bits respectively in DRM and HDA headers. We have CCed DRM folks here. Please ack patch 1, so that we can have this series merged through sound trees. Patch 3 needs Takashi's ack, so that it can be merged through ASoC. Patch 9 has dependency on commit#44fde3b ("ALSA: hda - Update chmap tlv to report sink's capability) which is merged in Takashi's tree. So this may be merged in ASoC with Takashi's Ack and pulling in changes from Takashi's tree or alternatively it can be directly merged in Takashi's with Mark's Ack Takashi/Mark, please decide how you guys want this to be merged. Cc: Jani Nikula <jani.nikula(a)intel.com> Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter(a)intel.com> Subhransu S. Prusty (11): ASoC: Intel: Skylake: Fix ibs/obs calc for non-integral sampling rates drm/edid: Add API to get speaker allocation ASoC: hdac_hdmi: parse eld for channel map capability ALSA: hda - add helper to get channels from cap bits ASoC: hdac_hdmi: Add multichannel support ASoC: skl_rt286: Fix to support hdmi channel map support ASoC: Intel: boards: Update skl_nau88l25_max98357a driver to support chmap ASoC: Intel: boards: Update skl_nau88l25_ssm4567 driver to support chmap ASoC: hdac_hdmi: Register chmap controls and ops ASoC: Intel: Skylake: Add multichannel support for HDMI ASoC: Intel: Skylake: Update channel map based on runtime params include/drm/drm_edid.h | 9 ++ sound/hda/local.h | 10 ++ sound/soc/codecs/hdac_hdmi.c | 165 ++++++++++++++++++++++-- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 74 ++++++++++- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 73 ++++++++++- sound/soc/intel/boards/skl_rt286.c | 48 ++++++- sound/soc/intel/skylake/skl-pcm.c | 14 +- sound/soc/intel/skylake/skl-topology.c | 49 +++++-- 8 files changed, 409 insertions(+), 33 deletions(-) -- 1.9.1

4 24

[alsa-devel] [PATCH] ASoC: Add max98371 codec driver
by anish kumar 28 Apr '16

28 Apr '16

Signed-off-by: anish kumar <yesanishhere(a)gmail.com> --- Changed some controls to TLV as Mark suggested. .../devicetree/bindings/sound/max98371.txt | 17 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 1 + sound/soc/codecs/max98371.c | 442 +++++++++++++++++++++ sound/soc/codecs/max98371.h | 67 ++++ 5 files changed, 531 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/max98371.txt create mode 100644 sound/soc/codecs/max98371.c create mode 100644 sound/soc/codecs/max98371.h diff --git a/Documentation/devicetree/bindings/sound/max98371.txt b/Documentation/devicetree/bindings/sound/max98371.txt new file mode 100644 index 0000000..6c28523 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/max98371.txt @@ -0,0 +1,17 @@ +max98371 codec + +This device supports I2C mode only. + +Required properties: + +- compatible : "maxim,max98371" +- reg : The chip select number on the I2C bus + +Example: + +&i2c { + max98371: max98371@0x31 { + compatible = "maxim,max98371"; + reg = <0x31>; + }; +}; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 913c83c..ba6c585 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98090 if I2C select SND_SOC_MAX98095 if I2C select SND_SOC_MAX98357A if GPIOLIB + select SND_SOC_MAX98371 if I2C select SND_SOC_MAX9867 if I2C select SND_SOC_MAX98925 if I2C select SND_SOC_MAX98926 if I2C @@ -491,6 +492,9 @@ config SND_SOC_MAX98095 config SND_SOC_MAX98357A tristate +config SND_SOC_MAX98371 + tristate + config SND_SOC_MAX9867 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index f39dee7..9f3587b 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -70,6 +70,7 @@ snd-soc-max98088-objs := max98088.o snd-soc-max98090-objs := max98090.o snd-soc-max98095-objs := max98095.o snd-soc-max98357a-objs := max98357a.o +snd-soc-max98371-objs := max98371.o snd-soc-max9867-objs := max9867.o snd-soc-max98925-objs := max98925.o snd-soc-max98926-objs := max98926.o diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c new file mode 100644 index 0000000..21fae09 --- /dev/null +++ b/sound/soc/codecs/max98371.c @@ -0,0 +1,442 @@ +/* + * max98371.c -- ALSA SoC Stereo MAX98371 driver + * + * Copyright 2015-16 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/regmap.h> +#include <linux/slab.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/tlv.h> +#include "max98371.h" + +static const char *const monomix_text[] = { + "Left", "Right", "LeftRightDiv2", +}; + +static const char *const hpf_cutoff_txt[] = { + "Disable", "DC Block", "50Hz", + "100Hz", "200Hz", "400Hz", "800Hz", +}; + +static SOC_ENUM_SINGLE_DECL(max98371_monomix, MAX98371_MONOMIX_CFG, 0, + monomix_text); + +static SOC_ENUM_SINGLE_DECL(max98371_hpf_cutoff, MAX98371_HPF, 0, + hpf_cutoff_txt); + +static const DECLARE_TLV_DB_RANGE(max98371_dht_min_gain, + 0, 1, TLV_DB_SCALE_ITEM(537, 66, 0), + 2, 3, TLV_DB_SCALE_ITEM(677, 82, 0), + 4, 5, TLV_DB_SCALE_ITEM(852, 104, 0), + 6, 7, TLV_DB_SCALE_ITEM(1072, 131, 0), + 8, 9, TLV_DB_SCALE_ITEM(1350, 165, 0), + 10, 11, TLV_DB_SCALE_ITEM(1699, 101, 0), +); + +static const DECLARE_TLV_DB_RANGE(max98371_dht_max_gain, + 0, 1, TLV_DB_SCALE_ITEM(537, 66, 0), + 2, 3, TLV_DB_SCALE_ITEM(677, 82, 0), + 4, 5, TLV_DB_SCALE_ITEM(852, 104, 0), + 6, 7, TLV_DB_SCALE_ITEM(1072, 131, 0), + 8, 9, TLV_DB_SCALE_ITEM(1350, 165, 0), + 10, 11, TLV_DB_SCALE_ITEM(1699, 208, 0), +); + +static const DECLARE_TLV_DB_RANGE(max98371_dht_rot_gain, + 0, 1, TLV_DB_SCALE_ITEM(-50, -50, 0), + 2, 6, TLV_DB_SCALE_ITEM(-100, -100, 0), + 7, 8, TLV_DB_SCALE_ITEM(-800, -200, 0), + 9, 11, TLV_DB_SCALE_ITEM(-1200, -300, 0), + 12, 13, TLV_DB_SCALE_ITEM(-2000, -200, 0), + 14, 15, TLV_DB_SCALE_ITEM(-2500, -500, 0), +); + +static const struct reg_default max98371_reg[] = { + { 0x01, 0x00 }, + { 0x02, 0x00 }, + { 0x03, 0x00 }, + { 0x04, 0x00 }, + { 0x05, 0x00 }, + { 0x06, 0x00 }, + { 0x07, 0x00 }, + { 0x08, 0x00 }, + { 0x09, 0x00 }, + { 0x0A, 0x00 }, + { 0x10, 0x06 }, + { 0x11, 0x08 }, + { 0x14, 0x80 }, + { 0x15, 0x00 }, + { 0x16, 0x00 }, + { 0x18, 0x00 }, + { 0x19, 0x00 }, + { 0x1C, 0x00 }, + { 0x1D, 0x00 }, + { 0x1E, 0x00 }, + { 0x1F, 0x00 }, + { 0x20, 0x00 }, + { 0x21, 0x00 }, + { 0x22, 0x00 }, + { 0x23, 0x00 }, + { 0x24, 0x00 }, + { 0x25, 0x00 }, + { 0x26, 0x00 }, + { 0x27, 0x00 }, + { 0x28, 0x00 }, + { 0x29, 0x00 }, + { 0x2A, 0x00 }, + { 0x2B, 0x00 }, + { 0x2C, 0x00 }, + { 0x2D, 0x00 }, + { 0x2E, 0x0B }, + { 0x31, 0x00 }, + { 0x32, 0x18 }, + { 0x33, 0x00 }, + { 0x34, 0x00 }, + { 0x36, 0x00 }, + { 0x37, 0x00 }, + { 0x38, 0x00 }, + { 0x39, 0x00 }, + { 0x3A, 0x00 }, + { 0x3B, 0x00 }, + { 0x3B, 0x00 }, + { 0x3C, 0x00 }, + { 0x3D, 0x00 }, + { 0x3E, 0x00 }, + { 0x3F, 0x00 }, + { 0x40, 0x00 }, + { 0x41, 0x00 }, + { 0x42, 0x00 }, + { 0x43, 0x00 }, + { 0x4A, 0x00 }, + { 0x4B, 0x00 }, + { 0x4C, 0x00 }, + { 0x4D, 0x00 }, + { 0x4E, 0x00 }, + { 0x50, 0x00 }, + { 0x51, 0x00 }, + { 0x55, 0x00 }, + { 0x58, 0x00 }, + { 0x59, 0x00 }, + { 0x5C, 0x00 }, + { 0xFF, 0x43 }, +}; + +static bool max98371_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX98371_IRQ_CLEAR1: + case MAX98371_IRQ_CLEAR2: + case MAX98371_IRQ_CLEAR3: + case MAX98371_VERSION: + return true; + default: + return false; + } +} + +static bool max98371_readable_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX98371_SOFT_RESET: + return false; + default: + return true; + } +}; + +static const DECLARE_TLV_DB_RANGE(max98371_gain_tlv, + 0, 7, TLV_DB_SCALE_ITEM(0, 50, 0), + 8, 10, TLV_DB_SCALE_ITEM(400, 100, 0) +); + +static const DECLARE_TLV_DB_RANGE(max98371_noload_gain_tlv, + 0, 11, TLV_DB_SCALE_ITEM(950, 100, 0), +); + +static const DECLARE_TLV_DB_SCALE(digital_tlv, -6300, 50, 1); + +static const struct snd_kcontrol_new max98371_snd_controls[] = { + SOC_SINGLE_TLV("Speaker Volume", MAX98371_GAIN, + MAX98371_GAIN_SHIFT, (1<<MAX98371_GAIN_WIDTH)-1, 0, + max98371_gain_tlv), + SOC_SINGLE_TLV("Digital Volume", MAX98371_DIGITAL_GAIN, 0, + (1<<MAX98371_DIGITAL_GAIN_WIDTH)-1, 1, digital_tlv), + SOC_SINGLE_TLV("Speaker DHT Max Volume", MAX98371_GAIN, + 0, (1<<MAX98371_DHT_MAX_WIDTH)-1, 0, + max98371_dht_max_gain), + SOC_SINGLE_TLV("Speaker DHT Min Volume", MAX98371_DHT_GAIN, + 0, (1<<MAX98371_DHT_GAIN_WIDTH)-1, 0, + max98371_dht_min_gain), + SOC_SINGLE_TLV("Speaker DHT Rotation Volume", MAX98371_DHT_GAIN, + 0, (1<<MAX98371_DHT_ROT_WIDTH)-1, 0, + max98371_dht_rot_gain), + SOC_SINGLE("DHT Attack Step", MAX98371_DHT, MAX98371_DHT_STEP, 3, 0), + SOC_SINGLE("DHT Attack Rate", MAX98371_DHT, 0, 7, 0), + SOC_ENUM("Monomix Select", max98371_monomix), + SOC_ENUM("HPF Cutoff", max98371_hpf_cutoff), +}; + +static int max98371_dai_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec); + unsigned int val = 0; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + break; + default: + dev_err(codec->dev, "DAI clock mode unsupported"); + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + val |= 0; + break; + case SND_SOC_DAIFMT_RIGHT_J: + val |= MAX98371_DAI_RIGHT; + break; + case SND_SOC_DAIFMT_LEFT_J: + val |= MAX98371_DAI_LEFT; + break; + default: + dev_err(codec->dev, "DAI wrong mode unsupported"); + return -EINVAL; + } + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MODE_MASK, val); + return 0; +} + +static int max98371_dai_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec); + int blr_clk_ratio, ch_size, channels = params_channels(params); + int rate = params_rate(params); + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S8: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_16); + ch_size = 8; + break; + case SNDRV_PCM_FORMAT_S16_LE: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_16); + ch_size = 16; + break; + case SNDRV_PCM_FORMAT_S24_LE: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_32); + ch_size = 24; + break; + case SNDRV_PCM_FORMAT_S32_LE: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_32); + ch_size = 32; + break; + default: + return -EINVAL; + } + + /* BCLK/LRCLK ratio calculation */ + blr_clk_ratio = channels * ch_size; + switch (blr_clk_ratio) { + case 32: + regmap_update_bits(max98371->regmap, + MAX98371_DAI_CLK, + MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_32); + break; + case 48: + regmap_update_bits(max98371->regmap, + MAX98371_DAI_CLK, + MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_48); + break; + case 64: + regmap_update_bits(max98371->regmap, + MAX98371_DAI_CLK, + MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_64); + break; + default: + return -EINVAL; + } + + switch (rate) { + case 32000: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_32); + break; + case 44100: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_44); + break; + case 48000: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_48); + break; + case 88200: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_88); + break; + case 96000: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_96); + break; + default: + return -EINVAL; + } + + /* enabling both the RX channels*/ + regmap_update_bits(max98371->regmap, MAX98371_MONOMIX_SRC, + MAX98371_MONOMIX_SRC_MASK, MONOMIX_RX_0_1); + regmap_update_bits(max98371->regmap, MAX98371_DAI_CHANNEL, + MAX98371_CHANNEL_MASK, MAX98371_CHANNEL_MASK); + return 0; +} + +static const struct snd_soc_dapm_widget max98371_dapm_widgets[] = { + SND_SOC_DAPM_DAC("DAC", NULL, MAX98371_SPK_ENABLE, 0, 0), + SND_SOC_DAPM_SUPPLY("Global Enable", MAX98371_GLOBAL_ENABLE, + 0, 0, NULL, 0), + SND_SOC_DAPM_OUTPUT("SPK_OUT"), +}; + +static const struct snd_soc_dapm_route max98371_audio_map[] = { + {"DAC", NULL, "HiFi Playback"}, + {"SPK_OUT", NULL, "DAC"}, + {"SPK_OUT", NULL, "Global Enable"}, +}; + +#define MAX98371_RATES SNDRV_PCM_RATE_8000_48000 +#define MAX98371_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | \ + SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE) + +static const struct snd_soc_dai_ops max98371_dai_ops = { + .set_fmt = max98371_dai_set_fmt, + .hw_params = max98371_dai_hw_params, +}; + +static struct snd_soc_dai_driver max98371_dai[] = { + { + .name = "max98371-aif1", + .playback = { + .stream_name = "HiFi Playback", + .channels_min = 1, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_48000, + .formats = MAX98371_FORMATS, + }, + .ops = &max98371_dai_ops, + } +}; + +static const struct snd_soc_codec_driver max98371_codec = { + .controls = max98371_snd_controls, + .num_controls = ARRAY_SIZE(max98371_snd_controls), + .dapm_routes = max98371_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98371_audio_map), + .dapm_widgets = max98371_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98371_dapm_widgets), +}; + +static const struct regmap_config max98371_regmap = { + .reg_bits = 8, + .val_bits = 8, + .max_register = MAX98371_VERSION, + .reg_defaults = max98371_reg, + .num_reg_defaults = ARRAY_SIZE(max98371_reg), + .volatile_reg = max98371_volatile_register, + .readable_reg = max98371_readable_register, + .cache_type = REGCACHE_RBTREE, +}; + +static int max98371_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct max98371_priv *max98371; + int ret, reg; + + max98371 = devm_kzalloc(&i2c->dev, + sizeof(*max98371), GFP_KERNEL); + if (!max98371) + return -ENOMEM; + + i2c_set_clientdata(i2c, max98371); + max98371->regmap = devm_regmap_init_i2c(i2c, &max98371_regmap); + if (IS_ERR(max98371->regmap)) { + ret = PTR_ERR(max98371->regmap); + dev_err(&i2c->dev, + "Failed to allocate regmap: %d\n", ret); + return ret; + } + + ret = regmap_read(max98371->regmap, MAX98371_VERSION, &reg); + if (ret < 0) { + dev_info(&i2c->dev, "device error %d\n", ret); + return ret; + } + dev_info(&i2c->dev, "device version %x\n", reg); + + ret = snd_soc_register_codec(&i2c->dev, &max98371_codec, + max98371_dai, ARRAY_SIZE(max98371_dai)); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); + return ret; + } + return ret; +} + +static int max98371_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + return 0; +} + +static const struct i2c_device_id max98371_i2c_id[] = { + { "max98371", 0 }, +}; + +MODULE_DEVICE_TABLE(i2c, max98371_i2c_id); + +static const struct of_device_id max98371_of_match[] = { + { .compatible = "maxim,max98371", }, + { } +}; +MODULE_DEVICE_TABLE(of, max98371_of_match); + +static struct i2c_driver max98371_i2c_driver = { + .driver = { + .name = "max98371", + .owner = THIS_MODULE, + .pm = NULL, + .of_match_table = of_match_ptr(max98371_of_match), + }, + .probe = max98371_i2c_probe, + .remove = max98371_i2c_remove, + .id_table = max98371_i2c_id, +}; + +module_i2c_driver(max98371_i2c_driver); + +MODULE_AUTHOR("anish kumar <yesanishhere(a)gmail.com>"); +MODULE_DESCRIPTION("ALSA SoC MAX98371 driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/max98371.h b/sound/soc/codecs/max98371.h new file mode 100644 index 0000000..9f63309 --- /dev/null +++ b/sound/soc/codecs/max98371.h @@ -0,0 +1,67 @@ +/* + * max98371.h -- MAX98371 ALSA SoC Audio driver + * + * Copyright 2011-2012 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _MAX98371_H +#define _MAX98371_H + +#define MAX98371_IRQ_CLEAR1 0x01 +#define MAX98371_IRQ_CLEAR2 0x02 +#define MAX98371_IRQ_CLEAR3 0x03 +#define MAX98371_DAI_CLK 0x10 +#define MAX98371_DAI_BSEL_MASK 0xF +#define MAX98371_DAI_BSEL_32 2 +#define MAX98371_DAI_BSEL_48 3 +#define MAX98371_DAI_BSEL_64 4 +#define MAX98371_SPK_SR 0x11 +#define MAX98371_SPK_SR_MASK 0xF +#define MAX98371_SPK_SR_32 6 +#define MAX98371_SPK_SR_44 7 +#define MAX98371_SPK_SR_48 8 +#define MAX98371_SPK_SR_88 10 +#define MAX98371_SPK_SR_96 11 +#define MAX98371_DAI_CHANNEL 0x15 +#define MAX98371_CHANNEL_MASK 0x3 +#define MAX98371_MONOMIX_SRC 0x18 +#define MAX98371_MONOMIX_CFG 0x19 +#define MAX98371_HPF 0x1C +#define MAX98371_MONOMIX_SRC_MASK 0xFF +#define MONOMIX_RX_0_1 ((0x1)<<(4)) +#define M98371_DAI_CHANNEL_I2S 0x3 +#define MAX98371_DIGITAL_GAIN 0x2D +#define MAX98371_DIGITAL_GAIN_WIDTH 0x7 +#define MAX98371_GAIN 0x2E +#define MAX98371_GAIN_SHIFT 0x4 +#define MAX98371_GAIN_WIDTH 0x4 +#define MAX98371_DHT_MAX_WIDTH 4 +#define MAX98371_FMT 0x14 +#define MAX98371_CHANSZ_WIDTH 6 +#define MAX98371_FMT_MASK ((0x3)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_FMT_MODE_MASK ((0x7)<<(3)) +#define MAX98371_DAI_LEFT ((0x1)<<(3)) +#define MAX98371_DAI_RIGHT ((0x2)<<(3)) +#define MAX98371_DAI_CHANSZ_16 ((1)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_DAI_CHANSZ_24 ((2)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_DAI_CHANSZ_32 ((3)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_DHT 0x32 +#define MAX98371_DHT_STEP 0x3 +#define MAX98371_DHT_GAIN 0x31 +#define MAX98371_DHT_GAIN_WIDTH 0x4 +#define MAX98371_DHT_ROT_WIDTH 0x4 +#define MAX98371_SPK_ENABLE 0x4A +#define MAX98371_GLOBAL_ENABLE 0x50 +#define MAX98371_SOFT_RESET 0x51 +#define MAX98371_VERSION 0xFF + + +struct max98371_priv { + struct regmap *regmap; + struct snd_soc_codec *codec; +}; +#endif -- 1.9.3

2 1

[alsa-devel] [PATCH 1/2] ALSA: hda: fix the missing ptr initialization
by Vinod Koul 28 Apr '16

28 Apr '16

ebus is a member of extended device and was never initialized, so do this at device creation. Signed-off-by: Jeeja KP <jeeja.kp(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/hda/ext/hdac_ext_bus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/hda/ext/hdac_ext_bus.c b/sound/hda/ext/hdac_ext_bus.c index 2433f7c81472..64de0a3d6d93 100644 --- a/sound/hda/ext/hdac_ext_bus.c +++ b/sound/hda/ext/hdac_ext_bus.c @@ -144,6 +144,7 @@ int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *ebus, int addr) if (!edev) return -ENOMEM; hdev = &edev->hdac; + edev->ebus = ebus; snprintf(name, sizeof(name), "ehdaudio%dD%d", ebus->idx, addr); -- 1.9.1

2 5

[alsa-devel] [PATCH v2] ASoC: rt5651: remove unexisting widget
by Bard Liao 28 Apr '16

28 Apr '16

IN Muxes are not existing on rt5651. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5651.c | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 7a61970..979e3e9 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -586,44 +586,6 @@ static const struct snd_kcontrol_new hpo_r_mute_control = SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_HP_VOL, RT5651_R_MUTE_SFT, 1, 1); -/* INL/R source */ -static const char * const rt5651_inl_src[] = {"IN2P", "HPOVOLLP"}; - -static SOC_ENUM_SINGLE_DECL( - rt5651_inl_enum, RT5651_INL1_INR1_VOL, - RT5651_INL_SEL_SFT, rt5651_inl_src); - -static const struct snd_kcontrol_new rt5651_inl1_mux = - SOC_DAPM_ENUM("INL1 source", rt5651_inl_enum); - -static const char * const rt5651_inr1_src[] = {"IN2N", "HPOVOLRP"}; - -static SOC_ENUM_SINGLE_DECL( - rt5651_inr1_enum, RT5651_INL1_INR1_VOL, - RT5651_INR_SEL_SFT, rt5651_inr1_src); - -static const struct snd_kcontrol_new rt5651_inr1_mux = - SOC_DAPM_ENUM("INR1 source", rt5651_inr1_enum); - -static const char * const rt5651_inl2_src[] = {"IN3P", "OUTVOLLP"}; - -static SOC_ENUM_SINGLE_DECL( - rt5651_inl2_enum, RT5651_INL2_INR2_VOL, - RT5651_INL_SEL_SFT, rt5651_inl2_src); - -static const struct snd_kcontrol_new rt5651_inl2_mux = - SOC_DAPM_ENUM("INL2 source", rt5651_inl2_enum); - -static const char * const rt5651_inr2_src[] = {"IN3N", "OUTVOLRP"}; - -static SOC_ENUM_SINGLE_DECL( - rt5651_inr2_enum, RT5651_INL2_INR2_VOL, - RT5651_INR_SEL_SFT, rt5651_inr2_src); - -static const struct snd_kcontrol_new rt5651_inr2_mux = - SOC_DAPM_ENUM("INR2 source", rt5651_inr2_enum); - - /* Stereo ADC source */ static const char * const rt5651_stereo1_adc1_src[] = {"DD MIX", "ADC"}; @@ -955,11 +917,6 @@ static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = { RT5651_PWR_IN2_L_BIT, 0, NULL, 0), SND_SOC_DAPM_PGA("INR2 VOL", RT5651_PWR_VOL, RT5651_PWR_IN2_R_BIT, 0, NULL, 0), - /* IN Mux */ - SND_SOC_DAPM_MUX("INL1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl1_mux), - SND_SOC_DAPM_MUX("INR1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr1_mux), - SND_SOC_DAPM_MUX("INL2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl2_mux), - SND_SOC_DAPM_MUX("INR2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr2_mux), /* REC Mixer */ SND_SOC_DAPM_MIXER("RECMIXL", RT5651_PWR_MIXER, RT5651_PWR_RM_L_BIT, 0, rt5651_rec_l_mix, ARRAY_SIZE(rt5651_rec_l_mix)), -- 1.8.1.1.439.g50a6b54

1 0

[alsa-devel] [PATCH] ASoC: rt5651: remove unexisting widget
by Bard Liao 28 Apr '16

28 Apr '16

IN Muxes are not existing on rt5651. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5651.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 7a61970..b812c06 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -955,11 +955,6 @@ static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = { RT5651_PWR_IN2_L_BIT, 0, NULL, 0), SND_SOC_DAPM_PGA("INR2 VOL", RT5651_PWR_VOL, RT5651_PWR_IN2_R_BIT, 0, NULL, 0), - /* IN Mux */ - SND_SOC_DAPM_MUX("INL1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl1_mux), - SND_SOC_DAPM_MUX("INR1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr1_mux), - SND_SOC_DAPM_MUX("INL2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl2_mux), - SND_SOC_DAPM_MUX("INR2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr2_mux), /* REC Mixer */ SND_SOC_DAPM_MIXER("RECMIXL", RT5651_PWR_MIXER, RT5651_PWR_RM_L_BIT, 0, rt5651_rec_l_mix, ARRAY_SIZE(rt5651_rec_l_mix)), -- 1.8.1.1.439.g50a6b54

2 2

[alsa-devel] [PATCH] ASoC: nau8825: apply BIQ to reduce recording signal DC offset
by John Hsu 28 Apr '16

28 Apr '16

Enable biquad filter as HPF in the ADC path when headset detected. It helps to reduce recording signal DC offset. The biquad filter parameters are applied for the ADC path when jack is inserted. The biquad filter is cancelled when jack is ejected. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 7 ++++++ 2 files changed, 66 insertions(+) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index f35019a..962d2f0 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -156,6 +156,20 @@ static const struct reg_default nau8825_reg_defaults[] = { { NAU8825_REG_CHARGE_PUMP, 0x0 }, }; +/* Biquad filter coefficients for A1, A2, B0, B1, and B3 */ +static const struct reg_default nau8825_adc_biq_reg[] = { + { NAU8825_REG_BIQ_COF1, 0x009B }, + { NAU8825_REG_BIQ_COF2, 0x0006 }, + { NAU8825_REG_BIQ_COF3, 0xff66 }, + { NAU8825_REG_BIQ_COF4, 0x0000 }, + { NAU8825_REG_BIQ_COF5, 0xffb3 }, + { NAU8825_REG_BIQ_COF6, 0x0000 }, + { NAU8825_REG_BIQ_COF7, 0x009A }, + { NAU8825_REG_BIQ_COF8, 0x0006 }, + { NAU8825_REG_BIQ_COF9, 0xffb3 }, + { NAU8825_REG_BIQ_COF10, 0x8000 }, +}; + static bool nau8825_readable_reg(struct device *dev, unsigned int reg) { switch (reg) { @@ -217,12 +231,46 @@ static bool nau8825_volatile_reg(struct device *dev, unsigned int reg) case NAU8825_REG_SARDOUT_RAM_STATUS: case NAU8825_REG_CHARGE_PUMP_INPUT_READ: case NAU8825_REG_GENERAL_STATUS: + case NAU8825_REG_BIQ_CTRL ... NAU8825_REG_BIQ_COF10: return true; default: return false; } } +static void nau8825_adc_biq_apply(struct nau8825 *nau8825) +{ + int i; + + /* Enable the BIQ parameter write/updated. The control is valid only + * when change from 0 to 1. The driver applies the BIQ function into + * the ADC path only. + */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_BIQ_CTRL, + NAU8825_BIQ_WRT_EN | NAU8825_BIQ_PATH_MASK, + NAU8825_BIQ_PATH_ADC); + for (i = 0; i < ARRAY_SIZE(nau8825_adc_biq_reg); i++) + regmap_write(nau8825->regmap, nau8825_adc_biq_reg[i].reg, + nau8825_adc_biq_reg[i].def); + regmap_update_bits(nau8825->regmap, NAU8825_REG_BIQ_CTRL, + NAU8825_BIQ_WRT_EN, NAU8825_BIQ_WRT_EN); +} + +static void nau8825_adc_biq_cancel(struct nau8825 *nau8825) +{ + int i; + + /* Disable the BIQ parameter write/updated. The control is valid only + * when change from 0 to 1. + */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_BIQ_CTRL, + NAU8825_BIQ_WRT_EN, 0); + for (i = 0; i < ARRAY_SIZE(nau8825_adc_biq_reg); i++) + regmap_write(nau8825->regmap, nau8825_adc_biq_reg[i].reg, 0); + regmap_update_bits(nau8825->regmap, NAU8825_REG_BIQ_CTRL, + NAU8825_BIQ_WRT_EN, NAU8825_BIQ_WRT_EN); +} + static int nau8825_adc_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -647,6 +695,9 @@ static void nau8825_eject_jack(struct nau8825 *nau8825) struct snd_soc_dapm_context *dapm = nau8825->dapm; struct regmap *regmap = nau8825->regmap; + /* Cancel biquad filter in ADC path */ + nau8825_adc_biq_cancel(nau8825); + snd_soc_dapm_disable_pin(dapm, "SAR"); snd_soc_dapm_disable_pin(dapm, "MICBIAS"); /* Detach 2kOhm Resistors from MICBIAS to MICGND1/2 */ @@ -737,6 +788,14 @@ static int nau8825_jack_insert(struct nau8825 *nau8825) break; } + if (type & SND_JACK_MICROPHONE) { + /* Apply biquad filter into ADC path. It helps to avoid the DC + * offset in recoding signal. The function will keep asleep + * without clock and work up automatically when clock provided. + */ + nau8825_adc_biq_apply(nau8825); + } + /* Leaving HPOL/R grounded after jack insert by default. They will be * ungrounded as part of the widget power up sequence at the beginning * of playback to reduce pop. diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 9e6cb62..f3b4acb 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -231,6 +231,13 @@ #define NAU8825_I2S_MS_MASTER (1 << NAU8825_I2S_MS_SFT) #define NAU8825_I2S_MS_SLAVE (0 << NAU8825_I2S_MS_SFT) +/* BIQ_CTRL (0x20) */ +#define NAU8825_BIQ_WRT_EN (1 << 4) +#define NAU8825_BIQ_PATH_SFT 0 +#define NAU8825_BIQ_PATH_MASK (1 << NAU8825_BIQ_PATH_SFT) +#define NAU8825_BIQ_PATH_ADC (0 << NAU8825_BIQ_PATH_SFT) +#define NAU8825_BIQ_PATH_DAC (1 << NAU8825_BIQ_PATH_SFT) + /* ADC_RATE (0x2b) */ #define NAU8825_ADC_SYNC_DOWN_SFT 0 #define NAU8825_ADC_SYNC_DOWN_MASK 0x3 -- 2.6.4

1 0

[alsa-devel] [PATCH 1/2] ASoC: dmaengine_pcm: Add support for packed transfers
by Matthias Reichl 27 Apr '16

27 Apr '16

dmaengine_pcm currently only supports setups where FIFO reads/writes correspond to exactly one sample, eg 16-bit sample data is transferred via 16-bit FIFO accesses, 32-bit data via 32-bit accesses. This patch adds support for setups with fixed width FIFOs where multiple samples are packed into a larger word. For example setups with a 32-bit wide FIFO register that expect 16-bit sample transfers to be done with the left+right sample data packed into a 32-bit word. Support for packed transfers is controlled via the SND_DMAENGINE_PCM_DAI_FLAG_PACK flag in snd_dmaengine_dai_dma_data.flags If this flag is set dmaengine_pcm doesn't put any restriction on the supported formats and sets the DMA transfer width to undefined. This means control over the constraints is now transferred to the DAI driver and it's responsible to provide proper configuration and check for possible corner cases that aren't handled by the ALSA core. Signed-off-by: Matthias Reichl <hias(a)horus.com> --- include/sound/dmaengine_pcm.h | 12 ++++++++ sound/core/pcm_dmaengine.c | 11 +++++-- sound/soc/soc-generic-dmaengine-pcm.c | 57 +++++++++++++++++++++-------------- 3 files changed, 55 insertions(+), 25 deletions(-) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index f86ef5e..67be244 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -51,6 +51,16 @@ struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn, void *filter_data); struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream); +/* + * The DAI supports packed transfers, eg 2 16-bit samples in a 32-bit word. + * If this flag is set the dmaengine driver won't put any restriction on + * the supported sample formats and set the DMA transfer size to undefined. + * The DAI driver is responsible to disable any unsupported formats in it's + * configuration and catch corner cases that are not already handled in + * the ALSA core. + */ +#define SND_DMAENGINE_PCM_DAI_FLAG_PACK BIT(0) + /** * struct snd_dmaengine_dai_dma_data - DAI DMA configuration data * @addr: Address of the DAI data source or destination register. @@ -63,6 +73,7 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream) * requesting the DMA channel. * @chan_name: Custom channel name to use when requesting DMA channel. * @fifo_size: FIFO size of the DAI controller in bytes + * @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now */ struct snd_dmaengine_dai_dma_data { dma_addr_t addr; @@ -72,6 +83,7 @@ struct snd_dmaengine_dai_dma_data { void *filter_data; const char *chan_name; unsigned int fifo_size; + unsigned int flags; }; void snd_dmaengine_pcm_set_config_from_dai_data( diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 697c166..8eb58c7 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -106,8 +106,9 @@ EXPORT_SYMBOL_GPL(snd_hwparams_to_dma_slave_config); * direction of the substream. If the substream is a playback stream the dst * fields will be initialized, if it is a capture stream the src fields will be * initialized. The {dst,src}_addr_width field will only be initialized if the - * addr_width field of the DAI DMA data struct is not equal to - * DMA_SLAVE_BUSWIDTH_UNDEFINED. + * SND_DMAENGINE_PCM_DAI_FLAG_PACK flag is set or if the addr_width field of + * the DAI DMA data struct is not equal to DMA_SLAVE_BUSWIDTH_UNDEFINED. If + * both conditions are met the latter takes priority. */ void snd_dmaengine_pcm_set_config_from_dai_data( const struct snd_pcm_substream *substream, @@ -117,11 +118,17 @@ void snd_dmaengine_pcm_set_config_from_dai_data( if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { slave_config->dst_addr = dma_data->addr; slave_config->dst_maxburst = dma_data->maxburst; + if (dma_data->flags & SND_DMAENGINE_PCM_DAI_FLAG_PACK) + slave_config->dst_addr_width = + DMA_SLAVE_BUSWIDTH_UNDEFINED; if (dma_data->addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED) slave_config->dst_addr_width = dma_data->addr_width; } else { slave_config->src_addr = dma_data->addr; slave_config->src_maxburst = dma_data->maxburst; + if (dma_data->flags & SND_DMAENGINE_PCM_DAI_FLAG_PACK) + slave_config->src_addr_width = + DMA_SLAVE_BUSWIDTH_UNDEFINED; if (dma_data->addr_width != DMA_SLAVE_BUSWIDTH_UNDEFINED) slave_config->src_addr_width = dma_data->addr_width; } diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 6fd1906..6cef397 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -163,31 +163,42 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substrea } /* - * Prepare formats mask for valid/allowed sample types. If the dma does - * not have support for the given physical word size, it needs to be - * masked out so user space can not use the format which produces - * corrupted audio. - * In case the dma driver does not implement the slave_caps the default - * assumption is that it supports 1, 2 and 4 bytes widths. + * If SND_DMAENGINE_PCM_DAI_FLAG_PACK is set keep + * hw.formats set to 0, meaning no restrictions are in place. + * In this case it's the responsibility of the DAI driver to + * provide the supported format information. */ - for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { - int bits = snd_pcm_format_physical_width(i); - - /* Enable only samples with DMA supported physical widths */ - switch (bits) { - case 8: - case 16: - case 24: - case 32: - case 64: - if (addr_widths & (1 << (bits / 8))) - hw.formats |= (1LL << i); - break; - default: - /* Unsupported types */ - break; + if (!(dma_data->flags & SND_DMAENGINE_PCM_DAI_FLAG_PACK)) + /* + * Prepare formats mask for valid/allowed sample types. If the + * dma does not have support for the given physical word size, + * it needs to be masked out so user space can not use the + * format which produces corrupted audio. + * In case the dma driver does not implement the slave_caps the + * default assumption is that it supports 1, 2 and 4 bytes + * widths. + */ + for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { + int bits = snd_pcm_format_physical_width(i); + + /* + * Enable only samples with DMA supported physical + * widths + */ + switch (bits) { + case 8: + case 16: + case 24: + case 32: + case 64: + if (addr_widths & (1 << (bits / 8))) + hw.formats |= (1LL << i); + break; + default: + /* Unsupported types */ + break; + } } - } return snd_soc_set_runtime_hwparams(substream, &hw); } -- 2.1.4

5 7

[alsa-devel] [PATCH] ASoC: Add max98371 codec driver
by anish kumar 27 Apr '16

27 Apr '16

Signed-off-by: anish kumar <yesanishhere(a)gmail.com> --- .../devicetree/bindings/sound/max98371.txt | 17 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 1 + sound/soc/codecs/max98371.c | 419 +++++++++++++++++++++ sound/soc/codecs/max98371.h | 64 ++++ 5 files changed, 505 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/max98371.txt create mode 100644 sound/soc/codecs/max98371.c create mode 100644 sound/soc/codecs/max98371.h diff --git a/Documentation/devicetree/bindings/sound/max98371.txt b/Documentation/devicetree/bindings/sound/max98371.txt new file mode 100644 index 0000000..6c28523 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/max98371.txt @@ -0,0 +1,17 @@ +max98371 codec + +This device supports I2C mode only. + +Required properties: + +- compatible : "maxim,max98371" +- reg : The chip select number on the I2C bus + +Example: + +&i2c { + max98371: max98371@0x31 { + compatible = "maxim,max98371"; + reg = <0x31>; + }; +}; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 913c83c..ba6c585 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98090 if I2C select SND_SOC_MAX98095 if I2C select SND_SOC_MAX98357A if GPIOLIB + select SND_SOC_MAX98371 if I2C select SND_SOC_MAX9867 if I2C select SND_SOC_MAX98925 if I2C select SND_SOC_MAX98926 if I2C @@ -491,6 +492,9 @@ config SND_SOC_MAX98095 config SND_SOC_MAX98357A tristate +config SND_SOC_MAX98371 + tristate + config SND_SOC_MAX9867 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index f39dee7..9f3587b 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -70,6 +70,7 @@ snd-soc-max98088-objs := max98088.o snd-soc-max98090-objs := max98090.o snd-soc-max98095-objs := max98095.o snd-soc-max98357a-objs := max98357a.o +snd-soc-max98371-objs := max98371.o snd-soc-max9867-objs := max9867.o snd-soc-max98925-objs := max98925.o snd-soc-max98926-objs := max98926.o diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c new file mode 100644 index 0000000..ce735db --- /dev/null +++ b/sound/soc/codecs/max98371.c @@ -0,0 +1,419 @@ +/* + * max98371.c -- ALSA SoC Stereo MAX98371 driver + * + * Copyright 2015-16 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/regmap.h> +#include <linux/slab.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/tlv.h> +#include "max98371.h" + +static const char *const monomix_text[] = { + "Left", "Right", "LeftRightDiv2", +}; + +static const char *const voltage_level_text[] = { + "9.5dB", "10.5dB", "11.5dB", "11.5dB", "12.5dB", + "13.5dB", "14.5dB", "15.5dB", "16.5dB", "17.5dB", + "18.5dB", "19.5dB", "20.5dB" +}; + +static const char *const hpf_cutoff_txt[] = { + "Disable", "DC Block", "50Hz", + "100Hz", "200Hz", "400Hz", "800Hz", +}; + +static SOC_ENUM_SINGLE_DECL(max98371_voltage, MAX98371_GAIN, 0, + voltage_level_text); + +static SOC_ENUM_SINGLE_DECL(max98371_monomix, MAX98371_MONOMIX_CFG, 0, + monomix_text); + +static SOC_ENUM_SINGLE_DECL(max98371_hpf_cutoff, MAX98371_HPF, 0, + hpf_cutoff_txt); + +static const struct reg_default max98371_reg[] = { + { 0x01, 0x00 }, + { 0x02, 0x00 }, + { 0x03, 0x00 }, + { 0x04, 0x00 }, + { 0x05, 0x00 }, + { 0x06, 0x00 }, + { 0x07, 0x00 }, + { 0x08, 0x00 }, + { 0x09, 0x00 }, + { 0x0A, 0x00 }, + { 0x10, 0x06 }, + { 0x11, 0x08 }, + { 0x14, 0x80 }, + { 0x15, 0x00 }, + { 0x16, 0x00 }, + { 0x18, 0x00 }, + { 0x19, 0x00 }, + { 0x1C, 0x00 }, + { 0x1D, 0x00 }, + { 0x1E, 0x00 }, + { 0x1F, 0x00 }, + { 0x20, 0x00 }, + { 0x21, 0x00 }, + { 0x22, 0x00 }, + { 0x23, 0x00 }, + { 0x24, 0x00 }, + { 0x25, 0x00 }, + { 0x26, 0x00 }, + { 0x27, 0x00 }, + { 0x28, 0x00 }, + { 0x29, 0x00 }, + { 0x2A, 0x00 }, + { 0x2B, 0x00 }, + { 0x2C, 0x00 }, + { 0x2D, 0x00 }, + { 0x2E, 0x0B }, + { 0x31, 0x00 }, + { 0x32, 0x18 }, + { 0x33, 0x00 }, + { 0x34, 0x00 }, + { 0x36, 0x00 }, + { 0x37, 0x00 }, + { 0x38, 0x00 }, + { 0x39, 0x00 }, + { 0x3A, 0x00 }, + { 0x3B, 0x00 }, + { 0x3B, 0x00 }, + { 0x3C, 0x00 }, + { 0x3D, 0x00 }, + { 0x3E, 0x00 }, + { 0x3F, 0x00 }, + { 0x40, 0x00 }, + { 0x41, 0x00 }, + { 0x42, 0x00 }, + { 0x43, 0x00 }, + { 0x4A, 0x00 }, + { 0x4B, 0x00 }, + { 0x4C, 0x00 }, + { 0x4D, 0x00 }, + { 0x4E, 0x00 }, + { 0x50, 0x00 }, + { 0x51, 0x00 }, + { 0x55, 0x00 }, + { 0x58, 0x00 }, + { 0x59, 0x00 }, + { 0x5C, 0x00 }, + { 0xFF, 0x43 }, +}; + +static bool max98371_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX98371_IRQ_CLEAR1: + case MAX98371_IRQ_CLEAR2: + case MAX98371_IRQ_CLEAR3: + case MAX98371_VERSION: + return true; + default: + return false; + } +} + +static bool max98371_readable_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case MAX98371_SOFT_RESET: + return false; + default: + return true; + } +}; + +static const DECLARE_TLV_DB_RANGE(max98371_gain_tlv, + 0, 7, TLV_DB_SCALE_ITEM(0, 50, 0), + 8, 10, TLV_DB_SCALE_ITEM(400, 100, 0) +); + +static const DECLARE_TLV_DB_RANGE(max98371_noload_gain_tlv, + 0, 11, TLV_DB_SCALE_ITEM(950, 100, 0), +); + +static const DECLARE_TLV_DB_SCALE(digital_tlv, -6300, 50, 1); + +static const struct snd_kcontrol_new max98371_snd_controls[] = { + SOC_SINGLE_TLV("Speaker Volume", MAX98371_GAIN, + MAX98371_GAIN_SHIFT, (1<<MAX98371_GAIN_WIDTH)-1, 0, + max98371_gain_tlv), + SOC_SINGLE_TLV("Digital Volume", MAX98371_DIGITAL_GAIN, 0, + (1<<MAX98371_DIGITAL_GAIN_WIDTH)-1, 1, digital_tlv), + SOC_SINGLE_TLV("Speaker No-load Volume", MAX98371_GAIN, + 0, (1<<MAX98371_NO_LOAD_WIDTH)-1, 0, + max98371_noload_gain_tlv), + SOC_SINGLE("DHT Attack Step", MAX98371_DHT, MAX98371_DHT_STEP, 3, 0), + SOC_SINGLE("DHT Attack Rate", MAX98371_DHT, 0, 7, 0), + SOC_ENUM("Voltage Level", max98371_voltage), + SOC_ENUM("Monomix Select", max98371_monomix), + SOC_ENUM("HPF Cutoff", max98371_hpf_cutoff), +}; + +static int max98371_dai_set_fmt(struct snd_soc_dai *codec_dai, + unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec); + unsigned int val = 0; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + break; + default: + dev_err(codec->dev, "DAI clock mode unsupported"); + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + val |= 0; + break; + case SND_SOC_DAIFMT_RIGHT_J: + val |= MAX98371_DAI_RIGHT; + break; + case SND_SOC_DAIFMT_LEFT_J: + val |= MAX98371_DAI_LEFT; + break; + default: + dev_err(codec->dev, "DAI wrong mode unsupported"); + return -EINVAL; + } + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MODE_MASK, val); + return 0; +} + +static int max98371_dai_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec); + int blr_clk_ratio, ch_size, channels = params_channels(params); + int rate = params_rate(params); + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S8: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_16); + ch_size = 8; + break; + case SNDRV_PCM_FORMAT_S16_LE: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_16); + ch_size = 16; + break; + case SNDRV_PCM_FORMAT_S24_LE: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_32); + ch_size = 24; + break; + case SNDRV_PCM_FORMAT_S32_LE: + regmap_update_bits(max98371->regmap, MAX98371_FMT, + MAX98371_FMT_MASK, MAX98371_DAI_CHANSZ_32); + ch_size = 32; + break; + default: + return -EINVAL; + } + + /* BCLK/LRCLK ratio calculation */ + blr_clk_ratio = channels * ch_size; + switch (blr_clk_ratio) { + case 32: + regmap_update_bits(max98371->regmap, + MAX98371_DAI_CLK, + MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_32); + break; + case 48: + regmap_update_bits(max98371->regmap, + MAX98371_DAI_CLK, + MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_48); + break; + case 64: + regmap_update_bits(max98371->regmap, + MAX98371_DAI_CLK, + MAX98371_DAI_BSEL_MASK, MAX98371_DAI_BSEL_64); + break; + default: + return -EINVAL; + } + + switch (rate) { + case 32000: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_32); + break; + case 44100: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_44); + break; + case 48000: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_48); + break; + case 88200: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_88); + break; + case 96000: + regmap_update_bits(max98371->regmap, + MAX98371_SPK_SR, + MAX98371_SPK_SR_MASK, MAX98371_SPK_SR_96); + break; + default: + return -EINVAL; + } + + /* enabling both the RX channels*/ + regmap_update_bits(max98371->regmap, MAX98371_MONOMIX_SRC, + MAX98371_MONOMIX_SRC_MASK, MONOMIX_RX_0_1); + regmap_update_bits(max98371->regmap, MAX98371_DAI_CHANNEL, + MAX98371_CHANNEL_MASK, MAX98371_CHANNEL_MASK); + return 0; +} + +static const struct snd_soc_dapm_widget max98371_dapm_widgets[] = { + SND_SOC_DAPM_DAC("DAC", NULL, MAX98371_SPK_ENABLE, 0, 0), + SND_SOC_DAPM_SUPPLY("Global Enable", MAX98371_GLOBAL_ENABLE, + 0, 0, NULL, 0), + SND_SOC_DAPM_OUTPUT("SPK_OUT"), +}; + +static const struct snd_soc_dapm_route max98371_audio_map[] = { + {"DAC", NULL, "HiFi Playback"}, + {"SPK_OUT", NULL, "DAC"}, + {"SPK_OUT", NULL, "Global Enable"}, +}; + +#define MAX98371_RATES SNDRV_PCM_RATE_8000_48000 +#define MAX98371_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_BE | \ + SNDRV_PCM_FMTBIT_S24_BE | SNDRV_PCM_FMTBIT_S32_BE) + +static const struct snd_soc_dai_ops max98371_dai_ops = { + .set_fmt = max98371_dai_set_fmt, + .hw_params = max98371_dai_hw_params, +}; + +static struct snd_soc_dai_driver max98371_dai[] = { + { + .name = "max98371-aif1", + .playback = { + .stream_name = "HiFi Playback", + .channels_min = 1, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_48000, + .formats = MAX98371_FORMATS, + }, + .ops = &max98371_dai_ops, + } +}; + +static const struct snd_soc_codec_driver max98371_codec = { + .controls = max98371_snd_controls, + .num_controls = ARRAY_SIZE(max98371_snd_controls), + .dapm_routes = max98371_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98371_audio_map), + .dapm_widgets = max98371_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98371_dapm_widgets), +}; + +static const struct regmap_config max98371_regmap = { + .reg_bits = 8, + .val_bits = 8, + .max_register = MAX98371_VERSION, + .reg_defaults = max98371_reg, + .num_reg_defaults = ARRAY_SIZE(max98371_reg), + .volatile_reg = max98371_volatile_register, + .readable_reg = max98371_readable_register, + .cache_type = REGCACHE_RBTREE, +}; + +static int max98371_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct max98371_priv *max98371; + int ret, reg; + + max98371 = devm_kzalloc(&i2c->dev, + sizeof(*max98371), GFP_KERNEL); + if (!max98371) + return -ENOMEM; + + i2c_set_clientdata(i2c, max98371); + max98371->regmap = devm_regmap_init_i2c(i2c, &max98371_regmap); + if (IS_ERR(max98371->regmap)) { + ret = PTR_ERR(max98371->regmap); + dev_err(&i2c->dev, + "Failed to allocate regmap: %d\n", ret); + return ret; + } + + ret = regmap_read(max98371->regmap, MAX98371_VERSION, &reg); + if (ret < 0) { + dev_info(&i2c->dev, "device error %d\n", ret); + return ret; + } + dev_info(&i2c->dev, "device version %x\n", reg); + + ret = snd_soc_register_codec(&i2c->dev, &max98371_codec, + max98371_dai, ARRAY_SIZE(max98371_dai)); + if (ret < 0) { + dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); + return ret; + } + return ret; +} + +static int max98371_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + return 0; +} + +static const struct i2c_device_id max98371_i2c_id[] = { + { "max98371", 0 }, +}; + +MODULE_DEVICE_TABLE(i2c, max98371_i2c_id); + +static const struct of_device_id max98371_of_match[] = { + { .compatible = "maxim,max98371", }, + { } +}; +MODULE_DEVICE_TABLE(of, max98371_of_match); + +static struct i2c_driver max98371_i2c_driver = { + .driver = { + .name = "max98371", + .owner = THIS_MODULE, + .pm = NULL, + .of_match_table = of_match_ptr(max98371_of_match), + }, + .probe = max98371_i2c_probe, + .remove = max98371_i2c_remove, + .id_table = max98371_i2c_id, +}; + +module_i2c_driver(max98371_i2c_driver); + +MODULE_AUTHOR("anish kumar <yesanishhere(a)gmail.com>"); +MODULE_DESCRIPTION("ALSA SoC MAX98371 driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/max98371.h b/sound/soc/codecs/max98371.h new file mode 100644 index 0000000..c75b259 --- /dev/null +++ b/sound/soc/codecs/max98371.h @@ -0,0 +1,64 @@ +/* + * max98371.h -- MAX98371 ALSA SoC Audio driver + * + * Copyright 2011-2012 Maxim Integrated Products + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _MAX98371_H +#define _MAX98371_H + +#define MAX98371_IRQ_CLEAR1 0x01 +#define MAX98371_IRQ_CLEAR2 0x02 +#define MAX98371_IRQ_CLEAR3 0x03 +#define MAX98371_DAI_CLK 0x10 +#define MAX98371_DAI_BSEL_MASK 0xF +#define MAX98371_DAI_BSEL_32 2 +#define MAX98371_DAI_BSEL_48 3 +#define MAX98371_DAI_BSEL_64 4 +#define MAX98371_SPK_SR 0x11 +#define MAX98371_SPK_SR_MASK 0xF +#define MAX98371_SPK_SR_32 6 +#define MAX98371_SPK_SR_44 7 +#define MAX98371_SPK_SR_48 8 +#define MAX98371_SPK_SR_88 10 +#define MAX98371_SPK_SR_96 11 +#define MAX98371_DAI_CHANNEL 0x15 +#define MAX98371_CHANNEL_MASK 0x3 +#define MAX98371_MONOMIX_SRC 0x18 +#define MAX98371_MONOMIX_CFG 0x19 +#define MAX98371_HPF 0x1C +#define MAX98371_MONOMIX_SRC_MASK 0xFF +#define MONOMIX_RX_0_1 ((0x1)<<(4)) +#define M98371_DAI_CHANNEL_I2S 0x3 +#define MAX98371_DIGITAL_GAIN 0x2D +#define MAX98371_DIGITAL_GAIN_WIDTH 0x7 +#define MAX98371_GAIN 0x2E +#define MAX98371_GAIN_SHIFT 0x4 +#define MAX98371_GAIN_WIDTH 0x4 +#define MAX98371_NO_LOAD_WIDTH 4 +#define MAX98371_FMT 0x14 +#define MAX98371_CHANSZ_WIDTH 6 +#define MAX98371_FMT_MASK ((0x3)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_FMT_MODE_MASK ((0x7)<<(3)) +#define MAX98371_DAI_LEFT ((0x1)<<(3)) +#define MAX98371_DAI_RIGHT ((0x2)<<(3)) +#define MAX98371_DAI_CHANSZ_16 ((1)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_DAI_CHANSZ_24 ((2)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_DAI_CHANSZ_32 ((3)<<(MAX98371_CHANSZ_WIDTH)) +#define MAX98371_DHT 0x32 +#define MAX98371_DHT_STEP 0x3 +#define MAX98371_SPK_ENABLE 0x4A +#define MAX98371_GLOBAL_ENABLE 0x50 +#define MAX98371_SOFT_RESET 0x51 +#define MAX98371_VERSION 0xFF + + +struct max98371_priv { + struct regmap *regmap; + struct snd_soc_codec *codec; +}; +#endif -- 1.9.3

2 7

[alsa-devel] [PATCH] ASoC: atmel_ssc_dai: read DSP mode A data on rising edges of bclk
by Peter Rosin 27 Apr '16

27 Apr '16

Signed-off-by: Peter Rosin <peda(a)axentia.se> --- sound/soc/atmel/atmel_ssc_dai.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 6dca95aa8a82..4ab1e2013238 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -652,7 +652,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, rcmr = SSC_BF(RCMR_PERIOD, ssc_p->rcmr_period) | SSC_BF(RCMR_STTDLY, 1) | SSC_BF(RCMR_START, SSC_START_RISING_RF) - | SSC_BF(RCMR_CKI, SSC_CKI_FALLING) + | SSC_BF(RCMR_CKI, SSC_CKI_RISING) | SSC_BF(RCMR_CKO, SSC_CKO_NONE) | SSC_BF(RCMR_CKS, SSC_CKS_DIV); @@ -692,7 +692,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, rcmr = SSC_BF(RCMR_PERIOD, 0) | SSC_BF(RCMR_STTDLY, START_DELAY) | SSC_BF(RCMR_START, SSC_START_RISING_RF) - | SSC_BF(RCMR_CKI, SSC_CKI_FALLING) + | SSC_BF(RCMR_CKI, SSC_CKI_RISING) | SSC_BF(RCMR_CKO, SSC_CKO_NONE) | SSC_BF(RCMR_CKS, ssc->clk_from_rk_pin ? SSC_CKS_PIN : SSC_CKS_CLOCK); -- 2.1.4

2 1