Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 68df978a8008e47c8a9b5607a27cf96411c226e6..47d5735793ba4f11a391c2205ef5817772f274a0 100755 (executable)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -5,12 +5,26 @@
 menu "Graphics support"
        depends on HAS_IOMEM
 
 menu "Graphics support"
        depends on HAS_IOMEM
 

+config HAVE_FB_ATMEL
+       bool
+
+config SH_MIPI_DSI
+       tristate
+       depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
+
+config SH_LCD_MIPI_DSI
+       bool
+

 source "drivers/char/agp/Kconfig"
 
 source "drivers/gpu/vga/Kconfig"
 
 source "drivers/gpu/drm/Kconfig"
 
 source "drivers/char/agp/Kconfig"
 
 source "drivers/gpu/vga/Kconfig"
 
 source "drivers/gpu/drm/Kconfig"
 

+source "drivers/gpu/stub/Kconfig"
+
+source "drivers/gpu/ion/Kconfig"
+

 config VGASTATE
        tristate
        default n
 config VGASTATE
        tristate
        default n


@@ -43,7 +57,7 @@ menuconfig FB
          You need an utility program called fbset to make full use of frame
          buffer devices. Please read <file:Documentation/fb/framebuffer.txt>
          and the Framebuffer-HOWTO at
          You need an utility program called fbset to make full use of frame
          buffer devices. Please read <file:Documentation/fb/framebuffer.txt>
          and the Framebuffer-HOWTO at

-         <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.2.html> for more
+         <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.3.html> for more

          information.
 
          Say Y here and to the driver for your graphics board below if you
          information.
 
          Say Y here and to the driver for your graphics board below if you


@@ -178,6 +192,14 @@ config FB_SYS_FOPS
        depends on FB
        default n
 
        depends on FB
        default n
 

+config FB_WMT_GE_ROPS
+       tristate
+       depends on FB
+       default n
+       ---help---
+         Include functions for accelerated rectangle filling and area
+         copying using WonderMedia Graphics Engine operations.
+

 config FB_DEFERRED_IO
        bool
        depends on FB
 config FB_DEFERRED_IO
        bool
        depends on FB


@@ -299,69 +321,6 @@ config FB_ARMCLCD
          here and read <file:Documentation/kbuild/modules.txt>.  The module
          will be called amba-clcd.
 
          here and read <file:Documentation/kbuild/modules.txt>.  The module
          will be called amba-clcd.
 

-choice
-
-       depends on FB_ARMCLCD && (ARCH_LH7A40X || ARCH_LH7952X)
-       prompt "LCD Panel"
-       default FB_ARMCLCD_SHARP_LQ035Q7DB02
-
-config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT
-       bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"
-       help
-         This is an implementation of the Sharp LQ035Q7DB02, a 3.5"
-         color QVGA, HRTFT panel.  The LogicPD device includes
-         an integrated HRTFT controller IC.
-         The native resolution is 240x320.
-
-config FB_ARMCLCD_SHARP_LQ057Q3DC02
-       bool "LogicPD LCD 5.7\" QVGA"
-       help
-         This is an implementation of the Sharp LQ057Q3DC02, a 5.7"
-         color QVGA, TFT panel.  The LogicPD device includes an
-         The native resolution is 320x240.
-
-config FB_ARMCLCD_SHARP_LQ64D343
-       bool "LogicPD LCD 6.4\" VGA"
-       help
-         This is an implementation of the Sharp LQ64D343, a 6.4"
-         color VGA, TFT panel.  The LogicPD device includes an
-         The native resolution is 640x480.
-
-config FB_ARMCLCD_SHARP_LQ10D368
-       bool "LogicPD LCD 10.4\" VGA"
-       help
-         This is an implementation of the Sharp LQ10D368, a 10.4"
-         color VGA, TFT panel.  The LogicPD device includes an
-         The native resolution is 640x480.
-
-
-config FB_ARMCLCD_SHARP_LQ121S1DG41
-       bool "LogicPD LCD 12.1\" SVGA"
-       help
-         This is an implementation of the Sharp LQ121S1DG41, a 12.1"
-         color SVGA, TFT panel.  The LogicPD device includes an
-         The native resolution is 800x600.
-
-         This panel requires a clock rate may be an integer fraction
-         of the base LCDCLK frequency.  The driver will select the
-         highest frequency available that is lower than the maximum
-         allowed.  The panel may flicker if the clock rate is
-         slower than the recommended minimum.
-
-config FB_ARMCLCD_AUO_A070VW01_WIDE
-       bool "AU Optronics A070VW01 LCD 7.0\" WIDE"
-       help
-         This is an implementation of the AU Optronics, a 7.0"
-         WIDE Color.  The native resolution is 234x480.
-
-config FB_ARMCLCD_HITACHI
-       bool "Hitachi Wide Screen 800x480"
-       help
-         This is an implementation of the Hitachi 800x480.
-
-endchoice
-
-

 config FB_ACORN
        bool "Acorn VIDC support"
        depends on (FB = y) && ARM && ARCH_ACORN
 config FB_ACORN
        bool "Acorn VIDC support"
        depends on (FB = y) && ARM && ARCH_ACORN


