summaryrefslogtreecommitdiff
path: root/sound
AgeCommit message (Collapse)Author
2012-08-10Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_androidXinyu Chen
2012-08-09ENGR00219837-1 HDMI: Add HDMI_SDMA support for RIGEL TO1.1Chen Liangjun
In RIGEL TO1.1, the same HDMI_SDMA fix is introduced as ARIK TO1.2. Add support for RIGEL TO1.1 for HDMI_SDMA functionality. In this patch: 1.Add hdmi_SDMA_check() interface to judge whether MX6 chip support HDMI_SDMA. 2.Replace mx6q_version() check with hdmi_SDMA_check() to support both ARIK To1.2 and RIGEL TO1.1. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-08-03Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_androidXinyu Chen
2012-08-02ENGR00219177 enable usb mic which bind with usb camerab02247
add "usb_audio" switch subsystem and uevent for usb audio Signed-off-by: b02247 <b02247@freescale.com>
2012-08-02ENGR00219184 HDMI AUDIO: set HDMI audio's SDMA priority to highChen Liangjun
HDMI use SDMA for buffer switch. Set HDMI audio's SDMA priority to the same level as other audio device. This adjust can avoid noise due to SDMA cpu race failing. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-08-01ENGR00218958 ESAI ASRC: fix system hang cause by accessing ASRC with no clockChen Liangjun
In ESAI_ASRC, to use ASRC for p2p playback, ESAI driver would maintain an variable to keep track of ASRC pair number allocated. So every time ESAI driver want to use ASRC, he would first init the variable to a value (0 in ESAI driver)stand for unvalid pair number and then request an valid pair number. At last, open the ASRC clock for ASRC register access. However, ASRC driver treat 0 as an valid pair number. Thus, if an ESAI ASRC playback is failed, ESAI driver would check whether the pair number is valid. If the pair number is valid, ESAI driver would access ASRC register to do some clean work. Thus, the init 0 value would be treat as an valid pair number and ASRC register would be access without ASRC clock. In the case, an system hang happens. In this patch, init pair number variable to -1 after its allocation. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-08-01Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_androidXinyu Chen
Conflicts: drivers/mxc/vpu/mxc_vpu.c
2012-07-31ENGR00217401 wm8962: fix build warningXinyu Chen
Fix two build warnings on wm8962 Signed-off-by: Xinyu Chen <Xinyu.chen@freescale.com>
2012-07-31ENGR00217401-1 wm8962: fix build warningXinyu Chen
Fix two build warnings on wm8962 Signed-off-by: Xinyu Chen <Xinyu.chen@freescale.com>
2012-07-30ENGR00218807 ESAI: fix bootup issue cause by accessing unexist addressChen Liangjun
To support p2p playback, ESAI driver would copy platform data to esai_asrc struct. The platform data only exist on boards that supports ESAI. However, for ARM2 board, it supports ESAI but not necessary get the codec CS42888. Thus the probe() in ESAI driver would also try to copy the platform data from board init file. The p2p playback now only support ARD board, so the ESAI probe() for ARM2 would access unexisted address and cause an kernel dump. In the patch, check the platform data address before copy. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-30ENGR00218421-2 ESAI_ASRC:Add support for p2p virtual device playbackChen Liangjun
In the origin code, ESAI driver supoprt audio p2p playback by setting input PCM data's sample rate thought amixer interface.It is ugly and request user application call amixer control interface everytime before and playback. In this patch, user can call the audio p2p playback by writing data to an special virtual device. Driver would automatically get the params of input PCM. At the same time, driver would get the output sample rate and word data. With the data abover, driver can set ASRC properly and audio p2p palyback is support. This patch mainly focus on: 1 clean old p2p playback way for ESAI. 2 Setup the output sample rate and word width to virtual device's substream_runtime's private data. Everytime the virtual device is called, the data abover is used for config ASRC, ESAI, and codec. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-30ENGR00218421-1 ESAI: Setup virtual device under ESAI sound cardChen Liangjun
For ESAI sound card, ESAI driver setup device 0 for raw ESAI playback and capture. In this patch, add ESAI virtual device 1 under ESAI sound card. Device 1 is for ESAI audio p2p playback. Every time user use device 1 for playback, ASRC would be called defaultly. Thus for device 1, it can support all sample rate between 8k ~ 192k. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-30ENGR00218013-5 HDMI: Add SDMA to help HDMI audio support multi bufferChen Liangjun
For chip version easily than TO1.1, HDMI use internel DMA enginue for audio tranfer. Due to capability of HDMI module, FIFO underrun is unavoidable. For chip TO 1.2, introducing SDMA to help HDMI audio DMA. With the help of SDMA, HDMI audio can use ping-pong buffer mechanism and FIFO underrun can be avoid. In this path: Add SDMA support for i.MX6Q later than TO1.2. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-27ENGR00218466 WM8962: remove unused variableGary Zhang
remove unused variable Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-25Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_androidXinyu Chen
Conflicts: arch/arm/configs/imx6_defconfig arch/arm/configs/imx6_updater_defconfig arch/arm/configs/imx6s_defconfig arch/arm/include/asm/dma-mapping.h arch/arm/kernel/smp.c arch/arm/mach-mx6/Kconfig arch/arm/mach-mx6/board-mx6dl_arm2.h arch/arm/mach-mx6/board-mx6dl_sabresd.h arch/arm/mach-mx6/board-mx6q_arm2.c arch/arm/mach-mx6/board-mx6q_arm2.h arch/arm/mach-mx6/board-mx6q_sabreauto.c arch/arm/mach-mx6/board-mx6q_sabreauto.h arch/arm/mach-mx6/board-mx6q_sabrelite.c arch/arm/mach-mx6/board-mx6q_sabresd.c arch/arm/mach-mx6/board-mx6q_sabresd.h arch/arm/mach-mx6/board-mx6sl_arm2.c arch/arm/mach-mx6/board-mx6sl_arm2.h arch/arm/mach-mx6/board-mx6solo_sabreauto.h arch/arm/mach-mx6/bus_freq.c arch/arm/mach-mx6/clock.c arch/arm/mach-mx6/clock_mx6sl.c arch/arm/mach-mx6/cpu.c arch/arm/mach-mx6/crm_regs.h arch/arm/mach-mx6/devices-imx6q.h arch/arm/mach-mx6/devices.c arch/arm/mach-mx6/mx6_anatop_regulator.c arch/arm/mach-mx6/pcie.c arch/arm/mach-mx6/system.c arch/arm/mm/dma-mapping.c arch/arm/plat-mxc/devices/Makefile arch/arm/plat-mxc/devices/platform-imx-dcp.c arch/arm/plat-mxc/devices/platform-imx-ocotp.c arch/arm/plat-mxc/devices/platform-imx-rngb.c arch/arm/plat-mxc/devices/platform-mxc_hdmi.c arch/arm/plat-mxc/include/mach/devices-common.h arch/arm/plat-mxc/include/mach/esdhc.h arch/arm/plat-mxc/include/mach/iomux-mx6dl.h arch/arm/plat-mxc/include/mach/iomux-mx6q.h arch/arm/plat-mxc/include/mach/memory.h arch/arm/plat-mxc/include/mach/mx6.h arch/arm/plat-mxc/include/mach/mxc_edid.h arch/arm/plat-mxc/include/mach/mxc_hdmi.h arch/arm/plat-mxc/system.c drivers/Kconfig drivers/char/hw_random/fsl-rngc.c drivers/cpufreq/Makefile drivers/cpufreq/cpufreq_interactive.c drivers/crypto/Kconfig drivers/crypto/caam/caamalg.c drivers/crypto/caam/compat.h drivers/crypto/caam/ctrl.c drivers/crypto/caam/desc_constr.h drivers/crypto/caam/intern.h drivers/crypto/dcp.c drivers/dma/pch_dma.c drivers/input/keyboard/gpio_keys.c drivers/input/touchscreen/egalax_ts.c drivers/input/touchscreen/max11801_ts.c drivers/media/video/mxc/capture/Kconfig drivers/media/video/mxc/capture/adv7180.c drivers/media/video/mxc/capture/ipu_csi_enc.c drivers/media/video/mxc/capture/ipu_prp_vf_sdc.c drivers/media/video/mxc/capture/ipu_prp_vf_sdc_bg.c drivers/media/video/mxc/capture/mxc_v4l2_capture.c drivers/media/video/mxc/capture/ov5640_mipi.c drivers/media/video/mxc/output/mxc_vout.c drivers/misc/Kconfig drivers/misc/Makefile drivers/mmc/card/block.c drivers/mmc/core/mmc.c drivers/mmc/host/mmci.c drivers/mmc/host/sdhci-esdhc-imx.c drivers/mmc/host/sdhci.c drivers/mmc/host/sdhci.h drivers/mxc/Kconfig drivers/mxc/Makefile drivers/mxc/asrc/mxc_asrc.c drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.h drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c drivers/mxc/ipu3/ipu_device.c drivers/mxc/vpu/mxc_vpu.c drivers/net/fec.c drivers/net/wireless/Makefile drivers/power/sabresd_battery.c drivers/regulator/core.c drivers/tty/serial/imx.c drivers/usb/core/hub.c drivers/usb/gadget/arcotg_udc.c drivers/usb/gadget/fsl_updater.c drivers/usb/gadget/inode.c drivers/usb/host/ehci-hub.c drivers/video/mxc/ldb.c drivers/video/mxc/mipi_dsi.c drivers/video/mxc/mxc_dispdrv.c drivers/video/mxc/mxc_dispdrv.h drivers/video/mxc/mxc_edid.c drivers/video/mxc/mxc_elcdif_fb.c drivers/video/mxc/mxc_ipuv3_fb.c drivers/video/mxc/mxc_spdc_fb.c drivers/video/mxc_hdmi.c drivers/watchdog/imx2_wdt.c fs/proc/base.c include/linux/mmc/host.h include/linux/mmc/sdhci.h include/linux/mxc_v4l2.h kernel/power/main.c sound/soc/codecs/mxc_hdmi.c sound/soc/codecs/mxc_spdif.c sound/soc/codecs/wm8962.c sound/soc/imx/Kconfig sound/soc/imx/Makefile sound/soc/imx/imx-cs42888.c sound/soc/imx/imx-esai.c sound/soc/imx/imx-wm8958.c sound/soc/imx/imx-wm8962.c
2012-07-25ENGR00217598 SSI: improvement for ssi driverGary Zhang
SSI driver improvement: 1. add parameter check in imx_ssi_set_dai_clkdiv(), 2. add TX/RX FIFO1 watermark settings, 3. remove the hardcode for watermark setting. Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-25ENGR00215621 HDMI: Pass HCT TestID 7-32: Audio Sample Packet LayoutSandor Yu
CA index table should followed CEA-861-D table 20. Signed-off-by: Sandor Yu <R01008@freescale.com>
2012-07-25ENGR00216976 ESAI: add support for 4,6channel p2pChen Liangjun
Add support for 4, 6 channels p2p playback in ESAI. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-25ENGR00209905 WM8962: support for continuously playback diff sample bit streamsGary Zhang
support for continuously playback different sample bit audio streams with -Dplughw:0,0 option such as the command: 'aplay -Dplughw:0,0 16bit.wav 24bit.wav' before prohibit reenter hw_params, now remove this limitation to support this feature. Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-25ENGR00215851 ASRC:fix datawidth type mismatchChen Liangjun
When ESAI call ASRC for p2p playback. The datawidth may be changed. The cpu dai would configure the ESAI data width according to the modified datawidth(output_bits). The type mismatch between output_bits and cpu dai's switch branch cause cpu dai's hardware parameter set fail. Match the type of output_bits to the switch branch in cpu dai's hardware parameter configuration function. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-20ENGR00176555 ESAI: Increase DMA buffer size to reslove occasional aplay underrunLionel Xu
The underrun warning appears when playback high bit-rate and multi-channel( greater than 6) wav, increase DMA buffer size can resolve this issue. Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
2012-07-20ENGR00212318 ASRC:update to in/out width configChen Liangjun
The origin ASRC driver did not support input and output wordwidth config but an total wordwidth config instead. And the input wordwith and output wordwidth are all fixed to 24 bit. In this path, we do things below: 1 Update to use input wordwidth and output wordwidth config seperately instead of an total wordwidth config. 2 Set corresponding DMA(input/output) buswidth according ASRC's input and output wordwidth config. 3 Support 16/24 bit input wordwidth and 24 bit output wordwidth. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-20ENGR00213616 wm8962: set default volume for playback and recordGary Zhang
set default volume for playback and record Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00163374 ESAI: ESAI driver does not support mono playbackLionel Xu
To remove mono playback support for ESAI. Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
2012-07-20ENGR00213179 Mx6x,Fix HDMI build wariningSandor Yu
Fix HDMI build warining Signed-off-by: Sandor Yu <R01008@freescale.com>
2012-07-20ENGR00180390 ESAI: add amixer ASRC p2p API(ALSALIB)Chen Liangjun
If we want to use ESAI call ASRC, we need to know the input sample rate as well as the output sample rate. however, cause of ALSA-LIB, the input sample rate pass down to ALSA-DRIVER is not accurate. For example, if the ALSA-DRIVER only support 48KHz playback and we want to play an 16KHz audio file, the sample rate params the ALSA DRIVER see is 48KHz but not 16KHz. So, the ALSA-DRIVER do not know the original sample rate, and thus unable to config ASRC properly. In this patch, we add an amixer control interface for alsa lib plugin to config the input sample rate before playback. If no plugin, user can call the amixer control interface to manually use ASRC for rate convert. For example, if we need to playback an 24bit_24K audio wav file without call the plug. The sound card is 0. 1 Get the ASRC capability: amixer sget "ASRC" 1 Set the input samplerate: amixer sset "ASRC" "24KHz" 2 Play; aplay -Dhw:0 audio_24k24S-S24_LE.wav Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-20ENGR00212542 SPDIF: move clock operationGary Zhang
Now clock operation occurs in mxc_spdif_trigger(), and because clock operation is forbidden to exist in interrupt context, move disabling clock operation to mxc_spdif_shutdown() Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00178461-02 HDMI1080p: hotplug cause kernel panic. 10%Sandor Yu
It is a warning cause by HDMI driver irq enable count mismatch. The purpose of maintain HDMI irq count is to disable hdmi_iahb_clk when HDMI cable plugout. But hdmi_iahb_clk parent ahb clock is always enabled when system run, so hdmi_iabh_clk power consumption is very low. The function clk_get_usecount introduce by irq count maintain is not safety in SMP. Remove HDMI irq count in HDMI driver, keep hdmi_iahb_clk always run. and disable hdmi_iahb_clk and hdmi_isfr_clk when FB Blank. Signed-off-by: Sandor Yu <R01008@freescale.com>
2012-07-20ENGR00211132 ESAI: fix build warningGary Zhang
imx-pcm.h should not include imx-ssi.h, or else DRV_NAME is redefined Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00209739-5 WM8962: check DMIC statusGary Zhang
if there are no amic_detect pin, by checking DMIC pin status to get to know which mic is used Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00209739-1 WM8962: add support for MX6 SLGary Zhang
1. add support for mx6 sl 2. operate clock by callback Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00209384-4 mxc_spdif: disable sym_err isrAdrian Alonso
* Disable symbol error interrupt when rx dpll is unlocked This means that no spdif Rx data had been identified and driver will keep issuing sym_err interrupt request. * Add check to only execute capture_start/stop functions if rx_active is set. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00209529 WM8962: registry detect pin handler more lateGary Zhang
move hp/mic detect pin handler from imx_wm8962_probe() to imx_wm8962_init(). Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00209384-3 mxc_spdif: capture playback stop functionAdrian Alonso
* Add capture/playback stop function Stops capture/playback process Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00209384-2 mxc_spdif: capture playback start functionAdrian Alonso
* Add start capture/playback function Start sequence for capturing/playing audio data. * Remove caprure/playback prepere function hwd initialization handled by trigger function when user/app starts capture/play process. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00209384-1 mxc_spdif: add trigger handler functionAdrian Alonso
* Add trigger function in order to handle user space events start/stop/pause playback/capture Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20SAUCE remove unnecessary suspend/resume functionsAdrian Alonso
BugLink: http://bugs.launchpad.net/bugs/882723 Disabling/re-enabling clocks is not necessary as it's done in *_startup() and *_shutdown() functions, and shall be performed during suspend/resume. This is causing warnings of un-matched clk_enable()/clk_disable() Rework patch for imx_3.0.15 code base Signed-off-by: Eric Miao <eric.miao@linaro.org> Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00178459 mxc_spdif: fix read access for debug infoAdrian Alonso
* Fix read register access for debug info * Read from spdif registers with a disabled spdif core clock leads to kernel hang. * Avoid it by enabling/diabling core clk. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00178459 mxc_spdif: clk_enable return checksAdrian Alonso
* Add clk_enable return checks, if clocks aren't enabled writting/reading from spdif register will cause system to become unresponsive. * Remove spdif_audio_clk enable/disable calls this clock is not assigned and is reposible for making the system unresposive. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00182220 WM8962: set a default volumeGary Zhang
set default volume for headphone and speaker Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00181697 HDMI: fix ahb bus error bugChen Liangjun
In ARIK, to prevent noise cause by false triggered burst, we reduce the incr type to 4. and the change may cause bus_error because a burst may unexpectly stop and thus an AHB bus error happens. Reset HDMI Audio FIFO state to prevent AHB bus error. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-20ENGR00181693 HDMI:threshold and INCR type configChen Liangjun
Configure information for threshold and incr: CHIP + CHANNEL THRESHOLD INCRTYPE ARIK + 2 126 4 ARIK + 4,6,8 124 4 RIGEL + 2,4,6,8 128 8 Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-07-20ENGR00181201 mx6x HDMI audio add IEC head optimization with C codeSandor Yu
mx6x HDMI audio add IEC head optimization with C code Signed-off-by: Sandor Yu <R01008@freescale.com>
2012-07-20ENGR00181188 Added miss file hdmi_cpm.S for patch ENGR00181130Sandor Yu
Added miss file hdmi_cpm.S for patch ENGR00181130 Signed-off-by: Sandor Yu <R01008@freescale.com>
2012-07-20ENGR00181130 Optimizate HDMI audio mmap to fix HDMI audio alsa underrunSandor Yu
HDMI audio DMA FIFO size is setting to 126, and use INCR4 mode to fix FIFO overflow issue. Added Neon code for PCM data IEC head and data copy. Signed-off-by: Sandor Yu <R01008@freescale.com>
2012-07-20ENGR00180236-2: spdif clk usecount is 1 when not in useAdrian Alonso
* Move spdif_core_clk enable from spdif_probe to spdif_startup function in order to avoid initializing the core clock when module is not in use. * At spdif_shutdown disable spdif core_clk. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00180236: mxc_spdif add spdif_clk error checkAdrian Alonso
* Add get_clk clock error check abort driver probe if wrong clock. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-07-20ENGR00180350-2 HDMI set infoframe informationAlan Tull
Get speaker allocation data block information from the EDID. Translate the EDID speaker allocation to audio infoframe speaker allocation (different bit mapping) given the number of channels of audio being played. Set channel count information in HDMI_FC_AUDICONF0. Set speaker allocation information in HDMI_FC_AUDICONF2. From CEA-861-D spec: NOTE—HDMI requires the CT, SS and SF fields to be set to 0 (Refer to Stream Header) as these items are carried in the audio stream. Signed-off-by: Alan Tull <r80115@freescale.com>
2012-07-20ENGR00180297 WM8962: stereo record on AMICGary Zhang
Implement stereo recording feature on analog mic Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-07-20ENGR00171077 ESAI: Ends of record should not impact playbackLionel Xu
The mute process in shutdown function should only be limited to playback, or it will influence each other when they running together. Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-13 07:26:42 +0000