From 4c1fd7bd50eea7b3af8807521860cae656fcf8cb Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 2 Feb 2010 17:48:17 +0900
Subject: [PATCH] --- yaml --- r: 181170 b: refs/heads/master c:
 6eb6f98396f7bd653d8fb15b06364c8c7d70e22c h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sh/Kconfig                  |  2 +-
 trunk/arch/sh/cchips/hd6446x/hd64461.c | 21 +++++++++++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fa3437d41d6a..c445cf324ae2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7a967273a539a9a38413753c58125e777e2d30d
+refs/heads/master: 6eb6f98396f7bd653d8fb15b06364c8c7d70e22c
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 0f023bb62f99..9e565d962dc0 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -731,7 +731,7 @@ config GUSA_RB
 config SPARSE_IRQ
 	def_bool y
 	depends on SUPERH32 && !SH_DREAMCAST && !SH_HIGHLANDER && \
-		   !SH_RTS7751R2D && !HD64461
+		   !SH_RTS7751R2D
 	help
 	  This enables support for sparse irqs. This is useful in general
 	  as most CPUs have a fairly sparse array of IRQ vectors, which
diff --git a/trunk/arch/sh/cchips/hd6446x/hd64461.c b/trunk/arch/sh/cchips/hd6446x/hd64461.c
index cbfedfb42e04..b447091fc064 100644
--- a/trunk/arch/sh/cchips/hd6446x/hd64461.c
+++ b/trunk/arch/sh/cchips/hd6446x/hd64461.c
@@ -73,7 +73,7 @@ static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc)
 
 int __init setup_hd64461(void)
 {
-	int i;
+	int i, nid = cpu_to_node(boot_cpu_data);
 
 	if (!MACH_HD64461)
 		return 0;
@@ -90,9 +90,26 @@ int __init setup_hd64461(void)
 	__raw_writew(0xffff, HD64461_NIMR);
 
 	/*  IRQ 80 -> 95 belongs to HD64461  */
-	for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++)
+	for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++) {
+		unsigned int irq;
+
+		irq = create_irq_nr(i, nid);
+		if (unlikely(irq == 0)) {
+			pr_err("%s: failed hooking irq %d for HD64461\n",
+			       __func__, i);
+			return -EBUSY;
+		}
+
+		if (unlikely(irq != i)) {
+			pr_err("%s: got irq %d but wanted %d, bailing.\n",
+			       __func__, irq, i);
+			destroy_irq(irq);
+			return -EINVAL;
+		}
+
 		set_irq_chip_and_handler(i, &hd64461_irq_chip,
 					 handle_level_irq);
+	}
 
 	set_irq_chained_handler(CONFIG_HD64461_IRQ, hd64461_irq_demux);
 	set_irq_type(CONFIG_HD64461_IRQ, IRQ_TYPE_LEVEL_LOW);