@@ -398,8 +357,8 @@ config FB_SA1100
          Y here.
 
 config FB_IMX
          Y here.
 
 config FB_IMX

-       tristate "Motorola i.MX LCD support"
-       depends on FB && (ARCH_MX1 || ARCH_MX2)
+       tristate "Freescale i.MX LCD support"
+       depends on FB && IMX_HAVE_PLATFORM_IMX_FB

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT


@@ -416,6 +375,24 @@ config FB_CYBER2000
          Say Y if you have a NetWinder or a graphics card containing this
          device, otherwise say N.
 
          Say Y if you have a NetWinder or a graphics card containing this
          device, otherwise say N.
 

+config FB_CYBER2000_DDC
+       bool "DDC for CyberPro support"
+       depends on FB_CYBER2000
+       select FB_DDC
+       default y
+       help
+         Say Y here if you want DDC support for your CyberPro graphics
+         card. This is only I2C bus support, driver does not use EDID.
+
+config FB_CYBER2000_I2C
+       bool "CyberPro 2000/2010/5000 I2C support"
+       depends on FB_CYBER2000 && I2C && ARCH_NETWINDER
+       select I2C_ALGOBIT
+       help
+         Enable support for the I2C video decoder interface on the
+         Integraphics CyberPro 20x0 and 5000 VGA chips.  This is used
+         on the Netwinder machines for the SAA7111 video capture.
+

 config FB_APOLLO
        bool
        depends on (FB = y) && APOLLO
 config FB_APOLLO
        bool
        depends on (FB = y) && APOLLO


@@ -611,6 +588,87 @@ config FB_BFIN_T350MCQB
         This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
         It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
 
         This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
         It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
 

+config FB_BFIN_LQ035Q1
+       tristate "SHARP LQ035Q1DH02 TFT LCD"
+       depends on FB && BLACKFIN && SPI
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       select BFIN_GPTIMERS
+       help
+         This is the framebuffer device driver for a SHARP LQ035Q1DH02 TFT display found on
+         the Blackfin Landscape LCD EZ-Extender Card.
+         This display is a QVGA 320x240 18-bit RGB display interfaced by an 16-bit wide PPI
+         It uses PPI[0..15] PPI_FS1, PPI_FS2 and PPI_CLK.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bfin-lq035q1-fb.
+
+config FB_BF537_LQ035
+       tristate "SHARP LQ035 TFT LCD (BF537 STAMP)"
+       depends on FB && (BF534 || BF536 || BF537) && I2C_BLACKFIN_TWI
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       select BFIN_GPTIMERS
+       help
+         This is the framebuffer device for a SHARP LQ035Q7DB03 TFT LCD
+         attached to a BF537.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bf537-lq035.
+
+config FB_BFIN_7393
+       tristate "Blackfin ADV7393 Video encoder"
+       depends on FB && BLACKFIN
+       select I2C
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This is the framebuffer device for a ADV7393 video encoder
+         attached to a Blackfin on the PPI port.
+         If your Blackfin board has a ADV7393 select Y.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bfin_adv7393fb.
+
+choice
+       prompt  "Video mode support"
+       depends on FB_BFIN_7393
+       default NTSC
+
+config NTSC
+       bool 'NTSC 720x480'
+
+config PAL
+       bool 'PAL 720x576'
+
+config NTSC_640x480
+       bool 'NTSC 640x480 (Experimental)'
+
+config PAL_640x480
+       bool 'PAL 640x480 (Experimental)'
+
+config NTSC_YCBCR
+       bool 'NTSC 720x480 YCbCR input'
+
+config PAL_YCBCR
+       bool 'PAL 720x576 YCbCR input'
+
+endchoice
+
+choice
+       prompt  "Size of ADV7393 frame buffer memory Single/Double Size"
+       depends on (FB_BFIN_7393)
+       default ADV7393_1XMEM
+
+config ADV7393_1XMEM
+       bool 'Single'
+
+config ADV7393_2XMEM
+       bool 'Double'
+endchoice

 
 config FB_STI
        tristate "HP STI frame buffer device support"
 
 config FB_STI
        tristate "HP STI frame buffer device support"


