diff options
Diffstat (limited to 'sound/soc/s3c24xx/neo1973_wm8753.c')
| -rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 87ddfefcc2fb..45bb12e8ea44 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #define NEO_CAPTURE_HEADSET 7 | 59 | #define NEO_CAPTURE_HEADSET 7 |
| 60 | #define NEO_CAPTURE_BLUETOOTH 8 | 60 | #define NEO_CAPTURE_BLUETOOTH 8 |
| 61 | 61 | ||
| 62 | static struct snd_soc_machine neo1973; | 62 | static struct snd_soc_card neo1973; |
| 63 | static struct i2c_client *i2c; | 63 | static struct i2c_client *i2c; |
| 64 | 64 | ||
| 65 | static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream, | 65 | static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream, |
| @@ -548,7 +548,6 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec) | |||
| 548 | static struct snd_soc_dai bt_dai = { | 548 | static struct snd_soc_dai bt_dai = { |
| 549 | .name = "Bluetooth", | 549 | .name = "Bluetooth", |
| 550 | .id = 0, | 550 | .id = 0, |
| 551 | .type = SND_SOC_DAI_PCM, | ||
| 552 | .playback = { | 551 | .playback = { |
| 553 | .channels_min = 1, | 552 | .channels_min = 1, |
| 554 | .channels_max = 1, | 553 | .channels_max = 1, |
| @@ -579,8 +578,9 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
| 579 | }, | 578 | }, |
| 580 | }; | 579 | }; |
| 581 | 580 | ||
| 582 | static struct snd_soc_machine neo1973 = { | 581 | static struct snd_soc_card neo1973 = { |
| 583 | .name = "neo1973", | 582 | .name = "neo1973", |
| 583 | .platform = &s3c24xx_soc_platform, | ||
| 584 | .dai_link = neo1973_dai, | 584 | .dai_link = neo1973_dai, |
| 585 | .num_links = ARRAY_SIZE(neo1973_dai), | 585 | .num_links = ARRAY_SIZE(neo1973_dai), |
| 586 | }; | 586 | }; |
| @@ -591,8 +591,7 @@ static struct wm8753_setup_data neo1973_wm8753_setup = { | |||
| 591 | }; | 591 | }; |
| 592 | 592 | ||
| 593 | static struct snd_soc_device neo1973_snd_devdata = { | 593 | static struct snd_soc_device neo1973_snd_devdata = { |
| 594 | .machine = &neo1973, | 594 | .card = &neo1973, |
| 595 | .platform = &s3c24xx_soc_platform, | ||
| 596 | .codec_dev = &soc_codec_dev_wm8753, | 595 | .codec_dev = &soc_codec_dev_wm8753, |
| 597 | .codec_data = &neo1973_wm8753_setup, | 596 | .codec_data = &neo1973_wm8753_setup, |
| 598 | }; | 597 | }; |
