aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLokesh Vutla2013-05-27 23:36:08 -0500
committerLokesh Vutla2013-05-29 04:34:46 -0500
commite3972cd8e4228b15aee026b703fd265db7242c19 (patch)
tree7d7cf481a5eaab66b9974894d6239bc0e11f1f6c
parentc1b9a301d89ba9701dc189782ada623ab657bdad (diff)
downloadu-boot-e3972cd8e4228b15aee026b703fd265db7242c19.tar.gz
u-boot-e3972cd8e4228b15aee026b703fd265db7242c19.tar.xz
u-boot-e3972cd8e4228b15aee026b703fd265db7242c19.zip
ARM: DRA7xx: Do not enable srcomp for DRA7xx Soc's
Slew rate compensation cells are not present for DRA7xx Soc's. So return from function srcomp_enable() if soc is not OMAP54xx. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
-rw-r--r--arch/arm/cpu/armv7/omap5/hwinit.c3
-rw-r--r--arch/arm/include/asm/omap_common.h8
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap5/hwinit.c b/arch/arm/cpu/armv7/omap5/hwinit.c
index e192fea0eb..784aa11933 100644
--- a/arch/arm/cpu/armv7/omap5/hwinit.c
+++ b/arch/arm/cpu/armv7/omap5/hwinit.c
@@ -201,6 +201,9 @@ void srcomp_enable(void)
201 u32 sysclk_ind = get_sys_clk_index(); 201 u32 sysclk_ind = get_sys_clk_index();
202 u32 omap_rev = omap_revision(); 202 u32 omap_rev = omap_revision();
203 203
204 if (!is_omap54xx())
205 return;
206
204 mul_factor = srcomp_parameters[sysclk_ind].multiply_factor; 207 mul_factor = srcomp_parameters[sysclk_ind].multiply_factor;
205 div_factor = srcomp_parameters[sysclk_ind].divide_factor; 208 div_factor = srcomp_parameters[sysclk_ind].divide_factor;
206 209
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 14356742d2..700717763c 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -575,6 +575,14 @@ static inline u32 omap_revision(void)
575 extern u32 *const omap_si_rev; 575 extern u32 *const omap_si_rev;
576 return *omap_si_rev; 576 return *omap_si_rev;
577} 577}
578
579#define OMAP54xx 0x54000000
580
581static inline u8 is_omap54xx(void)
582{
583 extern u32 *const omap_si_rev;
584 return ((*omap_si_rev & 0xFF000000) == OMAP54xx);
585}
578#endif 586#endif
579 587
580/* 588/*