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

Commit 2ace831f authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP4: PRCM: add OMAP4-specific accessor/mutator functions 



In some ways, the OMAP4 PRCM register layout is quite different than
the OMAP2/3 PRCM register layout.  For example, on OMAP2/3, from a
register layout point of view, all CM instances were located in the CM
subsystem, and all PRM instances were located in the PRM subsystem.
OMAP4 changes this.  Now, for example, some CM instances, such as
WKUP_CM and EMU_CM, are located in the system PRM subsystem.  And a
"local PRCM" exists for the MPU - this PRCM combines registers that
would normally appear in both CM and PRM instances, but uses its own
register layout which matches neither the OMAP2/3 PRCM layout nor the
OMAP4 PRCM layout.

To try to deal with this, introduce some new functions, omap4_cminst*
and omap4_prminst*.  The former is to be used when writing to a CM
instance register (no matter what subsystem or hardware module it
exists in), and the latter, similarly, with PRM instance registers.
To determine which "PRCM partition" to write to, the functions take a
PRCM instance ID argument.  Subsequent patches add these partition IDs
to the OMAP4 powerdomain and clockdomain definitions.

As far as I can see, there's really no good way to handle these types
of register access inconsistencies.  This patch seemed like the least
bad approach.

Moving forward, the long-term goal is to remove all direct PRCM
register access from the PM code.  PRCM register access should go
through layers such as the powerdomain and clockdomain code that can
hide the details of how to interact with the specific hardware
variant.

While here, rename cm4xxx.c to cm44xx.c to match the naming convention
of the other OMAP4 PRCM files.

Thanks to Santosh Shilimkar <santosh.shilimkar@ti.com>, Rajendra Nayak
<rnayak@ti.com>, and Benoît Cousson <b-cousson@ti.com> for some comments.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
parent f0611a5c

arch/arm/mach-omap2/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,9 @@ obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o 
# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and

# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and

# will be removed once the OMAP4 part of the codebase is converted to

# will be removed once the OMAP4 part of the codebase is converted to

# use OMAP4-specific PRCM functions.

# use OMAP4-specific PRCM functions.

obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cm2xxx_3xxx.o cm4xxx.o

obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cm2xxx_3xxx.o cminst44xx.o \

					   cm44xx.o prcm_mpu44xx.o \

					   prminst44xx.o





# OMAP powerdomain framework

# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o

powerdomain-common			+= powerdomain.o powerdomain-common.o

arch/arm/mach-omap2/cm1_44xx.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -248,4 +248,9 @@ 
#define OMAP4_CM_DYN_DEP_PRESCAL_RESTORE_OFFSET		0x0040

#define OMAP4_CM_DYN_DEP_PRESCAL_RESTORE_OFFSET		0x0040

#define OMAP4430_CM_DYN_DEP_PRESCAL_RESTORE		OMAP44XX_CM1_REGADDR(OMAP4430_CM1_RESTORE_INST, 0x0040)

#define OMAP4430_CM_DYN_DEP_PRESCAL_RESTORE		OMAP44XX_CM1_REGADDR(OMAP4430_CM1_RESTORE_INST, 0x0040)





/* Function prototypes */

extern u32 omap4_cm1_read_inst_reg(s16 inst, u16 idx);

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

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



#endif
 
#endif

arch/arm/mach-omap2/cm2_44xx.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -480,4 +480,10 @@ 
#define OMAP4430_CM_L3INIT_USB_TLL_CLKCTRL_RESTORE	OMAP44XX_CM2_REGADDR(OMAP4430_CM2_RESTORE_INST, 0x0058)

#define OMAP4430_CM_L3INIT_USB_TLL_CLKCTRL_RESTORE	OMAP44XX_CM2_REGADDR(OMAP4430_CM2_RESTORE_INST, 0x0058)

#define OMAP4_CM_SDMA_STATICDEP_RESTORE_OFFSET		0x005c

