From da4745334d168390fc9afe7dbe8f729df2aa9afa Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 3 Jun 2009 00:40:16 +0100 Subject: Tidy up Kconfig This just tidies up the Glamo Kconfig file a bit. Signed-off-by: Thomas White --- drivers/mfd/glamo/Kconfig | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'drivers/mfd/glamo/Kconfig') diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index eaa415df890..30932b0c2ee 100644 --- a/drivers/mfd/glamo/Kconfig +++ b/drivers/mfd/glamo/Kconfig @@ -1,12 +1,15 @@ config MFD_GLAMO - bool "Smedia Glamo 336x/337x support" + bool "SMedia Glamo 336x/337x support" help This enables the core driver for the Smedia Glamo 336x/337x multi-function device. It includes irq_chip demultiplex as well as clock / power management and GPIO support. +menu "SMedia Glamo 336x/337x engine drivers" + depends on MFD_GLAMO + config MFD_GLAMO_FB - tristate "Smedia Glamo 336x/337x framebuffer support" + tristate "SMedia Glamo 336x/337x framebuffer support" depends on FB && MFD_GLAMO select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -31,7 +34,6 @@ config MFD_GLAMO_FB_XGLAMO_WORKAROUND If unsure, say N. - config MFD_GLAMO_SPI_GPIO tristate "Glamo GPIO SPI bitbang support" depends on MFD_GLAMO @@ -57,10 +59,15 @@ config MFD_GLAMO_MCI If unsure, say N. config MFD_GLAMO_DRM - tristate "Glamo DRM support" + tristate "Glamo direct rendering and kernel modesetting support" depends on MFD_GLAMO && DRM help - Direct Rendering Manager interface for the S-Media GLAMO chip, as - used in Openmoko neo1973 GTA-02. + Direct Rendering Manager interface for the S-Media Glamo chip, as + used in Openmoko FreeRunner (GTA02). + + This DRM driver includes kernel modesetting (KMS) support. As such, + do not select MFD_GLAMO_FB above if you choose to enable this option. If unsure, say N. + +endmenu -- cgit v1.2.3 From ef859741e8baf985777015207041860cc42a2939 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 15 Jun 2009 01:21:30 +0100 Subject: Just backing up progress (again) Nearly there... Signed-off-by: Thomas White --- drivers/mfd/glamo/Kconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/mfd/glamo/Kconfig') diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index 30932b0c2ee..3b942ab0a6d 100644 --- a/drivers/mfd/glamo/Kconfig +++ b/drivers/mfd/glamo/Kconfig @@ -61,6 +61,9 @@ config MFD_GLAMO_MCI config MFD_GLAMO_DRM tristate "Glamo direct rendering and kernel modesetting support" depends on MFD_GLAMO && DRM + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT help Direct Rendering Manager interface for the S-Media Glamo chip, as used in Openmoko FreeRunner (GTA02). -- cgit v1.2.3