Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 07:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

leds: lgm-sso: Fix clock handling

Browse Source 
The clock handling has a few issues:
 - when getting second clock fails, the first one left prepared and enabled
 - on ->remove() clocks are unprepared and disabled twice

Fix all these by converting to use bulk clock operations since both clocks
are mandatory.

Fixes: c3987cd2bc ("leds: lgm: Add LED controller driver for LGM SoC")
Cc: Amireddy Mallikarjuna reddy <mallikarjunax.reddy@linux.intel.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
This commit is contained in:
Andy Shevchenko 2021-05-10 12:50:24 +03:00 committed by Pavel Machek
parent a43a4e588e
commit fba8a6f226
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/leds/blink/leds-lgm-sso.c
View File

@ -132,8 +132,7 @@ struct sso_led_priv {
struct regmap *mmap;
struct device *dev;
struct platform_device *pdev;
struct clk *gclk;
struct clk *fpid_clk;
struct clk_bulk_data clocks[2];
u32 fpid_clkrate;
u32 gptc_clkrate;
u32 freq[MAX_FREQ_RANK];
@ -763,12 +762,11 @@ static int sso_probe_gpios(struct sso_led_priv *priv)
return sso_gpio_gc_init(dev, priv);
}
static void sso_clk_disable(void *data)
static void sso_clock_disable_unprepare(void *data)
{
struct sso_led_priv *priv = data;
clk_disable_unprepare(priv->fpid_clk);
clk_disable_unprepare(priv->gclk);
clk_bulk_disable_unprepare(ARRAY_SIZE(priv->clocks), priv->clocks);
}
static int intel_sso_led_probe(struct platform_device *pdev)
@ -785,36 +783,30 @@ static int intel_sso_led_probe(struct platform_device *pdev)
priv->dev = dev;
/* gate clock */
priv->gclk = devm_clk_get(dev, "sso");
if (IS_ERR(priv->gclk)) {
dev_err(dev, "get sso gate clock failed!\n");
return PTR_ERR(priv->gclk);
}
priv->clocks[0].id = "sso";
ret = clk_prepare_enable(priv->gclk);
/* fpid clock */
priv->clocks[1].id = "fpid";
ret = devm_clk_bulk_get(dev, ARRAY_SIZE(priv->clocks), priv->clocks);
if (ret) {
dev_err(dev, "Failed to prepare/enable sso gate clock!\n");
dev_err(dev, "Getting clocks failed!\n");
return ret;
}
priv->fpid_clk = devm_clk_get(dev, "fpid");
if (IS_ERR(priv->fpid_clk)) {
dev_err(dev, "Failed to get fpid clock!\n");
return PTR_ERR(priv->fpid_clk);
}
ret = clk_prepare_enable(priv->fpid_clk);
ret = clk_bulk_prepare_enable(ARRAY_SIZE(priv->clocks), priv->clocks);
if (ret) {
dev_err(dev, "Failed to prepare/enable fpid clock!\n");
dev_err(dev, "Failed to prepare and enable clocks!\n");
return ret;
}
priv->fpid_clkrate = clk_get_rate(priv->fpid_clk);
ret = devm_add_action_or_reset(dev, sso_clk_disable, priv);
if (ret) {
dev_err(dev, "Failed to devm_add_action_or_reset, %d\n", ret);
ret = devm_add_action_or_reset(dev, sso_clock_disable_unprepare, priv);
if (ret)
return ret;
}
priv->fpid_clkrate = clk_get_rate(priv->clocks[1].clk);
priv->mmap = syscon_node_to_regmap(dev->of_node);
priv->mmap = syscon_node_to_regmap(dev->of_node);
if (IS_ERR(priv->mmap)) {
@ -859,8 +851,6 @@ static int intel_sso_led_remove(struct platform_device *pdev)
sso_led_shutdown(led);
}
clk_disable_unprepare(priv->fpid_clk);
clk_disable_unprepare(priv->gclk);
regmap_exit(priv->mmap);
return 0;