Skip to contentSkip to conversation

sound updates for 2.6.30

GIT PULL Takashi Iwai 4 participants 7 messages Apr 7, 2009 – Apr 13, 2009

lore
Share & tools
lore
#0 lore raw

Linus,

please pull more ALSA updates for v2.6.30 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

Mostly small fixes for atmel drivers, usb-audio and others as below. Still one ASoC driver addition that was missing in the last pull request, but it's safe to apply as it's a very local one.

Thanks!

Takashi

===

Akinobu Mita (1):
ALSA: hda - add missing comma in ad1884_slave_vols

Anton Vorontsov (1):
ASoC: fsl_dma: Pass the proper device for dma mapping routines

Clemens Ladisch (4):
sound: usb-audio: show sample format width in proc file
sound: usb-audio: remove check_hw_params_convention()
sound: usb-audio: save data packet interval in audioformat structure
sound: usb-audio: allow period sizes less than 1 ms

Dan Carpenter (1):
ASoC: Fix null dereference in ak4535_remove()

Deepika Makhija (1):
ALSA: oss - volume control for CSWITCH and CROUTE

Hans-Christian Egtvedt (10):
ALSA: snd-atmel-ac97c: cleanup register definitions
ALSA: snd-atmel-ac97c: remove dead break statements after return in switch case
ALSA: snd-atmel-ac97c: do not overwrite OCA and ICA when assigning channels
ALSA: snd-atmel-ac97c: set correct size for buffer hardware parameter
ALSA: snd-atmel-ac97c: enable interrupts to catch events for error reporting
ALSA: snd-atmel-ac97c: do a proper reset of the external codec
ALSA: snd-atmel-ac97c: cleanup registers when removing driver
ALSA: snd-atmel-ac97c: replace bus_id with dev_name()
ALSA: snd-atmel-abdac: replace bus_id with dev_name()
ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4

Jarkko Nikula (1):
ASoC: OMAP: Set minimum buffer size constraint for McBSP2 in OMAP3

Krzysztof Helt (1):
ALSA: opl3sa2: add ZV port control

Luotao Fu (1):
pxa2xx-ac97: fix displaying GSR after reset timeout

Mark Brown (4):
ASoC: Add some documentation for the ASoC jack API
ASoC: Don't defer resume work for AC97 codecs
ASoC: Set parent for AC97 devices we register
ASoC: Implement suspend and resume operations for WM9705

Matthew Ranostay (2):
ALSA: Add 92HD81B1C device id
ALSA: hda - Add VREF powerdown sequence for another board

Peter Ujfalusi (3):
ASoC: TWL4030: 96KHz playback support
ASoC: TWL4030: Add constrains for second stream
ASoC: TWL4030: Add actual support for 96KHz playback support

Philipp Zabel (2):
ASoC: pxa-ssp: Use 16-bit DMA for magician stereo
ASoC: Add Magician machine support

Timur Tabi (2):
ASoC: remove trigger delay in Freescale MPC8610 sound driver
ASoC: trim SSI sysfs statistics in Freescale MPC8610 sound drivers

Uwe Kleine-König (1):
ALSA: move snd_powermac's probe function to .devinit.text

Wu Fengguang (1):
ALSA: hda - enable SPDIF output for Intel DX58SO board

---
 Documentation/sound/alsa/soc/jack.txt |   71 +++++
 sound/arm/pxa2xx-ac97-lib.c           |   15 +-
 sound/atmel/abdac.c                   |    4 +-
 sound/atmel/ac97c.c                   |  128 +++++++--
 sound/atmel/ac97c.h                   |   14 +-
 sound/core/oss/mixer_oss.c            |    8 +
 sound/isa/opl3sa2.c                   |    1 +
 sound/pci/hda/patch_analog.c          |    2 +-
 sound/pci/hda/patch_realtek.c         |    5 +
 sound/pci/hda/patch_sigmatel.c        |   20 ++
 sound/ppc/powermac.c                  |    2 +-
 sound/soc/codecs/ak4535.c             |    3 +-
 sound/soc/codecs/twl4030.c            |   59 ++++-
 sound/soc/codecs/twl4030.h            |    1 +
 sound/soc/codecs/wm9705.c             |   37 +++
 sound/soc/fsl/fsl_dma.c               |   29 ++-
 sound/soc/fsl/fsl_ssi.c               |   99 +++---
 sound/soc/omap/omap-mcbsp.c           |   11 +
 sound/soc/pxa/Kconfig                 |   10 +
 sound/soc/pxa/Makefile                |    2 +
 sound/soc/pxa/magician.c              |  560 +++++++++++++++++++++++++++++++++
 sound/soc/pxa/pxa-ssp.c               |   12 +-
 sound/soc/soc-core.c                  |   20 +-
 sound/usb/usbaudio.c                  |  255 +++++++--------
 24 files changed, 1133 insertions(+), 235 deletions(-)
 create mode 100644 Documentation/sound/alsa/soc/jack.txt
 create mode 100644 sound/soc/pxa/magician.c
