Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[linux.git] / drivers / mfd / tps65217.c

diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index 9a4d8684dd32bd5beaf73547271bd2b1ee42431f..f769c7d4e335ac20da4db26ae5d7eb024d0b9987 100644 (file)
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -42,26 +42,6 @@ static struct resource pb_resources[] = {
        DEFINE_RES_IRQ_NAMED(TPS65217_IRQ_PB, "PB"),
 };
 
-struct tps65217_irq {
-       int mask;
-       int interrupt;
-};
-
-static const struct tps65217_irq tps65217_irqs[] = {
-       [TPS65217_IRQ_PB] = {
-               .mask = TPS65217_INT_PBM,
-               .interrupt = TPS65217_INT_PBI,
-       },
-       [TPS65217_IRQ_AC] = {
-               .mask = TPS65217_INT_ACM,
-               .interrupt = TPS65217_INT_ACI,
-       },
-       [TPS65217_IRQ_USB] = {
-               .mask = TPS65217_INT_USBM,
-               .interrupt = TPS65217_INT_USBI,
-       },
-};
-
 static void tps65217_irq_lock(struct irq_data *data)
 {
        struct tps65217 *tps = irq_data_get_irq_chip_data(data);
@@ -74,37 +54,32 @@ static void tps65217_irq_sync_unlock(struct irq_data *data)
        struct tps65217 *tps = irq_data_get_irq_chip_data(data);
        int ret;
 
-       ret = tps65217_reg_write(tps, TPS65217_REG_INT, tps->irq_mask,
-                               TPS65217_PROTECT_NONE);
+       ret = tps65217_set_bits(tps, TPS65217_REG_INT, TPS65217_INT_MASK,
+                               tps->irq_mask, TPS65217_PROTECT_NONE);
        if (ret != 0)
                dev_err(tps->dev, "Failed to sync IRQ masks\n");
 
        mutex_unlock(&tps->irq_lock);
 }
 
-static inline const struct tps65217_irq *
-irq_to_tps65217_irq(struct tps65217 *tps, struct irq_data *data)
-{
-       return &tps65217_irqs[data->hwirq];
-}
-
 static void tps65217_irq_enable(struct irq_data *data)
 {
        struct tps65217 *tps = irq_data_get_irq_chip_data(data);
-       const struct tps65217_irq *irq_data = irq_to_tps65217_irq(tps, data);
+       u8 mask = BIT(data->hwirq) << TPS65217_INT_SHIFT;
 
-       tps->irq_mask &= ~irq_data->mask;
+       tps->irq_mask &= ~mask;
 }
 
 static void tps65217_irq_disable(struct irq_data *data)
 {
        struct tps65217 *tps = irq_data_get_irq_chip_data(data);
-       const struct tps65217_irq *irq_data = irq_to_tps65217_irq(tps, data);
+       u8 mask = BIT(data->hwirq) << TPS65217_INT_SHIFT;
 
-       tps->irq_mask |= irq_data->mask;
+       tps->irq_mask |= mask;
 }
 
 static struct irq_chip tps65217_irq_chip = {
+       .name                   = "tps65217",
        .irq_bus_lock           = tps65217_irq_lock,
        .irq_bus_sync_unlock    = tps65217_irq_sync_unlock,
        .irq_enable             = tps65217_irq_enable,
@@ -149,8 +124,8 @@ static irqreturn_t tps65217_irq_thread(int irq, void *data)
                return IRQ_NONE;
        }
 
-       for (i = 0; i < ARRAY_SIZE(tps65217_irqs); i++) {
-               if (status & tps65217_irqs[i].interrupt) {
+       for (i = 0; i < TPS65217_NUM_IRQ; i++) {
+               if (status & BIT(i)) {
                        handle_nested_irq(irq_find_mapping(tps->irq_domain, i));
                        handled = true;
                }
@@ -188,10 +163,9 @@ static int tps65217_irq_init(struct tps65217 *tps, int irq)
        tps->irq = irq;
 
        /* Mask all interrupt sources */
-       tps->irq_mask = (TPS65217_INT_RESERVEDM | TPS65217_INT_PBM
-                       | TPS65217_INT_ACM | TPS65217_INT_USBM);
-       tps65217_reg_write(tps, TPS65217_REG_INT, tps->irq_mask,
-                       TPS65217_PROTECT_NONE);
+       tps->irq_mask = TPS65217_INT_MASK;
+       tps65217_set_bits(tps, TPS65217_REG_INT, TPS65217_INT_MASK,
+                         TPS65217_INT_MASK, TPS65217_PROTECT_NONE);
 
        tps->irq_domain = irq_domain_add_linear(tps->dev->of_node,
                TPS65217_NUM_IRQ, &tps65217_irq_domain_ops, tps);
@@ -209,6 +183,8 @@ static int tps65217_irq_init(struct tps65217 *tps, int irq)
                return ret;
        }
 
+       enable_irq_wake(irq);
+
        return 0;
 }
 
@@ -424,6 +400,24 @@ static int tps65217_probe(struct i2c_client *client,
        return 0;
 }
 
+static int tps65217_remove(struct i2c_client *client)
+{
+       struct tps65217 *tps = i2c_get_clientdata(client);
+       unsigned int virq;
+       int i;
+
+       for (i = 0; i < TPS65217_NUM_IRQ; i++) {
+               virq = irq_find_mapping(tps->irq_domain, i);
+               if (virq)
+                       irq_dispose_mapping(virq);
+       }
+
+       irq_domain_remove(tps->irq_domain);
+       tps->irq_domain = NULL;
+
+       return 0;
+}
+
 static const struct i2c_device_id tps65217_id_table[] = {
        {"tps65217", TPS65217},
        { /* sentinel */ }
@@ -437,6 +431,7 @@ static struct i2c_driver tps65217_driver = {
        },
        .id_table       = tps65217_id_table,
        .probe          = tps65217_probe,
+       .remove         = tps65217_remove,
 };
 
 static int __init tps65217_init(void)