Two fixes for leds-tca6507 - Version 2
cover Two fixes for leds-tca6507 - Version 2
The driver didn't compile on arches which did not define GPIOLIB.
Fix this by excluding gpio support on those archs. [Fix for the 'remove' function too]
Reported by: Randy Dunlap <[email protected]> and
Stephen Rothwell <[email protected]>
off-by-one error in choose_times
Reported by: Dan Carpenter <[email protected]>
Thanks,
NeilBrown
---
NeilBrown (2):
leds-tca6507 - fix off by one error.
leds-tca6507: allow driver to compile when GPIOLIB is not available.
drivers/leds/leds-tca6507.c | 100 +++++++++++++++++++++++++++++------------- include/linux/leds-tca6507.h | 3 + 2 files changed, 71 insertions(+), 32 deletions(-)
Signature · 1 line
Signature
PATCH 1/2 leds-tca6507: allow driver to compile when GPIOLIB is not available.
This driver can configure the outputs as GPIO line instead of LEDs. But that only works if GPIOLIB is available. So make that code conditional on the library's availability.
Also remove the 'teardown' callback as it is never called and should never be needed.
---
drivers/leds/leds-tca6507.c | 92 +++++++++++++++++++++++++++++------------- include/linux/leds-tca6507.h | 3 + 2 files changed, 65 insertions(+), 30 deletions(-)
drivers/leds/leds-tca6507.c +63 -29
@@ -149,9 +149,11 @@ struct tca6507_chip {int bank;/* Bank used, or -1 */ int blink;/* 1 if we are hardware-blinking */ } leds[NUM_LEDS ]; +#ifdef CONFIG_GPIOLIB struct gpio_chip gpio;const char *gpio_name[NUM_LEDS ];int gpio_map[NUM_LEDS ]; +#endif };static const struct i2c_device_id tca6507_id[] = {
@@ -520,6 +522,7 @@ static int tca6507_blink_set(struct led_classdev *led_cdev,return 0 ; } +#ifdef CONFIG_GPIOLIB static void tca6507_gpio_set_value (struct gpio_chip *gc,unsigned offset,int val) {
@@ -542,6 +545,62 @@ static int tca6507_gpio_direction_output(struct gpio_chip *gc,tca6507_gpio_set_value (gc, offset, val);return 0 ; } +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +int err; +int i =0 ; +int gpios =0 ; + +for (i =0 ; i <NUM_LEDS ; i++) +if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { +/* Configure as a gpio */ + tca->gpio_name[gpios] = pdata->leds.leds[i].name; + tca->gpio_map[gpios] = i; + gpios++; + } + +if (!gpios) +return 0 ; + + tca->gpio.label ="gpio-tca6507" ; + tca->gpio.names = tca->gpio_name; + tca->gpio.ngpio = gpios; + tca->gpio.base = pdata->gpio_base; + tca->gpio.owner =THIS_MODULE ; + tca->gpio.direction_output = tca6507_gpio_direction_output; + tca->gpio.set = tca6507_gpio_set_value; + tca->gpio.dev = &client->dev; + err =gpiochip_add (&tca->gpio); +if (err) { + tca->gpio.ngpio =0 ; +return err; + } +if (pdata->setup) + pdata->setup (tca->gpio.base, tca->gpio.ngpio); +return 0 ; +} + +static void tca6507_remove_gpio (struct tca6507_chip *tca) +{ +if (tca->gpio.ngpio) { +int err =gpiochip_remove (&tca->gpio); +dev_err (&tca->client->dev,"%s failed, %d\n" , +"gpiochip_remove()" , err); + } +} +#else /* CONFIG_GPIOLIB */ +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +return 0 ; +} +static void tca6507_remove_gpio (struct tca6507_chip *tca) +{ +} +#endif /* CONFIG_GPIOLIB */ static int __devinit tca6507_probe (struct i2c_client *client,const struct i2c_device_id *id)
@@ -551,7 +610,6 @@ static int __devinit tca6507_probe(struct i2c_client *client,struct tca6507_platform_data *pdata;int err;int i =0 ; -int gpios =0 ; adapter =to_i2c_adapter (client->dev.parent); pdata = client->dev.platform_data;
@@ -590,30 +648,10 @@ static int __devinit tca6507_probe(struct i2c_client *client,if (err <0 ) goto exit; } -if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { -/* Configure as a gpio */ - tca->gpio_name[gpios] = pdata->leds.leds[i].name; - tca->gpio_map[gpios] = i; - gpios++; - } - } -if (gpios) { - tca->gpio.label ="gpio-tca6507" ; - tca->gpio.names = tca->gpio_name; - tca->gpio.ngpio = gpios; - tca->gpio.base = pdata->gpio_base; - tca->gpio.owner =THIS_MODULE ; - tca->gpio.direction_output = tca6507_gpio_direction_output; - tca->gpio.set = tca6507_gpio_set_value; - tca->gpio.dev = &client->dev; - err =gpiochip_add (&tca->gpio); -if (err) { - tca->gpio.ngpio =0 ; - goto exit; - } -if (pdata->setup) - pdata->setup (tca->gpio.base, tca->gpio.ngpio); } + err =tca6507_probe_gpios (client, tca, pdata); +if (err) + goto exit;i2c_set_clientdata (client, tca);/* set all registers to known state - zero */ tca->reg_set =0x7f ;
@@ -638,11 +676,7 @@ static int __devexit tca6507_remove(struct i2c_client *client)if (tca_leds[i].led_cdev.name)led_classdev_unregister (&tca_leds[i].led_cdev); } -if (tca->gpio.ngpio) { -int err =gpiochip_remove (&tca->gpio); -dev_err (&tca->client->dev,"%s failed, %d\n" , -"gpiochip_remove()" , err); - } +tca6507_remove_gpio (tca);cancel_work_sync (&tca->work);kfree (tca);i2c_set_clientdata (client,NULL );
include/linux/leds-tca6507.h +2 -1
@@ -24,9 +24,10 @@struct tca6507_platform_data {struct led_platform_data leds; +#ifdef CONFIG_GPIOLIB int gpio_base;void (*setup)(unsigned gpio_base,unsigned ngpio); -void (*teardown)(unsigned gpio_base,unsigned ngpio); +#endif };#define TCA6507_MAKE_GPIO 1
Re: [PATCH 1/2] leds-tca6507: allow driver to compile when GPIOLIB is not available.
Quoted 8 lines · NeilBrown
This driver can configure the outputs as GPIO line instead of LEDs. But that only works if GPIOLIB is available. So make that code conditional on the library's availability.
Also remove the 'teardown' callback as it is never called and should never be needed.
Signed-off-by NeilBrown <[email protected]>
Thanks. This builds.
Quoted 166 lines
---
drivers/leds/leds-tca6507.c | 92 +++++++++++++++++++++++++++++------------- include/linux/leds-tca6507.h | 3 + 2 files changed, 65 insertions(+), 30 deletions(-)drivers/leds/leds-tca6507.c +63
-29@@ -149,9 +149,11 @@ struct tca6507_chip {int bank;/* Bank used, or -1 */ int blink;/* 1 if we are hardware-blinking */ } leds[NUM_LEDS ]; +#ifdef CONFIG_GPIOLIB struct gpio_chip gpio;const char *gpio_name[NUM_LEDS ];int gpio_map[NUM_LEDS ]; +#endif };static const struct i2c_device_id tca6507_id[] = {@@ -520,6 +522,7 @@ static int tca6507_blink_set(struct led_classdev *led_cdev,return 0 ; } +#ifdef CONFIG_GPIOLIB static void tca6507_gpio_set_value (struct gpio_chip *gc,unsigned offset,int val) {@@ -542,6 +545,62 @@ static int tca6507_gpio_direction_output(struct gpio_chip *gc,tca6507_gpio_set_value (gc, offset, val);return 0 ; } +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +int err; +int i =0 ; +int gpios =0 ; + +for (i =0 ; i <NUM_LEDS ; i++) +if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { +/* Configure as a gpio */ + tca->gpio_name[gpios] = pdata->leds.leds[i].name; + tca->gpio_map[gpios] = i; + gpios++; + } + +if (!gpios) +return 0 ; + + tca->gpio.label ="gpio-tca6507" ; + tca->gpio.names = tca->gpio_name; + tca->gpio.ngpio = gpios; + tca->gpio.base = pdata->gpio_base; + tca->gpio.owner =THIS_MODULE ; + tca->gpio.direction_output = tca6507_gpio_direction_output; + tca->gpio.set = tca6507_gpio_set_value; + tca->gpio.dev = &client->dev; + err =gpiochip_add (&tca->gpio); +if (err) { + tca->gpio.ngpio =0 ; +return err; + } +if (pdata->setup) + pdata->setup (tca->gpio.base, tca->gpio.ngpio); +return 0 ; +} + +static void tca6507_remove_gpio (struct tca6507_chip *tca) +{ +if (tca->gpio.ngpio) { +int err =gpiochip_remove (&tca->gpio); +dev_err (&tca->client->dev,"%s failed, %d\n" , +"gpiochip_remove()" , err); + } +} +#else /* CONFIG_GPIOLIB */ +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +return 0 ; +} +static void tca6507_remove_gpio (struct tca6507_chip *tca) +{ +} +#endif /* CONFIG_GPIOLIB */ static int __devinit tca6507_probe (struct i2c_client *client,const struct i2c_device_id *id)@@ -551,7 +610,6 @@ static int __devinit tca6507_probe(struct i2c_client *client,struct tca6507_platform_data *pdata;int err;int i =0 ; -int gpios =0 ; adapter =to_i2c_adapter (client->dev.parent); pdata = client->dev.platform_data;@@ -590,30 +648,10 @@ static int __devinit tca6507_probe(struct i2c_client *client,if (err <0 ) goto exit; } -if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { -/* Configure as a gpio */ - tca->gpio_name[gpios] = pdata->leds.leds[i].name; - tca->gpio_map[gpios] = i; - gpios++; - } - } -if (gpios) { - tca->gpio.label ="gpio-tca6507" ; - tca->gpio.names = tca->gpio_name; - tca->gpio.ngpio = gpios; - tca->gpio.base = pdata->gpio_base; - tca->gpio.owner =THIS_MODULE ; - tca->gpio.direction_output = tca6507_gpio_direction_output; - tca->gpio.set = tca6507_gpio_set_value; - tca->gpio.dev = &client->dev; - err =gpiochip_add (&tca->gpio); -if (err) { - tca->gpio.ngpio =0 ; - goto exit; - } -if (pdata->setup) - pdata->setup (tca->gpio.base, tca->gpio.ngpio); } + err =tca6507_probe_gpios (client, tca, pdata); +if (err) + goto exit;i2c_set_clientdata (client, tca);/* set all registers to known state - zero */ tca->reg_set =0x7f ;@@ -638,11 +676,7 @@ static int __devexit tca6507_remove(struct i2c_client *client)if (tca_leds[i].led_cdev.name)led_classdev_unregister (&tca_leds[i].led_cdev); } -if (tca->gpio.ngpio) { -int err =gpiochip_remove (&tca->gpio); -dev_err (&tca->client->dev,"%s failed, %d\n" , -"gpiochip_remove()" , err); - } +tca6507_remove_gpio (tca);cancel_work_sync (&tca->work);kfree (tca);i2c_set_clientdata (client,NULL );include/linux/leds-tca6507.h +2
-1@@ -24,9 +24,10 @@struct tca6507_platform_data {struct led_platform_data leds; +#ifdef CONFIG_GPIOLIB int gpio_base;void (*setup)(unsigned gpio_base,unsigned ngpio); -void (*teardown)(unsigned gpio_base,unsigned ngpio); +#endif };#define TCA6507_MAKE_GPIO 1
Signature · 2 lines
~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: [PATCH 1/2] leds-tca6507: allow driver to compile when GPIOLIB is not available.
Quoted 5 lines · Randy Dunlap
Quoted 4 lines · NeilBrown
This driver can configure the outputs as GPIO line instead of LEDs. But that only works if GPIOLIB is available. So make that code conditional on the library's availability.
Quoted 8 lines
Quoted 4 lines
Also remove the 'teardown' callback as it is never called and should never be needed.
Signed-off-by NeilBrown <[email protected]>Thanks. This builds.
Acked-by Randy Dunlap <[email protected]>
Neil,
You might want to check this also:
drivers/leds/leds-tca6507.c:358:17: warning: array subscript is above array bounds drivers/leds/leds-tca6507.c:357:17: warning: array subscript is above array bounds
Signature · 2 lines
~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: [PATCH 1/2] leds-tca6507: allow driver to compile when GPIOLIB is not available.
Quoted 13 lines · On Tue, 20 Dec 2011 12:26:51 -0800 Randy Dunlap <[email protected]> wrote:
Quoted 12 lines · Randy Dunlap
Quoted 8 lines · NeilBrown
This driver can configure the outputs as GPIO line instead of LEDs. But that only works if GPIOLIB is available. So make that code conditional on the library's availability.
Also remove the 'teardown' callback as it is never called and should never be needed.
Signed-off-by NeilBrown <[email protected]>Thanks. This builds.
Quoted 9 lines
Quoted 1 line
Acked-by Randy Dunlap <[email protected]>Neil,
You might want to check this also:
drivers/leds/leds-tca6507.c:358:17: warning: array subscript is above array boundsdrivers/leds/leds-tca6507.c:357:17: warning: array subscript is above array bounds
Argh..
drivers/leds/leds-tca6507.c +1 -1
@@ -349,7 +349,7 @@ static int led_prepare(struct tca6507_led *led)return 0 ; } -for (i =MASTER ; i >=BANK0 ; i++) { +for (i =MASTER ; i >=BANK0 ; i--) {int d;if (tca->bank[i].level == level || tca->bank[i].level_use ==0 ) {
That loop used to go up..
I might just go an re-review all the code. And repeat the tests.
Thanks a lot.
NeilBrown
Re: [PATCH 1/2] leds-tca6507: allow driver to compile when GPIOLIB is not available.
Quoted 1 line · On Wed, 21 Dec 2011 08:03:00 +1100 NeilBrown <[email protected]> wrote:
I might just go an re-review all the code. And repeat the tests.
Here's the current patch as I see it:
From: NeilBrown <[email protected]>
Subject: leds: add driver for TCA6507 LED controller
TI's TCA6507 is the LED driver in the GTA04 Openmoko motherboard. The driver provides full support for brightness levels and hardware blinking.
This driver can drive each of 7 outputs as an LED or a GPIO output, and provides hardware-assist blinking.
---
drivers/leds/Kconfig | 8 drivers/leds/Makefile | 1 drivers/leds/leds-tca6507.c | 725 +++++++++++++++++++++++++++++++++ include/linux/leds-tca6507.h | 34 + 4 files changed, 768 insertions(+)
drivers/leds/Kconfig renamed from drivers/leds/Kconfig~leds-add-driver-for-tca6507-led-controller +8 -0
@@ -388,6 +388,14 @@ config LEDS_RENESAS_TPU pin function. The latter to support brightness control. Brightness control is supported but hardware blinking is not. +config LEDS_TCA6507 + tristate "LED Support for TCA6507 I2C chip" + depends on LEDS_CLASS && I2C + help + This option enables support for LEDs connected to TC6507 + LED driver chips accessed via the I2C bus. + Driver support brightness control and hardware-assisted blinking. + config LEDS_TRIGGERS bool "LED Trigger support" depends on LEDS_CLASS
drivers/leds/Makefile renamed from drivers/leds/Makefile~leds-add-driver-for-tca6507-led-controller +1 -0
@@ -43,6 +43,7 @@ obj-$(CONFIG_LEDS_NS2) += leds-ns2.o obj-$(CONFIG_LEDS_NETXBIG) += leds-netxbig.o obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o obj-$(CONFIG_LEDS_RENESAS_TPU) += leds-renesas-tpu.o +obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o # LED SPI Drivers obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o
drivers/leds/leds-tca6507.c new file +725 -0
725 lines not on this page · raw message
include/linux/leds-tca6507.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* TCA6507 LED chip driver. +* +* Copyright (C) 2011 Neil Brown <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA +*/ + +#ifndef __LINUX_TCA6507_H +#define __LINUX_TCA6507_H +#include <linux/leds.h> + +struct tca6507_platform_data { +struct led_platform_data leds; +#ifdef CONFIG_GPIOLIB +int gpio_base; +void (*setup)(unsigned gpio_base,unsigned ngpio); +#endif +}; + +#define TCA6507_MAKE_GPIO 1 +#endif /* __LINUX_TCA6507_H*/
_
Re: [PATCH 1/2] leds-tca6507: allow driver to compile when GPIOLIB is not available.
Quoted 6 lines · On Tue, 20 Dec 2011 14:23:31 -0800 Andrew Morton <[email protected]>…
Quoted 1 line · On Wed, 21 Dec 2011 08:03:00 +1100 NeilBrown <[email protected]> wrote:
I might just go an re-review all the code. And repeat the tests.
Here's the current patch as I see it:
Thanks.
Here is a patch against that which is the result of a review and more testing *after* making the changes :-)
NeilBrown
From a2081eb20047e9254137e37931e3b47193d8e363 Mon Sep 17 00:00:00 2001
From: NeilBrown <[email protected]>
Date: Thu, 29 Dec 2011 17:37:20 +1100
Subject: [PATCH] LEDS tca6507 fixes
- various improvements to comments.
- bug in choose_times() which was counting down instead of up
- Change choice algorithm to allow change-time to be longer if requested 'msec' is odd (i.e. use lsb of 'msec' as a flag).
- bug in set_code wasn't shifting mask properly.
- dev_dbg messages so we can monitor the choice funciton.
- make spinlock irq-safe so that gpio.set() and others can be called from interrupt handler.
- set client_data before ->setup call back as it could set the GPIO value immediately.
drivers/leds/leds-tca6507.c +93 -39
@@ -24,29 +24,41 @@* This driver does not support double-blink so 'second-off' always matches * 'off'. * -* Only 16 different times can be programmed is a roughly logarithmic scale from -* 64ms to 16320ms. Times that cannot be closely matched with these must be +* Only 16 different times can be programmed in a roughly logarithmic scale from +* 64ms to 16320ms. To be precise the possible times are: +* 0, 64, 128, 192, 256, 384, 512, 768, +* 1024, 1536, 2048, 3072, 4096, 5760, 8128, 16320 +* +* Times that cannot be closely matched with these must be * handled in software. This driver allows 12.5% error in matching. * * This driver does not allow rise/fall rates to be set explicitly. When trying * to match a given 'on' or 'off' period, an appropriate pair of 'change' and -* 'hold' times are chosen to get a close match, with the 'change' being the -* smaller. +* 'hold' times are chosen to get a close match. If the target delay is even, +* the 'change' number will be the smaller; if odd, the 'hold' number will be +* the smaller. + +* Choosing pairs of delays with 12.5% errors allows us to match delays in the +* ranges: 56-72, 112-144, 168-216, 224-27504, 28560-36720. +* 26% of the achievable sums can be matched by multiple pairings. For example +* 1536 == 1536+0, 1024+512, or 768+768. This driver will always choose the +* pairing with the least maximum - 768+768 in this case. Other pairings are +* not available. * * Access to the 3 levels and 2 blinks are on a first-come, first-served basis. * Access can be shared by multiple leds if they have the same level and * either same blink rates, or some don't blink. * When a led changes, it relinquishes access and tries again, so it might * lose access to hardware blink. -* If a blink engine cannot be allocated, software blink is used. If the -* desired brightness cannot be allocated, the closest available non-zero +* If a blink engine cannot be allocated, software blink is used. +* If the desired brightness cannot be allocated, the closest available non-zero * brightness is used. As 'full' is always available, the worst case would be * to have two different blink rates at '1', with Max at '2', then other leds * will have to choose between '2' and '16'. Hopefully this is not likely. * -* Each bank (BANK0 and BANK1) have two usage counts - Leds using the brightness -* and leds using the blink. It can only be reprogrammed when appropriate -* counter is zero. The MASTER level has as single usage count. +* Each bank (BANK0 and BANK1) has two usage counts - LEDs using the brightness +* and LEDs using the blink. It can only be reprogrammed when the appropriate +* counter is zero. The MASTER level has a single usage count. * * Each Led has programmable 'on' and 'off' time as milliseconds. With each * there is a flag saying if it was explicitly requested or defaulted.
@@ -58,8 +70,10 @@* lists for each output: the name, default trigger, and whether the signal * is being used as a GPiO rather than an led. 'struct led_plaform_data' * is used for this. If 'name' is NULL, the output isn't used. If 'flags' -* is non-zero, the output is a GPO. The 'flags' for the first GPIO should -* be the base gpio number, or -1. +* is TCA6507_MAKE_CPIO, the output is a GPO. +* The "struct led_platform_data" can be embedded in a +* "struct tca6507_platform_data" which adds a 'gpio_base' for the GPiOs, +* and a 'setup' callback which is called once the GPiOs are available. * */
@@ -74,6 +88,7 @@/* LED select registers determine the source that drives LED outputs */ #define TCA6507_LS_LED_OFF 0x0/* Output HI-Z (off) */ +#define TCA6507_LS_LED_OFF1 0x1/* Output HI-Z (off) - not used */ #define TCA6507_LS_LED_PWM0 0x2/* Output LOW with Bank0 rate */ #define TCA6507_LS_LED_PWM1 0x3/* Output LOW with Bank1 rate */ #define TCA6507_LS_LED_ON 0x4/* Output LOW (on) */
@@ -91,7 +106,7 @@ static int bank_source[3] = {TCA6507_LS_LED_PWM1 , TCA6507_LS_LED_MIR, }; -static int blink_source[3 ] = { +static int blink_source[2 ] = {TCA6507_LS_BLINK0 ,TCA6507_LS_BLINK1 , };
@@ -99,6 +114,10 @@ static int blink_source[3] = {/* PWM registers */ #define TCA6507_REG_CNT 11 +/* +* 0x00, 0x01, 0x02 encode the TCA6507_LS_* values, each output +* owns one bit in each register +*/ #define TCA6507_FADE_ON 0x03#define TCA6507_FULL_ON 0x04#define TCA6507_FADE_OFF 0x05
@@ -132,10 +151,11 @@ static inline int TO_BRIGHT(int level)#define NUM_LEDS 7struct tca6507_chip { -int reg_set;/* a '1' means the register +int reg_set;/* One bit per register where +* a '1' means the register * should be written */ u8 reg_file[TCA6507_REG_CNT ]; -/* Bank 0 is Master Intensity */ +/* Bank 2 is Master Intensity and doesn't use times */ struct bank {int level;int ontime, offtime;
@@ -153,7 +173,7 @@ struct tca6507_chip {int ontime, offtime;int on_dflt, off_dflt;int bank;/* Bank used, or -1 */ -int blink;/* 1 if we are hardware-blinking */ +int blink;/* Set if hardware-blinking */ } leds[NUM_LEDS ];#ifdef CONFIG_GPIOLIB struct gpio_chip gpio;
@@ -172,9 +192,13 @@ static int choose_times(int msec, int *c1p, int *c2p) {/* * Choose two timecodes which add to 'msec' as near as possible. -* The first returned should be the larger and is the 'on' of 'off' -* time. The second will be used as a 'fade-on' or 'fade-off' time. -* If cannot get within 1/8, fail. +* The first returned is the 'on' or 'off' time. The second is to be +* used as a 'fade-on' or 'fade-off' time. If 'msec' is even, +* the first will not be smaller than the second. If 'msec' is odd, +* the first will not be larger than the second. +* If we cannot get a sum within 1/8 of 'msec' fail with -EINVAL, +* otherwise return the sum that was achieved, plus 1 if the first is +* smaller. * If two possibilities are equally good (e.g. 512+0, 256+256), choose * the first pair so there is more change-time visible (i.e. it is * softer).
@@ -193,7 +217,7 @@ static int choose_times(int msec, int *c1p, int *c2p)continue ;if (t > tmax)break ; -for (c2 =0 ; c2 <= c1; c2--) { +for (c2 =0 ; c2 <= c1; c2++) {int tt = t + time_codes[c2];int d;if (tt < tmin)
@@ -209,11 +233,22 @@ static int choose_times(int msec, int *c1p, int *c2p) *c2p = c2; diff = d;if (d ==0 ) -return 0 ; +return msec; } } -if (diff <65536 ) -return 0 ; +if (diff <65536 ) { +int actual; +if (msec &1 ) { + c1 = *c2p; + *c2p = *c1p; + *c1p = c1; + } + actual = time_codes[*c1p] + time_codes[*c2p]; +if (*c1p < *c2p) +return actual +1 ; +else +return actual; + }/* No close match */ return -EINVAL ; }
@@ -244,10 +279,13 @@ static void set_select(struct tca6507_chip *tca, int led, int val)*/ static void set_code (struct tca6507_chip *tca,int reg,int bank,int new) { -int mask = (0xF << bank); -int n = tca->reg_file[reg] & ~mask; -if (bank) +int mask =0xF ; +int n; +if (bank) { + mask <<=4 ; new <<=4 ; + } + n = tca->reg_file[reg] & ~mask; n |= new;if (tca->reg_file[reg] != n) { tca->reg_file[reg] = n;
@@ -274,17 +312,24 @@ static void set_level(struct tca6507_chip *tca, int bank, int level)static void set_times (struct tca6507_chip *tca,int bank) {int c1, c2; +int result; -choose_times (tca->bank[bank].ontime, &c1, &c2); + result =choose_times (tca->bank[bank].ontime, &c1, &c2); +dev_dbg (&tca->client->dev, +"Chose on times %d(%d) %d(%d) for %dms\n" , c1, time_codes[c1], + c2, time_codes[c2], tca->bank[bank].ontime);set_code (tca,TCA6507_FADE_ON , bank, c2);set_code (tca,TCA6507_FULL_ON , bank, c1); - tca->bank[bank].ontime = time_codes[c1] + time_codes[c2]; + tca->bank[bank].ontime = result; -choose_times (tca->bank[bank].offtime, &c1, &c2); + result =choose_times (tca->bank[bank].offtime, &c1, &c2); +dev_dbg (&tca->client->dev, +"Chose off times %d(%d) %d(%d) for %dms\n" , c1, time_codes[c1], + c2, time_codes[c2], tca->bank[bank].offtime);set_code (tca,TCA6507_FADE_OFF , bank, c2);set_code (tca,TCA6507_FIRST_OFF , bank, c1);set_code (tca,TCA6507_SECOND_OFF , bank, c1); - tca->bank[bank].offtime = time_codes[c1] + time_codes[c2]; + tca->bank[bank].offtime = result;set_code (tca,TCA6507_INITIALIZE , bank,INIT_CODE ); }
@@ -300,11 +345,11 @@ static void tca6507_work(struct work_struct *work)u8 file[TCA6507_REG_CNT ];int r; -spin_lock (&tca->lock); +spin_lock_irq (&tca->lock); set = tca->reg_set;memcpy (file, tca->reg_file,TCA6507_REG_CNT ); tca->reg_set =0 ; -spin_unlock (&tca->lock); +spin_unlock_irq (&tca->lock);for (r =0 ; r <TCA6507_REG_CNT ; r++)if (set & (1 <<r))
@@ -327,7 +372,7 @@ static void led_release(struct tca6507_led *led)static int led_prepare (struct tca6507_led *led) { -/* Assign this led to a bank. configuring that bank if necessary */ +/* Assign this led to a bank, configuring that bank if necessary. */ int level =TO_LEVEL (led->led_cdev.brightness);struct tca6507_chip *tca = led->chip;int c1, c2;
@@ -386,7 +431,11 @@ static int led_prepare(struct tca6507_led *led)return 0 ; } -/* We have on/off time so we need to try to allocate a timing bank. */ +/* +* We have on/off time so we need to try to allocate a timing bank. +* First check if times are compatible with hardware and give up if +* not. +*/ if (choose_times (led->ontime, &c1, &c2) <0 )return -EINVAL ;if (choose_times (led->offtime, &c1, &c2) <0 )
@@ -466,8 +515,9 @@ static int led_assign(struct tca6507_led *led) {struct tca6507_chip *tca = led->chip;int err; +unsigned long flags; -spin_lock (&tca->lock); +spin_lock_irqsave (&tca->lock, flags);led_release (led); err =led_prepare (led);if (err) {
@@ -479,7 +529,7 @@ static int led_assign(struct tca6507_led *led) led->offtime =0 ;led_prepare (led); } -spin_unlock (&tca->lock); +spin_unlock_irqrestore (&tca->lock, flags);if (tca->reg_set)schedule_work (&tca->work);
@@ -539,15 +589,16 @@ static void tca6507_gpio_set_value(struct gpio_chip *gc, unsigned offset, int val) { struct tca6507_chip *tca = container_of(gc, struct tca6507_chip, gpio); +unsigned long flags; -spin_lock (&tca->lock); +spin_lock_irqsave (&tca->lock, flags);/* * 'OFF' is floating high, and 'ON' is pulled down, so it has the * inverse sense of 'val'. */ set_select (tca, tca->gpio_map[offset], val ?TCA6507_LS_LED_OFF :TCA6507_LS_LED_ON ); -spin_unlock (&tca->lock); +spin_unlock_irqrestore (&tca->lock, flags);if (tca->reg_set)schedule_work (&tca->work); }
@@ -558,6 +609,7 @@ static int tca6507_gpio_direction_output(struct gpio_chip *gc,tca6507_gpio_set_value (gc, offset, val);return 0 ; } +static int tca6507_probe_gpios (struct i2c_client *client,struct tca6507_chip *tca,struct tca6507_platform_data *pdata)
@@ -643,6 +695,7 @@ static int __devinit tca6507_probe(struct i2c_client *client, tca->client = client;INIT_WORK (&tca->work, tca6507_work);spin_lock_init (&tca->lock); +i2c_set_clientdata (client, tca);for (i =0 ; i <NUM_LEDS ; i++) {struct tca6507_led *l = tca->leds + i;
@@ -665,7 +718,6 @@ static int __devinit tca6507_probe(struct i2c_client *client, err =tca6507_probe_gpios (client, tca, pdata);if (err) goto exit; -i2c_set_clientdata (client, tca);/* set all registers to known state - zero */ tca->reg_set =0x7f ;schedule_work (&tca->work);
@@ -675,6 +727,8 @@ exit:while (i--)if (tca->leds[i].led_cdev.name)led_classdev_unregister (&tca->leds[i].led_cdev); +cancel_work_sync (&tca->work); +i2c_set_clientdata (client,NULL );kfree (tca);return err; }
@@ -691,8 +745,8 @@ static int __devexit tca6507_remove(struct i2c_client *client) }tca6507_remove_gpio (tca);cancel_work_sync (&tca->work); -kfree (tca);i2c_set_clientdata (client,NULL ); +kfree (tca);return 0 ; }
PATCH 2/2 leds-tca6507 - fix off by one error.
In reply to NeilBrownWhen walking the list of possible time codes we can fall off the end. Fix that, and also improved the commentary.
---
drivers/leds/leds-tca6507.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/leds/leds-tca6507.c +6 -2
@@ -165,7 +165,8 @@ MODULE_DEVICE_TABLE(i2c, tca6507);static int choose_times (int msec,int *c1p,int *c2p) {/* Chose two timecodes which add to 'msec' as near as possible. -* The first returned should be the larger. +* The first returned should be the larger and is the 'on' of 'off' time. +* The second will be used as a 'fade-on' or 'fade-off' time. * If cannot get within 1/8, fail. * If two possibilities are equally good (e.g. 512+0, 256+256), choose * the first pair so there is more change-time visible (i.e. it is softer).
@@ -175,7 +176,10 @@ static int choose_times(int msec, int *c1p, int *c2p)int tmin = msec *7 /8 ;int diff =65536 ; -for (c1 =1 ; c1 <=TIMECODES ; c1++) { +/* We start at '1' to ensure we never even think of choosing a +* total time of '0'. +*/ +for (c1 =1 ; c1 <TIMECODES ; c1++) {int t = time_codes[c1];if (t*2 < tmin)continue ;