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

Commit df7cded3 authored by Vishwanath Sripathy's avatar Vishwanath Sripathy Committed by Kevin Hilman
Browse files

ARM: OMAP4: OPP: add OMAP4460 definitions 



Add OMAP4460 OPP definitions for voltage and frequencies based on
OMAP4460 ES1.0 DM Operating Condition Addendum Version 0.1

The following exceptions are present:
* Smartreflex support is still on experimental mode: the gains and min
  limits are currently pending characterization data. Currently OMAP4430 values
  are used.
* Efuse offset for core OPP100-OV setting is not clear in documentation.
* IVA OPPs beyond OPP100 are disabled due to the delta between max OMAP4460
  current requirements and Phoenix Max supply on VCORE2 in the default
  configuration - boards which have supply which can support this should
  explicitly call opp_enable and enable the same.
* MPU OPPs > OPPTURBO can easily be detected using a efuse burnt - currently
  disabled pending clock changes to support DCC feature.

[nm@ti.com: cleanups and updates from Datamanual]
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarVishwanath BS <vishwanath.bs@ti.com>
[t-kristo@ti.com: rebased to linux-3.6-rc5]
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 83b5b551

arch/arm/mach-omap2/control.h

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ 
#define OMAP44XX_CONTROL_FUSE_MPU_OPPNITRO	0x249

#define OMAP44XX_CONTROL_FUSE_CORE_OPP50	0x254

#define OMAP44XX_CONTROL_FUSE_CORE_OPP100	0x257

#define OMAP44XX_CONTROL_FUSE_CORE_OPP100OV	0x25A



/* AM35XX only CONTROL_GENERAL register offsets */

#define AM35XX_CONTROL_MSUSPENDMUX_6    (OMAP2_CONTROL_GENERAL + 0x0038)

arch/arm/mach-omap2/omap_opp_data.h

+6 −3
Original line number Diff line number Diff line
@@ -89,8 +89,11 @@ 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[];

extern struct omap_volt_data omap443x_vdd_mpu_volt_data[];

extern struct omap_volt_data omap443x_vdd_iva_volt_data[];

extern struct omap_volt_data omap443x_vdd_core_volt_data[];

extern struct omap_volt_data omap446x_vdd_mpu_volt_data[];

extern struct omap_volt_data omap446x_vdd_iva_volt_data[];

extern struct omap_volt_data omap446x_vdd_core_volt_data[];



#endif		/* __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H */

arch/arm/mach-omap2/opp4xxx_data.c

+87 −11
Original line number Diff line number Diff line 
/*

 * OMAP4 OPP table definitions.

 *

 * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/

 * Copyright (C) 2010-2012 Texas Instruments Incorporated - http://www.ti.com/

 *	Nishanth Menon

 *	Kevin Hilman

 *	Thara Gopinath
@@ -35,7 +35,7 @@ 
#define OMAP4430_VDD_MPU_OPPTURBO_UV		1313000

#define OMAP4430_VDD_MPU_OPPNITRO_UV		1375000



struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = {

struct omap_volt_data omap443x_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),
@@ -47,7 +47,7 @@ struct omap_volt_data omap44xx_vdd_mpu_volt_data[] = { 
#define OMAP4430_VDD_IVA_OPP100_UV		1188000

#define OMAP4430_VDD_IVA_OPPTURBO_UV		1300000



struct omap_volt_data omap44xx_vdd_iva_volt_data[] = {

struct omap_volt_data omap443x_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),
@@ -57,14 +57,14 @@ struct omap_volt_data omap44xx_vdd_iva_volt_data[] = { 
#define OMAP4430_VDD_CORE_OPP50_UV		1025000

#define OMAP4430_VDD_CORE_OPP100_UV		1200000



struct omap_volt_data omap44xx_vdd_core_volt_data[] = {

struct omap_volt_data omap443x_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[] = {

static struct omap_opp_def __initdata omap443x_opp_def_list[] = {

	/* MPU OPP1 - OPP50 */

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

	/* MPU OPP2 - OPP100 */
@@ -86,6 +86,82 @@ static struct omap_opp_def __initdata omap44xx_opp_def_list[] = { 
	/* TODO: add DSP, aess, fdif, gpu */

};



#define OMAP4460_VDD_MPU_OPP50_UV		1025000

#define OMAP4460_VDD_MPU_OPP100_UV		1200000

#define OMAP4460_VDD_MPU_OPPTURBO_UV		1313000

#define OMAP4460_VDD_MPU_OPPNITRO_UV		1375000



struct omap_volt_data omap446x_vdd_mpu_volt_data[] = {

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

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

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

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

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



#define OMAP4460_VDD_IVA_OPP50_UV		1025000

#define OMAP4460_VDD_IVA_OPP100_UV		1200000

#define OMAP4460_VDD_IVA_OPPTURBO_UV		1313000

#define OMAP4460_VDD_IVA_OPPNITRO_UV		1375000



struct omap_volt_data omap446x_vdd_iva_volt_data[] = {

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

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

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

	VOLT_DATA_DEFINE(OMAP4460_VDD_IVA_OPPNITRO_UV, OMAP44XX_CONTROL_FUSE_IVA_OPPNITRO, 0xfa, 0x23),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



#define OMAP4460_VDD_CORE_OPP50_UV		1025000

#define OMAP4460_VDD_CORE_OPP100_UV		1200000

#define OMAP4460_VDD_CORE_OPP100_OV_UV		1250000



struct omap_volt_data omap446x_vdd_core_volt_data[] = {

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

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

