Commit ec961cf3 authored by Marijn Suijten's avatar Marijn Suijten Committed by Lee Jones

backlight: qcom-wled: Respect enabled-strings in set_brightness

The hardware is capable of controlling any non-contiguous sequence of
LEDs specified in the DT using qcom,enabled-strings as u32
array, and this also follows from the DT-bindings documentation.  The
numbers specified in this array represent indices of the LED strings
that are to be enabled and disabled.

Its value is appropriately used to setup and enable string modules, but
completely disregarded in the set_brightness paths which only iterate
over the number of strings linearly.
Take an example where only string 2 is enabled with
qcom,enabled_strings=<2>: this string is appropriately enabled but
subsequent brightness changes would have only touched the zero'th
brightness register because num_strings is 1 here.  This is simply
addressed by looking up the string for this index in the enabled_strings
array just like the other codepaths that iterate over num_strings.

Likewise enabled_strings is now also used in the autodetection path for
consistent behaviour: when a list of strings is specified in DT only
those strings will be probed for autodetection, analogous to how the
number of strings that need to be probed is already bound by
qcom,num-strings.  After all autodetection uses the set_brightness
helpers to set an initial value, which could otherwise end up changing
brightness on a different set of strings.

Fixes: 775d2ffb ("backlight: qcom-wled: Restructure the driver for WLED3")
Fixes: 03b2b5e8 ("backlight: qcom-wled: Add support for WLED4 peripheral")
Signed-off-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211115203459.1634079-10-marijn.suijten@somainline.org
parent b7002cd5
...@@ -237,7 +237,7 @@ static int wled3_set_brightness(struct wled *wled, u16 brightness) ...@@ -237,7 +237,7 @@ static int wled3_set_brightness(struct wled *wled, u16 brightness)
for (i = 0; i < wled->cfg.num_strings; ++i) { for (i = 0; i < wled->cfg.num_strings; ++i) {
rc = regmap_bulk_write(wled->regmap, wled->ctrl_addr + rc = regmap_bulk_write(wled->regmap, wled->ctrl_addr +
WLED3_SINK_REG_BRIGHT(i), WLED3_SINK_REG_BRIGHT(wled->cfg.enabled_strings[i]),
&v, sizeof(v)); &v, sizeof(v));
if (rc < 0) if (rc < 0)
return rc; return rc;
...@@ -260,7 +260,7 @@ static int wled4_set_brightness(struct wled *wled, u16 brightness) ...@@ -260,7 +260,7 @@ static int wled4_set_brightness(struct wled *wled, u16 brightness)
for (i = 0; i < wled->cfg.num_strings; ++i) { for (i = 0; i < wled->cfg.num_strings; ++i) {
rc = regmap_bulk_write(wled->regmap, wled->sink_addr + rc = regmap_bulk_write(wled->regmap, wled->sink_addr +
WLED4_SINK_REG_BRIGHT(i), WLED4_SINK_REG_BRIGHT(wled->cfg.enabled_strings[i]),
&v, sizeof(v)); &v, sizeof(v));
if (rc < 0) if (rc < 0)
return rc; return rc;
...@@ -571,7 +571,7 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled) ...@@ -571,7 +571,7 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled)
static void wled_auto_string_detection(struct wled *wled) static void wled_auto_string_detection(struct wled *wled)
{ {
int rc = 0, i, delay_time_us; int rc = 0, i, j, delay_time_us;
u32 sink_config = 0; u32 sink_config = 0;
u8 sink_test = 0, sink_valid = 0, val; u8 sink_test = 0, sink_valid = 0, val;
bool fault_set; bool fault_set;
...@@ -618,14 +618,15 @@ static void wled_auto_string_detection(struct wled *wled) ...@@ -618,14 +618,15 @@ static void wled_auto_string_detection(struct wled *wled)
/* Iterate through the strings one by one */ /* Iterate through the strings one by one */
for (i = 0; i < wled->cfg.num_strings; i++) { for (i = 0; i < wled->cfg.num_strings; i++) {
sink_test = BIT((WLED4_SINK_REG_CURR_SINK_SHFT + i)); j = wled->cfg.enabled_strings[i];
sink_test = BIT((WLED4_SINK_REG_CURR_SINK_SHFT + j));
/* Enable feedback control */ /* Enable feedback control */
rc = regmap_write(wled->regmap, wled->ctrl_addr + rc = regmap_write(wled->regmap, wled->ctrl_addr +
WLED3_CTRL_REG_FEEDBACK_CONTROL, i + 1); WLED3_CTRL_REG_FEEDBACK_CONTROL, j + 1);
if (rc < 0) { if (rc < 0) {
dev_err(wled->dev, "Failed to enable feedback for SINK %d rc = %d\n", dev_err(wled->dev, "Failed to enable feedback for SINK %d rc = %d\n",
i + 1, rc); j + 1, rc);
goto failed_detect; goto failed_detect;
} }
...@@ -634,7 +635,7 @@ static void wled_auto_string_detection(struct wled *wled) ...@@ -634,7 +635,7 @@ static void wled_auto_string_detection(struct wled *wled)
WLED4_SINK_REG_CURR_SINK, sink_test); WLED4_SINK_REG_CURR_SINK, sink_test);
if (rc < 0) { if (rc < 0) {
dev_err(wled->dev, "Failed to configure SINK %d rc=%d\n", dev_err(wled->dev, "Failed to configure SINK %d rc=%d\n",
i + 1, rc); j + 1, rc);
goto failed_detect; goto failed_detect;
} }
...@@ -661,7 +662,7 @@ static void wled_auto_string_detection(struct wled *wled) ...@@ -661,7 +662,7 @@ static void wled_auto_string_detection(struct wled *wled)
if (fault_set) if (fault_set)
dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n", dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n",
i + 1); j + 1);
else else
sink_valid |= sink_test; sink_valid |= sink_test;
...@@ -701,15 +702,16 @@ static void wled_auto_string_detection(struct wled *wled) ...@@ -701,15 +702,16 @@ static void wled_auto_string_detection(struct wled *wled)
/* Enable valid sinks */ /* Enable valid sinks */
if (wled->version == 4) { if (wled->version == 4) {
for (i = 0; i < wled->cfg.num_strings; i++) { for (i = 0; i < wled->cfg.num_strings; i++) {
j = wled->cfg.enabled_strings[i];
if (sink_config & if (sink_config &
BIT(WLED4_SINK_REG_CURR_SINK_SHFT + i)) BIT(WLED4_SINK_REG_CURR_SINK_SHFT + j))
val = WLED4_SINK_REG_STR_MOD_MASK; val = WLED4_SINK_REG_STR_MOD_MASK;
else else
/* Disable modulator_en for unused sink */ /* Disable modulator_en for unused sink */
val = 0; val = 0;
rc = regmap_write(wled->regmap, wled->sink_addr + rc = regmap_write(wled->regmap, wled->sink_addr +
WLED4_SINK_REG_STR_MOD_EN(i), val); WLED4_SINK_REG_STR_MOD_EN(j), val);
if (rc < 0) { if (rc < 0) {
dev_err(wled->dev, "Failed to configure MODULATOR_EN rc=%d\n", dev_err(wled->dev, "Failed to configure MODULATOR_EN rc=%d\n",
rc); rc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment