]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gpio: max77620: Configure interrupt trigger level
authorLaxman Dewangan <ldewangan@nvidia.com>
Tue, 24 May 2016 13:13:44 +0000 (18:43 +0530)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 7 Jun 2016 07:35:15 +0000 (09:35 +0200)
The GPIO sub modules of MAX77620 offers to configure the GPIO
interrupt trigger level as RISING and FALLING edge.

Pass this information to regmap-irg when registering for GPIO
interrupts.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-max77620.c

index d9275623577c7774fcfc2a7e087aff7d67523c02..35f365c36df974399fb2406e097003e28922e179 100644 (file)
@@ -27,14 +27,62 @@ struct max77620_gpio {
 };
 
 static const struct regmap_irq max77620_gpio_irqs[] = {
-       REGMAP_IRQ_REG(0, 0, MAX77620_IRQ_LVL2_GPIO_EDGE0),
-       REGMAP_IRQ_REG(1, 0, MAX77620_IRQ_LVL2_GPIO_EDGE1),
-       REGMAP_IRQ_REG(2, 0, MAX77620_IRQ_LVL2_GPIO_EDGE2),
-       REGMAP_IRQ_REG(3, 0, MAX77620_IRQ_LVL2_GPIO_EDGE3),
-       REGMAP_IRQ_REG(4, 0, MAX77620_IRQ_LVL2_GPIO_EDGE4),
-       REGMAP_IRQ_REG(5, 0, MAX77620_IRQ_LVL2_GPIO_EDGE5),
-       REGMAP_IRQ_REG(6, 0, MAX77620_IRQ_LVL2_GPIO_EDGE6),
-       REGMAP_IRQ_REG(7, 0, MAX77620_IRQ_LVL2_GPIO_EDGE7),
+       [0] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE0,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 0,
+       },
+       [1] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE1,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 1,
+       },
+       [2] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE2,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 2,
+       },
+       [3] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE3,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 3,
+       },
+       [4] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE4,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 4,
+       },
+       [5] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE5,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 5,
+       },
+       [6] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE6,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 6,
+       },
+       [7] = {
+               .mask = MAX77620_IRQ_LVL2_GPIO_EDGE7,
+               .type_rising_mask = MAX77620_CNFG_GPIO_INT_RISING,
+               .type_falling_mask = MAX77620_CNFG_GPIO_INT_FALLING,
+               .reg_offset = 0,
+               .type_reg_offset = 7,
+       },
 };
 
 static struct regmap_irq_chip max77620_gpio_irq_chip = {
@@ -42,8 +90,11 @@ static struct regmap_irq_chip max77620_gpio_irq_chip = {
        .irqs = max77620_gpio_irqs,
        .num_irqs = ARRAY_SIZE(max77620_gpio_irqs),
        .num_regs = 1,
+       .num_type_reg = 8,
        .irq_reg_stride = 1,
+       .type_reg_stride = 1,
        .status_base = MAX77620_REG_IRQ_LVL2_GPIO,
+       .type_base = MAX77620_REG_GPIO0,
 };
 
 static int max77620_gpio_dir_input(struct gpio_chip *gc, unsigned int offset)