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

[alsa-devel] [PATCH] Convert bitfields in ASOC into full int width
by Jon Smirl 23 Jul '08

23 Jul '08

Convert bitfields in ASOC into full int width. This needs testing, I don't have sample controls for all of the different configurations. This is a simple mechanical conversion, behavior should not be changed. I did find two places in the DAPM code where max was being used as a mask. I fixed them to convert max to a mask, was this right? Signed-off-by: Jon Smirl <jonsmirl(a)gmail.com> --- include/sound/soc.h | 46 ++++++++++++++++++------------ sound/soc/soc-core.c | 77 ++++++++++++++++++++++++++++---------------------- sound/soc/soc-dapm.c | 46 +++++++++++++++++------------- 3 files changed, 96 insertions(+), 73 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 1890d87..8d16394 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -26,10 +26,12 @@ /* * Convenience kcontrol builders */ -#define SOC_SINGLE_VALUE(reg, shift, max, invert) ((reg) | ((shift) << 8) |\ - ((shift) << 12) | ((max) << 16) | ((invert) << 24)) -#define SOC_SINGLE_VALUE_EXT(reg, max, invert) ((reg) | ((max) << 16) |\ - ((invert) << 31)) +#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \ + (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .shift=xshift, .max=xmax, .invert=xinvert} +#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \ + (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .max=xmax, .invert=xinvert} #define SOC_SINGLE(xname, reg, shift, max, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\ @@ -43,45 +45,45 @@ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\ .put = snd_soc_put_volsw, \ .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } -#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \ +#define SOC_DOUBLE(xname, xreg, shift_left, shift_right, xmax, xinvert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \ .put = snd_soc_put_volsw, \ - .private_value = (reg) | ((shift_left) << 8) | \ - ((shift_right) << 12) | ((max) << 16) | ((invert) << 24) } -#define SOC_DOUBLE_R(xname, reg_left, reg_right, shift, max, invert) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .shift=shift_left, .rshift=shift_right, .max=xmax, .invert=xinvert} +#define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ .info = snd_soc_info_volsw_2r, \ .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \ - .private_value = (reg_left) | ((shift) << 8) | \ - ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) } -#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=reg_left, .rreg=reg_right, .shift=xshift, .max=xmax, .invert=xinvert} +#define SOC_DOUBLE_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \ .put = snd_soc_put_volsw, \ - .private_value = (reg) | ((shift_left) << 8) | \ - ((shift_right) << 12) | ((max) << 16) | ((invert) << 24) } -#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, shift, max, invert, tlv_array) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .shift=shift_left, .rshift=right_shift, .max=xmax, .invert=xinvert} +#define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ SNDRV_CTL_ELEM_ACCESS_READWRITE,\ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw_2r, \ .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \ - .private_value = (reg_left) | ((shift) << 8) | \ - ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) } -#define SOC_DOUBLE_S8_TLV(xname, reg, min, max, tlv_array) \ + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=reg_left, .rreg=reg_right, .shift=xshift, .max=xmax, .invert=xinvert} +#define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array), \ .info = snd_soc_info_volsw_s8, .get = snd_soc_get_volsw_s8, \ .put = snd_soc_put_volsw_s8, \ - .private_value = (reg) | (((signed char)max) << 16) | \ - (((signed char)min) << 24) } + .private_value = (unsigned long)&(struct mixer_control) \ + {.reg=xreg, .min=xmin, .max=xmax} #define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts) \ { .reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \ .mask = xmask, .texts = xtexts } @@ -516,6 +518,12 @@ struct snd_soc_pcm_runtime { struct snd_soc_device *socdev; }; +/* mixer control */ +struct mixer_control { + int min, max; + uint reg, rreg, shift, rshift, invert; +}; + /* enumerated kcontrol */ struct soc_enum { unsigned short reg; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 83f1190..3c36b4d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1434,9 +1434,10 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw_ext); int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - int max = (kcontrol->private_value >> 16) & 0xff; - int shift = (kcontrol->private_value >> 8) & 0x0f; - int rshift = (kcontrol->private_value >> 12) & 0x0f; + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; + int max = mc->max; + uint shift = mc->min; + uint rshift = mc->rshift; if (max == 1) uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; @@ -1462,13 +1463,14 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw); int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int shift = (kcontrol->private_value >> 8) & 0x0f; - int rshift = (kcontrol->private_value >> 12) & 0x0f; - int max = (kcontrol->private_value >> 16) & 0xff; - int mask = (1 << fls(max)) - 1; - int invert = (kcontrol->private_value >> 24) & 0x01; + uint reg = mc->reg; + uint shift = mc->shift; + uint rshift = mc->rshift; + int max = mc->max; + uint mask = (1 << fls(max)) - 1; + uint invert = mc->invert; ucontrol->value.integer.value[0] = (snd_soc_read(codec, reg) >> shift) & mask; @@ -1499,13 +1501,14 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw); int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int shift = (kcontrol->private_value >> 8) & 0x0f; - int rshift = (kcontrol->private_value >> 12) & 0x0f; - int max = (kcontrol->private_value >> 16) & 0xff; - int mask = (1 << fls(max)) - 1; - int invert = (kcontrol->private_value >> 24) & 0x01; + uint reg = mc->reg; + uint shift = mc->shift; + uint rshift = mc->rshift; + int max = mc->max; + uint mask = (1 << fls(max)) - 1; + uint invert = mc->invert; unsigned short val, val2, val_mask; val = (ucontrol->value.integer.value[0] & mask); @@ -1537,7 +1540,8 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw); int snd_soc_info_volsw_2r(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - int max = (kcontrol->private_value >> 12) & 0xff; + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; + int max = mc->max; if (max == 1) uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; @@ -1563,13 +1567,14 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw_2r); int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int reg2 = (kcontrol->private_value >> 24) & 0xff; - int shift = (kcontrol->private_value >> 8) & 0x0f; - int max = (kcontrol->private_value >> 12) & 0xff; - int mask = (1<<fls(max))-1; - int invert = (kcontrol->private_value >> 20) & 0x01; + uint reg = mc->reg; + uint reg2 = mc->rreg; + uint shift = mc->shift; + int max = mc->max; + uint mask = (1<<fls(max))-1; + uint invert = mc->invert; ucontrol->value.integer.value[0] = (snd_soc_read(codec, reg) >> shift) & mask; @@ -1598,13 +1603,14 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_2r); int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int reg2 = (kcontrol->private_value >> 24) & 0xff; - int shift = (kcontrol->private_value >> 8) & 0x0f; - int max = (kcontrol->private_value >> 12) & 0xff; - int mask = (1 << fls(max)) - 1; - int invert = (kcontrol->private_value >> 20) & 0x01; + uint reg = mc->reg; + uint reg2 = mc->rreg; + uint shift = mc->shift; + int max = mc->max; + uint mask = (1 << fls(max)) - 1; + uint invert = mc->invert; int err; unsigned short val, val2, val_mask; @@ -1641,8 +1647,9 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw_2r); int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - int max = (signed char)((kcontrol->private_value >> 16) & 0xff); - int min = (signed char)((kcontrol->private_value >> 24) & 0xff); + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; + int max = mc->max; + int min = mc->min; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->count = 2; @@ -1664,9 +1671,10 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw_s8); int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int min = (signed char)((kcontrol->private_value >> 24) & 0xff); + uint reg = mc->reg; + int min = mc->min; int val = snd_soc_read(codec, reg); ucontrol->value.integer.value[0] = @@ -1689,9 +1697,10 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_s8); int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int min = (signed char)((kcontrol->private_value >> 24) & 0xff); + uint reg = mc->reg; + int min = mc->min; unsigned short val; val = (ucontrol->value.integer.value[0]+min) & 0xff; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 2c87061..490a486 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -104,10 +104,12 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, case snd_soc_dapm_switch: case snd_soc_dapm_mixer: { int val; - int reg = w->kcontrols[i].private_value & 0xff; - int shift = (w->kcontrols[i].private_value >> 8) & 0x0f; - int mask = (w->kcontrols[i].private_value >> 16) & 0xff; - int invert = (w->kcontrols[i].private_value >> 24) & 0x01; + struct mixer_control *mc = (struct mixer_control *)w->kcontrols[i].private_value; + uint reg = mc->reg; + uint shift = mc->shift; + int max = mc->max; + uint mask = (1 << fls(max)) - 1; + uint invert = mc->invert; val = snd_soc_read(w->codec, reg); val = (val >> shift) & mask; @@ -247,10 +249,12 @@ static int dapm_set_pga(struct snd_soc_dapm_widget *widget, int power) return 0; if (widget->num_kcontrols && k) { - int reg = k->private_value & 0xff; - int shift = (k->private_value >> 8) & 0x0f; - int mask = (k->private_value >> 16) & 0xff; - int invert = (k->private_value >> 24) & 0x01; + struct mixer_control *mc = (struct mixer_control *)k->private_value; + uint reg = mc->reg; + uint shift = mc->shift; + int max = mc->max; + uint mask = (1 << fls(max)) - 1; + uint invert = mc->invert; if (power) { int i; @@ -1139,12 +1143,13 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int shift = (kcontrol->private_value >> 8) & 0x0f; - int rshift = (kcontrol->private_value >> 12) & 0x0f; - int max = (kcontrol->private_value >> 16) & 0xff; - int invert = (kcontrol->private_value >> 24) & 0x01; - int mask = (1 << fls(max)) - 1; + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; + uint reg = mc->reg; + uint shift = mc->shift; + uint rshift = mc->rshift; + int max = mc->max; + uint invert = mc->invert; + uint mask = (1 << fls(max)) - 1; /* return the saved value if we are powered down */ if (widget->id == snd_soc_dapm_pga && !widget->power) { @@ -1182,12 +1187,13 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); - int reg = kcontrol->private_value & 0xff; - int shift = (kcontrol->private_value >> 8) & 0x0f; - int rshift = (kcontrol->private_value >> 12) & 0x0f; - int max = (kcontrol->private_value >> 16) & 0xff; - int mask = (1 << fls(max)) - 1; - int invert = (kcontrol->private_value >> 24) & 0x01; + struct mixer_control *mc = (struct mixer_control *)kcontrol->private_value; + uint reg = mc->reg; + uint shift = mc->shift; + uint rshift = mc->rshift; + int max = mc->max; + uint mask = (1 << fls(max)) - 1; + uint invert = mc->invert; unsigned short val, val2, val_mask; int ret;

