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

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

Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024 

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
parents 2d403fe0 c0718df4

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_hwmod_3xxx_data.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <plat/i2c.h>

#include <plat/gpio.h>

#include <plat/mmc.h>

#include <plat/smartreflex.h>

#include <plat/mcbsp.h>

#include <plat/mcspi.h>

#include <plat/dmtimer.h>

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/omap_twl.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/kernel.h>

#include <linux/i2c/twl.h>



#include <plat/voltage.h>

#include "voltage.h"



#include "pm.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),