Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cdee912 authored by Thara Gopinath's avatar Thara Gopinath Committed by Kevin Hilman
Browse files

OMAP: PM debugfs removing OMAP3 hardcodings. 



This patch removes omap3 hardcodings from pm-debug.c
so that enabling PM debugfs support does break compilation
for other OMAP's. This is a preparatory patch for supporting
OMAP4 pm entries through PM debugfs.

Signed-off-by: default avatarThara Gopinath <thara@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent d5c47d7e

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

+16 −5
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
#include "pm.h"



int omap2_pm_debug;

u32 enable_off_mode;

u32 sleep_while_idle;

u32 wakeup_timer_seconds;

u32 wakeup_timer_milliseconds;



#define DUMP_PRM_MOD_REG(mod, reg)    \

	regs[reg_count].name = #mod "." #reg; \
@@ -494,7 +498,9 @@ int pm_dbg_regset_init(int reg_set) 


static int pwrdm_suspend_get(void *data, u64 *val)

{

	int ret;

	int ret = -EINVAL;



	if (cpu_is_omap34xx())

		ret = omap3_pm_get_suspend_state((struct powerdomain *)data);

	*val = ret;
@@ -505,7 +511,10 @@ static int pwrdm_suspend_get(void *data, u64 *val) 


static int pwrdm_suspend_set(void *data, u64 val)

{

	return omap3_pm_set_suspend_state((struct powerdomain *)data, (int)val);

	if (cpu_is_omap34xx())

		return omap3_pm_set_suspend_state(

			(struct powerdomain *)data, (int)val);

	return -EINVAL;

}



DEFINE_SIMPLE_ATTRIBUTE(pwrdm_suspend_fops, pwrdm_suspend_get,
@@ -553,8 +562,10 @@ static int option_set(void *data, u64 val) 


	*option = val;



	if (option == &enable_off_mode)

	if (option == &enable_off_mode) {

		if (cpu_is_omap34xx())

			omap3_pm_off_mode_enable(val);

	}



	return 0;

}

arch/arm/mach-omap2/pm34xx.c

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ 
#define OMAP343X_TABLE_VALUE_OFFSET	   0x30

#define OMAP343X_CONTROL_REG_VALUE_OFFSET  0x32



u32 enable_off_mode;

u32 sleep_while_idle;

u32 wakeup_timer_seconds;

u32 wakeup_timer_milliseconds;



struct power_state {

	struct powerdomain *pwrdm;

	u32 next_state;