diff options
| author | Dave Gerlach <d-gerlach@ti.com> | 2014-08-25 18:18:39 -0500 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2014-09-01 11:01:29 +0300 |
| commit | 2ff387bffd598ac12b9a425c95b74d7592fe91b3 (patch) | |
| tree | 2f634cc7f2f87f7fec7d3661e7b5195943590c2f /arch | |
| parent | 95306a5e53130d90277f493570842b04db6535d2 (diff) | |
ARM: OMAP2+: opp33xx: Change OPP50 initialization
Modify how we initialize 300MHz OPP, make sure we do not accidentally enable
one and then immediately disable it if the other 300MHz OPP is not
selected by eFuse.
Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/opp33xx_data.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/opp33xx_data.c b/arch/arm/mach-omap2/opp33xx_data.c index 1de589eda4a..0e07186f64e 100644 --- a/arch/arm/mach-omap2/opp33xx_data.c +++ b/arch/arm/mach-omap2/opp33xx_data.c @@ -123,20 +123,21 @@ int __init am33xx_opp_init(void) opp_def_list_update_opp_voltage(am33xx_es2_x_opp_list, ARRAY_SIZE(am33xx_es2_x_opp_list), "mpu", 300000000, 1100000); + opp_def_list_enable_opp(am33xx_es2_x_opp_list, + ARRAY_SIZE(am33xx_es2_x_opp_list), + "mpu", 300000000, true); + } else if (max_freq & EFUSE_OPP_50_300MHZ_BIT) { + opp_def_list_enable_opp(am33xx_es2_x_opp_list, + ARRAY_SIZE(am33xx_es2_x_opp_list), + "mpu", 300000000, true); + } else { + opp_def_list_enable_opp(am33xx_es2_x_opp_list, + ARRAY_SIZE(am33xx_es2_x_opp_list), + "mpu", 300000000, false); } opp_def_list_enable_opp(am33xx_es2_x_opp_list, ARRAY_SIZE(am33xx_es2_x_opp_list), - "mpu", 300000000, - (max_freq & EFUSE_OPP_50_300MHZ_BIT) ? true : false); - - opp_def_list_enable_opp(am33xx_es2_x_opp_list, - ARRAY_SIZE(am33xx_es2_x_opp_list), - "mpu", 300000000, - (max_freq & EFUSE_OPP_100_300MHZ_BIT) ? true : false); - - opp_def_list_enable_opp(am33xx_es2_x_opp_list, - ARRAY_SIZE(am33xx_es2_x_opp_list), "mpu", 600000000, (max_freq & EFUSE_OPP_100_600MHZ_BIT) ? true : false); |