From 604db9cac5749e8e997b0d0a4e79873a21b3766e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 13 Sep 2008 22:43:48 -0700
Subject: [PATCH] --- yaml --- r: 113151 b: refs/heads/master c:
 45bb5a7cbfa28dedc07730d6ecedbd574faf5459 h: refs/heads/master i:   113149:
 a02b52dbea2edc6be159ee8bcb9a5dde25f23399   113147:
 1292eacecf4d5d7a55224b706179020974818775   113143:
 c01f83d116c771d5cb6c7ab5ee6e3e5864729af1   113135:
 e02a35ec81c8f9b92c7f3e69e2b3eb847fdc324d   113119:
 701b5a067dc51e1410e7151df60473f507387abd   113087:
 ba797fa6cef610cbb37710ab4f2dd9bcd28d037e   113023:
 2925bd99e3477c0066951f1701b5273a977ca25d   112895:
 92ea0887accc95db7b8b95c6db5d0af5de207bec   112639:
 6447e5ac2a59007a7babd51b1271b0a4927ecb29 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/sparc/kernel/sun4c_irq.c | 47 +++++++++++++----------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 25299f896ace..2f7b6777c95e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ff0d55f93f8119b71b33d4c444cf5105d4c1d12
+refs/heads/master: 45bb5a7cbfa28dedc07730d6ecedbd574faf5459
diff --git a/trunk/arch/sparc/kernel/sun4c_irq.c b/trunk/arch/sparc/kernel/sun4c_irq.c
index ae3149ecaecd..8033132eda8c 100644
--- a/trunk/arch/sparc/kernel/sun4c_irq.c
+++ b/trunk/arch/sparc/kernel/sun4c_irq.c
@@ -59,7 +59,7 @@
  *
  * so don't go making it static, like I tried. sigh.
  */
-unsigned char *interrupt_enable = NULL;
+unsigned char __iomem *interrupt_enable = NULL;
 
 static void sun4c_disable_irq(unsigned int irq_nr)
 {
@@ -68,7 +68,7 @@ static void sun4c_disable_irq(unsigned int irq_nr)
     
 	local_irq_save(flags);
 	irq_nr &= (NR_IRQS - 1);
-	current_mask = *interrupt_enable;
+	current_mask = sbus_readb(interrupt_enable);
 	switch(irq_nr) {
 	case 1:
 		new_mask = ((current_mask) & (~(SUN4C_INT_E1)));
@@ -86,7 +86,7 @@ static void sun4c_disable_irq(unsigned int irq_nr)
 		local_irq_restore(flags);
 		return;
 	}
-	*interrupt_enable = new_mask;
+	sbus_writeb(new_mask, interrupt_enable);
 	local_irq_restore(flags);
 }
 
@@ -97,7 +97,7 @@ static void sun4c_enable_irq(unsigned int irq_nr)
     
 	local_irq_save(flags);
 	irq_nr &= (NR_IRQS - 1);
-	current_mask = *interrupt_enable;
+	current_mask = sbus_readb(interrupt_enable);
 	switch(irq_nr) {
 	case 1:
 		new_mask = ((current_mask) | SUN4C_INT_E1);
@@ -115,7 +115,7 @@ static void sun4c_enable_irq(unsigned int irq_nr)
 		local_irq_restore(flags);
 		return;
 	}
-	*interrupt_enable = new_mask;
+	sbus_writeb(new_mask, interrupt_enable);
 	local_irq_restore(flags);
 }
 
@@ -172,27 +172,22 @@ static void sun4c_nop(void) {}
 
 void __init sun4c_init_IRQ(void)
 {
-	struct linux_prom_registers int_regs[2];
-	int ie_node;
-	struct resource phyres;
-
-	ie_node = prom_searchsiblings (prom_getchild(prom_root_node),
-				       "interrupt-enable");
-	if(ie_node == 0)
-		panic("Cannot find /interrupt-enable node");
-
-	/* Depending on the "address" property is bad news... */
-	interrupt_enable = NULL;
-	if (prom_getproperty(ie_node, "reg", (char *) int_regs,
-			     sizeof(int_regs)) != -1) {
-		memset(&phyres, 0, sizeof(struct resource));
-		phyres.flags = int_regs[0].which_io;
-		phyres.start = int_regs[0].phys_addr;
-		interrupt_enable = (char *) of_ioremap(&phyres, 0,
-		    int_regs[0].reg_size, "sun4c_intr");
+	struct device_node *dp;
+	const u32 *addr;
+
+	dp = of_find_node_by_name(NULL, "interrupt-enable");
+	if (!dp) {
+		prom_printf("sun4c_init_IRQ: Unable to find interrupt-enable\n");
+		prom_halt();
+	}
+
+	addr = of_get_property(dp, "address", NULL);
+	if (!addr) {
+		prom_printf("sun4c_init_IRQ: No address property\n");
+		prom_halt();
 	}
-	if (!interrupt_enable)
-		panic("Cannot map interrupt_enable");
+
+	interrupt_enable = (void __iomem *) (unsigned long) addr[0];
 
 	BTFIXUPSET_CALL(enable_irq, sun4c_enable_irq, BTFIXUPCALL_NORM);
 	BTFIXUPSET_CALL(disable_irq, sun4c_disable_irq, BTFIXUPCALL_NORM);
@@ -206,6 +201,6 @@ void __init sun4c_init_IRQ(void)
 	BTFIXUPSET_CALL(clear_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);
 	BTFIXUPSET_CALL(set_irq_udt, sun4c_nop, BTFIXUPCALL_NOP);
 #endif
-	*interrupt_enable = (SUN4C_INT_ENABLE);
+	sbus_writeb(SUN4C_INT_ENABLE, interrupt_enable);
 	/* Cannot enable interrupts until OBP ticker is disabled. */
 }