diff options
Diffstat (limited to 'arch/mips/sgi-ip27/ip27-xtalk.c')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-xtalk.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/sgi-ip27/ip27-xtalk.c b/arch/mips/sgi-ip27/ip27-xtalk.c index 5e871e75a8d9..a4df7d0f6f12 100644 --- a/arch/mips/sgi-ip27/ip27-xtalk.c +++ b/arch/mips/sgi-ip27/ip27-xtalk.c | |||
@@ -17,15 +17,15 @@ | |||
17 | #include <asm/xtalk/xtalk.h> | 17 | #include <asm/xtalk/xtalk.h> |
18 | 18 | ||
19 | 19 | ||
20 | #define XBOW_WIDGET_PART_NUM 0x0 | 20 | #define XBOW_WIDGET_PART_NUM 0x0 |
21 | #define XXBOW_WIDGET_PART_NUM 0xd000 /* Xbow in Xbridge */ | 21 | #define XXBOW_WIDGET_PART_NUM 0xd000 /* Xbow in Xbridge */ |
22 | #define BASE_XBOW_PORT 8 /* Lowest external port */ | 22 | #define BASE_XBOW_PORT 8 /* Lowest external port */ |
23 | 23 | ||
24 | extern int bridge_probe(nasid_t nasid, int widget, int masterwid); | 24 | extern int bridge_probe(nasid_t nasid, int widget, int masterwid); |
25 | 25 | ||
26 | static int __cpuinit probe_one_port(nasid_t nasid, int widget, int masterwid) | 26 | static int __cpuinit probe_one_port(nasid_t nasid, int widget, int masterwid) |
27 | { | 27 | { |
28 | widgetreg_t widget_id; | 28 | widgetreg_t widget_id; |
29 | xwidget_part_num_t partnum; | 29 | xwidget_part_num_t partnum; |
30 | 30 | ||
31 | widget_id = *(volatile widgetreg_t *) | 31 | widget_id = *(volatile widgetreg_t *) |
@@ -102,10 +102,10 @@ static int __cpuinit xbow_probe(nasid_t nasid) | |||
102 | 102 | ||
103 | void __cpuinit xtalk_probe_node(cnodeid_t nid) | 103 | void __cpuinit xtalk_probe_node(cnodeid_t nid) |
104 | { | 104 | { |
105 | volatile u64 hubreg; | 105 | volatile u64 hubreg; |
106 | nasid_t nasid; | 106 | nasid_t nasid; |
107 | xwidget_part_num_t partnum; | 107 | xwidget_part_num_t partnum; |
108 | widgetreg_t widget_id; | 108 | widgetreg_t widget_id; |
109 | 109 | ||
110 | nasid = COMPACT_TO_NASID_NODEID(nid); | 110 | nasid = COMPACT_TO_NASID_NODEID(nid); |
111 | hubreg = REMOTE_HUB_L(nasid, IIO_LLP_CSR); | 111 | hubreg = REMOTE_HUB_L(nasid, IIO_LLP_CSR); |
@@ -115,7 +115,7 @@ void __cpuinit xtalk_probe_node(cnodeid_t nid) | |||
115 | return; | 115 | return; |
116 | 116 | ||
117 | widget_id = *(volatile widgetreg_t *) | 117 | widget_id = *(volatile widgetreg_t *) |
118 | (RAW_NODE_SWIN_BASE(nasid, 0x0) + WIDGET_ID); | 118 | (RAW_NODE_SWIN_BASE(nasid, 0x0) + WIDGET_ID); |
119 | partnum = XWIDGET_PART_NUM(widget_id); | 119 | partnum = XWIDGET_PART_NUM(widget_id); |
120 | 120 | ||
121 | printk(KERN_INFO "Cpu %d, Nasid 0x%x: partnum 0x%x is ", | 121 | printk(KERN_INFO "Cpu %d, Nasid 0x%x: partnum 0x%x is ", |