summaryrefslogtreecommitdiffstats
path: root/sound/soc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'asoc/topic/wm8995' into asoc-nextMark Brown2012-12-101-33/+7
|\
| * ASoC: wm8995: Convert to use devm_regmap_init_{spi,i2c}()Tushar Behera2012-11-231-23/+3
| | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * ASoC: wm8995: Convert to use devm_kzalloc()Tushar Behera2012-11-231-10/+4
| | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-nextMark Brown2012-12-104-192/+245
|\ \
| * | ASoC: wm8994: Allow microphone identification callback to be overriddenMark Brown2012-12-033-8/+22
| | | | | | | | | | | | | | | | | | | | | Allow custom accessory identification mechanisms to make use of the MICDET support in the device. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Check jack is inserted when handling mic IRQMark Brown2012-12-031-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we've got jack detection support then check that the jack is still inserted when handling a mic IRQ in order to avoid transient reports caused by shorts during the removal process as the two interrupts race with each other. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Support custom accessory identification for WM1811AMark Brown2012-12-032-17/+25
| | | | | | | | | | | | | | | | | | | | | Allow the user to override the accessory identification code with their own implementation if the system provides an alternative method. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Simplify button detection codeMark Brown2012-12-032-52/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the WM8994 driver allows the WM8958 microphone detection code to be replaced in its entirety, providing a default implementation. This doesn't actually reflect the needs of users well. They generally wish to replace only the accessory identification parts of the algorithm (eg, using an external GPIO to provide the equivalent of the JACKDET support in the WM1811A). In preparation for supporting these users better refactor the existing code so that we have separate identification and button detection callbacks, selecting between them rather than using the mic_detecting flag in the existing callback. This also simplifies the code by introducing a more explicit state machine for the detecting and button states. In anticipation of future refactoring the callback is left in the signature for wm8958_mic_detect(), it will be removed at a later stage. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Stop mic detection whenever we detect an open circuitMark Brown2012-12-031-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Jack detection will not do anything to help us detect a microphone when there is a fault in the cable and the debounce we have is enough to avoid getting an intermediate result so halt microphone detection when we detect that one is not present. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Use the same DCS codes for all WM1811 variantsMark Brown2012-11-281-14/+2
| | | | | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
| * | ASoC: wm8994: Use pdata cached in MFD driverMark Brown2012-11-243-48/+51
| | | | | | | | | | | | | | | | | | | | | This is better style and facilitates implementation of device tree support for the driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Lower AIFnCLK divisor when dropping to 32kHzMark Brown2012-11-221-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | When lowering SYSCLK to 50kHz for accessory detection also lower the AIFnCLK divisor to normalise the clocking configuration within the device. This will not disrupt audio as we cannot support active audio with such a low SYSCLK. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Lower AIFnCLK divisor when dropping to 32kHzMark Brown2012-10-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | When lowering SYSCLK to 50kHz for accessory detection also lower the AIFnCLK divisor to normalise the clocking configuration within the device. This will not disrupt audio as we cannot support active audio with such a low SYSCLK. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8958: Load firmwares simultaneouslyMark Brown2012-10-151-20/+11
| | | | | | | | | | | | | | | | | | | | | | | | As of commit 99c2aa (firmware loader: fix creation failure of fw loader device) we can have more than one firmware request outstanding at once so there is no need to daisychain our requests any more. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Tune VMID power down sequenceMark Brown2012-10-151-18/+4
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Tune VMID power up sequenceMark Brown2012-10-151-2/+2
| | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | ASoC: wm8994: Allow a delay between jack insertion and microphone detectMark Brown2012-10-151-19/+55
| | | | | | | | | | | | | | | | | | | | | | | | This can be used to provide some additional settling time to ensure that we don't start microphone detection while the microphone pin is connected to one of the headphone pins. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | Merge remote-tracking branch 'asoc/topic/wm8993' into asoc-nextMark Brown2012-12-101-10/+4
|\ \ \
| * | | ASoC: wm8993: Use devm_regmap_init_i2c()Sachin Kamat2012-12-021-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | ASoC: wm8993: Use devm_regulator_bulk_getSachin Kamat2012-11-281-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devm_regulator_bulk_get() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | Merge remote-tracking branch 'asoc/topic/wm8988' into asoc-nextMark Brown2012-12-101-12/+2
|\ \ \ \
| * | | | ASoC: wm8988: Convert to use devm_regmap_init_{spi,i2c}()Tushar Behera2012-11-231-12/+2
| | |_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-nextMark Brown2012-12-101-26/+4
|\ \ \ \
| * | | | ASoC: wm8985: Convert to use devm_regmap_init_{spi,i2c}()Tushar Behera2012-11-231-26/+4
| |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | Merge remote-tracking branch 'asoc/topic/wm8978' into asoc-nextMark Brown2012-12-101-13/+3
|\ \ \ \
| * | | | ASoC: wm8978: Use devm_regmap_init_i2c()Sachin Kamat2012-12-021-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | ASoC: wm8978: Remove remuxing of GPIO1 pinEric Millbrandt2012-11-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remuxing GPIO1. Leave control of this up to the platform device. Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8971' into asoc-nextMark Brown2012-12-101-19/+61
|\ \ \ \ \
| * | | | | ASoC: wm8971: Convert to direct regmap API usageMark Brown2012-10-151-19/+61
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown2012-12-101-16/+8
|\ \ \ \ \
| * | | | | ASoC: wm8962: Use devm_regmap_init_i2c()Sachin Kamat2012-12-021-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: wm8962: Use devm_regulator_bulk_getSachin Kamat2012-11-281-5/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devm_regulator_bulk_get() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-nextMark Brown2012-12-101-1/+1
|\ \ \ \ \
| * | | | | ASoC: wm8960: Use devm_regmap_init_i2c()Sachin Kamat2012-12-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. There was no explicit regmap_exit call in this function which was probably a bug. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8955' into asoc-nextMark Brown2012-12-101-10/+1
|\ \ \ \ \
| * | | | | ASoC: wm8955: Use devm_regmap_init_i2c()Sachin Kamat2012-12-021-10/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-nextMark Brown2012-12-101-15/+2
|\ \ \ \ \
| * | | | | ASoC: wm8804: Convert to use devm_regmap_init_{spi,i2c}()Tushar Behera2012-11-231-15/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8770' into asoc-nextMark Brown2012-12-101-110/+107
|\ \ \ \ \
| * | | | | ASoC: wm8770: Conver to table based DAPM and control initMark Brown2012-10-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: wm8770: Remove regulator allocation to SPI probeMark Brown2012-10-151-46/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more idiomatic and ensures we don't try to do the ASoC card setup until we've got all the required resources. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: wm8770: Remove unneeded bias level manipulationMark Brown2012-10-151-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the device is now idle_bias_off these never have any useful effect, the device will be brought to _OFF when idle, and will at best leave it powered for longer. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: wm8770: Convert to direct regmap API usageMark Brown2012-10-151-35/+65
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-nextMark Brown2012-12-101-27/+6
|\ \ \ \ \
| * | | | | ASoC: wm8753: Convert to use devm_regmap_init_{spi,i2c}()Tushar Behera2012-11-231-26/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: wm8753: remove invalid free of devm_ allocated dataTushar Behera2012-11-231-1/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes following warning. sound/soc/codecs/wm8753.c:1594:1-6: WARNING: invalid free of devm_ allocated data Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8750' into asoc-nextMark Brown2012-12-101-20/+66
|\ \ \ \ \
| * | | | | ASoC: wm8750: Convert to direct regmap API usageMark Brown2012-10-151-20/+66
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-nextMark Brown2012-12-101-2/+2
|\ \ \ \ \
| * | | | | ASoC: wm8741: Convert to use devm_regmap_init_{spi,i2c}()Tushar Behera2012-11-231-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
OpenPOWER on IntegriCloud