From b6ec6d298682e198b81a0e11da161eab3087d2c2 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Sat, 9 Jul 2011 20:42:59 -0600 Subject: [PATCH] --- yaml --- r: 260485 b: refs/heads/master c: 93cac2ad0f9459422d0af79b6937d6e83ed3aec9 h: refs/heads/master i: 260483: 2988cbb41d45dba76152a5b7f09036d4335e506b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/clock44xx_data.c | 1 + trunk/arch/arm/mach-omap2/pm.c | 2 +- trunk/arch/arm/mach-omap2/powerdomains44xx_data.c | 7 +++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bee862d681ed..360cb1bf964d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a2a3603cf1c57ed21adb045a771405ab27335c1 +refs/heads/master: 93cac2ad0f9459422d0af79b6937d6e83ed3aec9 diff --git a/trunk/arch/arm/mach-omap2/clock44xx_data.c b/trunk/arch/arm/mach-omap2/clock44xx_data.c index 8c965671b4d4..72a3976d6c43 100644 --- a/trunk/arch/arm/mach-omap2/clock44xx_data.c +++ b/trunk/arch/arm/mach-omap2/clock44xx_data.c @@ -1694,6 +1694,7 @@ static struct clk gpmc_ick = { .ops = &clkops_omap2_dflt, .enable_reg = OMAP4430_CM_L3_2_GPMC_CLKCTRL, .enable_bit = OMAP4430_MODULEMODE_HWCTRL, + .flags = ENABLE_ON_INIT, .clkdm_name = "l3_2_clkdm", .parent = &l3_div_ck, .recalc = &followparent_recalc, diff --git a/trunk/arch/arm/mach-omap2/pm.c b/trunk/arch/arm/mach-omap2/pm.c index d48813fd62de..49486f522dca 100644 --- a/trunk/arch/arm/mach-omap2/pm.c +++ b/trunk/arch/arm/mach-omap2/pm.c @@ -106,7 +106,7 @@ static void omap2_init_processor_devices(void) int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) { u32 cur_state; - int sleep_switch = -1; + int sleep_switch = 0; int ret = 0; if (pwrdm == NULL || IS_ERR(pwrdm)) diff --git a/trunk/arch/arm/mach-omap2/powerdomains44xx_data.c b/trunk/arch/arm/mach-omap2/powerdomains44xx_data.c index 631e45258de1..c4222c7036a5 100644 --- a/trunk/arch/arm/mach-omap2/powerdomains44xx_data.c +++ b/trunk/arch/arm/mach-omap2/powerdomains44xx_data.c @@ -1,7 +1,7 @@ /* * OMAP4 Power domains framework * - * Copyright (C) 2009-2011 Texas Instruments, Inc. + * Copyright (C) 2009-2010 Texas Instruments, Inc. * Copyright (C) 2009-2011 Nokia Corporation * * Abhijit Pagare (abhijitpagare@ti.com) @@ -41,14 +41,14 @@ static struct powerdomain core_44xx_pwrdm = { .banks = 5, .pwrsts_mem_ret = { [0] = PWRSTS_OFF, /* core_nret_bank */ - [1] = PWRSTS_RET, /* core_ocmram */ + [1] = PWRSTS_OFF_RET, /* core_ocmram */ [2] = PWRSTS_RET, /* core_other_bank */ [3] = PWRSTS_OFF_RET, /* ducati_l2ram */ [4] = PWRSTS_OFF_RET, /* ducati_unicache */ }, .pwrsts_mem_on = { [0] = PWRSTS_ON, /* core_nret_bank */ - [1] = PWRSTS_ON, /* core_ocmram */ + [1] = PWRSTS_OFF_RET, /* core_ocmram */ [2] = PWRSTS_ON, /* core_other_bank */ [3] = PWRSTS_ON, /* ducati_l2ram */ [4] = PWRSTS_ON, /* ducati_unicache */ @@ -318,7 +318,6 @@ static struct powerdomain cefuse_44xx_pwrdm = { .prcm_partition = OMAP4430_PRM_PARTITION, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), .pwrsts = PWRSTS_OFF_ON, - .flags = PWRDM_HAS_LOWPOWERSTATECHANGE, }; /*