aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin/bf5xx-ssm2602.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ssm2602.c')
-rw-r--r--sound/soc/blackfin/bf5xx-ssm2602.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c
index 030303238042..df3ac73f8778 100644
--- a/sound/soc/blackfin/bf5xx-ssm2602.c
+++ b/sound/soc/blackfin/bf5xx-ssm2602.c
@@ -49,7 +49,6 @@ static int bf5xx_ssm2602_hw_params(struct snd_pcm_substream *substream,
49{ 49{
50 struct snd_soc_pcm_runtime *rtd = substream->private_data; 50 struct snd_soc_pcm_runtime *rtd = substream->private_data;
51 struct snd_soc_dai *codec_dai = rtd->codec_dai; 51 struct snd_soc_dai *codec_dai = rtd->codec_dai;
52 struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
53 unsigned int clk = 0; 52 unsigned int clk = 0;
54 int ret = 0; 53 int ret = 0;
55 54
@@ -75,21 +74,6 @@ static int bf5xx_ssm2602_hw_params(struct snd_pcm_substream *substream,
75 break; 74 break;
76 } 75 }
77 76
78 /*
79 * CODEC is master for BCLK and LRC in this configuration.
80 */
81
82 /* set codec DAI configuration */
83 ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
84 SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
85 if (ret < 0)
86 return ret;
87 /* set cpu DAI configuration */
88 ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
89 SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
90 if (ret < 0)
91 return ret;
92
93 ret = snd_soc_dai_set_sysclk(codec_dai, SSM2602_SYSCLK, clk, 77 ret = snd_soc_dai_set_sysclk(codec_dai, SSM2602_SYSCLK, clk,
94 SND_SOC_CLOCK_IN); 78 SND_SOC_CLOCK_IN);
95 if (ret < 0) 79 if (ret < 0)
@@ -102,6 +86,10 @@ static struct snd_soc_ops bf5xx_ssm2602_ops = {
102 .hw_params = bf5xx_ssm2602_hw_params, 86 .hw_params = bf5xx_ssm2602_hw_params,
103}; 87};
104 88
89/* CODEC is master for BCLK and LRC in this configuration. */
90#define BF5XX_SSM2602_DAIFMT (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | \
91 SND_SOC_DAIFMT_CBM_CFM)
92
105static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { 93static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = {
106 { 94 {
107 .name = "ssm2602", 95 .name = "ssm2602",