diff options
| -rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 52 | ||||
| -rw-r--r-- | drivers/leds/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/leds/Makefile | 2 | ||||
| -rw-r--r-- | drivers/leds/led-triggers.c | 3 | ||||
| -rw-r--r-- | drivers/leds/leds-atmel-pwm.c | 2 | ||||
| -rw-r--r-- | drivers/leds/leds-h1940.c | 9 | ||||
| -rw-r--r-- | drivers/leds/leds-pca9532.c | 337 | ||||
| -rw-r--r-- | drivers/leds/leds-pca955x.c | 384 | ||||
| -rw-r--r-- | include/linux/leds-pca9532.h | 45 | ||||
| -rw-r--r-- | include/linux/leds.h | 16 |
10 files changed, 860 insertions, 6 deletions
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 2741063bf361..28f164ea4726 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/f75375s.h> | 19 | #include <linux/f75375s.h> |
| 20 | #include <linux/leds-pca9532.h> | ||
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 22 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| @@ -206,6 +207,53 @@ static struct f75375s_platform_data n2100_f75375s = { | |||
| 206 | .pwm_enable = { 0, 0 }, | 207 | .pwm_enable = { 0, 0 }, |
| 207 | }; | 208 | }; |
| 208 | 209 | ||
| 210 | static struct pca9532_platform_data n2100_leds = { | ||
| 211 | .leds = { | ||
| 212 | { .name = "n2100:red:satafail0", | ||
| 213 | .state = PCA9532_OFF, | ||
| 214 | .type = PCA9532_TYPE_LED, | ||
| 215 | }, | ||
| 216 | { .name = "n2100:red:satafail1", | ||
| 217 | .state = PCA9532_OFF, | ||
| 218 | .type = PCA9532_TYPE_LED, | ||
| 219 | }, | ||
| 220 | { .name = "n2100:blue:usb", | ||
| 221 | .state = PCA9532_OFF, | ||
| 222 | .type = PCA9532_TYPE_LED, | ||
| 223 | }, | ||
| 224 | { .type = PCA9532_TYPE_NONE }, | ||
| 225 | |||
| 226 | { .type = PCA9532_TYPE_NONE }, | ||
| 227 | { .type = PCA9532_TYPE_NONE }, | ||
| 228 | { .type = PCA9532_TYPE_NONE }, | ||
| 229 | { .name = "n2100:red:usb", | ||
| 230 | .state = PCA9532_OFF, | ||
| 231 | .type = PCA9532_TYPE_LED, | ||
| 232 | }, | ||
| 233 | |||
| 234 | { .type = PCA9532_TYPE_NONE }, /* power OFF gpio */ | ||
| 235 | { .type = PCA9532_TYPE_NONE }, /* reset gpio */ | ||
| 236 | { .type = PCA9532_TYPE_NONE }, | ||
| 237 | { .type = PCA9532_TYPE_NONE }, | ||
| 238 | |||
| 239 | { .type = PCA9532_TYPE_NONE }, | ||
| 240 | { .name = "n2100:orange:system", | ||
| 241 | .state = PCA9532_OFF, | ||
| 242 | .type = PCA9532_TYPE_LED, | ||
| 243 | }, | ||
| 244 | { .name = "n2100:red:system", | ||
| 245 | .state = PCA9532_OFF, | ||
| 246 | .type = PCA9532_TYPE_LED, | ||
| 247 | }, | ||
| 248 | { .name = "N2100 beeper" , | ||
| 249 | .state = PCA9532_OFF, | ||
| 250 | .type = PCA9532_TYPE_N2100_BEEP, | ||
| 251 | }, | ||
| 252 | }, | ||
| 253 | .psc = { 0, 0 }, | ||
| 254 | .pwm = { 0, 0 }, | ||
| 255 | }; | ||
| 256 | |||
| 209 | static struct i2c_board_info __initdata n2100_i2c_devices[] = { | 257 | static struct i2c_board_info __initdata n2100_i2c_devices[] = { |
| 210 | { | 258 | { |
| 211 | I2C_BOARD_INFO("rs5c372b", 0x32), | 259 | I2C_BOARD_INFO("rs5c372b", 0x32), |
| @@ -214,6 +262,10 @@ static struct i2c_board_info __initdata n2100_i2c_devices[] = { | |||
| 214 | I2C_BOARD_INFO("f75375", 0x2e), | 262 | I2C_BOARD_INFO("f75375", 0x2e), |
| 215 | .platform_data = &n2100_f75375s, | 263 | .platform_data = &n2100_f75375s, |
| 216 | }, | 264 | }, |
| 265 | { | ||
| 266 | I2C_BOARD_INFO("pca9532", 0x60), | ||
| 267 | .platform_data = &n2100_leds, | ||
| 268 | }, | ||
| 217 | }; | 269 | }; |
| 218 | 270 | ||
| 219 | /* | 271 | /* |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 86a369bc57d6..9556262dda5a 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
| @@ -103,6 +103,14 @@ config LEDS_HP6XX | |||
| 103 | This option enables led support for the handheld | 103 | This option enables led support for the handheld |
| 104 | HP Jornada 620/660/680/690. | 104 | HP Jornada 620/660/680/690. |
| 105 | 105 | ||
| 106 | config LEDS_PCA9532 | ||
| 107 | tristate "LED driver for PCA9532 dimmer" | ||
| 108 | depends on LEDS_CLASS && I2C && INPUT && EXPERIMENTAL | ||
| 109 | help | ||
| 110 | This option enables support for NXP pca9532 | ||
| 111 | led controller. It is generally only usefull | ||
| 112 | as a platform driver | ||
| 113 | |||
| 106 | config LEDS_GPIO | 114 | config LEDS_GPIO |
| 107 | tristate "LED Support for GPIO connected LEDs" | 115 | tristate "LED Support for GPIO connected LEDs" |
| 108 | depends on LEDS_CLASS && GENERIC_GPIO | 116 | depends on LEDS_CLASS && GENERIC_GPIO |
| @@ -147,6 +155,14 @@ config LEDS_CLEVO_MAIL | |||
| 147 | To compile this driver as a module, choose M here: the | 155 | To compile this driver as a module, choose M here: the |
| 148 | module will be called leds-clevo-mail. | 156 | module will be called leds-clevo-mail. |
| 149 | 157 | ||
| 158 | config LEDS_PCA955X | ||
| 159 | tristate "LED Support for PCA955x I2C chips" | ||
| 160 | depends on LEDS_CLASS && I2C | ||
| 161 | help | ||
| 162 | This option enables support for LEDs connected to PCA955x | ||
| 163 | LED driver chips accessed via the I2C bus. Supported | ||
| 164 | devices include PCA9550, PCA9551, PCA9552, and PCA9553. | ||
| 165 | |||
| 150 | comment "LED Triggers" | 166 | comment "LED Triggers" |
| 151 | 167 | ||
| 152 | config LEDS_TRIGGERS | 168 | config LEDS_TRIGGERS |
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index 973d626f5f4a..ff7982b44565 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile | |||
| @@ -16,11 +16,13 @@ obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o | |||
| 16 | obj-$(CONFIG_LEDS_H1940) += leds-h1940.o | 16 | obj-$(CONFIG_LEDS_H1940) += leds-h1940.o |
| 17 | obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o | 17 | obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o |
| 18 | obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o | 18 | obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o |
| 19 | obj-$(CONFIG_LEDS_PCA9532) += leds-pca9532.o | ||
| 19 | obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o | 20 | obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o |
| 20 | obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o | 21 | obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o |
| 21 | obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o | 22 | obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o |
| 22 | obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o | 23 | obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o |
| 23 | obj-$(CONFIG_LEDS_FSG) += leds-fsg.o | 24 | obj-$(CONFIG_LEDS_FSG) += leds-fsg.o |
| 25 | obj-$(CONFIG_LEDS_PCA955X) += leds-pca955x.o | ||
| 24 | 26 | ||
| 25 | # LED Triggers | 27 | # LED Triggers |
| 26 | obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o | 28 | obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o |
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 0f242b3f09b6..f910eaffe3a6 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c | |||
| @@ -111,16 +111,17 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger) | |||
| 111 | flags); | 111 | flags); |
| 112 | if (led_cdev->trigger->deactivate) | 112 | if (led_cdev->trigger->deactivate) |
| 113 | led_cdev->trigger->deactivate(led_cdev); | 113 | led_cdev->trigger->deactivate(led_cdev); |
| 114 | led_cdev->trigger = NULL; | ||
| 114 | led_set_brightness(led_cdev, LED_OFF); | 115 | led_set_brightness(led_cdev, LED_OFF); |
| 115 | } | 116 | } |
| 116 | if (trigger) { | 117 | if (trigger) { |
| 117 | write_lock_irqsave(&trigger->leddev_list_lock, flags); | 118 | write_lock_irqsave(&trigger->leddev_list_lock, flags); |
| 118 | list_add_tail(&led_cdev->trig_list, &trigger->led_cdevs); | 119 | list_add_tail(&led_cdev->trig_list, &trigger->led_cdevs); |
| 119 | write_unlock_irqrestore(&trigger->leddev_list_lock, flags); | 120 | write_unlock_irqrestore(&trigger->leddev_list_lock, flags); |
| 121 | led_cdev->trigger = trigger; | ||
| 120 | if (trigger->activate) | 122 | if (trigger->activate) |
| 121 | trigger->activate(led_cdev); | 123 | trigger->activate(led_cdev); |
| 122 | } | 124 | } |
| 123 | led_cdev->trigger = trigger; | ||
| 124 | } | 125 | } |
| 125 | EXPORT_SYMBOL_GPL(led_trigger_set); | 126 | EXPORT_SYMBOL_GPL(led_trigger_set); |
| 126 | 127 | ||
diff --git a/drivers/leds/leds-atmel-pwm.c b/drivers/leds/leds-atmel-pwm.c index 28db6c1444ed..52297c3ab246 100644 --- a/drivers/leds/leds-atmel-pwm.c +++ b/drivers/leds/leds-atmel-pwm.c | |||
| @@ -37,7 +37,7 @@ static int __init pwmled_probe(struct platform_device *pdev) | |||
| 37 | { | 37 | { |
| 38 | const struct gpio_led_platform_data *pdata; | 38 | const struct gpio_led_platform_data *pdata; |
| 39 | struct pwmled *leds; | 39 | struct pwmled *leds; |
| 40 | unsigned i; | 40 | int i; |
| 41 | int status; | 41 | int status; |
| 42 | 42 | ||
| 43 | pdata = pdev->dev.platform_data; | 43 | pdata = pdev->dev.platform_data; |
diff --git a/drivers/leds/leds-h1940.c b/drivers/leds/leds-h1940.c index bcec42230389..73c705021686 100644 --- a/drivers/leds/leds-h1940.c +++ b/drivers/leds/leds-h1940.c | |||
| @@ -23,7 +23,8 @@ | |||
| 23 | /* | 23 | /* |
| 24 | * Green led. | 24 | * Green led. |
| 25 | */ | 25 | */ |
| 26 | void h1940_greenled_set(struct led_classdev *led_dev, enum led_brightness value) | 26 | static void h1940_greenled_set(struct led_classdev *led_dev, |
| 27 | enum led_brightness value) | ||
| 27 | { | 28 | { |
| 28 | switch (value) { | 29 | switch (value) { |
| 29 | case LED_HALF: | 30 | case LED_HALF: |
| @@ -52,7 +53,8 @@ static struct led_classdev h1940_greenled = { | |||
| 52 | /* | 53 | /* |
| 53 | * Red led. | 54 | * Red led. |
| 54 | */ | 55 | */ |
| 55 | void h1940_redled_set(struct led_classdev *led_dev, enum led_brightness value) | 56 | static void h1940_redled_set(struct led_classdev *led_dev, |
| 57 | enum led_brightness value) | ||
| 56 | { | 58 | { |
| 57 | switch (value) { | 59 | switch (value) { |
| 58 | case LED_HALF: | 60 | case LED_HALF: |
| @@ -82,7 +84,8 @@ static struct led_classdev h1940_redled = { | |||
| 82 | * Blue led. | 84 | * Blue led. |
| 83 | * (it can only be blue flashing led) | 85 | * (it can only be blue flashing led) |
| 84 | */ | 86 | */ |
| 85 | void h1940_blueled_set(struct led_classdev *led_dev, enum led_brightness value) | 87 | static void h1940_blueled_set(struct led_classdev *led_dev, |
| 88 | enum led_brightness value) | ||
| 86 | { | 89 | { |
| 87 | if (value) { | 90 | if (value) { |
| 88 | /* flashing Blue */ | 91 | /* flashing Blue */ |
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c new file mode 100644 index 000000000000..4064d4f6b33b --- /dev/null +++ b/drivers/leds/leds-pca9532.c | |||
| @@ -0,0 +1,337 @@ | |||
| 1 | /* | ||
| 2 | * pca9532.c - 16-bit Led dimmer | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Riku Voipio <riku.voipio@movial.fi> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; version 2 of the License. | ||
| 9 | * | ||
| 10 | * Datasheet: http://www.nxp.com/acrobat/datasheets/PCA9532_3.pdf | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/module.h> | ||
| 15 | #include <linux/i2c.h> | ||
| 16 | #include <linux/leds.h> | ||
| 17 | #include <linux/input.h> | ||
| 18 | #include <linux/mutex.h> | ||
| 19 | #include <linux/leds-pca9532.h> | ||
| 20 | |||
| 21 | static const unsigned short normal_i2c[] = { /*0x60,*/ I2C_CLIENT_END}; | ||
| 22 | I2C_CLIENT_INSMOD_1(pca9532); | ||
| 23 | |||
| 24 | #define PCA9532_REG_PSC(i) (0x2+(i)*2) | ||
| 25 | #define PCA9532_REG_PWM(i) (0x3+(i)*2) | ||
| 26 | #define PCA9532_REG_LS0 0x6 | ||
| 27 | #define LED_REG(led) ((led>>2)+PCA9532_REG_LS0) | ||
| 28 | #define LED_NUM(led) (led & 0x3) | ||
| 29 | |||
| 30 | #define ldev_to_led(c) container_of(c, struct pca9532_led, ldev) | ||
| 31 | |||
| 32 | struct pca9532_data { | ||
| 33 | struct i2c_client *client; | ||
| 34 | struct pca9532_led leds[16]; | ||
| 35 | struct mutex update_lock; | ||
| 36 | struct input_dev *idev; | ||
| 37 | u8 pwm[2]; | ||
| 38 | u8 psc[2]; | ||
| 39 | }; | ||
| 40 | |||
| 41 | static int pca9532_probe(struct i2c_client *client, | ||
| 42 | const struct i2c_device_id *id); | ||
| 43 | static int pca9532_remove(struct i2c_client *client); | ||
| 44 | |||
| 45 | static const struct i2c_device_id pca9532_id[] = { | ||
| 46 | { "pca9532", 0 }, | ||
| 47 | { } | ||
| 48 | }; | ||
| 49 | |||
| 50 | MODULE_DEVICE_TABLE(i2c, pca9532_id); | ||
| 51 | |||
| 52 | static struct i2c_driver pca9532_driver = { | ||
| 53 | .driver = { | ||
| 54 | .name = "pca9532", | ||
| 55 | }, | ||
| 56 | .probe = pca9532_probe, | ||
| 57 | .remove = pca9532_remove, | ||
| 58 | .id_table = pca9532_id, | ||
| 59 | }; | ||
| 60 | |||
| 61 | /* We have two pwm/blinkers, but 16 possible leds to drive. Additionaly, | ||
| 62 | * the clever Thecus people are using one pwm to drive the beeper. So, | ||
| 63 | * as a compromise we average one pwm to the values requested by all | ||
| 64 | * leds that are not ON/OFF. | ||
| 65 | * */ | ||
| 66 | static int pca9532_setpwm(struct i2c_client *client, int pwm, int blink, | ||
| 67 | enum led_brightness value) | ||
| 68 | { | ||
| 69 | int a = 0, b = 0, i = 0; | ||
| 70 | struct pca9532_data *data = i2c_get_clientdata(client); | ||
| 71 | for (i = 0; i < 16; i++) { | ||
| 72 | if (data->leds[i].type == PCA9532_TYPE_LED && | ||
| 73 | data->leds[i].state == PCA9532_PWM0+pwm) { | ||
| 74 | a++; | ||
| 75 | b += data->leds[i].ldev.brightness; | ||
| 76 | } | ||
| 77 | } | ||
| 78 | if (a == 0) { | ||
| 79 | dev_err(&client->dev, | ||
| 80 | "fear of division by zero %d/%d, wanted %d\n", | ||
| 81 | b, a, value); | ||
| 82 | return -EINVAL; | ||
| 83 | } | ||
| 84 | b = b/a; | ||
| 85 | if (b > 0xFF) | ||
| 86 | return -EINVAL; | ||
| 87 | mutex_lock(&data->update_lock); | ||
| 88 | data->pwm[pwm] = b; | ||
| 89 | i2c_smbus_write_byte_data(client, PCA9532_REG_PWM(pwm), | ||
| 90 | data->pwm[pwm]); | ||
| 91 | data->psc[pwm] = blink; | ||
| 92 | i2c_smbus_write_byte_data(client, PCA9532_REG_PSC(pwm), | ||
| 93 | data->psc[pwm]); | ||
| 94 | mutex_unlock(&data->update_lock); | ||
| 95 | return 0; | ||
| 96 | } | ||
| 97 | |||
| 98 | /* Set LED routing */ | ||
| 99 | static void pca9532_setled(struct pca9532_led *led) | ||
| 100 | { | ||
| 101 | struct i2c_client *client = led->client; | ||
| 102 | struct pca9532_data *data = i2c_get_clientdata(client); | ||
| 103 | char reg; | ||
| 104 | |||
| 105 | mutex_lock(&data->update_lock); | ||
| 106 | reg = i2c_smbus_read_byte_data(client, LED_REG(led->id)); | ||
| 107 | /* zero led bits */ | ||
| 108 | reg = reg & ~(0x3<<LED_NUM(led->id)*2); | ||
| 109 | /* set the new value */ | ||
| 110 | reg = reg | (led->state << LED_NUM(led->id)*2); | ||
| 111 | i2c_smbus_write_byte_data(client, LED_REG(led->id), reg); | ||
| 112 | mutex_unlock(&data->update_lock); | ||
| 113 | } | ||
| 114 | |||
| 115 | static void pca9532_set_brightness(struct led_classdev *led_cdev, | ||
| 116 | enum led_brightness value) | ||
| 117 | { | ||
| 118 | int err = 0; | ||
| 119 | struct pca9532_led *led = ldev_to_led(led_cdev); | ||
| 120 | |||
| 121 | if (value == LED_OFF) | ||
| 122 | led->state = PCA9532_OFF; | ||
| 123 | else if (value == LED_FULL) | ||
| 124 | led->state = PCA9532_ON; | ||
| 125 | else { | ||
| 126 | led->state = PCA9532_PWM0; /* Thecus: hardcode one pwm */ | ||
| 127 | err = pca9532_setpwm(led->client, 0, 0, value); | ||
| 128 | if (err) | ||
| 129 | return; /* XXX: led api doesn't allow error code? */ | ||
| 130 | } | ||
| 131 | pca9532_setled(led); | ||
| 132 | } | ||
| 133 | |||
| 134 | static int pca9532_set_blink(struct led_classdev *led_cdev, | ||
| 135 | unsigned long *delay_on, unsigned long *delay_off) | ||
| 136 | { | ||
| 137 | struct pca9532_led *led = ldev_to_led(led_cdev); | ||
| 138 | struct i2c_client *client = led->client; | ||
| 139 | int psc; | ||
| 140 | |||
| 141 | if (*delay_on == 0 && *delay_off == 0) { | ||
| 142 | /* led subsystem ask us for a blink rate */ | ||
| 143 | *delay_on = 1000; | ||
| 144 | *delay_off = 1000; | ||
| 145 | } | ||
| 146 | if (*delay_on != *delay_off || *delay_on > 1690 || *delay_on < 6) | ||
| 147 | return -EINVAL; | ||
| 148 | |||
| 149 | /* Thecus specific: only use PSC/PWM 0 */ | ||
| 150 | psc = (*delay_on * 152-1)/1000; | ||
| 151 | return pca9532_setpwm(client, 0, psc, led_cdev->brightness); | ||
| 152 | } | ||
| 153 | |||
| 154 | int pca9532_event(struct input_dev *dev, unsigned int type, unsigned int code, | ||
| 155 | int value) | ||
| 156 | { | ||
| 157 | struct pca9532_data *data = input_get_drvdata(dev); | ||
| 158 | |||
| 159 | if (type != EV_SND && (code != SND_BELL || code != SND_TONE)) | ||
| 160 | return -1; | ||
| 161 | |||
| 162 | /* XXX: allow different kind of beeps with psc/pwm modifications */ | ||
| 163 | if (value > 1 && value < 32767) | ||
| 164 | data->pwm[1] = 127; | ||
| 165 | else | ||
| 166 | data->pwm[1] = 0; | ||
| 167 | |||
| 168 | dev_info(&dev->dev, "setting beep to %d \n", data->pwm[1]); | ||
| 169 | mutex_lock(&data->update_lock); | ||
| 170 | i2c_smbus_write_byte_data(data->client, PCA9532_REG_PWM(1), | ||
| 171 | data->pwm[1]); | ||
| 172 | mutex_unlock(&data->update_lock); | ||
| 173 | |||
| 174 | return 0; | ||
| 175 | } | ||
| 176 | |||
| 177 | static int pca9532_configure(struct i2c_client *client, | ||
| 178 | struct pca9532_data *data, struct pca9532_platform_data *pdata) | ||
| 179 | { | ||
| 180 | int i, err = 0; | ||
| 181 | |||
| 182 | for (i = 0; i < 2; i++) { | ||
| 183 | data->pwm[i] = pdata->pwm[i]; | ||
| 184 | data->psc[i] = pdata->psc[i]; | ||
| 185 | i2c_smbus_write_byte_data(client, PCA9532_REG_PWM(i), | ||
| 186 | data->pwm[i]); | ||
| 187 | i2c_smbus_write_byte_data(client, PCA9532_REG_PSC(i), | ||
| 188 | data->psc[i]); | ||
| 189 | } | ||
| 190 | |||
| 191 | for (i = 0; i < 16; i++) { | ||
| 192 | struct pca9532_led *led = &data->leds[i]; | ||
| 193 | struct pca9532_led *pled = &pdata->leds[i]; | ||
| 194 | led->client = client; | ||
| 195 | led->id = i; | ||
| 196 | led->type = pled->type; | ||
| 197 | switch (led->type) { | ||
| 198 | case PCA9532_TYPE_NONE: | ||
| 199 | break; | ||
| 200 | case PCA9532_TYPE_LED: | ||
| 201 | led->state = pled->state; | ||
| 202 | led->name = pled->name; | ||
| 203 | led->ldev.name = led->name; | ||
| 204 | led->ldev.brightness = LED_OFF; | ||
| 205 | led->ldev.brightness_set = pca9532_set_brightness; | ||
| 206 | led->ldev.blink_set = pca9532_set_blink; | ||
| 207 | if (led_classdev_register(&client->dev, | ||
| 208 | &led->ldev) < 0) { | ||
| 209 | dev_err(&client->dev, | ||
| 210 | "couldn't register LED %s\n", | ||
| 211 | led->name); | ||
| 212 | goto exit; | ||
| 213 | } | ||
| 214 | pca9532_setled(led); | ||
| 215 | break; | ||
| 216 | case PCA9532_TYPE_N2100_BEEP: | ||
| 217 | BUG_ON(data->idev); | ||
| 218 | led->state = PCA9532_PWM1; | ||
| 219 | pca9532_setled(led); | ||
| 220 | data->idev = input_allocate_device(); | ||
| 221 | if (data->idev == NULL) { | ||
| 222 | err = -ENOMEM; | ||
| 223 | goto exit; | ||
| 224 | } | ||
| 225 | data->idev->name = pled->name; | ||
| 226 | data->idev->phys = "i2c/pca9532"; | ||
| 227 | data->idev->id.bustype = BUS_HOST; | ||
| 228 | data->idev->id.vendor = 0x001f; | ||
| 229 | data->idev->id.product = 0x0001; | ||
| 230 | data->idev->id.version = 0x0100; | ||
| 231 | data->idev->evbit[0] = BIT_MASK(EV_SND); | ||
| 232 | data->idev->sndbit[0] = BIT_MASK(SND_BELL) | | ||
| 233 | BIT_MASK(SND_TONE); | ||
| 234 | data->idev->event = pca9532_event; | ||
| 235 | input_set_drvdata(data->idev, data); | ||
| 236 | err = input_register_device(data->idev); | ||
| 237 | if (err) { | ||
| 238 | input_free_device(data->idev); | ||
| 239 | data->idev = NULL; | ||
| 240 | goto exit; | ||
| 241 | } | ||
| 242 | break; | ||
| 243 | } | ||
| 244 | } | ||
| 245 | return 0; | ||
| 246 | |||
| 247 | exit: | ||
| 248 | if (i > 0) | ||
| 249 | for (i = i - 1; i >= 0; i--) | ||
| 250 | switch (data->leds[i].type) { | ||
| 251 | case PCA9532_TYPE_NONE: | ||
| 252 | break; | ||
| 253 | case PCA9532_TYPE_LED: | ||
| 254 | led_classdev_unregister(&data->leds[i].ldev); | ||
| 255 | break; | ||
| 256 | case PCA9532_TYPE_N2100_BEEP: | ||
| 257 | if (data->idev != NULL) { | ||
| 258 | input_unregister_device(data->idev); | ||
| 259 | input_free_device(data->idev); | ||
| 260 | data->idev = NULL; | ||
| 261 | } | ||
| 262 | break; | ||
| 263 | } | ||
| 264 | |||
| 265 | return err; | ||
| 266 | |||
| 267 | } | ||
| 268 | |||
| 269 | static int pca9532_probe(struct i2c_client *client, | ||
| 270 | const struct i2c_device_id *id) | ||
| 271 | { | ||
| 272 | struct pca9532_data *data = i2c_get_clientdata(client); | ||
| 273 | struct pca9532_platform_data *pca9532_pdata = client->dev.platform_data; | ||
| 274 | |||
| 275 | if (!i2c_check_functionality(client->adapter, | ||
| 276 | I2C_FUNC_SMBUS_BYTE_DATA)) | ||
| 277 | return -EIO; | ||
| 278 | |||
| 279 | data = kzalloc(sizeof(struct pca9532_data), GFP_KERNEL); | ||
| 280 | if (!data) | ||
| 281 | return -ENOMEM; | ||
| 282 | |||
| 283 | dev_info(&client->dev, "setting platform data\n"); | ||
| 284 | i2c_set_clientdata(client, data); | ||
| 285 | data->client = client; | ||
| 286 | mutex_init(&data->update_lock); | ||
| 287 | |||
| 288 | if (pca9532_pdata == NULL) | ||
| 289 | return -EIO; | ||
| 290 | |||
| 291 | pca9532_configure(client, data, pca9532_pdata); | ||
| 292 | return 0; | ||
| 293 | |||
| 294 | } | ||
| 295 | |||
| 296 | static int pca9532_remove(struct i2c_client *client) | ||
| 297 | { | ||
| 298 | struct pca9532_data *data = i2c_get_clientdata(client); | ||
| 299 | int i; | ||
| 300 | for (i = 0; i < 16; i++) | ||
| 301 | switch (data->leds[i].type) { | ||
| 302 | case PCA9532_TYPE_NONE: | ||
| 303 | break; | ||
| 304 | case PCA9532_TYPE_LED: | ||
| 305 | led_classdev_unregister(&data->leds[i].ldev); | ||
| 306 | break; | ||
| 307 | case PCA9532_TYPE_N2100_BEEP: | ||
| 308 | if (data->idev != NULL) { | ||
| 309 | input_unregister_device(data->idev); | ||
| 310 | input_free_device(data->idev); | ||
| 311 | data->idev = NULL; | ||
| 312 | } | ||
| 313 | break; | ||
| 314 | } | ||
| 315 | |||
| 316 | kfree(data); | ||
| 317 | i2c_set_clientdata(client, NULL); | ||
| 318 | return 0; | ||
| 319 | } | ||
| 320 | |||
| 321 | static int __init pca9532_init(void) | ||
| 322 | { | ||
| 323 | return i2c_add_driver(&pca9532_driver); | ||
| 324 | } | ||
| 325 | |||
| 326 | static void __exit pca9532_exit(void) | ||
| 327 | { | ||
| 328 | i2c_del_driver(&pca9532_driver); | ||
| 329 | } | ||
| 330 | |||
| 331 | MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi>"); | ||
| 332 | MODULE_LICENSE("GPL"); | ||
| 333 | MODULE_DESCRIPTION("PCA 9532 LED dimmer"); | ||
| 334 | |||
| 335 | module_init(pca9532_init); | ||
| 336 | module_exit(pca9532_exit); | ||
| 337 | |||
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c new file mode 100644 index 000000000000..146c06972863 --- /dev/null +++ b/drivers/leds/leds-pca955x.c | |||
| @@ -0,0 +1,384 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2007-2008 Extreme Engineering Solutions, Inc. | ||
| 3 | * | ||
| 4 | * Author: Nate Case <ncase@xes-inc.com> | ||
| 5 | * | ||
| 6 | * This file is subject to the terms and conditions of version 2 of | ||
| 7 | * the GNU General Public License. See the file COPYING in the main | ||
| 8 | * directory of this archive for more details. | ||
| 9 | * | ||
| 10 | * LED driver for various PCA955x I2C LED drivers | ||
| 11 | * | ||
| 12 | * Supported devices: | ||
| 13 | * | ||
| 14 | * Device Description 7-bit slave address | ||
| 15 | * ------ ----------- ------------------- | ||
| 16 | * PCA9550 2-bit driver 0x60 .. 0x61 | ||
| 17 | * PCA9551 8-bit driver 0x60 .. 0x67 | ||
| 18 | * PCA9552 16-bit driver 0x60 .. 0x67 | ||
| 19 | * PCA9553/01 4-bit driver 0x62 | ||
| 20 | * PCA9553/02 4-bit driver 0x63 | ||
| 21 | * | ||
| 22 | * Philips PCA955x LED driver chips follow a register map as shown below: | ||
| 23 | * | ||
| 24 | * Control Register Description | ||
| 25 | * ---------------- ----------- | ||
| 26 | * 0x0 Input register 0 | ||
| 27 | * .. | ||
| 28 | * NUM_INPUT_REGS - 1 Last Input register X | ||
| 29 | * | ||
| 30 | * NUM_INPUT_REGS Frequency prescaler 0 | ||
| 31 | * NUM_INPUT_REGS + 1 PWM register 0 | ||
| 32 | * NUM_INPUT_REGS + 2 Frequency prescaler 1 | ||
| 33 | * NUM_INPUT_REGS + 3 PWM register 1 | ||
| 34 | * | ||
| 35 | * NUM_INPUT_REGS + 4 LED selector 0 | ||
| 36 | * NUM_INPUT_REGS + 4 | ||
| 37 | * + NUM_LED_REGS - 1 Last LED selector | ||
| 38 | * | ||
| 39 | * where NUM_INPUT_REGS and NUM_LED_REGS vary depending on how many | ||
| 40 | * bits the chip supports. | ||
| 41 | */ | ||
| 42 | |||
| 43 | #include <linux/module.h> | ||
| 44 | #include <linux/delay.h> | ||
| 45 | #include <linux/string.h> | ||
| 46 | #include <linux/ctype.h> | ||
| 47 | #include <linux/leds.h> | ||
| 48 | #include <linux/err.h> | ||
| 49 | #include <linux/i2c.h> | ||
| 50 | #include <linux/workqueue.h> | ||
| 51 | |||
| 52 | /* LED select registers determine the source that drives LED outputs */ | ||
| 53 | #define PCA955X_LS_LED_ON 0x0 /* Output LOW */ | ||
| 54 | #define PCA955X_LS_LED_OFF 0x1 /* Output HI-Z */ | ||
| 55 | #define PCA955X_LS_BLINK0 0x2 /* Blink at PWM0 rate */ | ||
| 56 | #define PCA955X_LS_BLINK1 0x3 /* Blink at PWM1 rate */ | ||
| 57 | |||
| 58 | enum pca955x_type { | ||
| 59 | pca9550, | ||
| 60 | pca9551, | ||
| 61 | pca9552, | ||
| 62 | pca9553, | ||
| 63 | }; | ||
| 64 | |||
| 65 | struct pca955x_chipdef { | ||
| 66 | int bits; | ||
| 67 | u8 slv_addr; /* 7-bit slave address mask */ | ||
| 68 | int slv_addr_shift; /* Number of bits to ignore */ | ||
| 69 | }; | ||
| 70 | |||
| 71 | static struct pca955x_chipdef pca955x_chipdefs[] = { | ||
| 72 | [pca9550] = { | ||
| 73 | .bits = 2, | ||
| 74 | .slv_addr = /* 110000x */ 0x60, | ||
| 75 | .slv_addr_shift = 1, | ||
| 76 | }, | ||
| 77 | [pca9551] = { | ||
| 78 | .bits = 8, | ||
| 79 | .slv_addr = /* 1100xxx */ 0x60, | ||
| 80 | .slv_addr_shift = 3, | ||
| 81 | }, | ||
| 82 | [pca9552] = { | ||
| 83 | .bits = 16, | ||
| 84 | .slv_addr = /* 1100xxx */ 0x60, | ||
| 85 | .slv_addr_shift = 3, | ||
| 86 | }, | ||
| 87 | [pca9553] = { | ||
| 88 | .bits = 4, | ||
| 89 | .slv_addr = /* 110001x */ 0x62, | ||
| 90 | .slv_addr_shift = 1, | ||
| 91 | }, | ||
| 92 | }; | ||
| 93 | |||
| 94 | static const struct i2c_device_id pca955x_id[] = { | ||
| 95 | { "pca9550", pca9550 }, | ||
| 96 | { "pca9551", pca9551 }, | ||
| 97 | { "pca9552", pca9552 }, | ||
| 98 | { "pca9553", pca9553 }, | ||
| 99 | { } | ||
| 100 | }; | ||
| 101 | MODULE_DEVICE_TABLE(i2c, pca955x_id); | ||
| 102 | |||
| 103 | struct pca955x_led { | ||
| 104 | struct pca955x_chipdef *chipdef; | ||
| 105 | struct i2c_client *client; | ||
| 106 | struct work_struct work; | ||
| 107 | spinlock_t lock; | ||
| 108 | enum led_brightness brightness; | ||
| 109 | struct led_classdev led_cdev; | ||
| 110 | int led_num; /* 0 .. 15 potentially */ | ||
| 111 | char name[32]; | ||
| 112 | }; | ||
| 113 | |||
| 114 | /* 8 bits per input register */ | ||
| 115 | static inline int pca95xx_num_input_regs(int bits) | ||
| 116 | { | ||
| 117 | return (bits + 7) / 8; | ||
| 118 | } | ||
| 119 | |||
| 120 | /* 4 bits per LED selector register */ | ||
| 121 | static inline int pca95xx_num_led_regs(int bits) | ||
| 122 | { | ||
| 123 | return (bits + 3) / 4; | ||
| 124 | } | ||
| 125 | |||
| 126 | /* | ||
| 127 | * Return an LED selector register value based on an existing one, with | ||
| 128 | * the appropriate 2-bit state value set for the given LED number (0-3). | ||
| 129 | */ | ||
| 130 | static inline u8 pca955x_ledsel(u8 oldval, int led_num, int state) | ||
| 131 | { | ||
| 132 | return (oldval & (~(0x3 << (led_num << 1)))) | | ||
| 133 | ((state & 0x3) << (led_num << 1)); | ||
| 134 | } | ||
| 135 | |||
| 136 | /* | ||
| 137 | * Write to frequency prescaler register, used to program the | ||
| 138 | * period of the PWM output. period = (PSCx + 1) / 38 | ||
| 139 | */ | ||
| 140 | static void pca955x_write_psc(struct i2c_client *client, int n, u8 val) | ||
| 141 | { | ||
| 142 | struct pca955x_led *pca955x = i2c_get_clientdata(client); | ||
| 143 | |||
| 144 | i2c_smbus_write_byte_data(client, | ||
| 145 | pca95xx_num_input_regs(pca955x->chipdef->bits) + 2*n, | ||
| 146 | val); | ||
| 147 | } | ||
| 148 | |||
| 149 | /* | ||
| 150 | * Write to PWM register, which determines the duty cycle of the | ||
| 151 | * output. LED is OFF when the count is less than the value of this | ||
| 152 | * register, and ON when it is greater. If PWMx == 0, LED is always OFF. | ||
| 153 | * | ||
| 154 | * Duty cycle is (256 - PWMx) / 256 | ||
| 155 | */ | ||
| 156 | static void pca955x_write_pwm(struct i2c_client *client, int n, u8 val) | ||
| 157 | { | ||
| 158 | struct pca955x_led *pca955x = i2c_get_clientdata(client); | ||
| 159 | |||
| 160 | i2c_smbus_write_byte_data(client, | ||
| 161 | pca95xx_num_input_regs(pca955x->chipdef->bits) + 1 + 2*n, | ||
| 162 | val); | ||
| 163 | } | ||
| 164 | |||
| 165 | /* | ||
| 166 | * Write to LED selector register, which determines the source that | ||
| 167 | * drives the LED output. | ||
| 168 | */ | ||
| 169 | static void pca955x_write_ls(struct i2c_client *client, int n, u8 val) | ||
| 170 | { | ||
| 171 | struct pca955x_led *pca955x = i2c_get_clientdata(client); | ||
| 172 | |||
| 173 | i2c_smbus_write_byte_data(client, | ||
| 174 | pca95xx_num_input_regs(pca955x->chipdef->bits) + 4 + n, | ||
| 175 | val); | ||
| 176 | } | ||
| 177 | |||
| 178 | /* | ||
| 179 | * Read the LED selector register, which determines the source that | ||
| 180 | * drives the LED output. | ||
| 181 | */ | ||
| 182 | static u8 pca955x_read_ls(struct i2c_client *client, int n) | ||
| 183 | { | ||
| 184 | struct pca955x_led *pca955x = i2c_get_clientdata(client); | ||
| 185 | |||
| 186 | return (u8) i2c_smbus_read_byte_data(client, | ||
| 187 | pca95xx_num_input_regs(pca955x->chipdef->bits) + 4 + n); | ||
| 188 | } | ||
| 189 | |||
| 190 | static void pca955x_led_work(struct work_struct *work) | ||
| 191 | { | ||
| 192 | struct pca955x_led *pca955x; | ||
| 193 | u8 ls; | ||
| 194 | int chip_ls; /* which LSx to use (0-3 potentially) */ | ||
| 195 | int ls_led; /* which set of bits within LSx to use (0-3) */ | ||
| 196 | |||
| 197 | pca955x = container_of(work, struct pca955x_led, work); | ||
| 198 | chip_ls = pca955x->led_num / 4; | ||
| 199 | ls_led = pca955x->led_num % 4; | ||
| 200 | |||
| 201 | ls = pca955x_read_ls(pca955x->client, chip_ls); | ||
| 202 | |||
| 203 | switch (pca955x->brightness) { | ||
| 204 | case LED_FULL: | ||
| 205 | ls = pca955x_ledsel(ls, ls_led, PCA955X_LS_LED_ON); | ||
| 206 | break; | ||
| 207 | case LED_OFF: | ||
| 208 | ls = pca955x_ledsel(ls, ls_led, PCA955X_LS_LED_OFF); | ||
| 209 | break; | ||
| 210 | case LED_HALF: | ||
| 211 | ls = pca955x_ledsel(ls, ls_led, PCA955X_LS_BLINK0); | ||
| 212 | break; | ||
| 213 | default: | ||
| 214 | /* | ||
| 215 | * Use PWM1 for all other values. This has the unwanted | ||
| 216 | * side effect of making all LEDs on the chip share the | ||
| 217 | * same brightness level if set to a value other than | ||
| 218 | * OFF, HALF, or FULL. But, this is probably better than | ||
| 219 | * just turning off for all other values. | ||
| 220 | */ | ||
| 221 | pca955x_write_pwm(pca955x->client, 1, 255-pca955x->brightness); | ||
| 222 | ls = pca955x_ledsel(ls, ls_led, PCA955X_LS_BLINK1); | ||
| 223 | break; | ||
| 224 | } | ||
| 225 | |||
| 226 | pca955x_write_ls(pca955x->client, chip_ls, ls); | ||
| 227 | } | ||
| 228 | |||
| 229 | void pca955x_led_set(struct led_classdev *led_cdev, enum led_brightness value) | ||
| 230 | { | ||
| 231 | struct pca955x_led *pca955x; | ||
| 232 | |||
| 233 | pca955x = container_of(led_cdev, struct pca955x_led, led_cdev); | ||
| 234 | |||
| 235 | spin_lock(&pca955x->lock); | ||
| 236 | pca955x->brightness = value; | ||
| 237 | |||
| 238 | /* | ||
| 239 | * Must use workqueue for the actual I/O since I2C operations | ||
| 240 | * can sleep. | ||
| 241 | */ | ||
| 242 | schedule_work(&pca955x->work); | ||
| 243 | |||
| 244 | spin_unlock(&pca955x->lock); | ||
| 245 | } | ||
| 246 | |||
| 247 | static int __devinit pca955x_probe(struct i2c_client *client, | ||
| 248 | const struct i2c_device_id *id) | ||
| 249 | { | ||
| 250 | struct pca955x_led *pca955x; | ||
| 251 | int i; | ||
| 252 | int err = -ENODEV; | ||
| 253 | struct pca955x_chipdef *chip; | ||
| 254 | struct i2c_adapter *adapter; | ||
| 255 | struct led_platform_data *pdata; | ||
| 256 | |||
| 257 | chip = &pca955x_chipdefs[id->driver_data]; | ||
| 258 | adapter = to_i2c_adapter(client->dev.parent); | ||
| 259 | pdata = client->dev.platform_data; | ||
| 260 | |||
| 261 | /* Make sure the slave address / chip type combo given is possible */ | ||
| 262 | if ((client->addr & ~((1 << chip->slv_addr_shift) - 1)) != | ||
| 263 | chip->slv_addr) { | ||
| 264 | dev_err(&client->dev, "invalid slave address %02x\n", | ||
| 265 | client->addr); | ||
| 266 | return -ENODEV; | ||
| 267 | } | ||
| 268 | |||
| 269 | printk(KERN_INFO "leds-pca955x: Using %s %d-bit LED driver at " | ||
| 270 | "slave address 0x%02x\n", | ||
| 271 | id->name, chip->bits, client->addr); | ||
| 272 | |||
| 273 | if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) | ||
| 274 | return -EIO; | ||
| 275 | |||
| 276 | if (pdata) { | ||
| 277 | if (pdata->num_leds != chip->bits) { | ||
| 278 | dev_err(&client->dev, "board info claims %d LEDs" | ||
| 279 | " on a %d-bit chip\n", | ||
| 280 | pdata->num_leds, chip->bits); | ||
| 281 | return -ENODEV; | ||
| 282 | } | ||
| 283 | } | ||
| 284 | |||
| 285 | for (i = 0; i < chip->bits; i++) { | ||
| 286 | pca955x = kzalloc(sizeof(struct pca955x_led), GFP_KERNEL); | ||
| 287 | if (!pca955x) { | ||
| 288 | err = -ENOMEM; | ||
| 289 | goto exit; | ||
| 290 | } | ||
| 291 | |||
| 292 | pca955x->chipdef = chip; | ||
| 293 | pca955x->client = client; | ||
| 294 | pca955x->led_num = i; | ||
| 295 | /* Platform data can specify LED names and default triggers */ | ||
| 296 | if (pdata) { | ||
| 297 | if (pdata->leds[i].name) | ||
| 298 | snprintf(pca955x->name, 32, "pca955x:%s", | ||
| 299 | pdata->leds[i].name); | ||
| 300 | if (pdata->leds[i].default_trigger) | ||
| 301 | pca955x->led_cdev.default_trigger = | ||
| 302 | pdata->leds[i].default_trigger; | ||
| 303 | } else { | ||
| 304 | snprintf(pca955x->name, 32, "pca955x:%d", i); | ||
| 305 | } | ||
| 306 | spin_lock_init(&pca955x->lock); | ||
| 307 | |||
| 308 | pca955x->led_cdev.name = pca955x->name; | ||
| 309 | pca955x->led_cdev.brightness_set = | ||
| 310 | pca955x_led_set; | ||
| 311 | |||
| 312 | /* | ||
| 313 | * Client data is a pointer to the _first_ pca955x_led | ||
| 314 | * struct | ||
| 315 | */ | ||
| 316 | if (i == 0) | ||
| 317 | i2c_set_clientdata(client, pca955x); | ||
| 318 | |||
| 319 | INIT_WORK(&(pca955x->work), pca955x_led_work); | ||
| 320 | |||
| 321 | led_classdev_register(&client->dev, &(pca955x->led_cdev)); | ||
| 322 | } | ||
| 323 | |||
| 324 | /* Turn off LEDs */ | ||
| 325 | for (i = 0; i < pca95xx_num_led_regs(chip->bits); i++) | ||
| 326 | pca955x_write_ls(client, i, 0x55); | ||
| 327 | |||
| 328 | /* PWM0 is used for half brightness or 50% duty cycle */ | ||
| 329 | pca955x_write_pwm(client, 0, 255-LED_HALF); | ||
| 330 | |||
| 331 | /* PWM1 is used for variable brightness, default to OFF */ | ||
| 332 | pca955x_write_pwm(client, 1, 0); | ||
| 333 | |||
| 334 | /* Set to fast frequency so we do not see flashing */ | ||
| 335 | pca955x_write_psc(client, 0, 0); | ||
| 336 | pca955x_write_psc(client, 1, 0); | ||
| 337 | |||
| 338 | return 0; | ||
| 339 | exit: | ||
| 340 | return err; | ||
| 341 | } | ||
| 342 | |||
| 343 | static int __devexit pca955x_remove(struct i2c_client *client) | ||
| 344 | { | ||
| 345 | struct pca955x_led *pca955x = i2c_get_clientdata(client); | ||
| 346 | int leds = pca955x->chipdef->bits; | ||
| 347 | int i; | ||
| 348 | |||
| 349 | for (i = 0; i < leds; i++) { | ||
| 350 | led_classdev_unregister(&(pca955x->led_cdev)); | ||
| 351 | cancel_work_sync(&(pca955x->work)); | ||
| 352 | kfree(pca955x); | ||
| 353 | pca955x = pca955x + 1; | ||
| 354 | } | ||
| 355 | |||
| 356 | return 0; | ||
| 357 | } | ||
| 358 | |||
| 359 | static struct i2c_driver pca955x_driver = { | ||
| 360 | .driver = { | ||
| 361 | .name = "leds-pca955x", | ||
| 362 | .owner = THIS_MODULE, | ||
| 363 | }, | ||
| 364 | .probe = pca955x_probe, | ||
| 365 | .remove = __devexit_p(pca955x_remove), | ||
| 366 | .id_table = pca955x_id, | ||
| 367 | }; | ||
| 368 | |||
| 369 | static int __init pca955x_leds_init(void) | ||
| 370 | { | ||
| 371 | return i2c_add_driver(&pca955x_driver); | ||
| 372 | } | ||
| 373 | |||
| 374 | static void __exit pca955x_leds_exit(void) | ||
| 375 | { | ||
| 376 | i2c_del_driver(&pca955x_driver); | ||
| 377 | } | ||
| 378 | |||
| 379 | module_init(pca955x_leds_init); | ||
| 380 | module_exit(pca955x_leds_exit); | ||
| 381 | |||
| 382 | MODULE_AUTHOR("Nate Case <ncase@xes-inc.com>"); | ||
| 383 | MODULE_DESCRIPTION("PCA955x LED driver"); | ||
| 384 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/include/linux/leds-pca9532.h b/include/linux/leds-pca9532.h new file mode 100644 index 000000000000..81b4207deb95 --- /dev/null +++ b/include/linux/leds-pca9532.h | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | /* | ||
| 2 | * pca9532.h - platform data structure for pca9532 led controller | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Riku Voipio <riku.voipio@movial.fi> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; version 2 of the License. | ||
| 9 | * | ||
| 10 | * Datasheet: http://www.nxp.com/acrobat/datasheets/PCA9532_3.pdf | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #ifndef __LINUX_PCA9532_H | ||
| 15 | #define __LINUX_PCA9532_H | ||
| 16 | |||
| 17 | #include <linux/leds.h> | ||
| 18 | |||
| 19 | enum pca9532_state { | ||
| 20 | PCA9532_OFF = 0x0, | ||
| 21 | PCA9532_ON = 0x1, | ||
| 22 | PCA9532_PWM0 = 0x2, | ||
| 23 | PCA9532_PWM1 = 0x3 | ||
| 24 | }; | ||
| 25 | |||
| 26 | enum pca9532_type { PCA9532_TYPE_NONE, PCA9532_TYPE_LED, | ||
| 27 | PCA9532_TYPE_N2100_BEEP }; | ||
| 28 | |||
| 29 | struct pca9532_led { | ||
| 30 | u8 id; | ||
| 31 | struct i2c_client *client; | ||
| 32 | char *name; | ||
| 33 | struct led_classdev ldev; | ||
| 34 | enum pca9532_type type; | ||
| 35 | enum pca9532_state state; | ||
| 36 | }; | ||
| 37 | |||
| 38 | struct pca9532_platform_data { | ||
| 39 | struct pca9532_led leds[16]; | ||
| 40 | u8 pwm[2]; | ||
| 41 | u8 psc[2]; | ||
| 42 | }; | ||
| 43 | |||
| 44 | #endif /* __LINUX_PCA9532_H */ | ||
| 45 | |||
diff --git a/include/linux/leds.h b/include/linux/leds.h index 519df72e939d..d41ccb56146a 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h | |||
| @@ -48,7 +48,7 @@ struct led_classdev { | |||
| 48 | 48 | ||
| 49 | struct device *dev; | 49 | struct device *dev; |
| 50 | struct list_head node; /* LED Device list */ | 50 | struct list_head node; /* LED Device list */ |
| 51 | char *default_trigger; /* Trigger to use */ | 51 | const char *default_trigger; /* Trigger to use */ |
| 52 | 52 | ||
| 53 | #ifdef CONFIG_LEDS_TRIGGERS | 53 | #ifdef CONFIG_LEDS_TRIGGERS |
| 54 | /* Protects the trigger data below */ | 54 | /* Protects the trigger data below */ |
| @@ -118,6 +118,20 @@ extern void ledtrig_ide_activity(void); | |||
| 118 | #define ledtrig_ide_activity() do {} while(0) | 118 | #define ledtrig_ide_activity() do {} while(0) |
| 119 | #endif | 119 | #endif |
| 120 | 120 | ||
| 121 | /* | ||
| 122 | * Generic LED platform data for describing LED names and default triggers. | ||
| 123 | */ | ||
| 124 | struct led_info { | ||
| 125 | const char *name; | ||
| 126 | char *default_trigger; | ||
| 127 | int flags; | ||
| 128 | }; | ||
| 129 | |||
| 130 | struct led_platform_data { | ||
| 131 | int num_leds; | ||
| 132 | struct led_info *leds; | ||
| 133 | }; | ||
| 134 | |||
| 121 | /* For the leds-gpio driver */ | 135 | /* For the leds-gpio driver */ |
| 122 | struct gpio_led { | 136 | struct gpio_led { |
| 123 | const char *name; | 137 | const char *name; |
