Merge commit 'v2.6.36' into kbuild/misc

Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1 files changed, 84 insertions, 43 deletions

diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 9ba99cd39ee7..4a97d7341a94 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -35,6 +35,7 @@
 #define V4L2_SUBDEV_IR_TX_FIFO_SERVICE_REQ      0x00000001
 
 struct v4l2_device;
+struct v4l2_ctrl_handler;
 struct v4l2_subdev;
 struct tuner_setup;
 
@@ -90,10 +91,31 @@ struct v4l2_decode_vbi_line {
    not yet implemented) since ops provide proper type-checking.
  */
 
+/* Subdevice external IO pin configuration */
+#define V4L2_SUBDEV_IO_PIN_DISABLE      (1 << 0) /* ENABLE assumed */
+#define V4L2_SUBDEV_IO_PIN_OUTPUT       (1 << 1)
+#define V4L2_SUBDEV_IO_PIN_INPUT        (1 << 2)
+#define V4L2_SUBDEV_IO_PIN_SET_VALUE    (1 << 3) /* Set output value */
+#define V4L2_SUBDEV_IO_PIN_ACTIVE_LOW   (1 << 4) /* ACTIVE HIGH assumed */
+
+struct v4l2_subdev_io_pin_config {
+        u32 flags;      /* V4L2_SUBDEV_IO_PIN_* flags for this pin's config */
+        u8 pin;         /* Chip external IO pin to configure */
+        u8 function;    /* Internal signal pad/function to route to IO pin */
+        u8 value;       /* Initial value for pin - e.g. GPIO output value */
+        u8 strength;    /* Pin drive strength */
+};
+
 /* s_config: if set, then it is always called by the v4l2_i2c_new_subdev*
         functions after the v4l2_subdev was registered. It is used to pass
         platform data to the subdev which can be used during initialization.
 
+   s_io_pin_config: configure one or more chip I/O pins for chips that
+        multiplex different internal signal pads out to IO pins.  This function
+        takes a pointer to an array of 'n' pin configuration entries, one for
+        each pin being configured.  This function could be called at times
+        other than just subdevice initialization.
+
    init: initialize the sensor registors to some sort of reasonable default
         values. Do not use for new drivers and should be removed in existing
         drivers.
@@ -110,11 +132,18 @@ struct v4l2_decode_vbi_line {
 
    s_power: puts subdevice in power saving mode (on == 0) or normal operation
         mode (on == 1).
+
+   interrupt_service_routine: Called by the bridge chip's interrupt service
+        handler, when an interrupt status has be raised due to this subdev,
+        so that this subdev can handle the details.  It may schedule work to be
+        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_config)(struct v4l2_subdev *sd, int irq, void *platform_data);
+        int (*s_io_pin_config)(struct v4l2_subdev *sd, size_t n,
+                                      struct v4l2_subdev_io_pin_config *pincfg);
         int (*init)(struct v4l2_subdev *sd, u32 val);
         int (*load_fw)(struct v4l2_subdev *sd);
         int (*reset)(struct v4l2_subdev *sd, u32 val);
@@ -133,6 +162,8 @@ struct v4l2_subdev_core_ops {
         int (*s_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
 #endif
         int (*s_power)(struct v4l2_subdev *sd, int on);
+        int (*interrupt_service_routine)(struct v4l2_subdev *sd,
+                                                u32 status, bool *handled);
 };
 
 /* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
@@ -180,31 +211,10 @@ struct v4l2_subdev_audio_ops {
         int (*s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
         int (*s_i2s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
         int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
+        int (*s_stream)(struct v4l2_subdev *sd, int enable);
 };
 
 /*
-   decode_vbi_line: video decoders that support sliced VBI need to implement
-        this ioctl. Field p of the v4l2_sliced_vbi_line struct is set to the
-        start of the VBI data that was generated by the decoder. The driver
-        then parses the sliced VBI data and sets the other fields in the
-        struct accordingly. The pointer p is updated to point to the start of
-        the payload which can be copied verbatim into the data field of the
-        v4l2_sliced_vbi_data struct. If no valid VBI data was found, then the
-        type field is set to 0 on return.
-
-   s_vbi_data: used to generate VBI signals on a video signal.
-        v4l2_sliced_vbi_data is filled with the data packets that should be
-        output. Note that if you set the line field to 0, then that VBI signal
-        is disabled. If no valid VBI data was found, then the type field is
-        set to 0 on return.
-
-   g_vbi_data: used to obtain the sliced VBI packet from a readback register.
-        Not all video decoders support this. If no data is available because
-        the readback register contains invalid or erroneous data -EIO is
-        returned. Note that you must fill in the 'id' member and the 'field'
-        member (to determine whether CC data from the first or second field
-        should be obtained).
-
    s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
         video input devices.
 
@@ -242,10 +252,6 @@ struct v4l2_subdev_audio_ops {
 struct v4l2_subdev_video_ops {
         int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
         int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags);
-        int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
-        int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
-        int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
-        int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap);
         int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
         int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
         int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
@@ -261,6 +267,8 @@ struct v4l2_subdev_video_ops {
         int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
         int (*enum_framesizes)(struct v4l2_subdev *sd, struct v4l2_frmsizeenum *fsize);
         int (*enum_frameintervals)(struct v4l2_subdev *sd, struct v4l2_frmivalenum *fival);
+        int (*enum_dv_presets) (struct v4l2_subdev *sd,
+                        struct v4l2_dv_enum_preset *preset);
         int (*s_dv_preset)(struct v4l2_subdev *sd,
                         struct v4l2_dv_preset *preset);
         int (*query_dv_preset)(struct v4l2_subdev *sd,
@@ -269,7 +277,7 @@ struct v4l2_subdev_video_ops {
                         struct v4l2_dv_timings *timings);
         int (*g_dv_timings)(struct v4l2_subdev *sd,
                         struct v4l2_dv_timings *timings);
-        int (*enum_mbus_fmt)(struct v4l2_subdev *sd, int index,
+        int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,
                              enum v4l2_mbus_pixelcode *code);
         int (*g_mbus_fmt)(struct v4l2_subdev *sd,
                           struct v4l2_mbus_framefmt *fmt);
@@ -279,6 +287,45 @@ struct v4l2_subdev_video_ops {
                           struct v4l2_mbus_framefmt *fmt);
 };
 
+/*
+   decode_vbi_line: video decoders that support sliced VBI need to implement
+        this ioctl. Field p of the v4l2_sliced_vbi_line struct is set to the
+        start of the VBI data that was generated by the decoder. The driver
+        then parses the sliced VBI data and sets the other fields in the
+        struct accordingly. The pointer p is updated to point to the start of
+        the payload which can be copied verbatim into the data field of the
+        v4l2_sliced_vbi_data struct. If no valid VBI data was found, then the
+        type field is set to 0 on return.
+
+   s_vbi_data: used to generate VBI signals on a video signal.
+        v4l2_sliced_vbi_data is filled with the data packets that should be
+        output. Note that if you set the line field to 0, then that VBI signal
+        is disabled. If no valid VBI data was found, then the type field is
+        set to 0 on return.
+
+   g_vbi_data: used to obtain the sliced VBI packet from a readback register.
+        Not all video decoders support this. If no data is available because
+        the readback register contains invalid or erroneous data -EIO is
+        returned. Note that you must fill in the 'id' member and the 'field'
+        member (to determine whether CC data from the first or second field
+        should be obtained).
+
+   s_raw_fmt: setup the video encoder/decoder for raw VBI.
+
+   g_sliced_fmt: retrieve the current sliced VBI settings.
+
+   s_sliced_fmt: setup the sliced VBI settings.
+ */
+struct v4l2_subdev_vbi_ops {
+        int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
+        int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
+        int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
+        int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap);
+        int (*s_raw_fmt)(struct v4l2_subdev *sd, struct v4l2_vbi_format *fmt);
+        int (*g_sliced_fmt)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *fmt);
+        int (*s_sliced_fmt)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *fmt);
+};
+
 /**
  * struct v4l2_subdev_sensor_ops - v4l2-subdev sensor operations
  * @g_skip_top_lines: number of lines at the top of the image to be skipped.
@@ -291,11 +338,6 @@ struct v4l2_subdev_sensor_ops {
 };
 
 /*
-   interrupt_service_routine: Called by the bridge chip's interrupt service
-        handler, when an IR interrupt status has be raised due to this subdev,
-        so that this subdev can handle the details.  It may schedule work to be
-        performed later.  It must not sleep.  *Called from an IRQ context*.
-
    [rt]x_g_parameters: Get the current operating parameters and state of the
         the IR receiver or transmitter.
 
@@ -319,14 +361,9 @@ struct v4l2_subdev_sensor_ops {
  */
 
 enum v4l2_subdev_ir_mode {
-        V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* space & mark widths in nanosecs */
+        V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* uses struct ir_raw_event records */
 };
 
