* [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip
@ 2014-07-03 5:50 Peter Meerwald
2014-07-03 5:50 ` [PATCH v2 2/3] leds:pca963x: Always initialize MODE2 register Peter Meerwald
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Peter Meerwald @ 2014-07-03 5:50 UTC (permalink / raw)
To: linux-leds; +Cc: cooloney, rpurdie, Peter Meerwald
supports 16 PWM-controlled LEDs
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] leds:pca963x: Always initialize MODE2 register
2014-07-03 5:50 [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip Peter Meerwald
@ 2014-07-03 5:50 ` Peter Meerwald
2014-07-03 18:56 ` Bryan Wu
2014-07-03 5:50 ` [PATCH v2 3/3] leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default Peter Meerwald
2014-07-03 18:54 ` [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip Bryan Wu
2 siblings, 1 reply; 6+ messages in thread
From: Peter Meerwald @ 2014-07-03 5:50 UTC (permalink / raw)
To: linux-leds; +Cc: cooloney, rpurdie, Peter Meerwald
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>
---
drivers/leds/leds-pca963x.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c
index 4438be9..f110b4c 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;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default
2014-07-03 5:50 [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip Peter Meerwald
2014-07-03 5:50 ` [PATCH v2 2/3] leds:pca963x: Always initialize MODE2 register Peter Meerwald
@ 2014-07-03 5:50 ` Peter Meerwald
2014-07-03 18:59 ` Bryan Wu
2014-07-03 18:54 ` [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip Bryan Wu
2 siblings, 1 reply; 6+ messages in thread
From: Peter Meerwald @ 2014-07-03 5:50 UTC (permalink / raw)
To: linux-leds; +Cc: cooloney, rpurdie, Peter Meerwald
mention support for 16 LED PCA9635 chip
the default of MODE2's OUTDRV was incorrectly stated
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
Documentation/devicetree/bindings/leds/pca963x.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/leds/pca963x.txt b/Documentation/devicetree/bindings/leds/pca963x.txt
index aece3ea..dafbe99 100644
--- a/Documentation/devicetree/bindings/leds/pca963x.txt
+++ b/Documentation/devicetree/bindings/leds/pca963x.txt
@@ -1,18 +1,19 @@
LEDs connected to pca9632, pca9633 or pca9634
Required properties:
-- compatible : should be : "nxp,pca9632", "nxp,pca9633" or "nxp,pca9634"
+- compatible : should be : "nxp,pca9632", "nxp,pca9633", "nxp,pca9634" or "nxp,pca9635"
Optional properties:
-- nxp,totem-pole : use totem pole (push-pull) instead of default open-drain
+- nxp,totem-pole : use totem pole (push-pull) instead of open-drain (pca9632 defaults
+ to open-drain, newer chips to totem pole)
- nxp,hw-blink : use hardware blinking instead of software blinking
Each led is represented as a sub-node of the nxp,pca963x device.
LED sub-node properties:
- label : (optional) see Documentation/devicetree/bindings/leds/common.txt
-- reg : number of LED line (could be from 0 to 3 in pca9632 or pca9633
- or 0 to 7 in pca9634)
+- reg : number of LED line (could be from 0 to 3 in pca9632 or pca9633,
+ 0 to 7 in pca9634, or 0 to 15 in pca9635)
- linux,default-trigger : (optional)
see Documentation/devicetree/bindings/leds/common.txt
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip
2014-07-03 5:50 [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip Peter Meerwald
2014-07-03 5:50 ` [PATCH v2 2/3] leds:pca963x: Always initialize MODE2 register Peter Meerwald
2014-07-03 5:50 ` [PATCH v2 3/3] leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default Peter Meerwald
@ 2014-07-03 18:54 ` Bryan Wu
2 siblings, 0 replies; 6+ messages in thread
From: Bryan Wu @ 2014-07-03 18:54 UTC (permalink / raw)
To: Peter Meerwald; +Cc: Linux LED Subsystem, rpurdie@rpsys.net
On Wed, Jul 2, 2014 at 10:50 PM, Peter Meerwald <pmeerw@pmeerw.net> wrote:
> supports 16 PWM-controlled LEDs
>
OK, good. merged.
-Bryan
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> ---
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] leds:pca963x: Always initialize MODE2 register
2014-07-03 5:50 ` [PATCH v2 2/3] leds:pca963x: Always initialize MODE2 register Peter Meerwald
@ 2014-07-03 18:56 ` Bryan Wu
0 siblings, 0 replies; 6+ messages in thread
From: Bryan Wu @ 2014-07-03 18:56 UTC (permalink / raw)
To: Peter Meerwald; +Cc: Linux LED Subsystem, rpurdie@rpsys.net
On Wed, Jul 2, 2014 at 10:50 PM, Peter Meerwald <pmeerw@pmeerw.net> wrote:
> 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>
Applied. thanks,
-Bryan
> ---
> drivers/leds/leds-pca963x.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c
> index 4438be9..f110b4c 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;
>
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default
2014-07-03 5:50 ` [PATCH v2 3/3] leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default Peter Meerwald
@ 2014-07-03 18:59 ` Bryan Wu
0 siblings, 0 replies; 6+ messages in thread
From: Bryan Wu @ 2014-07-03 18:59 UTC (permalink / raw)
To: Peter Meerwald; +Cc: Linux LED Subsystem, rpurdie@rpsys.net
On Wed, Jul 2, 2014 at 10:50 PM, Peter Meerwald <pmeerw@pmeerw.net> wrote:
> mention support for 16 LED PCA9635 chip
>
> the default of MODE2's OUTDRV was incorrectly stated
>
Applied. Thanks,
-Bryan
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
> ---
> Documentation/devicetree/bindings/leds/pca963x.txt | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/leds/pca963x.txt b/Documentation/devicetree/bindings/leds/pca963x.txt
> index aece3ea..dafbe99 100644
> --- a/Documentation/devicetree/bindings/leds/pca963x.txt
> +++ b/Documentation/devicetree/bindings/leds/pca963x.txt
> @@ -1,18 +1,19 @@
> LEDs connected to pca9632, pca9633 or pca9634
>
> Required properties:
> -- compatible : should be : "nxp,pca9632", "nxp,pca9633" or "nxp,pca9634"
> +- compatible : should be : "nxp,pca9632", "nxp,pca9633", "nxp,pca9634" or "nxp,pca9635"
>
> Optional properties:
> -- nxp,totem-pole : use totem pole (push-pull) instead of default open-drain
> +- nxp,totem-pole : use totem pole (push-pull) instead of open-drain (pca9632 defaults
> + to open-drain, newer chips to totem pole)
> - nxp,hw-blink : use hardware blinking instead of software blinking
>
> Each led is represented as a sub-node of the nxp,pca963x device.
>
> LED sub-node properties:
> - label : (optional) see Documentation/devicetree/bindings/leds/common.txt
> -- reg : number of LED line (could be from 0 to 3 in pca9632 or pca9633
> - or 0 to 7 in pca9634)
> +- reg : number of LED line (could be from 0 to 3 in pca9632 or pca9633,
> + 0 to 7 in pca9634, or 0 to 15 in pca9635)
> - linux,default-trigger : (optional)
> see Documentation/devicetree/bindings/leds/common.txt
>
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-03 18:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-03 5:50 [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip Peter Meerwald
2014-07-03 5:50 ` [PATCH v2 2/3] leds:pca963x: Always initialize MODE2 register Peter Meerwald
2014-07-03 18:56 ` Bryan Wu
2014-07-03 5:50 ` [PATCH v2 3/3] leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default Peter Meerwald
2014-07-03 18:59 ` Bryan Wu
2014-07-03 18:54 ` [PATCH v2 1/3] leds:pca963x: Add support for PCA9635 LED driver chip Bryan Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).