Merge branches 'x86/cleanups', 'x86/mpparse', 'x86/numa' and 'x86/uv' into x86/urgent

[linux-2.6-omap-h63xx.git] / include / media / soc_camera.h

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index e6ed0d94ac1b3d98502da7580e176e0dd22c6202..7440d9250665489f2699fc1557bc1a7ae655b337 100644 (file)
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -12,9 +12,10 @@
 #ifndef SOC_CAMERA_H
 #define SOC_CAMERA_H
 
+#include <linux/mutex.h>
+#include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
-#include <linux/pm.h>
 
 struct soc_camera_device {
        struct list_head list;
@@ -36,6 +37,7 @@ struct soc_camera_device {
        unsigned char iface;            /* Host number */
        unsigned char devnum;           /* Device number per host */
        unsigned char buswidth;         /* See comment in .c */
+       struct soc_camera_sense *sense; /* See comment in struct definition */
        struct soc_camera_ops *ops;
        struct video_device *vdev;
        const struct soc_camera_data_format *current_fmt;
@@ -44,9 +46,10 @@ struct soc_camera_device {
        struct soc_camera_format_xlate *user_formats;
        int num_user_formats;
        struct module *owner;
-       void *host_priv;                /* per-device host private data */
-       /* soc_camera.c private count. Only accessed with video_lock held */
+       void *host_priv;                /* Per-device host private data */
+       /* soc_camera.c private count. Only accessed with .video_lock held */
        int use_count;
+       struct mutex video_lock;        /* Protects device data */
 };
 
 struct soc_camera_file {
@@ -161,10 +164,12 @@ struct soc_camera_ops {
        unsigned long (*query_bus_param)(struct soc_camera_device *);
        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
        int (*get_chip_id)(struct soc_camera_device *,
-                          struct v4l2_chip_ident *);
+                          struct v4l2_dbg_chip_ident *);
+       int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
+       int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-       int (*get_register)(struct soc_camera_device *, struct v4l2_register *);
-       int (*set_register)(struct soc_camera_device *, struct v4l2_register *);
+       int (*get_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
+       int (*set_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
 #endif
        int (*get_control)(struct soc_camera_device *, struct v4l2_control *);
        int (*set_control)(struct soc_camera_device *, struct v4l2_control *);
@@ -172,6 +177,32 @@ struct soc_camera_ops {
        int num_controls;
 };
 
+#define SOCAM_SENSE_PCLK_CHANGED       (1 << 0)
+
+/**
+ * This struct can be attached to struct soc_camera_device by the host driver
+ * to request sense from the camera, for example, when calling .set_fmt(). The
+ * host then can check which flags are set and verify respective values if any.
+ * For example, if SOCAM_SENSE_PCLK_CHANGED is set, it means, pixclock has
+ * changed during this operation. After completion the host should detach sense.
+ *
+ * @flags              ored SOCAM_SENSE_* flags
+ * @master_clock       if the host wants to be informed about pixel-clock
+ *                     change, it better set master_clock.
+ * @pixel_clock_max    maximum pixel clock frequency supported by the host,
+ *                     camera is not allowed to exceed this.
+ * @pixel_clock                if the camera driver changed pixel clock during this
+ *                     operation, it sets SOCAM_SENSE_PCLK_CHANGED, uses
+ *                     master_clock to calculate the new pixel-clock and
+ *                     sets this field.
+ */
+struct soc_camera_sense {
+       unsigned long flags;
+       unsigned long master_clock;
+       unsigned long pixel_clock_max;
+       unsigned long pixel_clock;
+};
+
 static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
        struct soc_camera_ops *ops, int id)
 {
@@ -190,15 +221,20 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
 #define SOCAM_HSYNC_ACTIVE_LOW         (1 << 3)
 #define SOCAM_VSYNC_ACTIVE_HIGH                (1 << 4)
 #define SOCAM_VSYNC_ACTIVE_LOW         (1 << 5)
-#define SOCAM_DATAWIDTH_8              (1 << 6)
-#define SOCAM_DATAWIDTH_9              (1 << 7)
-#define SOCAM_DATAWIDTH_10             (1 << 8)
-#define SOCAM_DATAWIDTH_16             (1 << 9)
-#define SOCAM_PCLK_SAMPLE_RISING       (1 << 10)
-#define SOCAM_PCLK_SAMPLE_FALLING      (1 << 11)
-
-#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_9 | \
-                             SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_16)
+#define SOCAM_DATAWIDTH_4              (1 << 6)
+#define SOCAM_DATAWIDTH_8              (1 << 7)
+#define SOCAM_DATAWIDTH_9              (1 << 8)
+#define SOCAM_DATAWIDTH_10             (1 << 9)
+#define SOCAM_DATAWIDTH_15             (1 << 10)
+#define SOCAM_DATAWIDTH_16             (1 << 11)
+#define SOCAM_PCLK_SAMPLE_RISING       (1 << 12)
+#define SOCAM_PCLK_SAMPLE_FALLING      (1 << 13)
+#define SOCAM_DATA_ACTIVE_HIGH         (1 << 14)
+#define SOCAM_DATA_ACTIVE_LOW          (1 << 15)
+
+#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \
+                             SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \
+                             SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
 
 static inline unsigned long soc_camera_bus_param_compatible(
                        unsigned long camera_flags, unsigned long bus_flags)