June 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCHv2] ASoC: dapm - Refactor widget IO functions in preparation for platform widgets.
by Liam Girdwood 10 Jun '11

10 Jun '11

Currently widget IO is tightly coupled to the CODEC drivers. Future platform DSP devices have mixer components that can alter power usage and hence require full DAPM support. This provides a generic widget IO operation wrapper in preparation for future patches that implement platform driver DAPM. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- sound/soc/soc-dapm.c | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 34106bc..ea6c2a5 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -124,6 +124,35 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget( return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL); } +static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg) +{ + if (w->codec) + return snd_soc_read(w->codec, reg); + return 0; +} + +static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg, int val) +{ + if (w->codec) + return snd_soc_write(w->codec, reg, val); + return 0; +} + +static int soc_widget_update_bits(struct snd_soc_dapm_widget *w, + unsigned short reg, unsigned int mask, unsigned int value) +{ + int change; + unsigned int old, new; + + old = soc_widget_read(w, reg); + new = (old & ~mask) | value; + change = old != new; + if (change) + soc_widget_write(w, reg, new); + + return change; +} + /** * snd_soc_dapm_set_bias_level - set the bias level for the system * @dapm: DAPM context @@ -181,7 +210,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; - val = snd_soc_read(w->codec, reg); + val = soc_widget_read(w, reg); val = (val >> shift) & mask; if ((invert && !val) || (!invert && val)) @@ -197,7 +226,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, for (bitmask = 1; bitmask < e->max; bitmask <<= 1) ; - val = snd_soc_read(w->codec, e->reg); + val = soc_widget_read(w, e->reg); item = (val >> e->shift_l) & (bitmask - 1); p->connect = 0; @@ -227,7 +256,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, w->kcontrol_news[i].private_value; int val, item; - val = snd_soc_read(w->codec, e->reg); + val = soc_widget_read(w, e->reg); val = (val >> e->shift_l) & e->mask; for (item = 0; item < e->max; item++) { if (val == e->values[item]) @@ -669,7 +698,7 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w, else val = w->off_val; - snd_soc_update_bits(w->codec, -(w->reg + 1), + soc_widget_update_bits(w, -(w->reg + 1), w->mask << w->shift, val << w->shift); return 0; @@ -877,7 +906,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm, "pop test : Applying 0x%x/0x%x to %x in %dms\n", value, mask, reg, card->pop_time); pop_wait(card->pop_time); - snd_soc_update_bits(dapm->codec, reg, mask, value); + soc_widget_update_bits(w, reg, mask, value); } list_for_each_entry(w, pending, power_list) { @@ -1878,7 +1907,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) /* Read the initial power state from the device */ if (w->reg >= 0) { - val = snd_soc_read(w->codec, w->reg); + val = soc_widget_read(w, w->reg); val &= 1 << w->shift; if (w->invert) val = !val; -- 1.7.4.1

1 0

[alsa-devel] [PATCH] ALSA: hda: Fix inaudible internal speakers on CyberpowerPC Gamer Xplorer N57001 laptop
by Daniel Chen 10 Jun '11

10 Jun '11

Hi, Attached is a patch against current sound-2.6 master HEAD that resolves the original reporter's inaudible internal speakers by using the model=asus quirk. Please apply. Cheers, -Dan

2 5

[alsa-devel] Regression in 3.0: oops with module RO/NX in snd_printk when loading snd-hda-intel (gold linker bug?)
by Maarten Lankhorst 10 Jun '11

10 Jun '11

Since 3.0.0rc1 I get an oops in alc_auto_parse_customize_define, when it's calling snd_printk, I have module NX/RO enabled, and linked the kernel with gold. the only command I do is 'modprobe snd debug=8; modprobe snd-hda-intel' after init=/bin/bash ld --version: GNU gold (GNU Binutils for Ubuntu 2.21.0.20110327) 1.11 [ 43.327003] HDA Intel 0000:00:1b.0: enabling device (0000 -> 0002) [ 43.327012] HDA Intel 0000:00:1b.0: PCI INT A -> GSI 22 (level, low) -> IRQ 22 [ 43.327063] HDA Intel 0000:00:1b.0: irq 46 for MSI/MSI-X [ 43.327090] HDA Intel 0000:00:1b.0: setting latency timer to 64 [ 43.327097] BUG: unable to handle kernel paging request at ffffffffa003c80a [ 43.327253] IP: [<ffffffffa002f791>] __snd_printk+0x71/0x110 [snd] [ 43.327392] PGD 1a25067 PUD 1a29063 PMD 231bce067 PTE 0 [ 43.327523] Oops: 0000 [#1] PREEMPT SMP [ 43.327620] CPU 1 [ 43.327660] Modules linked in: snd_hda_intel(+) snd_hda_codec snd_hwdep snd_pcm_oss snd_pcm snd_page_alloc snd_seq_midi snd_seq_midi_event snd_rawmidi snd_seq snd_seq_device snd_timer snd soundcore [ 43.328104] [ 43.328134] Pid: 149, comm: modprobe Not tainted 3.0.0-rc2-patser+ #34 To Be Filled By O.E.M. To Be Filled By O.E.M./P67 Pro3 [ 43.328393] RIP: 0010:[<ffffffffa002f791>] [<ffffffffa002f791>] __snd_printk+0x71/0x110 [snd] [ 43.328581] RSP: 0018:ffff8802310a9c38 EFLAGS: 00010216 [ 43.328696] RAX: ffff8802310a9c78 RBX: 0000000000000002 RCX: ffffffffa00bea30 [ 43.328851] RDX: 0000000000000a1a RSI: ffffffffa00be00a RDI: ffffffffa00be00a [ 43.329006] RBP: ffff8802310a9cb8 R08: 0000000000004401 R09: 0000000000000040 [ 43.329161] R10: 00000000000000d8 R11: 0000000000000002 R12: ffffffffa00bea30 [ 43.329316] R13: ffff88023110e800 R14: ffff88023110e800 R15: 0000000000004401 [ 43.329472] FS: 00007fc62e05c720(0000) GS:ffff88023f480000(0000) knlGS:0000000000000000 [ 43.329647] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 43.329772] CR2: ffffffffa003c80a CR3: 00000002310b6000 CR4: 00000000000406e0 [ 43.329927] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 43.330082] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 43.330237] Process modprobe (pid: 149, threadinfo ffff8802310a8000, task ffff8802311216f0) [ 43.330418] Stack: [ 43.330462] ffff8802310a9c58 ffffffff81a05080 ffff880200000020 ffff8802310a9cc8 [ 43.330640] ffff8802310a9c78 ffffffff810bab78 ffff8802310a9c98 0000000005411735 [ 43.330815] ffff88023110e800 40ff880232ad3000 ffff880232ad3000 ffff880232ad3000 [ 43.330991] Call Trace: [ 43.331044] [<ffffffff810bab78>] ? synchronize_irq+0x58/0xf0 [ 43.336434] [<ffffffffa00bd191>] azx_probe+0x48b/0x9fb [snd_hda_intel] [ 43.341867] [<ffffffff81317e8f>] local_pci_probe+0x5f/0xd0 [ 43.347300] [<ffffffff813185f9>] pci_device_probe+0x119/0x120 [ 43.352744] [<ffffffff813b27aa>] ? driver_sysfs_add+0x7a/0xb0 [ 43.358193] [<ffffffff813b2b23>] driver_probe_device+0xa3/0x2a0 [ 43.363649] [<ffffffff813b2dcb>] __driver_attach+0xab/0xb0 [ 43.369038] [<ffffffff813b2d20>] ? driver_probe_device+0x2a0/0x2a0 [ 43.374387] [<ffffffff813b193e>] bus_for_each_dev+0x5e/0x90 [ 43.379725] [<ffffffff813b272e>] driver_attach+0x1e/0x20 [ 43.385029] [<ffffffff813b22d0>] bus_add_driver+0x160/0x2b0 [ 43.390172] [<ffffffffa0021000>] ? 0xffffffffa0020fff [ 43.395151] [<ffffffff813b3394>] driver_register+0x74/0x130 [ 43.400133] [<ffffffffa0021000>] ? 0xffffffffa0020fff [ 43.405010] [<ffffffff81318876>] __pci_register_driver+0x56/0xd0 [ 43.409827] [<ffffffff8102b653>] ? set_memory_nx+0x43/0x50 [ 43.414645] [<ffffffffa002101e>] alsa_card_azx_init+0x1e/0x1000 [snd_hda_intel] [ 43.419550] [<ffffffff810002d5>] do_one_initcall+0x45/0x170 [ 43.424489] [<ffffffff8109505a>] sys_init_module+0xfa/0x250 [ 43.429420] [<ffffffff8157c52b>] system_call_fastpath+0x16/0x1b [ 43.434403] Code: 00 00 00 75 6b 48 8b 5d f0 4c 8b 65 f8 c9 c3 48 8d 45 10 c7 45 90 20 00 00 00 48 89 45 98 48 8d 45 c0 48 89 45 a0 80 3e 2f 74 78 <8b> 05 73 d0 00 00 85 db 89 45 b0 48 c7 c6 b3 23 03 a0 48 c7 c0 [ 43.444891] RIP [<ffffffffa002f791>] __snd_printk+0x71/0x110 [snd] [ 43.450012] RSP <ffff8802310a9c38> [ 43.450013] CR2: ffffffffa003c80a [ 43.450014] ---[ end trace 890ffb2c861edf22 ]--- everything sound loaded modular, all hda codecs too. CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_VERBOSE=y module RO/NX is set, which I assume is causing the problem. I don't understand the oops, but disassembly of the specific offset is below, from objdump -S: 7de1 is the location of the crash #ifdef CONFIG_SND_VERBOSE_PRINTK /* strip the leading path if the given path is absolute */ static const char *sanity_file_name(const char *path) { if (*path == '/') 7ddc: 80 3e 2f cmpb $0x2f,(%rsi) 7ddf: 74 78 je 7e59 <__snd_printk+0xe9> /* print file and line with a certain printk prefix */ static int print_snd_pfx(unsigned int level, const char *path, int line, const char *format) { const char *file = sanity_file_name(path); char tmp[] = "<0>"; 7de1: 8b 05 00 00 00 00 mov 0x0(%rip),%eax # 7de7 <__snd_printk+0x77> const char *pfx = level ? KERN_DEBUG : KERN_DEFAULT; 7de7: 85 db test %ebx,%ebx /* print file and line with a certain printk prefix */ static int print_snd_pfx(unsigned int level, const char *path, int line, const char *format) { const char *file = sanity_file_name(path); char tmp[] = "<0>"; 7de9: 89 45 b0 mov %eax,-0x50(%rbp) const char *pfx = level ? KERN_DEBUG : KERN_DEFAULT; 7dec: 48 c7 c6 00 00 00 00 mov $0x0,%rsi 7df3: 48 c7 c0 00 00 00 00 mov $0x0,%rax 7dfa: 48 0f 44 f0 cmove %rax,%rsi --- Seems to me like it's segfaulting when loading <0>\0 (4 bytes, so fits in an integer) to %eax. building all modules with the normal binutils works fine, and makes this crash disappear. Is this bug interesting enough that I'll see if I can find the commit which caused this regression? ~Maarten

2 3

[alsa-devel] ASoC pr_debug disabled in soc-core.c
by Lambrecht Jürgen 10 Jun '11

10 Jun '11

Hello, I am rather new to linux, and I don't find why 'pr_debug' is disabled in /sound/soc/soc-core.c but enabled in /drivers/base/dd.c (can see the messages with 'dmesg' or with setting 'loglevel=8'). (printk(KERN_DEBUG ...) does work though) I enabled those configuration options: - DEBUG_DRIVER - SND_DEBUG - SND_VERBOSE_PRINTK - DEBUG_KERNEL (SND_PCM_XRUN_DEBUG is disabled) What am I missing? Regards, Jürgen -- Jürgen Lambrecht R&D Associate Tel: +32 (0)51 303045 Fax: +32 (0)51 310670 http://www.televic-rail.com Televic Rail NV - Leo Bekaertlaan 1 - 8870 Izegem - Belgium Company number 0825.539.581 - RPR Kortrijk

1 0

[alsa-devel] [PATCH] ASoC: omap-mcbsp: Do not attempt to change DAI sysclk if stream is active
by Jarkko Nikula 10 Jun '11

10 Jun '11

Attempt to change McBSP CLKS source while another stream is active is not safe after commit d135865 ("OMAP: McBSP: implement functional clock switching via clock framework") in 2.6.37. CLKS parent clock switching using clock framework have to idle the McBSP before switching and then activate it again. This short break can cause a DMA transaction error to already running stream which halts and recovers only by closing and restarting the stream. This goes more fatal after commit e2fa61d ("OMAP3: l3: Introduce l3-interconnect error handling driver") in 2.6.39 where l3 driver detects a severe timeout error and does BUG_ON(). Fix this by checking is the McBSP active in omap_mcbsp_dai_set_dai_sysclk before attempting to change any clocking configuration. This test should have been here just from the beginning anyway. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> Cc: stable(a)kernel.org --- For 2.6.37 and onward. This issue is valid to those machine drivers that use the McBSP as a DAI link master and are configuring the CLKS source (like sound/soc/omap/omap3pandora.c in mainline). --- sound/soc/omap/omap-mcbsp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 07b7723..fc896c1 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -516,6 +516,9 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; int err = 0; + if (mcbsp_data->active) + return 0; + /* The McBSP signal muxing functions are only available on McBSP1 */ if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR || clk_id == OMAP_MCBSP_CLKR_SRC_CLKX || -- 1.7.4.4

3 5

[alsa-devel] ASoC updates for 3.1
by Mark Brown 10 Jun '11

10 Jun '11

The following changes since commit d21685ec258f803d3badae5eae821383a34815a9: Merge branch 'for-2.6.40' into for-2.6.41 (2011-05-30 10:54:18 +0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-3.0 Due to the merge up of 3.0-rc1 I wasn't able to get a sensible changelog or diff out of git easily - pretty much everything has been sitting in -next except for a small Samsung patch.

2 2

[alsa-devel] ASoC updates for 3.0
by Mark Brown 10 Jun '11

10 Jun '11

The following changes since commit 59c5f46fbe01a00eedf54a23789634438bb80603: Linux 3.0-rc2 (2011-06-06 18:06:33 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-3.0 This also includes a merge up of 3.0-rc1. The core change is the relatively large but straightforward patch to pass the DAPM context around when creating new mixers. Joachim Eastwood (1): ASoC: atmel_ssc: Don't try to free ssc if request failed Lars-Peter Clausen (3): ASoC: AD1836: Fix setting the PCM format ASoC: Blackfin: bf5xx-ad1836: Fix codec device name ASoC: snd_soc_new_{mixer,mux,pga} make sure to use right DAPM context Mark Brown (6): Merge branch 'for-3.0' of git://git.kernel.org/.../broonie/sound-2.6 into for-3.0 ASoC: Only update SYSCLK_ENA when pausing WM8915 SYSCLK ASoC: Add missing break in WM8915 FLL source selection ASoC: Check for NULL register bank in snd_soc_get_cache_val() ASoC: Fix WM8962 headphone volume update for use of advanced caches ASoC: WM8804 does not support sample rates below 32kHz Sangbeom Kim (1): ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register Timur Tabi (1): ASoC: fsl: fix initialization of DMA buffers sound/soc/atmel/atmel_ssc_dai.c | 5 +++-- sound/soc/blackfin/bf5xx-ad1836.c | 4 ++-- sound/soc/codecs/ad1836.c | 14 +++++++------- sound/soc/codecs/ad1836.h | 6 ++++++ sound/soc/codecs/wm8804.c | 9 +++++++-- sound/soc/codecs/wm8915.c | 3 ++- sound/soc/codecs/wm8962.c | 4 ++-- sound/soc/codecs/wm_hubs.c | 8 ++++---- sound/soc/fsl/fsl_dma.c | 9 +++++---- sound/soc/samsung/i2s.c | 4 ++-- sound/soc/soc-cache.c | 3 +++ sound/soc/soc-dapm.c | 22 ++++++++++++---------- 12 files changed, 55 insertions(+), 36 deletions(-)

2 1

[alsa-devel] [PATCH] ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register
by Sangbeom Kim 10 Jun '11

10 Jun '11

If DMA active status should be checked, I2SCON register should be referenced. In this patch, Fix the incorrect referencing of I2SCON register. Reported-by : Lakkyung Jung <lakkyung.jung(a)samsung.com> Signed-off-by: Sangbeom Kim <sbkim73(a)samsung.com> --- sound/soc/samsung/i2s.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index ffa09b3..992a732 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -191,7 +191,7 @@ static inline bool tx_active(struct i2s_dai *i2s) if (!i2s) return false; - active = readl(i2s->addr + I2SMOD); + active = readl(i2s->addr + I2SCON); if (is_secondary(i2s)) active &= CON_TXSDMA_ACTIVE; @@ -223,7 +223,7 @@ static inline bool rx_active(struct i2s_dai *i2s) if (!i2s) return false; - active = readl(i2s->addr + I2SMOD) & CON_RXDMA_ACTIVE; + active = readl(i2s->addr + I2SCON) & CON_RXDMA_ACTIVE; return active ? true : false; } -- 1.7.1

4 3

Re: [alsa-devel] [PATCH 1/1] ASoC: codecs: max98088: Combined DAI operations for DAI1 and DAI2.
by Jinyoung Park 10 Jun '11

10 Jun '11

Submitting again the patch what applied Peter's comments. >> These added local variables and their initialization repeats. >> It may be better to put them in struct max98088_cdata[]. > I got it. I will change register offset into struct max98088_cdata[]. > >> DAI2 does not have an OSR bit in the _CLOCK register. >> In the combined function, this should be conditionally for DAI1 only. > I will fix it. Thanks, Jin. Combined DAI operations for DAI1 and DAI2. For this, added id into DAI runtime data to identify each DAI. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com> --- sound/soc/codecs/max98088.c | 278 +++++++++++-------------------------------- 1 files changed, 69 insertions(+), 209 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index ac65a2d..3c0e4f7 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -36,6 +36,14 @@ struct max98088_cdata { unsigned int rate; unsigned int fmt; int eq_sel; + + unsigned short clkmode_reg; + unsigned short clk_reg; + unsigned short clkcfg_hi_reg; + unsigned short clkcfg_lo_reg; + unsigned short fmt_reg; + unsigned short play_lvl_reg; + unsigned short filters_reg; }; struct max98088_priv { @@ -1253,29 +1261,26 @@ static inline int rate_value(int rate, u8 *value) return -EINVAL; } -static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, +static int max98088_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 max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); - struct max98088_cdata *cdata; + struct max98088_cdata *cdata = &max98088->dai[dai->id - 1]; unsigned long long ni; unsigned int rate; - u8 regval; - - cdata = &max98088->dai[0]; + u8 val; rate = params_rate(params); switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: - snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, - M98088_DAI_WS, 0); + snd_soc_update_bits(codec, cdata->fmt_reg, M98088_DAI_WS, 0); break; case SNDRV_PCM_FORMAT_S24_LE: - snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, - M98088_DAI_WS, M98088_DAI_WS); + snd_soc_update_bits(codec, cdata->fmt_reg, M98088_DAI_WS, + M98088_DAI_WS); break; default: return -EINVAL; @@ -1283,16 +1288,14 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); - if (rate_value(rate, &regval)) + if (rate_value(rate, &val)) return -EINVAL; - snd_soc_update_bits(codec, M98088_REG_11_DAI1_CLKMODE, - M98088_CLKMODE_MASK, regval); + snd_soc_update_bits(codec, cdata->clkmode_reg, M98088_CLKMODE_MASK, val); cdata->rate = rate; /* Configure NI when operating as master */ - if (snd_soc_read(codec, M98088_REG_14_DAI1_FORMAT) - & M98088_DAI_MAS) { + if (snd_soc_read(codec, cdata->fmt_reg) & M98088_DAI_MAS) { if (max98088->sysclk == 0) { dev_err(codec->dev, "Invalid system clock frequency\n"); return -EINVAL; @@ -1300,86 +1303,16 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, ni = 65536ULL * (rate < 50000 ? 96ULL : 48ULL) * (unsigned long long int)rate; do_div(ni, (unsigned long long int)max98088->sysclk); - snd_soc_write(codec, M98088_REG_12_DAI1_CLKCFG_HI, - (ni >> 8) & 0x7F); - snd_soc_write(codec, M98088_REG_13_DAI1_CLKCFG_LO, - ni & 0xFF); + snd_soc_write(codec, cdata->clkcfg_hi_reg, (ni >> 8) & 0x7F); + snd_soc_write(codec, cdata->clkcfg_lo_reg, ni & 0xFF); } /* Update sample rate mode */ if (rate < 50000) - snd_soc_update_bits(codec, M98088_REG_18_DAI1_FILTERS, - M98088_DAI_DHF, 0); + snd_soc_update_bits(codec, cdata->filters_reg, M98088_DAI_DHF, 0); else - snd_soc_update_bits(codec, M98088_REG_18_DAI1_FILTERS, - M98088_DAI_DHF, M98088_DAI_DHF); - - snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, - M98088_SHDNRUN); - - return 0; -} - -static int max98088_dai2_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 max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); - struct max98088_cdata *cdata; - unsigned long long ni; - unsigned int rate; - u8 regval; - - cdata = &max98088->dai[1]; - - rate = params_rate(params); - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: - snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, - M98088_DAI_WS, 0); - break; - case SNDRV_PCM_FORMAT_S24_LE: - snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, - M98088_DAI_WS, M98088_DAI_WS); - break; - default: - return -EINVAL; - } - - snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, 0); - - if (rate_value(rate, &regval)) - return -EINVAL; - - snd_soc_update_bits(codec, M98088_REG_19_DAI2_CLKMODE, - M98088_CLKMODE_MASK, regval); - cdata->rate = rate; - - /* Configure NI when operating as master */ - if (snd_soc_read(codec, M98088_REG_1C_DAI2_FORMAT) - & M98088_DAI_MAS) { - if (max98088->sysclk == 0) { - dev_err(codec->dev, "Invalid system clock frequency\n"); - return -EINVAL; - } - ni = 65536ULL * (rate < 50000 ? 96ULL : 48ULL) - * (unsigned long long int)rate; - do_div(ni, (unsigned long long int)max98088->sysclk); - snd_soc_write(codec, M98088_REG_1A_DAI2_CLKCFG_HI, - (ni >> 8) & 0x7F); - snd_soc_write(codec, M98088_REG_1B_DAI2_CLKCFG_LO, - ni & 0xFF); - } - - /* Update sample rate mode */ - if (rate < 50000) - snd_soc_update_bits(codec, M98088_REG_20_DAI2_FILTERS, - M98088_DAI_DHF, 0); - else - snd_soc_update_bits(codec, M98088_REG_20_DAI2_FILTERS, - M98088_DAI_DHF, M98088_DAI_DHF); + snd_soc_update_bits(codec, cdata->filters_reg, M98088_DAI_DHF, + M98088_DAI_DHF); snd_soc_update_bits(codec, M98088_REG_51_PWR_SYS, M98088_SHDNRUN, M98088_SHDNRUN); @@ -1423,16 +1356,13 @@ static int max98088_dai_set_sysclk(struct snd_soc_dai *dai, return 0; } -static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, - unsigned int fmt) +static int max98088_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; + struct snd_soc_codec *codec = dai->codec; struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); - struct max98088_cdata *cdata; - u8 reg15val; - u8 reg14val = 0; - - cdata = &max98088->dai[0]; + struct max98088_cdata *cdata = &max98088->dai[dai->id - 1]; + u8 clk_val; + u8 fmt_val = 0; if (fmt != cdata->fmt) { cdata->fmt = fmt; @@ -1440,14 +1370,12 @@ static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: /* Slave mode PLL */ - snd_soc_write(codec, M98088_REG_12_DAI1_CLKCFG_HI, - 0x80); - snd_soc_write(codec, M98088_REG_13_DAI1_CLKCFG_LO, - 0x00); + snd_soc_write(codec, cdata->clkcfg_hi_reg, 0x80); + snd_soc_write(codec, cdata->clkcfg_lo_reg, 0x00); break; case SND_SOC_DAIFMT_CBM_CFM: /* Set to master mode */ - reg14val |= M98088_DAI_MAS; + fmt_val |= M98088_DAI_MAS; break; case SND_SOC_DAIFMT_CBS_CFM: case SND_SOC_DAIFMT_CBM_CFS: @@ -1458,7 +1386,7 @@ static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: - reg14val |= M98088_DAI_DLY; + fmt_val |= M98088_DAI_DLY; break; case SND_SOC_DAIFMT_LEFT_J: break; @@ -1470,127 +1398,43 @@ static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, case SND_SOC_DAIFMT_NB_NF: break; case SND_SOC_DAIFMT_NB_IF: - reg14val |= M98088_DAI_WCI; + fmt_val |= M98088_DAI_WCI; break; case SND_SOC_DAIFMT_IB_NF: - reg14val |= M98088_DAI_BCI; + fmt_val |= M98088_DAI_BCI; break; case SND_SOC_DAIFMT_IB_IF: - reg14val |= M98088_DAI_BCI|M98088_DAI_WCI; + fmt_val |= M98088_DAI_BCI|M98088_DAI_WCI; break; default: return -EINVAL; } - snd_soc_update_bits(codec, M98088_REG_14_DAI1_FORMAT, + snd_soc_update_bits(codec, cdata->fmt_reg, M98088_DAI_MAS | M98088_DAI_DLY | M98088_DAI_BCI | - M98088_DAI_WCI, reg14val); + M98088_DAI_WCI, fmt_val); - reg15val = M98088_DAI_BSEL64; - if (max98088->digmic) - reg15val |= M98088_DAI_OSR64; - snd_soc_write(codec, M98088_REG_15_DAI1_CLOCK, reg15val); + clk_val = M98088_DAI_BSEL64; + if ((dai->id == 1) && max98088->digmic) + clk_val |= M98088_DAI_OSR64; + snd_soc_write(codec, cdata->clk_reg, clk_val); } return 0; } -static int max98088_dai2_set_fmt(struct snd_soc_dai *codec_dai, - unsigned int fmt) +static int max98088_dai_digital_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = codec_dai->codec; + struct snd_soc_codec *codec = dai->codec; struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec); - struct max98088_cdata *cdata; - u8 reg1Cval = 0; - - cdata = &max98088->dai[1]; - - if (fmt != cdata->fmt) { - cdata->fmt = fmt; - - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* Slave mode PLL */ - snd_soc_write(codec, M98088_REG_1A_DAI2_CLKCFG_HI, - 0x80); - snd_soc_write(codec, M98088_REG_1B_DAI2_CLKCFG_LO, - 0x00); - break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Set to master mode */ - reg1Cval |= M98088_DAI_MAS; - break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: - default: - dev_err(codec->dev, "Clock mode unsupported"); - return -EINVAL; - } - - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { - case SND_SOC_DAIFMT_I2S: - reg1Cval |= M98088_DAI_DLY; - break; - case SND_SOC_DAIFMT_LEFT_J: - break; - default: - return -EINVAL; - } - - switch (fmt & SND_SOC_DAIFMT_INV_MASK) { - case SND_SOC_DAIFMT_NB_NF: - break; - case SND_SOC_DAIFMT_NB_IF: - reg1Cval |= M98088_DAI_WCI; - break; - case SND_SOC_DAIFMT_IB_NF: - reg1Cval |= M98088_DAI_BCI; - break; - case SND_SOC_DAIFMT_IB_IF: - reg1Cval |= M98088_DAI_BCI|M98088_DAI_WCI; - break; - default: - return -EINVAL; - } - - snd_soc_update_bits(codec, M98088_REG_1C_DAI2_FORMAT, - M98088_DAI_MAS | M98088_DAI_DLY | M98088_DAI_BCI | - M98088_DAI_WCI, reg1Cval); - - snd_soc_write(codec, M98088_REG_1D_DAI2_CLOCK, - M98088_DAI_BSEL64); - } - - return 0; -} - -static int max98088_dai1_digital_mute(struct snd_soc_dai *codec_dai, int mute) -{ - struct snd_soc_codec *codec = codec_dai->codec; - int reg; - - if (mute) - reg = M98088_DAI_MUTE; - else - reg = 0; - - snd_soc_update_bits(codec, M98088_REG_2F_LVL_DAI1_PLAY, - M98088_DAI_MUTE_MASK, reg); - return 0; -} - -static int max98088_dai2_digital_mute(struct snd_soc_dai *codec_dai, int mute) -{ - struct snd_soc_codec *codec = codec_dai->codec; - int reg; + struct max98088_cdata *cdata = &max98088->dai[dai->id - 1]; + int val = 0; if (mute) - reg = M98088_DAI_MUTE; - else - reg = 0; + val = M98088_DAI_MUTE; - snd_soc_update_bits(codec, M98088_REG_31_LVL_DAI2_PLAY, - M98088_DAI_MUTE_MASK, reg); + snd_soc_update_bits(codec, cdata->play_lvl_reg, M98088_DAI_MUTE_MASK, + val); return 0; } @@ -1653,21 +1497,22 @@ static int max98088_set_bias_level(struct snd_soc_codec *codec, static struct snd_soc_dai_ops max98088_dai1_ops = { .set_sysclk = max98088_dai_set_sysclk, - .set_fmt = max98088_dai1_set_fmt, - .hw_params = max98088_dai1_hw_params, - .digital_mute = max98088_dai1_digital_mute, + .set_fmt = max98088_dai_set_fmt, + .hw_params = max98088_dai_hw_params, + .digital_mute = max98088_dai_digital_mute, }; static struct snd_soc_dai_ops max98088_dai2_ops = { .set_sysclk = max98088_dai_set_sysclk, - .set_fmt = max98088_dai2_set_fmt, - .hw_params = max98088_dai2_hw_params, - .digital_mute = max98088_dai2_digital_mute, + .set_fmt = max98088_dai_set_fmt, + .hw_params = max98088_dai_hw_params, + .digital_mute = max98088_dai_digital_mute, }; static struct snd_soc_dai_driver max98088_dai[] = { { .name = "HiFi", + .id = 1, .playback = { .stream_name = "HiFi Playback", .channels_min = 1, @@ -1686,6 +1531,7 @@ static struct snd_soc_dai_driver max98088_dai[] = { }, { .name = "Aux", + .id = 2, .playback = { .stream_name = "Aux Playback", .channels_min = 1, @@ -1977,11 +1823,25 @@ static int max98088_probe(struct snd_soc_codec *codec) cdata->rate = (unsigned)-1; cdata->fmt = (unsigned)-1; cdata->eq_sel = 0; + cdata->clkmode_reg = M98088_REG_11_DAI1_CLKMODE; + cdata->clk_reg = M98088_REG_15_DAI1_CLOCK; + cdata->clkcfg_hi_reg = M98088_REG_12_DAI1_CLKCFG_HI; + cdata->clkcfg_lo_reg = M98088_REG_13_DAI1_CLKCFG_LO; + cdata->fmt_reg = M98088_REG_14_DAI1_FORMAT; + cdata->play_lvl_reg = M98088_REG_2F_LVL_DAI1_PLAY; + cdata->filters_reg = M98088_REG_18_DAI1_FILTERS; cdata = &max98088->dai[1]; cdata->rate = (unsigned)-1; cdata->fmt = (unsigned)-1; cdata->eq_sel = 0; + cdata->clkmode_reg = M98088_REG_19_DAI2_CLKMODE; + cdata->clk_reg = M98088_REG_1D_DAI2_CLOCK; + cdata->clkcfg_hi_reg = M98088_REG_1A_DAI2_CLKCFG_HI; + cdata->clkcfg_lo_reg = M98088_REG_1B_DAI2_CLKCFG_LO; + cdata->fmt_reg = M98088_REG_1C_DAI2_FORMAT; + cdata->play_lvl_reg = M98088_REG_31_LVL_DAI2_PLAY; + cdata->filters_reg = M98088_REG_20_DAI2_FILTERS; max98088->ina_state = 0; max98088->inb_state = 0; -- 1.7.1

1 0

[alsa-devel] [PATCH] sound/atmel_ssc_dai: add a missing space to an error message
by Uwe Kleine-König 10 Jun '11

10 Jun '11

Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- sound/soc/atmel/atmel_ssc_dai.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 7fbfa05..7d6ab47 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -402,7 +402,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, if ((ssc_p->daifmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_I2S && bits > 16) { printk(KERN_WARNING - "atmel_ssc_dai: sample size %d" + "atmel_ssc_dai: sample size %d " "is too large for I2S\n", bits); return -EINVAL; } -- 1.7.5.3

4 3