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

OMAP2+: voltage: reorganize, split code from data 

This is a first pass at reorganizing mach-omap2/voltage.c:

- Separate almost all of the data from the code of mach-omap2/voltage.c.
  The code remains in mach-omap2/voltage.c.  The data goes into one
  of several places, depending on what type of data it is:

  - Silicon process/validation data: mach-omap2/opp*_data.c
  - VC (Voltage Controller) data: mach-omap2/vc*_data.c
  - VP (Voltage Processor) data: mach-omap2/vp*_data.c
  - Voltage domain data: mach-omap2/voltagedomains*_data.c

  The ultimate goal is for all this data to be autogenerated, the same
  way we autogenerate the rest of our data.

- Separate VC and VP common data from VDD-specific VC and VP data.

- Separate common voltage.c code from SoC-specific code; reuse common code.

- Reorganize structures to avoid unnecessary memory loss due to unpacked
  fields.

There is much left to be done.  VC code and VP code should be separated out
into vc*.c and vp*.c files.  Many fields in the existing structures are
superfluous, and should be removed.  Some code in voltage.c seems to be
duplicated; that code should be moved into functions of its own.  Proper
voltage domain code should be created, as was done with the powerdomain
and clockdomains, and powerdomains should reference voltagedomains.

Thanks to Shweta Gulati <shweta.gulati@ti.com> for comments.  Thanks
to Rajendra Nayak <rnayak@ti.com> for finding and fixing some bugs
that prevented OMAP4 from booting:

   https://patchwork.kernel.org/patch/587311/

His patch has been folded into this one to avoid breaking OMAP4
between patches.  Thanks also to Kevin Hilman <khilman@ti.com> for
finding and fixing a compile problem when !CONFIG_PM:

   http://www.spinics.net/lists/arm-kernel/msg118067.html



His patch has also been folded into this one to avoid breaking
!CONFIG_PM builds.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Shweta Gulati <shweta.gulati@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
parent e1d6f472

arch/arm/mach-omap2/Makefile

+17 −5
Original line number Diff line number Diff line
@@ -59,10 +59,10 @@ endif 
# Power Management

ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o pm_bus.o voltage.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o voltage.o \

obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o \

					   cpuidle34xx.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o voltage.o pm_bus.o

obj-$(CONFIG_ARCH_OMAP4)		+= pm44xx.o pm_bus.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o

obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o

obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)	+= smartreflex-class3.o
@@ -78,13 +78,25 @@ endif 


# PRCM

obj-$(CONFIG_ARCH_OMAP2)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \

					   vc3xxx_data.o vp3xxx_data.o

# 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

# use OMAP4-specific PRCM functions.

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

					   cm44xx.o prcm_mpu44xx.o \

					   prminst44xx.o

					   prminst44xx.o vc44xx_data.o \

					   vp44xx_data.o



# OMAP voltage domains

ifeq ($(CONFIG_PM),y)

voltagedomain-common			:= voltage.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(voltagedomain-common)

obj-$(CONFIG_ARCH_OMAP3)		+= $(voltagedomain-common) \

					   voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common) \

					   voltagedomains44xx_data.o

endif



# OMAP powerdomain framework

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

arch/arm/mach-omap2/omap_opp_data.h

+24 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 


#include <plat/omap_hwmod.h>



#include "voltage.h"



/*

 * *BIG FAT WARNING*:

 * USE the following ONLY in opp data initialization common to an SoC.
@@ -65,8 +67,30 @@ struct omap_opp_def { 
	.u_volt		= _uv,					\

}



/*

 * Initialization wrapper used to define SmartReflex process data

 * XXX Is this needed?  Just use C99 initializers in data files?

 */

#define VOLT_DATA_DEFINE(_v_nom, _efuse_offs, _errminlimit, _errgain)  \

{								       \

	.volt_nominal	= _v_nom,				       \

	.sr_efuse_offs	= _efuse_offs,				       \

	.sr_errminlimit = _errminlimit,				       \

	.vp_errgain	= _errgain				       \

}



/* Use this to initialize the default table */

