Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Pull fbdev changes from Tomi Valkeinen:
 - Improvements to da8xx-fb to make it support v2 of the LCDC IP, used
   eg in BeagleBone
 - Himax HX8369 controller support
 - Various small fixes and cleanups

* tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (42 commits)
  video: da8xx-fb: fix the polarities of the hsync/vsync pulse
  video: da8xx-fb: support lcdc v2 timing register expansion
  video: da8xx-fb: fixing timing off by one errors
  video: da8xx-fb fixing incorrect porch mappings
  video: xilinxfb: replace devm_request_and_ioremap by devm_ioremap_resource
  fbmem: move EXPORT_SYMBOL annotation next to symbol declarations
  drivers: video: fbcmap: remove the redundency and incorrect checkings
  video: mxsfb: simplify use of devm_ioremap_resource
  Release efifb's colormap in efifb_destroy()
  at91/avr32/atmel_lcdfb: prepare clk before calling enable
  video: exynos: Ensure definitions match prototypes
  OMAPDSS: fix WARN_ON in 'alpha_blending_enabled' sysfs file
  OMAPDSS: HDMI: Fix possible NULL reference
  video: da8xx-fb: adding am33xx as dependency
  video: da8xx-fb: let compiler decide what to inline
  video: da8xx-fb: make clock naming consistent
  video: da8xx-fb: set upstream clock rate (if reqd)
  video: da8xx-fb: reorganize panel detection
  video: da8xx-fb: ensure non-null cfg in pdata
  video: da8xx-fb: use devres
  ...

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 34c3d960634d..84b685f7ab6e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2100,13 +2100,6 @@ 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
@@ -2228,15 +2221,17 @@ config FB_SH7760
           panels <= 320 pixel horizontal resolution.
 
 config FB_DA8XX
-        tristate "DA8xx/OMAP-L1xx Framebuffer support"
-        depends on FB && ARCH_DAVINCI_DA8XX
+        tristate "DA8xx/OMAP-L1xx/AM335x Framebuffer support"
+        depends on FB && (ARCH_DAVINCI_DA8XX || SOC_AM33XX)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select FB_CFB_REV_PIXELS_IN_BYTE
+        select FB_MODE_HELPERS
+        select VIDEOMODE_HELPERS
         ---help---
           This is the frame buffer device driver for the TI LCD controller
-          found on DA8xx/OMAP-L1xx SoCs.
+          found on DA8xx/OMAP-L1xx/AM335x SoCs.
           If unsure, say N.
 
 config FB_VIRTUAL