diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index d8c0e89f0126..8216e5f64a6a 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
26 | #include <linux/usb/otg.h> | 26 | #include <linux/usb/otg.h> |
27 | #include <linux/i2c/twl.h> | 27 | #include <linux/i2c/twl.h> |
28 | #include <linux/mfd/twl6040.h> | ||
28 | #include <linux/regulator/machine.h> | 29 | #include <linux/regulator/machine.h> |
29 | #include <linux/regulator/fixed.h> | 30 | #include <linux/regulator/fixed.h> |
30 | #include <linux/wl12xx.h> | 31 | #include <linux/wl12xx.h> |
@@ -230,7 +231,7 @@ static struct platform_device omap_vwlan_device = { | |||
230 | }, | 231 | }, |
231 | }; | 232 | }; |
232 | 233 | ||
233 | struct wl12xx_platform_data omap_panda_wlan_data __initdata = { | 234 | static struct wl12xx_platform_data omap_panda_wlan_data __initdata = { |
234 | /* PANDA ref clock is 38.4 MHz */ | 235 | /* PANDA ref clock is 38.4 MHz */ |
235 | .board_ref_clock = 2, | 236 | .board_ref_clock = 2, |
236 | }; | 237 | }; |
@@ -284,7 +285,7 @@ static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers) | |||
284 | return 0; | 285 | return 0; |
285 | } | 286 | } |
286 | 287 | ||
287 | static struct twl4030_codec_data twl6040_codec = { | 288 | static struct twl6040_codec_data twl6040_codec = { |
288 | /* single-step ramp for headset and handsfree */ | 289 | /* single-step ramp for headset and handsfree */ |
289 | .hs_left_step = 0x0f, | 290 | .hs_left_step = 0x0f, |
290 | .hs_right_step = 0x0f, | 291 | .hs_right_step = 0x0f, |
@@ -292,17 +293,14 @@ static struct twl4030_codec_data twl6040_codec = { | |||
292 | .hf_right_step = 0x1d, | 293 | .hf_right_step = 0x1d, |
293 | }; | 294 | }; |
294 | 295 | ||
295 | static struct twl4030_audio_data twl6040_audio = { | 296 | static struct twl6040_platform_data twl6040_data = { |
296 | .codec = &twl6040_codec, | 297 | .codec = &twl6040_codec, |
297 | .audpwron_gpio = 127, | 298 | .audpwron_gpio = 127, |
298 | .naudint_irq = OMAP44XX_IRQ_SYS_2N, | ||
299 | .irq_base = TWL6040_CODEC_IRQ_BASE, | 299 | .irq_base = TWL6040_CODEC_IRQ_BASE, |
300 | }; | 300 | }; |
301 | 301 | ||
302 | /* Panda board uses the common PMIC configuration */ | 302 | /* Panda board uses the common PMIC configuration */ |
303 | static struct twl4030_platform_data omap4_panda_twldata = { | 303 | static struct twl4030_platform_data omap4_panda_twldata; |
304 | .audio = &twl6040_audio, | ||
305 | }; | ||
306 | 304 | ||
307 | /* | 305 | /* |
308 | * Display monitor features are burnt in their EEPROM as EDID data. The EEPROM | 306 | * Display monitor features are burnt in their EEPROM as EDID data. The EEPROM |
@@ -326,7 +324,8 @@ static int __init omap4_panda_i2c_init(void) | |||
326 | TWL_COMMON_REGULATOR_VCXIO | | 324 | TWL_COMMON_REGULATOR_VCXIO | |
327 | TWL_COMMON_REGULATOR_VUSB | | 325 | TWL_COMMON_REGULATOR_VUSB | |
328 | TWL_COMMON_REGULATOR_CLK32KG); | 326 | TWL_COMMON_REGULATOR_CLK32KG); |
329 | omap4_pmic_init("twl6030", &omap4_panda_twldata); | 327 | omap4_pmic_init("twl6030", &omap4_panda_twldata, |
328 | &twl6040_data, OMAP44XX_IRQ_SYS_2N); | ||
330 | omap_register_i2c_bus(2, 400, NULL, 0); | 329 | omap_register_i2c_bus(2, 400, NULL, 0); |
331 | /* | 330 | /* |
332 | * Bus 3 is attached to the DVI port where devices like the pico DLP | 331 | * Bus 3 is attached to the DVI port where devices like the pico DLP |
@@ -439,7 +438,7 @@ static struct panel_dvi_platform_data omap4_dvi_panel = { | |||
439 | .i2c_bus_num = 3, | 438 | .i2c_bus_num = 3, |
440 | }; | 439 | }; |
441 | 440 | ||
442 | struct omap_dss_device omap4_panda_dvi_device = { | 441 | static struct omap_dss_device omap4_panda_dvi_device = { |
443 | .type = OMAP_DISPLAY_TYPE_DPI, | 442 | .type = OMAP_DISPLAY_TYPE_DPI, |
444 | .name = "dvi", | 443 | .name = "dvi", |
445 | .driver_name = "dvi", | 444 | .driver_name = "dvi", |
@@ -449,7 +448,7 @@ struct omap_dss_device omap4_panda_dvi_device = { | |||
449 | .channel = OMAP_DSS_CHANNEL_LCD2, | 448 | .channel = OMAP_DSS_CHANNEL_LCD2, |
450 | }; | 449 | }; |
451 | 450 | ||
452 | int __init omap4_panda_dvi_init(void) | 451 | static int __init omap4_panda_dvi_init(void) |
453 | { | 452 | { |
454 | int r; | 453 | int r; |
455 | 454 | ||
@@ -510,7 +509,7 @@ static struct omap_dss_board_info omap4_panda_dss_data = { | |||
510 | .default_device = &omap4_panda_dvi_device, | 509 | .default_device = &omap4_panda_dvi_device, |
511 | }; | 510 | }; |
512 | 511 | ||
513 | void __init omap4_panda_display_init(void) | 512 | static void __init omap4_panda_display_init(void) |
514 | { | 513 | { |
515 | int r; | 514 | int r; |
516 | 515 | ||