diff options
Diffstat (limited to 'sound/soc/s3c24xx/jive_wm8750.c')
-rw-r--r-- | sound/soc/s3c24xx/jive_wm8750.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 59dc2c6b56d9..8c108b121c10 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c | |||
@@ -70,7 +70,7 @@ static int jive_hw_params(struct snd_pcm_substream *substream, | |||
70 | } | 70 | } |
71 | 71 | ||
72 | s3c_i2sv2_iis_calc_rate(&div, NULL, params_rate(params), | 72 | s3c_i2sv2_iis_calc_rate(&div, NULL, params_rate(params), |
73 | s3c2412_get_iisclk()); | 73 | s3c_i2sv2_get_clock(cpu_dai)); |
74 | 74 | ||
75 | /* set codec DAI configuration */ | 75 | /* set codec DAI configuration */ |
76 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | 76 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | |
@@ -152,15 +152,10 @@ static struct snd_soc_card snd_soc_machine_jive = { | |||
152 | .num_links = 1, | 152 | .num_links = 1, |
153 | }; | 153 | }; |
154 | 154 | ||
155 | /* jive audio private data */ | ||
156 | static struct wm8750_setup_data jive_wm8750_setup = { | ||
157 | }; | ||
158 | |||
159 | /* jive audio subsystem */ | 155 | /* jive audio subsystem */ |
160 | static struct snd_soc_device jive_snd_devdata = { | 156 | static struct snd_soc_device jive_snd_devdata = { |
161 | .card = &snd_soc_machine_jive, | 157 | .card = &snd_soc_machine_jive, |
162 | .codec_dev = &soc_codec_dev_wm8750, | 158 | .codec_dev = &soc_codec_dev_wm8750, |
163 | .codec_data = &jive_wm8750_setup, | ||
164 | }; | 159 | }; |
165 | 160 | ||
166 | static struct platform_device *jive_snd_device; | 161 | static struct platform_device *jive_snd_device; |