diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-06-07 03:28:54 -0400 |
---|---|---|
committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-07-04 11:43:38 -0400 |
commit | 827ed9aef2f13000d58616384ea6a22497e787b6 (patch) | |
tree | fd6d117feaa7ac9c9e6195224efff07f230e867a /arch/arm/mach-omap2/board-cm-t35.c | |
parent | b22f954bae35be115a10c6426dc070f7d652b32e (diff) |
OMAP3: Move common twl configuration to twl-common
Reduce the amount of duplicated code by moving the common
configuration for twl4030/5030/tpsxx to the twl-common file.
Use the omap3_pmic_get_config function from board files to
properly configure the PMIC with the common fields.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index d76dca788540..cb00abc4dd5d 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -410,10 +410,6 @@ static struct regulator_init_data cm_t35_vpll2 = { | |||
410 | .consumer_supplies = cm_t35_vdvi_supply, | 410 | .consumer_supplies = cm_t35_vdvi_supply, |
411 | }; | 411 | }; |
412 | 412 | ||
413 | static struct twl4030_usb_data cm_t35_usb_data = { | ||
414 | .usb_mode = T2_USB_MODE_ULPI, | ||
415 | }; | ||
416 | |||
417 | static uint32_t cm_t35_keymap[] = { | 413 | static uint32_t cm_t35_keymap[] = { |
418 | KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_LEFT), | 414 | KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_LEFT), |
419 | KEY(1, 0, KEY_UP), KEY(1, 1, KEY_ENTER), KEY(1, 2, KEY_DOWN), | 415 | KEY(1, 0, KEY_UP), KEY(1, 1, KEY_ENTER), KEY(1, 2, KEY_DOWN), |
@@ -492,12 +488,8 @@ static struct twl4030_gpio_platform_data cm_t35_gpio_data = { | |||
492 | }; | 488 | }; |
493 | 489 | ||
494 | static struct twl4030_platform_data cm_t35_twldata = { | 490 | static struct twl4030_platform_data cm_t35_twldata = { |
495 | .irq_base = TWL4030_IRQ_BASE, | ||
496 | .irq_end = TWL4030_IRQ_END, | ||
497 | |||
498 | /* platform_data for children goes here */ | 491 | /* platform_data for children goes here */ |
499 | .keypad = &cm_t35_kp_data, | 492 | .keypad = &cm_t35_kp_data, |
500 | .usb = &cm_t35_usb_data, | ||
501 | .gpio = &cm_t35_gpio_data, | 493 | .gpio = &cm_t35_gpio_data, |
502 | .vmmc1 = &cm_t35_vmmc1, | 494 | .vmmc1 = &cm_t35_vmmc1, |
503 | .vsim = &cm_t35_vsim, | 495 | .vsim = &cm_t35_vsim, |
@@ -507,6 +499,7 @@ static struct twl4030_platform_data cm_t35_twldata = { | |||
507 | 499 | ||
508 | static void __init cm_t35_init_i2c(void) | 500 | static void __init cm_t35_init_i2c(void) |
509 | { | 501 | { |
502 | omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB, 0); | ||
510 | omap3_pmic_init("tps65930", &cm_t35_twldata); | 503 | omap3_pmic_init("tps65930", &cm_t35_twldata); |
511 | } | 504 | } |
512 | 505 | ||