aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-03ASoC: Check for a CODEC before dereferencing in DAPMMark Brown1-3/+3
A CODEC pointer is optional (and is checked for in most contexts within DAPM) - add checks to the few places where it was missed. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-03-03ASoC: Get the card directly from the DAPM contextMark Brown1-4/+4
Rather than indirecting through the CODEC we can look the card up directly from the card pointer in the DAPM context. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-03-03ASoC: Add TLV information for WM8978 DAC limiterMark Brown1-2/+3
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-03-03Merge branch 'for-2.6.38' into for-2.6.39Mark Brown1-6/+8
2011-03-03ASoC: Fix broken bitfield definitions in WM8978Mark Brown1-6/+8
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]> Cc: [email protected]
2011-03-03ASoC: WM8994: Ensure MICBIAS is provided with a clockDimitris Papastamos1-0/+13
The patch 'ASoC: WM8994: Improve Playback Robustness' did not handle this case properly. Signed-off-by: Dimitris Papastamos <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-03-01ASoC: Add platform data for WM9081 IRQ pin configurationMark Brown2-13/+25
The WM9081 IRQ output can be either active high or active low and can support either CMOS or open drain modes. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-03-01ASoC: Remove module probe announcements from CODEC driversMark Brown2-3/+0
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-03-01ASoC: Fix burstsize and DSP_B format problems in imx-ssi.Javier Martin1-1/+4
When choosing IMX_DMA flag, burtsizes are set to its default value (0) which leads to driver malfunction. Change them to 4. DSP_B interface needs additional flag to match DSP_B formats as described in several codecs as wm8741 and aic3205. Signed-off-by: Javier Martin <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-03-01ASoC: WM8994: Ensure MICBIAS is provided with a clockDimitris Papastamos1-0/+13
The patch 'ASoC: WM8994: Improve Playback Robustness' did not handle this case properly. Signed-off-by: Dimitris Papastamos <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-03-01Merge branch 'for-2.6.38' into for-2.6.39Mark Brown2-9/+47
2011-03-01ASoC: WM8994: Ensure late enable events are processed for the ADCsDimitris Papastamos1-3/+23
Ensure that the ADCs are provided with a clock as the previous patch "ASoC: WM8994: Improve playback robustness" did not handle this case properly. Signed-off-by: Dimitris Papastamos <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2011-03-01ASoC: WM8994: Don't disable the AIF[1|2]CLK_ENA unconditionalyDimitris Papastamos1-6/+19
Since we began using the late clock disable functionality, ensure that we don't disable the clock if any of the ADC or DAC paths are still enabled. This happens when we have simultaneous playback and recording. Signed-off-by: Dimitris Papastamos <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2011-03-01ASoC: Fix WM9081 platform data initialisationMark Brown1-0/+5
It went AWOL in the multi-component conversion. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]> Cc: [email protected]
2011-02-28ASoC: Tegra: Fix error handling in DMA channel allocStephen Warren1-2/+2
tegra_dma_allocate_channel() returns NULL on errors, not an error pointer. Signed-off-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-28ASoC: Staticise non-exported symbols in SGTL5000Mark Brown1-3/+3
Signed-off-by: Mark Brown <[email protected]>
2011-02-28ASoC: remove unnecessary header including in SGTL5000 codec driverZeng Zhaoming2-3/+0
Remove unnecessary headers: - mach/hardware.h in sgtl5000.c - linux/i2c.h in sgtl5000.h Signed-off-by: Zeng Zhaoming <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-26Merge branch 'for-2.6.38' into for-2.6.39Mark Brown1-1/+1
2011-02-25ASoC: eukrea-tlv320: add MBIMXSD51 supportEric Bénard2-2/+4
Signed-off-by: Eric Bénard <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-25ASoC: Move WM2000 to dev_pm_opsMark Brown1-7/+7
There's a general move to use dev_pm_ops rather than bus specific functions in order to facilitate work on the PM core. Do this conversion to WM2000. The driver ought to be updated to work better in a multi-component model but the mechanical conversion ensures that we avoid blocking PM core work until that happens. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-25eukrea-tlv320: fix platform_nameEric Bénard1-1/+1
commit f0fba2ad1b6b53d5360125c41953b7afcd6deff0 included a mistake on the name of the platform in the snd_soc_dai_link structure. Signed-off-by: Eric Bénard <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2011-02-25ASoC: Add Freescale SGTL5000 codec supportZeng Zhaoming4-0/+1921
Add Freescale SGTL5000 codec support. Supported features: - line-in and mic input - headphone and line-out output - line-in bypass ADC and DAC to headphone - 16, 20, 24, 32 bit audio - 8 ~ 96k sample rates Signed-off-by: Zeng Zhaoming <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-25ASoC: remove one to many l's in the wordJustin P. Mattock1-1/+1
The patch below removes an extra "l" in the word. Signed-off-by: Justin P. Mattock <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-25Merge branch 'for-2.6.38' into for-2.6.39Mark Brown8-16/+16
2011-02-25ASoC: Tegra: Move utilities to separate moduleStephen Warren2-1/+8
The utilities will be required by every machine driver. Including the utility object directly into every machine driver causes a build failure if the modules are actually built into the kernel, since each will define the symbols exported by the utility file. Solve this by moving the utility object into a separate module. Signed-off-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-25ASoC: soc-dapm: Include quotes around contents in debugfs entriesDimitris Papastamos1-2/+2
Sometimes the name of the control switch of a dapm route contains spaces which makes it impossible to distinguish it from the source widget. Add quotes around the names of the widgets to makes these parsable. Signed-off-by: Dimitris Papastamos <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-25ASoC: Remove -codec suffix from WM9081 driverMark Brown1-1/+1
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-25ASoC: correct pxa AC97 DAI namesDmitry Eremin-Solenikov8-16/+16
Correct names for pxa AC97 DAI are pxa2xx-ac97 and pxa2xx-ac97-aux. Fix that for all PXA platforms. Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2011-02-24ASoC: Pass the jack to jack notifiersMark Brown1-1/+1
We're currently not passing anything and this will make the card and so on more discoverable. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Simplify default WM8958 jack detection codeMark Brown1-34/+4
The default WM8958 jack detection handler implements a full set of buttons and also support for video detection. Support for multi-button jacks is fairly system specific and will usually require some tuning for headsets so simplify the implementation to only report a simple short to ground button, leaving multi-button headsets to be handled by system specific code. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Support configuration of WM8958 microphone bias analogue parametersMark Brown3-2/+14
The WM8958 has a different microphone bias architecture to WM8994 so needs different configuration to WM8994. Support this in platform data. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Support WM8958 direct microphone detection IRQMark Brown2-22/+40
Allow direct routing of the WM8958 microphone detection signal to a GPIO to be used, saving the need to demux the interrupt. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Mark WM8958 microphone bias registers as readableMark Brown1-2/+2
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Run bias level changes for all DAPM contexts in parallelMark Brown1-51/+67
As bias level changes can be quite time consuming and the bias changes for multiple devices aren't strongly tied to each other (if anything it can be advantageous to bring different devices up together) we can improve the state transition time for multi-component systems by running the bias level changes for all the devices in parallel. This is very simple to achieve using the kernel async functionality so use that to schedule the work. This should have no practical effect for the overwhelming majority of systems which have a single DAPM context - we'll bounce into another thread to do the bias level change but otherwise everything will happen in exactly the same order as it did before. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Remove card from snd_soc_dapm_set_bias_level()Mark Brown1-11/+11
We can get the card from the DAPM context so don't bother passing it as an argument. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22Merge branch 'for-2.6.38' into for-2.6.39Mark Brown2-4/+3
2011-02-22ASoC: Hook wm_hubs micbiases up to CLK_SYSMark Brown1-0/+3
The microphone detection functionality requires a clock to work. In any non-detection case where the MICBIAS is enabled CLK_SYS will be needed anyway so there is no negative impact on power consumption. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Correct definition of WM8903_VMID_RES_5KMark Brown1-1/+1
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: Fix WM8958 default microphone detection argument orderingMark Brown1-3/+2
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-22ASoC: omap: rx51: Add FM transmitter supportJarkko Nikula1-0/+4
Si4713 FM transmitter on Nokia RX-51/N900 is connected to same Line out signals of TLV320AIC34 than TPA6130 headphone amplifier. This patch adds route to transmitter and "FM Transmitter" control to keep route active when needed. Signed-off-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Peter Ujfalusi <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2011-02-18ASoC: Hook wm_hubs micbiases up to CLK_SYSMark Brown1-0/+3
The microphone detection functionality requires a clock to work. In any non-detection case where the MICBIAS is enabled CLK_SYS will be needed anyway so there is no negative impact on power consumption. Signed-off-by: Mark Brown <[email protected]>
2011-02-18ASoC: Mark WM8958 microphone detection registers readableMark Brown1-3/+3
So they show up in codec_reg. Signed-off-by: Mark Brown <[email protected]>
2011-02-18ASoC: Add kerneldoc for jack_status_check callbackMark Brown1-0/+3
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-18ASoC: Allow GPIO jack detection to be configured as a wake sourceMark Brown2-0/+11
Some systems wish to use jacks as wake sources. Provide a wake flag in the GPIO configuration which causes the driver to enable the IRQ as a wake source. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-18ASoC: Log wm_hubs DC servo operation code when reporting a timeoutMark Brown1-1/+2
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-18ASoC: Remove export of snd_soc_dapm_stream_event()Mark Brown1-1/+0
The only thing that should ever be calling this is soc-core and that is built as part of the same module so doesn't need the export. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-18ASoC: Fix missing space in WM8994Mark Brown1-1/+1
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-02-15ASoC: sst_platform: fix the pulseaudio errorVinod Koul1-0/+9
Pulseaudio doesnt work with current driver and it was root caused to absense of hw_params function and malloc_pages in it. This patch adds this and allows pa to work fine with these drivers Signed-off-by: Vinod Koul <[email protected]> Signed-off-by: Harsha Priya <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-15ASoC: mfld_machine: make use of soc_register_card APIVinod Koul1-14/+6
This patch removes the old method of soc-audio device creation in mfld machine and makes use of new soc_register_card API to register the card Signed-off-by: Vinod Koul <[email protected]> Signed-off-by: Harsha Priya <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-02-15ASoC: sn95031: fix the amic tlv scaleVinod Koul1-1/+1
The tlv scale is defined as (min, step, mute). The mute is not supported here so put the value to 0 Signed-off-by: Vinod Koul <[email protected]> Signed-off-by: Harsha Priya <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>