diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-24 12:50:34 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-24 12:50:34 +0800 |
| commit | 5b53e2720902c5dd9fbfc9b2644484173a5146aa (patch) | |
| tree | a369ffd3a3231a0d30c306c46636ec3e87cdbf39 /sound | |
| parent | e2f718a0c092f899e354b5179cde70f7aa7ab7a8 (diff) | |
| parent | 3101ee16f2f39b589d627b2858c5e3eca470dce7 (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35_12.11.01' into imx_3.0.35_android_r13.4.y
Conflicts:
arch/arm/configs/imx6s_updater_defconfig
arch/arm/include/asm/hardware/coresight.h
arch/arm/kernel/etm.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/mach-mx6/cpu_op-mx6.c
arch/arm/mach-mx6/mx6_suspend.S
arch/arm/mach-mx6/mx6sl_wfi.S
arch/arm/mach-mx6/pm.c
arch/arm/mach-mx6/system.c
arch/arm/plat-mxc/cpufreq.c
drivers/media/video/mxc/capture/ov5640_mipi.c
drivers/mfd/mxc-hdmi-core.c
drivers/mmc/host/sdhci.c
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
drivers/power/sabresd_battery.c
drivers/video/mxc/mxc_ipuv3_fb.c
include/linux/mfd/mxc-hdmi-core.h
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 2 | ||||
| -rw-r--r-- | sound/soc/imx/imx-hdmi-dma.c | 2 | ||||
| -rw-r--r-- | sound/soc/imx/imx-spdif.c | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index b14531157067..784b5957e37a 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2218,8 +2218,6 @@ SOC_ENUM("Capture LHPF Mode", cap_lhpf_mode), SOC_DOUBLE_R_TLV("Sidetone Volume", WM8962_DAC_DSP_MIXING_1, WM8962_DAC_DSP_MIXING_2, 4, 12, 0, st_tlv), -SOC_DOUBLE_R_TLV("Digital Playback Volume", WM8962_LEFT_DAC_VOLUME, - WM8962_RIGHT_DAC_VOLUME, 1, 127, 0, digital_tlv), SOC_SINGLE("DAC High Performance Switch", WM8962_ADC_DAC_CONTROL_2, 0, 1, 0), SOC_SINGLE("ADC High Performance Switch", WM8962_ADDITIONAL_CONTROL_1, diff --git a/sound/soc/imx/imx-hdmi-dma.c b/sound/soc/imx/imx-hdmi-dma.c index 8ada80e0cc74..342f9c85f481 100644 --- a/sound/soc/imx/imx-hdmi-dma.c +++ b/sound/soc/imx/imx-hdmi-dma.c @@ -1116,6 +1116,8 @@ static int hdmi_dma_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + if (!check_hdmi_state()) + return 0; rtd->frame_idx = 0; if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) { appl_bytes = frames_to_bytes(runtime, diff --git a/sound/soc/imx/imx-spdif.c b/sound/soc/imx/imx-spdif.c index efee7696bfbb..13c97aeb0622 100644 --- a/sound/soc/imx/imx-spdif.c +++ b/sound/soc/imx/imx-spdif.c @@ -1,7 +1,7 @@ /* * ASoC S/PDIF driver for IMX development boards * - * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. + * Copyright (C) 2008-2012 Freescale Semiconductor, Inc. * * based on stmp3780_devb_spdif.c * @@ -119,6 +119,11 @@ static int __init imx_spdif_init(void) return -ENOMEM; } + if (machine_is_mx6sl_evk()) { + imx_spdif_dai_link.name = "HDMI-Audio"; + imx_spdif_dai_link.stream_name = "HDMI-Audio"; + } + platform_set_drvdata(imx_spdif_snd_device, &snd_soc_card_imx_spdif); ret = platform_device_add(imx_spdif_snd_device); |