-/* Data format of data read or written for V4L2_SUBDEV_IR_MODE_PULSE_WIDTH */
-#define V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS       0x7fffffff
-#define V4L2_SUBDEV_IR_PULSE_LEVEL_MASK         0x80000000
-#define V4L2_SUBDEV_IR_PULSE_RX_SEQ_END         0xffffffff
-
 struct v4l2_subdev_ir_parameters {
         /* Either Rx or Tx */
         unsigned int bytes_per_data_element; /* of data in read or write call */
@@ -340,7 +377,10 @@ struct v4l2_subdev_ir_parameters {
         u32 max_pulse_width;       /* ns,      valid only for baseband signal */
         unsigned int carrier_freq; /* Hz,      valid only for modulated signal*/
         unsigned int duty_cycle;   /* percent, valid only for modulated signal*/
-        bool invert;               /* logically invert sense of mark/space */
+        bool invert_level;         /* invert signal level */
+
+        /* Tx only */
+        bool invert_carrier_sense; /* Send 0/space as a carrier burst */
 
         /* Rx only */
         u32 noise_filter_min_width;       /* ns, min time of a valid pulse */
@@ -350,10 +390,6 @@ struct v4l2_subdev_ir_parameters {
 };
 
 struct v4l2_subdev_ir_ops {
-        /* Common to receiver and transmitter */
-        int (*interrupt_service_routine)(struct v4l2_subdev *sd,
-                                                u32 status, bool *handled);
-
         /* Receiver */
         int (*rx_read)(struct v4l2_subdev *sd, u8 *buf, size_t count,
                                 ssize_t *num);
@@ -378,6 +414,7 @@ struct v4l2_subdev_ops {
         const struct v4l2_subdev_tuner_ops      *tuner;
         const struct v4l2_subdev_audio_ops      *audio;
         const struct v4l2_subdev_video_ops      *video;
+        const struct v4l2_subdev_vbi_ops        *vbi;
         const struct v4l2_subdev_ir_ops         *ir;
         const struct v4l2_subdev_sensor_ops     *sensor;
 };
@@ -386,6 +423,8 @@ struct v4l2_subdev_ops {
 
 /* Set this flag if this subdev is a i2c device. */
 #define V4L2_SUBDEV_FL_IS_I2C (1U << 0)
+/* Set this flag if this subdev is a spi device. */
+#define V4L2_SUBDEV_FL_IS_SPI (1U << 1)
 
 /* Each instance of a subdev driver should create this struct, either
    stand-alone or embedded in a larger struct.
@@ -396,6 +435,8 @@ struct v4l2_subdev {
         u32 flags;
         struct v4l2_device *v4l2_dev;
         const struct v4l2_subdev_ops *ops;
+        /* The control handler of this subdev. May be NULL. */
+        struct v4l2_ctrl_handler *ctrl_handler;
         /* name must be unique */
         char name[V4L2_SUBDEV_NAME_SIZE];
         /* can be used to group similar subdevs, value is driver-specific */