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

Commit 261bfb28 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Kevin Hilman
Browse files

omap3: pm: Use exported set_cr() instead of a custom one. 



Remove the custom restore_control_register() and use the exported
set_cr() instead to set the system control register(SCTRL) value.

No functional change.

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 51d070af

arch/arm/mach-omap2/pm34xx.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -311,11 +311,6 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





static void restore_control_register(u32 val)

{

	__asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0" : : "r" (val));

}



/* Function to restore the table entry that was modified for enabling MMU */

/* Function to restore the table entry that was modified for enabling MMU */

static void restore_table_entry(void)

static void restore_table_entry(void)

{

{
@@ -337,7 +332,7 @@ static void restore_table_entry(void) 
	control_reg_value = __raw_readl(scratchpad_address

	control_reg_value = __raw_readl(scratchpad_address

					+ OMAP343X_CONTROL_REG_VALUE_OFFSET);

					+ OMAP343X_CONTROL_REG_VALUE_OFFSET);

	/* This will enable caches and prediction */

	/* This will enable caches and prediction */

	restore_control_register(control_reg_value);

	set_cr(control_reg_value);

}

}





void omap_sram_idle(void)

void omap_sram_idle(void)