summaryrefslogtreecommitdiff
path: root/sound
AgeCommit message (Collapse)Author
2011-09-19Ux500 ASoC: cg29xx: The I2S PCM interface must not be configuredroger nilsson
It is not possible to configure the I2S PCM interface after the SCO link has been setup by the BT stack. ST-Ericsson ID: 337 138 Change-Id: Icc48f76c0d41665988709e4f09856e081c654e8a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21955 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Johan BOHLIN <johan.bohlin@stericsson.com> Tested-by: Johan BOHLIN <johan.bohlin@stericsson.com>
2011-09-19Ux500 ASoC: Move enabling of regulatorsPhilippe Langlais
Regulators is no longer enabled during machine-driver init, but rather done before playback, and disabled after playback is finished. Change-Id: I5f6bfc3dd60b139ce4e786160104e4daaa4040fc Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21788 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500.c include/sound/ux500_ab8500_ext.h sound/soc/codecs/ab8500_audio.c sound/soc/ux500/ux500_ab8500.c
2011-09-19Ux500 ASoC: Turn off AB8500 when inactivePhilippe Langlais
Using reference counter to be able to turn of AB8500 when none of playback, capture or vibra is active. Change-Id: If295d40a31e0f7529c2cd9573052ce798fdbe465 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21661 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Conflicts: sound/soc/codecs/ab8500_audio.c
2011-09-19Ux500 ASoC: Added reference counter for sysclkOla Lilja
A reference counter is added for enable/disable of sysclk to be able to handle playback and capture combinations. Change-Id: Ia28d3b94f3b54561cc990aa51fa5a0bf99319656 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21385 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Take sysclk during audio-playbackPhilippe Langlais
Change-Id: Iad133756a33d6f15f78806a29d9d3653e918578f Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21325 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Conflicts: sound/soc/codecs/ab8500_audio.c
2011-09-19Ux500 ASoC: Dynamical mapping of AD to slot settingsOla Lilja
AB8500 codec-driver now exposes controls for manually setting which AD output should be fed into what slot on the digital interface. Change-Id: I51a32b15bc5a948c24c36029aa7ed29860903503 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21158 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-09-19Ux500 ASoC: Fix build-error for AV8100 codec-driverOla Lilja
Change-Id: I4e4d016854b875580a8a7ec4f5243dc8f11cfbe3 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21096 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Fixed register defines for AB8500 codec-driver.Ola Lilja
Changed defines that were set as bit-mask but used as number of shifts. Change-Id: Ic1e3fbf7133c15eadeb97a3e57d5e48ac466bfbd Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20096 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-09-19Ux500 ASoC: Add support for burst-modeOla Lilja
ALSA-controls added to be able to control the burst FIFO. Change-Id: Ieb8fdbd942c11251c6bbd368a434750a15f39512 Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19822 Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Support configuration of I2S interface 1Philippe Langlais
Added support for configuring the second I2S interface. This is needed for FM-radio. Change-Id: I1a8cd908f66db45b6031d15d33779236a1a55344 Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19821 Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Conflicts: sound/soc/codecs/ab8500_audio.c
2011-09-19ASoC: cg29xx: The driver will not start a BTSCO stream.roger nilsson
If BTSCO is routed the driver will rely on the BT stack to setup the chip. Change-Id: Iea547d291c38d7a0784bbbd337d6095722c9ecfb Signed-off-by: roger nilsson <roger.xr.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19628 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
2011-09-19Ux500 ASoC: The MSP DAI driver now implements set_sysclk.Philippe Langlais
The cg2900 machine driver does now set the sysclk frequency that drives the MSP. The bitclock will now be correct when the MSP is master. Change-Id: I1134d00cf4b5600997b683977076815fd864ca04 Signed-off-by: roger nilsson <roger.xr.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19615 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Conflicts: sound/soc/ux500/ux500_msp_dai.h
2011-09-19Ux500 ASoC: Naming alignments and __devinit and __devexit fix.Philippe Langlais
Alignments of function names and filenames inside the Ux500 ASoC-driver. Fix to have __devinit and __devexit without section mismatch warnings. Change-Id: I367a18b846b54dbcea3fe8fc642779cdf4090278 Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19303 Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: sound/soc/codecs/Makefile sound/soc/codecs/ab8500_audio.c
2011-09-19Ux500 ASoC: Adaptations in the AB8500-parts for U8500.Philippe Langlais
Support added for more channels and more formats and configuration possibilities. Added controls in AB8500-codec for fsbitclk and master generator. Change-Id: I2ea60c54c3892340b4a0d1771a1efdb504cc2495 Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18279 Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500.c
2011-09-19Input: Add AB8500 AV Acc. Detection as platform drvPhilippe Langlais
Adds AV Accessory detection driver functionality as a platform driver. Driver allows detection of basic AV-Accessory connected to 3.5mm AV-Connector. Supported accessories include headphone, headset, video and carkit. Driver controls the audio-in/video-out switch based on the detected accessory type and notifies about button presses from basic headsets (No ECI Support). Accessory status and button presses are reported as standard input events, if AB8500 ASoC Machine driver is configured. For accessory properties reporting, ALSA JACK definitions (SND_JACK_*) are used to report the features supported by the attached accessory. Button presses are reported with KEY_MEDIA keycode. Depends on: http://gerrit.lud.stericsson.com/gerrit/16910 for GPIO framework update. ST-Ericsson ID: ER 275366 Signed-off-by: Rahul Venkatram <rahul.venkatram@stericsson.com> Change-Id: Ie1c68120fc718710ecac2d3dafe4f3e7b1a53ac1 Signed-off-by: Rahul Venkatram <rahul.venkatram@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16256 Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500-regulators.c arch/arm/mach-ux500/board-mop500.c sound/soc/ux500/ux500_ab8500.c
2011-09-19sound: replace init_MUTEX() by sema_init() and fix MODULE_LICENSE for 2.6.38Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-09-19sound: fix DAPM API change in 2.6.38Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-09-19sound accessory: update taken from 2.6.35 GLKPhilippe Langlais
2011-09-19Ux500 ASoC: Fix IF delay issue with AV8100Mikko Sarmanne
Fixes distortion in the AV8100 playback caused by mismatching IF formats in TDM mode. The fix enables configuration of the IF delay on MSP side. Change-Id: Icf154041fb3032e9f285eb6e7d8fa673e1c7f024 Signed-off-by: Mikko Sarmanne <mikko.sarmanne@symbio.com> Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13524 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
2011-09-19Ux500 ASoC: Fix 7 and 8 channel playback for AV8100Mikko Sarmanne
Fixes an issue with 8 channel setup that caused the audio not being played from the last two speakers. Also adds support for 7.0 speaker configuration. Change-Id: Ia46d6ab8e2f218e7bda384f364f1b4ea88a053fc Signed-off-by: Mikko Sarmanne <mikko.sarmanne@symbio.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13415 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: QATOOLS
2011-09-19Enable headset mic on V2 HWMikko Sarmanne
Enables headset mic recording on V2 hardware by updating regulator handling in the AB8500 ASoC driver. ST-Ericsson ID: ER281760 Change-Id: I1047f66a4a1fd8177e408330a8c34c27022bbbfa Signed-off-by: Mikko Sarmanne <mikko.sarmanne@symbio.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12883 Tested-by: Josefin LOFSTEDT <josefin.lofstedt@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-09-19Update AB8500 ASoC mixer controlsMikko Sarmanne
Updates the naming of several AB8500 ALSA SoC mixer controls and adds new ones to support vibra functionality. Support is added for both PCM and PWM vibra modes. ST-Ericsson ID: WP271430 and WP271431 Change-Id: If87fc88bbbb4d27dedd17db3652b35fdb59d97cc Signed-off-by: Mikko Sarmanne <mikko.sarmanne@symbio.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12882 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Josefin LOFSTEDT <josefin.lofstedt@stericsson.com>
2011-09-19ASoC: Add support for AB8500 audioMikko Sarmanne
Adds ALSA SoC support for AB8500 audio codec for 2.6.35 kernel. Signed-off-by: Mikko Sarmanne <mikko.sarmanne@symbio.com> Change-Id: Ibb8c0ae51ebd7c31615fd214292f3be2063a3dcf Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12277 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-09-19Ux500 ASoC: Change debug-level to avoid log-spam.Ola Lilja
pr_err was used where it should be pr_debug. Changed. ST-Ericsson ID: ER318557 Change-Id: I052d975da93c00807923ad4c57aa58c244bd357c Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11980 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: QATOOLS
2011-09-19mfd: Updating sound/soc/codecs/cg29xx.c for communityPhilippe Langlais
2011-09-19sound/soc: Add the AB5500 codec driver and correct the MSP internal clock ↵Xie Xiaolei
frequency. ST-Ericsson ID: WP 259100 Signed-off-by: Xie Xiaolei <xie.xiaolei@stericsson.com> Change-Id: Ia2ecfb380d9f59f0ef588888745269160e914d9e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/11424 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Xie XIAOLEI <xie.xiaolei@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-09-19msp: improved configuration for msp1Philippe Langlais
MSP1 Pins configured as GPIO to improve consumption during sleep mode GPIO[33] DIR=1, DATA=0 GPIO[36:34] DIR=0, PDIS=1 ST-Ericsson ID: ER 271120 Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> Change-Id: Ie394b8633a079974d9cc481b618eec1a8c005f03 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10365 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500-msp.c arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/include/mach/msp.h drivers/misc/audio_io_dev/ste_audio_io_core.c drivers/misc/audio_io_dev/ste_audio_io_core.h drivers/misc/audio_io_dev/ste_audio_io_func.c drivers/misc/i2s/msp_i2s.c include/linux/mfd/ab8500.h
2011-09-19Ux500 ASoC: Support for MSP3.Ola Lilja
Added support for a fourth MSP-block. Change-Id: I48cc0d13597e5887d85ac8ab0acff9de29a934a8 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10298
2011-09-19Ux500 ASoC: Allow multiple prepares.Ola Lilja
Keeping track of configured status to handle multiple calls to the prepare-callback. Change-Id: I4e39aa535ac0fc4cb71f2aa19da5eb9672d82270 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10297
2011-09-19Ux500 ASoC: Fix for for audio capture.Ola Lilja
Flag added in private struct for audio capture. Change-Id: I8e5a93c386e0c22d3350018e79e786849cbed497 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10296
2011-09-19Ux500 ASoC: Multi-component support.Ola Lilja
The Ux500 driver is now rewritten to for multi-component support. This includes the Ux500 platform driver, the AV8100 codec-driver, the CG29xx codec-driver and the AB3550 codec-driver. There is now one common machine-driver for all codecs, and all three codecs can be activated indepentantly. Change-Id: I4c942b040306a1d6033ee4d80f9368917cb9b4d3 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9767 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/10280
2011-09-19Ux500 ASoC: Use of cyclic DMA.Philippe Langlais
Platform driver rewritten to make use of cyclic DMA by sending a cyclic SG-list before playback is started. Updates to support cyclic DMA in MSP I2S-driver. ST-Ericsson ID: ER 278088 Change-Id: I9d143fc4704cff6f5415175ab14085b9ab98d6d4 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9353 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: drivers/misc/i2s/i2s.c drivers/misc/i2s/i2s_test_protocol_driver.c drivers/misc/i2s/msp_i2s.c drivers/misc/i2s/msp_i2s.h include/linux/i2s/i2s.h
2011-09-19msp: remove usage of stm_gpio_altfuncenable/disablePhilippe Langlais
Usage of two GPIO configuration systems - stm_gpio_altfuncenable/disable is removed.
2011-09-19Ux500 ASoC: Support for multi-channel audio in AV8100 codec-driver.Ola Lilja
The HDMI ASoC-driver can now be configured with 1-8 channels. Configuration is also done by using the HDMI-standard for audio info-frames. Change-Id: Ibc84f2efeb748a1cace08d184dfd387f46c58d7c Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/5915 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-09-19sound: add asoc codec support for ux500 platformPhilippe Langlais
This patch is based on the following work: cg29xx ASoc: The codec driver for cg29xx does now use the MFD driver for that chip. ST-Ericsson ID: 259100 Author: Roger Nilsson <roger.xr.nilsson@stericsson.com> Ux500 ASoC: HDMI-driver in Ux500 ALSA SoC-driver. Author: Ola Lilja <ola.o.lilja@stericsson.com> Add a power management scheme for AB3550 and fix bugs that hinder simultaneous playback/capture. ST-Ericsson ID: WP 259100 Author: Xie Xiaolei <xie.xiaolei@stericsson.com> sound: asoc: Added codec and machine drivers for cg29xx. Author: Ola Lilja <ola.o.lilja@stericsson.com> SND: sound codec ab3550 abx500 updates Author: Mattias Wallin <mattias.wallin@stericsson.com> New ASoC driver for Fairbanks. Author: Ola Lilja <ola.o.lilja@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Conflicts: arch/arm/mach-ux500/Kconfig-arch sound/soc/codecs/Makefile
2011-09-19sound: add asoc support for ux500 platformMian Yousaf Kaukab
This patch is based on the following work: cg29xx ASoc: The codec driver for cg29xx does now use the MFD driver for that chip. ST-Ericsson ID: 259 100 Author: Roger Nilsson <roger.xr.nilsson@stericsson.com> Ux500 ASoc: Added support for the DSP_A format. ST-Ericsson ID: 259 074 Author: Roger Nilsson <roger.xr.nilsson@stericsson.com> Ux500 ASoC: Added support for TDM. ST-Ericsson ID: 259 074 Author: Roger Nilsson <roger.xr.nilsson@stericsson.com> Ux500 ASoC: HDMI-driver in Ux500 ALSA SoC-driver. Author: Ola Lilja <ola.o.lilja@stericsson.com> Add a power management scheme for AB3550 and fix bugs that hinder simultaneous playback/capture. ST-Ericsson ID: WP 259100 Author: Xie Xiaolei <xie.xiaolei@stericsson.com> msp: add configuration param for MSP_IODLY ST-Ericsson ID: CR261462 Author: Rabin Vincent <rabin.vincent@stericsson.com> sound: asoc: Added codec and machine drivers for cg29xx. Author: Ola Lilja <ola.o.lilja@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
2011-09-19sound: add alsa support for ab8500Mian Yousaf Kaukab
This patch is based on the following work: Add a power management scheme for AB3550 and fix bugs that hinder simultaneous playback/capture. ST-Ericsson ID: WP 259100 Author: Xie Xiaolei <xie.xiaolei@stericsson.com> msp: add configuration param for MSP_IODLY ST-Ericsson ID: CR261462 Author: Rabin Vincent <rabin.vincent@stericsson.com> ux500: switch to DMAENGINE-based DMA driver ST-Ericsson ID: AP259210 Author: Rabin Vincent <rabin.vincent@stericsson.com> ab8500-acodec: remove unused dma variables ST-Ericsson ID: AP259210 Author: Rabin Vincent <rabin.vincent@stericsson.com> updates for u8500 sound drivers for v2.6.33 Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
2011-09-19ALSA: HDA: Fix automute for Gateway NV79David Henningsson
commit 94024cd1aefa0f8bcc9dfe46c05bd7ce3f471a1c upstream. The PCI SSID is 1025:031c and the codec SSID is 1025:031d, so the driver mistakes this for a SKU value, but looking at the numbers, this is obviously wrong. BugLink: http://bugs.launchpad.net/bugs/761861 Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-19sound: add ab8500 audio codecMian Yousaf Kaukab
This patch is based on the following work: Add a power management scheme for AB3550 and fix bugs that hinder simultaneous playback/capture. ST-Ericsson ID: WP 259100 Author: Xie Xiaolei <xie.xiaolei@stericsson.com> msp: add configuration param for MSP_IODLY ST-Ericsson ID: CR261462 Author: Rabin Vincent <rabin.vincent@stericsson.com> ab8500-acodec: remove unused dma variables ST-Ericsson ID: AP259210 Author: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
2011-07-25Merge branch 'upstream/linaro-3.0' into linaro-android-3.0John Stultz
2011-07-21Revert "Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0"Nicolas Pitre
This reverts commit c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef, reversing changes made to dfee09c8acf18e84fe197bb5d821d1e4e02d020f. John Stultz reports that Panda doesn't boot anymore and 'git bisect' indicated the merge commit itself as the culprit. The resulting kernel log is: [ 1.734802] OMAP DSS rev 4.0 [ 1.740417] omap_hwmod: dss_core: _wait_target_disable failed [ 1.746429] omap_device: omapdss_dss.-1: new worst case deactivate latency 01 [ 1.755035] omapdss DISPC error: can't get dss_clk [ 1.760101] omapdss_dispc: probe of omapdss_dispc failed with error -2 [ 1.767333] omapdss HDMI error: can't get hdmi_clk [ 1.772399] omapdss_hdmi: probe of omapdss_hdmi failed with error -2 [ 1.780273] ------------[ cut here ]------------ [ 1.785125] WARNING: at drivers/video/omap2/dss/dispc.c:553dispc_runtime_ge) [ 1.793640] Modules linked in: [ 1.796905] ---[ end trace 6fcb132ac310d004 ]--- [ 1.801757] Unable to handle kernel NULL pointer dereference at virtualaddr0 [...] Revert it so a later version of the arm-soc merge result can be used instead.
2011-07-20Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0Nicolas Pitre
2011-07-18Merge branch 'fix/asoc' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: Correct WM8994 MICBIAS supply widget hookup ASoC: Fix shift in WM8958 accessory detection default implementation ASoC: sh: fsi-hdmi: fixup snd_soc_card name ASoC: sh: fsi-da7210: fixup snd_soc_card name ASoC: sh: fsi-ak4642: fixup snd_soc_card name
2011-07-17Merge branch 'next/devel-2' into for-nextArnd Bergmann
2011-07-17Merge branches 'omap/prcm' and 'omap/mfd' of ↵Arnd Bergmann
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel-2
2011-07-17ASoC: Correct WM8994 MICBIAS supply widget hookupMark Brown
The WM8994 and WM8958 series of devices have two MICBIAS supplies rather than one, the current widget actually manages the microphone detection control register bit (which is managed separately by the relevant API). Fix this, hooking the relevant supplies up to the MICBIAS1 and MICBIAS2 widgets. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org
2011-07-15Merge branch 'fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 ↵Arnd Bergmann
into imx/fixes
2011-07-15ASoC: Fix shift in WM8958 accessory detection default implementationMark Brown
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org
2011-07-12Merge commit 'v3.0-rc7' into android-3.0Colin Cross
2011-07-09ASoC: sh: fsi-hdmi: fixup snd_soc_card nameKuninori Morimoto
it shouldn't contain space letters and special letters like parentheses. aplay will be "Segmentation fault" without this patch special thanks to Takashi. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 04:09:09 +0000