diff --git a/[refs] b/[refs]
index 76ee33730e05..771fabb17dc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: 6652c716a5e46f0631d26a7f83a8f7247d293ae7
+refs/heads/master: e0a9b1770bac048171961625875aaf15118a7ae9
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
index f4db44d0d95a..3dd1bec6d3c7 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
@@ -52,11 +52,23 @@
Start a hardware frequency seek from the current frequency.
To do this applications initialize the tuner,
type, seek_upward,
-spacing and
-wrap_around fields, and zero out the
-reserved array of a &v4l2-hw-freq-seek; and
-call the VIDIOC_S_HW_FREQ_SEEK ioctl with a pointer
-to this structure.
+wrap_around, spacing,
+rangelow and rangehigh
+fields, and zero out the reserved array of a
+&v4l2-hw-freq-seek; and call the VIDIOC_S_HW_FREQ_SEEK
+ioctl with a pointer to this structure.
+
+ The rangelow and
+rangehigh fields can be set to a non-zero value to
+tell the driver to search a specific band. If the &v4l2-tuner;
+capability field has the
+V4L2_TUNER_CAP_HWSEEK_PROG_LIM flag set, these values
+must fall within one of the bands returned by &VIDIOC-ENUM-FREQ-BANDS;. If
+the V4L2_TUNER_CAP_HWSEEK_PROG_LIM flag is not set,
+then these values must exactly match those of one of the bands returned by
+&VIDIOC-ENUM-FREQ-BANDS;. If the current frequency of the tuner does not fall
+within the selected band it will be clamped to fit in the band before the
+seek is started.
If an error is returned, then the original frequency will
be restored.
@@ -102,7 +114,27 @@ field and the &v4l2-tuner; index field.
__u32
- reserved[7]
+ rangelow
+ If non-zero, the lowest tunable frequency of the band to
+search in units of 62.5 kHz, or if the &v4l2-tuner;
+capability field has the
+V4L2_TUNER_CAP_LOW flag set, in units of 62.5 Hz.
+If rangelow is zero a reasonable default value
+is used.
+
+
+ __u32
+ rangehigh
+ If non-zero, the highest tunable frequency of the band to
+search in units of 62.5 kHz, or if the &v4l2-tuner;
+capability field has the
+V4L2_TUNER_CAP_LOW flag set, in units of 62.5 Hz.
+If rangehigh is zero a reasonable default value
+is used.
+
+
+ __u32
+ reserved[5]
Reserved for future extensions. Applications
must set the array to zero.
@@ -119,8 +151,10 @@ field and the &v4l2-tuner; index field.
EINVAL
The tuner index is out of
-bounds, the wrap_around value is not supported or the value in the type field is
-wrong.
+bounds, the wrap_around value is not supported or
+one of the values in the type,
+rangelow or rangehigh
+fields is wrong.
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index 63c950f6fcc2..7a147c8299ab 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -2033,6 +2033,7 @@ struct v4l2_modulator {
#define V4L2_TUNER_CAP_RDS_BLOCK_IO 0x0100
#define V4L2_TUNER_CAP_RDS_CONTROLS 0x0200
#define V4L2_TUNER_CAP_FREQ_BANDS 0x0400
+#define V4L2_TUNER_CAP_HWSEEK_PROG_LIM 0x0800
/* Flags for the 'rxsubchans' field */
#define V4L2_TUNER_SUB_MONO 0x0001
@@ -2078,7 +2079,9 @@ struct v4l2_hw_freq_seek {
__u32 seek_upward;
__u32 wrap_around;
__u32 spacing;
- __u32 reserved[7];
+ __u32 rangelow;
+ __u32 rangehigh;
+ __u32 reserved[5];
};
/*