summaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2014-07-02 22:50:35 -0700
committerBryan Wu <cooloney@gmail.com>2014-07-03 11:55:56 -0700
commit0c62f42dabb5d43d880262d7f1f85e6464acd601 (patch)
tree60b3da61cc2b0adab9aa7ea512462bc8c89fcd32 /drivers/leds
parent3dfedb9d545346958311b8d73f90b8522d1fc759 (diff)
leds:pca963x: Always initialize MODE2 register
PCA9632 defaults to open-drain PCA9633/4/5 defaults to totem-pole the driver assumed that totem-pole default and didn't actively set the value; the MODE2 register is now written if platform data indicating the mode is given Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-pca963x.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c
index 4438be9980a6..f110b4c456ba 100644
--- a/drivers/leds/leds-pca963x.c
+++ b/drivers/leds/leds-pca963x.c
@@ -423,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;