diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-01-31 09:13:16 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-01-31 09:13:20 +0300 |
| commit | abce5ba7169dbf9a66fe24acd93dd136da92fe00 (patch) | |
| tree | 8e126ded4d32aae8688c02e908b2f6d4c75de626 /drivers/leds | |
| parent | 2383899f793d3c409c974dcb517579834c4a3674 (diff) | |
| parent | 9c43548a7fb8220b13b0ff980989b44f37d54138 (diff) | |
| download | linux-abce5ba7169dbf9a66fe24acd93dd136da92fe00.tar.xz | |
Merge tag 'v5.15.18' into dev-5.15
This is the 5.15.18 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-lp55xx-common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c index d1657c46ee2f..9fdfc1b9a1a0 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -439,6 +439,8 @@ int lp55xx_init_device(struct lp55xx_chip *chip) return -EINVAL; if (pdata->enable_gpiod) { + gpiod_direction_output(pdata->enable_gpiod, 0); + gpiod_set_consumer_name(pdata->enable_gpiod, "LP55xx enable"); gpiod_set_value(pdata->enable_gpiod, 0); usleep_range(1000, 2000); /* Keep enable down at least 1ms */ @@ -694,7 +696,7 @@ struct lp55xx_platform_data *lp55xx_of_populate_pdata(struct device *dev, of_property_read_u8(np, "clock-mode", &pdata->clock_mode); pdata->enable_gpiod = devm_gpiod_get_optional(dev, "enable", - GPIOD_OUT_LOW); + GPIOD_ASIS); if (IS_ERR(pdata->enable_gpiod)) return ERR_CAST(pdata->enable_gpiod); |