[01/13] video: sh_mobile_lcdcfb depends on meram

Message ID 1398274127-2106-1-git-send-email-peter.griffin@linaro.org
State New
Headers show

Commit Message

Peter Griffin April 23, 2014, 5:28 p.m.
From: Arnd Bergmann <arnd@arndb.de>

The sh_mobile_lcdcfb driver calls interfaces provided
by the corresponding "meram" helper. This fails if meram
is a module but lcdcfb is built-in.

To work around it, this uses special Kconfig magic to
only allow lcdcfb to be built if
a) both are modules,
b) meram is built-in, or
c) meram is disabled and the helpers stubbed out

Changing meram from 'y' to 'm' now forces clcd to
be a module as well, which seems to be the desired
behavior.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: linux-sh@vger.kernel.org
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
---
 drivers/video/fbdev/Kconfig |    1 +
 1 file changed, 1 insertion(+)

Comments

Arnd Bergmann April 23, 2014, 6:18 p.m. | #1
On Wednesday 23 April 2014 18:28:35 Peter Griffin wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The sh_mobile_lcdcfb driver calls interfaces provided
> by the corresponding "meram" helper. This fails if meram
> is a module but lcdcfb is built-in.
> 
> To work around it, this uses special Kconfig magic to
> only allow lcdcfb to be built if
> a) both are modules,
> b) meram is built-in, or
> c) meram is disabled and the helpers stubbed out
> 
> Changing meram from 'y' to 'm' now forces clcd to
> be a module as well, which seems to be the desired
> behavior.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Cc: Simon Horman <horms+renesas@verge.net.au>
> Cc: Magnus Damm <magnus.damm@gmail.com>
> Cc: linux-sh@vger.kernel.org
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: linux-fbdev@vger.kernel.org

This was quick!

I think you got almost everything right with the series, but one
important addition would be a cover letter in the sense that
'git format-patch --cover-letter' generates, filling that out
with an explanation about the purpose of the patch series, what
your involvement is in this, and what you expect to happen with
the patches. I'll go through the patches individually and
comment on anything that sticks out. I guess once you have
addressed those, you can send the patches for real.

	Arnd
Peter Griffin April 24, 2014, 9:32 a.m. | #2
Hay Arnd,

> This was quick!
> 
> I think you got almost everything right with the series, but one
> important addition would be a cover letter in the sense that
> 'git format-patch --cover-letter' generates, filling that out
> with an explanation about the purpose of the patch series, what
> your involvement is in this, and what you expect to happen with
> the patches. I'll go through the patches individually and
> comment on anything that sticks out. I guess once you have
> addressed those, you can send the patches for real.

Thanks for taking a look :-) I'll address your comments and then
resend the patchset for real with a cover letter.

Peter.

Patch

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index e1f4727..a4116bf 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -1971,6 +1971,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_SH_MOBILE_MERAM || !FB_SH_MOBILE_MERAM
 	select FB_SYS_FILLRECT
 	select FB_SYS_COPYAREA
 	select FB_SYS_IMAGEBLIT