evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next

Browse source
This commit is contained in:
Mark Brown 2013-04-12 13:57:07 +01:00
commit 5dccf54e2b
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/fsl/imx-audmux.c
View file

@ -262,7 +262,7 @@ static int imx_audmux_probe(struct platform_device *pdev)
return PTR_ERR(pinctrl); return PTR_ERR(pinctrl);
} }
audmux_clk = clk_get(&pdev->dev, "audmux"); audmux_clk = devm_clk_get(&pdev->dev, "audmux");
if (IS_ERR(audmux_clk)) { if (IS_ERR(audmux_clk)) {
dev_dbg(&pdev->dev, "cannot get clock: %ld\n", dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
PTR_ERR(audmux_clk)); PTR_ERR(audmux_clk));
@ -282,7 +282,6 @@ static int imx_audmux_remove(struct platform_device *pdev)
{ {
if (audmux_type == IMX31_AUDMUX) if (audmux_type == IMX31_AUDMUX)
audmux_debugfs_remove(); audmux_debugfs_remove();
clk_put(audmux_clk);
return 0; return 0;
} }

2
sound/soc/fsl/imx-pcm-fiq.c
View file

@ -34,7 +34,7 @@
#include "imx-ssi.h" #include "imx-ssi.h"
struct imx_pcm_runtime_data { struct imx_pcm_runtime_data {
int period; unsigned int period;
int periods; int periods;
unsigned long offset; unsigned long offset;
unsigned long last_offset; unsigned long last_offset;

2
sound/soc/fsl/imx-sgtl5000.c
View file

@ -148,7 +148,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
data->dai.stream_name = "HiFi"; data->dai.stream_name = "HiFi";
data->dai.codec_dai_name = "sgtl5000"; data->dai.codec_dai_name = "sgtl5000";
data->dai.codec_of_node = codec_np; data->dai.codec_of_node = codec_np;
data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev); data->dai.cpu_of_node = ssi_np;
data->dai.platform_name = "imx-pcm-audio"; data->dai.platform_name = "imx-pcm-audio";
data->dai.init = &imx_sgtl5000_dai_init; data->dai.init = &imx_sgtl5000_dai_init;
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

2
sound/soc/fsl/imx-ssi.c
View file

@ -400,7 +400,7 @@ static struct snd_soc_dai_driver imx_ac97_dai = {
.stream_name = "AC97 Playback", .stream_name = "AC97 Playback",
.channels_min = 2, .channels_min = 2,
.channels_max = 2, .channels_max = 2,
.rates = SNDRV_PCM_RATE_48000, .rates = SNDRV_PCM_RATE_8000_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE, .formats = SNDRV_PCM_FMTBIT_S16_LE,
}, },
.capture = { .capture = {