Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 251 insertions, 99 deletions

diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index a2b12aa1f2b9..0451d7ac94ac 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -24,33 +24,46 @@
 #include <linux/of_gpio.h>
 #endif
 
-#define PCA953X_INPUT          0
-#define PCA953X_OUTPUT         1
-#define PCA953X_INVERT         2
-#define PCA953X_DIRECTION      3
-
-#define PCA953X_GPIOS          0x00FF
-#define PCA953X_INT            0x0100
+#define PCA953X_INPUT           0
+#define PCA953X_OUTPUT          1
+#define PCA953X_INVERT          2
+#define PCA953X_DIRECTION       3
+
+#define PCA957X_IN              0
+#define PCA957X_INVRT           1
+#define PCA957X_BKEN            2
+#define PCA957X_PUPD            3
+#define PCA957X_CFG             4
+#define PCA957X_OUT             5
+#define PCA957X_MSK             6
+#define PCA957X_INTS            7
+
+#define PCA_GPIO_MASK           0x00FF
+#define PCA_INT                 0x0100
+#define PCA953X_TYPE            0x1000
+#define PCA957X_TYPE            0x2000
 
 static const struct i2c_device_id pca953x_id[] = {
-        { "pca9534", 8  | PCA953X_INT, },
-        { "pca9535", 16 | PCA953X_INT, },
-        { "pca9536", 4, },
-        { "pca9537", 4  | PCA953X_INT, },
-        { "pca9538", 8  | PCA953X_INT, },
-        { "pca9539", 16 | PCA953X_INT, },
-        { "pca9554", 8  | PCA953X_INT, },
-        { "pca9555", 16 | PCA953X_INT, },
-        { "pca9556", 8, },
-        { "pca9557", 8, },
-
-        { "max7310", 8, },
-        { "max7312", 16 | PCA953X_INT, },
-        { "max7313", 16 | PCA953X_INT, },
-        { "max7315", 8  | PCA953X_INT, },
-        { "pca6107", 8  | PCA953X_INT, },
-        { "tca6408", 8  | PCA953X_INT, },
-        { "tca6416", 16 | PCA953X_INT, },
+        { "pca9534", 8  | PCA953X_TYPE | PCA_INT, },
+        { "pca9535", 16 | PCA953X_TYPE | PCA_INT, },
+        { "pca9536", 4  | PCA953X_TYPE, },
+        { "pca9537", 4  | PCA953X_TYPE | PCA_INT, },
+        { "pca9538", 8  | PCA953X_TYPE | PCA_INT, },
+        { "pca9539", 16 | PCA953X_TYPE | PCA_INT, },
+        { "pca9554", 8  | PCA953X_TYPE | PCA_INT, },
+        { "pca9555", 16 | PCA953X_TYPE | PCA_INT, },
+        { "pca9556", 8  | PCA953X_TYPE, },
+        { "pca9557", 8  | PCA953X_TYPE, },
+        { "pca9574", 8  | PCA957X_TYPE | PCA_INT, },
+        { "pca9575", 16 | PCA957X_TYPE | PCA_INT, },
+
+        { "max7310", 8  | PCA953X_TYPE, },
+        { "max7312", 16 | PCA953X_TYPE | PCA_INT, },
+        { "max7313", 16 | PCA953X_TYPE | PCA_INT, },
+        { "max7315", 8  | PCA953X_TYPE | PCA_INT, },
+        { "pca6107", 8  | PCA953X_TYPE | PCA_INT, },
+        { "tca6408", 8  | PCA953X_TYPE | PCA_INT, },
+        { "tca6416", 16 | PCA953X_TYPE | PCA_INT, },
         /* NYET:  { "tca6424", 24, }, */
         { }
 };