#define OMAP4_CM_SDMA_STATICDEP_RESTORE_OFFSET		0x005c

#define OMAP4430_CM_SDMA_STATICDEP_RESTORE		OMAP44XX_CM2_REGADDR(OMAP4430_CM2_RESTORE_INST, 0x005c)

#define OMAP4430_CM_SDMA_STATICDEP_RESTORE		OMAP44XX_CM2_REGADDR(OMAP4430_CM2_RESTORE_INST, 0x005c)



/* Function prototypes */

extern u32 omap4_cm2_read_inst_reg(s16 inst, u16 idx);

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

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



#endif
 
#endif

arch/arm/mach-omap2/cm44xx.c

0 → 100644
+52 −0
Original line number Original line Diff line number Diff line 
/*

 * OMAP4 CM1, CM2 module low-level functions

 *

 * Copyright (C) 2010 Nokia Corporation

 * Paul Walmsley

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * These functions are intended to be used only by the cminst44xx.c file.

 * XXX Perhaps we should just move them there and make them static.

 */



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/io.h>



#include <plat/common.h>



#include "cm.h"

#include "cm1_44xx.h"

#include "cm2_44xx.h"

#include "cm-regbits-44xx.h"



/* CM1 hardware module low-level functions */



/* Read a register in CM1 */

u32 omap4_cm1_read_inst_reg(s16 inst, u16 reg)

{

	return __raw_readl(OMAP44XX_CM1_REGADDR(inst, reg));

}



/* Write into a register in CM1 */

void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 reg)

{

	__raw_writel(val, OMAP44XX_CM1_REGADDR(inst, reg));

}



/* Read a register in CM2 */

u32 omap4_cm2_read_inst_reg(s16 inst, u16 reg)

{

	return __raw_readl(OMAP44XX_CM2_REGADDR(inst, reg));

}



/* Write into a register in CM2 */

void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 reg)

{

	__raw_writel(val, OMAP44XX_CM2_REGADDR(inst, reg));

}

arch/arm/mach-omap2/cm4xxx.c→arch/arm/mach-omap2/cminst44xx.c

+109 −0
Original line number Original line Diff line number Diff line 
/*

/*

 * OMAP4 CM module functions

 * OMAP4 CM instance functions

 *

 *

 * Copyright (C) 2009 Nokia Corporation

 * Copyright (C) 2009 Nokia Corporation

 * Paul Walmsley

 * Paul Walmsley
@@ -7,24 +7,71 @@ 
 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 *

 * This is needed since CM instances can be in the PRM, PRCM_MPU, CM1,

 * or CM2 hardware modules.  For example, the EMU_CM CM instance is in

 * the PRM hardware module.  What a mess...

 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/delay.h>

#include <linux/spinlock.h>

#include <linux/list.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/io.h>





#include <asm/atomic.h>



#include <plat/common.h>

#include <plat/common.h>





#include "cm.h"

#include "cm1_44xx.h"

#include "cm2_44xx.h"

#include "cm44xx.h"

#include "cm44xx.h"

#include "cminst44xx.h"

#include "cm-regbits-44xx.h"

#include "cm-regbits-44xx.h"

#include "prcm44xx.h"

#include "prm44xx.h"

#include "prcm_mpu44xx.h"



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,

};



/* Read a register in a CM instance */

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

}



/* Write into a register in a CM instance */

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

}



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

u32 omap4_cminst_rmw_inst_reg_bits(u32 mask, u32 bits, u8 part, s16 inst,

				   s16 idx)

{

	u32 v;



	v = omap4_cminst_read_inst_reg(part, inst, idx);

	v &= ~mask;

	v |= bits;

	omap4_cminst_write_inst_reg(v, part, inst, idx);



	return v;

}







/**

/**

 * omap4_cm_wait_module_ready - wait for a module to be in 'func' state

 * omap4_cm_wait_module_ready - wait for a module to be in 'func' state