mfd: Revert "mfd: add irq domain support for max8997 interrupts"

This reverts commit 98d8618af37728f6e18e84110ddb99987b47dd12 as it
breaks the build of the muic driver.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 0b48d6a8cf038f6d2a46281f73319f3b1edb62d6..b3982c867c9c5e9243c505d41b9914b69c130b30 100644 (file)
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -1079,8 +1079,12 @@ static struct platform_device nuri_max8903_device = {
 static void __init nuri_power_init(void)
 {
        int gpio;
+       int irq_base = IRQ_GPIO_END + 1;
        int ta_en = 0;
 
+       nuri_max8997_pdata.irq_base = irq_base;
+       irq_base += MAX8997_IRQ_NR;
+
        gpio = EXYNOS4_GPX0(7);
        gpio_request(gpio, "AP_PMIC_IRQ");
        s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf));

diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 600368fa6b69ad7056727cba915b58e0b91f086c..878d4c99142da9fb7809bf4ee1bfdc843837ac94 100644 (file)
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -424,6 +424,7 @@ static struct max8997_platform_data __initdata origen_max8997_pdata = {
        .buck1_gpiodvs  = false,
        .buck2_gpiodvs  = false,
        .buck5_gpiodvs  = false,
+       .irq_base       = IRQ_GPIO_END + 1,
 
        .ignore_gpiodvs_side_effect = true,
        .buck125_default_idx = 0x0,

diff --git a/drivers/mfd/max8997-irq.c b/drivers/mfd/max8997-irq.c
index 00390a117ae6e2e5cf00894c2d5b85eeb0fda62a..09274cf7c33bd0bd7d21ca2ee4cd12f78330bcfb 100644 (file)
--- a/drivers/mfd/max8997-irq.c
+++ b/drivers/mfd/max8997-irq.c
@@ -142,8 +142,7 @@ static void max8997_irq_sync_unlock(struct irq_data *data)
 static const inline struct max8997_irq_data *
 irq_to_max8997_irq(struct max8997_dev *max8997, int irq)
 {
-       struct irq_data *data = irq_get_irq_data(irq);
-       return &max8997_irqs[data->hwirq];
+       return &max8997_irqs[irq - max8997->irq_base];
 }
 
 static void max8997_irq_mask(struct irq_data *data)
@@ -183,7 +182,7 @@ static irqreturn_t max8997_irq_thread(int irq, void *data)
        u8 irq_reg[MAX8997_IRQ_GROUP_NR] = {};
        u8 irq_src;
        int ret;
-       int i, cur_irq;
+       int i;
 
        ret = max8997_read_reg(max8997->i2c, MAX8997_REG_INTSRC, &irq_src);
        if (ret < 0) {
@@ -270,11 +269,8 @@ static irqreturn_t max8997_irq_thread(int irq, void *data)
 
        /* Report */
        for (i = 0; i < MAX8997_IRQ_NR; i++) {
-               if (irq_reg[max8997_irqs[i].group] & max8997_irqs[i].mask) {
-                       cur_irq = irq_find_mapping(max8997->irq_domain, i);
-                       if (cur_irq)
-                               handle_nested_irq(cur_irq);
-               }
+               if (irq_reg[max8997_irqs[i].group] & max8997_irqs[i].mask)
+                       handle_nested_irq(max8997->irq_base + i);
        }
 
        return IRQ_HANDLED;
@@ -282,40 +278,26 @@ static irqreturn_t max8997_irq_thread(int irq, void *data)
 
 int max8997_irq_resume(struct max8997_dev *max8997)
 {
-       if (max8997->irq && max8997->irq_domain)
-               max8997_irq_thread(0, max8997);
-       return 0;
-}
-
-static int max8997_irq_domain_map(struct irq_domain *d, unsigned int irq,
-                                       irq_hw_number_t hw)
-{
-       struct max8997_dev *max8997 = d->host_data;
-
-       irq_set_chip_data(irq, max8997);
-       irq_set_chip_and_handler(irq, &max8997_irq_chip, handle_edge_irq);
-       irq_set_nested_thread(irq, 1);
-#ifdef CONFIG_ARM
-       set_irq_flags(irq, IRQF_VALID);
-#else
-       irq_set_noprobe(irq);
-#endif
+       if (max8997->irq && max8997->irq_base)
+               max8997_irq_thread(max8997->irq_base, max8997);
        return 0;
 }
 
-static struct irq_domain_ops max8997_irq_domain_ops = {
-       .map = max8997_irq_domain_map,
-};
-
 int max8997_irq_init(struct max8997_dev *max8997)
 {
-       struct irq_domain *domain;
        int i;
+       int cur_irq;
        int ret;
        u8 val;
 
        if (!max8997->irq) {
                dev_warn(max8997->dev, "No interrupt specified.\n");
+               max8997->irq_base = 0;
+               return 0;
+       }
+
+       if (!max8997->irq_base) {
+               dev_err(max8997->dev, "No interrupt base specified.\n");
                return 0;
        }
 
@@ -345,11 +327,18 @@ int max8997_irq_init(struct max8997_dev *max8997)
                                        true : false;
        }
 
-       domain = irq_domain_add_linear(NULL, MAX8997_IRQ_NR,
-                                       &max8997_irq_domain_ops, &max8997);
-       if (!domain) {
-               dev_err(max8997->dev, "could not create irq domain\n");
-               return -ENODEV;
+       /* Register with genirq */
+       for (i = 0; i < MAX8997_IRQ_NR; i++) {
+               cur_irq = i + max8997->irq_base;
+               irq_set_chip_data(cur_irq, max8997);
+               irq_set_chip_and_handler(cur_irq, &max8997_irq_chip,
+                               handle_edge_irq);
+               irq_set_nested_thread(cur_irq, 1);
+#ifdef CONFIG_ARM
+               set_irq_flags(cur_irq, IRQF_VALID);
+#else
+               irq_set_noprobe(cur_irq);
+#endif
        }
 
        ret = request_threaded_irq(max8997->irq, NULL, max8997_irq_thread,

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 20ecad3179d9fa04cd413b8a9f988db4e778c87e..cb83a7ab53e73b9825c4eb527211ab49ccd33a7e 100644 (file)
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -143,6 +143,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
        if (!pdata)
                goto err;
 
+       max8997->irq_base = pdata->irq_base;
        max8997->ono = pdata->ono;
 
        mutex_init(&max8997->iolock);

diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
index 830152cfae339727ad1d70875a61dbdaa34a6c67..3f4deb62d6b0d4c4c3475e074244860977fd259c 100644 (file)
--- a/include/linux/mfd/max8997-private.h
+++ b/include/linux/mfd/max8997-private.h
@@ -23,8 +23,6 @@
 #define __LINUX_MFD_MAX8997_PRIV_H
 
 #include <linux/i2c.h>
-#include <linux/export.h>
-#include <linux/irqdomain.h>
 
 #define MAX8997_REG_INVALID    (0xff)
 
@@ -327,7 +325,7 @@ struct max8997_dev {
 
        int irq;
        int ono;
-       struct irq_domain *irq_domain;
+       int irq_base;
        struct mutex irqlock;
        int irq_masks_cur[MAX8997_IRQ_GROUP_NR];
        int irq_masks_cache[MAX8997_IRQ_GROUP_NR];

diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
index 24b1a76540dac28dbfa1412f26820201ea0f05b1..28726dd540f25bd76b59c4d148bc02776112aa4a 100644 (file)
--- a/include/linux/mfd/max8997.h
+++ b/include/linux/mfd/max8997.h
@@ -204,6 +204,7 @@ struct max8997_led_platform_data {
 
 struct max8997_platform_data {
        /* IRQ */
+       int irq_base;
        int ono;
        int wakeup;