diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 13:40:25 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 13:40:25 +0300 |
| commit | 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57 (patch) | |
| tree | 6b932687edc73c07e544ccba3f0130fdb257d902 /sound/soc/omap/osk5912.c | |
| parent | facef8685b3ff95c01c33d9d836401d0dd26211d (diff) | |
| parent | 472346da9cc4231bec03ff2032e0d5fd4037232c (diff) | |
| download | linux-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.tar.xz | |
Merge branch 'topic/asoc' into to-push
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, /* Set codec DAI configuration */ err = snd_soc_dai_set_fmt(codec_dai, - SND_SOC_DAIFMT_DSP_A | + SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBM_CFM); if (err < 0) { @@ -71,7 +71,7 @@ static int osk_hw_params(struct snd_pcm_substream *substream, /* Set cpu DAI configuration */ err = snd_soc_dai_set_fmt(cpu_dai, - SND_SOC_DAIFMT_DSP_A | + SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBM_CFM); if (err < 0) { @@ -143,16 +143,16 @@ static struct snd_soc_dai_link osk_dai = { }; /* Audio machine driver */ -static struct snd_soc_machine snd_soc_machine_osk = { +static struct snd_soc_card snd_soc_card_osk = { .name = "OSK5912", + .platform = &omap_soc_platform, .dai_link = &osk_dai, .num_links = 1, }; /* Audio subsystem */ static struct snd_soc_device osk_snd_devdata = { - .machine = &snd_soc_machine_osk, - .platform = &omap_soc_platform, + .card = &snd_soc_card_osk, .codec_dev = &soc_codec_dev_tlv320aic23, }; |