From 7cbff1d818d763a23ded97c33607361d9f401af8 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 18 Oct 2012 18:22:11 +0200
Subject: [PATCH] --- yaml --- r: 342387 b: refs/heads/master c:
 a7238e432539d25726883ed3ee48cd46b5a8fa56 h: refs/heads/master i:   342385:
 3503446c887b8d578f8ee34c3c5b0bfc15b9e023   342383:
 0836e99f6a7eac60d490f602489c973c806ab1cf v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/mfd/db8500-prcmu.c | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 89ae6950ea8a..2a822c9036ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1d11f394f6e3fc0368e72244fb5ddc4142e804b
+refs/heads/master: a7238e432539d25726883ed3ee48cd46b5a8fa56
diff --git a/trunk/drivers/mfd/db8500-prcmu.c b/trunk/drivers/mfd/db8500-prcmu.c
index 00b8b0f3dfb6..cea29ba6ce9a 100644
--- a/trunk/drivers/mfd/db8500-prcmu.c
+++ b/trunk/drivers/mfd/db8500-prcmu.c
@@ -2697,9 +2697,15 @@ static struct irq_domain_ops db8500_irq_ops = {
 
 static int db8500_irq_init(struct device_node *np)
 {
-	db8500_irq_domain = irq_domain_add_legacy(
-		np, NUM_PRCMU_WAKEUPS, IRQ_PRCMU_BASE,
-		0, &db8500_irq_ops, NULL);
+	int irq_base = -1;
+
+	/* In the device tree case, just take some IRQs */
+	if (!np)
+		irq_base = IRQ_PRCMU_BASE;
+
+	db8500_irq_domain = irq_domain_add_simple(
+		np, NUM_PRCMU_WAKEUPS, irq_base,
+		&db8500_irq_ops, NULL);
 
 	if (!db8500_irq_domain) {
 		pr_err("Failed to create irqdomain\n");