Build failure in omap_remoteproc due to 02e6d546e3bd
Subsystems (2)
Hi all,
Apologies if this has already been reported, I did not see anything in the archives. On next-20200327, I see the following build error:
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.
Something like the diff below should resolve it but it cannot be applied to the rpmsg tree because it does not have the clockevents change. It will have to be applied by Linus as a merge fixup.
Stephen, would you mind applying this to whichever merge happens second?
Cheers,
Nathan
drivers/remoteproc/omap_remoteproc.c +1 -1
@@ -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 ; }
Hi Nathan,
Quoted 29 lines · On Fri, 27 Mar 2020 11:50:55 -0700 Nathan Chancellor…
Apologies if this has already been reported, I did not see anything in the archives. On next-20200327, I see the following build error:
drivers/remoteproc/omap_remoteproc.c:174:44: error: too many arguments to function call, expected 2, have 3timer->timer_ops->set_load(timer->odt, 0, 0); ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^1 error generated.
This is due to commit
02e6d546e3bd("clocksource/drivers/timer-ti-dm:
Enable autoreload inset_pwm") in the clockevents tree interacting with commite28edc571925("remoteproc/omap: Request a timer(s) for remoteproc usage") from the rpmsg tree.Something like the diff below should resolve it but it cannot be applied to the rpmsg tree because it does not have the clockevents change. It will have to be applied by Linus as a merge fixup.
Stephen, would you mind applying this to whichever merge happens second?
Cheers,
Nathandrivers/remoteproc/omap_remoteproc.c +0
-0
drivers/remoteproc/omap_remoteproc.c static int omap_rproc_request_timer(struct device *dev, struct device_node *np, · line 177
Quoted 8 lines
drivers/remoteproc/omap_remoteproc.c +1
-1@@ -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 ; }
Thanks, I will use that as a merge fix up from today.
Signature · 2 lines
Cheers, Stephen Rothwell
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).
Hello:
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).
Quoted 5 lines · On Fri, 27 Mar 2020 11:50:55 -0700 you wrote:
Hi all,
Apologies if this has already been reported, I did not see anything in the archives. On next-20200327, I see the following build error:
Quoted 7 lines
drivers/remoteproc/omap_remoteproc.c:174:44: error: too many arguments to function call, expected 2, have 3timer->timer_ops->set_load(timer->odt, 0, 0); ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^1 error generated.
[...]
Here is a summary with links:
- Build failure in omap_remoteproc due to 02e6d546e3bd
https://git.kernel.org/andersson/remoteproc/c/e6d05acd57013114977ec77a131fe79d2f542774
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot