Commit ad53ebb7 authored by Benoit Cousson's avatar Benoit Cousson Committed by Paul Walmsley
Browse files

OMAP4: prm: Remove deprecated functions 



The new prminst_xxx accessors based on partition and offset
is now used, so removed all the previous prcm_xxx accessors.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
[paul@pwsan.com: remove fn prototypes also]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent e54433f1

arch/arm/mach-omap2/prm44xx.c

+0 −37
Original line number Diff line number Diff line
@@ -50,40 +50,3 @@ u32 omap4_prm_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 reg) 


	return v;

}
 


/* Read a PRM register, AND it, and shift the result down to bit 0 */

/* XXX deprecated */

u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask)

{

	u32 v;



	v = __raw_readl(reg);

	v &= mask;

	v >>= __ffs(mask);



	return v;

}



/* Read-modify-write a register in a PRM module. Caller must lock */

/* XXX deprecated */

u32 omap4_prm_rmw_reg_bits(u32 mask, u32 bits, void __iomem *reg)

{

	u32 v;



	v = __raw_readl(reg);

	v &= ~mask;

	v |= bits;

	__raw_writel(v, reg);



	return v;

}



u32 omap4_prm_set_inst_reg_bits(u32 bits, s16 inst, s16 reg)

{

	return omap4_prm_rmw_inst_reg_bits(bits, bits, inst, reg);

}



u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 reg)

{

	return omap4_prm_rmw_inst_reg_bits(bits, 0x0, inst, reg);

}

arch/arm/mach-omap2/prm44xx.h

+0 −4
Original line number Diff line number Diff line
@@ -750,10 +750,6 @@ 
extern u32 omap4_prm_read_inst_reg(s16 inst, u16 idx);

extern void omap4_prm_write_inst_reg(u32 val, s16 inst, u16 idx);

extern u32 omap4_prm_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx);

extern u32 omap4_prm_rmw_reg_bits(u32 mask, u32 bits, void __iomem *reg);

extern u32 omap4_prm_set_inst_reg_bits(u32 bits, s16 inst, s16 idx);

extern u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 idx);

extern u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask);



# endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE