From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: "Pavel Machek" <pavel@ucw.cz>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Amireddy Mallikarjuna reddy"
<mallikarjunax.reddy@linux.intel.com>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Marek Behún" <marek.behun@nic.cz>,
"Abanoub Sameh" <abanoubsameh8@gmail.com>,
"Dan Murphy" <dmurphy@ti.com>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: [PATCH v1 07/28] leds: lgm-sso: Fix clock handling
Date: Mon, 10 May 2021 12:50:24 +0300 [thread overview]
Message-ID: <20210510095045.3299382-8-andy.shevchenko@gmail.com> (raw)
In-Reply-To: <20210510095045.3299382-1-andy.shevchenko@gmail.com>
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: c3987cd2bca3 ("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>
---
drivers/leds/blink/leds-lgm-sso.c | 44 ++++++++++++-------------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/drivers/leds/blink/leds-lgm-sso.c b/drivers/leds/blink/leds-lgm-sso.c
index 484f6831e6e7..6a6d75f07af0 100644
--- a/drivers/leds/blink/leds-lgm-sso.c
+++ b/drivers/leds/blink/leds-lgm-sso.c
@@ -133,8 +133,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];
@@ -766,12 +765,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)
@@ -788,36 +786,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";
+
+ /* fpid clock */
+ priv->clocks[1].id = "fpid";
- ret = clk_prepare_enable(priv->gclk);
+ 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)) {
@@ -862,8 +854,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;
--
2.31.1
next prev parent reply other threads:[~2021-05-10 9:51 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 9:50 [PATCH v1 00/28] leds: cleanups and fwnode refcounting bug fixes Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 01/28] leds: class: The -ENOTSUPP should never be seen by user space Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 02/28] leds: core: " Andy Shevchenko
2021-05-28 10:03 ` Pavel Machek
2021-05-28 10:43 ` Andy Shevchenko
2021-05-29 9:42 ` Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 03/28] leds: el15203000: Give better margin for usleep_range() Andy Shevchenko
2021-05-28 10:04 ` Pavel Machek
2021-05-28 10:45 ` Andy Shevchenko
2021-05-29 9:41 ` Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 04/28] leds: el15203000: Make error handling more robust Andy Shevchenko
2021-05-28 20:59 ` Oleh Kravchenko
2021-05-10 9:50 ` [PATCH v1 05/28] leds: el15203000: Correct headers (of*.h -> mod_devicetable.h) Andy Shevchenko
2021-05-28 21:00 ` Oleh Kravchenko
2021-05-29 9:45 ` Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 06/28] leds: el15203000: Introduce to_el15203000_led() helper Andy Shevchenko
2021-05-28 21:01 ` Oleh Kravchenko
2021-05-10 9:50 ` Andy Shevchenko [this message]
2021-05-10 9:50 ` [PATCH v1 08/28] leds: lgm-sso: Put fwnode in any case during ->probe() Andy Shevchenko
2021-05-28 10:08 ` Pavel Machek
2021-05-28 10:46 ` Andy Shevchenko
2021-05-29 9:28 ` Andy Shevchenko
2021-05-29 10:46 ` Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 09/28] leds: lgm-sso: Don't spam logs when probe is deferred Andy Shevchenko
2021-05-28 10:11 ` Pavel Machek
2021-05-28 10:47 ` Andy Shevchenko
2021-05-29 9:54 ` Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 10/28] leds: lgm-sso: Remove unneeded of_match_ptr() Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 11/28] leds: lgm-sso: Remove explicit managed resource cleanups Andy Shevchenko
2021-05-28 10:09 ` Pavel Machek
2021-05-28 10:49 ` Andy Shevchenko
2021-05-29 9:46 ` Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 12/28] leds: lgm-sso: Drop duplicate NULL check for GPIO operations Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 13/28] leds: lgm-sso: Convert to use list_for_each_entry*() API Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 14/28] leds: lm3532: select regmap I2C API Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 15/28] leds: lm3532: Make error handling more robust Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 16/28] leds: lm36274: Put fwnode in error case during ->probe() Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 17/28] leds: lm36274: Correct headers (of*.h -> mod_devicetable.h) Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 18/28] leds: lm3692x: Put fwnode in any case during ->probe() Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 19/28] leds: lm3692x: Correct headers (of*.h -> mod_devicetable.h) Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 20/28] leds: lm3697: Update header block to reflect reality Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 21/28] leds: lm3697: Make error handling more robust Andy Shevchenko
2021-05-28 10:10 ` Pavel Machek
2021-05-28 10:50 ` Andy Shevchenko
2021-05-29 9:50 ` Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 22/28] leds: lm3697: Don't spam logs when probe is deferred Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 23/28] leds: lp50xx: Put fwnode in error case during ->probe() Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 24/28] leds: lt3593: Put fwnode in any " Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 25/28] leds: lt3593: Make use of device properties Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 26/28] leds: pwm: Make error handling more robust Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 27/28] leds: rt8515: Put fwnode in any case during ->probe() Andy Shevchenko
2021-05-10 9:50 ` [PATCH v1 28/28] leds: sgm3140: " Andy Shevchenko
2021-05-28 10:14 ` Pavel Machek
2021-05-28 10:59 ` Andy Shevchenko
2021-05-29 9:58 ` Andy Shevchenko
2021-05-17 7:30 ` [PATCH v1 00/28] leds: cleanups and fwnode refcounting bug fixes Andy Shevchenko
2021-05-24 14:56 ` Andy Shevchenko
2021-05-24 17:49 ` Pavel Machek
2021-05-24 18:39 ` Andy Shevchenko
2021-05-28 10:02 ` Pavel Machek
2021-05-28 11:05 ` Andy Shevchenko
2021-05-28 20:34 ` Pavel Machek
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=20210510095045.3299382-8-andy.shevchenko@gmail.com \
--to=andy.shevchenko@gmail.com \
--cc=abanoubsameh8@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dmurphy@ti.com \
--cc=krzk@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=mallikarjunax.reddy@linux.intel.com \
--cc=marek.behun@nic.cz \
--cc=pavel@ucw.cz \
/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;
as well as URLs for NNTP newsgroup(s).