aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '85ce022' into HEADKalimochoAz2012-10-141-1/+1
|\
| * ASoC: wm9712: Fix name of Capture SwitchMark Brown2012-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | commit 689185b78ba6fbe0042f662a468b5565909dff7a upstream. Help UIs associate it with the matching gain control. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge remote-tracking branch 'korg/linux-3.0.y' into HEADKalimochoAz2012-09-161-2/+17
|\ \ | |/
| * ASoC: wm9712: Fix microphone source selectionMark Brown2012-09-141-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ccf795847a38235ee4a56a24129ce75147d6ba8f upstream. Currently the microphone input source is not selectable as while there is a DAPM widget it's not connected to anything so it won't be properly instantiated. Add something more correct for the input structure to get things going, even though it's not hooked into the rest of the routing map and so won't actually achieve anything except allowing the relevant register bits to be written. Reported-by: Christop Fritz <chf.fritz@googlemail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-08-302-1/+4
|\ \ | |/ | | | | | | Conflicts: drivers/net/tun.c
| * ASoC: wm8994: Ensure there are enough BCLKs for four channelsMark Brown2012-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | commit b8edf3e5522735c8ce78b81845f7a1a2d4a08626 upstream. Otherwise if someone tries to use all four channels on AIF1 with the device in master mode we won't be able to clock out all the data. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * ASoC: wm8962: Allow VMID time to fully rampMark Brown2012-08-091-0/+3
| | | | | | | | | | | | | | | | | | | | commit 9d40e5582c9c4cfb6977ba2a0ca9c2ed82c56f21 upstream. Required for reliable power up from cold. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-07-272-3/+2
|\ \ | |/ | | | | | | Conflicts: arch/arm/kernel/smp.c
| * ASoC: tlv320aic3x: Fix codec pll configure bugHebbar, Gururaja2012-07-162-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c9fe573a6584034670c1a55ee8162d623519cbbf upstream. In sound/soc/codecs/tlv320aic3x.c data = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); snd_soc_write(codec, AIC3X_PLL_PROGA_REG, data | (pll_p << PLLP_SHIFT)); In the above code, pll-p value is OR'ed with previous value without clearing it. Bug is not seen if pll-p value doesn't change across Sampling frequency. However on some platforms (like AM335x EVM-SK), pll-p may have different values across different sampling frequencies. In such case, above code configures the pll with a wrong value. Because of this bug, when a audio stream is played with pll value different from previous stream, audio is heard as differently(like its stretched). Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Restore voodoo sysfs filenameKalimochoAz2012-05-021-2/+2
| | | | | | | | | | | | Since pawitp cleaned DSPManager and is allowing living supercurio app that can be merged as soon as we merge: http://review.cyanogenmod.com/#/c/15245/1
* | Merge branch 'linux-3.0.y' into icsKalimochoAz2012-04-181-1/+1
|\ \ | |/
| * ASoC: ak4642: fixup: mute needs +1 stepKuninori Morimoto2012-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 1f99e44cf059d2ed43c5a0724fa738b83800f725 upstream. ak4642 out_tlv is +12.0dB to -115.0 dB, and it supports mute. But current settings didn't care +1 step for mute. This patch adds it Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'linux-3.0.y' into cm.icsKalimochoAz2012-03-011-1/+1
|\ \ | |/
| * ASoC: wm8962: Fix sidetone enumeration textsMark Brown2012-02-291-1/+1
| | | | | | | | | | | | | | | | | | | | commit 31794bc37bf2db84f085da52b72bfba65739b2d2 upstream. The sidetone enumeration texts have left and right swapped. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'linux-3.0.y' into cm.ics.newKalimochoAz2012-02-202-9/+15
|\ \ | |/ | | | | | | Conflicts: mm/compaction.c
| * ASoC: wm8962: Fix word length configurationSusan Gao2012-02-131-3/+3
| | | | | | | | | | | | | | | | | | commit 2b6712b19531e22455e7fa18371c5ba9eec76699 upstream. Signed-off-by: Susan Gao <sgao@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * ASoC: wm_hubs: Correct line input to line output 2 pathsMark Brown2012-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | commit 43b6cec27e1e50a1de3eff47e66e502f3fe7e66e upstream. The second line output mixer has the controls for the line input bypasses in the opposite order. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * ASoC: wm_hubs: Fix routing of input PGAs to line output mixerMark Brown2012-02-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | commit ee76744c51ec342df9822b4a85dbbfc3887b6d60 upstream. IN1L/R is routed to both line output mixers, we don't route IN1 to LINEOUT1 and IN2 to LINEOUT2. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * ASoC: wm_hubs: fix wrong bits for LINEOUT2 N/P mixerUK KIM2012-02-131-2/+2
| | | | | | | | | | | | | | | | | | commit 114395c61ad2eb5a7a5cd163fcadb2414e48245a upstream. Signed-off-by: UK KIM <w0806.kim@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * ASoC: wm_hubs: Enable line out VMID buffer for single ended line outputsMark Brown2012-02-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | commit 77231abe55433aa17eca712718745275853fa66d upstream. For optimal performance the single ended line outputs require that the line output VMID buffer be enabled. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Merge branch 'linux-3.0.update' into cm.ics.newKalimochoAz2012-02-1110-36/+54
|\ \ | |/
| * ASoC: Ensure WM8731 register cache is synced when resuming from disabledMark Brown2011-12-091-0/+1
| | | | | | | | | | | | | | | | commit ed3e80c4c991a52f9fce3421536a78e331ae0949 upstream. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: wm8753: Skip noop reconfiguration of DAI modeTimo Juhani Lindfors2011-12-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2391a0e06789a3f1718dee30b282562f7ed28c87 upstream. This patch makes it possible to set DAI mode to its currently applied value even if codec is active. This is necessary to allow aplay -t raw -r 44100 -f S16_LE -c 2 < /dev/urandom & alsactl store -f backup.state alsactl restore -f backup.state to work without returning errors. This patch is based on a patch sent by Klaus Kurzmann <mok@fluxnetz.de>. Signed-off-by: Timo Juhani Lindfors <timo.lindfors@iki.fi> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: Don't use wm8994->control_data in wm8994_readable_register()Mark Brown2011-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | commit 8eeea521d9d0fa6afd62df8c6e6566ee946117fa upstream. The field is no longer initialised so this will crash if running on wm8958. Reported-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: Ensure the WM8962 oscillator and PLLs start up disabledMark Brown2011-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | commit 2af8de8c39cf58e5a5e40a9d5d71332da98e6ba7 upstream. Since there is no current software control for these they would otherwise be left enabled, consuming power. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: Ensure WM8962 PLL registers are resetMark Brown2011-11-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | commit 4f4488abc97c1c27ff029f887944e6a6da1f5733 upstream. The WM8962 has a separate software reset for the PLL registers. Ensure that these are reset also on startup. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: WM8904: Set `invert' bit for Capture SwitchHong Xu2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | commit 5a7c5f26df3c0122814dfa1c13ef6dfbdbffdb86 upstream. Set `invert' bit for Capture Switch. Otherwise analogue is muted when Capture Switch is ON. Signed-off-by: Hong Xu <hong.xu@atmel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmtAxel Lin2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d558cfc30064a97c2c65dbd2b3a4f5a1dea7ec1b upstream. Current implementation in wm8711_set_dai_fmt always clear BIT[3:2] (the Input Audio Data Bit Length Select) of WM8711_IFACE(07h) register. Input Audio Data Bit Length Select bits are set by wm8711_hw_params, we should leave BIT[3:2] untouched in wm8711_set_dai_fmt. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: wm8711: Fix wrong mask for setting input audio data bit length selectAxel Lin2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 04c57163c8edfbc50e022737014069998ba4fc5f upstream. The Input Audio Data Bit Length Select is controlled by BIT[3:2] of WM8711_IFACE(07h) register. Current code incorrectly masks BIT[1:0] which is for Audio Data Format Select. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: Fix a bug in WM8962 DSP_A and DSP_B settingsSusan Gao2011-11-111-2/+2
| | | | | | | | | | | | | | | | | | commit fbc7c62a3ff831aef24894b7982cd1adb2b7e070 upstream. Signed-off-by: Susan Gao <sgao@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmico.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: Remove direct register cache accesses from WM8962 driverMark Brown2011-11-111-10/+11
| | | | | | | | | | | | | | | | | | | | commit 38f3f31a0a797bdbcc0cdb12553bbecc2f9a91c4 upstream. Also fix return values for speaker switch updates. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 CaptureAxel Lin2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | commit 35024f4922f7b271e7529673413889aa3d51c5fc upstream. Signed-off-by: Axel Lin <axel.lin@gmail.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>
| * ASoC: ak4535: fixup cache register tableAxel Lin2011-11-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | commit 7c04241acbdaf97f1448dcccd27ea0fcd1a57684 upstream. ak4535_reg should be 8bit, but cache table is defined as 16bit. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: ak4642: fixup cache register tableKuninori Morimoto2011-11-111-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | commit 19b115e523208a926813751aac8934cf3fc6085e upstream. ak4642 register was 8bit, but cache table was defined as 16bit. ak4642 doesn't work correctry without this patch. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ASoC: wm8741: Fix setting interface format for DSP modesAxel Lin2011-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3a340104fad6ecbea5ad6792a2ea855f0507a6e0 upstream. According to the datasheet: Format Control (05h) BITS[3:2] FMT[1:0] Audio data format selection 00 = right justified mode 01 = left justified mode 10 = I2S mode 11 = DSP mode BIT[4] LRP Polarity selec for LRCLK/DSP mode select 0 = normal LRCLK poalrity/DSP mode A 1 = inverted LRCLK poarity/DSP mode B For SND_SOC_DAIFMT_DSP_A, we should set 0x000C instead of 0x0003. For SND_SOC_DAIFMT_DSP_B, we should set 0x001C instead of 0x0013. Signed-off-by: Axel Lin <axel.lin@gmail.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>
| * ASoC: wm8940: Properly set codec->dapm.bias_levelAxel Lin2011-11-111-0/+2
| | | | | | | | | | | | | | | | | | | | commit 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb upstream. Reported-by: Chris Paulson-Ellis <chris@edesix.com> Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Rename voodoo sound control to default chip nameKalimochoAz2012-02-111-2/+2
| |
* | Voodoo Sound: update source code for ICS kernel sourcesSIMOND François2011-12-192-4/+5
| |
* | Voodoo sound: driver v10SIMOND François2011-12-193-48/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvement: - HW EQ support: smooth activation/deactivation and gain changes Bugfixes: - HP volume smoothing loop on low levels with negative digital offsets - wm8994_write logging on Nexus S New supported devices: - Galaxy Tab 7" Gingerbread Kernels support (based on M180S) - Galaxy Tab 10.1 - beta
* | Voodoo sound: fix wm8994_write logging routine missing register/value for ↵SIMOND François2011-12-191-7/+9
| | | | | | | | Nexus S-based kernels
* | Voodoo sound: driver v9SIMOND François2011-12-193-107/+714
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New features - advanced logging controllable via debug_log infos: 1, verbose: 2 - implements hardware EQ - implements hardware stereo expansion effect - new concept: digital_gain: makes room for effects with negative gains avoid saturation using hardware DRC as limiter act as compresser+limiter with positive gains (gain unit is mili-decibels, min -71625, max 36000) negative digital_gain are analog compensated if possible - super smooth headphone amp volume changes New supported device - Compatible with M110S Gingerbread kernel sources
* | Voodoo sound: driver v8SIMOND François2011-12-193-69/+177
| | | | | | | | | | | | | | - Fixes DAC direct not being applied in several situations - Fixes 1 channel only on Captivate headphone+mic calls - Add full support for Samsung Gingerbread kernels including complete FM radio tunings
* | Voodoo sound: update to driver v7SIMOND François2011-12-192-446/+555
| | | | | | | | | | | | - definite fix for DAC direct call issue - reshaped source code (Linux Coding Style!) - less hooks in pre-existing driver
* | Voodoo sound: modularization-related change and path management improvementsSIMOND François2011-12-194-13/+96
| |
* | Voodoo sound: bump version to v6SIMOND François2011-12-191-1/+1
| |
* | Voodoo sound: apply speaker tuning control only when active path is speaker, ↵SIMOND François2011-12-191-66/+67
| | | | | | | | fix reversed is_path(SPEAKER) logic
* | Voodoo sound: update to driver v5supercurio2011-12-195-192/+463
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New speaker tuning mode for music using different hardware EQ settings than stock ones - Microphone presets now supported on Nexus S. - Microphone presets balanced and loud reworked with lower background noise and higher dynamic range for balanced: -2dB noise, +6dB dynamic range. - New DAC direct option: reduces distortion and improves SNR by a small margin (bypass usless analog channel mixer) - Anti-jitter mode on by default. - Same exact source is now used on each device supported (still: only useful code is compiled in via ifdefs) - ability to fully disable/re-enable the driver and its sysfs interface: 0 or 1 in /sys/class/misc/voodoo_sound_control/enable - refactored source code
* | Voodoo sound: driver v4 for Nexus S. Microphone presets feature deactivated: ↵KalimochoAz2011-12-196-1/+736
| | | | | | | | needs some fine adjustement for the code & hardware
* | Revert "ASOC: modify gains of mic for SIP Call."Eric Laurent2011-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 7507d5a839a3caf97832f811df2829daa5b245c8. The mic gain reduction offered a very limited improvement of the echo for SIP calls but was such that it rendered other VoIP applications unusable. Signed-off-by: Eric Laurent <elaurent@google.com>
* | ASOC: Reduce the sleep currentsh21.won2011-11-171-4/+6
| | | | | | | | | | | | | | | | | | | | The sleep current is more consumed about 0.1mA. Because ear_sel GPIO's setting is wrong. ear_sel GPIO is not connected with anything by Hardware. So, block 'Pull None' setting to reduce the sleep current. Change-Id: I8d9236b6a1af4f0051e56539844ba2778a748df3 Signed-off-by: sh21.won <sh21.won@samsung.com>