From 8749fa6af3e94630eeb02bc3a45fe9bdcb8d3087 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 28 Mar 2017 10:27:29 -0600 Subject: board_f: powerpc: Make prt_8260_rsr(), prt_8260_clks() private Move these two function calls into checkcpu(), which is called on this arch immediately after these two. Signed-off-by: Simon Glass Reviewed-by: Stefan Roese --- arch/powerpc/cpu/mpc8260/cpu.c | 9 ++++++++- arch/powerpc/include/asm/processor.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 9f2be3cb22c..58d1c0261cb 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -50,7 +50,14 @@ int checkcpu (void) uint pvr = get_pvr (); uint immr, rev, m, k; char buf[32]; - + int ret; + + ret = prt_8260_rsr(); + if (ret) + return ret; + ret = prt_8260_clks(); + if (ret) + return ret; puts ("CPU: "); switch (pvr) { diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index c032726df15..fd38da9fe5e 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1355,6 +1355,8 @@ void ll_puts(const char *); void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); int prt_83xx_rsr(void); +int prt_8260_rsr(void); +int prt_8260_clks(void); #endif /* ndef ASSEMBLY*/ -- cgit v1.3.1