@@ -60,6 +73,7 @@ struct pca953x_chip {
         unsigned gpio_start;
         uint16_t reg_output;
         uint16_t reg_direction;
+        struct mutex i2c_lock;
 
 #ifdef CONFIG_GPIO_PCA953X_IRQ
         struct mutex irq_lock;
@@ -74,16 +88,32 @@ struct pca953x_chip {
         struct pca953x_platform_data *dyn_pdata;
         struct gpio_chip gpio_chip;
         const char *const *names;
+        int     chip_type;
 };
 
 static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val)
 {
-        int ret;
+        int ret = 0;
 
         if (chip->gpio_chip.ngpio <= 8)
                 ret = i2c_smbus_write_byte_data(chip->client, reg, val);
-        else
-                ret = i2c_smbus_write_word_data(chip->client, reg << 1, val);
+        else {
+                switch (chip->chip_type) {
+                case PCA953X_TYPE:
+                        ret = i2c_smbus_write_word_data(chip->client,
+                                                        reg << 1, val);
+                        break;
+                case PCA957X_TYPE:
+                        ret = i2c_smbus_write_byte_data(chip->client, reg << 1,
+                                                        val & 0xff);
+                        if (ret < 0)
+                                break;
+                        ret = i2c_smbus_write_byte_data(chip->client,
+                                                        (reg << 1) + 1,
+                                                        (val & 0xff00) >> 8);
+                        break;
+                }
+        }
 
         if (ret < 0) {
                 dev_err(&chip->client->dev, "failed writing register\n");
@@ -115,17 +145,30 @@ static int pca953x_gpio_direction_input(struct gpio_chip *gc, unsigned off)
 {
         struct pca953x_chip *chip;
         uint16_t reg_val;
-        int ret;
+        int ret, offset = 0;
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
+        mutex_lock(&chip->i2c_lock);
         reg_val = chip->reg_direction | (1u << off);
-        ret = pca953x_write_reg(chip, PCA953X_DIRECTION, reg_val);
+
+        switch (chip->chip_type) {
+        case PCA953X_TYPE:
+                offset = PCA953X_DIRECTION;
+                break;
+        case PCA957X_TYPE:
+                offset = PCA957X_CFG;
+                break;
+        }
+        ret = pca953x_write_reg(chip, offset, reg_val);
         if (ret)
-                return ret;
+                goto exit;
 
         chip->reg_direction = reg_val;
-        return 0;
+        ret = 0;
+exit:
+        mutex_unlock(&chip->i2c_lock);
+        return ret;
 }
 
 static int pca953x_gpio_direction_output(struct gpio_chip *gc,
@@ -133,41 +176,71 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
 {
         struct pca953x_chip *chip;
         uint16_t reg_val;
-        int ret;
+        int ret, offset = 0;
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
+        mutex_lock(&chip->i2c_lock);
         /* set output level */
         if (val)
                 reg_val = chip->reg_output | (1u << off);
         else
                 reg_val = chip->reg_output & ~(1u << off);
 
-        ret = pca953x_write_reg(chip, PCA953X_OUTPUT, reg_val);
+        switch (chip->chip_type) {
+        case PCA953X_TYPE:
+                offset = PCA953X_OUTPUT;
+                break;
+        case PCA957X_TYPE:
+                offset = PCA957X_OUT;
+                break;
+        }
+        ret = pca953x_write_reg(chip, offset, reg_val);
         if (ret)
-                return ret;
+                goto exit;
 
         chip->reg_output = reg_val;
 
         /* then direction */
         reg_val = chip->reg_direction & ~(1u << off);
-        ret = pca953x_write_reg(chip, PCA953X_DIRECTION, reg_val);
+        switch (chip->chip_type) {
+        case PCA953X_TYPE:
+                offset = PCA953X_DIRECTION;
+                break;
+        case PCA957X_TYPE:
+                offset = PCA957X_CFG;
+                break;
+        }
+        ret = pca953x_write_reg(chip, offset, reg_val);
         if (ret)
-                return ret;
+                goto exit;
 
         chip->reg_direction = reg_val;
-        return 0;
+        ret = 0;
+exit:
+        mutex_unlock(&chip->i2c_lock);
+        return ret;
 }
 
 static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
 {
         struct pca953x_chip *chip;
         uint16_t reg_val;
-        int ret;
+        int ret, offset = 0;
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
-        ret = pca953x_read_reg(chip, PCA953X_INPUT, &reg_val);
+        mutex_lock(&chip->i2c_lock);
+        switch (chip->chip_type) {
+        case PCA953X_TYPE:
+                offset = PCA953X_INPUT;
+                break;
+        case PCA957X_TYPE:
+                offset = PCA957X_IN;
+                break;
+        }
+        ret = pca953x_read_reg(chip, offset, &reg_val);
+        mutex_unlock(&chip->i2c_lock);
         if (ret < 0) {
                 /* NOTE:  diagnostic already emitted; that's all we should
                  * do unless gpio_*_value_cansleep() calls become different
@@ -183,20 +256,31 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
 {
         struct pca953x_chip *chip;
         uint16_t reg_val;
-        int ret;
+        int ret, offset = 0;
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
+        mutex_lock(&chip->i2c_lock);
         if (val)
                 reg_val = chip->reg_output | (1u << off);
         else
                 reg_val = chip->reg_output & ~(1u << off);
 
-        ret = pca953x_write_reg(chip, PCA953X_OUTPUT, reg_val);
+        switch (chip->chip_type) {
+        case PCA953X_TYPE:
+                offset = PCA953X_OUTPUT;
+                break;
+        case PCA957X_TYPE:
+                offset = PCA957X_OUT;
+                break;
+        }
+        ret = pca953x_write_reg(chip, offset, reg_val);
         if (ret)
-                return;
+                goto exit;
 
         chip->reg_output = reg_val;
+exit:
+        mutex_unlock(&chip->i2c_lock);
 }
 
 static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios)
@@ -228,30 +312,30 @@ static int pca953x_gpio_to_irq(struct gpio_chip *gc, unsigned off)
         return chip->irq_base + off;
 }
 
-static void pca953x_irq_mask(unsigned int irq)
+static void pca953x_irq_mask(struct irq_data *d)
 {
-        struct pca953x_chip *chip = get_irq_chip_data(irq);
+        struct pca953x_chip *chip = irq_data_get_irq_chip_data(d);
 
-        chip->irq_mask &= ~(1 << (irq - chip->irq_base));
+        chip->irq_mask &= ~(1 << (d->irq - chip->irq_base));
 }
 
-static void pca953x_irq_unmask(unsigned int irq)
+static void pca953x_irq_unmask(struct irq_data *d)
 {
-        struct pca953x_chip *chip = get_irq_chip_data(irq);
+        struct pca953x_chip *chip = irq_data_get_irq_chip_data(d);
 
-        chip->irq_mask |= 1 << (irq - chip->irq_base);
+        chip->irq_mask |= 1 << (d->irq - chip->irq_base);
 }
 
-static void pca953x_irq_bus_lock(unsigned int irq)
+static void pca953x_irq_bus_lock(struct irq_data *d)
 {
-        struct pca953x_chip *chip = get_irq_chip_data(irq);
+        struct pca953x_chip *chip = irq_data_get_irq_chip_data(d);
 
         mutex_lock(&chip->irq_lock);
 }
 
-static void pca953x_irq_bus_sync_unlock(unsigned int irq)
+static void pca953x_irq_bus_sync_unlock(struct irq_data *d)
 {
-        struct pca953x_chip *chip = get_irq_chip_data(irq);
+        struct pca953x_chip *chip = irq_data_get_irq_chip_data(d);
         uint16_t new_irqs;
         uint16_t level;
 
@@ -268,15 +352,15 @@ static void pca953x_irq_bus_sync_unlock(unsigned int irq)
         mutex_unlock(&chip->irq_lock);
 }
 
-static int pca953x_irq_set_type(unsigned int irq, unsigned int type)
+static int pca953x_irq_set_type(struct irq_data *d, unsigned int type)
 {
-        struct pca953x_chip *chip = get_irq_chip_data(irq);
-        uint16_t level = irq - chip->irq_base;
+        struct pca953x_chip *chip = irq_data_get_irq_chip_data(d);
+        uint16_t level = d->irq - chip->irq_base;
         uint16_t mask = 1 << level;
 
         if (!(type & IRQ_TYPE_EDGE_BOTH)) {
                 dev_err(&chip->client->dev, "irq %d: unsupported type %d\n",
-                        irq, type);
+                        d->irq, type);
                 return -EINVAL;
         }
 
@@ -295,11 +379,11 @@ static int pca953x_irq_set_type(unsigned int irq, unsigned int type)
 
 static struct irq_chip pca953x_irq_chip = {
         .name                   = "pca953x",
-        .mask                   = pca953x_irq_mask,
-        .unmask                 = pca953x_irq_unmask,
-        .bus_lock               = pca953x_irq_bus_lock,
-        .bus_sync_unlock        = pca953x_irq_bus_sync_unlock,
-        .set_type               = pca953x_irq_set_type,
+        .irq_mask               = pca953x_irq_mask,
+        .irq_unmask             = pca953x_irq_unmask,
+        .irq_bus_lock           = pca953x_irq_bus_lock,
+        .irq_bus_sync_unlock    = pca953x_irq_bus_sync_unlock,
+        .irq_set_type           = pca953x_irq_set_type,
 };
 
 static uint16_t pca953x_irq_pending(struct pca953x_chip *chip)
@@ -308,9 +392,17 @@ static uint16_t pca953x_irq_pending(struct pca953x_chip *chip)
         uint16_t old_stat;
         uint16_t pending;
         uint16_t trigger;
-        int ret;
-
-        ret = pca953x_read_reg(chip, PCA953X_INPUT, &cur_stat);
+        int ret, offset = 0;
+
+        switch (chip->chip_type) {
+        case PCA953X_TYPE:
+                offset = PCA953X_INPUT;
+                break;
+        case PCA957X_TYPE:
+                offset = PCA957X_IN;
+                break;
+        }
+        ret = pca953x_read_reg(chip, offset, &cur_stat);
         if (ret)
                 return 0;
 
@@ -345,7 +437,7 @@ static irqreturn_t pca953x_irq_handler(int irq, void *devid)
 
         do {
                 level = __ffs(pending);
-                handle_nested_irq(level + chip->irq_base);
+                generic_handle_irq(level + chip->irq_base);
 
                 pending &= ~(1 << level);
         } while (pending);
@@ -358,13 +450,21 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
 {
         struct i2c_client *client = chip->client;
         struct pca953x_platform_data *pdata = client->dev.platform_data;
-        int ret;
+        int ret, offset = 0;
 
-        if (pdata->irq_base && (id->driver_data & PCA953X_INT)) {
+        if (pdata->irq_base != -1
+                        && (id->driver_data & PCA_INT)) {
                 int lvl;
 
-                ret = pca953x_read_reg(chip, PCA953X_INPUT,
-                                       &chip->irq_stat);
+                switch (chip->chip_type) {
+                case PCA953X_TYPE:
+                        offset = PCA953X_INPUT;
+                        break;
+                case PCA957X_TYPE:
+                        offset = PCA957X_IN;
+                        break;
+                }
+                ret = pca953x_read_reg(chip, offset, &chip->irq_stat);
                 if (ret)
                         goto out_failed;
 
@@ -380,20 +480,20 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
                 for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) {
                         int irq = lvl + chip->irq_base;
 
-                        set_irq_chip_data(irq, chip);
-                        set_irq_chip_and_handler(irq, &pca953x_irq_chip,
-                                                 handle_edge_irq);
-                        set_irq_nested_thread(irq, 1);
+                        irq_set_chip_data(irq, chip);
+                        irq_set_chip_and_handler(irq, &pca953x_irq_chip,
+                                                 handle_simple_irq);
 #ifdef CONFIG_ARM
                         set_irq_flags(irq, IRQF_VALID);
 #else
-                        set_irq_noprobe(irq);
+                        irq_set_noprobe(irq);
 #endif
                 }
 
                 ret = request_threaded_irq(client->irq,
                                            NULL,
                                            pca953x_irq_handler,
+                                           IRQF_TRIGGER_RISING |
                                            IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                                            dev_name(&client->dev), chip);
                 if (ret) {
@@ -408,13 +508,13 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
         return 0;
 
 out_failed:
-        chip->irq_base = 0;
+        chip->irq_base = -1;
         return ret;
 }
 
 static void pca953x_irq_teardown(struct pca953x_chip *chip)
 {
-        if (chip->irq_base)
+        if (chip->irq_base != -1)
                 free_irq(chip->client->irq, chip);
 }
 #else /* CONFIG_GPIO_PCA953X_IRQ */
@@ -424,7 +524,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
         struct i2c_client *client = chip->client;
         struct pca953x_platform_data *pdata = client->dev.platform_data;
 
-        if (pdata->irq_base && (id->driver_data & PCA953X_INT))
+        if (pdata->irq_base != -1 && (id->driver_data & PCA_INT))
                 dev_warn(&client->dev, "interrupt support not compiled in\n");
 
         return 0;
@@ -447,7 +547,8 @@ pca953x_get_alt_pdata(struct i2c_client *client)
 {
         struct pca953x_platform_data *pdata;
         struct device_node *node;
-        const uint16_t *val;
+        const __be32 *val;
+        int size;
 
         node = client->dev.of_node;
         if (node == NULL)
@@ -460,13 +561,13 @@ pca953x_get_alt_pdata(struct i2c_client *client)
         }
 
         pdata->gpio_base = -1;
-        val = of_get_property(node, "linux,gpio-base", NULL);
+        val = of_get_property(node, "linux,gpio-base", &size);
         if (val) {
-                if (*val < 0)
-                        dev_warn(&client->dev,
-                                 "invalid gpio-base in device tree\n");
+                if (size != sizeof(*val))
+                        dev_warn(&client->dev, "%s: wrong linux,gpio-base\n",
+                                 node->full_name);
                 else
-                        pdata->gpio_base = *val;
+                        pdata->gpio_base = be32_to_cpup(val);
         }
 
         val = of_get_property(node, "polarity", NULL);
@@ -483,12 +584,65 @@ pca953x_get_alt_pdata(struct i2c_client *client)
 }
 #endif
 
+static int __devinit device_pca953x_init(struct pca953x_chip *chip, int invert)
+{
+        int ret;
+
+        ret = pca953x_read_reg(chip, PCA953X_OUTPUT, &chip->reg_output);
+        if (ret)
+                goto out;
+
+        ret = pca953x_read_reg(chip, PCA953X_DIRECTION,
+                               &chip->reg_direction);
+        if (ret)
+                goto out;
+
+        /* set platform specific polarity inversion */
+        ret = pca953x_write_reg(chip, PCA953X_INVERT, invert);
+        if (ret)
+                goto out;
+        return 0;
+out:
+        return ret;
+}
+
+static int __devinit device_pca957x_init(struct pca953x_chip *chip, int invert)
+{
+        int ret;
+        uint16_t val = 0;
+
+        /* Let every port in proper state, that could save power */
+        pca953x_write_reg(chip, PCA957X_PUPD, 0x0);
+        pca953x_write_reg(chip, PCA957X_CFG, 0xffff);
+        pca953x_write_reg(chip, PCA957X_OUT, 0x0);
+
+        ret = pca953x_read_reg(chip, PCA957X_IN, &val);
+        if (ret)
+                goto out;
+        ret = pca953x_read_reg(chip, PCA957X_OUT, &chip->reg_output);
+        if (ret)
+                goto out;
+        ret = pca953x_read_reg(chip, PCA957X_CFG, &chip->reg_direction);
+        if (ret)
+                goto out;
+
+        /* set platform specific polarity inversion */
+        pca953x_write_reg(chip, PCA957X_INVRT, invert);
+
+        /* To enable register 6, 7 to controll pull up and pull down */
+        pca953x_write_reg(chip, PCA957X_BKEN, 0x202);
+
+        return 0;
+out:
+        return ret;
+}
+
 static int __devinit pca953x_probe(struct i2c_client *client,
                                    const struct i2c_device_id *id)
 {
         struct pca953x_platform_data *pdata;
         struct pca953x_chip *chip;
-        int ret;
+        int ret = 0;
 
         chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL);
         if (chip == NULL)
@@ -515,23 +669,20 @@ static int __devinit pca953x_probe(struct i2c_client *client,
         chip->gpio_start = pdata->gpio_base;
 
         chip->names = pdata->names;
+        chip->chip_type = id->driver_data & (PCA953X_TYPE | PCA957X_TYPE);
+
+        mutex_init(&chip->i2c_lock);
 
         /* initialize cached registers from their original values.
          * we can't share this chip with another i2c master.
          */
-        pca953x_setup_gpio(chip, id->driver_data & PCA953X_GPIOS);
-
-        ret = pca953x_read_reg(chip, PCA953X_OUTPUT, &chip->reg_output);
-        if (ret)
-                goto out_failed;
+        pca953x_setup_gpio(chip, id->driver_data & PCA_GPIO_MASK);
 
-        ret = pca953x_read_reg(chip, PCA953X_DIRECTION, &chip->reg_direction);
-        if (ret)
-                goto out_failed;
-
-        /* set platform specific polarity inversion */
-        ret = pca953x_write_reg(chip, PCA953X_INVERT, pdata->invert);
-        if (ret)
+        if (chip->chip_type == PCA953X_TYPE)
+                device_pca953x_init(chip, pdata->invert);
+        else if (chip->chip_type == PCA957X_TYPE)
+                device_pca957x_init(chip, pdata->invert);
+        else
                 goto out_failed;
 
         ret = pca953x_irq_setup(chip, id);
@@ -540,7 +691,7 @@ static int __devinit pca953x_probe(struct i2c_client *client,
 
         ret = gpiochip_add(&chip->gpio_chip);
         if (ret)
-                goto out_failed;
+                goto out_failed_irq;
 
         if (pdata->setup) {
                 ret = pdata->setup(client, chip->gpio_chip.base,
@@ -552,8 +703,9 @@ static int __devinit pca953x_probe(struct i2c_client *client,
         i2c_set_clientdata(client, chip);
         return 0;
 
-out_failed:
+out_failed_irq:
         pca953x_irq_teardown(chip);
+out_failed:
         kfree(chip->dyn_pdata);
         kfree(chip);
         return ret;