Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / leds / leds-pca963x.c

diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c
index 82589c0a5689ff7abd033bd73b11ab42198ea0b9..f110b4c456baa77f632c610fd8e024c94eb5b3fe 100644 (file)
--- 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;
@@ -415,9 +423,13 @@ static int pca963x_probe(struct i2c_client *client,
        /* Disable LED all-call address and set normal mode */
        i2c_smbus_write_byte_data(client, PCA963X_MODE1, 0x00);
 
-       /* Configure output: open-drain or totem pole (push-pull) */
-       if (pdata && pdata->outdrv == PCA963X_OPEN_DRAIN)
-               i2c_smbus_write_byte_data(client, PCA963X_MODE2, 0x01);
+       if (pdata) {
+               /* Configure output: open-drain or totem pole (push-pull) */
+               if (pdata->outdrv == PCA963X_OPEN_DRAIN)
+                       i2c_smbus_write_byte_data(client, PCA963X_MODE2, 0x01);
+               else
+                       i2c_smbus_write_byte_data(client, PCA963X_MODE2, 0x05);
+       }
 
        return 0;