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

[alsa-devel] [PATCH] ASoC: hdac_hdmi: Add vendor id for Cannonlake HDMI codec
by Guneshwor Singh 21 Dec '17

21 Dec '17

Cannonlake HDMI codec has the same nid as Geminilake. This adds the vendor id for Cannonlake in hdmi device id list. Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 68a4a6b4e68e..69d7404dfbc4 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -2184,6 +2184,8 @@ static const struct hda_device_id hdmi_list[] = { HDA_CODEC_EXT_ENTRY(0x80862809, 0x100000, "Skylake HDMI", 0), HDA_CODEC_EXT_ENTRY(0x8086280a, 0x100000, "Broxton HDMI", 0), HDA_CODEC_EXT_ENTRY(0x8086280b, 0x100000, "Kabylake HDMI", 0), + HDA_CODEC_EXT_ENTRY(0x8086280c, 0x100000, "Cannonlake HDMI", + &intel_glk_drv_data), HDA_CODEC_EXT_ENTRY(0x8086280d, 0x100000, "Geminilake HDMI", &intel_glk_drv_data), {} -- 2.15.1

3 2

[alsa-devel] [RFC PATCH 0/2] select master clock in wm8994 driver based on DT clocks configuration
by Olivier Moysan 21 Dec '17

21 Dec '17

Hello, This RFC follows a previous RFC related to master clock issues with Wolfson wm8994 codec: http://mailman.alsa-project.org/pipermail/alsa-devel/2017-March/118834.html This RFC provides a new proposal regarding master clock selection in wm8994 driver. Below is a reminder of the problem: Use case: CPU DAI and codec are managed through audio graph card. Wolson codec wm8994 is set as slave of CPU DAI and CPU DAI feeds codec with master clock. Master clock is derived from mclk-fs property and provided to CPU DAI and codec through snd_soc_dai_set_sysclk API. Analysis: The audio graph card sets clock id to 0, while wm8994 codec driver expects a clock id in the range [1..4]. (MCLK1, MCLK2 ..) Proposal: Wolfson wm8994 codec bindings exposes MCLK1 and MCLK1 clocks. It seems that these clocks are not supported in wm8994 driver, yet. First patch adds support of these clocks. Second patch sets master clock according to clocks provided in DT. The patch assumes that MCLK1 and MCLK2 are linked to aif1 and aif2 interfaces respectively. If MCLKx is defined, is it used as source clock for aifx interface. Otherwise clock id parameter is used as usual. By default clock rate is requested from clock framework. This is not convenient, when mclk clock frequency is computed for mclk-fs ratio, as codec set_sysclk() is called before cpu set_sysclk() callback. In this case frequency provided by set_sysclk() must be used. So, if MCLKx rate is 0, frequency parameter provided by wm8994_set_dai_sysclk() is used. I have a limited view of potential side effects here, so any comments are welcome. If some adaptations are required to make this change more generic, please let me know. Regards Olivier Olivier Moysan (2): ASoC: add support of mclk clock providers in wm8894 driver ASoC: select sysclk clock from mlck clock provider in wm8994 driver drivers/mfd/wm8994-core.c | 9 +++++++++ include/linux/mfd/wm8994/pdata.h | 6 ++++++ sound/soc/codecs/wm8994.c | 20 +++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) -- 1.9.1

3 11

[alsa-devel] [PATCH v4 34/36] ALSA/dummy: Replace tasklet with softirq hrtimer
by Anna-Maria Gleixner 21 Dec '17

21 Dec '17

From: Thomas Gleixner <tglx(a)linutronix.de> The tasklet is used to defer the execution of snd_pcm_period_elapsed() to the softirq context. Using the HRTIMER_MODE_SOFT mode invokes the timer callback in softirq context as well which renders the tasklet useless. [o-takashi: avoid stall due to a call of hrtimer_cancel() on a callback of hrtimer] Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Signed-off-by: Anna-Maria Gleixner <anna-maria(a)linutronix.de> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Cc: Jaroslav Kysela <perex(a)perex.cz> Link: http://lkml.kernel.org/r/20170905161820.jtysvxtfleunbbmf@breakpoint.cc --- sound/drivers/dummy.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 7b2b1f766b00..6ad2ff57833d 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -375,17 +375,9 @@ struct dummy_hrtimer_pcm { ktime_t period_time; atomic_t running; struct hrtimer timer; - struct tasklet_struct tasklet; struct snd_pcm_substream *substream; }; -static void dummy_hrtimer_pcm_elapsed(unsigned long priv) -{ - struct dummy_hrtimer_pcm *dpcm = (struct dummy_hrtimer_pcm *)priv; - if (atomic_read(&dpcm->running)) - snd_pcm_period_elapsed(dpcm->substream); -} - static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer) { struct dummy_hrtimer_pcm *dpcm; @@ -393,7 +385,14 @@ static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer) dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer); if (!atomic_read(&dpcm->running)) return HRTIMER_NORESTART; - tasklet_schedule(&dpcm->tasklet); + /* + * In cases of XRUN and draining, this calls .trigger to stop PCM + * substream. + */ + snd_pcm_period_elapsed(dpcm->substream); + if (!atomic_read(&dpcm->running)) + return HRTIMER_NORESTART; + hrtimer_forward_now(timer, dpcm->period_time); return HRTIMER_RESTART; } @@ -403,7 +402,7 @@ static int dummy_hrtimer_start(struct snd_pcm_substream *substream) struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data; dpcm->base_time = hrtimer_cb_get_time(&dpcm->timer); - hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL); + hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL_SOFT); atomic_set(&dpcm->running, 1); return 0; } @@ -413,14 +412,14 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream) struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data; atomic_set(&dpcm->running, 0); - hrtimer_cancel(&dpcm->timer); + if (!hrtimer_callback_running(&dpcm->timer)) + hrtimer_cancel(&dpcm->timer); return 0; } static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm) { hrtimer_cancel(&dpcm->timer); - tasklet_kill(&dpcm->tasklet); } static snd_pcm_uframes_t @@ -465,12 +464,10 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream) if (!dpcm) return -ENOMEM; substream->runtime->private_data = dpcm; - hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT); dpcm->timer.function = dummy_hrtimer_callback; dpcm->substream = substream; atomic_set(&dpcm->running, 0); - tasklet_init(&dpcm->tasklet, dummy_hrtimer_pcm_elapsed, - (unsigned long)dpcm); return 0; } -- 2.11.0

1 0

[alsa-devel] pcm_post_start race condition with hardware error interrupts
by srainey＠delta-info.com 20 Dec '17

20 Dec '17

This is more of a general question/issue, but a bit of background: I encountered this in trying to resolve an issue on a fairly mature embedded ARM platform wherein captured audio was left/right swapped some small percent (~4%) of the time on startup. I should mention that I'm locked into using a fairly old kernel on this platform, but having a quick look at the latest at kernel.org reveals it to be not much changed. In tracing events, I found that during the stream startup, the following sequence is possible (and indeed does happen some small percent of time): -Audio Pipeline startups routines are kicked off through snd_pcm_action_start, eventually calling the driver's trigger op. -The driver's trigger function is called with SNDRV_PCM_TRIGGER_START command, which configures the necessary hardware and enables interrupts. -While the startup sequence is still running, an interrupt is generated due to some real error condition in the hardware, and the ISR sets the stream's state to SNDRV_PCM_STATE_XRUN. -The startup sequence reaches snd_pcm_post_start, which unconditionally sets the stream's state to RUNNING, clobbering the error state if it was set. See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/sou… If the hardware reaches an error state, the user must be informed in order to take action, but the unconditional assignment here does not allow that to happen if there is a hardware error in this small startup time. I don't have a patch because I am working on a very old vendor provided kernel (2.6.37), but by only setting the state if the current state is PREPARED, along with some other necessary changes in the driver, I was able to mitigate the l/r swap issue and get correct behavior. This is likely a very rare issue, but also it was somewhat difficult to debug. I'm not familiar enough with kernel dev processes or the audio framework to say something should be done or if there is perhaps some other solution here. It seems like something *should* be done anyway.

2 3

[alsa-devel] [PATCH] ALSA: usb-audio: Proper fallback at get_term_name()
by Takashi Iwai 20 Dec '17

20 Dec '17

get_term_name() calls snd_usb_copy_string_desc() for retrieving the name when a specific ID (name field) is given. When this returns an error (zero), however, it simply returns as is. This will end up in a fixed name string in the caller side, which often is meaningless. For giving a bit more useful name string depending on the terminal type, change the get_term_name() function to go through the fallback mode. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/mixer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 2b4ceda36291..9afb8ab524c7 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -656,10 +656,14 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm unsigned char *name, int maxlen, int term_only) { struct iterm_name_combo *names; + int len; - if (iterm->name) - return snd_usb_copy_string_desc(state, iterm->name, + if (iterm->name) { + len = snd_usb_copy_string_desc(state, iterm->name, name, maxlen); + if (len) + return len; + } /* virtual type - not a real terminal */ if (iterm->type >> 16) { -- 2.15.1

1 0

[alsa-devel] [PATCH 0/3] ASoC: remove dai_drv from snd_soc_component
by Kuninori Morimoto 20 Dec '17

20 Dec '17

Hi Mark These are not important, but cleanup. snd_soc_component is keeping DAI driver pointer, but each DAI has its driver, and component has dai_list. This means, we can reach to all DAI and its driver by using dai_list. We can remove DAI driver pointer from component. Kuninori Morimoto (3): ASoC: hdac_hdmi: keep DAI driver pointer in private data ASoC: soc-core: remove dai_drv from snd_soc_component ASoC: soc.h: Arrange DAI related parameter include/sound/soc.h | 4 +--- sound/soc/codecs/hdac_hdmi.c | 4 +++- sound/soc/soc-core.c | 14 ++++++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) -- 1.9.1

2 6

[alsa-devel] [PATCH 1/2] ASoC: Intel: Skylake: Request IRQ late only after all context are initialized
by Guneshwor Singh 20 Dec '17

20 Dec '17

From: "Subhransu S. Prusty" <subhransu.s.prusty(a)intel.com> Sometimes during boot, panic is observed at sst_dsp_shim_read_unlocked(). This happens when interrupt occurs before the context is initialized. So move the irq initialization only after the context is initialized completely. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Pawse, GuruprasadX <guruprasadx.pawse(a)intel.com> Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- sound/soc/intel/skylake/bxt-sst.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 2 +- sound/soc/intel/skylake/skl-sst-dsp.c | 14 ++++++++++---- sound/soc/intel/skylake/skl-sst-dsp.h | 1 + sound/soc/intel/skylake/skl-sst.c | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 1c78b853a7cc..13b1749fbcd5 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -582,7 +582,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, INIT_DELAYED_WORK(&skl->d0i3.work, bxt_set_dsp_D0i3); skl->d0i3.state = SKL_DSP_D0I3_NONE; - return 0; + return skl_dsp_acquire_irq(sst); } EXPORT_SYMBOL_GPL(bxt_sst_dsp_init); diff --git a/sound/soc/intel/skylake/cnl-sst.c b/sound/soc/intel/skylake/cnl-sst.c index 387de388ce29..245df1067ba8 100644 --- a/sound/soc/intel/skylake/cnl-sst.c +++ b/sound/soc/intel/skylake/cnl-sst.c @@ -458,7 +458,7 @@ int cnl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, cnl->boot_complete = false; init_waitqueue_head(&cnl->boot_wait); - return 0; + return skl_dsp_acquire_irq(sst); } EXPORT_SYMBOL_GPL(cnl_sst_dsp_init); diff --git a/sound/soc/intel/skylake/skl-sst-dsp.c b/sound/soc/intel/skylake/skl-sst-dsp.c index 19ee1d4f3bdf..71e31ad0bb3f 100644 --- a/sound/soc/intel/skylake/skl-sst-dsp.c +++ b/sound/soc/intel/skylake/skl-sst-dsp.c @@ -435,16 +435,22 @@ struct sst_dsp *skl_dsp_ctx_init(struct device *dev, return NULL; } + return sst; +} + +int skl_dsp_acquire_irq(struct sst_dsp *sst) +{ + struct sst_dsp_device *sst_dev = sst->sst_dev; + int ret; + /* Register the ISR */ ret = request_threaded_irq(sst->irq, sst->ops->irq_handler, sst_dev->thread, IRQF_SHARED, "AudioDSP", sst); - if (ret) { + if (ret) dev_err(sst->dev, "unable to grab threaded IRQ %d, disabling device\n", sst->irq); - return NULL; - } - return sst; + return ret; } void skl_dsp_free(struct sst_dsp *dsp) diff --git a/sound/soc/intel/skylake/skl-sst-dsp.h b/sound/soc/intel/skylake/skl-sst-dsp.h index b8e799ed65ef..12fc9a73dc8a 100644 --- a/sound/soc/intel/skylake/skl-sst-dsp.h +++ b/sound/soc/intel/skylake/skl-sst-dsp.h @@ -206,6 +206,7 @@ int skl_cldma_wait_interruptible(struct sst_dsp *ctx); void skl_dsp_set_state_locked(struct sst_dsp *ctx, int state); struct sst_dsp *skl_dsp_ctx_init(struct device *dev, struct sst_dsp_device *sst_dev, int irq); +int skl_dsp_acquire_irq(struct sst_dsp *sst); bool is_skl_dsp_running(struct sst_dsp *ctx); unsigned int skl_dsp_get_enabled_cores(struct sst_dsp *ctx); diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c index a436abf2fe3f..5a7e41b65ef3 100644 --- a/sound/soc/intel/skylake/skl-sst.c +++ b/sound/soc/intel/skylake/skl-sst.c @@ -569,7 +569,7 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, sst->fw_ops = skl_fw_ops; - return 0; + return skl_dsp_acquire_irq(sst); } EXPORT_SYMBOL_GPL(skl_sst_dsp_init); -- 2.15.1