@@ -727,24 +785,14 @@ config FB_N411
 config FB_HGA
        tristate "Hercules mono graphics support"
        depends on FB && X86
 config FB_HGA
        tristate "Hercules mono graphics support"
        depends on FB && X86

-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT

        help
          Say Y here if you have a Hercules mono graphics card.
 
          To compile this driver as a module, choose M here: the
          module will be called hgafb.
 
        help
          Say Y here if you have a Hercules mono graphics card.
 
          To compile this driver as a module, choose M here: the
          module will be called hgafb.
 

-         As this card technology is 15 years old, most people will answer N
-         here.
-
-config FB_HGA_ACCEL
-       bool "Hercules mono Acceleration functions (EXPERIMENTAL)"
-       depends on FB_HGA && EXPERIMENTAL
-       ---help---
-       This will compile the Hercules mono graphics with
-       acceleration functions.
+         As this card technology is at least 25 years old,
+         most people will answer N here.

 
 config FB_SGIVW
        tristate "SGI Visual Workstation framebuffer support"
 
 config FB_SGIVW
        tristate "SGI Visual Workstation framebuffer support"


@@ -891,6 +939,18 @@ config FB_XVR2500
          mostly initialized the card already.  It is treated as a
          completely dumb framebuffer device.
 
          mostly initialized the card already.  It is treated as a
          completely dumb framebuffer device.
 

+config FB_XVR1000
+       bool "Sun XVR-1000 support"
+       depends on (FB = y) && SPARC64
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This is the framebuffer device for the Sun XVR-1000 and similar
+         graphics cards.  The driver only works on sparc64 systems where
+         the system firmware has mostly initialized the card already.  It
+         is treated as a completely dumb framebuffer device.
+

 config FB_PVR2
        tristate "NEC PowerVR 2 display support"
        depends on FB && SH_DREAMCAST
 config FB_PVR2
        tristate "NEC PowerVR 2 display support"
        depends on FB && SH_DREAMCAST


@@ -922,7 +982,7 @@ config FB_EPSON1355
          Build in support for the SED1355 Epson Research Embedded RAMDAC
          LCD/CRT Controller (since redesignated as the S1D13505) as a
          framebuffer.  Product specs at
          Build in support for the SED1355 Epson Research Embedded RAMDAC
          LCD/CRT Controller (since redesignated as the S1D13505) as a
          framebuffer.  Product specs at

-         <http://www.erd.epson.com/vdc/html/products.htm>.
+         <http://vdc.epson.com/>.

 
 config FB_S1D13XXX
        tristate "Epson S1D13XXX framebuffer support"
 
 config FB_S1D13XXX
        tristate "Epson S1D13XXX framebuffer support"


@@ -933,11 +993,11 @@ config FB_S1D13XXX
        help
          Support for S1D13XXX framebuffer device family (currently only
          working with S1D13806). Product specs at
        help
          Support for S1D13XXX framebuffer device family (currently only
          working with S1D13806). Product specs at

-         <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
+         <http://vdc.epson.com/>

 
 config FB_ATMEL
        tristate "AT91/AT32 LCD Controller support"
 
 config FB_ATMEL
        tristate "AT91/AT32 LCD Controller support"

-       depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)
+       depends on FB && HAVE_FB_ATMEL

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT


@@ -1121,7 +1181,7 @@ config FB_CARILLO_RANCH
 
 config FB_INTEL
        tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
 
 config FB_INTEL
        tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EMBEDDED
+       depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EXPERT

        select FB_MODE_HELPERS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_MODE_HELPERS
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA


@@ -1174,7 +1234,7 @@ config FB_MATROX
          module will be called matroxfb.
 
          You can pass several parameters to the driver at boot time or at
          module will be called matroxfb.
 
          You can pass several parameters to the driver at boot time or at

-         module load time. The parameters look like "video=matrox:XXX", and
+         module load time. The parameters look like "video=matroxfb:XXX", and

          are described in <file:Documentation/fb/matroxfb.txt>.
 
 config FB_MATROX_MILLENIUM
          are described in <file:Documentation/fb/matroxfb.txt>.
 
 config FB_MATROX_MILLENIUM


@@ -1290,7 +1350,7 @@ config FB_RADEON
          don't need to choose this to run the Radeon in plain VGA mode.
 
          There is a product page at
          don't need to choose this to run the Radeon in plain VGA mode.
 
          There is a product page at

-         http://apps.ati.com/ATIcompare/
+         http://products.amd.com/en-us/GraphicCardResult.aspx

 
 config FB_RADEON_I2C
        bool "DDC/I2C for ATI Radeon support"
 
 config FB_RADEON_I2C
        bool "DDC/I2C for ATI Radeon support"


@@ -1362,7 +1422,7 @@ config FB_ATY_CT
          Say Y here to support use of ATI's 64-bit Rage boards (or other
          boards based on the Mach64 CT, VT, GT, and LT chipsets) as a
          framebuffer device.  The ATI product support page for these boards
          Say Y here to support use of ATI's 64-bit Rage boards (or other
          boards based on the Mach64 CT, VT, GT, and LT chipsets) as a
          framebuffer device.  The ATI product support page for these boards

-         is at <http://support.ati.com/products/pc/mach64/>.
+         is at <http://support.ati.com/products/pc/mach64/mach64.html>.

 
 config FB_ATY_GENERIC_LCD
        bool "Mach64 generic LCD support (EXPERIMENTAL)"
 
 config FB_ATY_GENERIC_LCD
        bool "Mach64 generic LCD support (EXPERIMENTAL)"


@@ -1402,6 +1462,14 @@ config FB_S3
        ---help---
          Driver for graphics boards with S3 Trio / S3 Virge chip.
 
        ---help---
          Driver for graphics boards with S3 Trio / S3 Virge chip.
 

+config FB_S3_DDC
+       bool "DDC for S3 support"
+       depends on FB_S3
+       select FB_DDC
+       default y
+       help
+         Say Y here if you want DDC support for your S3 graphics card.
+

 config FB_SAVAGE
        tristate "S3 Savage support"
        depends on FB && PCI && EXPERIMENTAL
 config FB_SAVAGE
        tristate "S3 Savage support"
        depends on FB && PCI && EXPERIMENTAL


@@ -1472,13 +1540,13 @@ config FB_SIS_315
 
 config FB_VIA
        tristate "VIA UniChrome (Pro) and Chrome9 display support"
 
 config FB_VIA
        tristate "VIA UniChrome (Pro) and Chrome9 display support"

-       depends on FB && PCI
+       depends on FB && PCI && X86

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT

-       select FB_SOFT_CURSOR

        select I2C_ALGOBIT
        select I2C
        select I2C_ALGOBIT
        select I2C

+       select GPIOLIB

        help
          This is the frame buffer device driver for Graphics chips of VIA
          UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/
        help
          This is the frame buffer device driver for Graphics chips of VIA
          UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/


@@ -1488,6 +1556,32 @@ config FB_VIA
 
          To compile this driver as a module, choose M here: the
          module will be called viafb.
 
          To compile this driver as a module, choose M here: the
          module will be called viafb.

+
+if FB_VIA
+
+config FB_VIA_DIRECT_PROCFS
+       bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)"
+       depends on FB_VIA
+       default n
+       help
+         Allow direct hardware access to some output registers via procfs.
+         This is dangerous but may provide the only chance to get the
+         correct output device configuration.
+         Its use is strongly discouraged.
+
+config FB_VIA_X_COMPATIBILITY
+       bool "X server compatibility"
+       depends on FB_VIA
+       default n
+       help
+         This option reduces the functionality (power saving, ...) of the
+         framebuffer to avoid negative impact on the OpenChrome X server.
+         If you use any X server other than fbdev you should enable this
+         otherwise it should be safe to disable it and allow using all
+         features.
+
+endif
+

 config FB_NEOMAGIC
        tristate "NeoMagic display support"
        depends on FB && PCI
 config FB_NEOMAGIC
        tristate "NeoMagic display support"
        depends on FB && PCI


