diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2020-04-02 18:31:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 10:47:21 -0700 |
| commit | e6d05acd57013114977ec77a131fe79d2f542774 (patch) | |
| tree | a05b072ab49151e0a105c814bd9f4489db980bfc | |
| parent | bef7b2a7be28638770972ab2709adf11d601c11a (diff) | |
| download | linux-e6d05acd57013114977ec77a131fe79d2f542774.tar.gz linux-e6d05acd57013114977ec77a131fe79d2f542774.tar.bz2 linux-e6d05acd57013114977ec77a131fe79d2f542774.zip | |
remoteproc/omap: Fix set_load call in omap_rproc_request_timer
When building arm allyesconfig:
drivers/remoteproc/omap_remoteproc.c:174:44: error: too many arguments
to function call, expected 2, have 3
timer->timer_ops->set_load(timer->odt, 0, 0);
~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
1 error generated.
This is due to commit 02e6d546e3bd ("clocksource/drivers/timer-ti-dm:
Enable autoreload in set_pwm") in the clockevents tree interacting with
commit e28edc571925 ("remoteproc/omap: Request a timer(s) for remoteproc
usage") from the rpmsg tree.
This should have been fixed during the merge of the remoteproc tree
since it happened after the clockevents tree merge; however, it does not
look like my email was noticed by either maintainer and I did not pay
attention when the pull was sent since I was on CC.
Fixes: c6570114316f ("Merge tag 'rproc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc")
Link: https://lore.kernel.org/lkml/20200327185055.GA22438@ubuntu-m2-xlarge-x86/
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Acked-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/remoteproc/omap_remoteproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index cdb546f7232e..6955fab0a78b 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -171,7 +171,7 @@ static int omap_rproc_request_timer(struct device *dev, struct device_node *np, } /* clean counter, remoteproc code will set the value */ - timer->timer_ops->set_load(timer->odt, 0, 0); + timer->timer_ops->set_load(timer->odt, 0); return 0; } |