Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
This commit is contained in:
commit
23abd863d2
|
@ -196,5 +196,13 @@ struct ccsr_ssi {
|
|||
#define CCSR_SSI_SOR_WAIT(x) (((x) & 3) << CCSR_SSI_SOR_WAIT_SHIFT)
|
||||
#define CCSR_SSI_SOR_SYNRST 0x00000001
|
||||
|
||||
#define CCSR_SSI_SACNT_FRDIV(x) (((x) & 0x3f) << 5)
|
||||
#define CCSR_SSI_SACNT_WR 0x00000010
|
||||
#define CCSR_SSI_SACNT_RD 0x00000008
|
||||
#define CCSR_SSI_SACNT_RDWR_MASK 0x00000018
|
||||
#define CCSR_SSI_SACNT_TIF 0x00000004
|
||||
#define CCSR_SSI_SACNT_FV 0x00000002
|
||||
#define CCSR_SSI_SACNT_AC97EN 0x00000001
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -262,7 +262,7 @@ static int imx_audmux_probe(struct platform_device *pdev)
|
|||
return PTR_ERR(pinctrl);
|
||||
}
|
||||
|
||||
audmux_clk = clk_get(&pdev->dev, "audmux");
|
||||
audmux_clk = devm_clk_get(&pdev->dev, "audmux");
|
||||
if (IS_ERR(audmux_clk)) {
|
||||
dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
|
||||
PTR_ERR(audmux_clk));
|
||||
|
@ -282,7 +282,6 @@ static int imx_audmux_remove(struct platform_device *pdev)
|
|||
{
|
||||
if (audmux_type == IMX31_AUDMUX)
|
||||
audmux_debugfs_remove();
|
||||
clk_put(audmux_clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include "imx-ssi.h"
|
||||
|
||||
struct imx_pcm_runtime_data {
|
||||
int period;
|
||||
unsigned int period;
|
||||
int periods;
|
||||
unsigned long offset;
|
||||
unsigned long last_offset;
|
||||
|
|
|
@ -148,7 +148,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
|
|||
data->dai.stream_name = "HiFi";
|
||||
data->dai.codec_dai_name = "sgtl5000";
|
||||
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.init = &imx_sgtl5000_dai_init;
|
||||
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
||||
|
|
|
@ -386,7 +386,7 @@ static struct snd_soc_dai_driver imx_ac97_dai = {
|
|||
.stream_name = "AC97 Playback",
|
||||
.channels_min = 2,
|
||||
.channels_max = 2,
|
||||
.rates = SNDRV_PCM_RATE_48000,
|
||||
.rates = SNDRV_PCM_RATE_8000_48000,
|
||||
.formats = SNDRV_PCM_FMTBIT_S16_LE,
|
||||
},
|
||||
.capture = {
|
||||
|
|
Loading…
Reference in New Issue