Adding the power script data for zoom board to TWL4030 platform data. Updating the sleep/wakeup/warm_rest sequence & voltsetup_time from generic script file.
Signed-off-by: Lesly A M <[email protected]> Cc: Nishanth Menon <[email protected]> Cc: David Derrick <[email protected]> Cc: Samuel Ortiz <[email protected]> --- arch/arm/mach-omap2/Makefile | 9 ++++-- arch/arm/mach-omap2/board-3630sdp.c | 2 + arch/arm/mach-omap2/board-zoom-peripherals.c | 36 ++++++++++++++++++++++++++ arch/arm/mach-omap2/board-zoom2.c | 2 + arch/arm/mach-omap2/board-zoom3.c | 2 + 5 files changed, 48 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 1461628..32eedde 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -130,14 +130,17 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ board-zoom-peripherals.o \ hsmmc.o \ - board-zoom-debugboard.o + board-zoom-debugboard.o \ + twl4030-script.o obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \ board-zoom-peripherals.o \ hsmmc.o \ - board-zoom-debugboard.o + board-zoom-debugboard.o \ + twl4030-script.o obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \ board-zoom-peripherals.o \ - hsmmc.o + hsmmc.o \ + twl4030-script.o obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ hsmmc.o obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index d04987d..7c21af4 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -26,6 +26,7 @@ #include "mux.h" #include "sdram-hynix-h8mbx00u0mer-0em.h" #include "voltage.h" +#include "twl4030-script.h" /* CLKSETUP TIME which depends on the OSC/XTAL used on the board */ static struct prm_setup_vc omap3_setuptime = { @@ -109,6 +110,7 @@ static struct omap_board_mux board_mux[] __initdata = { static void __init omap_sdp_init(void) { + twl4030_get_vc_timings(&omap3_setuptime); omap_voltage_init_vc(&omap3_setuptime); omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index ca95d8d..d22be4d 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -26,6 +26,7 @@ #include "mux.h" #include "hsmmc.h" +#include "twl4030-script.h" /* Zoom2 has Qwerty keyboard*/ static int board_keymap[] = { @@ -94,6 +95,38 @@ static struct twl4030_keypad_data zoom_kp_twl4030_data = { .rep = 1, }; +static struct twl4030_resconfig twl4030_rconfig[] = { + { .resource = RES_VPLL1, .devgroup = DEV_GRP_P1, .type = 3, + .type2 = 1, .remap_sleep = RES_STATE_OFF }, + { .resource = RES_VINTANA1, .devgroup = DEV_GRP_ALL, .type = 1, + .type2 = 2, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_VINTANA2, .devgroup = DEV_GRP_ALL, .type = 0, + .type2 = 2, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_VINTDIG, .devgroup = DEV_GRP_ALL, .type = 1, + .type2 = 2, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_VIO, .devgroup = DEV_GRP_ALL, .type = 2, + .type2 = 2, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_VDD1, .devgroup = DEV_GRP_P1, + .type = 4, .type2 = 1, .remap_sleep = RES_STATE_OFF }, + { .resource = RES_VDD2, .devgroup = DEV_GRP_P1, + .type = 3, .type2 = 1, .remap_sleep = RES_STATE_OFF }, + { .resource = RES_REGEN, .devgroup = DEV_GRP_ALL, .type = 2, + .type2 = 1, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_NRES_PWRON, .devgroup = DEV_GRP_ALL, .type = 0, + .type2 = 1, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_CLKEN, .devgroup = DEV_GRP_ALL, .type = 3, + .type2 = 2, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_SYSEN, .devgroup = DEV_GRP_ALL, .type = 6, + .type2 = 1, .remap_sleep = RES_STATE_SLEEP }, + { .resource = RES_HFCLKOUT, .devgroup = DEV_GRP_P3, + .type = 0, .type2 = 2, .remap_sleep = RES_STATE_SLEEP }, + { 0, 0}, +}; + +static struct twl4030_power_data zoom_t2scripts_data __initdata = { + .resource_config = twl4030_rconfig, +}; + static struct regulator_consumer_supply zoom_vmmc1_supply = { .supply = "vmmc", }; @@ -239,6 +272,7 @@ static struct twl4030_platform_data zoom_twldata = { .usb = &zoom_usb_data, .gpio = &zoom_gpio_data, .keypad = &zoom_kp_twl4030_data, + .power = &zoom_t2scripts_data, .codec = &zoom_codec_data, .vmmc1 = &zoom_vmmc1, .vmmc2 = &zoom_vmmc2, @@ -279,6 +313,8 @@ static void enable_board_wakeup_source(void) void __init zoom_peripherals_init(void) { + twl4030_get_scripts(&zoom_t2scripts_data); + omap_i2c_init(); omap_serial_init(); usb_musb_init(&musb_board_data); diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index 37f43dd..652fd8f 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -27,6 +27,7 @@ #include "sdram-micron-mt46h32m32lf-6.h" #include "omap3-opp.h" #include "voltage.h" +#include "twl4030-script.h" /* CLKSETUP TIME which depends on the OSC/XTAL used on the board */ static struct prm_setup_vc omap3_setuptime = { @@ -94,6 +95,7 @@ static struct omap_board_mux board_mux[] __initdata = { static void __init omap_zoom2_init(void) { + twl4030_get_vc_timings(&omap3_setuptime); omap_voltage_init_vc(&omap3_setuptime); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c index 76858d5..22d985d 100644 --- a/arch/arm/mach-omap2/board-zoom3.c +++ b/arch/arm/mach-omap2/board-zoom3.c @@ -25,6 +25,7 @@ #include "mux.h" #include "sdram-hynix-h8mbx00u0mer-0em.h" #include "voltage.h" +#include "twl4030-script.h" /* CLKSETUP TIME which depends on the OSC/XTAL used on the board */ static struct prm_setup_vc omap3_setuptime = { @@ -78,6 +79,7 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { static void __init omap_zoom_init(void) { + twl4030_get_vc_timings(&omap3_setuptime); omap_voltage_init_vc(&omap3_setuptime); omap3_mux_init(board_mux, OMAP_PACKAGE_CBP); -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
