Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[cascardo/linux.git] / include / linux / leds.h

diff --git a/include/linux/leds.h b/include/linux/leds.h
index dfe70e9..cfceef3 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -301,6 +301,7 @@ struct gpio_led {
        unsigned        retain_state_suspended : 1;
        unsigned        default_state : 2;
        /* default_state should be one of LEDS_GPIO_DEFSTATE_(ON|OFF|KEEP) */
+       struct gpio_desc *gpiod;
 };
 #define LEDS_GPIO_DEFSTATE_OFF         0
 #define LEDS_GPIO_DEFSTATE_ON          1
@@ -313,7 +314,7 @@ struct gpio_led_platform_data {
 #define GPIO_LED_NO_BLINK_LOW  0       /* No blink GPIO state low */
 #define GPIO_LED_NO_BLINK_HIGH 1       /* No blink GPIO state high */
 #define GPIO_LED_BLINK         2       /* Please, blink */
-       int             (*gpio_blink_set)(unsigned gpio, int state,
+       int             (*gpio_blink_set)(struct gpio_desc *desc, int state,
                                        unsigned long *delay_on,
                                        unsigned long *delay_off);
 };