@@ -1672,6 +1766,24 @@ config FB_AU1200
          various panels and CRTs by passing in kernel cmd line option
          au1200fb:panel=<name>.
 
          various panels and CRTs by passing in kernel cmd line option
          au1200fb:panel=<name>.
 

+config FB_VT8500
+       bool "VT8500 LCD Driver"
+       depends on (FB = y) && ARM && ARCH_VT8500 && VTWM_VERSION_VT8500
+       select FB_WMT_GE_ROPS
+       select FB_SYS_IMAGEBLIT
+       help
+         This is the framebuffer driver for VIA VT8500 integrated LCD
+         controller.
+
+config FB_WM8505
+       bool "WM8505 frame buffer support"
+       depends on (FB = y) && ARM && ARCH_VT8500 && VTWM_VERSION_WM8505
+       select FB_WMT_GE_ROPS
+       select FB_SYS_IMAGEBLIT
+       help
+         This is the framebuffer driver for WonderMedia WM8505
+         integrated LCD controller.
+

 source "drivers/video/geode/Kconfig"
 
 config FB_HIT
 source "drivers/video/geode/Kconfig"
 
 config FB_HIT


@@ -1800,6 +1912,16 @@ config FB_PXA_PARAMETERS
 
          <file:Documentation/fb/pxafb.txt> describes the available parameters.
 
 
          <file:Documentation/fb/pxafb.txt> describes the available parameters.
 

+config PXA3XX_GCU
+       tristate "PXA3xx 2D graphics accelerator driver"
+       depends on FB_PXA
+       help
+         Kernelspace driver for the 2D graphics controller unit (GCU)
+         found on PXA3xx processors. There is a counterpart driver in the
+         DirectFB suite, see http://www.directfb.org/
+
+         If you compile this as a module, it will be called pxa3xx_gcu.
+

 config FB_MBX
        tristate "2700G LCD framebuffer support"
        depends on FB && ARCH_PXA
 config FB_MBX
        tristate "2700G LCD framebuffer support"
        depends on FB && ARCH_PXA


@@ -1823,6 +1945,7 @@ config FB_MBX_DEBUG
 config FB_FSL_DIU
        tristate "Freescale DIU framebuffer support"
        depends on FB && FSL_SOC
 config FB_FSL_DIU
        tristate "Freescale DIU framebuffer support"
        depends on FB && FSL_SOC

+       select FB_MODE_HELPERS

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT


@@ -1849,15 +1972,39 @@ config FB_W100
 
 config FB_SH_MOBILE_LCDC
        tristate "SuperH Mobile LCDC framebuffer support"
 
 config FB_SH_MOBILE_LCDC
        tristate "SuperH Mobile LCDC framebuffer support"

-       depends on FB && SUPERH && HAVE_CLK
+       depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK

        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO

+       select FB_BACKLIGHT
+       select SH_MIPI_DSI if SH_LCD_MIPI_DSI

        ---help---
          Frame buffer driver for the on-chip SH-Mobile LCD controller.
 
        ---help---
          Frame buffer driver for the on-chip SH-Mobile LCD controller.
 

+config FB_SH_MOBILE_HDMI
+       tristate "SuperH Mobile HDMI controller support"
+       depends on FB_SH_MOBILE_LCDC
+       select FB_MODE_HELPERS
+       select SOUND
+       select SND
+       select SND_SOC
+       ---help---
+         Driver for the on-chip SH-Mobile HDMI controller.
+
+config FB_SH_MOBILE_MERAM
+       tristate "SuperH Mobile MERAM read ahead support for LCDC"
+       depends on FB_SH_MOBILE_LCDC
+       default y
+       ---help---
+         Enable MERAM support for the SH-Mobile LCD controller.
+
+         This will allow for caching of the framebuffer to provide more
+         reliable access under heavy main memory bus traffic situations.
+         Up to 4 memory channels can be configured, allowing 4 RGB or
+         2 YCbCr framebuffers to be configured.
+

 config FB_TMIO
        tristate "Toshiba Mobile IO FrameBuffer support"
        depends on FB && MFD_CORE
 config FB_TMIO
        tristate "Toshiba Mobile IO FrameBuffer support"
        depends on FB && MFD_CORE