3 4

[alsa-devel] [PATCH] ASoC: rsnd: fixup ADG register mask
by Kuninori Morimoto 20 Dec '17

20 Dec '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> BRGCKR should use 0x80770000, instead of 0x80FF0000. R-Car Gen2 xxx_TIMSEL should use 0x0F1F, R-Car Gen3 xxx_TIMSEL should use 0x1F1F. Here, Gen3 doesn't support AVD, thus, both case can use 0x0F1F. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> --- sound/soc/sh/rcar/adg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 8ddb087..4672688 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -222,7 +222,7 @@ int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *cmd_mod, NULL, &val, NULL); val = val << shift; - mask = 0xffff << shift; + mask = 0x0f1f << shift; rsnd_mod_bset(adg_mod, CMDOUT_TIMSEL, mask, val); @@ -250,7 +250,7 @@ int rsnd_adg_set_src_timesel_gen2(struct rsnd_mod *src_mod, in = in << shift; out = out << shift; - mask = 0xffff << shift; + mask = 0x0f1f << shift; switch (id / 2) { case 0: @@ -380,7 +380,7 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate) ckr = 0x80000000; } - rsnd_mod_bset(adg_mod, BRGCKR, 0x80FF0000, adg->ckr | ckr); + rsnd_mod_bset(adg_mod, BRGCKR, 0x80770000, adg->ckr | ckr); rsnd_mod_write(adg_mod, BRRA, adg->rbga); rsnd_mod_write(adg_mod, BRRB, adg->rbgb); -- 1.9.1

2 1

[alsa-devel] Raspberry Pi - asound/proc/status - state parameter always set to RUNNING?
by Michael Pinnell 20 Dec '17

20 Dec '17

Hi all, I was passed thi smailing list info in this github issue.. https://github.com/opensrc/alsa/issues/26#issuecomment-352616858 Basically, I'm working on a raspberry pi and need to know when sound is playing or not, and I'm trying to use the status file's state parameter to determine when this is. It seems however that my state parameter is always set to RUNNING and has an owner_pid even though that pid is not showing up in ps. Any ideas what may be causing this and how to rectify? Thanks, any help would be much appreciated. Regards, Mike. <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_cam…> Virus-free. www.avg.com <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_cam…> <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

1 0

[alsa-devel] [asoc:topic/fsl-ssi 11/18] sound/soc/fsl/fsl_ssi.h:87:0: warning: "SSI_SCR_TCH_EN" redefined
by kbuild test robot 19 Dec '17

19 Dec '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/fsl-ssi head: 52eee84e815e0fbaf9ada848ab5646314a529b61 commit: a818aa5f967ba60522ee0ad181a0c5a96b65d999 [11/18] ASoC: fsl_ssi: Rename registers and fields macros config: arm-allmodconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (Debian 7.2.0-11) 7.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout a818aa5f967ba60522ee0ad181a0c5a96b65d999 # save the attached .config to linux build tree make.cross ARCH=arm All warnings (new ones prefixed by >>): In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:87:0: warning: "SSI_SCR_TCH_EN" redefined #define SSI_SCR_TCH_EN 0x00000100 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:18:0: note: this is the location of the previous definition #define SSI_SCR_TCH_EN (1 << 8) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:88:0: warning: "SSI_SCR_SYS_CLK_EN" redefined #define SSI_SCR_SYS_CLK_EN 0x00000080 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:19:0: note: this is the location of the previous definition #define SSI_SCR_SYS_CLK_EN (1 << 7) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:92:0: warning: "SSI_SCR_I2S_MODE_SLAVE" redefined #define SSI_SCR_I2S_MODE_SLAVE 0x00000040 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:22:0: note: this is the location of the previous definition #define SSI_SCR_I2S_MODE_SLAVE (2 << 5) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:93:0: warning: "SSI_SCR_SYN" redefined #define SSI_SCR_SYN 0x00000010 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:24:0: note: this is the location of the previous definition #define SSI_SCR_SYN (1 << 4) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:94:0: warning: "SSI_SCR_NET" redefined #define SSI_SCR_NET 0x00000008 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:25:0: note: this is the location of the previous definition #define SSI_SCR_NET (1 << 3) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:95:0: warning: "SSI_SCR_RE" redefined #define SSI_SCR_RE 0x00000004 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:26:0: note: this is the location of the previous definition #define SSI_SCR_RE (1 << 2) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:96:0: warning: "SSI_SCR_TE" redefined #define SSI_SCR_TE 0x00000002 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:27:0: note: this is the location of the previous definition #define SSI_SCR_TE (1 << 1) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:97:0: warning: "SSI_SCR_SSIEN" redefined #define SSI_SCR_SSIEN 0x00000001 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:28:0: note: this is the location of the previous definition #define SSI_SCR_SSIEN (1 << 0) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:102:0: warning: "SSI_SISR_CMDAU" redefined #define SSI_SISR_CMDAU 0x00040000 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:32:0: note: this is the location of the previous definition #define SSI_SISR_CMDAU (1 << 18) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:103:0: warning: "SSI_SISR_CMDDU" redefined #define SSI_SISR_CMDDU 0x00020000 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:33:0: note: this is the location of the previous definition #define SSI_SISR_CMDDU (1 << 17) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:104:0: warning: "SSI_SISR_RXT" redefined #define SSI_SISR_RXT 0x00010000 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:34:0: note: this is the location of the previous definition #define SSI_SISR_RXT (1 << 16) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:105:0: warning: "SSI_SISR_RDR1" redefined #define SSI_SISR_RDR1 0x00008000 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:35:0: note: this is the location of the previous definition #define SSI_SISR_RDR1 (1 << 15) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:106:0: warning: "SSI_SISR_RDR0" redefined #define SSI_SISR_RDR0 0x00004000 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:36:0: note: this is the location of the previous definition #define SSI_SISR_RDR0 (1 << 14) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:107:0: warning: "SSI_SISR_TDE1" redefined #define SSI_SISR_TDE1 0x00002000 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:37:0: note: this is the location of the previous definition #define SSI_SISR_TDE1 (1 << 13) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:108:0: warning: "SSI_SISR_TDE0" redefined #define SSI_SISR_TDE0 0x00001000 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:38:0: note: this is the location of the previous definition #define SSI_SISR_TDE0 (1 << 12) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:109:0: warning: "SSI_SISR_ROE1" redefined #define SSI_SISR_ROE1 0x00000800 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:39:0: note: this is the location of the previous definition #define SSI_SISR_ROE1 (1 << 11) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:110:0: warning: "SSI_SISR_ROE0" redefined #define SSI_SISR_ROE0 0x00000400 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:40:0: note: this is the location of the previous definition #define SSI_SISR_ROE0 (1 << 10) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:111:0: warning: "SSI_SISR_TUE1" redefined #define SSI_SISR_TUE1 0x00000200 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:41:0: note: this is the location of the previous definition #define SSI_SISR_TUE1 (1 << 9) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:112:0: warning: "SSI_SISR_TUE0" redefined #define SSI_SISR_TUE0 0x00000100 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:42:0: note: this is the location of the previous definition #define SSI_SISR_TUE0 (1 << 8) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: >> sound/soc/fsl/fsl_ssi.h:113:0: warning: "SSI_SISR_TFS" redefined #define SSI_SISR_TFS 0x00000080 In file included from sound/soc/fsl/eukrea-tlv320.c:31:0: sound/soc/fsl/imx-ssi.h:43:0: note: this is the location of the previous definition #define SSI_SISR_TFS (1 << 7) In file included from sound/soc/fsl/eukrea-tlv320.c:32:0: vim +/SSI_SCR_TCH_EN +87 sound/soc/fsl/fsl_ssi.h 82 83 /* SSI Control Register -- REG_SSI_SCR 0x10 */ 84 #define SSI_SCR_SYNC_TX_FS 0x00001000 85 #define SSI_SCR_RFR_CLK_DIS 0x00000800 86 #define SSI_SCR_TFR_CLK_DIS 0x00000400 > 87 #define SSI_SCR_TCH_EN 0x00000100 > 88 #define SSI_SCR_SYS_CLK_EN 0x00000080 89 #define SSI_SCR_I2S_MODE_MASK 0x00000060 90 #define SSI_SCR_I2S_MODE_NORMAL 0x00000000 91 #define SSI_SCR_I2S_MODE_MASTER 0x00000020 > 92 #define SSI_SCR_I2S_MODE_SLAVE 0x00000040 > 93 #define SSI_SCR_SYN 0x00000010 > 94 #define SSI_SCR_NET 0x00000008 > 95 #define SSI_SCR_RE 0x00000004 > 96 #define SSI_SCR_TE 0x00000002 > 97 #define SSI_SCR_SSIEN 0x00000001 98 99 /* SSI Interrupt Status Register -- REG_SSI_SISR 0x14 */ 100 #define SSI_SISR_RFRC 0x01000000 101 #define SSI_SISR_TFRC 0x00800000 > 102 #define SSI_SISR_CMDAU 0x00040000 > 103 #define SSI_SISR_CMDDU 0x00020000 > 104 #define SSI_SISR_RXT 0x00010000 > 105 #define SSI_SISR_RDR1 0x00008000 > 106 #define SSI_SISR_RDR0 0x00004000 > 107 #define SSI_SISR_TDE1 0x00002000 > 108 #define SSI_SISR_TDE0 0x00001000 > 109 #define SSI_SISR_ROE1 0x00000800 > 110 #define SSI_SISR_ROE0 0x00000400 > 111 #define SSI_SISR_TUE1 0x00000200 > 112 #define SSI_SISR_TUE0 0x00000100 > 113 #define SSI_SISR_TFS 0x00000080 > 114 #define SSI_SISR_RFS 0x00000040 > 115 #define SSI_SISR_TLS 0x00000020 > 116 #define SSI_SISR_RLS 0x00000010 > 117 #define SSI_SISR_RFF1 0x00000008 > 118 #define SSI_SISR_RFF0 0x00000004 > 119 #define SSI_SISR_TFE1 0x00000002 > 120 #define SSI_SISR_TFE0 0x00000001 121 122 /* SSI Interrupt Enable Register -- REG_SSI_SIER 0x18 */ 123 #define SSI_SIER_RFRC_EN 0x01000000 124 #define SSI_SIER_TFRC_EN 0x00800000 > 125 #define SSI_SIER_RDMAE 0x00400000 > 126 #define SSI_SIER_RIE 0x00200000 > 127 #define SSI_SIER_TDMAE 0x00100000 > 128 #define SSI_SIER_TIE 0x00080000 > 129 #define SSI_SIER_CMDAU_EN 0x00040000 > 130 #define SSI_SIER_CMDDU_EN 0x00020000 > 131 #define SSI_SIER_RXT_EN 0x00010000 > 132 #define SSI_SIER_RDR1_EN 0x00008000 > 133 #define SSI_SIER_RDR0_EN 0x00004000 > 134 #define SSI_SIER_TDE1_EN 0x00002000 > 135 #define SSI_SIER_TDE0_EN 0x00001000 > 136 #define SSI_SIER_ROE1_EN 0x00000800 > 137 #define SSI_SIER_ROE0_EN 0x00000400 > 138 #define SSI_SIER_TUE1_EN 0x00000200 > 139 #define SSI_SIER_TUE0_EN 0x00000100 > 140 #define SSI_SIER_TFS_EN 0x00000080 > 141 #define SSI_SIER_RFS_EN 0x00000040 > 142 #define SSI_SIER_TLS_EN 0x00000020 > 143 #define SSI_SIER_RLS_EN 0x00000010 > 144 #define SSI_SIER_RFF1_EN 0x00000008 > 145 #define SSI_SIER_RFF0_EN 0x00000004 > 146 #define SSI_SIER_TFE1_EN 0x00000002 > 147 #define SSI_SIER_TFE0_EN 0x00000001 148 149 /* SSI Transmit Configuration Register -- REG_SSI_STCR 0x1C */ > 150 #define SSI_STCR_TXBIT0 0x00000200 > 151 #define SSI_STCR_TFEN1 0x00000100 > 152 #define SSI_STCR_TFEN0 0x00000080 > 153 #define SSI_STCR_TFDIR 0x00000040 > 154 #define SSI_STCR_TXDIR 0x00000020 > 155 #define SSI_STCR_TSHFD 0x00000010 > 156 #define SSI_STCR_TSCKP 0x00000008 > 157 #define SSI_STCR_TFSI 0x00000004 > 158 #define SSI_STCR_TFSL 0x00000002 > 159 #define SSI_STCR_TEFS 0x00000001 160 161 /* SSI Receive Configuration Register -- REG_SSI_SRCR 0x20 */ 162 #define SSI_SRCR_RXEXT 0x00000400 > 163 #define SSI_SRCR_RXBIT0 0x00000200 > 164 #define SSI_SRCR_RFEN1 0x00000100 > 165 #define SSI_SRCR_RFEN0 0x00000080 > 166 #define SSI_SRCR_RFDIR 0x00000040 > 167 #define SSI_SRCR_RXDIR 0x00000020 > 168 #define SSI_SRCR_RSHFD 0x00000010 > 169 #define SSI_SRCR_RSCKP 0x00000008 > 170 #define SSI_SRCR_RFSI 0x00000004 > 171 #define SSI_SRCR_RFSL 0x00000002 > 172 #define SSI_SRCR_REFS 0x00000001 173 174 /* 175 * SSI Transmit Clock Control Register -- REG_SSI_STCCR 0x24 176 * SSI Receive Clock Control Register -- REG_SSI_SRCCR 0x28 177 */ 178 #define SSI_SxCCR_DIV2_SHIFT 18 179 #define SSI_SxCCR_DIV2 0x00040000 180 #define SSI_SxCCR_PSR_SHIFT 17 181 #define SSI_SxCCR_PSR 0x00020000 182 #define SSI_SxCCR_WL_SHIFT 13 183 #define SSI_SxCCR_WL_MASK 0x0001E000 184 #define SSI_SxCCR_WL(x) \ 185 (((((x) / 2) - 1) << SSI_SxCCR_WL_SHIFT) & SSI_SxCCR_WL_MASK) 186 #define SSI_SxCCR_DC_SHIFT 8 187 #define SSI_SxCCR_DC_MASK 0x00001F00 188 #define SSI_SxCCR_DC(x) \ 189 ((((x) - 1) << SSI_SxCCR_DC_SHIFT) & SSI_SxCCR_DC_MASK) 190 #define SSI_SxCCR_PM_SHIFT 0 191 #define SSI_SxCCR_PM_MASK 0x000000FF 192 #define SSI_SxCCR_PM(x) \ 193 ((((x) - 1) << SSI_SxCCR_PM_SHIFT) & SSI_SxCCR_PM_MASK) 194 195 /* 196 * SSI FIFO Control/Status Register -- REG_SSI_SFCSR 0x2c 197 * 198 * Tx or Rx FIFO Counter -- SSI_SFCSR_xFCNTy Read-Only 199 * Tx or Rx FIFO Watermarks -- SSI_SFCSR_xFWMy Read/Write 200 */ 201 #define SSI_SFCSR_RFCNT1_SHIFT 28 202 #define SSI_SFCSR_RFCNT1_MASK 0xF0000000 > 203 #define SSI_SFCSR_RFCNT1(x) \ 204 (((x) & SSI_SFCSR_RFCNT1_MASK) >> SSI_SFCSR_RFCNT1_SHIFT) 205 #define SSI_SFCSR_TFCNT1_SHIFT 24 206 #define SSI_SFCSR_TFCNT1_MASK 0x0F000000 > 207 #define SSI_SFCSR_TFCNT1(x) \ 208 (((x) & SSI_SFCSR_TFCNT1_MASK) >> SSI_SFCSR_TFCNT1_SHIFT) 209 #define SSI_SFCSR_RFWM1_SHIFT 20 210 #define SSI_SFCSR_RFWM1_MASK 0x00F00000 > 211 #define SSI_SFCSR_RFWM1(x) \ 212 (((x) << SSI_SFCSR_RFWM1_SHIFT) & SSI_SFCSR_RFWM1_MASK) 213 #define SSI_SFCSR_TFWM1_SHIFT 16 214 #define SSI_SFCSR_TFWM1_MASK 0x000F0000 > 215 #define SSI_SFCSR_TFWM1(x) \ 216 (((x) << SSI_SFCSR_TFWM1_SHIFT) & SSI_SFCSR_TFWM1_MASK) 217 #define SSI_SFCSR_RFCNT0_SHIFT 12 218 #define SSI_SFCSR_RFCNT0_MASK 0x0000F000 > 219 #define SSI_SFCSR_RFCNT0(x) \ 220 (((x) & SSI_SFCSR_RFCNT0_MASK) >> SSI_SFCSR_RFCNT0_SHIFT) 221 #define SSI_SFCSR_TFCNT0_SHIFT 8 222 #define SSI_SFCSR_TFCNT0_MASK 0x00000F00 > 223 #define SSI_SFCSR_TFCNT0(x) \ 224 (((x) & SSI_SFCSR_TFCNT0_MASK) >> SSI_SFCSR_TFCNT0_SHIFT) 225 #define SSI_SFCSR_RFWM0_SHIFT 4 > 226 #define SSI_SFCSR_RFWM0_MASK 0x000000F0 > 227 #define SSI_SFCSR_RFWM0(x) \ 228 (((x) << SSI_SFCSR_RFWM0_SHIFT) & SSI_SFCSR_RFWM0_MASK) 229 #define SSI_SFCSR_TFWM0_SHIFT 0 > 230 #define SSI_SFCSR_TFWM0_MASK 0x0000000F > 231 #define SSI_SFCSR_TFWM0(x) \ 232 (((x) << SSI_SFCSR_TFWM0_SHIFT) & SSI_SFCSR_TFWM0_MASK) 233 234 /* SSI Test Register -- REG_SSI_STR 0x30 */ > 235 #define SSI_STR_TEST 0x00008000 > 236 #define SSI_STR_RCK2TCK 0x00004000 > 237 #define SSI_STR_RFS2TFS 0x00002000 > 238 #define SSI_STR_RXSTATE(x) (((x) >> 8) & 0x1F) > 239 #define SSI_STR_TXD2RXD 0x00000080 > 240 #define SSI_STR_TCK2RCK 0x00000040 > 241 #define SSI_STR_TFS2RFS 0x00000020 > 242 #define SSI_STR_TXSTATE(x) ((x) & 0x1F) 243 244 /* SSI Option Register -- REG_SSI_SOR 0x34 */ > 245 #define SSI_SOR_CLKOFF 0x00000040 > 246 #define SSI_SOR_RX_CLR 0x00000020 > 247 #define SSI_SOR_TX_CLR 0x00000010 > 248 #define SSI_SOR_INIT 0x00000008 249 #define SSI_SOR_WAIT_SHIFT 1 > 250 #define SSI_SOR_WAIT_MASK 0x00000006 > 251 #define SSI_SOR_WAIT(x) (((x) & 3) << SSI_SOR_WAIT_SHIFT) > 252 #define SSI_SOR_SYNRST 0x00000001 253 254 /* SSI AC97 Control Register -- REG_SSI_SACNT 0x38 */ 255 #define SSI_SACNT_FRDIV(x) (((x) & 0x3f) << 5) > 256 #define SSI_SACNT_WR 0x00000010 > 257 #define SSI_SACNT_RD 0x00000008 258 #define SSI_SACNT_RDWR_MASK 0x00000018 > 259 #define SSI_SACNT_TIF 0x00000004 > 260 #define SSI_SACNT_FV 0x00000002 > 261 #define SSI_SACNT_AC97EN 0x00000001 262 263 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1