diff options
Diffstat (limited to 'sound/soc/omap/osk5912.c')
-rw-r--r-- | sound/soc/omap/osk5912.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index 0fe733796898..cd41a948df7b 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c | |||
@@ -61,7 +61,7 @@ static int osk_hw_params(struct snd_pcm_substream *substream, | |||
61 | 61 | ||
62 | /* Set codec DAI configuration */ | 62 | /* Set codec DAI configuration */ |
63 | err = snd_soc_dai_set_fmt(codec_dai, | 63 | err = snd_soc_dai_set_fmt(codec_dai, |
64 | SND_SOC_DAIFMT_DSP_A | | 64 | SND_SOC_DAIFMT_DSP_B | |
65 | SND_SOC_DAIFMT_NB_IF | | 65 | SND_SOC_DAIFMT_NB_IF | |
66 | SND_SOC_DAIFMT_CBM_CFM); | 66 | SND_SOC_DAIFMT_CBM_CFM); |
67 | if (err < 0) { | 67 | if (err < 0) { |
@@ -71,7 +71,7 @@ static int osk_hw_params(struct snd_pcm_substream *substream, | |||
71 | 71 | ||
72 | /* Set cpu DAI configuration */ | 72 | /* Set cpu DAI configuration */ |
73 | err = snd_soc_dai_set_fmt(cpu_dai, | 73 | err = snd_soc_dai_set_fmt(cpu_dai, |
74 | SND_SOC_DAIFMT_DSP_A | | 74 | SND_SOC_DAIFMT_DSP_B | |
75 | SND_SOC_DAIFMT_NB_IF | | 75 | SND_SOC_DAIFMT_NB_IF | |
76 | SND_SOC_DAIFMT_CBM_CFM); | 76 | SND_SOC_DAIFMT_CBM_CFM); |
77 | if (err < 0) { | 77 | if (err < 0) { |
@@ -143,16 +143,16 @@ static struct snd_soc_dai_link osk_dai = { | |||
143 | }; | 143 | }; |
144 | 144 | ||
145 | /* Audio machine driver */ | 145 | /* Audio machine driver */ |
146 | static struct snd_soc_machine snd_soc_machine_osk = { | 146 | static struct snd_soc_card snd_soc_card_osk = { |
147 | .name = "OSK5912", | 147 | .name = "OSK5912", |
148 | .platform = &omap_soc_platform, | ||
148 | .dai_link = &osk_dai, | 149 | .dai_link = &osk_dai, |
149 | .num_links = 1, | 150 | .num_links = 1, |
150 | }; | 151 | }; |
151 | 152 | ||
152 | /* Audio subsystem */ | 153 | /* Audio subsystem */ |
153 | static struct snd_soc_device osk_snd_devdata = { | 154 | static struct snd_soc_device osk_snd_devdata = { |
154 | .machine = &snd_soc_machine_osk, | 155 | .card = &snd_soc_card_osk, |
155 | .platform = &omap_soc_platform, | ||
156 | .codec_dev = &soc_codec_dev_tlv320aic23, | 156 | .codec_dev = &soc_codec_dev_tlv320aic23, |
157 | }; | 157 | }; |
158 | 158 | ||