From 904d3f56a0667c0ea225ddc751bf4e5f19ec7ac1 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 9 Jun 2011 17:37:07 +0200 Subject: [PATCH 089/107] at91: video: change atmel lcdfb driver selection mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LCD driver for AT91 chips is selected by a single entry in Kconfig. The new hlcdfb is only selected on supported platforms. Backlight is selected if needed. XXX/nfe: improve commit log, move backlight to a separate patch Signed-off-by: Nicolas Ferre Signed-off-by: Uwe Kleine-König --- drivers/video/Kconfig | 13 ++++--------- drivers/video/Makefile | 5 ++++- drivers/video/backlight/Kconfig | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 8b25a8e..aa423d2 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -8,6 +8,9 @@ menu "Graphics support" config HAVE_FB_ATMEL bool +config FB_ATMEL_HLCD + bool + config HAVE_FB_IMX bool @@ -1002,6 +1005,7 @@ config FB_ATMEL select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select FB_ATMEL_HLCD if ARCH_AT91SAM9X5 help This enables support for the AT91/AT32 LCD Controller. @@ -1022,15 +1026,6 @@ config FB_ATMEL_STN If unsure, say N. -config FB_ATMEL_HLCD - tristate "AT91 HLCD Controller support" - depends on FB && HAVE_FB_ATMEL - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - help - This enables support for the AT91 HLCD Controller. - config FB_NVIDIA tristate "nVidia Framebuffer Support" depends on FB && PCI diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 2597768..ea6c5a3 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -91,8 +91,11 @@ obj-$(CONFIG_FB_EP93XX) += ep93xx-fb.o obj-$(CONFIG_FB_SA1100) += sa1100fb.o obj-$(CONFIG_FB_HIT) += hitfb.o obj-$(CONFIG_FB_EPSON1355) += epson1355fb.o +ifdef CONFIG_FB_ATMEL_HLCD +obj-y += atmel_hlcdfb.o atmel_lcdfb_core.o +else obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o atmel_lcdfb_core.o -obj-$(CONFIG_FB_ATMEL_HLCD) += atmel_hlcdfb.o atmel_lcdfb_core.o +endif obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index 0c9373b..ffd9fef 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -137,7 +137,7 @@ if BACKLIGHT_CLASS_DEVICE config BACKLIGHT_ATMEL_LCDC bool "Atmel LCDC Contrast-as-Backlight control" depends on FB_ATMEL - default y if MACH_SAM9261EK || MACH_SAM9G10EK || MACH_SAM9263EK + default y if MACH_SAM9261EK || MACH_SAM9G10EK || MACH_SAM9263EK || MACH_AT91SAM9X5EK help This provides a backlight control internal to the Atmel LCDC driver. If the LCD "contrast control" on your board is wired -- 1.7.5.4