TPS65910: IRQ: Add interrupt controller

[mv-sheeva.git] / drivers / mfd / tps65910.c

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 5a6a7be1f8cf7c7910bb02de3ca107434164511d..bf649cf6a0ae3440c756db6b1fbd790904aed418 100644 (file)
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -136,12 +136,20 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
 {
        struct tps65910 *tps65910;
        struct tps65910_board *pmic_plat_data;
+       struct tps65910_platform_data *init_data;
        int ret = 0;
 
        pmic_plat_data = dev_get_platdata(&i2c->dev);
        if (!pmic_plat_data)
                return -EINVAL;
 
+       init_data = kzalloc(sizeof(struct tps65910_platform_data), GFP_KERNEL);
+       if (init_data == NULL)
+               return -ENOMEM;
+
+       init_data->irq = pmic_plat_data->irq;
+       init_data->irq_base = pmic_plat_data->irq;
+
        tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
        if (tps65910 == NULL)
                return -ENOMEM;
@@ -161,6 +169,10 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
 
        tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);
 
+       ret = tps65910_irq_init(tps65910, init_data->irq, init_data);
+       if (ret < 0)
+               goto err;
+
        return ret;
 
 err: