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

Commit e9b0a2fb authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2xxx: hwmod/CM: add RNG integration data 



Add integration data for the hardware random number generator IP block
on some OMAP SoCs.  This appears to be present on at least OMAP2xxx
and OMAP3xxx SoCs, although it is not so easy to tell.  It may also be
present on other OMAP2+ SoCs.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent da496873

arch/arm/mach-omap2/cm2xxx_3xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define OMAP2XXX_APLL_AUTOIDLE_LOW_POWER_STOP		0x3



static const u8 cm_idlest_offs[] = {

	CM_IDLEST1, CM_IDLEST2, OMAP2430_CM_IDLEST3

	CM_IDLEST1, CM_IDLEST2, OMAP2430_CM_IDLEST3, OMAP24XX_CM_IDLEST4

};



u32 omap2_cm_read_mod_reg(s16 module, u16 idx)

arch/arm/mach-omap2/cm2xxx_3xxx.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#define OMAP24XX_CM_FCLKEN2				0x0004

#define OMAP24XX_CM_ICLKEN4				0x001c

#define OMAP24XX_CM_AUTOIDLE4				0x003c

#define OMAP24XX_CM_IDLEST4				0x002c



#define OMAP2430_CM_IDLEST3				0x0028

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+1 −0
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = { 
	&omap2420_l4_core__mcbsp1,

	&omap2420_l4_core__mcbsp2,

	&omap2420_l4_core__msdi1,

	&omap2xxx_l4_core__rng,

	&omap2420_l4_core__hdq1w,

	&omap2420_l4_wkup__counter_32k,

	&omap2420_l3__gpmc,

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+1 −0
Original line number Diff line number Diff line
@@ -961,6 +961,7 @@ static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = { 
	&omap2430_l4_core__mcbsp4,

	&omap2430_l4_core__mcbsp5,

	&omap2430_l4_core__hdq1w,

	&omap2xxx_l4_core__rng,

	&omap2430_l4_wkup__counter_32k,

	&omap2430_l3__gpmc,

	NULL,

arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c

+17 −0
Original line number Diff line number Diff line
@@ -129,6 +129,15 @@ struct omap_hwmod_addr_space omap2xxx_mcbsp2_addrs[] = { 
	{ }

};



static struct omap_hwmod_addr_space omap2_rng_addr_space[] = {

	{

		.pa_start	= 0x480a0000,

		.pa_end		= 0x480a004f,

		.flags		= ADDR_TYPE_RT

	},

	{ }

};



/*

 * Common interconnect data

 */
@@ -372,3 +381,11 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_venc = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4_core -> rng */

struct omap_hwmod_ocp_if omap2xxx_l4_core__rng = {

	.master		= &omap2xxx_l4_core_hwmod,

	.slave		= &omap2xxx_rng_hwmod,

	.clk		= "rng_ick",

	.addr		= omap2_rng_addr_space,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};