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

Commit 840b7eb8 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: AM33xx: PRM: move global warm reset implementation to driver 



Moved the implementation from am33xx-restart.c to the prm33xx.c file to
isolate the PRM register accesses to be private for PRM driver.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 88f9474f

arch/arm/mach-omap2/am33xx-restart.c

+1 −8
Original line number Diff line number Diff line
@@ -24,12 +24,5 @@ void am33xx_restart(enum reboot_mode mode, const char *cmd) 
{

	/* TODO: Handle mode and cmd if necessary */



	am33xx_prm_rmw_reg_bits(AM33XX_RST_GLOBAL_WARM_SW_MASK,

				AM33XX_RST_GLOBAL_WARM_SW_MASK,

				AM33XX_PRM_DEVICE_MOD,

				AM33XX_PRM_RSTCTRL_OFFSET);



	/* OCP barrier */

	(void)am33xx_prm_read_reg(AM33XX_PRM_DEVICE_MOD,

				  AM33XX_PRM_RSTCTRL_OFFSET);

	am33xx_prm_global_warm_sw_reset();

}

arch/arm/mach-omap2/prm33xx.c

+21 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
#include "prm33xx.h"

#include "prm-regbits-33xx.h"



#define AM33XX_PRM_RSTCTRL_OFFSET		0x0000



#define AM33XX_RST_GLOBAL_WARM_SW_MASK		(1 << 0)



/* Read a register in a PRM instance */

u32 am33xx_prm_read_reg(s16 inst, u16 idx)

{
@@ -332,6 +336,23 @@ static int am33xx_check_vcvp(void) 
	return 0;

}



/**

 * am33xx_prm_global_warm_sw_reset - reboot the device via warm reset

 *

 * Immediately reboots the device through warm reset.

 */

void am33xx_prm_global_warm_sw_reset(void)

{

	am33xx_prm_rmw_reg_bits(AM33XX_RST_GLOBAL_WARM_SW_MASK,

				AM33XX_RST_GLOBAL_WARM_SW_MASK,

				AM33XX_PRM_DEVICE_MOD,

				AM33XX_PRM_RSTCTRL_OFFSET);



	/* OCP barrier */

	(void)am33xx_prm_read_reg(AM33XX_PRM_DEVICE_MOD,

				  AM33XX_PRM_RSTCTRL_OFFSET);

}



struct pwrdm_ops am33xx_pwrdm_operations = {

	.pwrdm_set_next_pwrst		= am33xx_pwrdm_set_next_pwrst,

	.pwrdm_read_next_pwrst		= am33xx_pwrdm_read_next_pwrst,