7 files changed, 59 insertions, 9 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 5bc8a476c15e..cfedf63cce15 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -219,6 +219,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_voltage_scale
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_accel_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -273,6 +274,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_accel_scale_available
 What:           /sys/.../iio:deviceX/in_voltageX_scale_available
 What:           /sys/.../iio:deviceX/in_voltage-voltage_scale_available
 What:           /sys/.../iio:deviceX/out_voltageX_scale_available
+What:           /sys/.../iio:deviceX/out_altvoltageX_scale_available
 What:           /sys/.../iio:deviceX/in_capacitance_scale_available
 KernelVersion:  2.635
 Contact:        linux-iio@vger.kernel.org
@@ -298,14 +300,19 @@ Description:
                 gives the 3dB frequency of the filter in Hz.
 
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Raw (unscaled, no bias etc.) output voltage for
                 channel Y.  The number must always be specified and
                 unique if the output corresponds to a single channel.
+                While DAC like devices typically use out_voltage,
+                a continuous frequency generating device, such as
+                a DDS or PLL should use out_altvoltage.
 
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -316,6 +323,8 @@ Description:
 
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode
 KernelVersion:  2.6.38
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -330,6 +339,8 @@ Description:
 
 What:           /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
 What:           /sys/.../iio:deviceX/out_voltage_powerdown_mode_available
+What:           /sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available
+What:           /sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available
 KernelVersion:  2.6.38
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -338,6 +349,8 @@ Description:
 
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown
 KernelVersion:  2.6.38
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -346,6 +359,24 @@ Description:
                 normal operation. Y may be suppressed if all outputs are
                 controlled together.
 
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Output frequency for channel Y in Hz. The number must always be
+                specified and unique if the output corresponds to a single
+                channel.
+
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Phase in radians of one frequency/clock output Y
+                (out_altvoltageY) relative to another frequency/clock output
+                (out_altvoltageZ) of the device X. The number must always be
+                specified and unique if the output corresponds to a single
+                channel.
+
 What:           /sys/bus/iio/devices/iio:deviceX/events
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index f5ac15ed0549..e58934c92895 100644
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry>
           <row id="V4L2-PIX-FMT-Y4">
             <entry><constant>V4L2_PIX_FMT_Y4</constant></entry>
             <entry>'Y04 '</entry>
-            <entry>Old 4-bit greyscale format. Only the least significant 4 bits of each byte are used,
+            <entry>Old 4-bit greyscale format. Only the most significant 4 bits of each byte are used,
 the other bits are set to 0.</entry>
           </row>
           <row id="V4L2-PIX-FMT-Y6">
             <entry><constant>V4L2_PIX_FMT_Y6</constant></entry>
             <entry>'Y06 '</entry>
-            <entry>Old 6-bit greyscale format. Only the least significant 6 bits of each byte are used,
+            <entry>Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used,
 the other bits are set to 0.</entry>
           </row>
         </tbody>
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index 015c561754b7..008c2d73a484 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -560,6 +560,7 @@ and discussions on the V4L mailing list.</revremark>
     &sub-g-tuner;
     &sub-log-status;
     &sub-overlay;
+    &sub-prepare-buf;
     &sub-qbuf;
     &sub-querybuf;
     &sub-querycap;
@@ -567,7 +568,6 @@ and discussions on the V4L mailing list.</revremark>
     &sub-query-dv-preset;
     &sub-query-dv-timings;
     &sub-querystd;
-    &sub-prepare-buf;
     &sub-reqbufs;
     &sub-s-hw-freq-seek;
     &sub-streamon;
diff --git a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
index 765549ff8a71..a2474ecb574a 100644
--- a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
@@ -108,10 +108,9 @@ information.</para>
 /></entry>
           </row>
           <row>
-            <entry>__u32</entry>
+            <entry>struct&nbsp;v4l2_format</entry>
             <entry><structfield>format</structfield></entry>
-            <entry>Filled in by the application, preserved by the driver.
-            See <xref linkend="v4l2-format" />.</entry>
+            <entry>Filled in by the application, preserved by the driver.</entry>
           </row>
           <row>
             <entry>__u32</entry>
diff --git a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
index e8714aa16433..98a856f9ec30 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml
@@ -89,7 +89,7 @@
           <row>
             <entry></entry>
             <entry>&v4l2-event-frame-sync;</entry>
-            <entry><structfield>frame</structfield></entry>
+            <entry><structfield>frame_sync</structfield></entry>
             <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>
           </row>
           <row>
diff --git a/Documentation/arm/SPEAr/overview.txt b/Documentation/arm/SPEAr/overview.txt
index 57aae7765c74..65610bf52ebf 100644
--- a/Documentation/arm/SPEAr/overview.txt
+++ b/Documentation/arm/SPEAr/overview.txt
@@ -60,4 +60,4 @@ Introduction
   Document Author
   ---------------
 
-  Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics
+  Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index 84d46c0c71a3..c86b50c03ea8 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -6,7 +6,9 @@ Supported chips:
     Prefix: 'coretemp'
     CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),
                               0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),
-                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield)
+                              0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield),
+                              0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom),
+                              0x36 (Cedar Trail Atom)
     Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
                Volume 3A: System Programming Guide
                http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
@@ -52,6 +54,17 @@ Some information comes from ark.intel.com
 
 Process         Processor                                       TjMax(C)
 
+22nm            Core i5/i7 Processors
+                i7 3920XM, 3820QM, 3720QM, 3667U, 3520M         105
+                i5 3427U, 3360M/3320M                           105
+                i7 3770/3770K                                   105
+                i5 3570/3570K, 3550, 3470/3450                  105
+                i7 3770S                                        103
+                i5 3570S/3550S, 3475S/3470S/3450S               103
+                i7 3770T                                        94
+                i5 3570T                                        94
+                i5 3470T                                        91
+
 32nm            Core i3/i5/i7 Processors
                 i7 660UM/640/620, 640LM/620, 620M, 610E         105
                 i5 540UM/520/430, 540M/520/450/430              105
@@ -65,6 +78,11 @@ Process		Processor					TjMax(C)
                 U3400                                           105
                 P4505/P4500                                     90
 
+32nm            Atom Processors
+                Z2460                                           90
+                D2700/2550/2500                                 100
+                N2850/2800/2650/2600                            100
+
 45nm            Xeon Processors 5400 Quad-Core
                 X5492, X5482, X5472, X5470, X5460, X5450        85
                 E5472, E5462, E5450/40/30/20/10/05              85
@@ -85,6 +103,8 @@ Process		Processor					TjMax(C)
                 N475/470/455/450                                100
                 N280/270                                        90
                 330/230                                         125
+                E680/660/640/620                                90
+                E680T/660T/640T/620T                            110
 
 45nm            Core2 Processors
                 Solo ULV SU3500/3300                            100