2 3

[alsa-devel] Linux Plumbers Conference CFP Extended!
by Lennart Poettering 23 Jul '08

23 Jul '08

Heya! The Call For Papers for the Linux Plumbers Conference has been extended until July 31st! Anyone doing (audio) infrastructure work on Linux? If so, please make sure to join us at the Linux Plumbers Conference in Portland/Oregon in September. I will be doing a track about "Audio" there and would like to make sure that everyone who does audio infrastructure work will submit a paper, or at least attend, or maybe just knows about this conference! It's a conference about the kernel-userspace interfacing, about the lower levels in our software stack. For further details, checkout the conference website: http://www.linuxplumbersconf.org/ (Sorry for this spam!) Lennart -- Lennart Poettering Red Hat, Inc. lennart [at] poettering [dot] net ICQ# 11060553 http://0pointer.net/lennart/ GnuPG 0x1A015CC4

1 0

[alsa-devel] [PATCH] cs4232: fix crash during chip PNP detection
by Krzysztof Helt 23 Jul '08

23 Jul '08

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The acard->wss pointer is uninitialized in this function which leads to crash during chip PNP detection. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This bug was found in the 2.6.26-git9 kernel. This is the second version of the patch previously called: "cs4236: add missing pnp_request_card_device()" The crash log (if needed): BUG: unable to handle kernel NULL pointer dereference at 00000158 IP: [<c02ba3f8>] pnp_activate_dev+0x5/0x37 *pde = 00000000 Oops: 0000 [#1] Modules linked in: snd_cs4232(+) snd_opl3_lib snd_hwdep snd_cs4231_lib snd_pcm snd_timer snd_page_alloc snd_mpu401_uart snd_rawmidi snd_seq_device parport_pc parport Pid: 668, comm: modprobe Not tainted (2.6.26-git9 #1) EIP: 0060:[<c02ba3f8>] EFLAGS: 00010246 CPU: 0 EIP is at pnp_activate_dev+0x5/0x37 EAX: 00000000 EBX: 00000000 ECX: c1c46800 EDX: 00000000 ESI: 00000000 EDI: c1c46800 EBP: c02d6635 ESP: c1db3ef0 DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068 Process modprobe (pid: 668, ti=c1db2000 task=c064d3e0 task.ti=c1db2000) Stack: 00000000 c2a710ed 00000000 c1c46800 c2a712e7 c1e35600 c2a71702 c1c46800 c1c46800 c2a74120 c02b93ca c1c46800 00000000 c2a7413c c02d650d c2a7413c c1c46800 00000000 c02d65ca c1c46800 c1c468a8 c2a7413c c02d666c c1db3f5c Call Trace: [<c2a710ed>] snd_cs423x_pnp_init_wss+0xd/0x10c [snd_cs4232] [<c2a712e7>] snd_card_cs4232_pnp+0xb/0x25 [snd_cs4232] [<c2a71702>] snd_cs4232_pnpbios_detect+0x7b/0xcf [snd_cs4232] [<c02b93ca>] pnp_device_probe+0x5d/0x7a [<c02d650d>] really_probe+0x70/0xea [<c02d65ca>] driver_probe_device+0x34/0x3c [<c02d666c>] __driver_attach+0x37/0x55 [<c02d5aa2>] bus_for_each_dev+0x36/0x5a [<c02998d2>] kobject_init_and_add+0x23/0x25 [<c02d669b>] driver_attach+0x11/0x13 [<c02d6635>] __driver_attach+0x0/0x55 [<c02d5f9f>] bus_add_driver+0x8a/0x132 [<c02d69c2>] driver_register+0x68/0x88 [<c2a43027>] alsa_card_cs423x_init+0x27/0x6e [snd_cs4232] [<c022eb96>] sys_init_module+0x84/0x173 [<c02028c2>] syscall_call+0x7/0xb ======================= Code: e8 10 b3 f5 ff b8 fb ff ff ff eb 15 50 89 d8 e8 eb 9e 01 00 50 68 21 c3 3d c0 e8 f6 b2 f5 ff 31 c0 83 c4 0c 5b c3 53 31 d2 89 c3 <83> b8 58 01 00 00 00 75 25 e8 a3 fe ff ff ba f0 ff ff ff 85 c0 EIP: [<c02ba3f8>] pnp_activate_dev+0x5/0x37 SS:ESP 0068:c1db3ef0 ---[ end trace ff15a9f65b38124f ]--- --- linux-2.6.26/sound/isa/cs423x/cs4236.c~ 2008-07-23 07:40:16.129637645 +0200 +++ linux-2.6.26/sound/isa/cs423x/cs4236.c 2008-07-23 07:40:32.905641806 +0200 @@ -325,6 +325,7 @@ static int __devinit snd_cs423x_pnp_init static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard, struct pnp_dev *pdev) { + acard->wss = pdev; if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0) return -EBUSY; cport[dev] = -1; ---------------------------------------------------------------------- Galeria absurdow. zobacz >>> http://link.interia.pl/f1e5e

2 1

[alsa-devel] [PATCH] cs4236: add missing pnp_request_card_device()
by Krzysztof Helt 23 Jul '08

23 Jul '08

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> There is a missing pnp_request_card_device() call for cs4232 card. The acard->wss pointer is left uninitialized which leads to crash during detection. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This bug was found in the 2.6.26-git9 kernel. Please compare the snd_card_cs4232_pnp() and the snd_card_cs423x_pnpc(). --- linux-2.6.26/sound/isa/cs423x/cs4236.c~ 2008-07-13 23:51:29.000000000 +0200 +++ linux-2.6.26/sound/isa/cs423x/cs4236.c 2008-07-22 23:41:56.010942922 +0200 @@ -325,6 +325,9 @@ static int __devinit snd_cs423x_pnp_init static int __devinit snd_card_cs4232_pnp(int dev, struct snd_card_cs4236 *acard, struct pnp_dev *pdev) { + acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL); + if (acard->wss == NULL) + return -EBUSY; if (snd_cs423x_pnp_init_wss(dev, acard->wss) < 0) return -EBUSY; cport[dev] = -1; ---------------------------------------------------------------------- Czy Twoj mezczyzna gotuje dla Ciebie? Wygraj nagrody >>> http://link.interia.pl/f1e86

1 1

[alsa-devel] [PATCH v3 0/3] ALSA SoC: MPC5200 audio driver
by Grant Likely 23 Jul '08

23 Jul '08

Hi all, Here is the latest series for adding MPC5200 I2S and TI AIC26 codec support to ALSA SoC. I believe all the comments are addressed and I hope that this series is now ready to be merged. I would really like to see these ones land in 2.6.27. Thanks, g. include/sound/soc-of-simple.h | 21 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tlv320aic26.c | 519 +++++++++++++++++++++++ sound/soc/codecs/tlv320aic26.h | 93 ++++ sound/soc/fsl/Kconfig | 10 + sound/soc/fsl/Makefile | 5 + sound/soc/fsl/mpc5200_psc_i2s.c | 884 +++++++++++++++++++++++++++++++++++++++ sound/soc/fsl/soc-of-simple.c | 171 ++++++++ 9 files changed, 1709 insertions(+), 0 deletions(-) Cheers, g. On Tue, Jul 22, 2008 at 12:53 AM, Grant Likely <grant.likely(a)secretlab.ca> wrote: > From: Grant Likely <grant.likely(a)secretlab.ca> > > Simple utility layer for creating ASoC machine instances based on data > in the OpenFirmware device tree. OF aware platform drivers and codec > drivers register themselves with this framework and the framework > automatically instantiates a machine driver. At the moment, the driver > is not very capable and it is expected to be extended as more features > are needed for specifying the configuration in the device tree. > > This is most likely temporary glue code to work around limitations in > the ASoC v1 framework. When v2 is merged, most of this driver will > need to be reworked. > > Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca> > --- > > include/sound/soc-of-simple.h | 21 +++++ > sound/soc/fsl/Kconfig | 3 + > sound/soc/fsl/Makefile | 3 + > sound/soc/fsl/soc-of-simple.c | 171 +++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 198 insertions(+), 0 deletions(-) > > diff --git a/include/sound/soc-of-simple.h b/include/sound/soc-of-simple.h > new file mode 100644 > index 0000000..696fc51 > --- /dev/null > +++ b/include/sound/soc-of-simple.h > @@ -0,0 +1,21 @@ > +/* > + * OF helpers for ALSA SoC > + * > + * Copyright (C) 2008, Secret Lab Technologies Ltd. > + */ > + > +#ifndef _INCLUDE_SOC_OF_H_ > +#define _INCLUDE_SOC_OF_H_ > + > +#include <linux/of.h> > +#include <sound/soc.h> > + > +int of_snd_soc_register_codec(struct snd_soc_codec_device *codec_dev, > + void *codec_data, struct snd_soc_dai *dai, > + struct device_node *node); > + > +int of_snd_soc_register_platform(struct snd_soc_platform *platform, > + struct device_node *node, > + struct snd_soc_dai *cpu_dai); > + > +#endif /* _INCLUDE_SOC_OF_H_ */ > diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig > index 3368ace..398f002 100644 > --- a/sound/soc/fsl/Kconfig > +++ b/sound/soc/fsl/Kconfig > @@ -1,3 +1,6 @@ > +config SND_SOC_OF_SIMPLE > + tristate > + > config SND_SOC_MPC8610 > bool "ALSA SoC support for the MPC8610 SOC" > depends on MPC8610_HPCD > diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile > index 62f680a..aa2100b 100644 > --- a/sound/soc/fsl/Makefile > +++ b/sound/soc/fsl/Makefile > @@ -1,3 +1,6 @@ > +# Simple machine driver that extracts configuration from the OF device tree > +obj-$(CONFIG_SND_SOC_OF_SIMPLE) += soc-of-simple.o > + > # MPC8610 HPCD Machine Support > obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += mpc8610_hpcd.o > > diff --git a/sound/soc/fsl/soc-of-simple.c b/sound/soc/fsl/soc-of-simple.c > new file mode 100644 > index 0000000..0382fda > --- /dev/null > +++ b/sound/soc/fsl/soc-of-simple.c > @@ -0,0 +1,171 @@ > +/* > + * OF helpers for ALSA SoC Layer > + * > + * Copyright (C) 2008, Secret Lab Technologies Ltd. > + */ > + > +#include <linux/module.h> > +#include <linux/moduleparam.h> > +#include <linux/init.h> > +#include <linux/delay.h> > +#include <linux/pm.h> > +#include <linux/bitops.h> > +#include <linux/platform_device.h> > +#include <linux/of.h> > +#include <sound/core.h> > +#include <sound/pcm.h> > +#include <sound/pcm_params.h> > +#include <sound/soc.h> > +#include <sound/soc-of-simple.h> > +#include <sound/initval.h> > + > +MODULE_AUTHOR("Grant Likely <grant.likely(a)secretlab.ca>"); > +MODULE_LICENSE("GPL"); > +MODULE_DESCRIPTION("ALSA SoC OpenFirmware bindings"); > + > +static DEFINE_MUTEX(of_snd_soc_mutex); > +static LIST_HEAD(of_snd_soc_device_list); > +static int of_snd_soc_next_index; > + > +struct of_snd_soc_device { > + int id; > + struct list_head list; > + struct snd_soc_device device; > + struct snd_soc_machine machine; > + struct snd_soc_dai_link dai_link; > + struct platform_device *pdev; > + struct device_node *platform_node; > + struct device_node *codec_node; > +}; > + > +static struct snd_soc_ops of_snd_soc_ops = { > +}; > + > +static struct of_snd_soc_device * > +of_snd_soc_get_device(struct device_node *codec_node) > +{ > + struct of_snd_soc_device *of_soc; > + > + list_for_each_entry(of_soc, &of_snd_soc_device_list, list) { > + if (of_soc->codec_node == codec_node) > + return of_soc; > + } > + > + of_soc = kzalloc(sizeof(struct of_snd_soc_device), GFP_KERNEL); > + if (!of_soc) > + return NULL; > + > + /* Initialize the structure and add it to the global list */ > + of_soc->codec_node = codec_node; > + of_soc->id = of_snd_soc_next_index++; > + of_soc->machine.dai_link = &of_soc->dai_link; > + of_soc->machine.num_links = 1; > + of_soc->device.machine = &of_soc->machine; > + of_soc->dai_link.ops = &of_snd_soc_ops; > + list_add(&of_soc->list, &of_snd_soc_device_list); > + > + return of_soc; > +} > + > +static void of_snd_soc_register_device(struct of_snd_soc_device *of_soc) > +{ > + struct platform_device *pdev; > + int rc; > + > + /* Only register the device if both the codec and platform have > + * been registered */ > + if ((!of_soc->device.codec_data) || (!of_soc->platform_node)) > + return; > + > + pr_info("platform<-->codec match achieved; registering machine\n"); > + > + pdev = platform_device_alloc("soc-audio", of_soc->id); > + if (!pdev) { > + pr_err("of_soc: platform_device_alloc() failed\n"); > + return; > + } > + > + pdev->dev.platform_data = of_soc; > + platform_set_drvdata(pdev, &of_soc->device); > + of_soc->device.dev = &pdev->dev; > + > + /* The ASoC device is complete; register it */ > + rc = platform_device_add(pdev); > + if (rc) { > + pr_err("of_soc: platform_device_add() failed\n"); > + return; > + } > + > +} > + > +int of_snd_soc_register_codec(struct snd_soc_codec_device *codec_dev, > + void *codec_data, struct snd_soc_dai *dai, > + struct device_node *node) > +{ > + struct of_snd_soc_device *of_soc; > + int rc = 0; > + > + pr_info("registering ASoC codec driver: %s\n", node->full_name); > + > + mutex_lock(&of_snd_soc_mutex); > + of_soc = of_snd_soc_get_device(node); > + if (!of_soc) { > + rc = -ENOMEM; > + goto out; > + } > + > + /* Store the codec data */ > + of_soc->device.codec_data = codec_data; > + of_soc->device.codec_dev = codec_dev; > + of_soc->dai_link.name = (char *)node->name; > + of_soc->dai_link.stream_name = (char *)node->name; > + of_soc->dai_link.codec_dai = dai; > + > + /* Now try to register the SoC device */ > + of_snd_soc_register_device(of_soc); > + > + out: > + mutex_unlock(&of_snd_soc_mutex); > + return rc; > +} > +EXPORT_SYMBOL_GPL(of_snd_soc_register_codec); > + > +int of_snd_soc_register_platform(struct snd_soc_platform *platform, > + struct device_node *node, > + struct snd_soc_dai *cpu_dai) > +{ > + struct of_snd_soc_device *of_soc; > + struct device_node *codec_node; > + const phandle *handle; > + int len, rc = 0; > + > + pr_info("registering ASoC platform driver: %s\n", node->full_name); > + > + handle = of_get_property(node, "codec-handle", &len); > + if (!handle || len < sizeof(handle)) > + return -ENODEV; > + codec_node = of_find_node_by_phandle(*handle); > + if (!codec_node) > + return -ENODEV; > + pr_info("looking for codec: %s\n", codec_node->full_name); > + > + mutex_lock(&of_snd_soc_mutex); > + of_soc = of_snd_soc_get_device(codec_node); > + if (!of_soc) { > + rc = -ENOMEM; > + goto out; > + } > + > + of_soc->platform_node = node; > + of_soc->dai_link.cpu_dai = cpu_dai; > + of_soc->device.platform = platform; > + of_soc->machine.name = of_soc->dai_link.cpu_dai->name; > + > + /* Now try to register the SoC device */ > + of_snd_soc_register_device(of_soc); > + > + out: > + mutex_unlock(&of_snd_soc_mutex); > + return rc; > +} > +EXPORT_SYMBOL_GPL(of_snd_soc_register_platform); > > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.

4 8

[alsa-devel] [PATCH v3 1/3] ALSA SoC: Add OpenFirmware helper for matching bus and codec drivers
by Grant Likely 23 Jul '08

23 Jul '08

From: Grant Likely <grant.likely(a)secretlab.ca> Simple utility layer for creating ASoC machine instances based on data in the OpenFirmware device tree. OF aware platform drivers and codec drivers register themselves with this framework and the framework automatically instantiates a machine driver. At the moment, the driver is not very capable and it is expected to be extended as more features are needed for specifying the configuration in the device tree. This is most likely temporary glue code to work around limitations in the ASoC v1 framework. When v2 is merged, most of this driver will need to be reworked. Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca> --- include/sound/soc-of-simple.h | 21 +++++ sound/soc/fsl/Kconfig | 3 + sound/soc/fsl/Makefile | 3 + sound/soc/fsl/soc-of-simple.c | 171 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 198 insertions(+), 0 deletions(-) diff --git a/include/sound/soc-of-simple.h b/include/sound/soc-of-simple.h new file mode 100644 index 0000000..696fc51 --- /dev/null +++ b/include/sound/soc-of-simple.h @@ -0,0 +1,21 @@ +/* + * OF helpers for ALSA SoC + * + * Copyright (C) 2008, Secret Lab Technologies Ltd. + */ + +#ifndef _INCLUDE_SOC_OF_H_ +#define _INCLUDE_SOC_OF_H_ + +#include <linux/of.h> +#include <sound/soc.h> + +int of_snd_soc_register_codec(struct snd_soc_codec_device *codec_dev, + void *codec_data, struct snd_soc_dai *dai, + struct device_node *node); + +int of_snd_soc_register_platform(struct snd_soc_platform *platform, + struct device_node *node, + struct snd_soc_dai *cpu_dai); + +#endif /* _INCLUDE_SOC_OF_H_ */ diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3368ace..398f002 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -1,3 +1,6 @@ +config SND_SOC_OF_SIMPLE + tristate + config SND_SOC_MPC8610 bool "ALSA SoC support for the MPC8610 SOC" depends on MPC8610_HPCD diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 62f680a..aa2100b 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -1,3 +1,6 @@ +# Simple machine driver that extracts configuration from the OF device tree +obj-$(CONFIG_SND_SOC_OF_SIMPLE) += soc-of-simple.o + # MPC8610 HPCD Machine Support obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += mpc8610_hpcd.o diff --git a/sound/soc/fsl/soc-of-simple.c b/sound/soc/fsl/soc-of-simple.c new file mode 100644 index 0000000..0382fda --- /dev/null +++ b/sound/soc/fsl/soc-of-simple.c @@ -0,0 +1,171 @@ +/* + * OF helpers for ALSA SoC Layer + * + * Copyright (C) 2008, Secret Lab Technologies Ltd. + */ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/pm.h> +#include <linux/bitops.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-of-simple.h> +#include <sound/initval.h> + +MODULE_AUTHOR("Grant Likely <grant.likely(a)secretlab.ca>"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("ALSA SoC OpenFirmware bindings"); + +static DEFINE_MUTEX(of_snd_soc_mutex); +static LIST_HEAD(of_snd_soc_device_list); +static int of_snd_soc_next_index; + +struct of_snd_soc_device { + int id; + struct list_head list; + struct snd_soc_device device; + struct snd_soc_machine machine; + struct snd_soc_dai_link dai_link; + struct platform_device *pdev; + struct device_node *platform_node; + struct device_node *codec_node; +}; + +static struct snd_soc_ops of_snd_soc_ops = { +}; + +static struct of_snd_soc_device * +of_snd_soc_get_device(struct device_node *codec_node) +{ + struct of_snd_soc_device *of_soc; + + list_for_each_entry(of_soc, &of_snd_soc_device_list, list) { + if (of_soc->codec_node == codec_node) + return of_soc; + } + + of_soc = kzalloc(sizeof(struct of_snd_soc_device), GFP_KERNEL); + if (!of_soc) + return NULL; + + /* Initialize the structure and add it to the global list */ + of_soc->codec_node = codec_node; + of_soc->id = of_snd_soc_next_index++; + of_soc->machine.dai_link = &of_soc->dai_link; + of_soc->machine.num_links = 1; + of_soc->device.machine = &of_soc->machine; + of_soc->dai_link.ops = &of_snd_soc_ops; + list_add(&of_soc->list, &of_snd_soc_device_list); + + return of_soc; +} + +static void of_snd_soc_register_device(struct of_snd_soc_device *of_soc) +{ + struct platform_device *pdev; + int rc; + + /* Only register the device if both the codec and platform have + * been registered */ + if ((!of_soc->device.codec_data) || (!of_soc->platform_node)) + return; + + pr_info("platform<-->codec match achieved; registering machine\n"); + + pdev = platform_device_alloc("soc-audio", of_soc->id); + if (!pdev) { + pr_err("of_soc: platform_device_alloc() failed\n"); + return; + } + + pdev->dev.platform_data = of_soc; + platform_set_drvdata(pdev, &of_soc->device); + of_soc->device.dev = &pdev->dev; + + /* The ASoC device is complete; register it */ + rc = platform_device_add(pdev); + if (rc) { + pr_err("of_soc: platform_device_add() failed\n"); + return; + } + +} + +int of_snd_soc_register_codec(struct snd_soc_codec_device *codec_dev, + void *codec_data, struct snd_soc_dai *dai, + struct device_node *node) +{ + struct of_snd_soc_device *of_soc; + int rc = 0; + + pr_info("registering ASoC codec driver: %s\n", node->full_name); + + mutex_lock(&of_snd_soc_mutex); + of_soc = of_snd_soc_get_device(node); + if (!of_soc) { + rc = -ENOMEM; + goto out; + } + + /* Store the codec data */ + of_soc->device.codec_data = codec_data; + of_soc->device.codec_dev = codec_dev; + of_soc->dai_link.name = (char *)node->name; + of_soc->dai_link.stream_name = (char *)node->name; + of_soc->dai_link.codec_dai = dai; + + /* Now try to register the SoC device */ + of_snd_soc_register_device(of_soc); + + out: + mutex_unlock(&of_snd_soc_mutex); + return rc; +} +EXPORT_SYMBOL_GPL(of_snd_soc_register_codec); + +int of_snd_soc_register_platform(struct snd_soc_platform *platform, + struct device_node *node, + struct snd_soc_dai *cpu_dai) +{ + struct of_snd_soc_device *of_soc; + struct device_node *codec_node; + const phandle *handle; + int len, rc = 0; + + pr_info("registering ASoC platform driver: %s\n", node->full_name); + + handle = of_get_property(node, "codec-handle", &len); + if (!handle || len < sizeof(handle)) + return -ENODEV; + codec_node = of_find_node_by_phandle(*handle); + if (!codec_node) + return -ENODEV; + pr_info("looking for codec: %s\n", codec_node->full_name); + + mutex_lock(&of_snd_soc_mutex); + of_soc = of_snd_soc_get_device(codec_node); + if (!of_soc) { + rc = -ENOMEM; + goto out; + } + + of_soc->platform_node = node; + of_soc->dai_link.cpu_dai = cpu_dai; + of_soc->device.platform = platform; + of_soc->machine.name = of_soc->dai_link.cpu_dai->name; + + /* Now try to register the SoC device */ + of_snd_soc_register_device(of_soc); + + out: + mutex_unlock(&of_snd_soc_mutex); + return rc; +} +EXPORT_SYMBOL_GPL(of_snd_soc_register_platform);

3 10

[alsa-devel] RFC: reworking ASOC for large registers
by Jon Smirl 22 Jul '08

22 Jul '08

The current read/write routines: unsigned int read(struct snd_soc_codec *codec, unsigned int reg); int write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value); How about making them work on an array of bytes? unsigned int read(struct snd_soc_codec *codec, unsigned int reg, u8 *value); int write(struct snd_soc_codec *codec, unsigned int reg, u8* value); If read is sucessful, it returns the number of bytes read. Reading a non-existent register returns -ENODEV, or you can get other errors like -EIO when the IO fails. Write can return bytes written or a negative error code. Instead of u8 I've been using a union in my internal code. We can come up with better names for the members. typedef struct { union { u16 s16; u8 byte[32]; u16 value[16]; u32 data[8]; }; } register_t; It is easy to change the existing drivers to assign to the var parameter rather than return from the function. After the low level is changed, the ASOC core needs to be updated to allow 16 bit shifts and masks up to 64 bits. The encoding into 32 bit in the private field would need to be broken out to use a structure. .private_value = (reg_left) | ((shift) << 8) | \ ((max) << 12) | ((invert) << 20) | ((reg_right) << 24) } I think this can be changed inside the macros via a C99 initializer without effecting existing source. For a transition the snd_soc_write/snd_soc_read macros could see if the driver has the old or new form of read/write and use whichever is defined. -- Jon Smirl jonsmirl(a)gmail.com

