Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8bea8672edfca7ec5f661cafb218f1205863b343

Authored by Stephen Rothwell
Committed by Linus Torvalds
1 parent d180ec5d34
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mfd: compile fix for twl4030 renaming 

Caused by commit 0b83ddebc6e884dc0221358cf68c461520fbdd8e ("MFD:
twl4030: add twl4030_codec MFD as a new child to the core") interacting
with commit b07682b6056eb6701f8cb86aa5800e6f2ea7919b ("mfd: Rename
twl4030* driver files to enable re-use").

This file seems to have been missed in the renaming.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 5 deletions Inline Diff

drivers/mfd/twl4030-codec.c
Diff comments   View file @ 8bea867
1 /* 1 /*
2 * MFD driver for twl4030 codec submodule 2 * MFD driver for twl4030 codec submodule
3 * 3 *
4 * Author: Peter Ujfalusi <peter.ujfalusi@nokia.com> 4 * Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
5 * 5 *
6 * Copyright: (C) 2009 Nokia Corporation 6 * Copyright: (C) 2009 Nokia Corporation
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as 9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, but 12 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of 13 * WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details. 15 * General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
20 * 02110-1301 USA 20 * 02110-1301 USA
21 * 21 *
22 */ 22 */
23 23
24 #include <linux/module.h> 24 #include <linux/module.h>
25 #include <linux/types.h> 25 #include <linux/types.h>
26 #include <linux/kernel.h> 26 #include <linux/kernel.h>
27 #include <linux/fs.h> 27 #include <linux/fs.h>
28 #include <linux/platform_device.h> 28 #include <linux/platform_device.h>
29 #include <linux/i2c/twl4030.h> 29 #include <linux/i2c/twl.h>
30 #include <linux/mfd/core.h> 30 #include <linux/mfd/core.h>
31 #include <linux/mfd/twl4030-codec.h> 31 #include <linux/mfd/twl4030-codec.h>
32 32
33 #define TWL4030_CODEC_CELLS 2 33 #define TWL4030_CODEC_CELLS 2
34 34
35 static struct platform_device *twl4030_codec_dev; 35 static struct platform_device *twl4030_codec_dev;
36 36
37 struct twl4030_codec_resource { 37 struct twl4030_codec_resource {
38 int request_count; 38 int request_count;
39 u8 reg; 39 u8 reg;
40 u8 mask; 40 u8 mask;
41 }; 41 };
42 42
43 struct twl4030_codec { 43 struct twl4030_codec {
44 unsigned int audio_mclk; 44 unsigned int audio_mclk;
45 struct mutex mutex; 45 struct mutex mutex;
46 struct twl4030_codec_resource resource[TWL4030_CODEC_RES_MAX]; 46 struct twl4030_codec_resource resource[TWL4030_CODEC_RES_MAX];
47 struct mfd_cell cells[TWL4030_CODEC_CELLS]; 47 struct mfd_cell cells[TWL4030_CODEC_CELLS];
48 }; 48 };
49 49
50 /* 50 /*
51 * Modify the resource, the function returns the content of the register 51 * Modify the resource, the function returns the content of the register
52 * after the modification. 52 * after the modification.
53 */ 53 */
54 static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable) 54 static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
55 { 55 {
56 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); 56 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
57 u8 val; 57 u8 val;
58 58
59 twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, 59 twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
60 codec->resource[id].reg); 60 codec->resource[id].reg);
61 61
62 if (enable) 62 if (enable)
63 val |= codec->resource[id].mask; 63 val |= codec->resource[id].mask;
64 else 64 else
65 val &= ~codec->resource[id].mask; 65 val &= ~codec->resource[id].mask;
66 66
67 twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, 67 twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
68 val, codec->resource[id].reg); 68 val, codec->resource[id].reg);
69 69
70 return val; 70 return val;
71 } 71 }
72 72
73 static inline int twl4030_codec_get_resource(enum twl4030_codec_res id) 73 static inline int twl4030_codec_get_resource(enum twl4030_codec_res id)
74 { 74 {
75 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); 75 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
76 u8 val; 76 u8 val;
77 77
78 twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, 78 twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
79 codec->resource[id].reg); 79 codec->resource[id].reg);
80 80
81 return val; 81 return val;
82 } 82 }
83 83
84 /* 84 /*
85 * Enable the resource. 85 * Enable the resource.
86 * The function returns with error or the content of the register 86 * The function returns with error or the content of the register
87 */ 87 */
88 int twl4030_codec_enable_resource(enum twl4030_codec_res id) 88 int twl4030_codec_enable_resource(enum twl4030_codec_res id)
89 { 89 {
90 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); 90 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
91 int val; 91 int val;
92 92
93 if (id >= TWL4030_CODEC_RES_MAX) { 93 if (id >= TWL4030_CODEC_RES_MAX) {
94 dev_err(&twl4030_codec_dev->dev, 94 dev_err(&twl4030_codec_dev->dev,
95 "Invalid resource ID (%u)\n", id); 95 "Invalid resource ID (%u)\n", id);
96 return -EINVAL; 96 return -EINVAL;
97 } 97 }
98 98
99 mutex_lock(&codec->mutex); 99 mutex_lock(&codec->mutex);
100 if (!codec->resource[id].request_count) 100 if (!codec->resource[id].request_count)
101 /* Resource was disabled, enable it */ 101 /* Resource was disabled, enable it */
102 val = twl4030_codec_set_resource(id, 1); 102 val = twl4030_codec_set_resource(id, 1);
103 else 103 else
104 val = twl4030_codec_get_resource(id); 104 val = twl4030_codec_get_resource(id);
105 105
106 codec->resource[id].request_count++; 106 codec->resource[id].request_count++;
107 mutex_unlock(&codec->mutex); 107 mutex_unlock(&codec->mutex);
108 108
109 return val; 109 return val;
110 } 110 }
111 EXPORT_SYMBOL_GPL(twl4030_codec_enable_resource); 111 EXPORT_SYMBOL_GPL(twl4030_codec_enable_resource);
112 112
113 /* 113 /*
114 * Disable the resource. 114 * Disable the resource.
115 * The function returns with error or the content of the register 115 * The function returns with error or the content of the register
116 */ 116 */
117 int twl4030_codec_disable_resource(unsigned id) 117 int twl4030_codec_disable_resource(unsigned id)
118 { 118 {
119 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); 119 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
120 int val; 120 int val;
121 121
122 if (id >= TWL4030_CODEC_RES_MAX) { 122 if (id >= TWL4030_CODEC_RES_MAX) {
123 dev_err(&twl4030_codec_dev->dev, 123 dev_err(&twl4030_codec_dev->dev,
124 "Invalid resource ID (%u)\n", id); 124 "Invalid resource ID (%u)\n", id);
125 return -EINVAL; 125 return -EINVAL;
126 } 126 }
127 127
128 mutex_lock(&codec->mutex); 128 mutex_lock(&codec->mutex);
129 if (!codec->resource[id].request_count) { 129 if (!codec->resource[id].request_count) {
130 dev_err(&twl4030_codec_dev->dev, 130 dev_err(&twl4030_codec_dev->dev,
131 "Resource has been disabled already (%u)\n", id); 131 "Resource has been disabled already (%u)\n", id);
132 mutex_unlock(&codec->mutex); 132 mutex_unlock(&codec->mutex);
133 return -EPERM; 133 return -EPERM;
134 } 134 }
135 codec->resource[id].request_count--; 135 codec->resource[id].request_count--;
136 136
137 if (!codec->resource[id].request_count) 137 if (!codec->resource[id].request_count)
138 /* Resource can be disabled now */ 138 /* Resource can be disabled now */
139 val = twl4030_codec_set_resource(id, 0); 139 val = twl4030_codec_set_resource(id, 0);
140 else 140 else
141 val = twl4030_codec_get_resource(id); 141 val = twl4030_codec_get_resource(id);
142 142
143 mutex_unlock(&codec->mutex); 143 mutex_unlock(&codec->mutex);
144 144
145 return val; 145 return val;
146 } 146 }
147 EXPORT_SYMBOL_GPL(twl4030_codec_disable_resource); 147 EXPORT_SYMBOL_GPL(twl4030_codec_disable_resource);
148 148
149 unsigned int twl4030_codec_get_mclk(void) 149 unsigned int twl4030_codec_get_mclk(void)
150 { 150 {
151 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev); 151 struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
152 152
153 return codec->audio_mclk; 153 return codec->audio_mclk;
154 } 154 }
155 EXPORT_SYMBOL_GPL(twl4030_codec_get_mclk); 155 EXPORT_SYMBOL_GPL(twl4030_codec_get_mclk);
156 156
157 static int __devinit twl4030_codec_probe(struct platform_device *pdev) 157 static int __devinit twl4030_codec_probe(struct platform_device *pdev)
158 { 158 {
159 struct twl4030_codec *codec; 159 struct twl4030_codec *codec;
160 struct twl4030_codec_data *pdata = pdev->dev.platform_data; 160 struct twl4030_codec_data *pdata = pdev->dev.platform_data;
161 struct mfd_cell *cell = NULL; 161 struct mfd_cell *cell = NULL;
162 int ret, childs = 0; 162 int ret, childs = 0;
163 u8 val; 163 u8 val;
164 164
165 if (!pdata) { 165 if (!pdata) {
166 dev_err(&pdev->dev, "Platform data is missing\n"); 166 dev_err(&pdev->dev, "Platform data is missing\n");
167 return -EINVAL; 167 return -EINVAL;
168 } 168 }
169 169
170 /* Configure APLL_INFREQ and disable APLL if enabled */ 170 /* Configure APLL_INFREQ and disable APLL if enabled */
171 val = 0; 171 val = 0;
172 switch (pdata->audio_mclk) { 172 switch (pdata->audio_mclk) {
173 case 19200000: 173 case 19200000:
174 val |= TWL4030_APLL_INFREQ_19200KHZ; 174 val |= TWL4030_APLL_INFREQ_19200KHZ;
175 break; 175 break;
176 case 26000000: 176 case 26000000:
177 val |= TWL4030_APLL_INFREQ_26000KHZ; 177 val |= TWL4030_APLL_INFREQ_26000KHZ;
178 break; 178 break;
179 case 38400000: 179 case 38400000:
180 val |= TWL4030_APLL_INFREQ_38400KHZ; 180 val |= TWL4030_APLL_INFREQ_38400KHZ;
181 break; 181 break;
182 default: 182 default:
183 dev_err(&pdev->dev, "Invalid audio_mclk\n"); 183 dev_err(&pdev->dev, "Invalid audio_mclk\n");
184 return -EINVAL; 184 return -EINVAL;
185 } 185 }
186 twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, 186 twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
187 val, TWL4030_REG_APLL_CTL); 187 val, TWL4030_REG_APLL_CTL);
188 188
189 codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL); 189 codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL);
190 if (!codec) 190 if (!codec)
191 return -ENOMEM; 191 return -ENOMEM;
192 192
193 platform_set_drvdata(pdev, codec); 193 platform_set_drvdata(pdev, codec);
194 194
195 twl4030_codec_dev = pdev; 195 twl4030_codec_dev = pdev;
196 mutex_init(&codec->mutex); 196 mutex_init(&codec->mutex);
197 codec->audio_mclk = pdata->audio_mclk; 197 codec->audio_mclk = pdata->audio_mclk;
198 198
199 /* Codec power */ 199 /* Codec power */
200 codec->resource[TWL4030_CODEC_RES_POWER].reg = TWL4030_REG_CODEC_MODE; 200 codec->resource[TWL4030_CODEC_RES_POWER].reg = TWL4030_REG_CODEC_MODE;
201 codec->resource[TWL4030_CODEC_RES_POWER].mask = TWL4030_CODECPDZ; 201 codec->resource[TWL4030_CODEC_RES_POWER].mask = TWL4030_CODECPDZ;
202 202
203 /* PLL */ 203 /* PLL */
204 codec->resource[TWL4030_CODEC_RES_APLL].reg = TWL4030_REG_APLL_CTL; 204 codec->resource[TWL4030_CODEC_RES_APLL].reg = TWL4030_REG_APLL_CTL;
205 codec->resource[TWL4030_CODEC_RES_APLL].mask = TWL4030_APLL_EN; 205 codec->resource[TWL4030_CODEC_RES_APLL].mask = TWL4030_APLL_EN;
206 206
207 if (pdata->audio) { 207 if (pdata->audio) {
208 cell = &codec->cells[childs]; 208 cell = &codec->cells[childs];
209 cell->name = "twl4030_codec_audio"; 209 cell->name = "twl4030_codec_audio";
210 cell->platform_data = pdata->audio; 210 cell->platform_data = pdata->audio;
211 cell->data_size = sizeof(*pdata->audio); 211 cell->data_size = sizeof(*pdata->audio);
212 childs++; 212 childs++;
213 } 213 }
214 if (pdata->vibra) { 214 if (pdata->vibra) {
215 cell = &codec->cells[childs]; 215 cell = &codec->cells[childs];
216 cell->name = "twl4030_codec_vibra"; 216 cell->name = "twl4030_codec_vibra";
217 cell->platform_data = pdata->vibra; 217 cell->platform_data = pdata->vibra;
218 cell->data_size = sizeof(*pdata->vibra); 218 cell->data_size = sizeof(*pdata->vibra);
219 childs++; 219 childs++;
220 } 220 }
221 221
222 if (childs) 222 if (childs)
223 ret = mfd_add_devices(&pdev->dev, pdev->id, codec->cells, 223 ret = mfd_add_devices(&pdev->dev, pdev->id, codec->cells,
224 childs, NULL, 0); 224 childs, NULL, 0);
225 else { 225 else {
226 dev_err(&pdev->dev, "No platform data found for childs\n"); 226 dev_err(&pdev->dev, "No platform data found for childs\n");
227 ret = -ENODEV; 227 ret = -ENODEV;
228 } 228 }
229 229
230 if (!ret) 230 if (!ret)
231 return 0; 231 return 0;
232 232
233 platform_set_drvdata(pdev, NULL); 233 platform_set_drvdata(pdev, NULL);
234 kfree(codec); 234 kfree(codec);
235 twl4030_codec_dev = NULL; 235 twl4030_codec_dev = NULL;
236 return ret; 236 return ret;
237 } 237 }
238 238
239 static int __devexit twl4030_codec_remove(struct platform_device *pdev) 239 static int __devexit twl4030_codec_remove(struct platform_device *pdev)
240 { 240 {
241 struct twl4030_codec *codec = platform_get_drvdata(pdev); 241 struct twl4030_codec *codec = platform_get_drvdata(pdev);
242 242
243 mfd_remove_devices(&pdev->dev); 243 mfd_remove_devices(&pdev->dev);
244 platform_set_drvdata(pdev, NULL); 244 platform_set_drvdata(pdev, NULL);
245 kfree(codec); 245 kfree(codec);
246 twl4030_codec_dev = NULL; 246 twl4030_codec_dev = NULL;
247 247
248 return 0; 248 return 0;
249 } 249 }
250 250
251 MODULE_ALIAS("platform:twl4030_codec"); 251 MODULE_ALIAS("platform:twl4030_codec");
252 252
253 static struct platform_driver twl4030_codec_driver = { 253 static struct platform_driver twl4030_codec_driver = {
254 .probe = twl4030_codec_probe, 254 .probe = twl4030_codec_probe,
255 .remove = __devexit_p(twl4030_codec_remove), 255 .remove = __devexit_p(twl4030_codec_remove),
256 .driver = { 256 .driver = {
257 .owner = THIS_MODULE, 257 .owner = THIS_MODULE,
258 .name = "twl4030_codec", 258 .name = "twl4030_codec",
259 }, 259 },
260 }; 260 };
261 261
262 static int __devinit twl4030_codec_init(void) 262 static int __devinit twl4030_codec_init(void)
263 { 263 {
264 return platform_driver_register(&twl4030_codec_driver); 264 return platform_driver_register(&twl4030_codec_driver);
265 } 265 }
266 module_init(twl4030_codec_init); 266 module_init(twl4030_codec_init);
267 267
268 static void __devexit twl4030_codec_exit(void) 268 static void __devexit twl4030_codec_exit(void)
269 { 269 {
270 platform_driver_unregister(&twl4030_codec_driver); 270 platform_driver_unregister(&twl4030_codec_driver);
271 } 271 }
272 module_exit(twl4030_codec_exit); 272 module_exit(twl4030_codec_exit);
273 273
274 MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@nokia.com>"); 274 MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@nokia.com>");
275 MODULE_LICENSE("GPL"); 275 MODULE_LICENSE("GPL");
276 276
277 277