| Message ID | 1457663298-31973-2-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Simon, Thank you for the patch. On Friday 11 March 2016 11:28:17 Simon Horman wrote: > Use ARCH_RENESAS in place of ARCH_SHMOBILE. > Also remove spurious (). > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to > ARCH_RENESAS the motivation for which being that RENESAS seems to be a more > appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/video/fbdev/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > index 8ea45a5cd806..71294f595f61 100644 > --- a/drivers/video/fbdev/Kconfig > +++ b/drivers/video/fbdev/Kconfig > @@ -1985,7 +1985,7 @@ config FB_W100 > > config FB_SH_MOBILE_LCDC > tristate "SuperH Mobile LCDC framebuffer support" > - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK > + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK > depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM > select FB_SYS_FILLRECT > select FB_SYS_COPYAREA > @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" > > config FB_SH_MOBILE_MERAM > tristate "SuperH Mobile MERAM read ahead support" > - depends on (SUPERH || ARCH_SHMOBILE) > + depends on SUPERH || ARCH_RENESAS The MERAM driver isn't used by any ARM platform, you can just drop ARCH_SHMOBILE completely. > select GENERIC_ALLOCATOR > ---help--- > Enable MERAM support for the SuperH controller.
Hi Simon, On Friday 11 March 2016 09:14:46 Laurent Pinchart wrote: > On Friday 11 March 2016 11:28:17 Simon Horman wrote: > > Use ARCH_RENESAS in place of ARCH_SHMOBILE. > > Also remove spurious (). > > > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to > > ARCH_RENESAS the motivation for which being that RENESAS seems to be a > > more appropriate name than SHMOBILE for the majority of Renesas ARM based > > SoCs. > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > > > drivers/video/fbdev/Kconfig | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > > index 8ea45a5cd806..71294f595f61 100644 > > --- a/drivers/video/fbdev/Kconfig > > +++ b/drivers/video/fbdev/Kconfig > > @@ -1985,7 +1985,7 @@ config FB_W100 > > > > config FB_SH_MOBILE_LCDC > > tristate "SuperH Mobile LCDC framebuffer support" > > - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK > > + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK > > depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM > > select FB_SYS_FILLRECT > > select FB_SYS_COPYAREA > > @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" > > > > config FB_SH_MOBILE_MERAM > > tristate "SuperH Mobile MERAM read ahead support" > > - depends on (SUPERH || ARCH_SHMOBILE) > > + depends on SUPERH || ARCH_RENESAS > > The MERAM driver isn't used by any ARM platform, you can just drop > ARCH_SHMOBILE completely. Actually, upon closer inspection, the MERAM driver isn't used by any platform. > > select GENERIC_ALLOCATOR > > ---help--- > > Enable MERAM support for the SuperH controller.
Hi Simon, On Fri, Mar 11, 2016 at 3:28 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > Use ARCH_RENESAS in place of ARCH_SHMOBILE. > Also remove spurious (). > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to > ARCH_RENESAS the motivation for which being that RENESAS seems to be a more > appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs. > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > drivers/video/fbdev/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > index 8ea45a5cd806..71294f595f61 100644 > --- a/drivers/video/fbdev/Kconfig > +++ b/drivers/video/fbdev/Kconfig > @@ -1985,7 +1985,7 @@ config FB_W100 > > config FB_SH_MOBILE_LCDC > tristate "SuperH Mobile LCDC framebuffer support" > - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK > + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK I would replace SUPERH by ARCH_RENESAS, and thus keep ARCH_SHMOBILE. "sh_mobile_lcdc_fb" is used on SH_AP325RXA, SH_ECOVEC, SH_KFR2R09, SH_MIGOR, and SH_7724_SOLUTION_ENGINE, which depend on either CPU_SUBTYPE_SH7722, CPU_SUBTYPE_SH7723, or CPU_SUBTYPE_SH7724, and all three select ARCH_SHMOBILE. In addition, it's used on r8a7740/armadillo800eva, which is covered by ARCH_RENESAS. > depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM > select FB_SYS_FILLRECT > select FB_SYS_COPYAREA > @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" > > config FB_SH_MOBILE_MERAM > tristate "SuperH Mobile MERAM read ahead support" > - depends on (SUPERH || ARCH_SHMOBILE) > + depends on SUPERH || ARCH_RENESAS > select GENERIC_ALLOCATOR > ---help--- > Enable MERAM support for the SuperH controller. As Laurent already pointed out, that one is currently unused. It could be used on sh73a0, r8a7740, and some SuperH SH-Mobile SoCs, though. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Fri, Mar 11, 2016 at 08:55:36AM +0100, Geert Uytterhoeven wrote: > Hi Simon, > > On Fri, Mar 11, 2016 at 3:28 AM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Use ARCH_RENESAS in place of ARCH_SHMOBILE. > > Also remove spurious (). > > > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to > > ARCH_RENESAS the motivation for which being that RENESAS seems to be a more > > appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs. > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > drivers/video/fbdev/Kconfig | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > > index 8ea45a5cd806..71294f595f61 100644 > > --- a/drivers/video/fbdev/Kconfig > > +++ b/drivers/video/fbdev/Kconfig > > @@ -1985,7 +1985,7 @@ config FB_W100 > > > > config FB_SH_MOBILE_LCDC > > tristate "SuperH Mobile LCDC framebuffer support" > > - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK > > + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK > > I would replace SUPERH by ARCH_RENESAS, and thus keep ARCH_SHMOBILE. > > "sh_mobile_lcdc_fb" is used on SH_AP325RXA, SH_ECOVEC, SH_KFR2R09, SH_MIGOR, > and SH_7724_SOLUTION_ENGINE, which depend on either CPU_SUBTYPE_SH7722, > CPU_SUBTYPE_SH7723, or CPU_SUBTYPE_SH7724, and all three select ARCH_SHMOBILE. > > In addition, it's used on r8a7740/armadillo800eva, which is covered by > ARCH_RENESAS. > > > depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM > > select FB_SYS_FILLRECT > > select FB_SYS_COPYAREA > > @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" > > > > config FB_SH_MOBILE_MERAM > > tristate "SuperH Mobile MERAM read ahead support" > > - depends on (SUPERH || ARCH_SHMOBILE) > > + depends on SUPERH || ARCH_RENESAS > > select GENERIC_ALLOCATOR > > ---help--- > > Enable MERAM support for the SuperH controller. > > As Laurent already pointed out, that one is currently unused. > > It could be used on sh73a0, r8a7740, and some SuperH SH-Mobile SoCs, though. I'm inclined to remove the driver if its unused (I assume that has been the case for quite some time).
On Fri, Mar 11, 2016 at 09:22:08AM +0200, Laurent Pinchart wrote: > Hi Simon, > > On Friday 11 March 2016 09:14:46 Laurent Pinchart wrote: > > On Friday 11 March 2016 11:28:17 Simon Horman wrote: > > > Use ARCH_RENESAS in place of ARCH_SHMOBILE. > > > Also remove spurious (). > > > > > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to > > > ARCH_RENESAS the motivation for which being that RENESAS seems to be a > > > more appropriate name than SHMOBILE for the majority of Renesas ARM based > > > SoCs. > > > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > --- > > > > > > drivers/video/fbdev/Kconfig | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > > > index 8ea45a5cd806..71294f595f61 100644 > > > --- a/drivers/video/fbdev/Kconfig > > > +++ b/drivers/video/fbdev/Kconfig > > > @@ -1985,7 +1985,7 @@ config FB_W100 > > > > > > config FB_SH_MOBILE_LCDC > > > tristate "SuperH Mobile LCDC framebuffer support" > > > - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK > > > + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK > > > depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM > > > select FB_SYS_FILLRECT > > > select FB_SYS_COPYAREA > > > @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" > > > > > > config FB_SH_MOBILE_MERAM > > > tristate "SuperH Mobile MERAM read ahead support" > > > - depends on (SUPERH || ARCH_SHMOBILE) > > > + depends on SUPERH || ARCH_RENESAS > > > > The MERAM driver isn't used by any ARM platform, you can just drop > > ARCH_SHMOBILE completely. > > Actually, upon closer inspection, the MERAM driver isn't used by any platform. If its not used then I think we should consider removing it. However, it seems to me that its used in the following: drivers/gpu/drm/shmobile/shmob_drm_crtc.c drivers/gpu/drm/shmobile/shmob_drm_kms.c drivers/gpu/drm/shmobile/shmob_drm_plane.c drivers/video/fbdev/sh_mobile_lcdcfb.c It seems to me that we would need to either remove usage in the above files or remove the above files before removing the MERAM driver.
Hi Simon, On Tuesday 15 March 2016 10:25:30 Simon Horman wrote: > On Fri, Mar 11, 2016 at 09:22:08AM +0200, Laurent Pinchart wrote: > > On Friday 11 March 2016 09:14:46 Laurent Pinchart wrote: > > > On Friday 11 March 2016 11:28:17 Simon Horman wrote: > > > > Use ARCH_RENESAS in place of ARCH_SHMOBILE. > > > > Also remove spurious (). > > > > > > > > This is part of an ongoing process to migrate from ARCH_SHMOBILE to > > > > ARCH_RENESAS the motivation for which being that RENESAS seems to be a > > > > more appropriate name than SHMOBILE for the majority of Renesas ARM > > > > based SoCs. > > > > > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > > --- > > > > > > > > drivers/video/fbdev/Kconfig | 4 ++-- > > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig > > > > index 8ea45a5cd806..71294f595f61 100644 > > > > --- a/drivers/video/fbdev/Kconfig > > > > +++ b/drivers/video/fbdev/Kconfig > > > > @@ -1985,7 +1985,7 @@ config FB_W100 > > > > > > > > config FB_SH_MOBILE_LCDC > > > > > > > > tristate "SuperH Mobile LCDC framebuffer support" > > > > > > > > - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK > > > > + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK > > > > > > > > depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM > > > > select FB_SYS_FILLRECT > > > > select FB_SYS_COPYAREA > > > > > > > > @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" > > > > > > > > config FB_SH_MOBILE_MERAM > > > > > > > > tristate "SuperH Mobile MERAM read ahead support" > > > > > > > > - depends on (SUPERH || ARCH_SHMOBILE) > > > > + depends on SUPERH || ARCH_RENESAS > > > > > > The MERAM driver isn't used by any ARM platform, you can just drop > > > ARCH_SHMOBILE completely. > > > > Actually, upon closer inspection, the MERAM driver isn't used by any > > platform. > > If its not used then I think we should consider removing it. > > However, it seems to me that its used in the following: > > drivers/gpu/drm/shmobile/shmob_drm_crtc.c > drivers/gpu/drm/shmobile/shmob_drm_kms.c > drivers/gpu/drm/shmobile/shmob_drm_plane.c > drivers/video/fbdev/sh_mobile_lcdcfb.c > > It seems to me that we would need to either remove usage in the above > files or remove the above files before removing the MERAM driver. That's correct, those drivers need to be fixed or removed.
Hi Simon, On Mon, Mar 14, 2016 at 9:13 AM, Simon Horman <horms@verge.net.au> wrote: > On Fri, Mar 11, 2016 at 08:55:36AM +0100, Geert Uytterhoeven wrote: >> Hi Simon, >> >> On Fri, Mar 11, 2016 at 3:28 AM, Simon Horman >> <horms+renesas@verge.net.au> wrote: >> > Use ARCH_RENESAS in place of ARCH_SHMOBILE. >> > Also remove spurious (). >> > >> > This is part of an ongoing process to migrate from ARCH_SHMOBILE to >> > ARCH_RENESAS the motivation for which being that RENESAS seems to be a more >> > appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs. >> > >> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> >> > --- >> > drivers/video/fbdev/Kconfig | 4 ++-- >> > 1 file changed, 2 insertions(+), 2 deletions(-) >> > >> > diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig >> > index 8ea45a5cd806..71294f595f61 100644 >> > --- a/drivers/video/fbdev/Kconfig >> > +++ b/drivers/video/fbdev/Kconfig >> > @@ -1985,7 +1985,7 @@ config FB_W100 >> > >> > config FB_SH_MOBILE_LCDC >> > tristate "SuperH Mobile LCDC framebuffer support" >> > - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK >> > + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK >> >> I would replace SUPERH by ARCH_RENESAS, and thus keep ARCH_SHMOBILE. >> >> "sh_mobile_lcdc_fb" is used on SH_AP325RXA, SH_ECOVEC, SH_KFR2R09, SH_MIGOR, >> and SH_7724_SOLUTION_ENGINE, which depend on either CPU_SUBTYPE_SH7722, >> CPU_SUBTYPE_SH7723, or CPU_SUBTYPE_SH7724, and all three select ARCH_SHMOBILE. >> >> In addition, it's used on r8a7740/armadillo800eva, which is covered by >> ARCH_RENESAS. >> >> > depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM >> > select FB_SYS_FILLRECT >> > select FB_SYS_COPYAREA >> > @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" >> > >> > config FB_SH_MOBILE_MERAM >> > tristate "SuperH Mobile MERAM read ahead support" >> > - depends on (SUPERH || ARCH_SHMOBILE) >> > + depends on SUPERH || ARCH_RENESAS >> > select GENERIC_ALLOCATOR >> > ---help--- >> > Enable MERAM support for the SuperH controller. >> >> As Laurent already pointed out, that one is currently unused. >> >> It could be used on sh73a0, r8a7740, and some SuperH SH-Mobile SoCs, though. > > I'm inclined to remove the driver if its unused (I assume that has > been the case for quite some time). Before removing perhaps it makes sense to ask the original author of the MERAM code about integration status? It may be as simple as revoking a couple of commits. / magnus
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 8ea45a5cd806..71294f595f61 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1985,7 +1985,7 @@ config FB_W100 config FB_SH_MOBILE_LCDC tristate "SuperH Mobile LCDC framebuffer support" - depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK + depends on FB && (SUPERH || ARCH_RENESAS) && HAVE_CLK depends on FB_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM select FB_SYS_FILLRECT select FB_SYS_COPYAREA @@ -2450,7 +2450,7 @@ source "drivers/video/fbdev/mmp/Kconfig" config FB_SH_MOBILE_MERAM tristate "SuperH Mobile MERAM read ahead support" - depends on (SUPERH || ARCH_SHMOBILE) + depends on SUPERH || ARCH_RENESAS select GENERIC_ALLOCATOR ---help--- Enable MERAM support for the SuperH controller.
Use ARCH_RENESAS in place of ARCH_SHMOBILE. Also remove spurious (). This is part of an ongoing process to migrate from ARCH_SHMOBILE to ARCH_RENESAS the motivation for which being that RENESAS seems to be a more appropriate name than SHMOBILE for the majority of Renesas ARM based SoCs. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- drivers/video/fbdev/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)