aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-07-01ASoC: ak4642: Add Digital Playback Volume controlKuninori Morimoto1-3/+21
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-30ASoC: uda134x: correct bias level setup for codecs familyVladimir Zapolskiy1-4/+32
For UDA1341 codec power control is managed in STATUS1 register, and for all other codecs in DATA011 register. Signed-off-by: Vladimir Zapolskiy <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-30ASoC: uda134x: add DATA011 register found in codecs familyVladimir Zapolskiy2-3/+5
In UDA1340, UDA1344 and UDA1345 codecs there is one more functional register in part of DATA0 tranfser. For UDA1341 this register coincides with EA register. Signed-off-by: Vladimir Zapolskiy <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-30Merge remote branch 'takashi/topic/asoc' into for-2.6.36Mark Brown3-32/+84
2010-06-25ASoC: clean i.MX KconfigEric Bénard1-8/+6
Signed-off-by: Eric Bénard <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-25ASoC: uda134x: fix bias level setup on initializationVladimir Zapolskiy1-4/+8
On initialization ADC/DAC are enabled only for UDA1341, that's why bias_level shall be set to off explicitly, otherwise dapm is misinformed about bias_level on startup. Signed-off-by: Vladimir Zapolskiy <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-25ASoC: uda134x: replace a macro with a value in platform struct.Vladimir Zapolskiy2-16/+17
This change wipes out a hardcoded macro, which enables codec bias level control. Now is_powered_on_standby value shall be used instead. Signed-off-by: Vladimir Zapolskiy <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-24Merge branch 'for-2.6.36' of ↵Takashi Iwai3-32/+84
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
2010-06-23ASoC: RX-51: Add basic jack detectionJarkko Nikula1-1/+28
This patch adds GPIO jack detection to Nokia N900/RX-51. At the moment only SND_JACK_VIDEOOUT type is reported. More types could be reported after getting more audio features supported and necessary drivers integrated for implementing automated accessory detection. Signed-off-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-23ASoC: RX-51: Add Jack Function kcontrolJarkko Nikula1-0/+44
Nokia RX-51/N900 has multifunction 4-pole audio-video jack that can be used as headphone, headset or audio-video connector. This patch implements the control 'Jack Function' which is used to select the desired function. At the moment only TV-out without audio is supported. Signed-off-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-23codecs/tlv320aic23: fix bias management for suspend/resumeEric Bénard1-3/+4
in tlv320aic23_set_bias_level, for the case SND_SOC_BIAS_ON, the comment says "vref/mid, osc on, dac unmute" but the code doesn't clear the corresponding bits, thus when resuming, several bits are not cleared preventing the codec from working. in tlv320aic23_suspend, clearing the active register is not needed as it will be done by tlv320aic23_set_bias_level, when setting bias to SND_SOC_BIAS_OFF Signed-off-by: Eric Bénard <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-23ASoC: JZ4740: Add qi_lb60 board driverLars-Peter Clausen3-0/+179
This patch adds ASoC support for the qi_lb60 board. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-23ASoC: Add JZ4740 codec driverLars-Peter Clausen4-0/+537
This patch adds support for the JZ4740 internal codec. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-23ASoC: Add JZ4740 ASoC supportLars-Peter Clausen8-0/+978
This patch adds ASoC support for JZ4740 SoCs I2S module. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-21ASoC: pandora: fix CLKX polarityGrazvydas Ignotas1-28/+8
After mass production started it was found that several boards exhibit noise problems during sound playback. After some investigation it was determined that CLKX polarity is set incorrectly, and even if most boards can tolerate the wrong setting, there are some that don't. Fix polarity setup in the board file. As the clock settings for input and output now match, merge in and out functions and structures to simplify code. Signed-off-by: Grazvydas Ignotas <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-20ASoC: Fix sorting of DA7210 entries in KconfigMark Brown1-4/+4
Signed-off-by: Mark Brown <[email protected]>
2010-06-19ASoC: Fix overflow bug in SOC_DOUBLE_R_SX_TLVStuart Longland1-2/+2
When SX_TLV widgets are read, if the gain is set to a value below 0dB, the mixer control is erroniously read as being at maximum volume. The value read out of the CODEC register is never sign-extended, and when the minimum value is subtracted (read; added, since the minimum is negative) the result is a number greater than the maximum allowed value for the control, and hence it saturates. Solution: Mask the result so that it "wraps around", emulating sign-extension. Signed-off-by: Stuart Longland <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-18ASoC: eukrea-tlv320: add support for our i.MX25 boardEric Bénard2-2/+3
* tdm slot has to be configured to get sound working on i.MX25 Signed-off-by: Eric Bénard <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-16ASoC: Fix I2C dependency for SND_FSI_AK4642 and SND_FSI_DA7210Peter Huewe1-2/+2
The config option SND_FSI_AK4642 selects SND_SOC_AK4642 which in turn enables the compilation of ak4642.c - however this codec uses I2C to communicate with the HW. Same applies to DA7210. Consequently when I2C is not set, the compilation fails [1] This patch fixes this issues, by adding a depencdency on the related HW- controller. Signed-off-by: Peter Huewe <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-16ASoC: Pay attention to write errors in volsw_2r_sxMark Brown1-4/+2
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2010-06-15ASoC: Default WM2000 ANC and speaker to enabledMark Brown1-0/+2
The most useful configuration for the WM2000 is to enable the ANC so turn that on by default, and since we're not reflecting chip default state also enable the speaker output by default. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2010-06-15Merge branch 'for-2.6.35' into for-2.6.36Mark Brown1-2/+0
2010-06-15ASoC: DaVinci: Fix McASP hardware FIFO configurationSudhakar Rajashekhara1-2/+0
On DA830/OMAP-L137 and DA850/OMAP-L138 SoCs, the McASP peripheral has FIFO support. This FIFO provides additional data buffering. It also provides tolerance to variation in host/DMA controller response times. More details of the FIFO operation can be found at http://focus.ti.com/general/docs/lit/getliterature.tsp?literatureNumber=sprufm1&fileType=pdf Existing sequence of steps for audio playback/capture are: a. DMA configuration b. McASP configuration (configures and enables FIFO) c. Start DMA d. Start McASP (enables FIFO) During McASP configuration, while FIFO was being configured, FIFO was being enabled in davinci_hw_common_param() function of sound/soc/davinci/davinci-mcasp.c file. This generated a transmit DMA event, which gets serviced when DMA is started. https://patchwork.kernel.org/patch/84611/ patch clears the DMA events before starting DMA, which is the right thing to do. But this resulted in a state where DMA was waiting for an event from McASP (after step c above), but the event which was already there, has got cleared (because of step b above). The fix is not to enable the FIFO during McASP configuration as FIFO was being enabled as part of McASP start. Signed-off-by: Sudhakar Rajashekhara <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-15ASoC: header cleanup for da7210Kuninori Morimoto1-9/+0
Signed-off-by: Kuninori Morimoto <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-15ASoC: header cleanup for ak4642Kuninori Morimoto1-8/+0
Signed-off-by: Kuninori Morimoto <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-15ASoC: header cleanup for FSI-DA7210Kuninori Morimoto1-9/+0
Signed-off-by: Kuninori Morimoto <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-15ASoC: header cleanup for FSI-AK4642Kuninori Morimoto1-9/+0
Signed-off-by: Kuninori Morimoto <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-15ASoC: header cleanup for FSIKuninori Morimoto1-9/+0
Signed-off-by: Kuninori Morimoto <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-12ASoC: Remove unused header from MPC5200 PSC driverGrant Likely2-13/+0
The header contains an extern that isn't used by anything. Remove. Signed-off-by: Grant Likely <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-10ASoC: NUC900: patch for fix build errorWan ZongShun2-2/+2
This patch is to change 'auido.h' to 'audio.h' for fixing nuc900 alsa driver build error. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-09ASoC: EP93xx: Add Snapper CL15 i2s audio supportRyan Mallon4-0/+163
Add support for i2s audio on Bluewater Systems Snapper CL15 module Signed-off-by: Ryan Mallon <[email protected]> Acked-by: H Hartley Sweeten <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-09Merge branch 'ep93xx' into for-2.6.36Mark Brown4-1/+146
Trivial add/add fixup required in the clock table. Conflicts: arch/arm/mach-ep93xx/clock.c
2010-06-09EP93xx: Add i2s core supportRyan Mallon4-1/+146
Add core support for EP93xx i2s audio Signed-off-by: Ryan Mallon <[email protected]> Acked-by: H Hartley Sweeten <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-07Merge branch 'for-2.6.36' of ↵Takashi Iwai24-79/+1080
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
2010-06-07ASoC: patch for the useless 'break' removal in kirkwoodWan ZongShun1-1/+0
This patch to remove the 'break;', when the 'switch' jumps to the 'default' branch, the 'return -EINVAL' will be return with a error number, so the 'break;' code never be run, it is unuseful and should be removed here. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-07ASoC: atmel: trivial code cleanupWan ZongShun1-1/+0
Remove break after return, it is not needed. Signed-off-by: Wan ZongShun <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-07ASoC: ep93xx i2s audio driverRyan Mallon8-0/+865
Add ep93xx i2s audio driver Signed-off-by: Ryan Mallon <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-07ASoC: tlv320dac33: Add support for changing upper thresholdPeter Ujfalusi1-9/+48
Upper threshold is used in mode7 of DAC33. Instead of hard wired UTHR, add control to change the upper threshold value. Changing upper threshold is not allowed when the playback is already running, since wrongly timed change in the UTHR can cause problems with the codec. With this control the length of the burst in mode7 can be changed. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-03ASoC: imx: add eukrea-tlv320Eric Bénard3-0/+146
Add the necessary files to support the TLV320AIC23B wired in I2S on our i.MX platforms. Signed-off-by: Eric Bénard <[email protected]> Acked-by: Sascha Hauer <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2010-06-03ASoC: imx-ssi.c: add new choices to platform configurationEric Bénard2-2/+12
* introduce 3 new flags to allow a more detailed configuration of the SSI link : IMX_SSI_NET : enable Network Mode IMX_SSI_SYN : enable Synchronous Mode IMX_SSI_USE_I2S_SLAVE : enable I2S Slave Mode * new platform can use these settings without breaking actual platforms. Signed-off-by: Eric Bénard <[email protected]> Acked-by: Sascha Hauer <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-03ASoC: s3c: patch for the unnecessary variable 'state' removalWan ZongShun1-1/+0
The variable 'state' of structure 's3c_ac97_info' seems no use here, so this patch is to remove the unnecessary variable. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-03ASoC: atmel: patch for the unnecessary variable removalWan ZongShun1-1/+0
The variable 'periods' of structure 'atmel_runtime_data' seems no use in whole atmel alsa driver,so I make a patch to remove the unnecessary variable. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-03ASoC: use resource_size for au1xWan ZongShun3-17/+10
Use the resource_size function instead of manually calculating the resource size.This patch can reduce the chance of introducing off-by-one errors. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Manuel Lauss <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-03ASoC: omap-mcbsp: Place correct constraints for streamsPeter Ujfalusi1-21/+77
OMAP McBSP FIFO is word structured: McBSP2 has 1024 + 256 = 1280 word long buffer, McBSP1,3,4,5 has 128 word long buffer This means, that the size of the FIFO depends on the McBSP word size configuration. For example on McBSP3: 16bit samples: size is 128 * 2 = 256 bytes 32bit samples: size is 128 * 4 = 512 bytes It is simpler to place constraint for buffer and period based on channels. McBSP3 as example again (16 or 32 bit samples): 1 channel (mono): size is 128 frames (128 words) 2 channels (stereo): size is 128 / 2 = 64 frames (2 * 64 words) 4 channels: size is 128 / 4 = 32 frames (4 * 32 words) Use the second method to place hw_rule on buffer size, and in threshold mode to period size. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-03ASoC: omap-mcbsp: Save, and use wlen for threshold configurationPeter Ujfalusi1-5/+9
Save the word length configuration of McBSP, and use that information to calculate, and configure the threshold in McBSP. Previously the calculation was only correct when the stream had 16bit audio. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-03OMAP3: McBSP: Use the port's buffer_size when calculating tx delayPeter Ujfalusi1-6/+1
Sicne the platform data's buffer_size now holds the full size of the FIFO, there is no longer need to handle the ports differently. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-03OMAP3: McBSP: Change the way how the FIFO is handledPeter Ujfalusi2-15/+25
Use the actual FIFO size in words as buffer_size on OMAP3. Change the threshold configuration to use 1 based numbering, when specifying the allowed threshold maximum or the McBSP threshold value. Set the default maximum threshold to (buffer_size - 0x10) intialy. >From users of McBSP, now it is expected to use this method. Asking for threshold 1 means that the value written to threshold registers are going to be 0, which means 1 word threshold. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-03OMAP: McBSP: Function to query the FIFO sizePeter Ujfalusi2-0/+16
Users of McBSP can use the omap_mcbsp_get_fifo_size function to query the size of the McBSP FIFO. The function will return the FIFO size in words (the HW maximum). Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-06-02ASoC: s6000: use resource_size for {request/release}_mem_region and ioremapWan ZongShun1-21/+17
The size calculation is end - start + 1. But,sometimes, the '1' can be forgotten carelessly, witch will have potential risk, so use resource_size for {request/release}_mem_region and ioremap here should be good habit. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Daniel Glöckner <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-06-02Merge branch 'for-2.6.35' of ↵Takashi Iwai1-1/+10
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc