greybus: gpio: add irq-type defines

Add Greybus GPIO IRQ-type defines rather than rely on the current
Linux implementation.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 8dad9e579881364e4be4e6094cd0c56fc30117aa..95909149eba24007906466e8b9e1898ceb1fb1f1 100644 (file)
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -286,21 +286,33 @@ static int gb_gpio_irq_set_type(struct irq_data *d, unsigned int type)
        struct gpio_chip *chip = irq_data_to_gpio_chip(d);
        struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
        struct gb_gpio_line *line = &ggc->lines[d->hwirq];
+       u8 irq_type;
 
        switch (type) {
        case IRQ_TYPE_NONE:
+               irq_type = GB_GPIO_IRQ_TYPE_NONE;
+               break;
        case IRQ_TYPE_EDGE_RISING:
+               irq_type = GB_GPIO_IRQ_TYPE_EDGE_RISING;
+               break;
        case IRQ_TYPE_EDGE_FALLING:
+               irq_type = GB_GPIO_IRQ_TYPE_EDGE_FALLING;
+               break;
        case IRQ_TYPE_EDGE_BOTH:
+               irq_type = GB_GPIO_IRQ_TYPE_EDGE_BOTH;
+               break;
        case IRQ_TYPE_LEVEL_LOW:
+               irq_type = GB_GPIO_IRQ_TYPE_LEVEL_LOW;
+               break;
        case IRQ_TYPE_LEVEL_HIGH:
+               irq_type = GB_GPIO_IRQ_TYPE_LEVEL_HIGH;
                break;
        default:
                dev_err(chip->dev, "unsupported irq type: %u\n", type);
                return -EINVAL;
        }
 
-       line->irq_type = type;
+       line->irq_type = irq_type;
        line->irq_type_pending = true;
 
        return 0;

diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index 25c9a380ad994b32d2a4c84804220da983e3796f..81f01d9ab2931749c976357306aa2c5f5749fc88 100644 (file)
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -132,6 +132,13 @@ struct gb_i2c_transfer_response {
 #define GB_GPIO_TYPE_IRQ_UNMASK                0x0d
 #define GB_GPIO_TYPE_IRQ_EVENT         0x0e
 
+#define GB_GPIO_IRQ_TYPE_NONE          0x00
+#define GB_GPIO_IRQ_TYPE_EDGE_RISING   0x01
+#define GB_GPIO_IRQ_TYPE_EDGE_FALLING  0x02
+#define GB_GPIO_IRQ_TYPE_EDGE_BOTH     0x03
+#define GB_GPIO_IRQ_TYPE_LEVEL_HIGH    0x04
+#define GB_GPIO_IRQ_TYPE_LEVEL_LOW     0x08
+
 /* line count request has no payload */
 struct gb_gpio_line_count_response {
        __u8    count;