diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2016-02-09 17:08:16 +0100 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2016-03-12 00:18:03 +0100 |
| commit | 63e9e1c28fa6fe714364c7817e60dbaed3cec95e (patch) | |
| tree | 2e6f0fbf6348eff75e9af64f981e13127b574ee1 /arch/powerpc/include | |
| parent | powerpc/8xx: Handle CPU6 ERRATA directly in mtspr() macro (diff) | |
| download | linux-63e9e1c28fa6fe714364c7817e60dbaed3cec95e.tar.xz linux-63e9e1c28fa6fe714364c7817e60dbaed3cec95e.zip | |
powerpc/8xx: remove special handling of CPU6 errata in set_dec()
CPU6 ERRATA is now handled directly in mtspr(), so we can use the
standard set_dec() fonction in all cases.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/time.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h index 2d7109a8d296..1092fdd7e737 100644 --- a/arch/powerpc/include/asm/time.h +++ b/arch/powerpc/include/asm/time.h @@ -31,8 +31,6 @@ extern void tick_broadcast_ipi_handler(void); extern void generic_calibrate_decr(void); -extern void set_dec_cpu6(unsigned int val); - /* Some sane defaults: 125 MHz timebase, 1GHz processor */ extern unsigned long ppc_proc_freq; #define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8) @@ -166,14 +164,12 @@ static inline void set_dec(int val) { #if defined(CONFIG_40x) mtspr(SPRN_PIT, val); -#elif defined(CONFIG_8xx_CPU6) - set_dec_cpu6(val - 1); #else #ifndef CONFIG_BOOKE --val; #endif mtspr(SPRN_DEC, val); -#endif /* not 40x or 8xx_CPU6 */ +#endif /* not 40x */ } static inline unsigned long tb_ticks_since(unsigned long tstamp) |