extern int __init omap_init_opp_table(struct omap_opp_def *opp_def,

		u32 opp_def_size);





extern struct omap_volt_data omap34xx_vddmpu_volt_data[];

extern struct omap_volt_data omap34xx_vddcore_volt_data[];

extern struct omap_volt_data omap36xx_vddmpu_volt_data[];

extern struct omap_volt_data omap36xx_vddcore_volt_data[];



extern struct omap_volt_data omap44xx_vdd_mpu_volt_data[];

extern struct omap_volt_data omap44xx_vdd_iva_volt_data[];

extern struct omap_volt_data omap44xx_vdd_core_volt_data[];



#endif		/* __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H */

arch/arm/mach-omap2/opp3xxx_data.c

+65 −1
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ 
 * Copyright (C) 2009-2010 Texas Instruments Incorporated - http://www.ti.com/

 *	Nishanth Menon

 *	Kevin Hilman

 * Copyright (C) 2010 Nokia Corporation.

 * Copyright (C) 2010-2011 Nokia Corporation.

 *      Eduardo Valentin

 *      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
@@ -20,8 +21,71 @@ 


#include <plat/cpu.h>



#include "control.h"

#include "omap_opp_data.h"



/* 34xx */



/* VDD1 */



#define OMAP3430_VDD_MPU_OPP1_UV		975000

#define OMAP3430_VDD_MPU_OPP2_UV		1075000

#define OMAP3430_VDD_MPU_OPP3_UV		1200000

#define OMAP3430_VDD_MPU_OPP4_UV		1270000

#define OMAP3430_VDD_MPU_OPP5_UV		1350000



struct omap_volt_data omap34xx_vddmpu_volt_data[] = {

	VOLT_DATA_DEFINE(OMAP3430_VDD_MPU_OPP1_UV, OMAP343X_CONTROL_FUSE_OPP1_VDD1, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP3430_VDD_MPU_OPP2_UV, OMAP343X_CONTROL_FUSE_OPP2_VDD1, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP3430_VDD_MPU_OPP3_UV, OMAP343X_CONTROL_FUSE_OPP3_VDD1, 0xf9, 0x18),

	VOLT_DATA_DEFINE(OMAP3430_VDD_MPU_OPP4_UV, OMAP343X_CONTROL_FUSE_OPP4_VDD1, 0xf9, 0x18),

	VOLT_DATA_DEFINE(OMAP3430_VDD_MPU_OPP5_UV, OMAP343X_CONTROL_FUSE_OPP5_VDD1, 0xf9, 0x18),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



/* VDD2 */



#define OMAP3430_VDD_CORE_OPP1_UV		975000

#define OMAP3430_VDD_CORE_OPP2_UV		1050000

#define OMAP3430_VDD_CORE_OPP3_UV		1150000



struct omap_volt_data omap34xx_vddcore_volt_data[] = {

	VOLT_DATA_DEFINE(OMAP3430_VDD_CORE_OPP1_UV, OMAP343X_CONTROL_FUSE_OPP1_VDD2, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP3430_VDD_CORE_OPP2_UV, OMAP343X_CONTROL_FUSE_OPP2_VDD2, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP3430_VDD_CORE_OPP3_UV, OMAP343X_CONTROL_FUSE_OPP3_VDD2, 0xf9, 0x18),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



/* 36xx */



/* VDD1 */



#define OMAP3630_VDD_MPU_OPP50_UV		1012500

#define OMAP3630_VDD_MPU_OPP100_UV		1200000

#define OMAP3630_VDD_MPU_OPP120_UV		1325000

#define OMAP3630_VDD_MPU_OPP1G_UV		1375000



struct omap_volt_data omap36xx_vddmpu_volt_data[] = {

	VOLT_DATA_DEFINE(OMAP3630_VDD_MPU_OPP50_UV, OMAP3630_CONTROL_FUSE_OPP50_VDD1, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP3630_VDD_MPU_OPP100_UV, OMAP3630_CONTROL_FUSE_OPP100_VDD1, 0xf9, 0x16),

