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

Commit 610eb8c2 authored by R Sricharan's avatar R Sricharan Committed by Paul Walmsley
Browse files

ARM: OMAP4+: Add prm and cm base init function. 



Instead of statically defining seperate arrays for every OMAP4+ archs,
have a generic init function to populate the arrays. This avoids the
need for creating new array for every arch added in the future that
reuses the prm and cm registers read/write code.

Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarR Sricharan <r.sricharan@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 444b3df6

arch/arm/mach-omap2/cminst44xx.c

+18 −10
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "prcm44xx.h"

#include "prm44xx.h"

#include "prcm_mpu44xx.h"

#include "prcm-common.h"



/*

 * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield:
@@ -49,14 +50,21 @@ 
#define CLKCTRL_IDLEST_INTERFACE_IDLE		0x2

#define CLKCTRL_IDLEST_DISABLED			0x3



static u32 _cm_bases[OMAP4_MAX_PRCM_PARTITIONS] = {

	[OMAP4430_INVALID_PRCM_PARTITION]	= 0,

	[OMAP4430_PRM_PARTITION]		= OMAP4430_PRM_BASE,

	[OMAP4430_CM1_PARTITION]		= OMAP4430_CM1_BASE,

	[OMAP4430_CM2_PARTITION]		= OMAP4430_CM2_BASE,

	[OMAP4430_SCRM_PARTITION]		= 0,

	[OMAP4430_PRCM_MPU_PARTITION]		= OMAP4430_PRCM_MPU_BASE,

};

static void __iomem *_cm_bases[OMAP4_MAX_PRCM_PARTITIONS];



/**

 * omap_cm_base_init - Populates the cm partitions

 *

 * Populates the base addresses of the _cm_bases

 * array used for read/write of cm module registers.

 */

void omap_cm_base_init(void)

{

	_cm_bases[OMAP4430_PRM_PARTITION] = prm_base;

	_cm_bases[OMAP4430_CM1_PARTITION] = cm_base;

	_cm_bases[OMAP4430_CM2_PARTITION] = cm2_base;

	_cm_bases[OMAP4430_PRCM_MPU_PARTITION] = prcm_mpu_base;

}



/* Private functions */
@@ -106,7 +114,7 @@ u32 omap4_cminst_read_inst_reg(u8 part, s16 inst, u16 idx) 
	BUG_ON(part >= OMAP4_MAX_PRCM_PARTITIONS ||

	       part == OMAP4430_INVALID_PRCM_PARTITION ||

	       !_cm_bases[part]);

	return __raw_readl(OMAP2_L4_IO_ADDRESS(_cm_bases[part] + inst + idx));

	return __raw_readl(_cm_bases[part] + inst + idx);

}



/* Write into a register in a CM instance */
@@ -115,7 +123,7 @@ void omap4_cminst_write_inst_reg(u32 val, u8 part, s16 inst, u16 idx) 
	BUG_ON(part >= OMAP4_MAX_PRCM_PARTITIONS ||

	       part == OMAP4430_INVALID_PRCM_PARTITION ||

	       !_cm_bases[part]);

	__raw_writel(val, OMAP2_L4_IO_ADDRESS(_cm_bases[part] + inst + idx));

	__raw_writel(val, _cm_bases[part] + inst + idx);

}



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

arch/arm/mach-omap2/common.c

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ static struct omap_globals omap4_globals = { 
	.prm	= OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),

	.cm	= OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),

	.cm2	= OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE),

	.prcm_mpu	= OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE),

};



void __init omap2_set_globals_443x(void)

arch/arm/mach-omap2/common.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ struct omap_globals { 
	void __iomem	*prm;            /* Power and Reset Management */

	void __iomem	*cm;             /* Clock Management */

	void __iomem	*cm2;

	void __iomem	*prcm_mpu;

};



void omap2_set_globals_242x(void);

arch/arm/mach-omap2/prcm-common.h

+13 −0
Original line number Diff line number Diff line
@@ -414,6 +414,19 @@ 
extern void __iomem *prm_base;

extern void __iomem *cm_base;

extern void __iomem *cm2_base;

extern void __iomem *prcm_mpu_base;



#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_OMAP5)

extern void omap_prm_base_init(void);

extern void omap_cm_base_init(void);

#else

static inline void omap_prm_base_init(void)

{

}

static inline void omap_cm_base_init(void)

{

}

#endif



/**

 * struct omap_prcm_irq - describes a PRCM interrupt bit

arch/arm/mach-omap2/prcm.c

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
void __iomem *prm_base;

void __iomem *cm_base;

void __iomem *cm2_base;

void __iomem *prcm_mpu_base;



#define MAX_MODULE_ENABLE_WAIT		100000
@@ -155,4 +156,11 @@ void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) 
		cm_base = omap2_globals->cm;

	if (omap2_globals->cm2)

		cm2_base = omap2_globals->cm2;

	if (omap2_globals->prcm_mpu)

		prcm_mpu_base = omap2_globals->prcm_mpu;



	if (cpu_is_omap44xx()) {

		omap_prm_base_init();

		omap_cm_base_init();

	}

}