Merge branch 'i2c/for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

[linux-beck.git] / include / linux / leds-pca9532.h

diff --git a/include/linux/leds-pca9532.h b/include/linux/leds-pca9532.h
index b8d6fffed4d801c938e69bf7aa99fe3ad98085cb..d215b45611809ddc0c0d1e6d51b622b0db91cdbb 100644 (file)
--- a/include/linux/leds-pca9532.h
+++ b/include/linux/leds-pca9532.h
@@ -16,6 +16,7 @@
 
 #include <linux/leds.h>
 #include <linux/workqueue.h>
+#include <dt-bindings/leds/leds-pca9532.h>
 
 enum pca9532_state {
        PCA9532_OFF  = 0x0,
@@ -24,16 +25,14 @@ enum pca9532_state {
        PCA9532_PWM1 = 0x3
 };
 
-enum pca9532_type { PCA9532_TYPE_NONE, PCA9532_TYPE_LED,
-       PCA9532_TYPE_N2100_BEEP, PCA9532_TYPE_GPIO };
-
 struct pca9532_led {
        u8 id;
        struct i2c_client *client;
-       char *name;
+       const char *name;
+       const char *default_trigger;
        struct led_classdev ldev;
        struct work_struct work;
-       enum pca9532_type type;
+       u32 type;
        enum pca9532_state state;
 };