#1 lore raw

Hi Takashi,

Quoted 3 lines · On Tue, 07 Apr 2009 04:53:04 +0200 Takashi Iwai <[email protected]> wrote:

Peter Ujfalusi (3):
ASoC: TWL4030: Add constrains for second stream

This commit causes the linux-next tree to fail to build ... see my other email.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#2 lore raw
In reply to Takashi Iwai

I encountered this oops with the latest linux git pull. Will this update fix the problem? When I rolled back to 2.6.29-stable, the sound works find.

Oops from dmesg ...

HDA Intel 0000:00:1b.0: PCI INT B -> GSI 17 (level, low) -> IRQ 17
hda_intel: probe_mask set to 0x1 for device 17aa:20ac HDA Intel 0000:00:1b.0: setting latency timer to 64

BUG: unable to handle kernel paging request at 6c000002
IP: [<c023d876>] strcpy+0xe/0x1b
*pdpt = 0000000036836001 *pde = 0000000000000000
Oops: 0000 [#1] PREEMPT SMP
last sysfs file:
/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda15/dev
Modules linked in: snd_hda_codec_analog snd_hda_intel(+) snd_hda_codec

Pid: 3067, comm: modprobe Not tainted (2.6.29 #3) 7676A24
EIP: 0060:[<c023d876>] EFLAGS: 00010286 CPU: 0
EIP is at strcpy+0xe/0x1b
EAX: f7605d78 EBX: 00000000 ECX: f7605d78 EDX: 6c000002
ESI: 6c000002 EDI: f7605d78 EBP: f7605d50 ESP: f7605d44
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
Process modprobe (pid: 3067, ti=f7605000 task=f7537020 task.ti=f7605000)

Stack:
 00000000 f692b000 f7605da8 f7605db4 fa7e8e53 f7605d68 00000000 00000000
 00000000 00000000 00000002 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
Call Trace:
 [<fa7e8e53>] ? _snd_hda_find_mixer_ctl+0x36/0x4a [snd_hda_codec]
 [<fa7e95b0>] ? snd_hda_add_vmaster+0x64/0x8a [snd_hda_codec]
 [<f8345420>] ? ad198x_build_controls+0x106/0x150 [snd_hda_codec_analog]
 [<fa7e72a8>] ? snd_hda_codec_build_controls+0x20/0x2c [snd_hda_codec]
 [<fa7e9df0>] ? snd_hda_build_controls+0x18/0x67 [snd_hda_codec]
 [<fa803f81>] ? azx_probe+0x715/0x78a [snd_hda_intel]
 [<fa802e29>] ? azx_send_cmd+0x0/0xbf [snd_hda_intel]
 [<fa802ee8>] ? azx_get_response+0x0/0x196 [snd_hda_intel]
 [<fa8028e0>] ? azx_attach_pcm_stream+0x0/0x133 [snd_hda_intel]
 [<c024b934>] ? local_pci_probe+0xe/0x10
 [<c024c26a>] ? pci_device_probe+0x48/0x66
 [<c02c837f>] ? driver_probe_device+0x7b/0xef
 [<c02c8436>] ? __driver_attach+0x43/0x5f
 [<c02c7aac>] ? bus_for_each_dev+0x39/0x5a
 [<c02c8256>] ? driver_attach+0x14/0x16
 [<c02c83f3>] ? __driver_attach+0x0/0x5f
 [<c02c7f07>] ? bus_add_driver+0x97/0x1a7
 [<c02c863d>] ? driver_register+0x7b/0xd7
 [<c024c45b>] ? __pci_register_driver+0x35/0x61
 [<fa80a017>] ? alsa_card_azx_init+0x17/0x19 [snd_hda_intel]
 [<c0101137>] ? do_one_initcall+0x4a/0x115
 [<fa80a000>] ? alsa_card_azx_init+0x0/0x19 [snd_hda_intel]
 [<c0144660>] ? sys_init_module+0x87/0x18b
 [<c0102a10>] ? sysenter_do_call+0x12/0x2c
Code: ff ff 21 e3 8b 5b 18 83 eb 07 39 d9 73 08 89 01 89 51 04 31 c0

c3 b8 f2 ff ff ff c3 90 55 89 c1 89 e5 57 89 c7 56 89 d6 83 ec 04 <ac> aa 84 c0 75 fa 5a 89 c8 5e 5f 5d c3 55 89 e5 57 89 c7 56 89
EIP: [<c023d876>] strcpy+0xe/0x1b SS:ESP 0068:f7605d44
CR2: 000000006c000002

---[ end trace 6160ed88b8798d2d ]---

Thanks,
Jeff.

Quoted 120 lines · Takashi Iwai

Linus,

please pull more ALSA updates for v2.6.30 from:

 git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

Mostly small fixes for atmel drivers, usb-audio and others as below. Still one ASoC driver addition that was missing in the last pull request, but it's safe to apply as it's a very local one.

Thanks!

Takashi

===

Akinobu Mita (1):
     ALSA: hda - add missing comma in ad1884_slave_vols

Anton Vorontsov (1):
     ASoC: fsl_dma: Pass the proper device for dma mapping routines

Clemens Ladisch (4):
     sound: usb-audio: show sample format width in proc file
     sound: usb-audio: remove check_hw_params_convention()
     sound: usb-audio: save data packet interval in audioformat structure
     sound: usb-audio: allow period sizes less than 1 ms

Dan Carpenter (1):
     ASoC: Fix null dereference in ak4535_remove()

Deepika Makhija (1):
     ALSA: oss - volume control for CSWITCH and CROUTE

Hans-Christian Egtvedt (10):
     ALSA: snd-atmel-ac97c: cleanup register definitions
     ALSA: snd-atmel-ac97c: remove dead break statements after return in switch case
     ALSA: snd-atmel-ac97c: do not overwrite OCA and ICA when assigning channels
     ALSA: snd-atmel-ac97c: set correct size for buffer hardware parameter
     ALSA: snd-atmel-ac97c: enable interrupts to catch events for error reporting
     ALSA: snd-atmel-ac97c: do a proper reset of the external codec
     ALSA: snd-atmel-ac97c: cleanup registers when removing driver
     ALSA: snd-atmel-ac97c: replace bus_id with dev_name()
     ALSA: snd-atmel-abdac: replace bus_id with dev_name()
     ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4

Jarkko Nikula (1):
     ASoC: OMAP: Set minimum buffer size constraint for McBSP2 in OMAP3

Krzysztof Helt (1):
     ALSA: opl3sa2: add ZV port control

Luotao Fu (1):
     pxa2xx-ac97: fix displaying GSR after reset timeout

Mark Brown (4):
     ASoC: Add some documentation for the ASoC jack API
     ASoC: Don't defer resume work for AC97 codecs
     ASoC: Set parent for AC97 devices we register
     ASoC: Implement suspend and resume operations for WM9705

Matthew Ranostay (2):
     ALSA: Add 92HD81B1C device id
     ALSA: hda - Add VREF powerdown sequence for another board

Peter Ujfalusi (3):
     ASoC: TWL4030: 96KHz playback support
     ASoC: TWL4030: Add constrains for second stream
     ASoC: TWL4030: Add actual support for 96KHz playback support

Philipp Zabel (2):
     ASoC: pxa-ssp: Use 16-bit DMA for magician stereo
     ASoC: Add Magician machine support

Timur Tabi (2):
     ASoC: remove trigger delay in Freescale MPC8610 sound driver
     ASoC: trim SSI sysfs statistics in Freescale MPC8610 sound drivers

Uwe Kleine-König (1):
     ALSA: move snd_powermac's probe function to .devinit.text

Wu Fengguang (1):
     ALSA: hda - enable SPDIF output for Intel DX58SO board

---
 Documentation/sound/alsa/soc/jack.txt |   71 +++++ sound/arm/pxa2xx-ac97-lib.c           |   15 +-

 sound/atmel/abdac.c                   |    4 +-
 sound/atmel/ac97c.c                   |  128 +++++++--
 sound/atmel/ac97c.h                   |   14 +-

 sound/core/oss/mixer_oss.c            |    8 +
 sound/isa/opl3sa2.c                   |    1 +
 sound/pci/hda/patch_analog.c          |    2 +-
 sound/pci/hda/patch_realtek.c         |    5 +
 sound/pci/hda/patch_sigmatel.c        |   20 ++
 sound/ppc/powermac.c                  |    2 +-

 sound/soc/codecs/ak4535.c             |    3 +-
 sound/soc/codecs/twl4030.c            |   59 ++++-
 sound/soc/codecs/twl4030.h            |    1 +
 sound/soc/codecs/wm9705.c             |   37 +++

 sound/soc/fsl/fsl_dma.c               |   29 ++- sound/soc/fsl/fsl_ssi.c               |   99 +++--- sound/soc/omap/omap-mcbsp.c           |   11 + sound/soc/pxa/Kconfig                 |   10 + sound/soc/pxa/Makefile                |    2 + sound/soc/pxa/magician.c              |  560 +++++++++++++++++++++++++++++++++ sound/soc/pxa/pxa-ssp.c               |   12 +- sound/soc/soc-core.c                  |   20 +- sound/usb/usbaudio.c                  |  255 +++++++--------

 24 files changed, 1133 insertions(+), 235 deletions(-)

 create mode 100644 Documentation/sound/alsa/soc/jack.txt create mode 100644 sound/soc/pxa/magician.c

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

#3 lore raw
Quoted 3 lines · Jeff Chua

I encountered this oops with the latest linux git pull. Will this update fix the problem? When I rolled back to 2.6.29-stable, the sound works find.

Yes, I got same oops and found the bug in ad1884_slave_vols table. But I don't know why the oops doesn't happen with 2.6.29...

#4 lore raw
In reply to Jeff Chua

At Tue, 7 Apr 2009 14:04:28 +0800,

Quoted 6 lines · Jeff Chua

I encountered this oops with the latest linux git pull. Will this update fix the problem? When I rolled back to 2.6.29-stable, the sound works find.

Oops from dmesg ...

Judging also from other bug reports, this looks like Analog codec specific. Likely it's a typo or so...

Could you add probe_only=1 module option and load the module, then run alsa-info.sh output with --no-upload option and attach the generated file? The script is found at
http://www.alsa-project.org/alsa-info.sh

(BTW, I'm on vacation now, and I'll check this bug after Easter
holidays. Sorry for inconvenience.)

thanks,

Takashi

#5 lore raw
Quoted 12 lines · Takashi Iwai

At Tue, 7 Apr 2009 14:04:28 +0800,

Quoted 6 lines · Jeff Chua

I encountered this oops with the latest linux git pull. Will this update fix the problem? When I rolled back to 2.6.29-stable, the sound works find.

Oops from dmesg ...

Judging also from other bug reports, this looks like Analog codec specific.  Likely it's a typo or so...

Quoted 7 lines

Could you add probe_only=1 module option and load the module, then run alsa-info.sh output with --no-upload option and attach the generated file?  The script is found at
   http://www.alsa-project.org/alsa-info.sh

(BTW, I'm on vacation now, and I'll check this bug after Easter holidays.  Sorry for inconvenience.)

Good news is the latest linux git pull today makes the HDA opps go away. It's all good now.

Thanks and Happy Easter!

Jeff.

#6 lore raw

At Wed, 8 Apr 2009 20:56:11 +0800,

Quoted 19 lines · Jeff Chua
Quoted 17 lines · Takashi Iwai

At Tue, 7 Apr 2009 14:04:28 +0800,

Quoted 6 lines · Jeff Chua

I encountered this oops with the latest linux git pull. Will this update fix the problem? When I rolled back to 2.6.29-stable, the sound works find.

Oops from dmesg ...

Judging also from other bug reports, this looks like Analog codec specific.  Likely it's a typo or so...

Could you add probe_only=1 module option and load the module, then run alsa-info.sh output with --no-upload option and attach the generated file?  The script is found at
   http://www.alsa-project.org/alsa-info.sh

Quoted 5 lines
Quoted 2 lines

(BTW, I'm on vacation now, and I'll check this bug after Easter holidays.  Sorry for inconvenience.)

Good news is the latest linux git pull today makes the HDA opps go away. It's all good now.

Good to know. It must be Mita-san's patch to fix my typo. Two strings were concatenated due to lack of comma, and resulted in a too long string over the fixed size array. I'll add strlen check or use strlcpy to make it safer later.

thanks,

Takashi