diff options
author | Sebastien Jan <s-jan@ti.com> | 2011-11-11 17:54:01 +0800 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-11-19 08:54:56 +0800 |
commit | 08dca2f91d0735176a776b3ed7ecd5296178e094 (patch) | |
tree | 64e6a5b1d7152014bd8b029f98235c883f408ad8 /arch/arm | |
parent | 1fd1d8356d5e9379bd4fdc7359e579b65636fa6c (diff) |
omap4430: disable OPP50 support for core and iva
Prevent core and iva voltage domains from scaling (they will remain
in OPP100).
This will prevent borders effects while constrains and notification
frameworks are not in place (ex: avoid scaling down core if an high
L3 bdw is requried).
MPU can still scale, which is sufficient for thermal considerations.
But SGX, IVA, Ducati and L3 won't scale anymore and stay at OPP100.
Signed-off-by: Sebastien Jan <s-jan@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/opp4xxx_data.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c index 6bca54b1deb..134dc80ab50 100644 --- a/arch/arm/mach-omap2/opp4xxx_data.c +++ b/arch/arm/mach-omap2/opp4xxx_data.c @@ -51,7 +51,6 @@ struct omap_volt_data omap443x_vdd_mpu_volt_data[] = { #define OMAP4430_VDD_IVA_OPPTURBO_UV 1300000 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), VOLT_DATA_DEFINE(0, 0, 0, 0), @@ -61,7 +60,6 @@ struct omap_volt_data omap443x_vdd_iva_volt_data[] = { #define OMAP4430_VDD_CORE_OPP100_UV 1200000 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), }; @@ -77,7 +75,7 @@ struct omap_volt_data omap443x_vdd_core_volt_data[] = { /* OMAP 4430 MPU Core VDD dependency table */ static struct omap_vdd_dep_volt omap443x_vdd_mpu_core_dep_data[] = { - {.main_vdd_volt = OMAP4430_VDD_MPU_OPP50_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP50_UV}, + {.main_vdd_volt = OMAP4430_VDD_MPU_OPP50_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV}, {.main_vdd_volt = OMAP4430_VDD_MPU_OPP100_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV}, {.main_vdd_volt = OMAP4430_VDD_MPU_OPPTURBO_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV}, {.main_vdd_volt = OMAP4430_VDD_MPU_OPPNITRO_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV}, @@ -94,7 +92,6 @@ struct omap_vdd_dep_info omap443x_vddmpu_dep_info[] = { /* OMAP 4430 MPU IVA VDD dependency table */ static struct omap_vdd_dep_volt omap443x_vdd_iva_core_dep_data[] = { - {.main_vdd_volt = OMAP4430_VDD_IVA_OPP50_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP50_UV}, {.main_vdd_volt = OMAP4430_VDD_IVA_OPP100_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV}, {.main_vdd_volt = OMAP4430_VDD_IVA_OPPTURBO_UV, .dep_vdd_volt = OMAP4430_VDD_CORE_OPP100_UV}, }; @@ -117,12 +114,8 @@ static struct omap_opp_def __initdata omap443x_opp_def_list[] = { OPP_INITIALIZER("mpu", "dpll_mpu_ck", "mpu", true, 800000000, OMAP4430_VDD_MPU_OPPTURBO_UV), /* MPU OPP4 - OPP-SB */ OPP_INITIALIZER("mpu", "dpll_mpu_ck", "mpu", true, 1008000000, OMAP4430_VDD_MPU_OPPNITRO_UV), - /* L3 OPP1 - OPP50 */ - OPP_INITIALIZER("l3_main_1", "dpll_core_m5x2_ck", "core", true, 100000000, OMAP4430_VDD_CORE_OPP50_UV), /* L3 OPP2 - OPP100, OPP-Turbo, OPP-SB */ - OPP_INITIALIZER("l3_main_1", "dpll_core_m5x2_ck", "core", true, 200000000, OMAP4430_VDD_CORE_OPP100_UV), - /* IVA OPP1 - OPP50 */ - OPP_INITIALIZER("iva", "dpll_iva_m5x2_ck", "iva", true, 133000000, OMAP4430_VDD_IVA_OPP50_UV), + OPP_INITIALIZER("l3_main_1", "dpll_core_m5x2_ck", "core", true, 400000000, OMAP4430_VDD_CORE_OPP100_UV), /* IVA OPP2 - OPP100 */ OPP_INITIALIZER("iva", "dpll_iva_m5x2_ck", "iva", true, 266100000, OMAP4430_VDD_IVA_OPP100_UV), /* IVA OPP3 - OPP-Turbo */ |