19 files changed, 208 insertions, 93 deletions

diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/include/linux/dvb/Kbuild
+++ /dev/null
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
deleted file mode 100644
index 0be6d8f2b52b..000000000000
--- a/include/linux/dvb/dmx.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * dmx.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-#ifndef _DVBDMX_H_
-#define _DVBDMX_H_
-
-#include <linux/time.h>
-#include <uapi/linux/dvb/dmx.h>
-
-#endif /*_DVBDMX_H_*/
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
deleted file mode 100644
index 85c20d925696..000000000000
--- a/include/linux/dvb/video.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * video.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-#ifndef _DVBVIDEO_H_
-#define _DVBVIDEO_H_
-
-#include <linux/compiler.h>
-#include <uapi/linux/dvb/video.h>
-
-#endif /*_DVBVIDEO_H_*/
diff --git a/include/media/adp1653.h b/include/media/adp1653.h
index 50a1af88aed0..1d9b48a3bd80 100644
--- a/include/media/adp1653.h
+++ b/include/media/adp1653.h
@@ -3,10 +3,10 @@
  *
  * Copyright (C) 2008--2011 Nokia Corporation
  *
- * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
+ * Contact: Sakari Ailus <sakari.ailus@iki.fi>
  *
  * Contributors:
- *      Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
+ *      Sakari Ailus <sakari.ailus@iki.fi>
  *      Tuukka Toivonen <tuukkat76@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/include/media/davinci/vpbe_display.h b/include/media/davinci/vpbe_display.h
index dbf6b37682cd..8dffffedbb59 100644
--- a/include/media/davinci/vpbe_display.h
+++ b/include/media/davinci/vpbe_display.h
@@ -16,7 +16,7 @@
 /* Header files */
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
-#include <media/videobuf-dma-contig.h>
+#include <media/videobuf2-dma-contig.h>
 #include <media/davinci/vpbe_types.h>
 #include <media/davinci/vpbe_osd.h>
 #include <media/davinci/vpbe.h>
@@ -62,6 +62,11 @@ struct display_layer_info {
         enum osd_v_exp_ratio v_exp;
 };
 
+struct vpbe_disp_buffer {
+        struct vb2_buffer vb;
+        struct list_head list;
+};
+
 /* vpbe display object structure */
 struct vpbe_layer {
         /* number of buffers in fbuffers */
@@ -69,13 +74,15 @@ struct vpbe_layer {
         /* Pointer to the vpbe_display */
         struct vpbe_display *disp_dev;
         /* Pointer pointing to current v4l2_buffer */
-        struct videobuf_buffer *cur_frm;
+        struct vpbe_disp_buffer *cur_frm;
         /* Pointer pointing to next v4l2_buffer */
-        struct videobuf_buffer *next_frm;
+        struct vpbe_disp_buffer *next_frm;
         /* videobuf specific parameters
          * Buffer queue used in video-buf
          */
-        struct videobuf_queue buffer_queue;
+        struct vb2_queue buffer_queue;
+        /* allocator-specific contexts for each plane */
+        struct vb2_alloc_ctx *alloc_ctx;
         /* Queue of filled frames */
         struct list_head dma_queue;
         /* Used in video-buf */
diff --git a/include/media/davinci/vpbe_osd.h b/include/media/davinci/vpbe_osd.h
index d7e397a444e6..5ab0d8d41f68 100644
--- a/include/media/davinci/vpbe_osd.h
+++ b/include/media/davinci/vpbe_osd.h
@@ -357,7 +357,7 @@ struct osd_state {
         spinlock_t lock;
         struct device *dev;
         dma_addr_t osd_base_phys;
-        unsigned long osd_base;
+        void __iomem *osd_base;
         unsigned long osd_size;
         /* 1-->the isr will toggle the VID0 ping-pong buffer */
         int pingpong;
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 768aa77925cd..e221bc74020b 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -37,7 +37,7 @@ enum ir_kbd_get_key_fn {
 struct IR_i2c_init_data {
         char                    *ir_codes;
         const char              *name;
-        u64                     type; /* RC_TYPE_RC5, etc */
+        u64                     type; /* RC_BIT_RC5, etc */
         u32                     polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */
 
         /*
diff --git a/include/media/mt9v022.h b/include/media/mt9v022.h
new file mode 100644
index 000000000000..40561801321a
--- /dev/null
+++ b/include/media/mt9v022.h
@@ -0,0 +1,16 @@
+/*
+ * mt9v022 sensor
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __MT9V022_H__
+#define __MT9V022_H__
+
+struct mt9v022_platform_data {
+        unsigned short y_skip_top;      /* Lines to skip at the top */
+};
+
+#endif
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index b0c494a69079..f03445f3c767 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -50,7 +50,7 @@ enum rc_driver_type {
  * @input_dev: the input child device used to communicate events to userspace
  * @driver_type: specifies if protocol decoding is done in hardware or software
  * @idle: used to keep track of RX state
- * @allowed_protos: bitmask with the supported RC_TYPE_* protocols
+ * @allowed_protos: bitmask with the supported RC_BIT_* protocols
  * @scanmask: some hardware decoders are not capable of providing the full
  *      scancode to the application. As this is a hardware limit, we can't do
  *      anything with it. Yet, as the same keycode table can be used with other
@@ -113,7 +113,7 @@ struct rc_dev {
         u32                             max_timeout;
         u32                             rx_resolution;
         u32                             tx_resolution;
-        int                             (*change_protocol)(struct rc_dev *dev, u64 rc_type);
+        int                             (*change_protocol)(struct rc_dev *dev, u64 *rc_type);
         int                             (*open)(struct rc_dev *dev);
         void                            (*close)(struct rc_dev *dev);
         int                             (*s_tx_mask)(struct rc_dev *dev, u32 mask);
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index cfd5163ff7f3..74f55a3f14eb 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -11,22 +11,54 @@
 
 #include <linux/input.h>
 
-#define RC_TYPE_UNKNOWN 0
-#define RC_TYPE_RC5     (1  << 0)       /* Philips RC5 protocol */
-#define RC_TYPE_NEC     (1  << 1)
-#define RC_TYPE_RC6     (1  << 2)       /* Philips RC6 protocol */
-#define RC_TYPE_JVC     (1  << 3)       /* JVC protocol */
-#define RC_TYPE_SONY    (1  << 4)       /* Sony12/15/20 protocol */
-#define RC_TYPE_RC5_SZ  (1  << 5)       /* RC5 variant used by Streamzap */
-#define RC_TYPE_SANYO   (1  << 6)       /* Sanyo protocol */
-#define RC_TYPE_MCE_KBD (1  << 29)      /* RC6-ish MCE keyboard/mouse */
-#define RC_TYPE_LIRC    (1  << 30)      /* Pass raw IR to lirc userspace */
-#define RC_TYPE_OTHER   (1u << 31)
+enum rc_type {
+        RC_TYPE_UNKNOWN         = 0,    /* Protocol not known */
+        RC_TYPE_OTHER           = 1,    /* Protocol known but proprietary */
+        RC_TYPE_LIRC            = 2,    /* Pass raw IR to lirc userspace */
+        RC_TYPE_RC5             = 3,    /* Philips RC5 protocol */
+        RC_TYPE_RC5X            = 4,    /* Philips RC5x protocol */
+        RC_TYPE_RC5_SZ          = 5,    /* StreamZap variant of RC5 */
+        RC_TYPE_JVC             = 6,    /* JVC protocol */
+        RC_TYPE_SONY12          = 7,    /* Sony 12 bit protocol */
+        RC_TYPE_SONY15          = 8,    /* Sony 15 bit protocol */
+        RC_TYPE_SONY20          = 9,    /* Sony 20 bit protocol */
+        RC_TYPE_NEC             = 10,   /* NEC protocol */
+        RC_TYPE_SANYO           = 11,   /* Sanyo protocol */
+        RC_TYPE_MCE_KBD         = 12,   /* RC6-ish MCE keyboard/mouse */
+        RC_TYPE_RC6_0           = 13,   /* Philips RC6-0-16 protocol */
+        RC_TYPE_RC6_6A_20       = 14,   /* Philips RC6-6A-20 protocol */
+        RC_TYPE_RC6_6A_24       = 15,   /* Philips RC6-6A-24 protocol */
+        RC_TYPE_RC6_6A_32       = 16,   /* Philips RC6-6A-32 protocol */
+        RC_TYPE_RC6_MCE         = 17,   /* MCE (Philips RC6-6A-32 subtype) protocol */
+};
+
+#define RC_BIT_NONE             0
+#define RC_BIT_UNKNOWN          (1 << RC_TYPE_UNKNOWN)
+#define RC_BIT_OTHER            (1 << RC_TYPE_OTHER)
+#define RC_BIT_LIRC             (1 << RC_TYPE_LIRC)
+#define RC_BIT_RC5              (1 << RC_TYPE_RC5)
+#define RC_BIT_RC5X             (1 << RC_TYPE_RC5X)
+#define RC_BIT_RC5_SZ           (1 << RC_TYPE_RC5_SZ)
+#define RC_BIT_JVC              (1 << RC_TYPE_JVC)
+#define RC_BIT_SONY12           (1 << RC_TYPE_SONY12)
+#define RC_BIT_SONY15           (1 << RC_TYPE_SONY15)
+#define RC_BIT_SONY20           (1 << RC_TYPE_SONY20)
+#define RC_BIT_NEC              (1 << RC_TYPE_NEC)
+#define RC_BIT_SANYO            (1 << RC_TYPE_SANYO)
+#define RC_BIT_MCE_KBD          (1 << RC_TYPE_MCE_KBD)
+#define RC_BIT_RC6_0            (1 << RC_TYPE_RC6_0)
+#define RC_BIT_RC6_6A_20        (1 << RC_TYPE_RC6_6A_20)
+#define RC_BIT_RC6_6A_24        (1 << RC_TYPE_RC6_6A_24)
+#define RC_BIT_RC6_6A_32        (1 << RC_TYPE_RC6_6A_32)
+#define RC_BIT_RC6_MCE          (1 << RC_TYPE_RC6_MCE)
 
-#define RC_TYPE_ALL (RC_TYPE_RC5    | RC_TYPE_NEC   | RC_TYPE_RC6     | \
-                     RC_TYPE_JVC    | RC_TYPE_SONY  | RC_TYPE_LIRC    | \
-                     RC_TYPE_RC5_SZ | RC_TYPE_SANYO | RC_TYPE_MCE_KBD | \
-                     RC_TYPE_OTHER)
+#define RC_BIT_ALL      (RC_BIT_UNKNOWN | RC_BIT_OTHER | RC_BIT_LIRC | \
+                         RC_BIT_RC5 | RC_BIT_RC5X | RC_BIT_RC5_SZ | \
+                         RC_BIT_JVC | \
+                         RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20 | \
+                         RC_BIT_NEC | RC_BIT_SANYO | RC_BIT_MCE_KBD | \
+                         RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | \
+                         RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE)
 
 struct rc_map_table {
         u32     scancode;
@@ -38,7 +70,7 @@ struct rc_map {
         unsigned int            size;   /* Max number of entries */
         unsigned int            len;    /* Used number of entries */
         unsigned int            alloc;  /* Size of *scan in bytes */
-        u64                     rc_type;
+        enum rc_type            rc_type;
         const char              *name;
         spinlock_t              lock;
 };
diff --git a/include/media/s3c_camif.h b/include/media/s3c_camif.h
new file mode 100644
index 000000000000..df96c2c789b4
--- /dev/null
+++ b/include/media/s3c_camif.h
@@ -0,0 +1,45 @@
+/*
+ * s3c24xx/s3c64xx SoC series Camera Interface (CAMIF) driver
+ *
+ * Copyright (C) 2012 Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef MEDIA_S3C_CAMIF_
+#define MEDIA_S3C_CAMIF_
+
+#include <linux/i2c.h>
+#include <media/v4l2-mediabus.h>
+
+/**
+ * struct s3c_camif_sensor_info - an image sensor description
+ * @i2c_board_info: pointer to an I2C sensor subdevice board info
+ * @clock_frequency: frequency of the clock the host provides to a sensor
+ * @mbus_type: media bus type
+ * @i2c_bus_num: i2c control bus id the sensor is attached to
+ * @flags: the parallel bus flags defining signals polarity (V4L2_MBUS_*)
+ * @use_field: 1 if parallel bus FIELD signal is used (only s3c64xx)
+ */
+struct s3c_camif_sensor_info {
+        struct i2c_board_info i2c_board_info;
+        unsigned long clock_frequency;
+        enum v4l2_mbus_type mbus_type;
+        u16 i2c_bus_num;
+        u16 flags;
+        u8 use_field;
+};
+
+struct s3c_camif_plat_data {
+        struct s3c_camif_sensor_info sensor;
+        int (*gpio_get)(void);
+        int (*gpio_put)(void);
+};
+
+/* Platform default helper functions */
+int s3c_camif_gpio_get(void);
+int s3c_camif_gpio_put(void);
+
+#endif /* MEDIA_S3C_CAMIF_ */
diff --git a/include/media/smiapp.h b/include/media/smiapp.h
index 9ab07fd45d5c..07f96a89e189 100644
--- a/include/media/smiapp.h
+++ b/include/media/smiapp.h
@@ -4,7 +4,7 @@
  * Generic driver for SMIA/SMIA++ compliant camera modules
  *
  * Copyright (C) 2011--2012 Nokia Corporation
- * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
+ * Contact: Sakari Ailus <sakari.ailus@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h
index e7c5d170a9cd..eff85f934b24 100644
--- a/include/media/v4l2-event.h
+++ b/include/media/v4l2-event.h
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2009--2010 Nokia Corporation.
  *
- * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
+ * Contact: Sakari Ailus <sakari.ailus@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h
index 52513c225c18..a62ee18cb7b7 100644
--- a/include/media/v4l2-fh.h
+++ b/include/media/v4l2-fh.h
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 2009--2010 Nokia Corporation.
  *
- * Contact: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
+ * Contact: Sakari Ailus <sakari.ailus@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index e48b571ca37d..4118ad1324c9 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -111,6 +111,8 @@ struct v4l2_ioctl_ops {
         int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
         int (*vidioc_querybuf)(struct file *file, void *fh, struct v4l2_buffer *b);
         int (*vidioc_qbuf)    (struct file *file, void *fh, struct v4l2_buffer *b);
+        int (*vidioc_expbuf)  (struct file *file, void *fh,
+                                struct v4l2_exportbuffer *e);
         int (*vidioc_dqbuf)   (struct file *file, void *fh, struct v4l2_buffer *b);
 
         int (*vidioc_create_bufs)(struct file *file, void *fh, struct v4l2_create_buffers *b);
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
index 131cc4a53675..7e82d2b193d5 100644
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
@@ -111,6 +111,9 @@ int v4l2_m2m_qbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
 int v4l2_m2m_dqbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                    struct v4l2_buffer *buf);
 
+int v4l2_m2m_expbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
+                   struct v4l2_exportbuffer *eb);
+
 int v4l2_m2m_streamon(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                       enum v4l2_buf_type type);
 int v4l2_m2m_streamoff(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index e04252a9fea6..9cfd4ee9e56f 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -16,6 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/poll.h>
 #include <linux/videodev2.h>
+#include <linux/dma-buf.h>
 
 struct vb2_alloc_ctx;
 struct vb2_fileio_data;
@@ -41,6 +42,24 @@ struct vb2_fileio_data;
  *               argument to other ops in this structure
  * @put_userptr: inform the allocator that a USERPTR buffer will no longer
  *               be used
+ * @attach_dmabuf: attach a shared struct dma_buf for a hardware operation;
+ *                 used for DMABUF memory types; alloc_ctx is the alloc context
+ *                 dbuf is the shared dma_buf; returns NULL on failure;
+ *                 allocator private per-buffer structure on success;
+ *                 this needs to be used for further accesses to the buffer
+ * @detach_dmabuf: inform the exporter of the buffer that the current DMABUF
+ *                 buffer is no longer used; the buf_priv argument is the
+ *                 allocator private per-buffer structure previously returned
+ *                 from the attach_dmabuf callback
+ * @map_dmabuf: request for access to the dmabuf from allocator; the allocator
+ *              of dmabuf is informed that this driver is going to use the
+ *              dmabuf
+ * @unmap_dmabuf: releases access control to the dmabuf - allocator is notified
+ *                that this driver is done using the dmabuf for now
+ * @prepare:    called every time the buffer is passed from userspace to the
+ *              driver, useful for cache synchronisation, optional
+ * @finish:     called every time the buffer is passed back from the driver
+ *              to the userspace, also optional
  * @vaddr:      return a kernel virtual address to a given memory buffer
  *              associated with the passed private structure or NULL if no
  *              such mapping exists
@@ -56,15 +75,27 @@ struct vb2_fileio_data;
  * Required ops for USERPTR types: get_userptr, put_userptr.
  * Required ops for MMAP types: alloc, put, num_users, mmap.
  * Required ops for read/write access types: alloc, put, num_users, vaddr
+ * Required ops for DMABUF types: attach_dmabuf, detach_dmabuf, map_dmabuf,
+ *                                unmap_dmabuf.
  */
 struct vb2_mem_ops {
         void            *(*alloc)(void *alloc_ctx, unsigned long size);
         void            (*put)(void *buf_priv);
+        struct dma_buf *(*get_dmabuf)(void *buf_priv);
 
         void            *(*get_userptr)(void *alloc_ctx, unsigned long vaddr,
                                         unsigned long size, int write);
         void            (*put_userptr)(void *buf_priv);
 
+        void            (*prepare)(void *buf_priv);
+        void            (*finish)(void *buf_priv);
+
+        void            *(*attach_dmabuf)(void *alloc_ctx, struct dma_buf *dbuf,
+                                unsigned long size, int write);
+        void            (*detach_dmabuf)(void *buf_priv);
+        int             (*map_dmabuf)(void *buf_priv);
+        void            (*unmap_dmabuf)(void *buf_priv);
+
         void            *(*vaddr)(void *buf_priv);
         void            *(*cookie)(void *buf_priv);
 
@@ -75,6 +106,8 @@ struct vb2_mem_ops {
 
 struct vb2_plane {
         void                    *mem_priv;
+        struct dma_buf          *dbuf;
+        unsigned int            dbuf_mapped;
 };
 
 /**
@@ -83,12 +116,14 @@ struct vb2_plane {
  * @VB2_USERPTR:        driver supports USERPTR with streaming API
  * @VB2_READ:           driver supports read() style access
  * @VB2_WRITE:          driver supports write() style access
+ * @VB2_DMABUF:         driver supports DMABUF with streaming API
  */
 enum vb2_io_modes {
         VB2_MMAP        = (1 << 0),
         VB2_USERPTR     = (1 << 1),
         VB2_READ        = (1 << 2),
         VB2_WRITE       = (1 << 3),
+        VB2_DMABUF      = (1 << 4),
 };
 
 /**
@@ -329,6 +364,7 @@ int __must_check vb2_queue_init(struct vb2_queue *q);
 void vb2_queue_release(struct vb2_queue *q);
 
 int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b);
+int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb);
 int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking);
 
 int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
@@ -438,6 +474,8 @@ int vb2_ioctl_qbuf(struct file *file, void *priv, struct v4l2_buffer *p);
 int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p);
 int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i);
 int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i);
+int vb2_ioctl_expbuf(struct file *file, void *priv,
+        struct v4l2_exportbuffer *p);
 
 /* struct v4l2_file_operations helpers */
 
diff --git a/include/media/videobuf2-memops.h b/include/media/videobuf2-memops.h
index 84e1f6c031c5..f05444ca8c0c 100644
--- a/include/media/videobuf2-memops.h
+++ b/include/media/videobuf2-memops.h
@@ -33,11 +33,6 @@ extern const struct vm_operations_struct vb2_common_vm_ops;
 int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size,
                            struct vm_area_struct **res_vma, dma_addr_t *res_pa);
 
-int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
-                                unsigned long size,
-                                const struct vm_operations_struct *vm_ops,
-                                void *priv);
-
 struct vm_area_struct *vb2_get_vma(struct vm_area_struct *vma);
 void vb2_put_vma(struct vm_area_struct *vma);
 
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 57bfa59cda74..3cf3e946e331 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -186,6 +186,7 @@ enum v4l2_memory {
         V4L2_MEMORY_MMAP             = 1,
         V4L2_MEMORY_USERPTR          = 2,
         V4L2_MEMORY_OVERLAY          = 3,
+        V4L2_MEMORY_DMABUF           = 4,
 };
 
 /* see also http://vektor.theorem.ca/graphics/ycbcr/ */
@@ -602,6 +603,8 @@ struct v4l2_requestbuffers {
  *                      should be passed to mmap() called on the video node)
  * @userptr:            when memory is V4L2_MEMORY_USERPTR, a userspace pointer
  *                      pointing to this plane
+ * @fd:                 when memory is V4L2_MEMORY_DMABUF, a userspace file
+ *                      descriptor associated with this plane
  * @data_offset:        offset in the plane to the start of data; usually 0,
  *                      unless there is a header in front of the data
  *
@@ -616,6 +619,7 @@ struct v4l2_plane {
         union {
                 __u32           mem_offset;
                 unsigned long   userptr;
+                __s32           fd;
         } m;
         __u32                   data_offset;
         __u32                   reserved[11];
@@ -640,6 +644,8 @@ struct v4l2_plane {
  *              (or a "cookie" that should be passed to mmap() as offset)
  * @userptr:    for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
  *              a userspace pointer pointing to this buffer
+ * @fd:         for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF;
+ *              a userspace file descriptor associated with this buffer
  * @planes:     for multiplanar buffers; userspace pointer to the array of plane
  *              info structs for this buffer
  * @length:     size in bytes of the buffer (NOT its payload) for single-plane
@@ -666,6 +672,7 @@ struct v4l2_buffer {
                 __u32           offset;
                 unsigned long   userptr;
                 struct v4l2_plane *planes;
+                __s32           fd;
         } m;
         __u32                   length;
         __u32                   reserved2;
@@ -687,6 +694,33 @@ struct v4l2_buffer {
 #define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE       0x0800
 #define V4L2_BUF_FLAG_NO_CACHE_CLEAN            0x1000
 
+/**
+ * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor
+ *
+ * @index:      id number of the buffer
+ * @type:       enum v4l2_buf_type; buffer type (type == *_MPLANE for
+ *              multiplanar buffers);
+ * @plane:      index of the plane to be exported, 0 for single plane queues
+ * @flags:      flags for newly created file, currently only O_CLOEXEC is
+ *              supported, refer to manual of open syscall for more details
+ * @fd:         file descriptor associated with DMABUF (set by driver)
+ *
+ * Contains data used for exporting a video buffer as DMABUF file descriptor.
+ * The buffer is identified by a 'cookie' returned by VIDIOC_QUERYBUF
+ * (identical to the cookie used to mmap() the buffer to userspace). All
+ * reserved fields must be set to zero. The field reserved0 is expected to
+ * become a structure 'type' allowing an alternative layout of the structure
+ * content. Therefore this field should not be used for any other extensions.
+ */
+struct v4l2_exportbuffer {
+        __u32           type; /* enum v4l2_buf_type */
+        __u32           index;
+        __u32           plane;
+        __u32           flags;
+        __s32           fd;
+        __u32           reserved[11];
+};
+
 /*
  *      O V E R L A Y   P R E V I E W
  */
@@ -737,7 +771,7 @@ struct v4l2_window {
 struct v4l2_captureparm {
         __u32              capability;    /*  Supported modes */
         __u32              capturemode;   /*  Current mode */
-        struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
+        struct v4l2_fract  timeperframe;  /*  Time per frame in seconds */
         __u32              extendedmode;  /*  Driver-specific extensions */
         __u32              readbuffers;   /*  # of buffers for read */
         __u32              reserved[4];
@@ -1888,6 +1922,7 @@ struct v4l2_create_buffers {
 #define VIDIOC_S_FBUF            _IOW('V', 11, struct v4l2_framebuffer)
 #define VIDIOC_OVERLAY           _IOW('V', 14, int)
 #define VIDIOC_QBUF             _IOWR('V', 15, struct v4l2_buffer)
+#define VIDIOC_EXPBUF           _IOWR('V', 16, struct v4l2_exportbuffer)
 #define VIDIOC_DQBUF            _IOWR('V', 17, struct v4l2_buffer)
 #define VIDIOC_STREAMON          _IOW('V', 18, int)
 #define VIDIOC_STREAMOFF         _IOW('V', 19, int)