[PATCH v3] ARM: OMAP1: Prepare for conversion of OMAP1 clocks to CCF

Janusz Krzysztofik jmkrzyszt at gmail.com
Sat Apr 9 05:05:17 PDT 2022


On Tuesday, 5 April 2022 11:39:05 CEST Arnd Bergmann wrote:
> On Sat, Apr 2, 2022 at 9:51 PM Janusz Krzysztofik <jmkrzyszt at gmail.com> wrote:
> >
> > In preparation for conversion of OMAP1 clocks to common clock framework,
> > identify arch/arm/mach-omap1 local users of those clocks and update them
> > to call clk_prepare_enable/clk_disable_unprepare() instead of just
> > clk_enable/disable(), as required by CCF implementation of clock API.
> >
> > Users which reside under /drivers will be updated via separate patches,
> > split out from v2 and already submitted.
> >
> > Signed-off-by: Janusz Krzysztofik <jmkrzyszt at gmail.com>
> > ---
> >  arch/arm/mach-omap1/mcbsp.c    | 8 ++++----
> >  arch/arm/mach-omap1/ocpi.c     | 4 ++--
> >  arch/arm/mach-omap1/serial.c   | 6 +++---
> >  arch/arm/mach-omap1/timer32k.c | 2 +-
> >  4 files changed, 10 insertions(+), 10 deletions(-)
> 
> This all looks good to me. I have now rebased my omap1 multiplatform series
> on the latest kernel and integrated some of your new work, see [1].
> 
> I have also finished up the multiplatform conversion for all other ARMv4T
> and ARMv5 platforms and sent them out, hopefully we are getting into the
> endgame with this.
> 
> Are you able to test your CCF patches in combination with my series?
> It would be great if we could get this all working in time for 5.19.
> 
>          Arnd
> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/log/?h=omap1-multiplatform-5.18

Your branch with my CCF patches on top of it works for me on my OMAP1510 
based Amstrad Delta with the below fix:

diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c
index 8cafe7819e13..292fcb0a24fc 100644
--- a/drivers/video/fbdev/omap/omapfb_main.c
+++ b/drivers/video/fbdev/omap/omapfb_main.c
@@ -1623,7 +1623,7 @@ static int omapfb_do_probe(struct platform_device *pdev,
 
 	init_state = 0;
 
-	if (pdev->num_resources != 1) {
+	if (pdev->num_resources != 2) {
 		dev_err(&pdev->dev, "probed for an unknown device\n");
 		r = -ENODEV;
 		goto cleanup;

Amstrad Delta uses internal LCD controller, then the second IRQ (for sossi) 
is not needed, but your patch "fbdev: omap: pass irqs as resource" adds 
both to the array of omapfb resources and sets pdev->num_resources = 2.

Thanks,
Janusz





More information about the linux-arm-kernel mailing list