Skip to content

Commit

Permalink
Merge tag 'counter-fixes-for-6.10' of ssh://gitolite.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/linux/kernel/git/wbg/counter into char-misc-linus

William writes:

Counter fixes for 6.10

A fix to enable the TI eQEP clock explicitly in the probe callback
rather than hope it's already enabled by something else on the system by
the time we need it.

* tag 'counter-fixes-for-6.10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
  counter: ti-eqep: enable clock at probe
  • Loading branch information
Greg Kroah-Hartman committed Jun 24, 2024
2 parents 8fe050e + 0cf81c7 commit 06ebbce
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/counter/ti-eqep.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

#include <linux/bitops.h>
#include <linux/clk.h>
#include <linux/counter.h>
#include <linux/kernel.h>
#include <linux/mod_devicetable.h>
Expand Down Expand Up @@ -376,6 +377,7 @@ static int ti_eqep_probe(struct platform_device *pdev)
struct counter_device *counter;
struct ti_eqep_cnt *priv;
void __iomem *base;
struct clk *clk;
int err;

counter = devm_counter_alloc(dev, sizeof(*priv));
Expand Down Expand Up @@ -415,6 +417,10 @@ static int ti_eqep_probe(struct platform_device *pdev)
pm_runtime_enable(dev);
pm_runtime_get_sync(dev);

clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(clk))
return dev_err_probe(dev, PTR_ERR(clk), "failed to enable clock\n");

err = counter_add(counter);
if (err < 0) {
pm_runtime_put_sync(dev);
Expand Down

0 comments on commit 06ebbce

Please sign in to comment.