Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "This series contain:
   - new i2c video drivers: ml86v7667 (video decoder),
                            ths8200 (video encoder)
   - a new video driver for EasyCap cards based on Fushicai USBTV007
   - Improved support for OF and embedded systems, with V4L2 async
     initialization and a better support for clocks
   - API cleanups on the ioctls used by the v4l2 debug tool
   - Lots of cleanups
   - As usual, several driver improvements and new cards additions
   - Revert two changesets that change the minimal symbol rate for
     stv0399, as request by Manu
   - Update MAINTAINERS and other files to point to my new e-mail"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (378 commits)
  MAINTAINERS & ABI: Update to point to my new email
  [media] stb0899: restore minimal rate to 5Mbauds
  [media] exynos4-is: Correct colorspace handling at FIMC-LITE
  [media] exynos4-is: Set valid initial format on FIMC.n subdevs
  [media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads
  [media] exynos4-is: Fix format propagation on FIMC-IS-ISP subdev
  [media] exynos4-is: Set valid initial format at FIMC-LITE
  [media] exynos4-is: Fix format propagation on FIMC-LITE.n subdevs
  [media] MAINTAINERS: Update S5P/Exynos FIMC driver entry
  [media] Documentation: Update driver's directory in video4linux/fimc.txt
  [media] exynos4-is: Change fimc-is firmware file names
  [media] exynos4-is: Add support for Exynos5250 MIPI-CSIS
  [media] exynos4-is: Add Exynos5250 SoC support to fimc-lite driver
  [media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms
  [media] media: i2c: tvp514x: remove manual setting of subdev name
  [media] media: i2c: tvp7002: remove manual setting of subdev name
  [media] mem2mem: set missing v4l2_dev pointer
  [media] wl128x: add missing struct v4l2_device
  [media] tvp514x: Fix init seqeunce
  [media] saa7134: Fix sparse warnings by adding __user annotation
  ...

21 files changed, 299 insertions, 460 deletions

diff --git a/include/media/davinci/vpbe_osd.h b/include/media/davinci/vpbe_osd.h
index 42628fcfe1bd..de59364d7ed2 100644
--- a/include/media/davinci/vpbe_osd.h
+++ b/include/media/davinci/vpbe_osd.h
@@ -82,9 +82,9 @@ enum osd_pix_format {
         PIXFMT_4BPP,
         PIXFMT_8BPP,
         PIXFMT_RGB565,
-        PIXFMT_YCbCrI,
+        PIXFMT_YCBCRI,
         PIXFMT_RGB888,
-        PIXFMT_YCrCbI,
+        PIXFMT_YCRCBI,
         PIXFMT_NV12,
         PIXFMT_OSD_ATTR,
 };
diff --git a/include/media/media-device.h b/include/media/media-device.h
index eaade9815bb6..12155a9596c4 100644
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -45,6 +45,7 @@ struct device;
  * @entities:   List of registered entities
  * @lock:       Entities list lock
  * @graph_mutex: Entities graph operation lock
+ * @link_notify: Link state change notification callback
  *
  * This structure represents an abstract high-level media device. It allows easy
  * access to entities and provides basic media device-level support. The
@@ -75,10 +76,14 @@ struct media_device {
         /* Serializes graph operations. */
         struct mutex graph_mutex;
 
-        int (*link_notify)(struct media_pad *source,
-                           struct media_pad *sink, u32 flags);
+        int (*link_notify)(struct media_link *link, u32 flags,
+                           unsigned int notification);
 };
 
+/* Supported link_notify @notification values. */
+#define MEDIA_DEV_NOTIFY_PRE_LINK_CH    0
+#define MEDIA_DEV_NOTIFY_POST_LINK_CH   1
+
 /* media_devnode to media_device */
 #define to_media_device(node) container_of(node, struct media_device, devnode)
 
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 0c16f518ee09..06bacf937d61 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -128,11 +128,14 @@ void media_entity_cleanup(struct media_entity *entity);
 
 int media_entity_create_link(struct media_entity *source, u16 source_pad,
                 struct media_entity *sink, u16 sink_pad, u32 flags);
+void __media_entity_remove_links(struct media_entity *entity);
+void media_entity_remove_links(struct media_entity *entity);
+
 int __media_entity_setup_link(struct media_link *link, u32 flags);
 int media_entity_setup_link(struct media_link *link, u32 flags);
 struct media_link *media_entity_find_link(struct media_pad *source,
                 struct media_pad *sink);
-struct media_pad *media_entity_remote_source(struct media_pad *pad);
+struct media_pad *media_entity_remote_pad(struct media_pad *pad);
 
 struct media_entity *media_entity_get(struct media_entity *entity);
 void media_entity_put(struct media_entity *entity);
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 5d5d3a30f04a..6628f5d01f52 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -111,6 +111,7 @@ void rc_map_init(void);
 #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"
 #define RC_MAP_CINERGY_1400              "rc-cinergy-1400"
 #define RC_MAP_CINERGY                   "rc-cinergy"
+#define RC_MAP_DELOCK_61959              "rc-delock-61959"
 #define RC_MAP_DIB0700_NEC_TABLE         "rc-dib0700-nec"
 #define RC_MAP_DIB0700_RC5_TABLE         "rc-dib0700-rc5"
 #define RC_MAP_DIGITALNOW_TINYTWIN       "rc-digitalnow-tinytwin"
diff --git a/include/media/s5p_fimc.h b/include/media/s5p_fimc.h
index f50969025ef3..b975c285c8a9 100644
--- a/include/media/s5p_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -13,6 +13,7 @@
 #define S5P_FIMC_H_
 
 #include <media/media-entity.h>
+#include <media/v4l2-dev.h>
 #include <media/v4l2-mediabus.h>
 
 /*
@@ -115,6 +116,7 @@ struct s5p_platform_fimc {
  * @color: the driver's private color format id
  * @memplanes: number of physically non-contiguous data planes
  * @colplanes: number of physically contiguous data planes
+ * @colorspace: v4l2 colorspace (V4L2_COLORSPACE_*)
  * @depth: per plane driver's private 'number of bits per pixel'
  * @mdataplanes: bitmask indicating meta data plane(s), (1 << plane_no)
  * @flags: flags indicating which operation mode format applies to
@@ -126,6 +128,7 @@ struct fimc_fmt {
         u32     color;
         u16     memplanes;
         u16     colplanes;
+        u8      colorspace;
         u8      depth[FIMC_MAX_PLANES];
         u16     mdataplanes;
         u16     flags;
@@ -140,37 +143,40 @@ struct fimc_fmt {
 #define FMT_FLAGS_YUV           (1 << 7)
 };
 
-enum fimc_subdev_index {
-        IDX_SENSOR,
-        IDX_CSIS,
-        IDX_FLITE,
-        IDX_IS_ISP,
-        IDX_FIMC,
-        IDX_MAX,
-};
+struct exynos_media_pipeline;
 
-struct media_pipeline;
-struct v4l2_subdev;
+/*
+ * Media pipeline operations to be called from within a video node,  i.e. the
+ * last entity within the pipeline. Implemented by related media device driver.
+ */
+struct exynos_media_pipeline_ops {
+        int (*prepare)(struct exynos_media_pipeline *p,
+                                                struct media_entity *me);
+        int (*unprepare)(struct exynos_media_pipeline *p);
+        int (*open)(struct exynos_media_pipeline *p, struct media_entity *me,
+                                                        bool resume);
+        int (*close)(struct exynos_media_pipeline *p);
+        int (*set_stream)(struct exynos_media_pipeline *p, bool state);
+};
 
-struct fimc_pipeline {
-        struct v4l2_subdev *subdevs[IDX_MAX];
-        struct media_pipeline *m_pipeline;
+struct exynos_video_entity {
+        struct video_device vdev;
+        struct exynos_media_pipeline *pipe;
 };
 
-/*
- * Media pipeline operations to be called from within the fimc(-lite)
- * video node when it is the last entity of the pipeline. Implemented
- * by corresponding media device driver.
- */
-struct fimc_pipeline_ops {
-        int (*open)(struct fimc_pipeline *p, struct media_entity *me,
-                          bool resume);
-        int (*close)(struct fimc_pipeline *p);
-        int (*set_stream)(struct fimc_pipeline *p, bool state);
+struct exynos_media_pipeline {
+        struct media_pipeline mp;
+        const struct exynos_media_pipeline_ops *ops;
 };
 
-#define fimc_pipeline_call(f, op, p, args...)                           \
-        (!(f) ? -ENODEV : (((f)->pipeline_ops && (f)->pipeline_ops->op) ? \
-                            (f)->pipeline_ops->op((p), ##args) : -ENOIOCTLCMD))
+static inline struct exynos_video_entity *vdev_to_exynos_video_entity(
+                                        struct video_device *vdev)
+{
+        return container_of(vdev, struct exynos_video_entity, vdev);
+}
+
+#define fimc_pipeline_call(ent, op, args...)                              \
+        (!(ent) ? -ENOENT : (((ent)->pipe->ops && (ent)->pipe->ops->op) ? \
+        (ent)->pipe->ops->op(((ent)->pipe), ##args) : -ENOIOCTLCMD))      \
 
 #endif /* S5P_FIMC_H_ */
diff --git a/include/media/sh_mobile_ceu.h b/include/media/sh_mobile_ceu.h
index 6fdb6adf6b2b..7f57056c22ba 100644
--- a/include/media/sh_mobile_ceu.h
+++ b/include/media/sh_mobile_ceu.h
@@ -22,6 +22,8 @@ struct sh_mobile_ceu_info {
         int max_width;
         int max_height;
         struct sh_mobile_ceu_companion *csi2;
+        struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
+        unsigned int *asd_sizes;        /* 0-terminated array pf asd group sizes */
 };
 
 #endif /* __ASM_SH_MOBILE_CEU_H__ */
diff --git a/include/media/sh_mobile_csi2.h b/include/media/sh_mobile_csi2.h
index c586c4f7f16b..14030db51f13 100644
--- a/include/media/sh_mobile_csi2.h
+++ b/include/media/sh_mobile_csi2.h
@@ -33,6 +33,7 @@ struct sh_csi2_client_config {
         unsigned char lanes;            /* bitmask[3:0] */
         unsigned char channel;          /* 0..3 */
         struct platform_device *pdev;   /* client platform device */
+        const char *name;               /* async matching: client name */
 };
 
 struct v4l2_device;
@@ -42,7 +43,6 @@ struct sh_csi2_pdata {
         unsigned int flags;
         struct sh_csi2_client_config *clients;
         int num_clients;
-        struct v4l2_device *v4l2_dev;
 };
 
 #endif
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index ff77d08c30fd..34d2414f2b8c 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -19,11 +19,13 @@
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf2-core.h>
+#include <media/v4l2-async.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 
 struct file;
 struct soc_camera_desc;
+struct soc_camera_async_client;
 
 struct soc_camera_device {
         struct list_head list;          /* list of all registered devices */
@@ -49,6 +51,10 @@ struct soc_camera_device {
         /* soc_camera.c private count. Only accessed with .host_lock held */
         int use_count;
         struct file *streamer;          /* stream owner */
+        struct v4l2_clk *clk;
+        /* Asynchronous subdevice management */
+        struct soc_camera_async_client *sasc;
+        /* video buffer queue */
         union {
                 struct videobuf_queue vb_vidq;
                 struct vb2_queue vb2_vidq;
@@ -58,21 +64,38 @@ struct soc_camera_device {
 /* Host supports programmable stride */
 #define SOCAM_HOST_CAP_STRIDE           (1 << 0)
 
+enum soc_camera_subdev_role {
+        SOCAM_SUBDEV_DATA_SOURCE = 1,
+        SOCAM_SUBDEV_DATA_SINK,
+        SOCAM_SUBDEV_DATA_PROCESSOR,
+};
+
+struct soc_camera_async_subdev {
+        struct v4l2_async_subdev asd;
+        enum soc_camera_subdev_role role;
+};
+
 struct soc_camera_host {
         struct v4l2_device v4l2_dev;
         struct list_head list;
-        struct mutex host_lock;         /* Protect pipeline modifications */
+        struct mutex host_lock;         /* Main synchronisation lock */
+        struct mutex clk_lock;          /* Protect pipeline modifications */
         unsigned char nr;               /* Host number */
         u32 capabilities;
+        struct soc_camera_device *icd;  /* Currently attached client */
         void *priv;
         const char *drv_name;
         struct soc_camera_host_ops *ops;
+        struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
+        unsigned int *asd_sizes;        /* 0-terminated array of asd group sizes */
 };
 
 struct soc_camera_host_ops {
         struct module *owner;
         int (*add)(struct soc_camera_device *);
         void (*remove)(struct soc_camera_device *);
+        int (*clock_start)(struct soc_camera_host *);
+        void (*clock_stop)(struct soc_camera_host *);
         /*
          * .get_formats() is called for each client device format, but
          * .put_formats() is only called once. Further, if any of the calls to
@@ -157,6 +180,7 @@ struct soc_camera_host_desc {
 };
 
 /*
+ * Platform data for "soc-camera-pdrv"
  * This MUST be kept binary-identical to struct soc_camera_link below, until
  * it is completely replaced by this one, after which we can split it into its
  * two components.
@@ -322,14 +346,17 @@ static inline void soc_camera_limit_side(int *start, int *length,
 unsigned long soc_camera_apply_board_flags(struct soc_camera_subdev_desc *ssdd,
                                            const struct v4l2_mbus_config *cfg);
 
-int soc_camera_power_on(struct device *dev, struct soc_camera_subdev_desc *ssdd);
-int soc_camera_power_off(struct device *dev, struct soc_camera_subdev_desc *ssdd);
+int soc_camera_power_init(struct device *dev, struct soc_camera_subdev_desc *ssdd);
+int soc_camera_power_on(struct device *dev, struct soc_camera_subdev_desc *ssdd,
+                        struct v4l2_clk *clk);
+int soc_camera_power_off(struct device *dev, struct soc_camera_subdev_desc *ssdd,
+                         struct v4l2_clk *clk);
 
 static inline int soc_camera_set_power(struct device *dev,
-                                struct soc_camera_subdev_desc *ssdd, bool on)
+                struct soc_camera_subdev_desc *ssdd, struct v4l2_clk *clk, bool on)
 {
-        return on ? soc_camera_power_on(dev, ssdd)
-                  : soc_camera_power_off(dev, ssdd);
+        return on ? soc_camera_power_on(dev, ssdd, clk)
+                  : soc_camera_power_off(dev, ssdd, clk);
 }
 
 /* This is only temporary here - until v4l2-subdev begins to link to video_device */
@@ -346,9 +373,9 @@ static inline struct soc_camera_subdev_desc *soc_camera_i2c_to_desc(const struct
         return client->dev.platform_data;
 }
 
-static inline struct v4l2_subdev *soc_camera_vdev_to_subdev(const struct video_device *vdev)
+static inline struct v4l2_subdev *soc_camera_vdev_to_subdev(struct video_device *vdev)
 {
-        struct soc_camera_device *icd = dev_get_drvdata(vdev->parent);
+        struct soc_camera_device *icd = video_get_drvdata(vdev);
         return soc_camera_to_subdev(icd);
 }
 
diff --git a/include/media/ths7303.h b/include/media/ths7303.h
index 980ec51d574d..a7b49297da82 100644
--- a/include/media/ths7303.h
+++ b/include/media/ths7303.h
@@ -30,13 +30,11 @@
  * @ch_1: Bias value for channel one.
  * @ch_2: Bias value for channel two.
  * @ch_3: Bias value for channel three.
- * @init_enable: initalize on init.
  */
 struct ths7303_platform_data {
         u8 ch_1;
         u8 ch_2;
         u8 ch_3;
-        u8 init_enable;
 };
 
 #endif
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index a8ad75a9152a..4a1191abd936 100644
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -1,6 +1,17 @@
 /*
  */
 
+enum tveeprom_audio_processor {
+        /* No audio processor present */
+        TVEEPROM_AUDPROC_NONE,
+        /* The audio processor is internal to the video processor */
+        TVEEPROM_AUDPROC_INTERNAL,
+        /* The audio processor is a MSPXXXX device */
+        TVEEPROM_AUDPROC_MSP,
+        /* The audio processor is another device */
+        TVEEPROM_AUDPROC_OTHER,
+};
+
 struct tveeprom {
         u32 has_radio;
         /* If has_ir == 0, then it is unknown what the IR capabilities are,
diff --git a/include/media/tvp7002.h b/include/media/tvp7002.h
index ee4353459ef5..fadb6afe9ef0 100644
--- a/include/media/tvp7002.h
+++ b/include/media/tvp7002.h
@@ -26,31 +26,29 @@
 #ifndef _TVP7002_H_
 #define _TVP7002_H_
 
-/* Platform-dependent data
- *
- * clk_polarity:
- *                      0 -> data clocked out on rising edge of DATACLK signal
- *                      1 -> data clocked out on falling edge of DATACLK signal
- * hs_polarity:
- *                      0 -> active low HSYNC output
- *                      1 -> active high HSYNC output
- * sog_polarity:
- *                      0 -> normal operation
- *                      1 -> operation with polarity inverted
- * vs_polarity:
- *                      0 -> active low VSYNC output
- *                      1 -> active high VSYNC output
- * fid_polarity:
- *                      0 -> the field ID output is set to logic 1 for an odd
- *                           field (field 1) and set to logic 0 for an even
- *                           field (field 0).
- *                      1 -> operation with polarity inverted.
+#define TVP7002_MODULE_NAME "tvp7002"
+
+/**
+ * struct tvp7002_config - Platform dependent data
+ *@clk_polarity: Clock polarity
+ *              0 - Data clocked out on rising edge of DATACLK signal
+ *              1 - Data clocked out on falling edge of DATACLK signal
+ *@hs_polarity:  HSYNC polarity
+ *              0 - Active low HSYNC output, 1 - Active high HSYNC output
+ *@vs_polarity: VSYNC Polarity
+ *              0 - Active low VSYNC output, 1 - Active high VSYNC output
+ *@fid_polarity: Active-high Field ID polarity.
+ *              0 - The field ID output is set to logic 1 for an odd field
+ *                  (field 1) and set to logic 0 for an even field (field 0).
+ *              1 - Operation with polarity inverted.
+ *@sog_polarity: Active high Sync on Green output polarity.
+ *              0 - Normal operation, 1 - Operation with polarity inverted
  */
 struct tvp7002_config {
-        u8 clk_polarity;
-        u8 hs_polarity;
-        u8 vs_polarity;
-        u8 fid_polarity;
-        u8 sog_polarity;
+        bool clk_polarity;
+        bool hs_polarity;
+        bool vs_polarity;
+        bool fid_polarity;
+        bool sog_polarity;
 };
 #endif
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
new file mode 100644
index 000000000000..c3ec6ac75f7e
--- /dev/null
+++ b/include/media/v4l2-async.h
@@ -0,0 +1,105 @@
+/*
+ * V4L2 asynchronous subdevice registration API
+ *
+ * Copyright (C) 2012-2013, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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 V4L2_ASYNC_H
+#define V4L2_ASYNC_H
+
+#include <linux/list.h>
+#include <linux/mutex.h>
+
+struct device;
+struct v4l2_device;
+struct v4l2_subdev;
+struct v4l2_async_notifier;
+
+/* A random max subdevice number, used to allocate an array on stack */
+#define V4L2_MAX_SUBDEVS 128U
+
+enum v4l2_async_bus_type {
+        V4L2_ASYNC_BUS_CUSTOM,
+        V4L2_ASYNC_BUS_PLATFORM,
+        V4L2_ASYNC_BUS_I2C,
+};
+
+/**
+ * struct v4l2_async_subdev - sub-device descriptor, as known to a bridge
+ * @bus_type:   subdevice bus type to select the appropriate matching method
+ * @match:      union of per-bus type matching data sets
+ * @list:       used to link struct v4l2_async_subdev objects, waiting to be
+ *              probed, to a notifier->waiting list
+ */
+struct v4l2_async_subdev {
+        enum v4l2_async_bus_type bus_type;
+        union {
+                struct {
+                        const char *name;
+                } platform;
+                struct {
+                        int adapter_id;
+                        unsigned short address;
+                } i2c;
+                struct {
+                        bool (*match)(struct device *,
+                                      struct v4l2_async_subdev *);
+                        void *priv;
+                } custom;
+        } match;
+
+        /* v4l2-async core private: not to be used by drivers */
+        struct list_head list;
+};
+
+/**
+ * v4l2_async_subdev_list - provided by subdevices
+ * @list:       links struct v4l2_async_subdev_list objects to a global list
+ *              before probing, and onto notifier->done after probing
+ * @asd:        pointer to respective struct v4l2_async_subdev
+ * @notifier:   pointer to managing notifier
+ */
+struct v4l2_async_subdev_list {
+        struct list_head list;
+        struct v4l2_async_subdev *asd;
+        struct v4l2_async_notifier *notifier;
+};
+
+/**
+ * v4l2_async_notifier - v4l2_device notifier data
+ * @num_subdevs:number of subdevices
+ * @subdev:     array of pointers to subdevice descriptors
+ * @v4l2_dev:   pointer to struct v4l2_device
+ * @waiting:    list of struct v4l2_async_subdev, waiting for their drivers
+ * @done:       list of struct v4l2_async_subdev_list, already probed
+ * @list:       member in a global list of notifiers
+ * @bound:      a subdevice driver has successfully probed one of subdevices
+ * @complete:   all subdevices have been probed successfully
+ * @unbind:     a subdevice is leaving
+ */
+struct v4l2_async_notifier {
+        unsigned int num_subdevs;
+        struct v4l2_async_subdev **subdev;
+        struct v4l2_device *v4l2_dev;
+        struct list_head waiting;
+        struct list_head done;
+        struct list_head list;
+        int (*bound)(struct v4l2_async_notifier *notifier,
+                     struct v4l2_subdev *subdev,
+                     struct v4l2_async_subdev *asd);
+        int (*complete)(struct v4l2_async_notifier *notifier);
+        void (*unbind)(struct v4l2_async_notifier *notifier,
+                       struct v4l2_subdev *subdev,
+                       struct v4l2_async_subdev *asd);
+};
+
+int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
+                                 struct v4l2_async_notifier *notifier);
+void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
+int v4l2_async_register_subdev(struct v4l2_subdev *sd);
+void v4l2_async_unregister_subdev(struct v4l2_subdev *sd);
+#endif
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
deleted file mode 100644
index c259b36bf1e9..000000000000
--- a/include/media/v4l2-chip-ident.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
-    v4l2 chip identifiers header
-
-    This header provides a list of chip identifiers that can be returned
-    through the VIDIOC_DBG_G_CHIP_IDENT ioctl.
-
-    Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 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 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 V4L2_CHIP_IDENT_H_
-#define V4L2_CHIP_IDENT_H_
-
-/* VIDIOC_DBG_G_CHIP_IDENT: identifies the actual chip installed on the board */
-
-/* KEEP THIS LIST ORDERED BY ID!
-   Otherwise it will be hard to see which ranges are already in use when
-   adding support to a new chip family. */
-enum {
-        /* general idents: reserved range 0-49 */
-        V4L2_IDENT_NONE      = 0,       /* No chip matched */
-        V4L2_IDENT_AMBIGUOUS = 1,       /* Match too general, multiple chips matched */
-        V4L2_IDENT_UNKNOWN   = 2,       /* Chip found, but cannot identify */
-
-        /* module tvaudio: reserved range 50-99 */
-        V4L2_IDENT_TVAUDIO = 50,        /* A tvaudio chip, unknown which it is exactly */
-
-        /* Sony IMX074 */
-        V4L2_IDENT_IMX074 = 74,
-
-        /* module saa7110: just ident 100 */
-        V4L2_IDENT_SAA7110 = 100,
-
-        /* module saa7115: reserved range 101-149 */
-        V4L2_IDENT_SAA7111 = 101,
-        V4L2_IDENT_SAA7111A = 102,
-        V4L2_IDENT_SAA7113 = 103,
-        V4L2_IDENT_SAA7114 = 104,
-        V4L2_IDENT_SAA7115 = 105,
-        V4L2_IDENT_SAA7118 = 108,
-
-        /* module saa7127: reserved range 150-199 */
-        V4L2_IDENT_SAA7127 = 157,
-        V4L2_IDENT_SAA7129 = 159,
-
-        /* module cx25840: reserved range 200-249 */
-        V4L2_IDENT_CX25836 = 236,
-        V4L2_IDENT_CX25837 = 237,
-        V4L2_IDENT_CX25840 = 240,
-        V4L2_IDENT_CX25841 = 241,
-        V4L2_IDENT_CX25842 = 242,
-        V4L2_IDENT_CX25843 = 243,
-
-        /* OmniVision sensors: reserved range 250-299 */
-        V4L2_IDENT_OV7670 = 250,
-        V4L2_IDENT_OV7720 = 251,
-        V4L2_IDENT_OV7725 = 252,
-        V4L2_IDENT_OV7660 = 253,
-        V4L2_IDENT_OV9650 = 254,
-        V4L2_IDENT_OV9655 = 255,
-        V4L2_IDENT_SOI968 = 256,
-        V4L2_IDENT_OV9640 = 257,
-        V4L2_IDENT_OV6650 = 258,
-        V4L2_IDENT_OV2640 = 259,
-        V4L2_IDENT_OV9740 = 260,
-        V4L2_IDENT_OV5642 = 261,
-
-        /* module saa7146: reserved range 300-309 */
-        V4L2_IDENT_SAA7146 = 300,
-
-        /* Conexant MPEG encoder/decoders: reserved range 400-420 */
-        V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
-        V4L2_IDENT_CX23415 = 415,
-        V4L2_IDENT_CX23416 = 416,
-        V4L2_IDENT_CX23417 = 417,
-        V4L2_IDENT_CX23418 = 418,
-
-        /* module bt819: reserved range 810-819 */
-        V4L2_IDENT_BT815A = 815,
-        V4L2_IDENT_BT817A = 817,
-        V4L2_IDENT_BT819A = 819,
-
-        /* module au0828 */
-        V4L2_IDENT_AU0828 = 828,
-
-        /* module bttv: ident 848 + 849 */
-        V4L2_IDENT_BT848 = 848,
-        V4L2_IDENT_BT849 = 849,
-
-        /* module bt856: just ident 856 */
-        V4L2_IDENT_BT856 = 856,
-
-        /* module bt866: just ident 866 */
-        V4L2_IDENT_BT866 = 866,
-
-        /* module bttv: ident 878 + 879 */
-        V4L2_IDENT_BT878 = 878,
-        V4L2_IDENT_BT879 = 879,
-
-        /* module ks0127: reserved range 1120-1129 */
-        V4L2_IDENT_KS0122S = 1122,
-        V4L2_IDENT_KS0127  = 1127,
-        V4L2_IDENT_KS0127B = 1128,
-
-        /* module indycam: just ident 2000 */
-        V4L2_IDENT_INDYCAM = 2000,
-
-        /* module vp27smpx: just ident 2700 */
-        V4L2_IDENT_VP27SMPX = 2700,
-
-        /* module vpx3220: reserved range: 3210-3229 */
-        V4L2_IDENT_VPX3214C = 3214,
-        V4L2_IDENT_VPX3216B = 3216,
-        V4L2_IDENT_VPX3220A = 3220,
-
-        /* VX855 just ident 3409 */
-        /* Other via devs could use 3314, 3324, 3327, 3336, 3364, 3353 */
-        V4L2_IDENT_VIA_VX855 = 3409,
-
-        /* module tvp5150 */
-        V4L2_IDENT_TVP5150 = 5150,
-
-        /* module saa5246a: just ident 5246 */
-        V4L2_IDENT_SAA5246A = 5246,
-
-        /* module saa5249: just ident 5249 */
-        V4L2_IDENT_SAA5249 = 5249,
-
-        /* module cs5345: just ident 5345 */
-        V4L2_IDENT_CS5345 = 5345,
-
-        /* module tea6415c: just ident 6415 */
-        V4L2_IDENT_TEA6415C = 6415,
-
-        /* module tea6420: just ident 6420 */
-        V4L2_IDENT_TEA6420 = 6420,
-
-        /* module saa6588: just ident 6588 */
-        V4L2_IDENT_SAA6588 = 6588,
-
-        /* module vs6624: just ident 6624 */
-        V4L2_IDENT_VS6624 = 6624,
-
-        /* module saa6752hs: reserved range 6750-6759 */
-        V4L2_IDENT_SAA6752HS = 6752,
-        V4L2_IDENT_SAA6752HS_AC3 = 6753,
-
-        /* modules tef6862: just ident 6862 */
-        V4L2_IDENT_TEF6862 = 6862,
-
-        /* module tvp7002: just ident 7002 */
-        V4L2_IDENT_TVP7002 = 7002,
-
-        /* module adv7170: just ident 7170 */
-        V4L2_IDENT_ADV7170 = 7170,
-
-        /* module adv7175: just ident 7175 */
-        V4L2_IDENT_ADV7175 = 7175,
-
-        /* module adv7180: just ident 7180 */
-        V4L2_IDENT_ADV7180 = 7180,
-
-        /* module adv7183: just ident 7183 */
-        V4L2_IDENT_ADV7183 = 7183,
-
-        /* module saa7185: just ident 7185 */
-        V4L2_IDENT_SAA7185 = 7185,
-
-        /* module saa7191: just ident 7191 */
-        V4L2_IDENT_SAA7191 = 7191,
-
-        /* module ths7303: just ident 7303 */
-        V4L2_IDENT_THS7303 = 7303,
-
-        /* module adv7343: just ident 7343 */
-        V4L2_IDENT_ADV7343 = 7343,
-
-        /* module ths7353: just ident 7353 */
-        V4L2_IDENT_THS7353 = 7353,
-
-        /* module adv7393: just ident 7393 */
-        V4L2_IDENT_ADV7393 = 7393,
-
-        /* module adv7604: just ident 7604 */
-        V4L2_IDENT_ADV7604 = 7604,
-
-        /* module saa7706h: just ident 7706 */
-        V4L2_IDENT_SAA7706H = 7706,
-
-        /* module mt9v011, just ident 8243 */
-        V4L2_IDENT_MT9V011 = 8243,
-
-        /* module wm8739: just ident 8739 */
-        V4L2_IDENT_WM8739 = 8739,
-
-        /* module wm8775: just ident 8775 */
-        V4L2_IDENT_WM8775 = 8775,
-
-        /* Marvell controllers starting at 8801 */
-        V4L2_IDENT_CAFE = 8801,
-        V4L2_IDENT_ARMADA610 = 8802,
-
-        /* AKM AK8813/AK8814 */
-        V4L2_IDENT_AK8813 = 8813,
-        V4L2_IDENT_AK8814 = 8814,
-
-        /* module cx23885 and cx25840 */
-        V4L2_IDENT_CX23885    = 8850,
-        V4L2_IDENT_CX23885_AV = 8851, /* Integrated A/V decoder */
-        V4L2_IDENT_CX23887    = 8870,
-        V4L2_IDENT_CX23887_AV = 8871, /* Integrated A/V decoder */
-        V4L2_IDENT_CX23888    = 8880,
-        V4L2_IDENT_CX23888_AV = 8881, /* Integrated A/V decoder */
-        V4L2_IDENT_CX23888_IR = 8882, /* Integrated infrared controller */
-
-        /* module ad9389b: just ident 9389 */
-        V4L2_IDENT_AD9389B = 9389,
-
-        /* module tda9840: just ident 9840 */
-        V4L2_IDENT_TDA9840 = 9840,
-
-        /* module tw9910: just ident 9910 */
-        V4L2_IDENT_TW9910 = 9910,
-
-        /* module sn9c20x: just ident 10000 */
-        V4L2_IDENT_SN9C20X = 10000,
-
-        /* module cx231xx and cx25840 */
-        V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
-        V4L2_IDENT_CX23100    = 23100,
-        V4L2_IDENT_CX23101    = 23101,
-        V4L2_IDENT_CX23102    = 23102,
-
-        /* module msp3400: reserved range 34000-34999 for msp34xx */
-        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
-                                        use internally (tveeprom.c). */
-
-        V4L2_IDENT_MSP3400B = 34002,
-        V4L2_IDENT_MSP3400C = 34003,
-        V4L2_IDENT_MSP3400D = 34004,
-        V4L2_IDENT_MSP3400G = 34007,
-        V4L2_IDENT_MSP3401G = 34017,
-        V4L2_IDENT_MSP3402G = 34027,
-        V4L2_IDENT_MSP3405D = 34054,
-        V4L2_IDENT_MSP3405G = 34057,
-        V4L2_IDENT_MSP3407D = 34074,
-        V4L2_IDENT_MSP3407G = 34077,
-
-        V4L2_IDENT_MSP3410B = 34102,
-        V4L2_IDENT_MSP3410C = 34103,
-        V4L2_IDENT_MSP3410D = 34104,
-        V4L2_IDENT_MSP3410G = 34107,
-        V4L2_IDENT_MSP3411G = 34117,
-        V4L2_IDENT_MSP3412G = 34127,
-        V4L2_IDENT_MSP3415D = 34154,
-        V4L2_IDENT_MSP3415G = 34157,
-        V4L2_IDENT_MSP3417D = 34174,
-        V4L2_IDENT_MSP3417G = 34177,
-
-        V4L2_IDENT_MSP3420G = 34207,
-        V4L2_IDENT_MSP3421G = 34217,
-        V4L2_IDENT_MSP3422G = 34227,
-        V4L2_IDENT_MSP3425G = 34257,
-        V4L2_IDENT_MSP3427G = 34277,
-
-        V4L2_IDENT_MSP3430G = 34307,
-        V4L2_IDENT_MSP3431G = 34317,
-        V4L2_IDENT_MSP3435G = 34357,
-        V4L2_IDENT_MSP3437G = 34377,
-
-        V4L2_IDENT_MSP3440G = 34407,
-        V4L2_IDENT_MSP3441G = 34417,
-        V4L2_IDENT_MSP3442G = 34427,
-        V4L2_IDENT_MSP3445G = 34457,
-        V4L2_IDENT_MSP3447G = 34477,
-
-        V4L2_IDENT_MSP3450G = 34507,
-        V4L2_IDENT_MSP3451G = 34517,
-        V4L2_IDENT_MSP3452G = 34527,
-        V4L2_IDENT_MSP3455G = 34557,
-        V4L2_IDENT_MSP3457G = 34577,
-
-        V4L2_IDENT_MSP3460G = 34607,
-        V4L2_IDENT_MSP3461G = 34617,
-        V4L2_IDENT_MSP3465G = 34657,
-        V4L2_IDENT_MSP3467G = 34677,
-
-        /* module msp3400: reserved range 44000-44999 for msp44xx */
-        V4L2_IDENT_MSP4400G = 44007,
-        V4L2_IDENT_MSP4408G = 44087,
-        V4L2_IDENT_MSP4410G = 44107,
-        V4L2_IDENT_MSP4418G = 44187,
-        V4L2_IDENT_MSP4420G = 44207,
-        V4L2_IDENT_MSP4428G = 44287,
-        V4L2_IDENT_MSP4440G = 44407,
-        V4L2_IDENT_MSP4448G = 44487,
-        V4L2_IDENT_MSP4450G = 44507,
-        V4L2_IDENT_MSP4458G = 44587,
-
-        /* Micron CMOS sensor chips: 45000-45099 */
-        V4L2_IDENT_MT9M001C12ST         = 45000,
-        V4L2_IDENT_MT9M001C12STM        = 45005,
-        V4L2_IDENT_MT9M111              = 45007,
-        V4L2_IDENT_MT9M112              = 45008,
-        V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
-        V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
-        V4L2_IDENT_MT9T031              = 45020,
-        V4L2_IDENT_MT9T111              = 45021,
-        V4L2_IDENT_MT9T112              = 45022,
-        V4L2_IDENT_MT9V111              = 45031,
-        V4L2_IDENT_MT9V112              = 45032,
-
-        /* HV7131R CMOS sensor: just ident 46000 */
-        V4L2_IDENT_HV7131R              = 46000,
-
-        /* Sharp RJ54N1CB0C, 0xCB0C = 51980 */
-        V4L2_IDENT_RJ54N1CB0C = 51980,
-
-        /* module m52790: just ident 52790 */
-        V4L2_IDENT_M52790 = 52790,
-
-        /* module cs53132a: just ident 53132 */
-        V4L2_IDENT_CS53l32A = 53132,
-
-        /* modules upd61151 MPEG2 encoder: just ident 54000 */
-        V4L2_IDENT_UPD61161 = 54000,
-        /* modules upd61152 MPEG2 encoder with AC3: just ident 54001 */
-        V4L2_IDENT_UPD61162 = 54001,
-
-        /* module upd64031a: just ident 64031 */
-        V4L2_IDENT_UPD64031A = 64031,
-
-        /* module upd64083: just ident 64083 */
-        V4L2_IDENT_UPD64083 = 64083,
-
-        /* Don't just add new IDs at the end: KEEP THIS LIST ORDERED BY ID! */
-};
-
-#endif
diff --git a/include/media/v4l2-clk.h b/include/media/v4l2-clk.h
new file mode 100644
index 000000000000..0503a90b48bb
--- /dev/null
+++ b/include/media/v4l2-clk.h
@@ -0,0 +1,54 @@
+/*
+ * V4L2 clock service
+ *
+ * Copyright (C) 2012-2013, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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.
+ *
+ * ATTENTION: This is a temporary API and it shall be replaced by the generic
+ * clock API, when the latter becomes widely available.
+ */
+
+#ifndef MEDIA_V4L2_CLK_H
+#define MEDIA_V4L2_CLK_H
+
+#include <linux/atomic.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+
+struct module;
+struct device;
+
+struct v4l2_clk {
+        struct list_head list;
+        const struct v4l2_clk_ops *ops;
+        const char *dev_id;
+        const char *id;
+        int enable;
+        struct mutex lock; /* Protect the enable count */
+        atomic_t use_count;
+        void *priv;
+};
+
+struct v4l2_clk_ops {
+        struct module   *owner;
+        int             (*enable)(struct v4l2_clk *clk);
+        void            (*disable)(struct v4l2_clk *clk);
+        unsigned long   (*get_rate)(struct v4l2_clk *clk);
+        int             (*set_rate)(struct v4l2_clk *clk, unsigned long);
+};
+
+struct v4l2_clk *v4l2_clk_register(const struct v4l2_clk_ops *ops,
+                                   const char *dev_name,
+                                   const char *name, void *priv);
+void v4l2_clk_unregister(struct v4l2_clk *clk);
+struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id);
+void v4l2_clk_put(struct v4l2_clk *clk);
+int v4l2_clk_enable(struct v4l2_clk *clk);
+void v4l2_clk_disable(struct v4l2_clk *clk);
+unsigned long v4l2_clk_get_rate(struct v4l2_clk *clk);
+int v4l2_clk_set_rate(struct v4l2_clk *clk, unsigned long rate);
+
+#endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 1d93c48cb371..015ff82da73c 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -100,16 +100,6 @@ u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id);
 
 /* ------------------------------------------------------------------------- */
 
-/* Register/chip ident helper function */
-
-struct i2c_client; /* forward reference */
-int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match);
-int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_dbg_chip_ident *chip,
-                u32 ident, u32 revision);
-int v4l2_chip_match_host(const struct v4l2_dbg_match *match);
-
-/* ------------------------------------------------------------------------- */
-
 /* I2C Helper functions */
 
 struct i2c_driver;
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 95d1c91770f4..c768c9f8abc2 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -96,9 +96,9 @@ struct video_device
         struct device dev;              /* v4l device */
         struct cdev *cdev;              /* character device */
 
-        /* Set either parent or v4l2_dev if your driver uses v4l2_device */
-        struct device *parent;          /* device parent */
         struct v4l2_device *v4l2_dev;   /* v4l2_device parent */
+        /* Only set parent if that can't be deduced from v4l2_dev */
+        struct device *dev_parent;      /* device parent */
 
         /* Control handler associated with this device node. May be NULL. */
         struct v4l2_ctrl_handler *ctrl_handler;
@@ -129,7 +129,6 @@ struct video_device
 
         /* Video standard vars */
         v4l2_std_id tvnorms;            /* Supported tv norms */
-        v4l2_std_id current_norm;       /* Current tvnorm */
 
         /* callbacks */
         void (*release)(struct video_device *vdev);
diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h
index e6aa2318367b..0286c95814ff 100644
--- a/include/media/v4l2-int-device.h
+++ b/include/media/v4l2-int-device.h
@@ -220,8 +220,6 @@ enum v4l2_int_ioctl_num {
         vidioc_int_reset_num,
         /* VIDIOC_INT_INIT */
         vidioc_int_init_num,
-        /* VIDIOC_DBG_G_CHIP_IDENT */
-        vidioc_int_g_chip_ident_num,
 
         /*
          *
@@ -303,6 +301,5 @@ V4L2_INT_WRAPPER_1(enum_frameintervals, struct v4l2_frmivalenum, *);
 
 V4L2_INT_WRAPPER_0(reset);
 V4L2_INT_WRAPPER_0(init);
-V4L2_INT_WRAPPER_1(g_chip_ident, int, *);
 
 #endif
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 931652f0e2af..e0b74a430b3a 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -247,8 +247,6 @@ struct v4l2_ioctl_ops {
         int (*vidioc_g_chip_info)      (struct file *file, void *fh,
                                         struct v4l2_dbg_chip_info *chip);
 #endif
-        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
-                                        struct v4l2_dbg_chip_ident *chip);
 
         int (*vidioc_enum_framesizes)   (struct file *file, void *fh,
                                          struct v4l2_frmsizeenum *fsize);
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 5298d678d0f3..3250cc5e7925 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/v4l2-subdev.h>
 #include <media/media-entity.h>
+#include <media/v4l2-async.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-fh.h>
@@ -88,7 +89,6 @@ struct v4l2_decode_vbi_line {
 
 /* Core ops: it is highly recommended to implement at least these ops:
 
-   g_chip_ident
    log_status
    g_register
    s_register
@@ -145,7 +145,6 @@ struct v4l2_subdev_io_pin_config {
         performed later.  It must not sleep.  *Called from an IRQ context*.
  */
 struct v4l2_subdev_core_ops {
-        int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
         int (*log_status)(struct v4l2_subdev *sd);
         int (*s_io_pin_config)(struct v4l2_subdev *sd, size_t n,
                                       struct v4l2_subdev_io_pin_config *pincfg);
@@ -585,8 +584,17 @@ struct v4l2_subdev {
         void *host_priv;
         /* subdev device node */
         struct video_device *devnode;
+        /* pointer to the physical device, if any */
+        struct device *dev;
+        struct v4l2_async_subdev_list asdl;
 };
 
+static inline struct v4l2_subdev *v4l2_async_to_subdev(
+                        struct v4l2_async_subdev_list *asdl)
+{
+        return container_of(asdl, struct v4l2_subdev, asdl);
+}
+
 #define media_entity_to_v4l2_subdev(ent) \
         container_of(ent, struct v4l2_subdev, entity)
 #define vdev_to_v4l2_subdev(vdev) \
@@ -660,7 +668,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd,
 /* Call an ops of a v4l2_subdev, doing the right checks against
    NULL pointers.
 
-   Example: err = v4l2_subdev_call(sd, core, g_chip_ident, &chip);
+   Example: err = v4l2_subdev_call(sd, core, s_std, norm);
  */
 #define v4l2_subdev_call(sd, o, f, args...)                             \
         (!(sd) ? -ENODEV : (((sd)->ops->o && (sd)->ops->o->f) ? \
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 69bd5bb0d5af..e90a88a8708f 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -53,13 +53,13 @@
 #define V4L2_CTRL_CLASS_USER            0x00980000      /* Old-style 'user' controls */
 #define V4L2_CTRL_CLASS_MPEG            0x00990000      /* MPEG-compression controls */
 #define V4L2_CTRL_CLASS_CAMERA          0x009a0000      /* Camera class controls */
-#define V4L2_CTRL_CLASS_FM_TX           0x009b0000      /* FM Modulator control class */
+#define V4L2_CTRL_CLASS_FM_TX           0x009b0000      /* FM Modulator controls */
 #define V4L2_CTRL_CLASS_FLASH           0x009c0000      /* Camera flash controls */
 #define V4L2_CTRL_CLASS_JPEG            0x009d0000      /* JPEG-compression controls */
 #define V4L2_CTRL_CLASS_IMAGE_SOURCE    0x009e0000      /* Image source controls */
 #define V4L2_CTRL_CLASS_IMAGE_PROC      0x009f0000      /* Image processing controls */
 #define V4L2_CTRL_CLASS_DV              0x00a00000      /* Digital Video controls */
-#define V4L2_CTRL_CLASS_FM_RX           0x00a10000      /* Digital Video controls */
+#define V4L2_CTRL_CLASS_FM_RX           0x00a10000      /* FM Receiver controls */
 
 /* User-class control IDs */
 
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index f40b41c7e108..95ef4551edc1 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -395,7 +395,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_H263     v4l2_fourcc('H', '2', '6', '3') /* H263          */
 #define V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
 #define V4L2_PIX_FMT_MPEG2    v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES     */
-#define V4L2_PIX_FMT_MPEG4    v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 ES     */
+#define V4L2_PIX_FMT_MPEG4    v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part 2 ES */
 #define V4L2_PIX_FMT_XVID     v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid           */
 #define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
 #define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
@@ -555,7 +555,7 @@ struct v4l2_jpegcompression {
         __u32 jpeg_markers;     /* Which markers should go into the JPEG
                                  * output. Unless you exactly know what
                                  * you do, leave them untouched.
-                                 * Inluding less markers will make the
+                                 * Including less markers will make the
                                  * resulting code smaller, but there will
                                  * be fewer applications which can read it.
                                  * The presence of the APP and COM marker
@@ -567,7 +567,7 @@ struct v4l2_jpegcompression {
 #define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
 #define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
 #define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-                                        * allways use APP0 */
+                                        * always use APP0 */
 };
 
 /*
@@ -900,7 +900,7 @@ typedef __u64 v4l2_std_id;
 /*
  * "Common" PAL - This macro is there to be compatible with the old
  * V4L1 concept of "PAL": /BGDKHI.
- * Several PAL standards are mising here: /M, /N and /Nc
+ * Several PAL standards are missing here: /M, /N and /Nc
  */
 #define V4L2_STD_PAL            (V4L2_STD_PAL_BG        |\
                                  V4L2_STD_PAL_DK        |\
@@ -1787,11 +1787,13 @@ struct v4l2_event_subscription {
 /* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
 
 #define V4L2_CHIP_MATCH_BRIDGE      0  /* Match against chip ID on the bridge (0 for the bridge) */
+#define V4L2_CHIP_MATCH_SUBDEV      4  /* Match against subdev index */
+
+/* The following four defines are no longer in use */
 #define V4L2_CHIP_MATCH_HOST V4L2_CHIP_MATCH_BRIDGE
 #define V4L2_CHIP_MATCH_I2C_DRIVER  1  /* Match against I2C driver name */
 #define V4L2_CHIP_MATCH_I2C_ADDR    2  /* Match against I2C 7-bit address */
-#define V4L2_CHIP_MATCH_AC97        3  /* Match against anciliary AC97 chip */
-#define V4L2_CHIP_MATCH_SUBDEV      4  /* Match against subdev index */
+#define V4L2_CHIP_MATCH_AC97        3  /* Match against ancillary AC97 chip */
 
 struct v4l2_dbg_match {
         __u32 type; /* Match type */
@@ -1808,13 +1810,6 @@ struct v4l2_dbg_register {
         __u64 val;
 } __attribute__ ((packed));
 
-/* VIDIOC_DBG_G_CHIP_IDENT */
-struct v4l2_dbg_chip_ident {
-        struct v4l2_dbg_match match;
-        __u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
-        __u32 revision;    /* chip revision, chip specific */
-} __attribute__ ((packed));
-
 #define V4L2_CHIP_FL_READABLE (1 << 0)
 #define V4L2_CHIP_FL_WRITABLE (1 << 1)
 
@@ -1915,12 +1910,6 @@ struct v4l2_create_buffers {
 #define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
 #define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
 
-/* Experimental, meant for debugging, testing and internal use.
-   Never use this ioctl in applications!
-   Note: this ioctl is deprecated in favor of VIDIOC_DBG_G_CHIP_INFO and
-   will go away in the future. */
-#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
 
 #define VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct v4l2_dv_timings)