@@ -1882,7 +2029,7 @@ config FB_TMIO_ACCELL
 
 config FB_S3C
        tristate "Samsung S3C framebuffer support"
 
 config FB_S3C
        tristate "Samsung S3C framebuffer support"

-       depends on FB && ARCH_S3C64XX
+       depends on FB && S3C_DEV_FB

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT


@@ -1927,15 +2074,6 @@ config FB_S3C2410_DEBUG
          Turn on debugging messages. Note that you can set/unset at run time
          through sysfs
 
          Turn on debugging messages. Note that you can set/unset at run time
          through sysfs
 

-config FB_RK2818
-       tristate "RK2818 lcd control"
-       depends on FB
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
-       ---help---
-         Framebuffer driver for RK2818 Platform,select it if you using rk2818
-

 config FB_RK29
        tristate "RK29 lcd control"
        depends on FB
 config FB_RK29
        tristate "RK29 lcd control"
        depends on FB


@@ -1958,18 +2096,53 @@ config FB_SCALING_OSD
        ---help---
           this function be used scale-up UI when video, it only support RGB565 UI;
 
        ---help---
           this function be used scale-up UI when video, it only support RGB565 UI;
 

+config FB_SCALING_OSD_1080P
+       bool "fb scale OSD support when video playing in 1080P "
+       depends on FB_WORK_IPP && FB_SCALING_OSD
+       ---help---
+          this function be used scale-up UI when video, it only support RGB565 UI;
+          should set SCALE_UI_1080P_VIDEO to 1 in android

 config FB_ROTATE_VIDEO
        bool "fb video rotate support"
        depends on FB_WORK_IPP
        ---help---
                this function  can use to rotate video .
 config FB_ROTATE_VIDEO
        bool "fb video rotate support"
        depends on FB_WORK_IPP
        ---help---
                this function  can use to rotate video .

-
+config FB_MIRROR_X_Y
+       bool "fb video rotate support x y mirror"
+       depends on FB_ROTATE_VIDEO
+       ---help---
+               this function  can use to x y mirror video .

 config CLOSE_WIN1_DYNAMIC
        bool "close win1 dynamically when video"
        depends on FB_RK29
        ---help---
                this function  can close win1 when video and it have no data in fb0
 
 config CLOSE_WIN1_DYNAMIC
        bool "close win1 dynamically when video"
        depends on FB_RK29
        ---help---
                this function  can close win1 when video and it have no data in fb0
 

+config FB_WIMO
+       bool "WiMo support"
+       depends on FB_RK29
+
+config FB_NUC900
+        bool "NUC900 LCD framebuffer support"
+        depends on FB && ARCH_W90X900
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Frame buffer driver for the built-in LCD controller in the Nuvoton
+          NUC900 processor
+
+config GPM1040A0_320X240
+        bool "Giantplus Technology GPM1040A0 320x240 Color TFT LCD"
+        depends on FB_NUC900
+
+config FB_NUC900_DEBUG
+        bool "NUC900 lcd debug messages"
+        depends on FB_NUC900
+        help
+          Turn on debugging messages. Note that you can set/unset at run time
+          through sysfs
+

 config FB_SM501
        tristate "Silicon Motion SM501 framebuffer support"
        depends on FB && MFD_SM501
 config FB_SM501
        tristate "Silicon Motion SM501 framebuffer support"
        depends on FB && MFD_SM501


@@ -1987,6 +2160,20 @@ config FB_SM501
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config FB_UDL
+       tristate "Displaylink USB Framebuffer support"
+       depends on FB && USB
+       select FB_MODE_HELPERS
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       select FB_DEFERRED_IO
+       ---help---
+         This is a kernel framebuffer driver for DisplayLink USB devices.
+         Supports fbdev clients like xf86-video-fbdev, kdrive, fbi, and
+         mplayer -vo fbdev. Supports all USB 2.0 era DisplayLink devices.
+         To compile as a module, choose M here: the module name is udlfb.

 
 config FB_PNX4008_DUM
        tristate "Display Update Module support on Philips PNX4008 board"
 
 config FB_PNX4008_DUM
        tristate "Display Update Module support on Philips PNX4008 board"


@@ -2106,6 +2293,7 @@ config XEN_FBDEV_FRONTEND
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO

+       select XEN_XENBUS_FRONTEND

        default y
        help
          This driver implements the front-end of the Xen virtual
        default y
        help
          This driver implements the front-end of the Xen virtual


