diff options
author | Tony Lindgren <tony@atomide.com> | 2011-07-10 14:48:26 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-07-10 14:48:26 -0400 |
commit | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 (patch) | |
tree | cea7ef733c50025496f554f114173e49e52d3028 /arch/arm/mach-omap2/board-rx51-peripherals.c | |
parent | f67df6c670a8fcd3f63728afa2314e7eca653bd7 (diff) | |
parent | 727e18b429e3badda12d1de74f492bfa363a2e94 (diff) |
Merge branch 'cleanup-part-2' into devel-board
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 7d3775425170..8946d7232f3c 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -348,10 +348,6 @@ static struct twl4030_keypad_data rx51_kp_data = { | |||
348 | .rep = 1, | 348 | .rep = 1, |
349 | }; | 349 | }; |
350 | 350 | ||
351 | static struct twl4030_madc_platform_data rx51_madc_data = { | ||
352 | .irq_line = 1, | ||
353 | }; | ||
354 | |||
355 | /* Enable input logic and pull all lines up when eMMC is on. */ | 351 | /* Enable input logic and pull all lines up when eMMC is on. */ |
356 | static struct omap_board_mux rx51_mmc2_on_mux[] = { | 352 | static struct omap_board_mux rx51_mmc2_on_mux[] = { |
357 | OMAP3_MUX(SDMMC2_CMD, OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0), | 353 | OMAP3_MUX(SDMMC2_CMD, OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0), |
@@ -458,10 +454,6 @@ static struct regulator_consumer_supply rx51_vaux1_consumers[] = { | |||
458 | REGULATOR_SUPPLY("vdd", "2-0063"), | 454 | REGULATOR_SUPPLY("vdd", "2-0063"), |
459 | }; | 455 | }; |
460 | 456 | ||
461 | static struct regulator_consumer_supply rx51_vdac_supply[] = { | ||
462 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"), | ||
463 | }; | ||
464 | |||
465 | static struct regulator_init_data rx51_vaux1 = { | 457 | static struct regulator_init_data rx51_vaux1 = { |
466 | .constraints = { | 458 | .constraints = { |
467 | .name = "V28", | 459 | .name = "V28", |
@@ -604,21 +596,6 @@ static struct regulator_init_data rx51_vsim = { | |||
604 | .consumer_supplies = rx51_vsim_supply, | 596 | .consumer_supplies = rx51_vsim_supply, |
605 | }; | 597 | }; |
606 | 598 | ||
607 | static struct regulator_init_data rx51_vdac = { | ||
608 | .constraints = { | ||
609 | .name = "VDAC", | ||
610 | .min_uV = 1800000, | ||
611 | .max_uV = 1800000, | ||
612 | .apply_uV = true, | ||
613 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
614 | | REGULATOR_MODE_STANDBY, | ||
615 | .valid_ops_mask = REGULATOR_CHANGE_MODE | ||
616 | | REGULATOR_CHANGE_STATUS, | ||
617 | }, | ||
618 | .num_consumer_supplies = ARRAY_SIZE(rx51_vdac_supply), | ||
619 | .consumer_supplies = rx51_vdac_supply, | ||
620 | }; | ||
621 | |||
622 | static struct regulator_init_data rx51_vio = { | 599 | static struct regulator_init_data rx51_vio = { |
623 | .constraints = { | 600 | .constraints = { |
624 | .min_uV = 1800000, | 601 | .min_uV = 1800000, |
@@ -726,10 +703,6 @@ static struct twl4030_gpio_platform_data rx51_gpio_data = { | |||
726 | .setup = rx51_twlgpio_setup, | 703 | .setup = rx51_twlgpio_setup, |
727 | }; | 704 | }; |
728 | 705 | ||
729 | static struct twl4030_usb_data rx51_usb_data = { | ||
730 | .usb_mode = T2_USB_MODE_ULPI, | ||
731 | }; | ||
732 | |||
733 | static struct twl4030_ins sleep_on_seq[] __initdata = { | 706 | static struct twl4030_ins sleep_on_seq[] __initdata = { |
734 | /* | 707 | /* |
735 | * Turn off everything | 708 | * Turn off everything |
@@ -901,14 +874,9 @@ struct twl4030_codec_data rx51_codec_data __initdata = { | |||
901 | }; | 874 | }; |
902 | 875 | ||
903 | static struct twl4030_platform_data rx51_twldata __initdata = { | 876 | static struct twl4030_platform_data rx51_twldata __initdata = { |
904 | .irq_base = TWL4030_IRQ_BASE, | ||
905 | .irq_end = TWL4030_IRQ_END, | ||
906 | |||
907 | /* platform_data for children goes here */ | 877 | /* platform_data for children goes here */ |
908 | .gpio = &rx51_gpio_data, | 878 | .gpio = &rx51_gpio_data, |
909 | .keypad = &rx51_kp_data, | 879 | .keypad = &rx51_kp_data, |
910 | .madc = &rx51_madc_data, | ||
911 | .usb = &rx51_usb_data, | ||
912 | .power = &rx51_t2scripts_data, | 880 | .power = &rx51_t2scripts_data, |
913 | .codec = &rx51_codec_data, | 881 | .codec = &rx51_codec_data, |
914 | 882 | ||
@@ -919,7 +887,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = { | |||
919 | .vpll1 = &rx51_vpll1, | 887 | .vpll1 = &rx51_vpll1, |
920 | .vpll2 = &rx51_vpll2, | 888 | .vpll2 = &rx51_vpll2, |
921 | .vsim = &rx51_vsim, | 889 | .vsim = &rx51_vsim, |
922 | .vdac = &rx51_vdac, | ||
923 | .vintana1 = &rx51_vintana1, | 890 | .vintana1 = &rx51_vintana1, |
924 | .vintana2 = &rx51_vintana2, | 891 | .vintana2 = &rx51_vintana2, |
925 | .vintdig = &rx51_vintdig, | 892 | .vintdig = &rx51_vintdig, |
@@ -984,6 +951,13 @@ static int __init rx51_i2c_init(void) | |||
984 | rx51_twldata.vaux3 = &rx51_vaux3_cam; | 951 | rx51_twldata.vaux3 = &rx51_vaux3_cam; |
985 | } | 952 | } |
986 | rx51_twldata.vmmc2 = &rx51_vmmc2; | 953 | rx51_twldata.vmmc2 = &rx51_vmmc2; |
954 | omap3_pmic_get_config(&rx51_twldata, | ||
955 | TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_MADC, | ||
956 | TWL_COMMON_REGULATOR_VDAC); | ||
957 | |||
958 | rx51_twldata.vdac->constraints.apply_uV = true; | ||
959 | rx51_twldata.vdac->constraints.name = "VDAC"; | ||
960 | |||
987 | omap_pmic_init(1, 2200, "twl5030", INT_34XX_SYS_NIRQ, &rx51_twldata); | 961 | omap_pmic_init(1, 2200, "twl5030", INT_34XX_SYS_NIRQ, &rx51_twldata); |
988 | omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2, | 962 | omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2, |
989 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_2)); | 963 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_2)); |