Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers/leds/leds-pca9532.c: add gpio capability

Allow unused leds on pca9532 to be used as gpio. The board I am working
on now has no less than 6 pca9532 chips. One chips is used for only leds,
one has 14 leds and 2 gpio and the rest of the chips are gpio only.

There is also one board in mainline which could use this capabilty;
arch/arm/mach-iop32x/n2100.c
232 { .type = PCA9532_TYPE_NONE }, /* power OFF gpio */
233 { .type = PCA9532_TYPE_NONE }, /* reset gpio */

This patch defines a new pin type, PCA9532_TYPE_GPIO, and registers a
gpiochip if any pin has this type set. The gpio will registers all chip
pins but will filter on gpio_request.

[randy.dunlap@oracle.com: fix build when GPIOLIB is not enabled]
Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Jan Weitzel <j.weitzel@phytec.de>
Cc: Juergen Kilb <j.kilb@phytec.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Joachim Eastwood and committed by
Linus Torvalds
3c1ab50d fff26f81

+122 -4
+10
drivers/leds/Kconfig
··· 162 162 LED controller. It is generally only useful 163 163 as a platform driver 164 164 165 + config LEDS_PCA9532_GPIO 166 + bool "Enable GPIO support for PCA9532" 167 + depends on LEDS_PCA9532 168 + depends on GPIOLIB 169 + help 170 + Allow unused pins on PCA9532 to be used as gpio. 171 + 172 + To use a pin as gpio pca9532_type in pca9532_platform data needs to 173 + set to PCA9532_TYPE_GPIO. 174 + 165 175 config LEDS_GPIO 166 176 tristate "LED Support for GPIO connected LEDs" 167 177 depends on LEDS_CLASS
+110 -3
drivers/leds/leds-pca9532.c
··· 19 19 #include <linux/mutex.h> 20 20 #include <linux/workqueue.h> 21 21 #include <linux/leds-pca9532.h> 22 + #include <linux/gpio.h> 22 23 24 + #define PCA9532_REG_INPUT(i) ((i)/8) 23 25 #define PCA9532_REG_PSC(i) (0x2+(i)*2) 24 26 #define PCA9532_REG_PWM(i) (0x3+(i)*2) 25 27 #define PCA9532_REG_LS0 0x6 ··· 36 34 struct mutex update_lock; 37 35 struct input_dev *idev; 38 36 struct work_struct work; 37 + #ifdef CONFIG_LEDS_PCA9532_GPIO 38 + struct gpio_chip gpio; 39 + #endif 39 40 u8 pwm[2]; 40 41 u8 psc[2]; 41 42 }; ··· 205 200 pca9532_setled(led); 206 201 } 207 202 208 - static void pca9532_destroy_devices(struct pca9532_data *data, int n_devs) 203 + #ifdef CONFIG_LEDS_PCA9532_GPIO 204 + static int pca9532_gpio_request_pin(struct gpio_chip *gc, unsigned offset) 205 + { 206 + struct pca9532_data *data = container_of(gc, struct pca9532_data, gpio); 207 + struct pca9532_led *led = &data->leds[offset]; 208 + 209 + if (led->type == PCA9532_TYPE_GPIO) 210 + return 0; 211 + 212 + return -EBUSY; 213 + } 214 + 215 + static void pca9532_gpio_set_value(struct gpio_chip *gc, unsigned offset, int val) 216 + { 217 + struct pca9532_data *data = container_of(gc, struct pca9532_data, gpio); 218 + struct pca9532_led *led = &data->leds[offset]; 219 + 220 + if (val) 221 + led->state = PCA9532_ON; 222 + else 223 + led->state = PCA9532_OFF; 224 + 225 + pca9532_setled(led); 226 + } 227 + 228 + static int pca9532_gpio_get_value(struct gpio_chip *gc, unsigned offset) 229 + { 230 + struct pca9532_data *data = container_of(gc, struct pca9532_data, gpio); 231 + unsigned char reg; 232 + 233 + reg = i2c_smbus_read_byte_data(data->client, PCA9532_REG_INPUT(offset)); 234 + 235 + return !!(reg & (1 << (offset % 8))); 236 + } 237 + 238 + static int pca9532_gpio_direction_input(struct gpio_chip *gc, unsigned offset) 239 + { 240 + /* To use as input ensure pin is not driven */ 241 + pca9532_gpio_set_value(gc, offset, 0); 242 + 243 + return 0; 244 + } 245 + 246 + static int pca9532_gpio_direction_output(struct gpio_chip *gc, unsigned offset, int val) 247 + { 248 + pca9532_gpio_set_value(gc, offset, val); 249 + 250 + return 0; 251 + } 252 + #endif /* CONFIG_LEDS_PCA9532_GPIO */ 253 + 254 + static int pca9532_destroy_devices(struct pca9532_data *data, int n_devs) 209 255 { 210 256 int i = n_devs; 211 257 212 258 if (!data) 213 - return; 259 + return -EINVAL; 214 260 215 261 while (--i >= 0) { 216 262 switch (data->leds[i].type) { 217 263 case PCA9532_TYPE_NONE: 264 + case PCA9532_TYPE_GPIO: 218 265 break; 219 266 case PCA9532_TYPE_LED: 220 267 led_classdev_unregister(&data->leds[i].ldev); ··· 281 224 break; 282 225 } 283 226 } 227 + 228 + #ifdef CONFIG_LEDS_PCA9532_GPIO 229 + if (data->gpio.dev) { 230 + int err = gpiochip_remove(&data->gpio); 231 + if (err) { 232 + dev_err(&data->client->dev, "%s failed, %d\n", 233 + "gpiochip_remove()", err); 234 + return err; 235 + } 236 + } 237 + #endif 238 + 239 + return 0; 284 240 } 285 241 286 242 static int pca9532_configure(struct i2c_client *client, 287 243 struct pca9532_data *data, struct pca9532_platform_data *pdata) 288 244 { 289 245 int i, err = 0; 246 + int gpios = 0; 290 247 291 248 for (i = 0; i < 2; i++) { 292 249 data->pwm[i] = pdata->pwm[i]; ··· 319 248 led->type = pled->type; 320 249 switch (led->type) { 321 250 case PCA9532_TYPE_NONE: 251 + break; 252 + case PCA9532_TYPE_GPIO: 253 + gpios++; 322 254 break; 323 255 case PCA9532_TYPE_LED: 324 256 led->state = pled->state; ··· 371 297 break; 372 298 } 373 299 } 300 + 301 + #ifdef CONFIG_LEDS_PCA9532_GPIO 302 + if (gpios) { 303 + data->gpio.label = "gpio-pca9532"; 304 + data->gpio.direction_input = pca9532_gpio_direction_input; 305 + data->gpio.direction_output = pca9532_gpio_direction_output; 306 + data->gpio.set = pca9532_gpio_set_value; 307 + data->gpio.get = pca9532_gpio_get_value; 308 + data->gpio.request = pca9532_gpio_request_pin; 309 + data->gpio.can_sleep = 1; 310 + data->gpio.base = pdata->gpio_base; 311 + data->gpio.ngpio = 16; 312 + data->gpio.dev = &client->dev; 313 + data->gpio.owner = THIS_MODULE; 314 + 315 + err = gpiochip_add(&data->gpio); 316 + if (err) { 317 + /* Use data->gpio.dev as a flag for freeing gpiochip */ 318 + data->gpio.dev = NULL; 319 + dev_warn(&client->dev, "could not add gpiochip\n"); 320 + } else { 321 + dev_info(&client->dev, "gpios %i...%i\n", 322 + data->gpio.base, data->gpio.base + 323 + data->gpio.ngpio - 1); 324 + } 325 + } 326 + #endif 327 + 374 328 return 0; 375 329 376 330 exit: ··· 439 337 static int pca9532_remove(struct i2c_client *client) 440 338 { 441 339 struct pca9532_data *data = i2c_get_clientdata(client); 442 - pca9532_destroy_devices(data, 16); 340 + int err; 341 + 342 + err = pca9532_destroy_devices(data, 16); 343 + if (err) 344 + return err; 345 + 443 346 kfree(data); 444 347 return 0; 445 348 }
+2 -1
include/linux/leds-pca9532.h
··· 25 25 }; 26 26 27 27 enum pca9532_type { PCA9532_TYPE_NONE, PCA9532_TYPE_LED, 28 - PCA9532_TYPE_N2100_BEEP }; 28 + PCA9532_TYPE_N2100_BEEP, PCA9532_TYPE_GPIO }; 29 29 30 30 struct pca9532_led { 31 31 u8 id; ··· 41 41 struct pca9532_led leds[16]; 42 42 u8 pwm[2]; 43 43 u8 psc[2]; 44 + int gpio_base; 44 45 }; 45 46 46 47 #endif /* __LINUX_PCA9532_H */