@@ -2128,29 +2316,43 @@ config FB_METRONOME
 config FB_MB862XX
        tristate "Fujitsu MB862xx GDC support"
        depends on FB
 config FB_MB862XX
        tristate "Fujitsu MB862xx GDC support"
        depends on FB

+       depends on PCI || (OF && PPC)

        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        ---help---
          Frame buffer driver for Fujitsu Carmine/Coral-P(A)/Lime controllers.
 
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        ---help---
          Frame buffer driver for Fujitsu Carmine/Coral-P(A)/Lime controllers.
 

+choice
+       prompt "GDC variant"
+       depends on FB_MB862XX
+

 config FB_MB862XX_PCI_GDC
        bool "Carmine/Coral-P(A) GDC"
 config FB_MB862XX_PCI_GDC
        bool "Carmine/Coral-P(A) GDC"

-       depends on PCI && FB_MB862XX
+       depends on PCI

        ---help---
          This enables framebuffer support for Fujitsu Carmine/Coral-P(A)
          PCI graphics controller devices.
 
 config FB_MB862XX_LIME
        bool "Lime GDC"
        ---help---
          This enables framebuffer support for Fujitsu Carmine/Coral-P(A)
          PCI graphics controller devices.
 
 config FB_MB862XX_LIME
        bool "Lime GDC"

-       depends on FB_MB862XX
-       depends on OF && !FB_MB862XX_PCI_GDC
-       depends on PPC
+       depends on OF && PPC

        select FB_FOREIGN_ENDIAN
        select FB_LITTLE_ENDIAN
        ---help---
          Framebuffer support for Fujitsu Lime GDC on host CPU bus.
 
        select FB_FOREIGN_ENDIAN
        select FB_LITTLE_ENDIAN
        ---help---
          Framebuffer support for Fujitsu Lime GDC on host CPU bus.
 

+endchoice
+
+config FB_MB862XX_I2C
+       bool "Support I2C bus on MB862XX GDC"
+       depends on FB_MB862XX && I2C
+       default y
+       help
+         Selecting this option adds Coral-P(A)/Lime GDC I2C bus adapter
+         driver to support accessing I2C devices on controller's I2C bus.
+         These are usually some video decoder chips.
+

 config FB_EP93XX
        tristate "EP93XX frame buffer support"
        depends on FB && ARCH_EP93XX
 config FB_EP93XX
        tristate "EP93XX frame buffer support"
        depends on FB && ARCH_EP93XX


@@ -2170,12 +2372,11 @@ config FB_PRE_INIT_FB
          the bootloader.
 
 config FB_MSM
          the bootloader.
 
 config FB_MSM

-       tristate
+       tristate "MSM Framebuffer support"

        depends on FB && ARCH_MSM
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        depends on FB && ARCH_MSM
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT

-       default y

 
 config FB_MX3
        tristate "MX3 Framebuffer support"
 
 config FB_MX3
        tristate "MX3 Framebuffer support"


@@ -2203,11 +2404,46 @@ config FB_BROADSHEET
          and could also have been called by other names when coupled with
          a bridge adapter.
 
          and could also have been called by other names when coupled with
          a bridge adapter.
 

+config FB_JZ4740
+       tristate "JZ4740 LCD framebuffer support"
+       depends on FB && MACH_JZ4740
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       help
+         Framebuffer support for the JZ4740 SoC.
+
+config FB_MXS
+       tristate "MXS LCD framebuffer support"
+       depends on FB && ARCH_MXS
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         Framebuffer support for the MXS SoC.
+
+config FB_PUV3_UNIGFX
+       tristate "PKUnity v3 Unigfx framebuffer support"
+       depends on FB && UNICORE32 && ARCH_PUV3
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       help
+         Choose this option if you want to use the Unigfx device as a
+         framebuffer device. Without the support of PCI & AGP.
+

 source "drivers/video/omap/Kconfig"
 source "drivers/video/omap/Kconfig"

+source "drivers/video/omap2/Kconfig"

 
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/display/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/display/Kconfig"

+
+if !LCDC_RK30 && !LCDC_RK2928

 source "drivers/video/hdmi/Kconfig"
 source "drivers/video/hdmi/Kconfig"

+endif
+
+source "drivers/video/rockchip/Kconfig"

 
 if VT
        source "drivers/video/console/Kconfig"
 
 if VT
        source "drivers/video/console/Kconfig"