On Wed, Jul 2, 2014 at 10:50 PM, Peter Meerwald <pmeerw@xxxxxxxxxx> wrote:
> supports 16 PWM-controlled LEDs
>
OK, good. merged.
-Bryan
> Signed-off-by: Peter Meerwald <pmeerw@xxxxxxxxxx>
> ---
> v2: fix code to turn off all leds initially
> ---
> drivers/leds/leds-pca963x.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c
> index 82589c0..4438be9 100644
> --- a/drivers/leds/leds-pca963x.c
> +++ b/drivers/leds/leds-pca963x.c
> @@ -12,7 +12,7 @@
> * directory of this archive for more details.
> *
> * LED driver for the PCA9633 I2C LED driver (7-bit slave address 0x62)
> - * LED driver for the PCA9634 I2C LED driver (7-bit slave address set by hw.)
> + * LED driver for the PCA9634/5 I2C LED driver (7-bit slave address set by hw.)
> *
> * Note that hardware blinking violates the leds infrastructure driver
> * interface since the hardware only supports blinking all LEDs with the
> @@ -52,6 +52,7 @@
> enum pca963x_type {
> pca9633,
> pca9634,
> + pca9635,
> };
>
> struct pca963x_chipdef {
> @@ -74,6 +75,12 @@ static struct pca963x_chipdef pca963x_chipdefs[] = {
> .ledout_base = 0xc,
> .n_leds = 8,
> },
> + [pca9635] = {
> + .grppwm = 0x12,
> + .grpfreq = 0x13,
> + .ledout_base = 0x14,
> + .n_leds = 16,
> + },
> };
>
> /* Total blink period in milliseconds */
> @@ -84,6 +91,7 @@ static const struct i2c_device_id pca963x_id[] = {
> { "pca9632", pca9633 },
> { "pca9633", pca9633 },
> { "pca9634", pca9634 },
> + { "pca9635", pca9635 },
> { }
> };
> MODULE_DEVICE_TABLE(i2c, pca963x_id);
> @@ -107,7 +115,7 @@ struct pca963x_led {
> struct work_struct work;
> enum led_brightness brightness;
> struct led_classdev led_cdev;
> - int led_num; /* 0 .. 7 potentially */
> + int led_num; /* 0 .. 15 potentially */
> enum pca963x_cmd cmd;
> char name[32];
> u8 gdc;
> @@ -321,6 +329,7 @@ static const struct of_device_id of_pca963x_match[] = {
> { .compatible = "nxp,pca9632", },
> { .compatible = "nxp,pca9633", },
> { .compatible = "nxp,pca9634", },
> + { .compatible = "nxp,pca9635", },
> {},
> };
> #else
> @@ -375,9 +384,8 @@ static int pca963x_probe(struct i2c_client *client,
> pca963x_chip->leds = pca963x;
>
> /* Turn off LEDs by default*/
> - i2c_smbus_write_byte_data(client, chip->ledout_base, 0x00);
> - if (chip->n_leds > 4)
> - i2c_smbus_write_byte_data(client, chip->ledout_base + 1, 0x00);
> + for (i = 0; i < chip->n_leds / 4; i++)
> + i2c_smbus_write_byte_data(client, chip->ledout_base + i, 0x00);
>
> for (i = 0; i < chip->n_leds; i++) {
> pca963x[i].led_num = i;
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