	VOLT_DATA_DEFINE(OMAP4460_VDD_CORE_OPP100_OV_UV, OMAP44XX_CONTROL_FUSE_CORE_OPP100OV, 0xf9, 0x16),

	VOLT_DATA_DEFINE(0, 0, 0, 0),

};



static struct omap_opp_def __initdata omap446x_opp_def_list[] = {

	/* MPU OPP1 - OPP50 */

	OPP_INITIALIZER("mpu", true, 350000000, OMAP4460_VDD_MPU_OPP50_UV),

	/* MPU OPP2 - OPP100 */

	OPP_INITIALIZER("mpu", true, 700000000, OMAP4460_VDD_MPU_OPP100_UV),

	/* MPU OPP3 - OPP-Turbo */

	OPP_INITIALIZER("mpu", true, 920000000, OMAP4460_VDD_MPU_OPPTURBO_UV),

	/*

	 * MPU OPP4 - OPP-Nitro + Disabled as the reference schematics

	 * recommends TPS623631 - confirm and enable the opp in board file

	 * XXX: May be we should enable these based on mpu capability and

	 * Exception board files disable it...

	 */

	OPP_INITIALIZER("mpu", false, 1200000000, OMAP4460_VDD_MPU_OPPNITRO_UV),

	/* MPU OPP4 - OPP-Nitro SpeedBin */

	OPP_INITIALIZER("mpu", false, 1500000000, OMAP4460_VDD_MPU_OPPNITRO_UV),

	/* L3 OPP1 - OPP50 */

	OPP_INITIALIZER("l3_main_1", true, 100000000, OMAP4460_VDD_CORE_OPP50_UV),

	/* L3 OPP2 - OPP100 */

	OPP_INITIALIZER("l3_main_1", true, 200000000, OMAP4460_VDD_CORE_OPP100_UV),

	/* IVA OPP1 - OPP50 */

	OPP_INITIALIZER("iva", true, 133000000, OMAP4460_VDD_IVA_OPP50_UV),

	/* IVA OPP2 - OPP100 */

	OPP_INITIALIZER("iva", true, 266100000, OMAP4460_VDD_IVA_OPP100_UV),

	/*

	 * IVA OPP3 - OPP-Turbo + Disabled as the reference schematics

	 * recommends Phoenix VCORE2 which can supply only 600mA - so the ones

	 * above this OPP frequency, even though OMAP is capable, should be

	 * enabled by board file which is sure of the chip power capability

	 */

	OPP_INITIALIZER("iva", false, 332000000, OMAP4460_VDD_IVA_OPPTURBO_UV),

	/* IVA OPP4 - OPP-Nitro */

	OPP_INITIALIZER("iva", false, 430000000, OMAP4460_VDD_IVA_OPPNITRO_UV),

	/* IVA OPP5 - OPP-Nitro SpeedBin*/

	OPP_INITIALIZER("iva", false, 500000000, OMAP4460_VDD_IVA_OPPNITRO_UV),



	/* TODO: add DSP, aess, fdif, gpu */

};



/**

 * omap4_opp_init() - initialize omap4 opp table

 */
@@ -93,12 +169,12 @@ int __init omap4_opp_init(void) 
{

	int r = -ENODEV;



	if (!cpu_is_omap443x())

		return r;



	r = omap_init_opp_table(omap44xx_opp_def_list,

			ARRAY_SIZE(omap44xx_opp_def_list));



	if (cpu_is_omap443x())

		r = omap_init_opp_table(omap443x_opp_def_list,

			ARRAY_SIZE(omap443x_opp_def_list));

	else if (cpu_is_omap446x())

		r = omap_init_opp_table(omap446x_opp_def_list,

			ARRAY_SIZE(omap446x_opp_def_list));

	return r;

}

device_initcall(omap4_opp_init);

arch/arm/mach-omap2/voltagedomains44xx_data.c

+9 −3
Original line number Diff line number Diff line
@@ -104,9 +104,15 @@ void __init omap44xx_voltagedomains_init(void) 
	 * for the currently-running IC

	 */

#ifdef CONFIG_PM_OPP

	omap4_voltdm_mpu.volt_data = omap44xx_vdd_mpu_volt_data;

	omap4_voltdm_iva.volt_data = omap44xx_vdd_iva_volt_data;

	omap4_voltdm_core.volt_data = omap44xx_vdd_core_volt_data;

	if (cpu_is_omap443x()) {

		omap4_voltdm_mpu.volt_data = omap443x_vdd_mpu_volt_data;

		omap4_voltdm_iva.volt_data = omap443x_vdd_iva_volt_data;

		omap4_voltdm_core.volt_data = omap443x_vdd_core_volt_data;

	} else if (cpu_is_omap446x()) {

		omap4_voltdm_mpu.volt_data = omap446x_vdd_mpu_volt_data;

		omap4_voltdm_iva.volt_data = omap446x_vdd_iva_volt_data;

		omap4_voltdm_core.volt_data = omap446x_vdd_core_volt_data;

	}

#endif



	omap4_voltdm_mpu.vp_param = &omap4_mpu_vp_data;