summaryrefslogtreecommitdiff
path: root/sound
AgeCommit message (Collapse)Author
2011-10-28ALSA: hda - Fix duplicated DAC assignments for RealtekTakashi Iwai
commit c48a8fb0d31d6147d8d76b8e2ad7f51a2fbb5c4d upstream. Copying hp_pins and speaker_pins from line_out_pins may confuse the parser, and it can lead to duplicated initializations for the same pin with a wrong DAC assignment. The problem appears in 3.0 kernel code. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I7e8e35f771d9e34c095927752b4ddc9bfd16d5c2 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35629 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28ALSA: virtuoso: fix silent analog output on Xonar Essence ST DeluxeClemens Ladisch
commit c81c6b356b52d3fcb4d531d149573fc100aad643 upstream. Commit dd203fa97bd5 (ALSA: virtuoso: remove non-working controls on Essence ST Deluxe) made it impossible to adjust the volume after the driver initialized it to muted. Ensure that those DACs that can be accessed with I2C are initialized to the same volume that is the reset default of the DAC without I2C. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: Id6e134a09984ae42267008363f5d9cdf34bbfa00 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35628 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28ASoC: Mark cache as dirty when suspendingMark Brown
commit 7be4ba24a3ea53bc8ade841635e4d4a59e98ceb5 upstream. Since quite a few drivers are not managing to flag the cache as needing to be resynced after suspend and it's a reasonable thing to do flag the cache as needing sync automatically when suspending. The expectation is that systems will mainly only keep the CODEC powered when doing audio through the CODEC so we won't actually suspend the device anyway; drivers which want to can override this behaviour when they resume. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I3251da89d229c6dfe25b3e0ed269d36c6470702b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35600 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28ASoC: davinci: fix codec start and stop functionsRajashekhara, Sudhakar
commit 3012f43eaf7592d8121426918e43e3b5db013aff upstream. According to DM365 voice codec data sheet at [1], before starting recording or playback, ADC/DAC modules should follow a reset and enable cycle. Writing a 1 to the ADC/DAC bit in the register resets the module and clearing the bit to 0 will enable the module. But the driver seems to be doing the reverse of it. [1] http://focus.ti.com/lit/ug/sprufi9b/sprufi9b.pdf Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: Ic51dd5415751fb011627a8f3a8ad4d51de626577 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35599 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28ASoC: davinci: add missing break statementRajashekhara, Sudhakar
commit 82d1d521036eb3f5aae48b847f939d99a44c18bb upstream. In davinci_vcif_trigger() function, a break() statement was missing causing the davinci_vcif_stop() function to be called as a fallback after calling davinci_vcif_start(). Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I58f55d9ff177ae79049c293bad984738c9244b29 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35598 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-19Ux500 ASoC: Add ANC functionalityKristoffer KARLSSON
This patch adds support for control of the ANC block in the ab8500 chipset. ST-Ericsson Linux next: NA ST-Ericsson ID: 325656 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Icf57820d32b218f16f13d96d195b2cba6b31f494 Signed-off-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> Change-Id: Ic841ecb0ae13939c84e8d959ab3cb74986e3b72b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32988 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: QATOOLS
2011-10-19Ux500 ASoC: Add new generic ALSA Control typesKristoffer KARLSSON
Added the definition and implementation for: * Signed multi register controls (1,2,4 and 8) * Signed array cache control * Strobe bit control Both multi register- and array control types have full support for signed longs (64bit) ST-Ericsson Linux next: NA ST-Ericsson ID: 325656 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3041fe115bc349bfddc3870c160e9087f21f6197 Change-Id: I955b7248b1f81fbbd331cf41edc696c865d61758 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32987 Reviewed-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> Tested-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-10-05misc: audio_io: Remove obsolete and unused driverJonas Aaberg
audio_io is superseded by alsa. ST-Ericsson Linux next: - ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I4641468e1d67e8596b1fcd9af69b0b81b686a0a0 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32904 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
2011-10-05ASoC: Ux500: Power toggle moved to DAPMOla Lilja
The toggling of power for the AB8500, including turning audio regulator and audio clock on/off is now moved to be a part of the DAPM-chain. ST-Ericsson ID: 352421 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ifd5f0edf6ed3eaea87a2e7085b2edf1aedd4f24b Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32990 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ASoC: Ux500: Added support for Line OutJohan Bohlin
Added support for Line Out in the DAPM-chain. The DAPM-chains have been rearranged to better fit the introduction of Line Out. ST-Ericsson ID: 362841 ST-Ericsson Linux next: Not tested ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I8ba138af2ca16552dfe871c61c59784a64943039 Signed-off-by: Johan Bohlin <johan.bohlin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32985 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-03ASOC CG29xx: Configures driver cg2900 for FMShyam Krishnan M
This patch sets the driver configuration on cg2900. The MSP1 line is used to receive FM. ST-Ericsson Linux next: NA ST-Ericsson ID: 335714 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ic8f2e00b1ed57716007ef65b5b9eb4663c4f5e3b Signed-off-by: Shyam Krishnan M <shyam.moni@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32392 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-03ASOC CG29xx: Configure Codec to receive FMShyam Krishnan M
This patch tristates the Interfaces in probe. The Interface is enable back in prepare function. ST-Ericsson Linux next: NA ST-Ericsson ID: 335714 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia04453f0e3aca1991e135785e9b2772522219347 Signed-off-by: Shyam Krishnan M <shyam.moni@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32802 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-30sound: asoc: ab5500: Corrected the clock settingAngshuman Dasgupta
This fixes the clock which was configured automatically to 13Mhz instead of being decided at run time ST-Ericsson Linux next: NA ST-Ericsson ID: 363003 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Change-Id: If885d5b39c8e95d02a367a16f346aade6208f252 Signed-off-by: Angshuman Dasgupta <angshuman.dasgupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32393 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-22Ux500 ASoC:To decrease noise in Audio playbackkumar km
This patch addresses loud noise that heard at the start and end of audio plaback. This patch enables DC offset cancellation and negative charge pump voltage selection. ST-Ericsson Linux next: Not tested, ER 342775 ST-Ericsson ID: 342775 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Signed-off-by: kumar km <kumar.km@stericsson.com> Change-Id: I2d11d60f8ddf14a7fa02981ece78699f62e932af Signed-off-by: kumar km <kumar.km@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31696 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-22sound: asoc: ab5500: Fix to set correct DAI formatShyam Krishnan M
This fixes the DAI format when the stream doesnot set it properly ST-Ericsson Linux next: NA ST-Ericsson ID: 348589 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Change-Id: I059921538565075b35bd533a88d7448a80823d24 Signed-off-by: Shyam Krishnan M <shyam.moni@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31695 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-22Ux500 ASoC: Fix to set max/min in h/w settingShyam Krishnan M
The maximum and minimum value in snd_pcm_hw_constraint_minmax is not checked when the maximum goes less than minimum. This check is put in place ST-Ericsson Linux next: NA ST-Ericsson ID: 348589 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Change-Id: I3abc645d64c0c7f9914609468e74b5256495bda6 Signed-off-by: Shyam Krishnan M <shyam.moni@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31694 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-19Ux500 ASoC: Move mic-regulators into DAPM-pathsOla Lilja
Race-conditions could occur when mic-regulators were turned on/off outside DAPM-paths. They are now moved into machine-driver DAPM-paths. ST-Ericsson Linux next: NA ST-Ericsson ID: 348272 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I27b7225326db9c0ccaaabf5aec5bbc9c3cfbd573 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26679 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: sound/soc/codecs/ab8500_audio.c sound/soc/ux500/ux500_ab8500.c Change-Id: Ic32c44f335a54a7a52fb395503af860ba2aae94d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30844 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-19u5500: Enable Sound on HDMIxvatnag
This patch enables audio HDMI sink ST-Ericsson ID: 342433 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial ref commit-id: I714161c24527288332b9ebdbef909d199a08f625 Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: I41f5d27106113a5dc1cbb8febd7db29296cd3f27 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30869 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-19Ux500 ASoC: Remove analog loopback graph from DAPMJohan Bohlin
ST-Ericsson ID: 358 510 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I134d32150292a0616ddc764c51b20d8f1120dbbe Signed-off-by: Johan Bohlin <johan.bohlin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29557 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30803 Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Fix FIR-coeffecient limitOla Lilja
The value limit in ALSA-control for sidetone FIR-coeffecients changed to match 2 * 8 bits. ST Ericsson ID: CR345207 ST Ericsson FOSS-OUT ID: trivial ST Ericsson Linux next: N/A Change-Id: I2f56b5c1a9905bfad943c39798b7c856e2ce5f1b Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26618 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30801 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Cosmetic changesOla Lilja
ALSA-controls are rearranged in a better way and comments are changed. No actual code is changed. ST-Ericsson Linux next: NA ST-Ericsson ID: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: I9213476b1723f7cb52f782ae26f94b9e18ddc2c5 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26063 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30800 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Proper handling of vibra output driverOla Lilja
The Class-D amplifier used for vibra is now turned of to same power when not needed. A new control to handle this is introduced. ST-Ericsson Linux next: NA ST-Ericsson ID: 345554 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I28d4daf28b3ff33b9cc2665e8a156c6f56175b66 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26046 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30799 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Fix problem when disabling DMicsOla Lilja
When DMic1 or DMic2 was disabled the other one was also disabled. This is no longer the case. ST-Ericsson Linux next: NA ST-Ericsson ID: ER348882 ST-Ericsson FOSS-OUT ID: NA Change-Id: I88d402b3f7a22e53424f2f1bcfd6fdc8e8d24468 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25710 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30798 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Activate gpio.1 clock during playbackHenrik Segerback
During burst mode, the DSP accesses the GPIO block to configure sleep mode before and after DSP sleeps. To allow this, the GPIO block must be clocked. ST-Ericsson Linux next: NA ST-Ericsson ID: 349519 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I625c63fd506316d543e26392d1edb4912193a12c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29114 Reviewed-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> Tested-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: QATEST Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30802 Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Henrik SEGERBACK <henrik.xh.segerback@stericsson.com>
2011-09-19ab5500: move to separate headerRabin Vincent
Change-Id: I11dd2a23323229096b6e0ee2d4dc68cab8919bff
2011-09-19video: av8100: Add new firmware versionNaveen Kumar Gaddipati
Updates AV8100 firmware to version 2.3 Linux firmware interface is used. ST-Ericsson ID: 322390 ST-Ericsson Linux next: Not tested, ER 282779 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Per Persson <per.xb.persson@stericsson.com> Change-Id: I7951b921538af17b3761240393a55a46c2606ddd Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30127 Reviewed-by: Naveen Kumar GADDIPATI <naveen.gaddipati@stericsson.com> Tested-by: Naveen Kumar GADDIPATI <naveen.gaddipati@stericsson.com>
2011-09-19Ux500 ASoC: increase volume level of micing07300
Increase in volume level of mic ST-Ericsson Linux next: Not tested, ER 350889 ST-Ericsson ID: 350889 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Ref: Commit-id: I853d25eb69f5b8c3221b51388d8d9741cde76b8d Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: Id5e09176745ab6fdfa02efe1b1f37ec09c233728 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30117 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-19Ux500 ASoC: Add codec-driver for AB5500Shyam Krishnan M
ST-Ericsson Linux next: Not tested ST-Ericsson ID: 332112 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Ref: Commit-id: Ic35d9290ab3d938f19b8581c8e82cbd878952f54 Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: I0f48b74fd7f46f10b45834d74f8167a1a45f1ea7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30116 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-19Ux500 ASoC: Add codec-driver for AB5500Shyam Krishnan M
ST-Ericsson Linux next: Not tested ST-Ericsson ID: 332112 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Ref: Commit-id: Ic35d9290ab3d938f19b8581c8e82cbd878952f54 Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: I8baf1401b2071c109ee8e42e25ced2cf4fb520c4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29832 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2011-09-19u5500 : Improper handling of device name in ab5500 coreBibek Basu
Following changes done: 1> Remove the protection on Read/Write access for any ab5500 register by any driver 2> Correct the pdev id for the mfd devices being registered by ab5500 core driver 3> Correct device name in sound driver ST-Ericsson Linux next: 336280 ST-Ericsson ID: 349133 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I659621b0d5453652a9368580631d85c7c852026d Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25871 Reviewed-by: QATEST Tested-by: Amaresh MULAGE <amaresh.mulage@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19Vibrator: Timed output vibrator driverMarcin Mielczarczyk
ST-Ericsson vibrator driver which registers in Android specific timed output device class. Signed-off-by: Marcin Mielczarczyk <marcin.mielczarczyk@tieto.com> Signed-off-by: Jerzy Kasenberg <jerzy.kasenberg@tieto.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Timed output vibrator: New functionality. This patch allows to form the vibration characteristic using few parameters defined in the platform data: - boost level and period for start condition - on level as moderate speed - off level and period for brake condition Detailed information can be found here: Documentation\DocBook\ste_timed_vibra.html Signed-off-by: Grzegorz Sygieda <grzegorz.sygieda@tieto.com> Signed-off-by: Krzysztof Antonowicz <krzysztof.antonowicz@tieto.com> Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> vibrator: remove board specific control of vibrator Platform specific control of vibrator should be present in board file (here board-mop500.c). So, for example if GPIO pins are used to control the vibrator, its control function implemenation should be in board file. This patch provides the callback function support in the driver for the same. Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> android: vibrator: dont directly access ktime_t members Use ktime helper functions for converting ktime values Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> u8500: vibra: linear vibrators using vibra-pwm Linear vibrators operate on thier required resonance frequency (for COPAL and AAC its ~150Hz). This can be provided using AUDIO DA5 path. This software *workaround* enables linear vibrators using AB8500 vibra-pwm by generating required resonace frequency using software. In addition this patch provides support for separate platform data for Linear and Rotarty vibrators. Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> u8500: vibra: disable vibrator after vibration This patch disables vibrator i.e. configures the PWM duty cycle to zero after vibration duration is over. Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-09-19Merge linux-linaro-3.0-2011.07-1-android-1 into..Ulf Hansson
..linux-linaro-3.0-2011.07-1_glk3.0 Conflicts: arch/arm/common/Makefile drivers/misc/Kconfig drivers/misc/Makefile kernel/printk.c Change-Id: I126f34edb1879981909072beefb2738cad26f951
2011-09-19Ux500 ASoC:DistortionNoise fix for underrun AB5500Shyam Krishnan M
Underrun happens due to system load. This causes the msp and dma to start the channel again and again. The fix prevents the call to start the channel once it is started alredy.The fix also increases the start threshold of the buffer list so that the duration after which the usecase hits underrun is improved. ST-Ericsson Linux next: Not tested, ER 344102 ST-Ericsson ID: 344102 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Change-Id: I992f83efbf8f48ff652e4c164356eb2e75fd3ac0 Signed-off-by: Shyam Krishnan M <shyam.moni@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25261 Tested-by: Hemanth P SETHURAM <hemanth.sethuram@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19Ux500 ASoC: Fix ALSA-controls for sidetone FIROla Lilja
The ALSA-controls for sidetone FIR is now working. The value controls are now merged into one control instead of having one for MSB and one for LSB. ST-Ericsson Linux next: NA ST-Ericsson ID: ER345205 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Icff8a8a6f3fdddc4ef0333e67e6e7576df4d53cf Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25303 Reviewed-by: QATEST Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-09-19ux500: sound: Withdraw some console tracesPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-09-19cg2900: sound: fixes due to move cg29xx driver in stagingPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-09-19Ux500 ASoC: Print-level changesOla Lilja
Remove a DORIAN-print and reviewed print-levels in the driver. No printing in association with a playback. ST-Ericsson ID: - ST-Ericsson Linux next: Not tested ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I1200b3135cb2a4a8260a0b97ff89661b9688c6e8 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24818 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Fix to merge with 4d589f631055f3d751377ba81453463138dc9120
2011-09-19Ux500 ASoC: Enhanced regulator managementPhilippe Langlais
The mic-regulators are now only taken when needed. This involves querying the codec-driver to see if the the associated DAPM-path is enabled or not. ST-Ericsson Linux next: NA ST-Ericsson ID: 337512 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I5dec05a8a4b0cdb567bd3a3301d3c50a48fab23b Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24373 Reviewed-by: QATEST Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Conflicts: sound/soc/ux500/ux500_ab8500.c
2011-09-19Ux500 ASoC: Add controls for sidetone in AB8500Ola Lilja
Controls needed for setting sidetone FIR-coeffecients has been added to the AB8500 codec-driver. ST-Ericsson ID: 328357 Change-Id: Ibe7ba8226356f8bcc2ab2dc397b34af8331bb2b8 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23999 Reviewed-by: QATEST Reviewed-by: Henrik SEGERBACK <henrik.xh.segerback@stericsson.com> Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-09-19Ux500 ASoC: Add codec-driver for AB5500Shyam Krishnan M
ST-Ericsson Linux next: Not tested ST-Ericsson ID: 332112 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Change-Id:Ic35d9290ab3d938f19b8581c8e82cbd878952f54 Signed-off-by: Shyam Krishnan M <shyam.moni@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24090 Tested-by: Hemanth P SETHURAM <hemanth.sethuram@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-09-19sound: u8500: msp: Remove v1 supportJonas Aaberg
ST-Ericsson Linux next: Not tested, ask SSM for ER ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Change-Id: I9cdae05681ec60f13cf9079a4d3b0292157da91d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24282 Reviewed-by: QATEST Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
2011-09-19Ux500 ASoC: Add controls for negative charge pumpHenrik Segerback
Adds the following ALSA controls for the negative charge pump, which provides power to the headset: Charge Pump High Threshold For Low Voltage Charge Pump Low Threshold For Low Voltage Charge Pump Envelope Detection Charge Pump Envelope Detection Decay Time ST-Ericsson ID: 337868 Change-Id: Ieecab4dc880cb4ea63e4dd4980e78879abc17bf3 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23516 Tested-by: Henrik SEGERBACK <henrik.xh.segerback@stericsson.com> Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
2011-09-19Ux500 ASoC: Reflect changes in clock-db8500.cOla Lilja
audioclk has intclk as parent. intclk has sysclk or ulpclk as parent. ASoC-driver changes intclk parent. Change-Id: I395f0d7cfa6811e148a3e43f49eb756663b46ee3 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23497 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Mattias NILSSON <mattias.i.nilsson@stericsson.com>
2011-09-19Ux500 ASoC: Dynamic audio master-clock selectPhilippe Langlais
A new control in the Ux500_AB8500 machine-driver is added to be able to switch between SYSCLK and ULPCLK. Power management-code related to clocks is also moved from the codec-driver into the machine-driver. ST-Ericsson ID: 325090 Depends On: I641c6eb243552d8d0ff4902cae8ead336fff575c Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Change-Id: I23ecbee74aeebc64a1dedd0d7c4cdab4194de24b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23500 Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: sound/soc/codecs/ab8500_audio.c sound/soc/codecs/ab8500_audio.h sound/soc/ux500/ux500_ab8500.c
2011-09-19ux500-ASoC: Update ux500 driver to use dmaengineRobert Marklund
ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I6d0b04aaa9f3e0d170cb3dd2510960f606c4435f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24728 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-09-19ux500-ASoC: Change to support ux500 soc:s in buildRobert Marklund
Change to support ux500 soc:s in the same build. ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I276df2266288c0ae95a7ad8d41bdcdce6cfde2bc Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24727 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
2011-09-19sound: soc: codec: Fix link warningsRobert Marklund
ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I9b17c8fe0bf86d19066951ae5acc6a2261a3527e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24730 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-09-19sound: soc: ux500: Fix merge problemsRobert Marklund
Fix merge problems introduced in soc u8500 driver when merging from main dev track ST-Ericsson Linux next: 342252 ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I083638dddc34792b654d36b5aa967238614799c7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24724 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-09-19Ux500 ASoC: Dynamical mapping of DA from slot settingsOla Lilja
AB8500 codec-driver now exposes controls for manually setting which DA input should be fed from what slot on the digital interface. ST-Ericsson ID: 337376 Change-Id: I2504256cd77ee1c92a09b98f84efc83633dd5bd7 Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22551 Reviewed-by: Johan BOHLIN <johan.bohlin@stericsson.com> Tested-by: Johan BOHLIN <johan.bohlin@stericsson.com> Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
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>