* [PATCH v4 0/2] cap118x: add LED support
@ 2015-06-16 2:46 Matt Ranostay
2015-06-16 2:46 ` [PATCH v4 1/2] dt: add cap11xx LED documentation Matt Ranostay
2015-06-16 2:46 ` [PATCH v4 2/2] cap11xx: add LED support Matt Ranostay
0 siblings, 2 replies; 15+ messages in thread
From: Matt Ranostay @ 2015-06-16 2:46 UTC (permalink / raw)
To: zonque, dmitry.torokhov
Cc: linux-input, linux-leds, devicetree, Matt Ranostay
Changes from v3:
* Fix race condition in work_queue
* Make 0 value (0% duty cycle) an invalid brightness option
* Document why LED brightness is only set global but ON/OFF state isn't
Matt Ranostay (2):
dt: add cap11xx LED documentation
cap11xx: add LED support
.../devicetree/bindings/input/cap11xx.txt | 23 ++++
drivers/input/keyboard/cap11xx.c | 128 ++++++++++++++++++++-
2 files changed, 148 insertions(+), 3 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v4 1/2] dt: add cap11xx LED documentation
2015-06-16 2:46 [PATCH v4 0/2] cap118x: add LED support Matt Ranostay
@ 2015-06-16 2:46 ` Matt Ranostay
2015-06-16 7:57 ` Jacek Anaszewski
2015-06-16 2:46 ` [PATCH v4 2/2] cap11xx: add LED support Matt Ranostay
1 sibling, 1 reply; 15+ messages in thread
From: Matt Ranostay @ 2015-06-16 2:46 UTC (permalink / raw)
To: zonque, dmitry.torokhov
Cc: linux-input, linux-leds, devicetree, Matt Ranostay
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
---
.../devicetree/bindings/input/cap11xx.txt | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/cap11xx.txt b/Documentation/devicetree/bindings/input/cap11xx.txt
index 7d0a300..01bb5b8 100644
--- a/Documentation/devicetree/bindings/input/cap11xx.txt
+++ b/Documentation/devicetree/bindings/input/cap11xx.txt
@@ -38,6 +38,11 @@ Optional properties:
defaults. The array must have exactly six
entries.
+ linux,led-brightness: Defines the ON brightness when the optional LED
+ functionality is used. Valid values are 1-15.
+ By default a value of 15 is set.
+
+
Example:
i2c_controller {
@@ -55,5 +60,23 @@ i2c_controller {
<105>, /* KEY_LEFT */
<109>, /* KEY_PAGEDOWN */
<104>; /* KEY_PAGEUP */
+
+ linux,led-brightness = <15>;
+
+ usr@0 {
+ label = "cap11xx:green:usr0";
+ reg = <0>;
+ };
+
+ usr@1 {
+ label = "cap11xx:green:usr1";
+ reg = <1>;
+ };
+
+ alive@2 {
+ label = "cap11xx:green:alive";
+ reg = <2>;
+ linux,default_trigger = "heartbeat";
+ };
};
}
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v4 2/2] cap11xx: add LED support
2015-06-16 2:46 [PATCH v4 0/2] cap118x: add LED support Matt Ranostay
2015-06-16 2:46 ` [PATCH v4 1/2] dt: add cap11xx LED documentation Matt Ranostay
@ 2015-06-16 2:46 ` Matt Ranostay
2015-06-16 7:54 ` Jacek Anaszewski
1 sibling, 1 reply; 15+ messages in thread
From: Matt Ranostay @ 2015-06-16 2:46 UTC (permalink / raw)
To: zonque, dmitry.torokhov
Cc: linux-input, linux-leds, devicetree, 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 | 128 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 125 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
index f07461a..fc8d365 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,20 @@
#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_LED_DUTY_CYCLE_1 0x90
+#define CAP11XX_REG_LED_DUTY_CYCLE_2 0x91
+#define CAP11XX_REG_LED_DUTY_CYCLE_3 0x92
+#define CAP11XX_REG_LED_DUTY_CYCLE_4 0x93
+
+#define CAP11XX_REG_LED_DUTY_MIN_MASK (0x0f)
+#define CAP11XX_REG_LED_DUTY_MIN_MASK_SHIFT (0)
+#define CAP11XX_REG_LED_DUTY_MAX_MASK (0xf0)
+#define CAP11XX_REG_LED_DUTY_MAX_MASK_SHIFT (4)
+#define CAP11XX_REG_LED_DUTY_MAX_VALUE (15)
+
#define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X))
#define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9
#define CAP11XX_REG_SENSOR_CALIB_LSB2 0xba
@@ -56,10 +71,24 @@
#define CAP11XX_MANUFACTURER_ID 0x5d
+#ifdef CONFIG_LEDS_CLASS
+struct cap11xx_led {
+ struct cap11xx_priv *priv;
+ struct led_classdev cdev;
+ struct work_struct work;
+ u32 reg;
+ 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 +96,7 @@ struct cap11xx_priv {
struct cap11xx_hw_model {
u8 product_id;
unsigned int num_channels;
+ unsigned int num_leds;
};
enum {
@@ -76,9 +106,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 +141,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 +227,91 @@ 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;
+
+ /*
+ * All LEDs share the same duty cycle as this is a HW limitation.
+ * Brightness levels per LED are either 0 (OFF) and 1 (ON).
+ *
+ * Actual brightness level for the ON state for all LEDS is set via the
+ * "linux,led-brightness" DT property.
+ */
+ regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
+ BIT(led->reg), !!value ? BIT(led->reg) : 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_init_leds(struct device *dev, struct cap11xx_priv *priv)
+{
+ struct device_node *node = dev->of_node, *child;
+ struct cap11xx_led *led;
+ int cnt = of_get_child_count(node);
+ u32 reg = 0;
+ int error;
+
+ if (!priv->num_leds || !cnt)
+ return 0;
+ if (cnt > priv->num_leds)
+ return -EINVAL;
+
+ led = devm_kcalloc(dev, cnt,
+ sizeof(struct cap11xx_led), GFP_KERNEL);
+ if (!led)
+ return -ENOMEM;
+
+ priv->leds = led;
+ error = of_property_read_u32(node, "linux,led-brightness", ®);
+ if (error || reg == 0 || reg > CAP11XX_REG_LED_DUTY_MAX_VALUE)
+ reg = CAP11XX_REG_LED_DUTY_MAX_VALUE;
+
+ error = regmap_update_bits(priv->regmap, CAP11XX_REG_LED_DUTY_CYCLE_4,
+ CAP11XX_REG_LED_DUTY_MAX_MASK,
+ reg << CAP11XX_REG_LED_DUTY_MAX_MASK_SHIFT);
+ if (error)
+ return error;
+
+ for_each_child_of_node(node, child) {
+ led->cdev.name =
+ of_get_property(child, "label", NULL) ? : child->name;
+ led->cdev.default_trigger =
+ of_get_property(child, "linux,default-trigger", NULL);
+ led->cdev.flags = 0;
+ led->cdev.brightness_set = cap11xx_led_set;
+ led->cdev.max_brightness = 1;
+ led->cdev.brightness = LED_OFF;
+
+ error = of_property_read_u32(child, "reg", ®);
+ if (error != 0 || reg >= priv->num_leds)
+ continue;
+ led->reg = reg;
+ led->priv = priv;
+
+ INIT_WORK(&led->work, cap11xx_led_work);
+ error = devm_led_classdev_register(dev, &led->cdev);
+ if (error < 0)
+ return -EINVAL;
+
+ schedule_work(&led->work);
+ led++;
+ };
+
+ return 0;
+}
+#endif
+
static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
const struct i2c_device_id *id)
{
@@ -316,6 +432,12 @@ 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
+ priv->num_leds = cap->num_leds;
+ error = cap11xx_init_leds(dev, priv);
+ if (error)
+ return error;
+#endif
input_set_drvdata(priv->idev, priv);
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-16 2:46 ` [PATCH v4 2/2] cap11xx: add LED support Matt Ranostay
@ 2015-06-16 7:54 ` Jacek Anaszewski
2015-06-16 14:39 ` Matt Ranostay
0 siblings, 1 reply; 15+ messages in thread
From: Jacek Anaszewski @ 2015-06-16 7:54 UTC (permalink / raw)
To: Matt Ranostay
Cc: zonque, dmitry.torokhov, linux-input, linux-leds, devicetree
On 06/16/2015 04:46 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 | 128 ++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 125 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
> index f07461a..fc8d365 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,20 @@
> #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_LED_DUTY_CYCLE_1 0x90
> +#define CAP11XX_REG_LED_DUTY_CYCLE_2 0x91
> +#define CAP11XX_REG_LED_DUTY_CYCLE_3 0x92
> +#define CAP11XX_REG_LED_DUTY_CYCLE_4 0x93
> +
> +#define CAP11XX_REG_LED_DUTY_MIN_MASK (0x0f)
> +#define CAP11XX_REG_LED_DUTY_MIN_MASK_SHIFT (0)
> +#define CAP11XX_REG_LED_DUTY_MAX_MASK (0xf0)
> +#define CAP11XX_REG_LED_DUTY_MAX_MASK_SHIFT (4)
> +#define CAP11XX_REG_LED_DUTY_MAX_VALUE (15)
> +
> #define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X))
> #define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9
> #define CAP11XX_REG_SENSOR_CALIB_LSB2 0xba
> @@ -56,10 +71,24 @@
>
> #define CAP11XX_MANUFACTURER_ID 0x5d
>
> +#ifdef CONFIG_LEDS_CLASS
> +struct cap11xx_led {
> + struct cap11xx_priv *priv;
> + struct led_classdev cdev;
> + struct work_struct work;
> + u32 reg;
> + 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 +96,7 @@ struct cap11xx_priv {
> struct cap11xx_hw_model {
> u8 product_id;
> unsigned int num_channels;
> + unsigned int num_leds;
> };
>
> enum {
> @@ -76,9 +106,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 +141,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 +227,91 @@ 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;
> +
> + /*
> + * All LEDs share the same duty cycle as this is a HW limitation.
> + * Brightness levels per LED are either 0 (OFF) and 1 (ON).
> + *
> + * Actual brightness level for the ON state for all LEDS is set via the
> + * "linux,led-brightness" DT property.
> + */
> + regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
> + BIT(led->reg), !!value ? BIT(led->reg) : 0);
You don't need '!!' before value. Any non-zero value is evaluated
to true in conditions.
> +}
> +
> +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_init_leds(struct device *dev, struct cap11xx_priv *priv)
> +{
> + struct device_node *node = dev->of_node, *child;
> + struct cap11xx_led *led;
> + int cnt = of_get_child_count(node);
> + u32 reg = 0;
> + int error;
> +
> + if (!priv->num_leds || !cnt)
> + return 0;
> + if (cnt > priv->num_leds)
> + return -EINVAL;
> +
> + led = devm_kcalloc(dev, cnt,
> + sizeof(struct cap11xx_led), GFP_KERNEL);
> + if (!led)
> + return -ENOMEM;
> +
> + priv->leds = led;
> + error = of_property_read_u32(node, "linux,led-brightness", ®);
> + if (error || reg == 0 || reg > CAP11XX_REG_LED_DUTY_MAX_VALUE)
> + reg = CAP11XX_REG_LED_DUTY_MAX_VALUE;
> +
> + error = regmap_update_bits(priv->regmap, CAP11XX_REG_LED_DUTY_CYCLE_4,
> + CAP11XX_REG_LED_DUTY_MAX_MASK,
> + reg << CAP11XX_REG_LED_DUTY_MAX_MASK_SHIFT);
> + if (error)
> + return error;
> +
> + for_each_child_of_node(node, child) {
> + led->cdev.name =
> + of_get_property(child, "label", NULL) ? : child->name;
> + led->cdev.default_trigger =
> + of_get_property(child, "linux,default-trigger", NULL);
> + led->cdev.flags = 0;
> + led->cdev.brightness_set = cap11xx_led_set;
> + led->cdev.max_brightness = 1;
> + led->cdev.brightness = LED_OFF;
> +
> + error = of_property_read_u32(child, "reg", ®);
> + if (error != 0 || reg >= priv->num_leds)
> + continue;
> + led->reg = reg;
> + led->priv = priv;
> +
> + INIT_WORK(&led->work, cap11xx_led_work);
> + error = devm_led_classdev_register(dev, &led->cdev);
> + if (error < 0)
> + return -EINVAL;
> +
> + schedule_work(&led->work);
Why do you schedule work here? It should be done only in brightness_set op.
> + led++;
> + };
> +
> + return 0;
> +}
> +#endif
> +
> static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
> const struct i2c_device_id *id)
> {
> @@ -316,6 +432,12 @@ 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
> + priv->num_leds = cap->num_leds;
> + error = cap11xx_init_leds(dev, priv);
> + if (error)
> + return error;
> +#endif
> input_set_drvdata(priv->idev, priv);
>
> /*
>
--
Best Regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 1/2] dt: add cap11xx LED documentation
2015-06-16 2:46 ` [PATCH v4 1/2] dt: add cap11xx LED documentation Matt Ranostay
@ 2015-06-16 7:57 ` Jacek Anaszewski
2015-06-16 14:31 ` Matt Ranostay
0 siblings, 1 reply; 15+ messages in thread
From: Jacek Anaszewski @ 2015-06-16 7:57 UTC (permalink / raw)
To: Matt Ranostay
Cc: zonque, dmitry.torokhov, linux-input, linux-leds, devicetree
On 06/16/2015 04:46 AM, Matt Ranostay wrote:
> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
> ---
> .../devicetree/bindings/input/cap11xx.txt | 23 ++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/input/cap11xx.txt b/Documentation/devicetree/bindings/input/cap11xx.txt
> index 7d0a300..01bb5b8 100644
> --- a/Documentation/devicetree/bindings/input/cap11xx.txt
> +++ b/Documentation/devicetree/bindings/input/cap11xx.txt
> @@ -38,6 +38,11 @@ Optional properties:
> defaults. The array must have exactly six
> entries.
>
> + linux,led-brightness: Defines the ON brightness when the optional LED
> + functionality is used. Valid values are 1-15.
> + By default a value of 15 is set.
> +
> +
> Example:
>
> i2c_controller {
> @@ -55,5 +60,23 @@ i2c_controller {
> <105>, /* KEY_LEFT */
> <109>, /* KEY_PAGEDOWN */
> <104>; /* KEY_PAGEUP */
> +
> + linux,led-brightness = <15>;
You are missing here:
#address-cells = <1>;
#size-cells = <0>;
Otherwise you will get warnings during compilation of dtc file.
> + usr@0 {
> + label = "cap11xx:green:usr0";
> + reg = <0>;
> + };
> +
> + usr@1 {
> + label = "cap11xx:green:usr1";
> + reg = <1>;
> + };
> +
> + alive@2 {
> + label = "cap11xx:green:alive";
> + reg = <2>;
> + linux,default_trigger = "heartbeat";
> + };
> };
> }
>
--
Best Regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 1/2] dt: add cap11xx LED documentation
2015-06-16 7:57 ` Jacek Anaszewski
@ 2015-06-16 14:31 ` Matt Ranostay
0 siblings, 0 replies; 15+ messages in thread
From: Matt Ranostay @ 2015-06-16 14:31 UTC (permalink / raw)
To: Jacek Anaszewski
Cc: Daniel Mack, Dmitry Torokhov, linux-input, linux-leds, devicetree
On Tue, Jun 16, 2015 at 12:57 AM, Jacek Anaszewski
<j.anaszewski@samsung.com> wrote:
> On 06/16/2015 04:46 AM, Matt Ranostay wrote:
>>
>> Signed-off-by: Matt Ranostay <mranostay@gmail.com>
>> ---
>> .../devicetree/bindings/input/cap11xx.txt | 23
>> ++++++++++++++++++++++
>> 1 file changed, 23 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/input/cap11xx.txt
>> b/Documentation/devicetree/bindings/input/cap11xx.txt
>> index 7d0a300..01bb5b8 100644
>> --- a/Documentation/devicetree/bindings/input/cap11xx.txt
>> +++ b/Documentation/devicetree/bindings/input/cap11xx.txt
>> @@ -38,6 +38,11 @@ Optional properties:
>> defaults. The array must have exactly six
>> entries.
>>
>> + linux,led-brightness: Defines the ON brightness when the
>> optional LED
>> + functionality is used. Valid values are
>> 1-15.
>> + By default a value of 15 is set.
>> +
>> +
>> Example:
>>
>> i2c_controller {
>> @@ -55,5 +60,23 @@ i2c_controller {
>> <105>, /* KEY_LEFT */
>> <109>, /* KEY_PAGEDOWN */
>> <104>; /* KEY_PAGEUP */
>> +
>> + linux,led-brightness = <15>;
>
>
> You are missing here:
>
> #address-cells = <1>;
> #size-cells = <0>;
>
> Otherwise you will get warnings during compilation of dtc file.
Will fix in v5.
>
>
>> + usr@0 {
>> + label = "cap11xx:green:usr0";
>> + reg = <0>;
>> + };
>> +
>> + usr@1 {
>> + label = "cap11xx:green:usr1";
>> + reg = <1>;
>> + };
>> +
>> + alive@2 {
>> + label = "cap11xx:green:alive";
>> + reg = <2>;
>> + linux,default_trigger = "heartbeat";
>> + };
>> };
>> }
>>
>
>
> --
> Best Regards,
> Jacek Anaszewski
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-16 7:54 ` Jacek Anaszewski
@ 2015-06-16 14:39 ` Matt Ranostay
2015-06-16 21:26 ` Daniel Mack
0 siblings, 1 reply; 15+ messages in thread
From: Matt Ranostay @ 2015-06-16 14:39 UTC (permalink / raw)
To: Jacek Anaszewski
Cc: Daniel Mack, Dmitry Torokhov, linux-input, linux-leds, devicetree
On Tue, Jun 16, 2015 at 12:54 AM, Jacek Anaszewski
<j.anaszewski@samsung.com> wrote:
> On 06/16/2015 04:46 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 | 128
>> ++++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 125 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/input/keyboard/cap11xx.c
>> b/drivers/input/keyboard/cap11xx.c
>> index f07461a..fc8d365 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,20 @@
>> #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_LED_DUTY_CYCLE_1 0x90
>> +#define CAP11XX_REG_LED_DUTY_CYCLE_2 0x91
>> +#define CAP11XX_REG_LED_DUTY_CYCLE_3 0x92
>> +#define CAP11XX_REG_LED_DUTY_CYCLE_4 0x93
>> +
>> +#define CAP11XX_REG_LED_DUTY_MIN_MASK (0x0f)
>> +#define CAP11XX_REG_LED_DUTY_MIN_MASK_SHIFT (0)
>> +#define CAP11XX_REG_LED_DUTY_MAX_MASK (0xf0)
>> +#define CAP11XX_REG_LED_DUTY_MAX_MASK_SHIFT (4)
>> +#define CAP11XX_REG_LED_DUTY_MAX_VALUE (15)
>> +
>> #define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X))
>> #define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9
>> #define CAP11XX_REG_SENSOR_CALIB_LSB2 0xba
>> @@ -56,10 +71,24 @@
>>
>> #define CAP11XX_MANUFACTURER_ID 0x5d
>>
>> +#ifdef CONFIG_LEDS_CLASS
>> +struct cap11xx_led {
>> + struct cap11xx_priv *priv;
>> + struct led_classdev cdev;
>> + struct work_struct work;
>> + u32 reg;
>> + 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 +96,7 @@ struct cap11xx_priv {
>> struct cap11xx_hw_model {
>> u8 product_id;
>> unsigned int num_channels;
>> + unsigned int num_leds;
>> };
>>
>> enum {
>> @@ -76,9 +106,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 +141,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 +227,91 @@ 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;
>> +
>> + /*
>> + * All LEDs share the same duty cycle as this is a HW limitation.
>> + * Brightness levels per LED are either 0 (OFF) and 1 (ON).
>> + *
>> + * Actual brightness level for the ON state for all LEDS is set
>> via the
>> + * "linux,led-brightness" DT property.
>> + */
>> + regmap_update_bits(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL,
>> + BIT(led->reg), !!value ? BIT(led->reg) :
>> 0);
>
>
> You don't need '!!' before value. Any non-zero value is evaluated
> to true in conditions.
>
Ok old habit of mine. Will remove in v5
>
>> +}
>> +
>> +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_init_leds(struct device *dev, struct cap11xx_priv
>> *priv)
>> +{
>> + struct device_node *node = dev->of_node, *child;
>> + struct cap11xx_led *led;
>> + int cnt = of_get_child_count(node);
>> + u32 reg = 0;
>> + int error;
>> +
>> + if (!priv->num_leds || !cnt)
>> + return 0;
>> + if (cnt > priv->num_leds)
>> + return -EINVAL;
>> +
>> + led = devm_kcalloc(dev, cnt,
>> + sizeof(struct cap11xx_led), GFP_KERNEL);
>> + if (!led)
>> + return -ENOMEM;
>> +
>> + priv->leds = led;
>> + error = of_property_read_u32(node, "linux,led-brightness", ®);
>> + if (error || reg == 0 || reg > CAP11XX_REG_LED_DUTY_MAX_VALUE)
>> + reg = CAP11XX_REG_LED_DUTY_MAX_VALUE;
>> +
>> + error = regmap_update_bits(priv->regmap,
>> CAP11XX_REG_LED_DUTY_CYCLE_4,
>> + CAP11XX_REG_LED_DUTY_MAX_MASK,
>> + reg <<
>> CAP11XX_REG_LED_DUTY_MAX_MASK_SHIFT);
>> + if (error)
>> + return error;
>> +
>> + for_each_child_of_node(node, child) {
>> + led->cdev.name =
>> + of_get_property(child, "label", NULL) ? :
>> child->name;
>> + led->cdev.default_trigger =
>> + of_get_property(child, "linux,default-trigger",
>> NULL);
>> + led->cdev.flags = 0;
>> + led->cdev.brightness_set = cap11xx_led_set;
>> + led->cdev.max_brightness = 1;
>> + led->cdev.brightness = LED_OFF;
>> +
>> + error = of_property_read_u32(child, "reg", ®);
>> + if (error != 0 || reg >= priv->num_leds)
>> + continue;
>> + led->reg = reg;
>> + led->priv = priv;
>> +
>> + INIT_WORK(&led->work, cap11xx_led_work);
>> + error = devm_led_classdev_register(dev, &led->cdev);
>> + if (error < 0)
>> + return -EINVAL;
>> +
>> + schedule_work(&led->work);
>
>
> Why do you schedule work here? It should be done only in brightness_set op.
>
The LED needs to be set to initial turned off state, since there is no
Power ON/OFF register for the cap11xx devices.. So LEDs state would be
persistent across warm reboots.
Thoughts on how to do this better?
>> + led++;
>> + };
>> +
>> + return 0;
>> +}
>> +#endif
>> +
>> static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
>> const struct i2c_device_id *id)
>> {
>> @@ -316,6 +432,12 @@ 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
>> + priv->num_leds = cap->num_leds;
>> + error = cap11xx_init_leds(dev, priv);
>> + if (error)
>> + return error;
>> +#endif
>> input_set_drvdata(priv->idev, priv);
>>
>> /*
>>
>
>
> --
> Best Regards,
> Jacek Anaszewski
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-16 14:39 ` Matt Ranostay
@ 2015-06-16 21:26 ` Daniel Mack
2015-06-16 21:55 ` Matt Ranostay
0 siblings, 1 reply; 15+ messages in thread
From: Daniel Mack @ 2015-06-16 21:26 UTC (permalink / raw)
To: Matt Ranostay, Jacek Anaszewski
Cc: Dmitry Torokhov, linux-input, linux-leds, devicetree
On 06/16/2015 04:39 PM, Matt Ranostay wrote:
> On Tue, Jun 16, 2015 at 12:54 AM, Jacek Anaszewski
> <j.anaszewski@samsung.com> wrote:
>> On 06/16/2015 04:46 AM, Matt Ranostay wrote:
>>> + for_each_child_of_node(node, child) {
>>> + led->cdev.name =
>>> + of_get_property(child, "label", NULL) ? :
>>> child->name;
>>> + led->cdev.default_trigger =
>>> + of_get_property(child, "linux,default-trigger",
>>> NULL);
>>> + led->cdev.flags = 0;
>>> + led->cdev.brightness_set = cap11xx_led_set;
>>> + led->cdev.max_brightness = 1;
>>> + led->cdev.brightness = LED_OFF;
>>> +
>>> + error = of_property_read_u32(child, "reg", ®);
>>> + if (error != 0 || reg >= priv->num_leds)
>>> + continue;
>>> + led->reg = reg;
>>> + led->priv = priv;
>>> +
>>> + INIT_WORK(&led->work, cap11xx_led_work);
>>> + error = devm_led_classdev_register(dev, &led->cdev);
>>> + if (error < 0)
>>> + return -EINVAL;
>>> +
>>> + schedule_work(&led->work);
>>
>>
>> Why do you schedule work here? It should be done only in brightness_set op.
>>
> The LED needs to be set to initial turned off state, since there is no
> Power ON/OFF register for the cap11xx devices.. So LEDs state would be
> persistent across warm reboots.
> Thoughts on how to do this better?
What's wrong with this?
regmap_write(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL, 0);
Outside the loop, of course ...
Daniel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-16 21:26 ` Daniel Mack
@ 2015-06-16 21:55 ` Matt Ranostay
2015-06-17 6:34 ` Matt Ranostay
0 siblings, 1 reply; 15+ messages in thread
From: Matt Ranostay @ 2015-06-16 21:55 UTC (permalink / raw)
To: Daniel Mack
Cc: Jacek Anaszewski, Dmitry Torokhov, linux-input, linux-leds, devicetree
On Tue, Jun 16, 2015 at 2:26 PM, Daniel Mack <daniel@zonque.org> wrote:
> On 06/16/2015 04:39 PM, Matt Ranostay wrote:
>> On Tue, Jun 16, 2015 at 12:54 AM, Jacek Anaszewski
>> <j.anaszewski@samsung.com> wrote:
>>> On 06/16/2015 04:46 AM, Matt Ranostay wrote:
>
>>>> + for_each_child_of_node(node, child) {
>>>> + led->cdev.name =
>>>> + of_get_property(child, "label", NULL) ? :
>>>> child->name;
>>>> + led->cdev.default_trigger =
>>>> + of_get_property(child, "linux,default-trigger",
>>>> NULL);
>>>> + led->cdev.flags = 0;
>>>> + led->cdev.brightness_set = cap11xx_led_set;
>>>> + led->cdev.max_brightness = 1;
>>>> + led->cdev.brightness = LED_OFF;
>>>> +
>>>> + error = of_property_read_u32(child, "reg", ®);
>>>> + if (error != 0 || reg >= priv->num_leds)
>>>> + continue;
>>>> + led->reg = reg;
>>>> + led->priv = priv;
>>>> +
>>>> + INIT_WORK(&led->work, cap11xx_led_work);
>>>> + error = devm_led_classdev_register(dev, &led->cdev);
>>>> + if (error < 0)
>>>> + return -EINVAL;
>>>> +
>>>> + schedule_work(&led->work);
>>>
>>>
>>> Why do you schedule work here? It should be done only in brightness_set op.
>>>
>> The LED needs to be set to initial turned off state, since there is no
>> Power ON/OFF register for the cap11xx devices.. So LEDs state would be
>> persistent across warm reboots.
>> Thoughts on how to do this better?
>
> What's wrong with this?
>
> regmap_write(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL, 0);
>
> Outside the loop, of course ...
>
Works for me, and prevents the workqueues tasks for blocking each
other in regmap_update_bits.
However I just noticed the DLSLEEP state that cap11xx_input_close()
requests via cap11xx_set_sleep(true) could disable the LEDs. Need to
double check this later tonight...
>
> Daniel
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-16 21:55 ` Matt Ranostay
@ 2015-06-17 6:34 ` Matt Ranostay
[not found] ` <CAKzfze8629xyiz1wufjoGbOu+npDRXyCgyGEhxY_1h7XHKeTQg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 15+ messages in thread
From: Matt Ranostay @ 2015-06-17 6:34 UTC (permalink / raw)
To: Daniel Mack
Cc: Jacek Anaszewski, Dmitry Torokhov, linux-input, linux-leds, devicetree
On Tue, Jun 16, 2015 at 2:55 PM, Matt Ranostay <mranostay@gmail.com> wrote:
> On Tue, Jun 16, 2015 at 2:26 PM, Daniel Mack <daniel@zonque.org> wrote:
>> On 06/16/2015 04:39 PM, Matt Ranostay wrote:
>>> On Tue, Jun 16, 2015 at 12:54 AM, Jacek Anaszewski
>>> <j.anaszewski@samsung.com> wrote:
>>>> On 06/16/2015 04:46 AM, Matt Ranostay wrote:
>>
>>>>> + for_each_child_of_node(node, child) {
>>>>> + led->cdev.name =
>>>>> + of_get_property(child, "label", NULL) ? :
>>>>> child->name;
>>>>> + led->cdev.default_trigger =
>>>>> + of_get_property(child, "linux,default-trigger",
>>>>> NULL);
>>>>> + led->cdev.flags = 0;
>>>>> + led->cdev.brightness_set = cap11xx_led_set;
>>>>> + led->cdev.max_brightness = 1;
>>>>> + led->cdev.brightness = LED_OFF;
>>>>> +
>>>>> + error = of_property_read_u32(child, "reg", ®);
>>>>> + if (error != 0 || reg >= priv->num_leds)
>>>>> + continue;
>>>>> + led->reg = reg;
>>>>> + led->priv = priv;
>>>>> +
>>>>> + INIT_WORK(&led->work, cap11xx_led_work);
>>>>> + error = devm_led_classdev_register(dev, &led->cdev);
>>>>> + if (error < 0)
>>>>> + return -EINVAL;
>>>>> +
>>>>> + schedule_work(&led->work);
>>>>
>>>>
>>>> Why do you schedule work here? It should be done only in brightness_set op.
>>>>
>>> The LED needs to be set to initial turned off state, since there is no
>>> Power ON/OFF register for the cap11xx devices.. So LEDs state would be
>>> persistent across warm reboots.
>>> Thoughts on how to do this better?
>>
>> What's wrong with this?
>>
>> regmap_write(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL, 0);
>>
>> Outside the loop, of course ...
>>
> Works for me, and prevents the workqueues tasks for blocking each
> other in regmap_update_bits.
>
> However I just noticed the DLSLEEP state that cap11xx_input_close()
> requests via cap11xx_set_sleep(true) could disable the LEDs. Need to
> double check this later tonight...
Seems deep sleep only effects the breath function. So never mind :)
>
>>
>> Daniel
>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
[not found] ` <CAKzfze8629xyiz1wufjoGbOu+npDRXyCgyGEhxY_1h7XHKeTQg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2015-06-17 6:49 ` Matt Ranostay
2015-06-17 8:59 ` Daniel Mack
0 siblings, 1 reply; 15+ messages in thread
From: Matt Ranostay @ 2015-06-17 6:49 UTC (permalink / raw)
To: Daniel Mack
Cc: Jacek Anaszewski, Dmitry Torokhov,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
Actually after further reading of the datasheet and testing with
i2ctools it seems cap11xx_input_close() isn't putting the device in
DEEP SLEEP mode.
Any thoughts why?
On Tue, Jun 16, 2015 at 11:34 PM, Matt Ranostay <mranostay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Tue, Jun 16, 2015 at 2:55 PM, Matt Ranostay <mranostay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> On Tue, Jun 16, 2015 at 2:26 PM, Daniel Mack <daniel-cYrQPVfZoowdnm+yROfE0A@public.gmane.org> wrote:
>>> On 06/16/2015 04:39 PM, Matt Ranostay wrote:
>>>> On Tue, Jun 16, 2015 at 12:54 AM, Jacek Anaszewski
>>>> <j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> wrote:
>>>>> On 06/16/2015 04:46 AM, Matt Ranostay wrote:
>>>
>>>>>> + for_each_child_of_node(node, child) {
>>>>>> + led->cdev.name =
>>>>>> + of_get_property(child, "label", NULL) ? :
>>>>>> child->name;
>>>>>> + led->cdev.default_trigger =
>>>>>> + of_get_property(child, "linux,default-trigger",
>>>>>> NULL);
>>>>>> + led->cdev.flags = 0;
>>>>>> + led->cdev.brightness_set = cap11xx_led_set;
>>>>>> + led->cdev.max_brightness = 1;
>>>>>> + led->cdev.brightness = LED_OFF;
>>>>>> +
>>>>>> + error = of_property_read_u32(child, "reg", ®);
>>>>>> + if (error != 0 || reg >= priv->num_leds)
>>>>>> + continue;
>>>>>> + led->reg = reg;
>>>>>> + led->priv = priv;
>>>>>> +
>>>>>> + INIT_WORK(&led->work, cap11xx_led_work);
>>>>>> + error = devm_led_classdev_register(dev, &led->cdev);
>>>>>> + if (error < 0)
>>>>>> + return -EINVAL;
>>>>>> +
>>>>>> + schedule_work(&led->work);
>>>>>
>>>>>
>>>>> Why do you schedule work here? It should be done only in brightness_set op.
>>>>>
>>>> The LED needs to be set to initial turned off state, since there is no
>>>> Power ON/OFF register for the cap11xx devices.. So LEDs state would be
>>>> persistent across warm reboots.
>>>> Thoughts on how to do this better?
>>>
>>> What's wrong with this?
>>>
>>> regmap_write(priv->regmap, CAP11XX_REG_LED_OUTPUT_CONTROL, 0);
>>>
>>> Outside the loop, of course ...
>>>
>> Works for me, and prevents the workqueues tasks for blocking each
>> other in regmap_update_bits.
>>
>> However I just noticed the DLSLEEP state that cap11xx_input_close()
>> requests via cap11xx_set_sleep(true) could disable the LEDs. Need to
>> double check this later tonight...
>
> Seems deep sleep only effects the breath function. So never mind :)
>
>>
>>>
>>> Daniel
>>>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-17 6:49 ` Matt Ranostay
@ 2015-06-17 8:59 ` Daniel Mack
2015-06-17 21:53 ` Matt Ranostay
0 siblings, 1 reply; 15+ messages in thread
From: Daniel Mack @ 2015-06-17 8:59 UTC (permalink / raw)
To: Matt Ranostay
Cc: Jacek Anaszewski, Dmitry Torokhov, linux-input, linux-leds, devicetree
On 06/17/2015 08:49 AM, Matt Ranostay wrote:
> Actually after further reading of the datasheet and testing with
> i2ctools it seems cap11xx_input_close() isn't putting the device in
> DEEP SLEEP mode.
>
> Any thoughts why?
No, sorry. IIRC, the board I wrote the driver for didn't give me the
ability to measure power consumption.
Daniel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-17 8:59 ` Daniel Mack
@ 2015-06-17 21:53 ` Matt Ranostay
[not found] ` <CAKzfze-H=m55j-1ty4xOkrVzMswU7FpXe=6pHq4ws=P+3vcZNQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 15+ messages in thread
From: Matt Ranostay @ 2015-06-17 21:53 UTC (permalink / raw)
To: Daniel Mack
Cc: Jacek Anaszewski, Dmitry Torokhov, linux-input, linux-leds, devicetree
On Wed, Jun 17, 2015 at 1:59 AM, Daniel Mack <daniel@zonque.org> wrote:
> On 06/17/2015 08:49 AM, Matt Ranostay wrote:
>> Actually after further reading of the datasheet and testing with
>> i2ctools it seems cap11xx_input_close() isn't putting the device in
>> DEEP SLEEP mode.
>>
>> Any thoughts why?
>
> No, sorry. IIRC, the board I wrote the driver for didn't give me the
> ability to measure power consumption.
>
I can confirm it never goes to deep sleep or cap11xx_input_close()
gets called. Does evdev kernel module increment/input_open_device even
if nothing in userspace is accessing the /dev/event/inputX nodes?
- Matt
>
> Daniel
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
[not found] ` <CAKzfze-H=m55j-1ty4xOkrVzMswU7FpXe=6pHq4ws=P+3vcZNQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2015-06-17 22:38 ` Dmitry Torokhov
2015-06-17 23:36 ` Matt Ranostay
0 siblings, 1 reply; 15+ messages in thread
From: Dmitry Torokhov @ 2015-06-17 22:38 UTC (permalink / raw)
To: Matt Ranostay
Cc: Daniel Mack, Jacek Anaszewski,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-leds-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA
On Wed, Jun 17, 2015 at 02:53:26PM -0700, Matt Ranostay wrote:
> On Wed, Jun 17, 2015 at 1:59 AM, Daniel Mack <daniel-cYrQPVfZoowdnm+yROfE0A@public.gmane.org> wrote:
> > On 06/17/2015 08:49 AM, Matt Ranostay wrote:
> >> Actually after further reading of the datasheet and testing with
> >> i2ctools it seems cap11xx_input_close() isn't putting the device in
> >> DEEP SLEEP mode.
> >>
> >> Any thoughts why?
> >
> > No, sorry. IIRC, the board I wrote the driver for didn't give me the
> > ability to measure power consumption.
> >
>
> I can confirm it never goes to deep sleep or cap11xx_input_close()
> gets called. Does evdev kernel module increment/input_open_device even
> if nothing in userspace is accessing the /dev/event/inputX nodes?
No it does not. On the other hand there is VT that does keep all
keyboard-like devices open.
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v4 2/2] cap11xx: add LED support
2015-06-17 22:38 ` Dmitry Torokhov
@ 2015-06-17 23:36 ` Matt Ranostay
0 siblings, 0 replies; 15+ messages in thread
From: Matt Ranostay @ 2015-06-17 23:36 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Daniel Mack, Jacek Anaszewski, linux-input, linux-leds, devicetree
On Wed, Jun 17, 2015 at 3:38 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> On Wed, Jun 17, 2015 at 02:53:26PM -0700, Matt Ranostay wrote:
>> On Wed, Jun 17, 2015 at 1:59 AM, Daniel Mack <daniel@zonque.org> wrote:
>> > On 06/17/2015 08:49 AM, Matt Ranostay wrote:
>> >> Actually after further reading of the datasheet and testing with
>> >> i2ctools it seems cap11xx_input_close() isn't putting the device in
>> >> DEEP SLEEP mode.
>> >>
>> >> Any thoughts why?
>> >
>> > No, sorry. IIRC, the board I wrote the driver for didn't give me the
>> > ability to measure power consumption.
>> >
>>
>> I can confirm it never goes to deep sleep or cap11xx_input_close()
>> gets called. Does evdev kernel module increment/input_open_device even
>> if nothing in userspace is accessing the /dev/event/inputX nodes?
>
> No it does not. On the other hand there is VT that does keep all
> keyboard-like devices open.
Ah yes is that is likely the issue. I'll disable CONFIG_VT, and update
in v5 to handle to keep the device from going to deep sleep when one
or more LEDS is on.
- Matt
>
> Thanks.
>
> --
> Dmitry
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2015-06-17 23:36 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-16 2:46 [PATCH v4 0/2] cap118x: add LED support Matt Ranostay
2015-06-16 2:46 ` [PATCH v4 1/2] dt: add cap11xx LED documentation Matt Ranostay
2015-06-16 7:57 ` Jacek Anaszewski
2015-06-16 14:31 ` Matt Ranostay
2015-06-16 2:46 ` [PATCH v4 2/2] cap11xx: add LED support Matt Ranostay
2015-06-16 7:54 ` Jacek Anaszewski
2015-06-16 14:39 ` Matt Ranostay
2015-06-16 21:26 ` Daniel Mack
2015-06-16 21:55 ` Matt Ranostay
2015-06-17 6:34 ` Matt Ranostay
[not found] ` <CAKzfze8629xyiz1wufjoGbOu+npDRXyCgyGEhxY_1h7XHKeTQg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-06-17 6:49 ` Matt Ranostay
2015-06-17 8:59 ` Daniel Mack
2015-06-17 21:53 ` Matt Ranostay
[not found] ` <CAKzfze-H=m55j-1ty4xOkrVzMswU7FpXe=6pHq4ws=P+3vcZNQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-06-17 22:38 ` Dmitry Torokhov
2015-06-17 23:36 ` Matt Ranostay
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.