2 9

[alsa-devel] [2.6 patch] make snd_ac97_add_vmaster() static
by Adrian Bunk 22 Jul '08

22 Jul '08

This patch makes the needlessly global snd_ac97_add_vmaster() static. Signed-off-by: Adrian Bunk <bunk(a)kernel.org> --- 8ca0ca6ab50a53faf6c7af44b67408e32d11f69a diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 0746e9c..f4fbc79 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -3381,8 +3381,8 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97, } /* create a virtual master control and add slaves */ -int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, - const unsigned int *tlv, const char **slaves) +static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, + const unsigned int *tlv, const char **slaves) { struct snd_kcontrol *kctl; const char **s;

1 0

[alsa-devel] logging stream creation
by Nick Thompson 21 Jul '08

21 Jul '08

Hello, I've just started looking at ALSA, and I have a couple questions that I hope will be pretty easy to answer. I'd like to log stream creation as streams are brought up and shut down. Should I use an I/O plugin for this? Is there code I should start to look at for doing this. Ideally I'd like to get a notification once streaming starts on a PCM and when it stops. If I wanted to manipulate DMIX settings in response to streams being started and stopped, is it best to do this via a plugin (possibly the same one that I'd write for the stream monitoring, or from an external app that has a connection to the monitoring plug). Finally is it possible to change the physical ALSA sink for a running PCM (for example if I have two devices, I start streaming on the first and decide in response to a user even that I need to stream to another sink). Thank you!! Nick

1 0

[alsa-devel] CS4279 and hw_read_t/hw_write_t
by Jon Smirl 21 Jul '08

21 Jul '08

_From soc/codecs/cs4270.c... * * Note that we don't use the hw_write function pointer of snd_soc_codec. * That's because it's too clunky: the hw_write_t prototype does not match * i2c_smbus_write_byte_data(), and it's just another layer of overhead. */ The prototype doesn't match because you are using i2c_smbus_write_byte_data() instead of i2c_master_send()/i2c_master_recv(). -- Jon Smirl jonsmirl(a)gmail.com

2 4