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

Commit 37fb59d7 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP2+: PRM: add generic API for deasserting hardware reset 



PRM driver now has a generic API for deasserting hardware resets. SoC
specific support functions are registered through the prm_ll_data.

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 efd44dc3

arch/arm/mach-omap2/omap_hwmod.c

+10 −12
Original line number Diff line number Diff line
@@ -2932,9 +2932,8 @@ static int _omap2_assert_hardreset(struct omap_hwmod *oh, 
static int _omap2_deassert_hardreset(struct omap_hwmod *oh,

				     struct omap_hwmod_rst_info *ohri)

{

	return omap2_prm_deassert_hardreset(oh->prcm.omap2.module_offs,

					    ohri->rst_shift,

					    ohri->st_shift);

	return omap_prm_deassert_hardreset(ohri->rst_shift, ohri->st_shift, 0,

					   oh->prcm.omap2.module_offs, 0, 0);

}



/**
@@ -3001,10 +3000,10 @@ static int _omap4_deassert_hardreset(struct omap_hwmod *oh, 
	if (ohri->st_shift)

		pr_err("omap_hwmod: %s: %s: hwmod data error: OMAP4 does not support st_shift\n",

		       oh->name, ohri->name);

	return omap4_prminst_deassert_hardreset(ohri->rst_shift,

	return omap_prm_deassert_hardreset(ohri->rst_shift, 0,

					   oh->clkdm->pwrdm.ptr->prcm_partition,

					   oh->clkdm->pwrdm.ptr->prcm_offs,

				oh->prcm.omap4.rstctrl_offs);

					   oh->prcm.omap4.rstctrl_offs, 0);

}



/**
@@ -3067,8 +3066,7 @@ static int _am33xx_assert_hardreset(struct omap_hwmod *oh, 
static int _am33xx_deassert_hardreset(struct omap_hwmod *oh,

				     struct omap_hwmod_rst_info *ohri)

{

	return am33xx_prm_deassert_hardreset(ohri->rst_shift,

				ohri->st_shift,

	return omap_prm_deassert_hardreset(ohri->rst_shift, ohri->st_shift, 0,

					   oh->clkdm->pwrdm.ptr->prcm_offs,

					   oh->prcm.omap4.rstctrl_offs,

					   oh->prcm.omap4.rstst_offs);

arch/arm/mach-omap2/prm.h

+7 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ struct prm_reset_src_map { 
 * @clear_context_loss_flags_old: ptr to the SoC PRM context loss flag clear fn

 * @late_init: ptr to the late init function

 * @assert_hardreset: ptr to the SoC PRM hardreset assert impl

 * @deassert_hardreset: ptr to the SoC PRM hardreset deassert impl

 *

 * XXX @was_any_context_lost_old and @clear_context_loss_flags_old are

 * deprecated.
@@ -139,12 +140,18 @@ struct prm_ll_data { 
	void (*clear_context_loss_flags_old)(u8 part, s16 inst, u16 idx);

	int (*late_init)(void);

	int (*assert_hardreset)(u8 shift, u8 part, s16 prm_mod, u16 offset);

	int (*deassert_hardreset)(u8 shift, u8 st_shift, u8 part, s16 prm_mod,

				  u16 offset, u16 st_offset);

	int (*is_hardreset_asserted)(u8 shift, u8 part, s16 prm_mod,

				     u16 offset);

};



extern int prm_register(struct prm_ll_data *pld);

extern int prm_unregister(struct prm_ll_data *pld);



int omap_prm_assert_hardreset(u8 shift, u8 part, s16 prm_mod, u16 offset);

int omap_prm_deassert_hardreset(u8 shift, u8 st_shift, u8 part, s16 prm_mod,

				u16 offset, u16 st_offset);

extern u32 prm_read_reset_sources(void);

extern bool prm_was_any_context_lost_old(u8 part, s16 inst, u16 idx);

extern void prm_clear_context_loss_flags_old(u8 part, s16 inst, u16 idx);

arch/arm/mach-omap2/prm2xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ struct pwrdm_ops omap2_pwrdm_operations = { 
static struct prm_ll_data omap2xxx_prm_ll_data = {

	.read_reset_sources = &omap2xxx_prm_read_reset_sources,

	.assert_hardreset = &omap2_prm_assert_hardreset,

	.deassert_hardreset = &omap2_prm_deassert_hardreset,

};



int __init omap2xxx_prm_init(void)

arch/arm/mach-omap2/prm2xxx_3xxx.c

+6 −1
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ int omap2_prm_assert_hardreset(u8 shift, u8 part, s16 prm_mod, u16 offset) 
 * @prm_mod: PRM submodule base (e.g. CORE_MOD)

 * @rst_shift: register bit shift corresponding to the reset line to deassert

 * @st_shift: register bit shift for the status of the deasserted submodule

 * @part: PRM partition, not used for OMAP2

 * @prm_mod: PRM submodule base (e.g. CORE_MOD)

 * @rst_offset: reset register offset, not used for OMAP2

 * @st_offset: reset status register offset, not used for OMAP2

 *

 * Some IPs like dsp or iva contain processors that require an HW

 * reset line to be asserted / deasserted in order to fully enable the
@@ -76,7 +80,8 @@ int omap2_prm_assert_hardreset(u8 shift, u8 part, s16 prm_mod, u16 offset) 
 * -EINVAL upon an argument error, -EEXIST if the submodule was already out

 * of reset, or -EBUSY if the submodule did not exit reset promptly.

 */

int omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, u8 st_shift)

int omap2_prm_deassert_hardreset(u8 rst_shift, u8 st_shift, u8 part,

				 s16 prm_mod, u16 rst_offset, u16 st_offset)

{

	u32 rst, st;

	int c;

arch/arm/mach-omap2/prm2xxx_3xxx.h

+3 −1
Original line number Diff line number Diff line
@@ -103,7 +103,9 @@ static inline u32 omap2_prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) 
extern int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift);

int omap2_prm_assert_hardreset(u8 shift, u8 part, s16 prm_mod,

			       u16 offset);

extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, u8 st_shift);

int omap2_prm_deassert_hardreset(u8 rst_shift, u8 st_shift, u8 part,

				 s16 prm_mod, u16 reset_offset,

				 u16 st_offset);



extern int omap2_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst);

extern int omap2_pwrdm_read_next_pwrst(struct powerdomain *pwrdm);