* [PATCH v2] cap11xx: add LED support
@ 2015-06-10 7:08 Matt Ranostay
2015-06-10 8:03 ` Jacek Anaszewski
2015-06-11 23:00 ` Dmitry Torokhov
0 siblings, 2 replies; 5+ messages in thread
From: Matt Ranostay @ 2015-06-10 7:08 UTC (permalink / raw)
To: dmitry.torokhov, zonque; +Cc: linux-input, linux-leds, Matt Ranostay
Several cap11xx variants have LEDs that be can be controlled, this
patchset implements this functionality.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
---
drivers/input/keyboard/cap11xx.c | 90 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 87 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
index f07461a..af1daa0 100644
--- a/drivers/input/keyboard/cap11xx.c
+++ b/drivers/input/keyboard/cap11xx.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/input.h>
+#include <linux/leds.h>
#include <linux/of_irq.h>
#include <linux/regmap.h>
#include <linux/i2c.h>
@@ -47,6 +48,8 @@
#define CAP11XX_REG_CONFIG2 0x44
#define CAP11XX_REG_CONFIG2_ALT_POL BIT(6)
#define CAP11XX_REG_SENSOR_BASE_CNT(X) (0x50 + (X))
+#define CAP11XX_REG_LED_POLARITY 0x73
+#define CAP11XX_REG_LED_OUTPUT_CONTROL 0x74
#define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X))
#define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9
#define CAP11XX_REG_SENSOR_CALIB_LSB2 0xba
@@ -56,10 +59,25 @@
#define CAP11XX_MANUFACTURER_ID 0x5d
+#ifdef CONFIG_LEDS_CLASS
+struct cap11xx_led {
+ struct cap11xx_priv *priv;
+ struct led_classdev cdev;
+ struct work_struct work;
+ char name[32];
+ int id;
+ enum led_brightness new_brightness;
+};
+#endif
+
struct cap11xx_priv {
struct regmap *regmap;
struct input_dev *idev;
+#ifdef CONFIG_LEDS_CLASS
+ struct cap11xx_led *leds;
+ int num_leds;
+#endif
/* config */
u32 keycodes[];
};
@@ -67,6 +85,7 @@ struct cap11xx_priv {
struct cap11xx_hw_model {
u8 product_id;
unsigned int num_channels;
+ unsigned int num_leds;
};
enum {
@@ -76,9 +95,9 @@ enum {
};
static const struct cap11xx_hw_model cap11xx_devices[] = {
- [CAP1106] = { .product_id = 0x55, .num_channels = 6 },
- [CAP1126] = { .product_id = 0x53, .num_channels = 6 },
- [CAP1188] = { .product_id = 0x50, .num_channels = 8 },
+ [CAP1106] = { .product_id = 0x55, .num_channels = 6, .num_leds = 0 },
+ [CAP1126] = { .product_id = 0x53, .num_channels = 6, .num_leds = 2 },
+ [CAP1188] = { .product_id = 0x50, .num_channels = 8, .num_leds = 8 },
};
static const struct reg_default cap11xx_reg_defaults[] = {
@@ -111,6 +130,7 @@ static const struct reg_default cap11xx_reg_defaults[] = {
{ CAP11XX_REG_STANDBY_SENSITIVITY, 0x02 },
{ CAP11XX_REG_STANDBY_THRESH, 0x40 },
{ CAP11XX_REG_CONFIG2, 0x40 },
+ { CAP11XX_REG_LED_POLARITY, 0x00 },
{ CAP11XX_REG_SENSOR_CALIB_LSB1, 0x00 },
{ CAP11XX_REG_SENSOR_CALIB_LSB2, 0x00 },
};
@@ -196,6 +216,58 @@ static void cap11xx_input_close(struct input_dev *idev)
cap11xx_set_sleep(priv, true);
}
+#ifdef CONFIG_LEDS_CLASS
+static void cap11xx_led_work(struct work_struct *work)
+{
+ struct cap11xx_led *led = container_of(work, struct cap11xx_led, work);
+ struct cap11xx_priv *priv = led->priv;
+ int value = led->new_brightness;
+
+ regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
+ BIT(led->id), !!value ? BIT(led->id) : 0);
+}
+
+static void cap11xx_led_set(struct led_classdev *cdev,
+ enum led_brightness value)
+{
+ struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev);
+
+ led->new_brightness = value;
+ schedule_work(&led->work);
+}
+
+static int cap11xx_register_leds(struct device *dev, struct cap11xx_priv *priv)
+{
+ int ret;
+ int i;
+
+ /*
+ * Be sure all LEDS are in off-state
+ */
+ regmap_update_bits(priv->regmap,
+ CAP11XX_REG_LED_OUTPUT_CONTROL, 0xff, 0);
+
+ for (i = 0; i < priv->num_leds; i++) {
+ struct cap11xx_led *led = &priv->leds[i];
+
+ snprintf(led->name, sizeof(led->name), "cap11xx:led%d", i + 1);
+ led->cdev.name = led->name;
+ led->cdev.brightness_set = cap11xx_led_set;
+ led->cdev.brightness = LED_OFF;
+ led->cdev.max_brightness = 1;
+ led->id = i;
+ led->priv = priv;
+
+ ret = devm_led_classdev_register(dev, &led->cdev);
+ if (ret < 0)
+ return ret;
+
+ INIT_WORK(&led->work, cap11xx_led_work);
+ };
+ return 0;
+}
+#endif
+
static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
const struct i2c_device_id *id)
{
@@ -316,6 +388,18 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
priv->idev->open = cap11xx_input_open;
priv->idev->close = cap11xx_input_close;
+#ifdef CONFIG_LEDS_CLASS
+ if (cap->num_leds > 0) {
+ priv->leds = devm_kcalloc(dev, cap->num_leds,
+ sizeof(struct cap11xx_led), GFP_KERNEL);
+ if (!priv->leds)
+ return -ENOMEM;
+ priv->num_leds = cap->num_leds;
+ error = cap11xx_register_leds(dev, priv);
+ if (error)
+ return error;
+ }
+#endif
input_set_drvdata(priv->idev, priv);
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] cap11xx: add LED support
2015-06-10 7:08 [PATCH v2] cap11xx: add LED support Matt Ranostay
@ 2015-06-10 8:03 ` Jacek Anaszewski
2015-06-10 22:07 ` Matt Ranostay
2015-06-11 23:00 ` Dmitry Torokhov
1 sibling, 1 reply; 5+ messages in thread
From: Jacek Anaszewski @ 2015-06-10 8:03 UTC (permalink / raw)
To: Matt Ranostay; +Cc: dmitry.torokhov, zonque, linux-input, linux-leds
Hi Matt,
On 06/10/2015 09:08 AM, Matt Ranostay wrote:
> Several cap11xx variants have LEDs that be can be controlled, this
> patchset implements this functionality.
>
> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
> ---
> drivers/input/keyboard/cap11xx.c | 90 ++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 87 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
> index f07461a..af1daa0 100644
> --- a/drivers/input/keyboard/cap11xx.c
> +++ b/drivers/input/keyboard/cap11xx.c
> @@ -12,6 +12,7 @@
> #include <linux/module.h>
> #include <linux/interrupt.h>
> #include <linux/input.h>
> +#include <linux/leds.h>
> #include <linux/of_irq.h>
> #include <linux/regmap.h>
> #include <linux/i2c.h>
These include directives aren't arranged in an alphabetical order.
You could fix that as you are modifying this file.
> @@ -47,6 +48,8 @@
> #define CAP11XX_REG_CONFIG2 0x44
> #define CAP11XX_REG_CONFIG2_ALT_POL BIT(6)
> #define CAP11XX_REG_SENSOR_BASE_CNT(X) (0x50 + (X))
> +#define CAP11XX_REG_LED_POLARITY 0x73
> +#define CAP11XX_REG_LED_OUTPUT_CONTROL 0x74
> #define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X))
> #define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9
> #define CAP11XX_REG_SENSOR_CALIB_LSB2 0xba
> @@ -56,10 +59,25 @@
>
> #define CAP11XX_MANUFACTURER_ID 0x5d
>
> +#ifdef CONFIG_LEDS_CLASS
> +struct cap11xx_led {
> + struct cap11xx_priv *priv;
> + struct led_classdev cdev;
> + struct work_struct work;
> + char name[32];
This 'name' field is not needed. Instead the 'name' field of struct
led_classdev should be initialized with the address of either a 'label'
property from DT child node representing a LED, or the DT child node
name if the label is absent. Please refer to
Documentation/devicetree/bindings/leds/common.txt.
This is usually accomplished in the LED subsystem with following
instruction:
led_cdev->name = of_get_property(child_node, "label", NULL) ? :
child_node->name;
> + int id;
> + enum led_brightness new_brightness;
> +};
> +#endif
> +
> struct cap11xx_priv {
> struct regmap *regmap;
> struct input_dev *idev;
>
> +#ifdef CONFIG_LEDS_CLASS
> + struct cap11xx_led *leds;
> + int num_leds;
> +#endif
> /* config */
> u32 keycodes[];
> };
> @@ -67,6 +85,7 @@ struct cap11xx_priv {
> struct cap11xx_hw_model {
> u8 product_id;
> unsigned int num_channels;
> + unsigned int num_leds;
> };
>
> enum {
> @@ -76,9 +95,9 @@ enum {
> };
>
> static const struct cap11xx_hw_model cap11xx_devices[] = {
> - [CAP1106] = { .product_id = 0x55, .num_channels = 6 },
> - [CAP1126] = { .product_id = 0x53, .num_channels = 6 },
> - [CAP1188] = { .product_id = 0x50, .num_channels = 8 },
> + [CAP1106] = { .product_id = 0x55, .num_channels = 6, .num_leds = 0 },
> + [CAP1126] = { .product_id = 0x53, .num_channels = 6, .num_leds = 2 },
> + [CAP1188] = { .product_id = 0x50, .num_channels = 8, .num_leds = 8 },
> };
The number of LEDs should be determined by the number of DT child nodes
representing each LED. Please refer to
Documentation/devicetree/bindings/leds/common.txt and other LED
subsystem drivers to find out how it should be implemented.
> static const struct reg_default cap11xx_reg_defaults[] = {
> @@ -111,6 +130,7 @@ static const struct reg_default cap11xx_reg_defaults[] = {
> { CAP11XX_REG_STANDBY_SENSITIVITY, 0x02 },
> { CAP11XX_REG_STANDBY_THRESH, 0x40 },
> { CAP11XX_REG_CONFIG2, 0x40 },
> + { CAP11XX_REG_LED_POLARITY, 0x00 },
> { CAP11XX_REG_SENSOR_CALIB_LSB1, 0x00 },
> { CAP11XX_REG_SENSOR_CALIB_LSB2, 0x00 },
> };
> @@ -196,6 +216,58 @@ static void cap11xx_input_close(struct input_dev *idev)
> cap11xx_set_sleep(priv, true);
> }
>
> +#ifdef CONFIG_LEDS_CLASS
> +static void cap11xx_led_work(struct work_struct *work)
> +{
> + struct cap11xx_led *led = container_of(work, struct cap11xx_led, work);
> + struct cap11xx_priv *priv = led->priv;
> + int value = led->new_brightness;
> +
> + regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
> + BIT(led->id), !!value ? BIT(led->id) : 0);
> +}
> +
> +static void cap11xx_led_set(struct led_classdev *cdev,
> + enum led_brightness value)
> +{
> + struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev);
> +
> + led->new_brightness = value;
> + schedule_work(&led->work);
> +}
> +
> +static int cap11xx_register_leds(struct device *dev, struct cap11xx_priv *priv)
> +{
> + int ret;
> + int i;
> +
> + /*
> + * Be sure all LEDS are in off-state
> + */
> + regmap_update_bits(priv->regmap,
> + CAP11XX_REG_LED_OUTPUT_CONTROL, 0xff, 0);
> +
> + for (i = 0; i < priv->num_leds; i++) {
> + struct cap11xx_led *led = &priv->leds[i];
> +
> + snprintf(led->name, sizeof(led->name), "cap11xx:led%d", i + 1);
> + led->cdev.name = led->name;
> + led->cdev.brightness_set = cap11xx_led_set;
> + led->cdev.brightness = LED_OFF;
> + led->cdev.max_brightness = 1;
> + led->id = i;
> + led->priv = priv;
> +
> + ret = devm_led_classdev_register(dev, &led->cdev);
> + if (ret < 0)
> + return ret;
> +
> + INIT_WORK(&led->work, cap11xx_led_work);
> + };
> + return 0;
> +}
> +#endif
> +
> static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
> const struct i2c_device_id *id)
> {
> @@ -316,6 +388,18 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
> priv->idev->open = cap11xx_input_open;
> priv->idev->close = cap11xx_input_close;
>
> +#ifdef CONFIG_LEDS_CLASS
> + if (cap->num_leds > 0) {
> + priv->leds = devm_kcalloc(dev, cap->num_leds,
> + sizeof(struct cap11xx_led), GFP_KERNEL);
> + if (!priv->leds)
> + return -ENOMEM;
> + priv->num_leds = cap->num_leds;
> + error = cap11xx_register_leds(dev, priv);
> + if (error)
> + return error;
> + }
> +#endif
> input_set_drvdata(priv->idev, priv);
>
> /*
>
--
Best Regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] cap11xx: add LED support
2015-06-10 8:03 ` Jacek Anaszewski
@ 2015-06-10 22:07 ` Matt Ranostay
2015-06-11 6:55 ` Jacek Anaszewski
0 siblings, 1 reply; 5+ messages in thread
From: Matt Ranostay @ 2015-06-10 22:07 UTC (permalink / raw)
To: Jacek Anaszewski; +Cc: Dmitry Torokhov, Daniel Mack, linux-input, linux-leds
On Wed, Jun 10, 2015 at 1:03 AM, Jacek Anaszewski
<j.anaszewski@samsung.com> wrote:
> Hi Matt,
>
> On 06/10/2015 09:08 AM, Matt Ranostay wrote:
>>
>> Several cap11xx variants have LEDs that be can be controlled, this
>> patchset implements this functionality.
>>
>> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
>> ---
>> drivers/input/keyboard/cap11xx.c | 90
>> ++++++++++++++++++++++++++++++++++++++--
>> 1 file changed, 87 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/input/keyboard/cap11xx.c
>> b/drivers/input/keyboard/cap11xx.c
>> index f07461a..af1daa0 100644
>> --- a/drivers/input/keyboard/cap11xx.c
>> +++ b/drivers/input/keyboard/cap11xx.c
>> @@ -12,6 +12,7 @@
>> #include <linux/module.h>
>> #include <linux/interrupt.h>
>> #include <linux/input.h>
>> +#include <linux/leds.h>
>> #include <linux/of_irq.h>
>> #include <linux/regmap.h>
>> #include <linux/i2c.h>
>
>
> These include directives aren't arranged in an alphabetical order.
> You could fix that as you are modifying this file.
>
>> @@ -47,6 +48,8 @@
>> #define CAP11XX_REG_CONFIG2 0x44
>> #define CAP11XX_REG_CONFIG2_ALT_POL BIT(6)
>> #define CAP11XX_REG_SENSOR_BASE_CNT(X) (0x50 + (X))
>> +#define CAP11XX_REG_LED_POLARITY 0x73
>> +#define CAP11XX_REG_LED_OUTPUT_CONTROL 0x74
>> #define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X))
>> #define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9
>> #define CAP11XX_REG_SENSOR_CALIB_LSB2 0xba
>> @@ -56,10 +59,25 @@
>>
>> #define CAP11XX_MANUFACTURER_ID 0x5d
>>
>> +#ifdef CONFIG_LEDS_CLASS
>> +struct cap11xx_led {
>> + struct cap11xx_priv *priv;
>> + struct led_classdev cdev;
>> + struct work_struct work;
>> + char name[32];
>
>
> This 'name' field is not needed. Instead the 'name' field of struct
> led_classdev should be initialized with the address of either a 'label'
> property from DT child node representing a LED, or the DT child node
> name if the label is absent. Please refer to
> Documentation/devicetree/bindings/leds/common.txt.
>
> This is usually accomplished in the LED subsystem with following
> instruction:
>
> led_cdev->name = of_get_property(child_node, "label", NULL) ? :
> child_node->name;
>
>
>
>> + int id;
>> + enum led_brightness new_brightness;
>> +};
>> +#endif
>> +
>> struct cap11xx_priv {
>> struct regmap *regmap;
>> struct input_dev *idev;
>>
>> +#ifdef CONFIG_LEDS_CLASS
>> + struct cap11xx_led *leds;
>> + int num_leds;
>> +#endif
>> /* config */
>> u32 keycodes[];
>> };
>> @@ -67,6 +85,7 @@ struct cap11xx_priv {
>> struct cap11xx_hw_model {
>> u8 product_id;
>> unsigned int num_channels;
>> + unsigned int num_leds;
>> };
>>
>> enum {
>> @@ -76,9 +95,9 @@ enum {
>> };
>>
>> static const struct cap11xx_hw_model cap11xx_devices[] = {
>> - [CAP1106] = { .product_id = 0x55, .num_channels = 6 },
>> - [CAP1126] = { .product_id = 0x53, .num_channels = 6 },
>> - [CAP1188] = { .product_id = 0x50, .num_channels = 8 },
>> + [CAP1106] = { .product_id = 0x55, .num_channels = 6, .num_leds = 0
>> },
>> + [CAP1126] = { .product_id = 0x53, .num_channels = 6, .num_leds = 2
>> },
>> + [CAP1188] = { .product_id = 0x50, .num_channels = 8, .num_leds = 8
>> },
>> };
>
>
> The number of LEDs should be determined by the number of DT child nodes
> representing each LED. Please refer to
> Documentation/devicetree/bindings/leds/common.txt and other LED
> subsystem drivers to find out how it should be implemented.
>
Ok but this is still needed as a check so you don't "overflow" the
number the chipset supports, correct?
>
>
>> static const struct reg_default cap11xx_reg_defaults[] = {
>> @@ -111,6 +130,7 @@ static const struct reg_default cap11xx_reg_defaults[]
>> = {
>> { CAP11XX_REG_STANDBY_SENSITIVITY, 0x02 },
>> { CAP11XX_REG_STANDBY_THRESH, 0x40 },
>> { CAP11XX_REG_CONFIG2, 0x40 },
>> + { CAP11XX_REG_LED_POLARITY, 0x00 },
>> { CAP11XX_REG_SENSOR_CALIB_LSB1, 0x00 },
>> { CAP11XX_REG_SENSOR_CALIB_LSB2, 0x00 },
>> };
>> @@ -196,6 +216,58 @@ static void cap11xx_input_close(struct input_dev
>> *idev)
>> cap11xx_set_sleep(priv, true);
>> }
>>
>> +#ifdef CONFIG_LEDS_CLASS
>> +static void cap11xx_led_work(struct work_struct *work)
>> +{
>> + struct cap11xx_led *led = container_of(work, struct cap11xx_led,
>> work);
>> + struct cap11xx_priv *priv = led->priv;
>> + int value = led->new_brightness;
>> +
>> + regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
>> + BIT(led->id), !!value ? BIT(led->id) : 0);
>> +}
>> +
>> +static void cap11xx_led_set(struct led_classdev *cdev,
>> + enum led_brightness value)
>> +{
>> + struct cap11xx_led *led = container_of(cdev, struct cap11xx_led,
>> cdev);
>> +
>> + led->new_brightness = value;
>> + schedule_work(&led->work);
>> +}
>> +
>> +static int cap11xx_register_leds(struct device *dev, struct cap11xx_priv
>> *priv)
>> +{
>> + int ret;
>> + int i;
>> +
>> + /*
>> + * Be sure all LEDS are in off-state
>> + */
>> + regmap_update_bits(priv->regmap,
>> + CAP11XX_REG_LED_OUTPUT_CONTROL, 0xff, 0);
>> +
>> + for (i = 0; i < priv->num_leds; i++) {
>> + struct cap11xx_led *led = &priv->leds[i];
>> +
>> + snprintf(led->name, sizeof(led->name), "cap11xx:led%d", i
>> + 1);
>> + led->cdev.name = led->name;
>> + led->cdev.brightness_set = cap11xx_led_set;
>> + led->cdev.brightness = LED_OFF;
>> + led->cdev.max_brightness = 1;
>> + led->id = i;
>> + led->priv = priv;
>> +
>> + ret = devm_led_classdev_register(dev, &led->cdev);
>> + if (ret < 0)
>> + return ret;
>> +
>> + INIT_WORK(&led->work, cap11xx_led_work);
>> + };
>> + return 0;
>> +}
>> +#endif
>> +
>> static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
>> const struct i2c_device_id *id)
>> {
>> @@ -316,6 +388,18 @@ static int cap11xx_i2c_probe(struct i2c_client
>> *i2c_client,
>> priv->idev->open = cap11xx_input_open;
>> priv->idev->close = cap11xx_input_close;
>>
>> +#ifdef CONFIG_LEDS_CLASS
>> + if (cap->num_leds > 0) {
>> + priv->leds = devm_kcalloc(dev, cap->num_leds,
>> + sizeof(struct cap11xx_led), GFP_KERNEL);
>> + if (!priv->leds)
>> + return -ENOMEM;
>> + priv->num_leds = cap->num_leds;
>> + error = cap11xx_register_leds(dev, priv);
>> + if (error)
>> + return error;
>> + }
>> +#endif
>> input_set_drvdata(priv->idev, priv);
>>
>> /*
>>
>
>
> --
> Best Regards,
> Jacek Anaszewski
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] cap11xx: add LED support
2015-06-10 22:07 ` Matt Ranostay
@ 2015-06-11 6:55 ` Jacek Anaszewski
0 siblings, 0 replies; 5+ messages in thread
From: Jacek Anaszewski @ 2015-06-11 6:55 UTC (permalink / raw)
To: Matt Ranostay; +Cc: Dmitry Torokhov, Daniel Mack, linux-input, linux-leds
On 06/11/2015 12:07 AM, Matt Ranostay wrote:
[...]
>>> static const struct cap11xx_hw_model cap11xx_devices[] = {
>>> - [CAP1106] = { .product_id = 0x55, .num_channels = 6 },
>>> - [CAP1126] = { .product_id = 0x53, .num_channels = 6 },
>>> - [CAP1188] = { .product_id = 0x50, .num_channels = 8 },
>>> + [CAP1106] = { .product_id = 0x55, .num_channels = 6, .num_leds = 0
>>> },
>>> + [CAP1126] = { .product_id = 0x53, .num_channels = 6, .num_leds = 2
>>> },
>>> + [CAP1188] = { .product_id = 0x50, .num_channels = 8, .num_leds = 8
>>> },
>>> };
>>
>>
>> The number of LEDs should be determined by the number of DT child nodes
>> representing each LED. Please refer to
>> Documentation/devicetree/bindings/leds/common.txt and other LED
>> subsystem drivers to find out how it should be implemented.
>>
> Ok but this is still needed as a check so you don't "overflow" the
> number the chipset supports, correct?
Right, the above modification is correct then.
--
Best Regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] cap11xx: add LED support
2015-06-10 7:08 [PATCH v2] cap11xx: add LED support Matt Ranostay
2015-06-10 8:03 ` Jacek Anaszewski
@ 2015-06-11 23:00 ` Dmitry Torokhov
1 sibling, 0 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2015-06-11 23:00 UTC (permalink / raw)
To: Matt Ranostay; +Cc: zonque, linux-input, linux-leds
Hi Matt,
On Wed, Jun 10, 2015 at 12:08:03AM -0700, Matt Ranostay wrote:
> Several cap11xx variants have LEDs that be can be controlled, this
> patchset implements this functionality.
>
> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
> ---
> drivers/input/keyboard/cap11xx.c | 90 ++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 87 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
> index f07461a..af1daa0 100644
> --- a/drivers/input/keyboard/cap11xx.c
> +++ b/drivers/input/keyboard/cap11xx.c
> @@ -12,6 +12,7 @@
> #include <linux/module.h>
> #include <linux/interrupt.h>
> #include <linux/input.h>
> +#include <linux/leds.h>
> #include <linux/of_irq.h>
> #include <linux/regmap.h>
> #include <linux/i2c.h>
> @@ -47,6 +48,8 @@
> #define CAP11XX_REG_CONFIG2 0x44
> #define CAP11XX_REG_CONFIG2_ALT_POL BIT(6)
> #define CAP11XX_REG_SENSOR_BASE_CNT(X) (0x50 + (X))
> +#define CAP11XX_REG_LED_POLARITY 0x73
> +#define CAP11XX_REG_LED_OUTPUT_CONTROL 0x74
> #define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X))
> #define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9
> #define CAP11XX_REG_SENSOR_CALIB_LSB2 0xba
> @@ -56,10 +59,25 @@
>
> #define CAP11XX_MANUFACTURER_ID 0x5d
>
> +#ifdef CONFIG_LEDS_CLASS
> +struct cap11xx_led {
> + struct cap11xx_priv *priv;
> + struct led_classdev cdev;
> + struct work_struct work;
> + char name[32];
> + int id;
> + enum led_brightness new_brightness;
> +};
> +#endif
> +
> struct cap11xx_priv {
> struct regmap *regmap;
> struct input_dev *idev;
>
> +#ifdef CONFIG_LEDS_CLASS
> + struct cap11xx_led *leds;
> + int num_leds;
> +#endif
> /* config */
> u32 keycodes[];
> };
> @@ -67,6 +85,7 @@ struct cap11xx_priv {
> struct cap11xx_hw_model {
> u8 product_id;
> unsigned int num_channels;
> + unsigned int num_leds;
> };
>
> enum {
> @@ -76,9 +95,9 @@ enum {
> };
>
> static const struct cap11xx_hw_model cap11xx_devices[] = {
> - [CAP1106] = { .product_id = 0x55, .num_channels = 6 },
> - [CAP1126] = { .product_id = 0x53, .num_channels = 6 },
> - [CAP1188] = { .product_id = 0x50, .num_channels = 8 },
> + [CAP1106] = { .product_id = 0x55, .num_channels = 6, .num_leds = 0 },
> + [CAP1126] = { .product_id = 0x53, .num_channels = 6, .num_leds = 2 },
> + [CAP1188] = { .product_id = 0x50, .num_channels = 8, .num_leds = 8 },
> };
>
> static const struct reg_default cap11xx_reg_defaults[] = {
> @@ -111,6 +130,7 @@ static const struct reg_default cap11xx_reg_defaults[] = {
> { CAP11XX_REG_STANDBY_SENSITIVITY, 0x02 },
> { CAP11XX_REG_STANDBY_THRESH, 0x40 },
> { CAP11XX_REG_CONFIG2, 0x40 },
> + { CAP11XX_REG_LED_POLARITY, 0x00 },
> { CAP11XX_REG_SENSOR_CALIB_LSB1, 0x00 },
> { CAP11XX_REG_SENSOR_CALIB_LSB2, 0x00 },
> };
> @@ -196,6 +216,58 @@ static void cap11xx_input_close(struct input_dev *idev)
> cap11xx_set_sleep(priv, true);
> }
>
> +#ifdef CONFIG_LEDS_CLASS
> +static void cap11xx_led_work(struct work_struct *work)
> +{
> + struct cap11xx_led *led = container_of(work, struct cap11xx_led, work);
> + struct cap11xx_priv *priv = led->priv;
> + int value = led->new_brightness;
> +
> + regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
> + BIT(led->id), !!value ? BIT(led->id) : 0);
Why do we need to convert value to bool before doing the tertiary
operation?
> +}
> +
> +static void cap11xx_led_set(struct led_classdev *cdev,
> + enum led_brightness value)
> +{
> + struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev);
> +
> + led->new_brightness = value;
> + schedule_work(&led->work);
> +}
> +
> +static int cap11xx_register_leds(struct device *dev, struct cap11xx_priv *priv)
> +{
> + int ret;
Let's call it "error" please.
> + int i;
> +
> + /*
> + * Be sure all LEDS are in off-state
> + */
> + regmap_update_bits(priv->regmap,
> + CAP11XX_REG_LED_OUTPUT_CONTROL, 0xff, 0);
> +
> + for (i = 0; i < priv->num_leds; i++) {
> + struct cap11xx_led *led = &priv->leds[i];
> +
> + snprintf(led->name, sizeof(led->name), "cap11xx:led%d", i + 1);
> + led->cdev.name = led->name;
> + led->cdev.brightness_set = cap11xx_led_set;
> + led->cdev.brightness = LED_OFF;
> + led->cdev.max_brightness = 1;
> + led->id = i;
> + led->priv = priv;
> +
> + ret = devm_led_classdev_register(dev, &led->cdev);
> + if (ret < 0)
> + return ret;
> +
> + INIT_WORK(&led->work, cap11xx_led_work);
This is too late, request may come even before you return from
devm_led_classdev_register. Please move to a spot above.
> + };
A stray semicolon.
> + return 0;
> +}
> +#endif
> +
> static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
> const struct i2c_device_id *id)
> {
> @@ -316,6 +388,18 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
> priv->idev->open = cap11xx_input_open;
> priv->idev->close = cap11xx_input_close;
>
> +#ifdef CONFIG_LEDS_CLASS
> + if (cap->num_leds > 0) {
> + priv->leds = devm_kcalloc(dev, cap->num_leds,
> + sizeof(struct cap11xx_led), GFP_KERNEL);
> + if (!priv->leds)
> + return -ENOMEM;
> + priv->num_leds = cap->num_leds;
> + error = cap11xx_register_leds(dev, priv);
> + if (error)
> + return error;
> + }
> +#endif
Instead of inline #ifdef would prefer you moved memory allocation into
cap11xx_register_leds() and stub it out of leds are disabled.
> input_set_drvdata(priv->idev, priv);
>
> /*
> --
> 1.9.1
>
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-12 9:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-10 7:08 [PATCH v2] cap11xx: add LED support Matt Ranostay
2015-06-10 8:03 ` Jacek Anaszewski
2015-06-10 22:07 ` Matt Ranostay
2015-06-11 6:55 ` Jacek Anaszewski
2015-06-11 23:00 ` Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.