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

Commit 1bc28b34 authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP2+: PRM: add generic API for checking hardreset status 



PRM driver now has a generic API for checking hardreset status. 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 37fb59d7

arch/arm/mach-omap2/omap_hwmod.c

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

					struct omap_hwmod_rst_info *ohri)

{

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

					       ohri->st_shift);

	return omap_prm_is_hardreset_asserted(ohri->st_shift, 0,

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

}



/**
@@ -3024,8 +3024,9 @@ static int _omap4_is_hardreset_asserted(struct omap_hwmod *oh, 
	if (!oh->clkdm)

		return -EINVAL;



	return omap4_prminst_is_hardreset_asserted(ohri->rst_shift,

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

	return omap_prm_is_hardreset_asserted(ohri->rst_shift,

					      oh->clkdm->pwrdm.ptr->

					      prcm_partition,

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

					      oh->prcm.omap4.rstctrl_offs);

}
@@ -3087,7 +3088,7 @@ static int _am33xx_deassert_hardreset(struct omap_hwmod *oh, 
static int _am33xx_is_hardreset_asserted(struct omap_hwmod *oh,

					struct omap_hwmod_rst_info *ohri)

{

	return am33xx_prm_is_hardreset_asserted(ohri->rst_shift,

	return omap_prm_is_hardreset_asserted(ohri->rst_shift, 0,

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

					      oh->prcm.omap4.rstctrl_offs);

}

arch/arm/mach-omap2/prm.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 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);

int omap_prm_is_hardreset_asserted(u8 shift, u8 part, s16 prm_mod, u16 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
@@ -214,6 +214,7 @@ 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,

	.is_hardreset_asserted = &omap2_prm_is_hardreset_asserted,

};



int __init omap2xxx_prm_init(void)

arch/arm/mach-omap2/prm2xxx_3xxx.c

+4 −2
Original line number Diff line number Diff line
@@ -24,14 +24,16 @@ 
/**

 * omap2_prm_is_hardreset_asserted - read the HW reset line state of

 * submodules contained in the hwmod module

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

 * @shift: register bit shift corresponding to the reset line to check

 * @part: PRM partition, ignored for OMAP2

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

 * @offset: register offset, ignored for OMAP2

 *

 * Returns 1 if the (sub)module hardreset line is currently asserted,

 * 0 if the (sub)module hardreset line is not currently asserted, or

 * -EINVAL if called while running on a non-OMAP2/3 chip.

 */

int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift)

int omap2_prm_is_hardreset_asserted(u8 shift, u8 part, s16 prm_mod, u16 offset)

{

	return omap2_prm_read_mod_bits_shift(prm_mod, OMAP2_RM_RSTCTRL,

				       (1 << shift));

arch/arm/mach-omap2/prm2xxx_3xxx.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static inline u32 omap2_prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) 
}



/* These omap2_ PRM functions apply to both OMAP2 and 3 */

extern int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift);

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

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

			       u16 offset);

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