Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / arch / powerpc / platforms / cell / cbe_regs.h

diff --git a/arch/powerpc/platforms/cell/cbe_regs.h b/arch/powerpc/platforms/cell/cbe_regs.h
index 91083f51a0cb1ce034c567b17a50f51dc1015cc8..440a7ecc66eab1c3d2a894579c9dc399c7b9a351 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_regs.h
+++ b/arch/powerpc/platforms/cell/cbe_regs.h
@@ -15,6 +15,8 @@
 #ifndef CBE_REGS_H
 #define CBE_REGS_H
 
+#include <asm/cell-pmu.h>
+
 /*
  *
  * Some HID register definitions
@@ -35,11 +37,6 @@
  *
  */
 
-/* Macros for the pm_control register. */
-#define CBE_PM_16BIT_CTR(ctr)                  (1 << (24 - ((ctr) & (NR_PHYS_CTRS - 1))))
-#define CBE_PM_ENABLE_PERF_MON                 0x80000000
-
-
 union spe_reg {
        u64 val;
        u8 spe[8];
@@ -139,9 +136,6 @@ extern struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs(int cpu);
  * counters currently have a value waiting to be written.
  */
 
-#define NR_PHYS_CTRS   4
-#define NR_CTRS                (NR_PHYS_CTRS * 2)
-
 struct cbe_pmd_shadow_regs {
        u32 group_control;
        u32 debug_bus_control;
@@ -191,6 +185,14 @@ struct cbe_iic_regs {
        struct  cbe_iic_thread_regs thread[2];                  /* 0x0400 */
 
        u64     iic_ir;                                         /* 0x0440 */
+#define CBE_IIC_IR_PRIO(x)      (((x) & 0xf) << 12)
+#define CBE_IIC_IR_DEST_NODE(x) (((x) & 0xf) << 4)
+#define CBE_IIC_IR_DEST_UNIT(x) ((x) & 0xf)
+#define CBE_IIC_IR_IOC_0        0x0
+#define CBE_IIC_IR_IOC_1S       0xb
+#define CBE_IIC_IR_PT_0         0xe
+#define CBE_IIC_IR_PT_1         0xf
+
        u64     iic_is;                                         /* 0x0448 */
 #define CBE_IIC_IS_PMI         0x2