Merge git://git.denx.de/u-boot-i2c

[people/ms/u-boot.git] / arch / powerpc / include / asm / ppc.h

diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 27d3b83e070baaa2711d1bd760f8e74fa326481f..5e0aa08be936e1b44b099ae6a9083c31610f6d9f 100644 (file)
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -38,17 +38,25 @@
 #include <asm/arch/immap_lsch2.h>
 #endif
 
+#include <asm/processor.h>
+
 #if defined(CONFIG_8xx)
-uint get_immr(uint);
+static inline uint get_immr(uint mask)
+{
+       uint immr = mfspr(SPRN_IMMR);
+
+       return mask ? (immr & mask) : immr;
+}
 #endif
-uint get_pvr(void);
-uint get_svr(void);
-uint rd_ic_cst(void);
-void wr_ic_cst(uint);
-void wr_ic_adr(uint);
-uint rd_dc_cst(void);
-void wr_dc_cst(uint);
-void wr_dc_adr(uint);
+static inline uint get_pvr(void)
+{
+       return mfspr(PVR);
+}
+
+static inline uint get_svr(void)
+{
+       return mfspr(SVR);
+}
 
 #if defined(CONFIG_MPC85xx)    || \
        defined(CONFIG_MPC86xx) || \
@@ -114,6 +122,10 @@ static inline void set_msr(unsigned long msr)
 void print_reginfo(void);
 #endif
 
+void interrupt_init_cpu(unsigned *);
+void timer_interrupt_cpu(struct pt_regs *);
+unsigned long search_exception_table(unsigned long addr);
+
 #endif /* !__ASSEMBLY__ */
 
 #ifdef CONFIG_PPC