	VOLT_DATA_DEFINE(OMAP3630_VDD_MPU_OPP120_UV, OMAP3630_CONTROL_FUSE_OPP120_VDD1, 0xfa, 0x23),

	VOLT_DATA_DEFINE(OMAP3630_VDD_MPU_OPP1G_UV, OMAP3630_CONTROL_FUSE_OPP1G_VDD1, 0xfa, 0x27),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



/* VDD2 */



#define OMAP3630_VDD_CORE_OPP50_UV		1000000

#define OMAP3630_VDD_CORE_OPP100_UV		1200000



struct omap_volt_data omap36xx_vddcore_volt_data[] = {

	VOLT_DATA_DEFINE(OMAP3630_VDD_CORE_OPP50_UV, OMAP3630_CONTROL_FUSE_OPP50_VDD2, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP3630_VDD_CORE_OPP100_UV, OMAP3630_CONTROL_FUSE_OPP100_VDD2, 0xf9, 0x16),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



/* OPP data */



static struct omap_opp_def __initdata omap34xx_opp_def_list[] = {

	/* MPU OPP1 */

	OPP_INITIALIZER("mpu", true, 125000000, 975000),

arch/arm/mach-omap2/opp4xxx_data.c

+42 −1
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ 
 *	Nishanth Menon

 *	Kevin Hilman

 *	Thara Gopinath

 * Copyright (C) 2010 Nokia Corporation.

 * Copyright (C) 2010-2011 Nokia Corporation.

 *      Eduardo Valentin

