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

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

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



PRM driver now has a generic API for asserting 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 d9bbe84f

arch/arm/mach-omap2/omap_hwmod.c

+9 −9
Original line number Diff line number Diff line
@@ -2914,8 +2914,8 @@ static int _omap4_wait_target_ready(struct omap_hwmod *oh) 
static int _omap2_assert_hardreset(struct omap_hwmod *oh,

				   struct omap_hwmod_rst_info *ohri)

{

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

					  ohri->rst_shift);

	return omap_prm_assert_hardreset(ohri->rst_shift, 0,

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

}



/**
@@ -2974,7 +2974,7 @@ static int _omap4_assert_hardreset(struct omap_hwmod *oh, 
	if (!oh->clkdm)

		return -EINVAL;



	return omap4_prminst_assert_hardreset(ohri->rst_shift,

	return omap_prm_assert_hardreset(ohri->rst_shift,

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

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

					 oh->prcm.omap4.rstctrl_offs);
@@ -3047,7 +3047,7 @@ static int _am33xx_assert_hardreset(struct omap_hwmod *oh, 
				   struct omap_hwmod_rst_info *ohri)



{

	return am33xx_prm_assert_hardreset(ohri->rst_shift,

	return omap_prm_assert_hardreset(ohri->rst_shift, 0,

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

					 oh->prcm.omap4.rstctrl_offs);

}

arch/arm/mach-omap2/prm.h

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ struct prm_reset_src_map { 
 * @was_any_context_lost_old: ptr to the SoC PRM context loss test fn

 * @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

 *

 * XXX @was_any_context_lost_old and @clear_context_loss_flags_old are

 * deprecated.
@@ -137,11 +138,13 @@ struct prm_ll_data { 
	bool (*was_any_context_lost_old)(u8 part, s16 inst, u16 idx);

	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);

};



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);

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
@@ -212,6 +212,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,

};



int __init omap2xxx_prm_init(void)

arch/arm/mach-omap2/prm2xxx_3xxx.c

+4 −2
Original line number Diff line number Diff line
@@ -39,8 +39,10 @@ int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift) 


/**

 * omap2_prm_assert_hardreset - assert the HW reset line of a submodule

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

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

 * @part: PRM partition, ignored for OMAP2

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

 * @offset: register offset, ignored 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
@@ -49,7 +51,7 @@ int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift) 
 * place the submodule into reset.  Returns 0 upon success or -EINVAL

 * upon an argument error.

 */

int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift)

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

{

	u32 mask;

arch/arm/mach-omap2/prm2xxx_3xxx.h

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ 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);

extern int omap2_prm_assert_hardreset(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);



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