diff options
| -rw-r--r-- | include/linux/mfd/davinci_voicecodec.h | 7 | ||||
| -rw-r--r-- | sound/soc/codecs/cq93vc.c | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h index cb01496bfa49..8e1cdbef3dad 100644 --- a/include/linux/mfd/davinci_voicecodec.h +++ b/include/linux/mfd/davinci_voicecodec.h | |||
| @@ -99,12 +99,6 @@ struct davinci_vcif { | |||
| 99 | dma_addr_t dma_rx_addr; | 99 | dma_addr_t dma_rx_addr; |
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | struct cq93vc { | ||
| 103 | struct platform_device *pdev; | ||
| 104 | struct snd_soc_codec *codec; | ||
| 105 | u32 sysclk; | ||
| 106 | }; | ||
| 107 | |||
| 108 | struct davinci_vc; | 102 | struct davinci_vc; |
| 109 | 103 | ||
| 110 | struct davinci_vc { | 104 | struct davinci_vc { |
| @@ -122,7 +116,6 @@ struct davinci_vc { | |||
| 122 | 116 | ||
| 123 | /* Client devices */ | 117 | /* Client devices */ |
| 124 | struct davinci_vcif davinci_vcif; | 118 | struct davinci_vcif davinci_vcif; |
| 125 | struct cq93vc cq93vc; | ||
| 126 | }; | 119 | }; |
| 127 | 120 | ||
| 128 | #endif | 121 | #endif |
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 537327c7f7f1..036a877746b9 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c | |||
| @@ -62,14 +62,10 @@ static int cq93vc_mute(struct snd_soc_dai *dai, int mute) | |||
| 62 | static int cq93vc_set_dai_sysclk(struct snd_soc_dai *codec_dai, | 62 | static int cq93vc_set_dai_sysclk(struct snd_soc_dai *codec_dai, |
| 63 | int clk_id, unsigned int freq, int dir) | 63 | int clk_id, unsigned int freq, int dir) |
| 64 | { | 64 | { |
| 65 | struct snd_soc_codec *codec = codec_dai->codec; | ||
| 66 | struct davinci_vc *davinci_vc = codec->dev->platform_data; | ||
| 67 | |||
| 68 | switch (freq) { | 65 | switch (freq) { |
| 69 | case 22579200: | 66 | case 22579200: |
| 70 | case 27000000: | 67 | case 27000000: |
| 71 | case 33868800: | 68 | case 33868800: |
| 72 | davinci_vc->cq93vc.sysclk = freq; | ||
| 73 | return 0; | 69 | return 0; |
| 74 | } | 70 | } |
| 75 | 71 | ||
| @@ -135,10 +131,6 @@ static int cq93vc_resume(struct snd_soc_codec *codec) | |||
| 135 | 131 | ||
| 136 | static int cq93vc_probe(struct snd_soc_codec *codec) | 132 | static int cq93vc_probe(struct snd_soc_codec *codec) |
| 137 | { | 133 | { |
| 138 | struct davinci_vc *davinci_vc = codec->dev->platform_data; | ||
| 139 | |||
| 140 | davinci_vc->cq93vc.codec = codec; | ||
| 141 | |||
| 142 | /* Off, with power on */ | 134 | /* Off, with power on */ |
| 143 | cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 135 | cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
| 144 | 136 | ||
