summaryrefslogtreecommitdiff
path: root/sound
AgeCommit message (Collapse)Author
2012-01-09Merge commit 'rel_imx_2.6.38_12.01.00_RC1' into imx_2.6.38_androidXinyu Chen
Conflicts: drivers/input/touchscreen/egalax_ts.c
2011-12-31ENGR00171026 SGTL5000: remove mono supportGary Zhang
there is a issue on 24bit mono transmit of sgtl5000, temporarily disable mono support Signed-off-by: Gary Zhang <b13634@freescale.com>
2011-12-29Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/board-mx6q_arm2.c arch/arm/mach-mx6/board-mx6q_sabrelite.c arch/arm/plat-mxc/dvfs_core.c
2011-12-28ENGR00170999 Fix the record end, playback muteb02247
SGTL5000_VAG_POWERUP used by record and playback. when playback and record are opened, close one of them will cause the other mute Signed-off-by: b02247 <b02247@freescale.com>
2011-12-23Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/board-mx6q_arm2.c
2011-12-21ENGR00170453 SSI: close ssi_clk when idleGary Zhang
close ssi_clk when ssi is idle. Signed-off-by: Gary Zhang <b13634@freescale.com>
2011-12-20ENGR00170627 imx-cs42888: overwrite codec_name if passed as platform dataAdrian Alonso
* Overwrite codec_name if passed as platform data * Add codec_name in mxc_audio_platform_data * Codec name follows the naming convention <codec>.<i2c-channel>-<codec i2c address> i.e. cs42888.0-0048 * For IMX6Q-ARD this name convention doesn't follow previous settings for imx6q platforms codec is on different i2c channel and can't be resolved by CONFIG macros on imx_3stack_dai data structure; So we overwrite in probe function by getting the correct value from plat_data->codec_name. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2011-12-20ENGR00170626 imx-cs42888: avoid codded gpio reset definitionAdrian Alonso
* Remove hard codded gpio reset definition * Add in mxc_audio_platform_data reset gpio reference to be able to pass gpio reset assignment in board definition file instead of a macro for each different board. * Add plat_data null check, return EINV if no set. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2011-12-14ENGR00162649 sgtl5000: reduce the DAC volumeGary Zhang
1. if the DAC volume is largest, output is harsh. so reduce the DAC volume. 2. increase ADC volume Signed-off-by: Gary Zhang <b13634@freescale.com>
2011-12-13Merge remote-tracking branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/board-mx6q_arm2.c arch/arm/mach-mx6/board-mx6q_sabrelite.c
2011-12-09ENGR00162729 MX6 ESAI: To reset the codec before initing a stream playbackingLionel Xu
Sometimes there is no sound after starting a stream playbacking, this problem can be resolved by resetting external codec at the beginning of startup. Signed-off-by: Lionel Xu <R63889@freescale.com>
2011-12-08ENGR00162797 SSI: add I2S mode for stereo playbackGary Zhang
Former stereo playback uses network mode which does not suppot 24bit format well. Add I2S mode to do the same manner with codec. Signed-off-by: Gary Zhang <b13634@freescale.com>
2011-12-06Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/system.c drivers/media/video/mxc/capture/mxc_v4l2_capture.c
2011-11-22ENGR00162709 Add Support for MX6Q Sabre AutoEric Sun
Code change in none-mach code for support MX6Q Sabre Auto. Signed-off-by: Eric Sun <jian.sun@freescale.com>
2011-11-18Merge commit 'rel_imx_2.6.38_11.11.00_RC1' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/board-mx6q_sabrelite.c
2011-11-11ENGR00162035 Fix usage of snd_soc_update_bits() func in SGTL5000 driverMahesh Mahadevan
Some calls to the snd_soc_update_bits() uses an incorrect value for the mask field Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
2011-11-11ENGR00161608 SSI: support 24bit samplerateGary Zhang
Add 24bit sample rate playback support for SSI and sgtl5000 codec driver. Signed-off-by: Gary Zhang <b13634@freescale.com>
2011-11-10ENGR00161757 imx: add i2c depends of some driversJason Chen
add i2c depends for mxc edid/dvi/hdmi driver. add i2c depends for codec soc sgtl5000 and cs42888. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-11-04Merge branch 'imx_2.6.38' into imx_2.6.38_androidZhang Jiejing
Conflicts: arch/arm/mach-mx6/board-mx6q_sabreauto.c arch/arm/mach-mx6/cpu_op-mx6.c arch/arm/plat-mxc/dvfs_core.c drivers/cpufreq/cpufreq_stats.c
2011-11-03ASoC: imx: fix burstsize for DMAWolfram Sang
commit e1bb31b444668bc957c337d33803db7cb3330745 upstream. SSI counts in words, the DMA engine in bytes. (Wrong) factor got removed in bf974a0 (ASoC i.MX: switch to new DMA api). Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> 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> (cherry picked from commit e34910dd0fcf32e9a0e5ff6f3249910cff4c06d8)
2011-11-03ASoC: imx: set watermarks for mx2-dmaWolfram Sang
commit 2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b upstream. They got accidently removed by f0fba2a (ASoC: multi-component - ASoC Multi-Component Support). Reintroduce them and get rid of the superfluous defines because the fiq-driver has its own hardcoded values. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> 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> (cherry picked from commit ad5d054f79f20dfaecf23322783e652eee303d98)
2011-11-02ENGR00161288 balance spdif clock enables and disablesAlan Tull
Add tx_active, rx_active flags to keep track of what channels have enabled clocks. In suspend/resume, only disable/re-enable the clocks that were enabled. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-11-02ENGR00161014 ASoC: don't clobber platform DMA driver opsAlan Tull
Previously, only one static struct for ops existed for all platform DMA drivers to share. Half of the ops are shared functions which don't have stubs in the ALSA core. The other half are initialized to point directly to ops in the platform driver. This creates problems where each time soc_new_pcm is called, the new platform driver's ops would overwrite a subset of the ops. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-11-01ENGR00156869 ESAI: Support 8-channel playbacking and 6-channel recordingLionel Xu
To make cpu_dai esai support 8/6 channel playback/recording. Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
2011-10-31ENGR00160930-5 Add support for SSI audio on MX6 Sabre-liteMahesh Mahadevan
Add support for the SSI audio through the SGTL codec on MX6 Sabre-lite board Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
2011-10-28ENGR00161005-2 MX6Q Kernel Rename sabreauto to arm2 boardAnish Trivedi
Rename "sabreauto" config in sound driver to "arm2". Signed-off-by: Anish Trivedi <anish@freescale.com>
2011-10-28ENGR00160860-2 hdmi audio driverAlan Tull
Audio driver for i.Mx built-in HDMI Transmitter. * Uses HDMI Transmitter's built-in DMA. * Adds IEC958-style digital audio header info to the raw audio. * Gets pixel clock from the IPU driver and calculates clock regenerator values (cts and N). * Move ipu_id, and disp_id from the HDMI's platform data to the HDMI mfd's platform data. Saves them in the hdmi mfd. * Add mfd functionality to update the clock regenerator values when the hdmi changes the pixel clock rate or when requested from the audio driver with a new audio sample rate. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-10-27ENGR00160862 unique id for each soc-audio deviceAlan Tull
On boards which have more than one soc-audio device, the initialization of the first device will create a sysfs directory named /sys/devices/platform/soc-audio and subsequent soc-audio devices will fail to init because they try to create another sysfs directory of the same name. The solution is to have a unique number for each device such that different boards having combinations will be OK. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-10-25ENGR00139265-2 mxc alsa soc spdif driverAlan Tull
* Add spdif block clock divider settings and spdif_clk_set_rate function to mxc_spdif_platform_data. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-10-25ENGR00139265-1 spdif capture gets clock from spdif streamAlan Tull
The S/PDIF block's DPLL recovers the clock from the input bitstream. So S/PDIF capture rate is not dependent on transmit clocks available. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-10-25ENGR00160611 Update ALSA driver to initialize soonerMahesh Mahadevan
All ALSA sound-cards are not registered, hence change the init to regular module_init. Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
2011-10-21ENGR00160605 Update ALSA Headset detect codeMahesh Mahadevan
Update Headset detect code incase no dedicated pin and detect is always activated Signed-off-by: Mahesh Mahadevan <r9aadq@freescale.com>
2011-10-11Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_androidXinyu Chen
2011-10-09ENGR00156745 MX6Q ESAI: Playback and record can't start up concurrentlyLionel Xu
Proper flag setting and placement should be used to avoid function hw_param called multiple times when playback and record startup concurrently. Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
2011-09-30SAUCE: set correct rates before registering SPDIF codec DAIEric Miao
BugLink: http://bugs.launchpad.net/bugs/855281 Playback/capture rates should be configured before the SPDIF codec DAI is registered, according to the parameters that passed in by the platform data. And this caused pulseaudio not working with the SPDIF sound card. Signed-off-by: Eric Miao <eric.miao@linaro.org>
2011-09-27ENGR00158176 SGTL5000: I/O Error appeared when recording mono wav through HWLionel Xu
When recording mono wav, SSI's network mode should be closed, or it will influence the internal freq config, making recording fail. Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
2011-09-16ENGR00156906 Android: more support mx6q board.Zhang Jiejing
amead these patchs: Update mx6 android defconfig to enable cs42888 codec. Resolve the touch intr pin request conflict. Add ipuv3 fb earlysuspend callbacks. Avoid the cs42888 suspend/resume failed issue when we do not have the audio extension board (cs42888 on it) connected. Android: viv_gpu: imx6q: disable 2d & vg system bar can not display if we enable 2d & vg. Add HDMI support into the defconfig config: change mx6 defconfig to 1g/3g address partition change back to 1g/3g address partition, give more vma to user space. mx6q: increase the dma zone size to 184MB Enlarge the GPU pmem size to 128MB Disable the virtual console and framebuffer console touchscreen: temp disable eGalax touchscreen suspend function the touchscreen chip can't be wake up during resume. it caused by the irq pin can't pull down while resume. this is may caused by 6q cpu board HW design. temp disable suspend function of eGalax touch screen for release. Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com> Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2011-09-16ENGR00156813 MX53 ALSA: Recording no soundLionel Xu
There is no sound in the recorded wav, to enable recording, the VAG should be powered up, and the mic bias resistor should be setup with proper value. Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
2011-08-30ENGR00139255 MX6Q_BSP ESAI: Add esai recording supportLionel Xu
Add ESAI recording to mx6q platform. To differentiate mx6q and mx53 in codec machine layer code. Signed-off-by: Lionel Xu <R63889@freescale.com>
2011-08-29ENGR00139255-2 MX6Q_BSP ESAI: Add esai recording supportLionel Xu
Add ESAI recording to mx6q platform. Note: since there is pad conflict between esai record and fec, add a boot argument esai_record to deal with it. This argument is required to enable the record functionality. Signed-off-by: Lionel Xu <R63889@freescale.com>
2011-08-18ENGR00154650-2 ESAI: add mx53 playback/record supportGary Zhang
add driver codes for mx53 ard. close esai clk when not used. add delay when power on cs42888 to avoid noise Signed-off-by: Gary Zhang <b13634@freescale.com>
2011-08-15ENGR00154727 ESAI: Resolve i2c access problem when there is no audio cardLionel Xu
I2c device should not probe successfully when there is no such device on the bus. This will make i2c access failure later. Signed-off-by: Lionel Xu <R63889@freescale.com>
2011-07-27ENGR00153793-1 ESAI: Resolve esai codec i2c suspend/resume problemLionel Xu
1)Resolve esai codec i2c suspend/resume problem; 2)Remove imx pcm operating function which already defined in imx-ssi.c Signed-off-by: Lionel Xu <R63889@freescale.com>
2011-07-27ENGR00153740-6 imx-cs42888: remove asrc codeDong Aisheng
The asrc code in imx-cs42888 driver will cause building fail. Further more, the current asrc driver does not support p2p mode, so remove it first. Signed-off-by: Dong Aisheng <b29396@freescale.com>
2011-07-26ENGR00153651-2 ESAI: Add esai/cs42888 audio codec support on mx6q platformLionel Xu
Add ESAI and related audio codec cs42888 support on mx6q platform. Signed-off-by: Lionel Xu <R63889@freescale.com>
2011-06-08ENGR00139461-2 mxc alsa soc spdif driverAlan Tull
S/PDIF tx and rx using ASoC layer. Signed-off-by: Alan Tull <alan.tull@freescale.com>
2011-04-21ENGR00142436-2 SGTL5000: Audio not work in 2.6.38 kernelZeng Zhaoming
If platform not provide headphone status detect gpio, should not failed the audio subsystem. Fix it by complains with a warning. Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
2011-04-18ENGR00137340-1 ASOC: add headphone detection support for imx-sgtl5000.cZhang Jiejing
add a asoc headphone detection, it's a generic way using by asoc area. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2011-04-06ENGR00141651-2 Audio: audio not work when ipmux2 clock disabled in idleZeng Zhaoming
When SOC enter wait mode, ipmux2_clk will disable to save power, if using ssi1 for audio transfer, audio will not work correctly. To around this, using ssi2. Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
2011-04-06ENGR00141647 AUDIO,SGTL5000: Fix codec error after resetZeng Zhaoming
sgtl5000 codec not work after board reset, this is caused by sgtl5000 using register address step is 2, and snd-soc-core can't handle this as we expect, so we have to fill the register cache by reading register out when initialization instead of providing a default value array. Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-26 09:18:18 +0000