 *      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
@@ -21,8 +22,48 @@ 


#include <plat/cpu.h>



#include "control.h"

#include "omap_opp_data.h"



/*

 * Structures containing OMAP4430 voltage supported and various

 * voltage dependent data for each VDD.

 */



#define OMAP4430_VDD_MPU_OPP50_UV		930000

#define OMAP4430_VDD_MPU_OPP100_UV		1100000

#define OMAP4430_VDD_MPU_OPPTURBO_UV		1260000

#define OMAP4430_VDD_MPU_OPPNITRO_UV		1350000



struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = {

	VOLT_DATA_DEFINE(OMAP4430_VDD_MPU_OPP50_UV, OMAP44XX_CONTROL_FUSE_MPU_OPP50, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP4430_VDD_MPU_OPP100_UV, OMAP44XX_CONTROL_FUSE_MPU_OPP100, 0xf9, 0x16),

	VOLT_DATA_DEFINE(OMAP4430_VDD_MPU_OPPTURBO_UV, OMAP44XX_CONTROL_FUSE_MPU_OPPTURBO, 0xfa, 0x23),

	VOLT_DATA_DEFINE(OMAP4430_VDD_MPU_OPPNITRO_UV, OMAP44XX_CONTROL_FUSE_MPU_OPPNITRO, 0xfa, 0x27),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



#define OMAP4430_VDD_IVA_OPP50_UV		930000

#define OMAP4430_VDD_IVA_OPP100_UV		1100000

#define OMAP4430_VDD_IVA_OPPTURBO_UV		1260000



struct omap_volt_data omap44xx_vdd_iva_volt_data[] = {

	VOLT_DATA_DEFINE(OMAP4430_VDD_IVA_OPP50_UV, OMAP44XX_CONTROL_FUSE_IVA_OPP50, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP4430_VDD_IVA_OPP100_UV, OMAP44XX_CONTROL_FUSE_IVA_OPP100, 0xf9, 0x16),

	VOLT_DATA_DEFINE(OMAP4430_VDD_IVA_OPPTURBO_UV, OMAP44XX_CONTROL_FUSE_IVA_OPPTURBO, 0xfa, 0x23),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



#define OMAP4430_VDD_CORE_OPP50_UV		930000

#define OMAP4430_VDD_CORE_OPP100_UV		1100000



struct omap_volt_data omap44xx_vdd_core_volt_data[] = {

	VOLT_DATA_DEFINE(OMAP4430_VDD_CORE_OPP50_UV, OMAP44XX_CONTROL_FUSE_CORE_OPP50, 0xf4, 0x0c),

	VOLT_DATA_DEFINE(OMAP4430_VDD_CORE_OPP100_UV, OMAP44XX_CONTROL_FUSE_CORE_OPP100, 0xf9, 0x16),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};





static struct omap_opp_def __initdata omap44xx_opp_def_list[] = {

	/* MPU OPP1 - OPP50 */

	OPP_INITIALIZER("mpu", true, 300000000, 1100000),

arch/arm/mach-omap2/vc.h

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

 * OMAP3/4 Voltage Controller (VC) structure and macro definitions

 *

 * Copyright (C) 2007, 2010 Texas Instruments, Inc.

 * Rajendra Nayak <rnayak@ti.com>

 * Lesly A M <x0080970@ti.com>

 * Thara Gopinath <thara@ti.com>

 *

 * Copyright (C) 2008, 2011 Nokia Corporation

 * Kalle Jokiniemi

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

 */

#ifndef __ARCH_ARM_MACH_OMAP2_VC_H

#define __ARCH_ARM_MACH_OMAP2_VC_H



#include <linux/kernel.h>



/**

 * struct omap_vc_common_data - per-VC register/bitfield data

 * @cmd_on_mask: ON bitmask in PRM_VC_CMD_VAL* register

 * @valid: VALID bitmask in PRM_VC_BYPASS_VAL register

 * @smps_sa_reg: Offset of PRM_VC_SMPS_SA reg from PRM start

 * @smps_volra_reg: Offset of PRM_VC_SMPS_VOL_RA reg from PRM start

 * @bypass_val_reg: Offset of PRM_VC_BYPASS_VAL reg from PRM start

 * @data_shift: DATA field shift in PRM_VC_BYPASS_VAL register

 * @slaveaddr_shift: SLAVEADDR field shift in PRM_VC_BYPASS_VAL register

 * @regaddr_shift: REGADDR field shift in PRM_VC_BYPASS_VAL register

 * @cmd_on_shift: ON field shift in PRM_VC_CMD_VAL_* register

 * @cmd_onlp_shift: ONLP field shift in PRM_VC_CMD_VAL_* register

 * @cmd_ret_shift: RET field shift in PRM_VC_CMD_VAL_* register

 * @cmd_off_shift: OFF field shift in PRM_VC_CMD_VAL_* register

 *

 * XXX One of cmd_on_mask and cmd_on_shift are not needed

 * XXX VALID should probably be a shift, not a mask

 */

struct omap_vc_common_data {

	u32 cmd_on_mask;

	u32 valid;

	u8 smps_sa_reg;

	u8 smps_volra_reg;

	u8 bypass_val_reg;

	u8 data_shift;

	u8 slaveaddr_shift;

	u8 regaddr_shift;

	u8 cmd_on_shift;

	u8 cmd_onlp_shift;

	u8 cmd_ret_shift;

	u8 cmd_off_shift;

};



/**

 * struct omap_vc_instance_data - VC per-instance data

 * @vc_common: pointer to VC common data for this platform

 * @smps_sa_mask: SA* bitmask in the PRM_VC_SMPS_SA register

 * @smps_volra_mask: VOLRA* bitmask in the PRM_VC_VOL_RA register

 * @smps_sa_shift: SA* field shift in the PRM_VC_SMPS_SA register

 * @smps_volra_shift: VOLRA* field shift in the PRM_VC_VOL_RA register

 *

 * XXX It is not necessary to have both a *_mask and a *_shift -

 *     remove one

 */

struct omap_vc_instance_data {

	const struct omap_vc_common_data *vc_common;

	u32 smps_sa_mask;

	u32 smps_volra_mask;

	u8 cmdval_reg;

	u8 smps_sa_shift;

	u8 smps_volra_shift;

};



extern struct omap_vc_instance_data omap3_vc1_data;

extern struct omap_vc_instance_data omap3_vc2_data;



extern struct omap_vc_instance_data omap4_vc_mpu_data;

extern struct omap_vc_instance_data omap4_vc_iva_data;

extern struct omap_vc_instance_data omap4_vc_core_data;



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE