[IA64-SGI] Add support for a future SGI chipset (shub2) 4of4

Change the code that manages the LEDs so that it
works on both shub1 & shub2.
Signed-off-by: Jack Steiner <steiner@sgi.com>

arch/ia64/sn/kernel/setup.c

@@ -40,7 +40,6 @@
 #include <asm/sn/nodepda.h>
 #include <asm/sn/sn_cpuid.h>
 #include <asm/sn/simulator.h>
-#include "shub.h"
 #include <asm/sn/leds.h>
 #include <asm/sn/bte.h>
 #include <asm/sn/shub_mmr.h>

arch/ia64/sn/kernel/sn2/timer_interrupt.c

@@ -34,7 +34,6 @@
 
 #include <linux/interrupt.h>
 #include <asm/sn/pda.h>
-#include "shub.h"
 #include <asm/sn/leds.h>
 
 extern void sn_lb_int_war_check(void);

include/asm-ia64/sn/leds.h

@@ -9,6 +9,7 @@
 
 #include <asm/sn/addrs.h>
 #include <asm/sn/pda.h>
+#include <asm/sn/shub_mmr.h>
 
 #define LED0		(LOCAL_MMR_ADDR(SH_REAL_JUNK_BUS_LED0))
 #define LED_CPU_SHIFT	16

include/asm-ia64/sn/shub_mmr.h

@@ -129,6 +129,19 @@
 #define SH_EVENT_OCCURRED_II_INT1_SHFT           30
 #define SH_EVENT_OCCURRED_II_INT1_MASK           0x0000000040000000
 
+/* ==================================================================== */
+/*                         LEDS                                         */
+/* ==================================================================== */
+#define SH1_REAL_JUNK_BUS_LED0			 0x7fed00000UL
+#define SH1_REAL_JUNK_BUS_LED1			 0x7fed10000UL
+#define SH1_REAL_JUNK_BUS_LED2			 0x7fed20000UL
+#define SH1_REAL_JUNK_BUS_LED3			 0x7fed30000UL
+
+#define SH2_REAL_JUNK_BUS_LED0			 0xf0000000UL
+#define SH2_REAL_JUNK_BUS_LED1			 0xf0010000UL
+#define SH2_REAL_JUNK_BUS_LED2			 0xf0020000UL
+#define SH2_REAL_JUNK_BUS_LED3			 0xf0030000UL
+
 /* ==================================================================== */
 /*                         Register "SH1_PTC_0"                         */
 /*       Puge Translation Cache Message Configuration Information       */
@@ -410,6 +423,7 @@
 /* ==================================================================== */
 #define shubmmr(a,b) 		(is_shub2() ? a##2_##b : a##1_##b)
 
+#define SH_REAL_JUNK_BUS_LED0	shubmmr(SH, REAL_JUNK_BUS_LED0)
 #define SH_IPI_INT		shubmmr(SH, IPI_INT)
 #define SH_EVENT_OCCURRED	shubmmr(SH, EVENT_OCCURRED)
 #define SH_EVENT_OCCURRED_ALIAS	shubmmr(SH, EVENT_OCCURRED_ALIAS)