diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2009-10-22 06:26:46 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:09:07 -0500 |
commit | e86fa0b4a3fe0563e492db4c5a52fd37219a4c70 (patch) | |
tree | f7dbb1f1822f225b39678a8a0ddb1db6a03eb3a7 /arch | |
parent | 3066eec68d21cf4d468809c0b7b1fe9ee59c8f32 (diff) |
OMAP: Platform support for twl4030_codec MFD
Add needed platform data for the twl4030_codec MFD on boards,
where the audio part of the twl4030 codec is used.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-zoom2.c | 9 |
6 files changed, 54 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index a2abac98c569..7c1bbe255b8f 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -410,6 +410,14 @@ static struct regulator_init_data sdp3430_vpll2 = { | |||
410 | .consumer_supplies = &sdp3430_vdvi_supply, | 410 | .consumer_supplies = &sdp3430_vdvi_supply, |
411 | }; | 411 | }; |
412 | 412 | ||
413 | static struct twl4030_codec_audio_data sdp3430_audio = { | ||
414 | .audio_mclk = 26000000, | ||
415 | }; | ||
416 | |||
417 | static struct twl4030_codec_data sdp3430_codec = { | ||
418 | .audio = &sdp3430_audio, | ||
419 | }; | ||
420 | |||
413 | static struct twl4030_platform_data sdp3430_twldata = { | 421 | static struct twl4030_platform_data sdp3430_twldata = { |
414 | .irq_base = TWL4030_IRQ_BASE, | 422 | .irq_base = TWL4030_IRQ_BASE, |
415 | .irq_end = TWL4030_IRQ_END, | 423 | .irq_end = TWL4030_IRQ_END, |
@@ -420,6 +428,7 @@ static struct twl4030_platform_data sdp3430_twldata = { | |||
420 | .madc = &sdp3430_madc_data, | 428 | .madc = &sdp3430_madc_data, |
421 | .keypad = &sdp3430_kp_data, | 429 | .keypad = &sdp3430_kp_data, |
422 | .usb = &sdp3430_usb_data, | 430 | .usb = &sdp3430_usb_data, |
431 | .codec = &sdp3430_codec, | ||
423 | 432 | ||
424 | .vaux1 = &sdp3430_vaux1, | 433 | .vaux1 = &sdp3430_vaux1, |
425 | .vaux2 = &sdp3430_vaux2, | 434 | .vaux2 = &sdp3430_vaux2, |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 76c727ed8da5..23bfd333066f 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -254,6 +254,14 @@ static struct twl4030_usb_data beagle_usb_data = { | |||
254 | .usb_mode = T2_USB_MODE_ULPI, | 254 | .usb_mode = T2_USB_MODE_ULPI, |
255 | }; | 255 | }; |
256 | 256 | ||
257 | static struct twl4030_codec_audio_data beagle_audio_data = { | ||
258 | .audio_mclk = 26000000, | ||
259 | }; | ||
260 | |||
261 | static struct twl4030_codec_data beagle_codec_data = { | ||
262 | .audio = &beagle_audio_data, | ||
263 | }; | ||
264 | |||
257 | static struct twl4030_platform_data beagle_twldata = { | 265 | static struct twl4030_platform_data beagle_twldata = { |
258 | .irq_base = TWL4030_IRQ_BASE, | 266 | .irq_base = TWL4030_IRQ_BASE, |
259 | .irq_end = TWL4030_IRQ_END, | 267 | .irq_end = TWL4030_IRQ_END, |
@@ -261,6 +269,7 @@ static struct twl4030_platform_data beagle_twldata = { | |||
261 | /* platform_data for children goes here */ | 269 | /* platform_data for children goes here */ |
262 | .usb = &beagle_usb_data, | 270 | .usb = &beagle_usb_data, |
263 | .gpio = &beagle_gpio_data, | 271 | .gpio = &beagle_gpio_data, |
272 | .codec = &beagle_codec_data, | ||
264 | .vmmc1 = &beagle_vmmc1, | 273 | .vmmc1 = &beagle_vmmc1, |
265 | .vsim = &beagle_vsim, | 274 | .vsim = &beagle_vsim, |
266 | .vdac = &beagle_vdac, | 275 | .vdac = &beagle_vdac, |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 522ff6288c6f..4761c4f8f480 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -194,6 +194,14 @@ static struct twl4030_madc_platform_data omap3evm_madc_data = { | |||
194 | .irq_line = 1, | 194 | .irq_line = 1, |
195 | }; | 195 | }; |
196 | 196 | ||
197 | static struct twl4030_codec_audio_data omap3evm_audio_data = { | ||
198 | .audio_mclk = 26000000, | ||
199 | }; | ||
200 | |||
201 | static struct twl4030_codec_data omap3evm_codec_data = { | ||
202 | .audio = &omap3evm_audio_data, | ||
203 | }; | ||
204 | |||
197 | static struct twl4030_platform_data omap3evm_twldata = { | 205 | static struct twl4030_platform_data omap3evm_twldata = { |
198 | .irq_base = TWL4030_IRQ_BASE, | 206 | .irq_base = TWL4030_IRQ_BASE, |
199 | .irq_end = TWL4030_IRQ_END, | 207 | .irq_end = TWL4030_IRQ_END, |
@@ -203,6 +211,7 @@ static struct twl4030_platform_data omap3evm_twldata = { | |||
203 | .madc = &omap3evm_madc_data, | 211 | .madc = &omap3evm_madc_data, |
204 | .usb = &omap3evm_usb_data, | 212 | .usb = &omap3evm_usb_data, |
205 | .gpio = &omap3evm_gpio_data, | 213 | .gpio = &omap3evm_gpio_data, |
214 | .codec = &omap3evm_codec_data, | ||
206 | }; | 215 | }; |
207 | 216 | ||
208 | static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = { | 217 | static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = { |
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 7fb9023b4239..034e679b8408 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -281,11 +281,20 @@ static struct twl4030_usb_data omap3pandora_usb_data = { | |||
281 | .usb_mode = T2_USB_MODE_ULPI, | 281 | .usb_mode = T2_USB_MODE_ULPI, |
282 | }; | 282 | }; |
283 | 283 | ||
284 | static struct twl4030_codec_audio_data omap3pandora_audio_data = { | ||
285 | .audio_mclk = 26000000, | ||
286 | }; | ||
287 | |||
288 | static struct twl4030_codec_data omap3pandora_codec_data = { | ||
289 | .audio = &omap3pandora_audio_data, | ||
290 | }; | ||
291 | |||
284 | static struct twl4030_platform_data omap3pandora_twldata = { | 292 | static struct twl4030_platform_data omap3pandora_twldata = { |
285 | .irq_base = TWL4030_IRQ_BASE, | 293 | .irq_base = TWL4030_IRQ_BASE, |
286 | .irq_end = TWL4030_IRQ_END, | 294 | .irq_end = TWL4030_IRQ_END, |
287 | .gpio = &omap3pandora_gpio_data, | 295 | .gpio = &omap3pandora_gpio_data, |
288 | .usb = &omap3pandora_usb_data, | 296 | .usb = &omap3pandora_usb_data, |
297 | .codec = &omap3pandora_codec_data, | ||
289 | .vmmc1 = &pandora_vmmc1, | 298 | .vmmc1 = &pandora_vmmc1, |
290 | .vmmc2 = &pandora_vmmc2, | 299 | .vmmc2 = &pandora_vmmc2, |
291 | .keypad = &pandora_kp_data, | 300 | .keypad = &pandora_kp_data, |
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 461522c1bced..7303b4165e31 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -329,6 +329,14 @@ static struct regulator_init_data overo_vmmc1 = { | |||
329 | .consumer_supplies = &overo_vmmc1_supply, | 329 | .consumer_supplies = &overo_vmmc1_supply, |
330 | }; | 330 | }; |
331 | 331 | ||
332 | static struct twl4030_codec_audio_data overo_audio_data = { | ||
333 | .audio_mclk = 26000000, | ||
334 | }; | ||
335 | |||
336 | static struct twl4030_codec_data overo_codec_data = { | ||
337 | .audio = &overo_audio_data, | ||
338 | }; | ||
339 | |||
332 | /* mmc2 (WLAN) and Bluetooth don't use twl4030 regulators */ | 340 | /* mmc2 (WLAN) and Bluetooth don't use twl4030 regulators */ |
333 | 341 | ||
334 | static struct twl4030_platform_data overo_twldata = { | 342 | static struct twl4030_platform_data overo_twldata = { |
@@ -336,6 +344,7 @@ static struct twl4030_platform_data overo_twldata = { | |||
336 | .irq_end = TWL4030_IRQ_END, | 344 | .irq_end = TWL4030_IRQ_END, |
337 | .gpio = &overo_gpio_data, | 345 | .gpio = &overo_gpio_data, |
338 | .usb = &overo_usb_data, | 346 | .usb = &overo_usb_data, |
347 | .codec = &overo_codec_data, | ||
339 | .vmmc1 = &overo_vmmc1, | 348 | .vmmc1 = &overo_vmmc1, |
340 | }; | 349 | }; |
341 | 350 | ||
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index ea01a0fa07fb..a37bbb492ce9 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
@@ -230,6 +230,14 @@ static struct twl4030_madc_platform_data zoom2_madc_data = { | |||
230 | .irq_line = 1, | 230 | .irq_line = 1, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | static struct twl4030_codec_audio_data zoom2_audio_data = { | ||
234 | .audio_mclk = 26000000, | ||
235 | }; | ||
236 | |||
237 | static struct twl4030_codec_data zoom2_codec_data = { | ||
238 | .audio = &zoom2_audio_data, | ||
239 | }; | ||
240 | |||
233 | static struct twl4030_platform_data zoom2_twldata = { | 241 | static struct twl4030_platform_data zoom2_twldata = { |
234 | .irq_base = TWL4030_IRQ_BASE, | 242 | .irq_base = TWL4030_IRQ_BASE, |
235 | .irq_end = TWL4030_IRQ_END, | 243 | .irq_end = TWL4030_IRQ_END, |
@@ -240,6 +248,7 @@ static struct twl4030_platform_data zoom2_twldata = { | |||
240 | .usb = &zoom2_usb_data, | 248 | .usb = &zoom2_usb_data, |
241 | .gpio = &zoom2_gpio_data, | 249 | .gpio = &zoom2_gpio_data, |
242 | .keypad = &zoom2_kp_twl4030_data, | 250 | .keypad = &zoom2_kp_twl4030_data, |
251 | .codec = &zoom2_codec_data, | ||
243 | .vmmc1 = &zoom2_vmmc1, | 252 | .vmmc1 = &zoom2_vmmc1, |
244 | .vmmc2 = &zoom2_vmmc2, | 253 | .vmmc2 = &zoom2_vmmc2, |
245 | .vsim = &zoom2_vsim, | 254 | .vsim = &zoom2_vsim, |