1 files changed, 96 insertions, 2 deletions

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index f38f06169795..132b0cc29832 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -2976,13 +2976,107 @@ negative values towards infinity. This is a write-only control.</entry>
           <row>
             <entry spanname="id"><constant>V4L2_CID_FOCUS_AUTO</constant>&nbsp;</entry>
             <entry>boolean</entry>
-          </row><row><entry spanname="descr">Enables automatic focus
-adjustments. The effect of manual focus adjustments while this feature
+          </row><row><entry spanname="descr">Enables continuous automatic
+focus adjustments. The effect of manual focus adjustments while this feature
 is enabled is undefined, drivers should ignore such requests.</entry>
           </row>
           <row><entry></entry></row>
 
           <row>
+            <entry spanname="id"><constant>V4L2_CID_AUTO_FOCUS_START</constant>&nbsp;</entry>
+            <entry>button</entry>
+          </row><row><entry spanname="descr">Starts single auto focus process.
+The effect of setting this control when <constant>V4L2_CID_FOCUS_AUTO</constant>
+is set to <constant>TRUE</constant> (1) is undefined, drivers should ignore
+such requests.</entry>
+          </row>
+          <row><entry></entry></row>
+
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_AUTO_FOCUS_STOP</constant>&nbsp;</entry>
+            <entry>button</entry>
+          </row><row><entry spanname="descr">Aborts automatic focusing
+started with <constant>V4L2_CID_AUTO_FOCUS_START</constant> control. It is
+effective only when the continuous autofocus is disabled, that is when
+<constant>V4L2_CID_FOCUS_AUTO</constant> control is set to <constant>FALSE
+</constant> (0).</entry>
+          </row>
+          <row><entry></entry></row>
+
+          <row id="v4l2-auto-focus-status">
+            <entry spanname="id">
+              <constant>V4L2_CID_AUTO_FOCUS_STATUS</constant>&nbsp;</entry>
+            <entry>bitmask</entry>
+          </row>
+          <row><entry spanname="descr">The automatic focus status. This is a read-only
+          control.</entry>
+          </row>
+          <row>
+            <entrytbl spanname="descr" cols="2">
+              <tbody valign="top">
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_STATUS_IDLE</constant>&nbsp;</entry>
+                  <entry>Automatic focus is not active.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_STATUS_BUSY</constant>&nbsp;</entry>
+                  <entry>Automatic focusing is in progress.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_STATUS_REACHED</constant>&nbsp;</entry>
+                  <entry>Focus has been reached.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_STATUS_FAILED</constant>&nbsp;</entry>
+                  <entry>Automatic focus has failed, the driver will not
+                  transition from this state until another action is
+                  performed by an application.</entry>
+                </row>
+              </tbody>
+            </entrytbl>
+          </row>
+          <row><entry spanname="descr">
+Setting <constant>V4L2_LOCK_FOCUS</constant> lock bit of the <constant>V4L2_CID_3A_LOCK
+</constant> control may stop updates of the <constant>V4L2_CID_AUTO_FOCUS_STATUS</constant>
+control value.</entry>
+          </row>
+          <row><entry></entry></row>
+
+          <row id="v4l2-auto-focus-range">
+            <entry spanname="id">
+              <constant>V4L2_CID_AUTO_FOCUS_RANGE</constant>&nbsp;</entry>
+            <entry>enum&nbsp;v4l2_auto_focus_range</entry>
+          </row>
+          <row><entry spanname="descr">Determines auto focus distance range
+for which lens may be adjusted. </entry>
+          </row>
+          <row>
+            <entrytbl spanname="descr" cols="2">
+              <tbody valign="top">
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_RANGE_AUTO</constant>&nbsp;</entry>
+                  <entry>The camera automatically selects the focus range.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_RANGE_NORMAL</constant>&nbsp;</entry>
+                  <entry>Normal distance range, limited for best automatic focus
+performance.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_RANGE_MACRO</constant>&nbsp;</entry>
+                  <entry>Macro (close-up) auto focus. The camera will
+use its minimum possible distance for auto focus.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_AUTO_FOCUS_RANGE_INFINITY</constant>&nbsp;</entry>
+                  <entry>The lens is set to focus on an object at infinite distance.</entry>
+                </row>
+              </tbody>
+            </entrytbl>
+          </row>
+          <row><entry></entry></row>
+
+          <row>
             <entry spanname="id"><constant>V4L2_CID_ZOOM_ABSOLUTE</constant>&nbsp;</entry>
             <entry>integer</entry>
           </row><row><entry spanname="descr">Specify the objective lens