From: Dan Murphy <dmurphy@ti.com>
To: <jacek.anaszewski@gmail.com>, <pavel@ucw.cz>, <tony@atomide.com>,
<sre@kernel.org>, <nekit1000@gmail.com>, <mpartap@gmx.net>,
<merlijn@wizzup.org>
Cc: <linux-leds@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Dan Murphy <dmurphy@ti.com>
Subject: [PATCH v3 3/5] leds: lm3532: Fixes for the driver for stability
Date: Tue, 20 Aug 2019 14:53:05 -0500 [thread overview]
Message-ID: <20190820195307.27590-3-dmurphy@ti.com> (raw)
In-Reply-To: <20190820195307.27590-1-dmurphy@ti.com>
Fixed misspelled words, added error check during probe
on the init of the registers, and fixed ALS/I2C control
mode.
Fixes: e37a7f8d77e1 ("leds: lm3532: Introduce the lm3532 LED driver")
Reported-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
v3 - No changes - https://lore.kernel.org/patchwork/patch/1114541/
drivers/leds/leds-lm3532.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index 0c3d67671ab2..5e33ae4561f2 100644
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -43,7 +43,7 @@
#define LM3532_REG_ZONE_TRGT_C 0x7a
#define LM3532_REG_MAX 0x7e
-/* Contorl Enable */
+/* Control Enable */
#define LM3532_CTRL_A_ENABLE BIT(0)
#define LM3532_CTRL_B_ENABLE BIT(1)
#define LM3532_CTRL_C_ENABLE BIT(2)
@@ -307,7 +307,7 @@ static int lm3532_led_disable(struct lm3532_led *led_data)
int ret;
ret = regmap_update_bits(led_data->priv->regmap, LM3532_REG_ENABLE,
- ctrl_en_val, ~ctrl_en_val);
+ ctrl_en_val, 0);
if (ret) {
dev_err(led_data->priv->dev, "Failed to set ctrl:%d\n", ret);
return ret;
@@ -326,7 +326,7 @@ static int lm3532_brightness_set(struct led_classdev *led_cdev,
mutex_lock(&led->priv->lock);
- if (led->mode == LM3532_BL_MODE_ALS) {
+ if (led->mode == LM3532_ALS_CTRL) {
if (brt_val > LED_OFF)
ret = lm3532_led_enable(led);
else
@@ -561,11 +561,14 @@ static int lm3532_parse_node(struct lm3532_data *priv)
}
if (led->mode == LM3532_BL_MODE_ALS) {
+ led->mode = LM3532_ALS_CTRL;
ret = lm3532_parse_als(priv);
if (ret)
dev_err(&priv->client->dev, "Failed to parse als\n");
else
lm3532_als_configure(priv, led);
+ } else {
+ led->mode = LM3532_I2C_CTRL;
}
led->num_leds = fwnode_property_count_u32(child, "led-sources");
@@ -606,7 +609,13 @@ static int lm3532_parse_node(struct lm3532_data *priv)
goto child_out;
}
- lm3532_init_registers(led);
+ ret = lm3532_init_registers(led);
+ if (ret) {
+ dev_err(&priv->client->dev, "register init err: %d\n",
+ ret);
+ fwnode_handle_put(child);
+ goto child_out;
+ }
i++;
}
--
2.22.0.214.g8dca754b1e
next prev parent reply other threads:[~2019-08-20 19:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 19:53 [PATCH v3 1/5] leds: lm3532: Fix brightness control for i2c mode Dan Murphy
2019-08-20 19:53 ` [PATCH v3 2/5] leds: lm3532: Change the define for the fs current register Dan Murphy
2019-08-25 9:32 ` Pavel Machek
2019-08-27 21:33 ` Jacek Anaszewski
2019-08-27 21:37 ` Jacek Anaszewski
2019-08-20 19:53 ` Dan Murphy [this message]
2019-08-20 19:53 ` [PATCH v3 4/5] dt: lm3532: Add property for full scale current Dan Murphy
2019-08-20 19:53 ` [PATCH v3 5/5] leds: lm3532: Add full scale current configuration Dan Murphy
2019-08-25 10:50 ` [PATCH v3 1/5] leds: lm3532: Fix brightness control for i2c mode Jacek Anaszewski
2019-08-26 21:58 ` Tony Lindgren
2019-08-26 22:14 ` Pavel Machek
2019-08-26 22:44 ` Tony Lindgren
2019-08-27 12:03 ` Dan Murphy
2019-08-27 12:18 ` Pavel Machek
2019-08-27 12:44 ` Dan Murphy
2019-08-27 13:01 ` Dan Murphy
2019-08-27 16:04 ` Tony Lindgren
2019-08-27 16:19 ` Dan Murphy
2019-08-27 16:45 ` Tony Lindgren
2019-08-27 21:14 ` Jacek Anaszewski
2019-08-28 15:28 ` Dan Murphy
2019-08-28 20:37 ` Jacek Anaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190820195307.27590-3-dmurphy@ti.com \
--to=dmurphy@ti.com \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=merlijn@wizzup.org \
--cc=mpartap@gmx.net \
--cc=nekit1000@gmail.com \
--cc=pavel@ucw.cz \
--cc=sre@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox