Merge branch 'for-2.6.39' into for-2.6.40

1 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 489f7b6d61c5..402955ae48ce 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -85,6 +85,8 @@
 #define  SSB_IMSTATE_AP_RSV     0x00000030 /* Reserved */
 #define  SSB_IMSTATE_IBE        0x00020000 /* In Band Error */
 #define  SSB_IMSTATE_TO         0x00040000 /* Timeout */
+#define  SSB_IMSTATE_BUSY       0x01800000 /* Busy (Backplane rev >= 2.3 only) */
+#define  SSB_IMSTATE_REJECT     0x02000000 /* Reject (Backplane rev >= 2.3 only) */
 #define SSB_INTVEC              0x0F94     /* SB Interrupt Mask */
 #define  SSB_INTVEC_PCI         0x00000001 /* Enable interrupts for PCI */
 #define  SSB_INTVEC_ENET0       0x00000002 /* Enable interrupts for enet 0 */
@@ -97,7 +99,6 @@
 #define  SSB_TMSLOW_RESET       0x00000001 /* Reset */
 #define  SSB_TMSLOW_REJECT_22   0x00000002 /* Reject (Backplane rev 2.2) */
 #define  SSB_TMSLOW_REJECT_23   0x00000004 /* Reject (Backplane rev 2.3) */
-#define  SSB_TMSLOW_PHYCLK      0x00000010 /* MAC PHY Clock Control Enable */
 #define  SSB_TMSLOW_CLOCK       0x00010000 /* Clock Enable */
 #define  SSB_TMSLOW_FGC         0x00020000 /* Force Gated Clocks On */
 #define  SSB_TMSLOW_PE          0x40000000 /* Power Management Enable */
@@ -268,6 +269,8 @@
 /* SPROM Revision 4 */
 #define SSB_SPROM4_BFLLO                0x0044  /* Boardflags (low 16 bits) */
 #define SSB_SPROM4_BFLHI                0x0046  /* Board Flags Hi */
+#define SSB_SPROM4_BFL2LO               0x0048  /* Board flags 2 (low 16 bits) */
+#define SSB_SPROM4_BFL2HI               0x004A  /* Board flags 2 Hi */
 #define SSB_SPROM4_IL0MAC               0x004C  /* 6 byte MAC address for a/b/g/n */
 #define SSB_SPROM4_CCODE                0x0052  /* Country Code (2 bytes) */
 #define SSB_SPROM4_GPIOA                0x0056  /* Gen. Purpose IO # 0 and 1 */
@@ -358,6 +361,8 @@
 #define SSB_SPROM5_CCODE                0x0044  /* Country Code (2 bytes) */
 #define SSB_SPROM5_BFLLO                0x004A  /* Boardflags (low 16 bits) */
 #define SSB_SPROM5_BFLHI                0x004C  /* Board Flags Hi */
+#define SSB_SPROM5_BFL2LO               0x004E  /* Board flags 2 (low 16 bits) */
+#define SSB_SPROM5_BFL2HI               0x0050  /* Board flags 2 Hi */
 #define SSB_SPROM5_IL0MAC               0x0052  /* 6 byte MAC address for a/b/g/n */
 #define SSB_SPROM5_GPIOA                0x0076  /* Gen. Purpose IO # 0 and 1 */
 #define  SSB_SPROM5_GPIOA_P0            0x00FF  /* Pin 0 */