9 files changed, 140 insertions, 52 deletions

diff --git a/Documentation/ABI/obsolete/dv1394 b/Documentation/ABI/obsolete/dv1394
deleted file mode 100644
index 2ee36864ca10..000000000000
--- a/Documentation/ABI/obsolete/dv1394
+++ /dev/null
@@ -1,9 +0,0 @@
-What:           dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
-Contact:        linux1394-devel@lists.sourceforge.net
-Description:
-        New application development should use raw1394 + userspace libraries
-        instead, notably libiec61883 which is functionally equivalent.
-
-Users:
-        ffmpeg/libavformat (used by a variety of media players)
-        dvgrab v1.x (replaced by dvgrab2 on top of raw1394 and resp. libraries)
diff --git a/Documentation/ABI/removed/dv1394 b/Documentation/ABI/removed/dv1394
new file mode 100644
index 000000000000..c2310b6676f4
--- /dev/null
+++ b/Documentation/ABI/removed/dv1394
@@ -0,0 +1,14 @@
+What:           dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
+Date:           May 2010 (scheduled), finally removed in kernel v2.6.37
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        /dev/dv1394/* were character device files, one for each FireWire
+        controller and for NTSC and PAL respectively, from which DV data
+        could be received by read() or transmitted by write().  A few
+        ioctl()s allowed limited control.
+        This special-purpose interface has been superseded by libraw1394 +
+        libiec61883 which are functionally equivalent, support HDV, and
+        transparently work on top of the newer firewire kernel drivers.
+
+Users:
+        ffmpeg/libavformat (if configured for DV1394)
diff --git a/Documentation/ABI/removed/raw1394 b/Documentation/ABI/removed/raw1394
new file mode 100644
index 000000000000..490aa1efc4ae
--- /dev/null
+++ b/Documentation/ABI/removed/raw1394
@@ -0,0 +1,15 @@
+What:           raw1394 (a.k.a. "Raw IEEE1394 I/O support" for FireWire)
+Date:           May 2010 (scheduled), finally removed in kernel v2.6.37
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        /dev/raw1394 was a character device file that allowed low-level
+        access to FireWire buses.  Its major drawbacks were its inability
+        to implement sensible device security policies, and its low level
+        of abstraction that required userspace clients do duplicate much
+        of the kernel's ieee1394 core functionality.
+        Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
+        firewire-core.
+
+Users:
+        libraw1394 (works with firewire-cdev too, transparent to library ABI
+        users)
diff --git a/Documentation/ABI/removed/raw1394_legacy_isochronous b/Documentation/ABI/removed/raw1394_legacy_isochronous
deleted file mode 100644
index 1b629622d883..000000000000
--- a/Documentation/ABI/removed/raw1394_legacy_isochronous
+++ /dev/null
@@ -1,16 +0,0 @@
-What:           legacy isochronous ABI of raw1394 (1st generation iso ABI)
-Date:           June 2007 (scheduled), removed in kernel v2.6.23
-Contact:        linux1394-devel@lists.sourceforge.net
-Description:
-        The two request types RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN have
-        been deprecated for quite some time.  They are very inefficient as they
-        come with high interrupt load and several layers of callbacks for each
-        packet.  Because of these deficiencies, the video1394 and dv1394 drivers
-        and the 3rd-generation isochronous ABI in raw1394 (rawiso) were created.
-
-Users:
-        libraw1394 users via the long deprecated API raw1394_iso_write,
-        raw1394_start_iso_write, raw1394_start_iso_rcv, raw1394_stop_iso_rcv
-
-        libdc1394, which optionally uses these old libraw1394 calls
-        alternatively to the more efficient video1394 ABI
diff --git a/Documentation/ABI/removed/video1394 b/Documentation/ABI/removed/video1394
new file mode 100644
index 000000000000..c39c25aee77b
--- /dev/null
+++ b/Documentation/ABI/removed/video1394
@@ -0,0 +1,16 @@
+What:           video1394 (a.k.a. "OHCI-1394 Video support" for FireWire)
+Date:           May 2010 (scheduled), finally removed in kernel v2.6.37
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+        /dev/video1394/* were character device files, one for each FireWire
+        controller, which were used for isochronous I/O.  It was added as an
+        alternative to raw1394's isochronous I/O functionality which had
+        performance issues in its first generation.  Any video1394 user had
+        to use raw1394 + libraw1394 too because video1394 did not provide
+        asynchronous I/O for device discovery and configuration.
+        Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
+        firewire-core.
+
+Users:
+        libdc1394 (works with firewire-cdev too, transparent to library ABI
+        users)
diff --git a/Documentation/ABI/testing/sysfs-devices-system-ibm-rtl b/Documentation/ABI/testing/sysfs-devices-system-ibm-rtl
new file mode 100644
index 000000000000..b82deeaec314
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-system-ibm-rtl
@@ -0,0 +1,22 @@
+What:           state
+Date:           Sep 2010
+KernelVersion:  2.6.37
+Contact:        Vernon Mauery <vernux@us.ibm.com>
+Description:    The state file allows a means by which to change in and
+                out of Premium Real-Time Mode (PRTM), as well as the
+                ability to query the current state.
+                    0 => PRTM off
+                    1 => PRTM enabled
+Users:          The ibm-prtm userspace daemon uses this interface.
+
+
+What:           version
+Date:           Sep 2010
+KernelVersion:  2.6.37
+Contact:        Vernon Mauery <vernux@us.ibm.com>
+Description:    The version file provides a means by which to query
+                the RTL table version that lives in the Extended
+                BIOS Data Area (EBDA).
+Users:          The ibm-prtm userspace daemon uses this interface.
+
+
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 9961f1564d22..e833c8c81e69 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -502,16 +502,6 @@ Who:	Thomas Gleixner <tglx@linutronix.de>
 
 ----------------------------
 
-What:   old ieee1394 subsystem (CONFIG_IEEE1394)
-When:   2.6.37
-Files:  drivers/ieee1394/ except init_ohci1394_dma.c
-Why:    superseded by drivers/firewire/ (CONFIG_FIREWIRE) which offers more
-        features, better performance, and better security, all with smaller
-        and more modern code base
-Who:    Stefan Richter <stefanr@s5r6.in-berlin.de>
-
-----------------------------
-
 What:   The acpi_sleep=s4_nonvs command line option
 When:   2.6.37
 Files:  arch/x86/kernel/acpi/sleep.c
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 7f4dcebda9c6..d0eb696d32e8 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -300,6 +300,74 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
            control correctly. If you have problems regarding this, try
            another ALSA compliant mixer (alsamixer works).
 
+  Module snd-azt1605
+  ------------------
+
+    Module for Aztech Sound Galaxy soundcards based on the Aztech AZT1605
+    chipset.
+
+    port        - port # for BASE (0x220,0x240,0x260,0x280)
+    wss_port    - port # for WSS (0x530,0x604,0xe80,0xf40)
+    irq         - IRQ # for WSS (7,9,10,11)
+    dma1        - DMA # for WSS playback (0,1,3)
+    dma2        - DMA # for WSS capture (0,1), -1 = disabled (default)
+    mpu_port    - port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)
+    mpu_irq     - IRQ # for MPU-401 UART (3,5,7,9), -1 = disabled (default)
+    fm_port     - port # for OPL3 (0x388), -1 = disabled (default)
+
+    This module supports multiple cards. It does not support autoprobe: port,
+    wss_port, irq and dma1 have to be specified. The other values are
+    optional.
+
+    "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)
+    or the value stored in the card's EEPROM for cards that have an EEPROM and
+    their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can
+    be choosen freely from the options enumerated above.
+
+    If dma2 is specified and different from dma1, the card will operate in
+    full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to
+    enable capture since only channels 0 and 1 are available for capture.
+
+    Generic settings are "port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0
+    mpu_port=0x330 mpu_irq=9 fm_port=0x388".
+
+    Whatever IRQ and DMA channels you pick, be sure to reserve them for
+    legacy ISA in your BIOS.
+
+  Module snd-azt2316
+  ------------------
+
+    Module for Aztech Sound Galaxy soundcards based on the Aztech AZT2316
+    chipset.
+
+    port        - port # for BASE (0x220,0x240,0x260,0x280)
+    wss_port    - port # for WSS (0x530,0x604,0xe80,0xf40)
+    irq         - IRQ # for WSS (7,9,10,11)
+    dma1        - DMA # for WSS playback (0,1,3)
+    dma2        - DMA # for WSS capture (0,1), -1 = disabled (default)
+    mpu_port    - port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)
+    mpu_irq     - IRQ # for MPU-401 UART (5,7,9,10), -1 = disabled (default)
+    fm_port     - port # for OPL3 (0x388), -1 = disabled (default)
+
+    This module supports multiple cards. It does not support autoprobe: port,
+    wss_port, irq and dma1 have to be specified. The other values are
+    optional.
+
+    "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)
+    or the value stored in the card's EEPROM for cards that have an EEPROM and
+    their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can
+    be choosen freely from the options enumerated above.
+
+    If dma2 is specified and different from dma1, the card will operate in
+    full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to
+    enable capture since only channels 0 and 1 are available for capture.
+
+    Generic settings are "port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0
+    mpu_port=0x330 mpu_irq=9 fm_port=0x388".
+
+    Whatever IRQ and DMA channels you pick, be sure to reserve them for
+    legacy ISA in your BIOS.
+
   Module snd-aw2
   --------------
 
@@ -1641,20 +1709,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This card is also known as Audio Excel DSP 16 or Zoltrix AV302.
 
-  Module snd-sgalaxy
-  ------------------
-
-    Module for Aztech Sound Galaxy sound card.
-
-    sbport      - Port # for SB16 interface (0x220,0x240)
-    wssport     - Port # for WSS interface (0x530,0xe80,0xf40,0x604)
-    irq         - IRQ # (7,9,10,11)
-    dma1        - DMA #
-
-    This module supports multiple cards.
-
-    The power-management is supported.
-
   Module snd-sscape
   -----------------
 
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index 278cc2122ea0..c82beb007634 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -57,9 +57,11 @@ dead.  However, this detection isn't perfect on some devices.  In such
 a case, you can change the default method via `position_fix` option.
 
 `position_fix=1` means to use LPIB method explicitly.
-`position_fix=2` means to use the position-buffer.  0 is the default
-value, the automatic check and fallback to LPIB as described in the
-above.  If you get a problem of repeated sounds, this option might
+`position_fix=2` means to use the position-buffer.
+`position_fix=3` means to use a combination of both methods, needed
+for some VIA and ATI controllers.  0 is the default value for all other
+controllers, the automatic check and fallback to LPIB as described in
+the above.  If you get a problem of repeated sounds, this option might
 help.
 
 In addition to that, every controller is known to be broken regarding