Commit ec5d043f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks
  OMAP2+: PM/serial: fix console semaphore acquire during suspend
  OMAP1: SRAM: fix size for OMAP1611 SoCs
  arm: omap2: io: fix clk_get() error check
  arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
  omap: nand: remove hardware ECC as default
  omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD
  omap: PM debug: fix wake-on-timer debugfs dependency
parents fc47e672 c2015dc8

arch/arm/mach-omap2/board-zoom-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static struct omap2_hsmmc_info mmc[] __initdata = { 
	{

		.name		= "wl1271",

		.mmc		= 3,

		.caps		= MMC_CAP_4_BIT_DATA,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD,

		.gpio_wp	= -EINVAL,

		.gpio_cd	= -EINVAL,

		.nonremovable	= true,

arch/arm/mach-omap2/io.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int __init _omap2_init_reprogram_sdrc(void) 
		return 0;



	dpll3_m2_ck = clk_get(NULL, "dpll3_m2_ck");

	if (!dpll3_m2_ck)

	if (IS_ERR(dpll3_m2_ck))

		return -EINVAL;



	rate = clk_get_rate(dpll3_m2_ck);

arch/arm/mach-omap2/pm-debug.c

+17 −17
Original line number Diff line number Diff line
@@ -161,6 +161,23 @@ void omap2_pm_dump(int mode, int resume, unsigned int us) 
		printk(KERN_INFO "%-20s: 0x%08x\n", regs[i].name, regs[i].val);

}



void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds)

{

	u32 tick_rate, cycles;



	if (!seconds && !milliseconds)

		return;



	tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer_wakeup));

	cycles = tick_rate * seconds + tick_rate * milliseconds / 1000;

	omap_dm_timer_stop(gptimer_wakeup);

	omap_dm_timer_set_load_start(gptimer_wakeup, 0, 0xffffffff - cycles);



	pr_info("PM: Resume timer in %u.%03u secs"

		" (%d ticks at %d ticks/sec.)\n",

		seconds, milliseconds, cycles, tick_rate);

}



#ifdef CONFIG_DEBUG_FS

#include <linux/debugfs.h>

#include <linux/seq_file.h>
@@ -354,23 +371,6 @@ void pm_dbg_update_time(struct powerdomain *pwrdm, int prev) 
	pwrdm->timer = t;

}



void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds)

{

	u32 tick_rate, cycles;



	if (!seconds && !milliseconds)

		return;



	tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer_wakeup));

	cycles = tick_rate * seconds + tick_rate * milliseconds / 1000;

	omap_dm_timer_stop(gptimer_wakeup);

	omap_dm_timer_set_load_start(gptimer_wakeup, 0, 0xffffffff - cycles);



	pr_info("PM: Resume timer in %u.%03u secs"

		" (%d ticks at %d ticks/sec.)\n",

		seconds, milliseconds, cycles, tick_rate);

}



static int clkdm_dbg_show_counter(struct clockdomain *clkdm, void *user)

{

	struct seq_file *s = (struct seq_file *)user;

arch/arm/mach-omap2/pm24xx.c

+31 −3
Original line number Diff line number Diff line
@@ -53,6 +53,19 @@ 
#include <plat/powerdomain.h>

#include <plat/clockdomain.h>



#ifdef CONFIG_SUSPEND

static suspend_state_t suspend_state = PM_SUSPEND_ON;

static inline bool is_suspending(void)

{

	return (suspend_state != PM_SUSPEND_ON);

}

#else

static inline bool is_suspending(void)

{

	return false;

}

#endif



static void (*omap2_sram_idle)(void);

static void (*omap2_sram_suspend)(u32 dllctrl, void __iomem *sdrc_dlla_ctrl,

				  void __iomem *sdrc_power);
@@ -120,6 +133,7 @@ static void omap2_enter_full_retention(void) 
		goto no_sleep;



	/* Block console output in case it is on one of the OMAP UARTs */

	if (!is_suspending())

		if (try_acquire_console_sem())

			goto no_sleep;
@@ -136,6 +150,7 @@ static void omap2_enter_full_retention(void) 
	omap_uart_resume_idle(1);

	omap_uart_resume_idle(0);



	if (!is_suspending())

		release_console_sem();



no_sleep:
@@ -284,6 +299,12 @@ out: 
	local_irq_enable();

}



static int omap2_pm_begin(suspend_state_t state)

{

	suspend_state = state;

	return 0;

}



static int omap2_pm_prepare(void)

{

	/* We cannot sleep in idle until we have resumed */
@@ -333,10 +354,17 @@ static void omap2_pm_finish(void) 
	enable_hlt();

}



static void omap2_pm_end(void)

{

	suspend_state = PM_SUSPEND_ON;

}



static struct platform_suspend_ops omap_pm_ops = {

	.begin		= omap2_pm_begin,

	.prepare	= omap2_pm_prepare,

	.enter		= omap2_pm_enter,

	.finish		= omap2_pm_finish,

	.end		= omap2_pm_end,

	.valid		= suspend_valid_only_mem,

};

arch/arm/mach-omap2/pm34xx.c

+20 −7
Original line number Diff line number Diff line
@@ -50,6 +50,19 @@ 
#include "sdrc.h"

#include "control.h"



#ifdef CONFIG_SUSPEND

static suspend_state_t suspend_state = PM_SUSPEND_ON;

static inline bool is_suspending(void)

{

	return (suspend_state != PM_SUSPEND_ON);

}

#else

static inline bool is_suspending(void)

{

	return false;

}

#endif



/* Scratchpad offsets */

#define OMAP343X_TABLE_ADDRESS_OFFSET	   0xc4

#define OMAP343X_TABLE_VALUE_OFFSET	   0xc0
@@ -387,6 +400,7 @@ void omap_sram_idle(void) 
	}



	/* Block console output in case it is on one of the OMAP UARTs */

	if (!is_suspending())

		if (per_next_state < PWRDM_POWER_ON ||

		    core_next_state < PWRDM_POWER_ON)

			if (try_acquire_console_sem())
@@ -470,6 +484,7 @@ void omap_sram_idle(void) 
		omap_uart_resume_idle(3);

	}



	if (!is_suspending())

		release_console_sem();



console_still_active:
@@ -514,8 +529,6 @@ out: 
}



#ifdef CONFIG_SUSPEND

static suspend_state_t suspend_state;



static int omap3_pm_prepare(void)

{

	disable_hlt();

CRA Git | Maintained and supported by SUSTech CRA and CCSE