diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
| commit | 7903aad4738b38f48fb8800782b186be8dfaa024 (patch) | |
| tree | a8b20157c57c9dc35f049725d38fb2ca645c816a /drivers/mfd/glamo/Kconfig | |
| parent | d1bb1b43b8db0926715d4bb1bbd9abcb88a4c5ee (diff) | |
| parent | 5b85050a8f1e7db530f803627ba6371ca9c0ba9b (diff) | |
Merge branch 'drm-kms' into drm-tracking
Conflicts:
drivers/mfd/glamo/glamo-cmdq.c
drivers/mfd/glamo/glamo-cmdq.h
drivers/mfd/glamo/glamo-drm-drv.c
drivers/mfd/glamo/glamo-drm-private.h
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/mfd/glamo/Kconfig')
| -rw-r--r-- | drivers/mfd/glamo/Kconfig | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index 9c5b11b8372..7db45288c38 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 @@ -59,10 +61,18 @@ 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 + 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 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 |