Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
  V4L/DVB: sms: Convert IR support to use the Remote Controller core
  V4L/DVB: sms: properly initialize IR phys and IR name
  V4L/DVB: standardize names at rc-dib0700 tables
  V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
  V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
  V4L/DVB: dib0700: properly implement IR change_protocol
  V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
  V4L/DVB: dib0700: avoid bad repeat
  V4L/DVB: Port dib0700 to rc-core
  V4L/DVB: Add a keymap file with dib0700 table
  V4L/DVB: dvb-usb: add support for rc-core mode
  V4L/DVB: dvb-usb: prepare drivers for using rc-core
  V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
  V4L/DVB: rj54n1cb0c: fix a comment in the driver
  V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
  V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
  V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
  V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
  V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
  V4L/DVB: mediabus: fix ambiguous pixel code names
  ...

1 files changed, 18 insertions, 165 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 27e2acce3c3a..2e15903b976d 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -517,19 +517,6 @@ config VIDEO_UPD64083
 
 endmenu # encoder / decoder chips
 
-config DISPLAY_DAVINCI_DM646X_EVM
-        tristate "DM646x EVM Video Display"
-        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
-        select VIDEOBUF_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
-        select VIDEO_ADV7343
-        select VIDEO_THS7303
-        help
-          Support for DM6467 based display device.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_display.
-
 config VIDEO_SH_VOU
         tristate "SuperH VOU video output driver"
         depends on VIDEO_DEV && ARCH_SHMOBILE
@@ -537,29 +524,22 @@ config VIDEO_SH_VOU
         help
           Support for the Video Output Unit (VOU) on SuperH SoCs.
 
-config CAPTURE_DAVINCI_DM646X_EVM
-        tristate "DM646x EVM Video Capture"
-        depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM
+config VIDEO_VIU
+        tristate "Freescale VIU Video Driver"
+        depends on VIDEO_V4L2 && PPC_MPC512x
         select VIDEOBUF_DMA_CONTIG
-        select VIDEO_DAVINCI_VPIF
-        help
-          Support for DM6467 based capture device.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpif_capture.
-
-config VIDEO_DAVINCI_VPIF
-        tristate "DaVinci VPIF Driver"
-        depends on DISPLAY_DAVINCI_DM646X_EVM
-        help
-          Support for DaVinci VPIF Driver.
+        default y
+        ---help---
+          Support for Freescale VIU video driver. This device captures
+          video data, or overlays video on DIU frame buffer.
 
-          To compile this driver as a module, choose M here: the
-          module will be called vpif.
+          Say Y here if you want to enable VIU device on MPC5121e Rev2+.
+          In doubt, say N.
 
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
-        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 && FONTS
+        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
+        depends on (FRAMEBUFFER_CONSOLE || STI_CONSOLE) && FONTS
         select FONT_8x16
         select VIDEOBUF_VMALLOC
         default n
@@ -570,66 +550,7 @@ config VIDEO_VIVI
           Say Y here if you want to test video apps or debug V4L devices.
           In doubt, say N.
 
-config VIDEO_VPSS_SYSTEM
-        tristate "VPSS System module driver"
-        depends on ARCH_DAVINCI
-        help
-          Support for vpss system module for video driver
-
-config VIDEO_VPFE_CAPTURE
-        tristate "VPFE Video Capture Driver"
-        depends on VIDEO_V4L2 && ARCH_DAVINCI
-        select VIDEOBUF_DMA_CONTIG
-        help
-          Support for DMXXXX VPFE based frame grabber. This is the
-          common V4L2 module for following DMXXX SoCs from Texas
-          Instruments:- DM6446 & DM355.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vpfe-capture.
-
-config VIDEO_DM6446_CCDC
-        tristate "DM6446 CCDC HW module"
-        depends on ARCH_DAVINCI_DM644x && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
-           Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
-           with decoder modules such as TVP5146 over BT656 or
-           sensor module such as MT9T001 over a raw interface. This
-           module configures the interface and CCDC/ISIF to do
-           video frame capture from slave decoders.
-
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
-
-config VIDEO_DM355_CCDC
-        tristate "DM355 CCDC HW module"
-        depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
-           Enables DM355 CCD hw module. DM355 CCDC hw interfaces
-           with decoder modules such as TVP5146 over BT656 or
-           sensor module such as MT9T001 over a raw interface. This
-           module configures the interface and CCDC/ISIF to do
-           video frame capture from a slave decoders
-
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
-
-config VIDEO_ISIF
-        tristate "ISIF HW module"
-        depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE
-        select VIDEO_VPSS_SYSTEM
-        default y
-        help
-           Enables ISIF hw module. This is the hardware module for
-           configuring ISIF in VPFE to capture Raw Bayer RGB data  from
-           a image sensor or YUV data from a YUV source.
-
-           To compile this driver as a module, choose M here: the
-           module will be called vpfe.
+source "drivers/media/video/davinci/Kconfig"
 
 source "drivers/media/video/omap/Kconfig"
 
@@ -955,6 +876,12 @@ config VIDEO_PXA27x
         ---help---
           This is a v4l2 driver for the PXA27x Quick Capture Interface
 
+config VIDEO_SH_MOBILE_CSI2
+        tristate "SuperH Mobile MIPI CSI-2 Interface driver"
+        depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK
+        ---help---
+          This is a v4l2 driver for the SuperH MIPI CSI-2 Interface
+
 config VIDEO_SH_MOBILE_CEU
         tristate "SuperH Mobile CEU Interface driver"
         depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
@@ -1013,61 +940,6 @@ source "drivers/media/video/usbvideo/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"
 
-config VIDEO_OVCAMCHIP
-        tristate "OmniVision Camera Chip support (DEPRECATED)"
-        depends on I2C && VIDEO_V4L1
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca ov519 module
-          instead. Note that for the ov511 / ov518 support of the gspca module
-          you need atleast version 0.6.0 of libv4l and for the w9968cf
-          atleast version 0.6.3 of libv4l.
-
-          Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
-          This driver is intended to be used with the ov511 and w9968cf USB
-          camera drivers.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ovcamchip.
-
-config USB_W9968CF
-        tristate "USB W996[87]CF JPEG Dual Mode Camera support (DEPRECATED)"
-        depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca ov519 module
-          instead. Note that for the w9968cf support of the gspca module
-          you need atleast version 0.6.3 of libv4l.
-
-          Say Y here if you want support for cameras based on OV681 or
-          Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
-
-          This driver has an optional plugin, which is distributed as a
-          separate module only (released under GPL). It allows to use higher
-          resolutions and framerates, but cannot be included in the official
-          Linux kernel for performance purposes.
-
-          See <file:Documentation/video4linux/w9968cf.txt> for more info.
-
-          To compile this driver as a module, choose M here: the
-          module will be called w9968cf.
-
-config USB_OV511
-        tristate "USB OV511 Camera support (DEPRECATED)"
-        depends on VIDEO_V4L1
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca ov519 module
-          instead. Note that for the ov511 / ov518 support of the gspca module
-          you need atleast version 0.6.0 of libv4l.
-
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. See <file:Documentation/video4linux/ov511.txt>
-          for more information and for a list of supported cameras.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ov511.
-
 config USB_SE401
         tristate "USB SE401 Camera support"
         depends on VIDEO_V4L1
@@ -1081,25 +953,6 @@ config USB_SE401
 
 source "drivers/media/video/sn9c102/Kconfig"
 
-config USB_STV680
-        tristate "USB STV680 (Pencam) Camera support (DEPRECATED)"
-        depends on VIDEO_V4L1
-        default n
-        ---help---
-          This driver is DEPRECATED please use the gspca stv0680 module
-          instead. Note that for the gspca stv0680 module you need
-          atleast version 0.6.3 of libv4l.
-
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. This includes the Pencam line of cameras.
-          See <file:Documentation/video4linux/stv680.txt> for more information
-          and for a list of supported cameras.
-
-          To compile this driver as a module, choose M here: the
-          module will be called stv680.
-
-source "drivers/media/video/zc0301/Kconfig"
-
 source "drivers/media/video/pwc/Kconfig"
 
 config USB_ZR364XX