392 files changed, 27106 insertions, 5427 deletions

diff --git a/CREDITS b/CREDITS
index 2993348ce6ce..3b7a1548aaf9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2380,9 +2380,10 @@ E: tmolina@cablespeed.com
 D: bug fixes, documentation, minor hackery
 
 N: James Morris
-E: jmorris@intercode.com.au
+E: jmorris@redhat.com
 W: http://www.intercode.com.au/jmorris/
-D: Netfilter, Linux Security Modules (LSM).
+D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
+D: Crypto API, general networking, miscellaneous.
 S: PO Box 707
 S: Spit Junction NSW 2088
 S: Australia
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b9eb209318ab..26414bc87c65 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -83,3 +83,13 @@ Why:	Deprecated in favour of the new ioctl-based rawiso interface, which is
         more efficient.  You should really be using libraw1394 for raw1394
         access anyway.
 Who:    Jody McIntyre <scjody@steamballoon.com>
+
+---------------------------
+
+What:   i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid
+When:   November 2005
+Files:  drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c
+Why:    Match the other drivers' name for the same function, duplicate names
+        will be available until removal of old names.
+Who:    Grant Coady <gcoady@gmail.com>
+
diff --git a/Documentation/i2c/busses/i2c-sis69x b/Documentation/i2c/busses/i2c-sis69x
index 5be48769f65b..b88953dfd580 100644
--- a/Documentation/i2c/busses/i2c-sis69x
+++ b/Documentation/i2c/busses/i2c-sis69x
@@ -42,7 +42,7 @@ I suspect that this driver could be made to work for the following SiS
 chipsets as well: 635, and 635T. If anyone owns a board with those chips
 AND is willing to risk crashing & burning an otherwise well-behaved kernel
 in the name of progress... please contact me at <mhoffman@lightlink.com> or
-via the project's mailing list: <sensors@stimpy.netroedge.com>.  Please
+via the project's mailing list: <lm-sensors@lm-sensors.org>.  Please
 send bug reports and/or success stories as well.
 
 
diff --git a/Documentation/i2c/chips/adm1021 b/Documentation/i2c/chips/adm1021
new file mode 100644
index 000000000000..03d02bfb3df1
--- /dev/null
+++ b/Documentation/i2c/chips/adm1021
@@ -0,0 +1,111 @@
+Kernel driver adm1021
+=====================
+
+Supported chips:
+  * Analog Devices ADM1021
+    Prefix: 'adm1021'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the Analog Devices website
+  * Analog Devices ADM1021A/ADM1023
+    Prefix: 'adm1023'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the Analog Devices website
+  * Genesys Logic GL523SM
+    Prefix: 'gl523sm'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet:
+  * Intel Xeon Processor
+    Prefix: - any other - may require 'force_adm1021' parameter
+    Addresses scanned: none
+    Datasheet: Publicly available at Intel website
+  * Maxim MAX1617
+    Prefix: 'max1617'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the Maxim website
+  * Maxim MAX1617A
+    Prefix: 'max1617a'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the Maxim website
+  * National Semiconductor LM84
+    Prefix: 'lm84'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the National Semiconductor website
+  * Philips NE1617
+    Prefix: 'max1617' (probably detected as a max1617)
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the Philips website
+  * Philips NE1617A
+    Prefix: 'max1617' (probably detected as a max1617)
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the Philips website
+  * TI THMC10
+    Prefix: 'thmc10'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the TI website
+  * Onsemi MC1066
+    Prefix: 'mc1066'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the Onsemi website
+
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>
+
+Module Parameters
+-----------------
+
+* read_only: int
+  Don't set any values, read only mode
+
+
+Description
+-----------
+
+The chips supported by this driver are very similar. The Maxim MAX1617 is
+the oldest; it has the problem that it is not very well detectable. The
+MAX1617A solves that. The ADM1021 is a straight clone of the MAX1617A.
+Ditto for the THMC10. From here on, we will refer to all these chips as
+ADM1021-clones.
+
+The ADM1021 and MAX1617A reports a die code, which is a sort of revision
+code. This can help us pinpoint problems; it is not very useful
+otherwise.
+
+ADM1021-clones implement two temperature sensors. One of them is internal,
+and measures the temperature of the chip itself; the other is external and
+is realised in the form of a transistor-like device. A special alarm
+indicates whether the remote sensor is connected.
+
+Each sensor has its own low and high limits. When they are crossed, the
+corresponding alarm is set and remains on as long as the temperature stays
+out of range. Temperatures are measured in degrees Celsius. Measurements
+are possible between -65 and +127 degrees, with a resolution of one degree.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may already
+have disappeared!
+
+This driver only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values. It is possible to make
+ADM1021-clones do faster measurements, but there is really no good reason
+for that.
+
+Xeon support
+------------
+
+Some Xeon processors have real max1617, adm1021, or compatible chips
+within them, with two temperature sensors.
+
+Other Xeons have chips with only one sensor.
+
+If you have a Xeon, and the adm1021 module loads, and both temperatures
+appear valid, then things are good.
+
+If the adm1021 module doesn't load, you should try this:
+        modprobe adm1021 force_adm1021=BUS,ADDRESS
+        ADDRESS can only be 0x18, 0x1a, 0x29, 0x2b, 0x4c, or 0x4e.
+
+If you have dual Xeons you may have appear to have two separate
+adm1021-compatible chips, or two single-temperature sensors, at distinct
+addresses.
diff --git a/Documentation/i2c/chips/adm1025 b/Documentation/i2c/chips/adm1025
new file mode 100644
index 000000000000..39d2b781b5d6
--- /dev/null
+++ b/Documentation/i2c/chips/adm1025
@@ -0,0 +1,51 @@
+Kernel driver adm1025
+=====================
+
+Supported chips:
+  * Analog Devices ADM1025, ADM1025A
+    Prefix: 'adm1025'
+    Addresses scanned: I2C 0x2c - 0x2e
+    Datasheet: Publicly available at the Analog Devices website
+  * Philips NE1619
+    Prefix: 'ne1619'
+    Addresses scanned: I2C 0x2c - 0x2d
+    Datasheet: Publicly available at the Philips website
+
+The NE1619 presents some differences with the original ADM1025:
+  * Only two possible addresses (0x2c - 0x2d).
+  * No temperature offset register, but we don't use it anyway.
+  * No INT mode for pin 16. We don't play with it anyway.
+
+Authors:
+        Chen-Yuan Wu <gwu@esoft.com>,
+        Jean Delvare <khali@linux-fr.org>
+
+Description
+-----------
+
+(This is from Analog Devices.) The ADM1025 is a complete system hardware
+monitor for microprocessor-based systems, providing measurement and limit
+comparison of various system parameters. Five voltage measurement inputs
+are provided, for monitoring +2.5V, +3.3V, +5V and +12V power supplies and
+the processor core voltage. The ADM1025 can monitor a sixth power-supply
+voltage by measuring its own VCC. One input (two pins) is dedicated to a
+remote temperature-sensing diode and an on-chip temperature sensor allows
+ambient temperature to be monitored.
+
+One specificity of this chip is that the pin 11 can be hardwired in two
+different manners. It can act as the +12V power-supply voltage analog
+input, or as the a fifth digital entry for the VID reading (bit 4). It's
+kind of strange since both are useful, and the reason for designing the
+chip that way is obscure at least to me. The bit 5 of the configuration
+register can be used to define how the chip is hardwired. Please note that
+it is not a choice you have to make as the user. The choice was already
+made by your motherboard's maker. If the configuration bit isn't set
+properly, you'll have a wrong +12V reading or a wrong VID reading. The way
+the driver handles that is to preserve this bit through the initialization
+process, assuming that the BIOS set it up properly beforehand. If it turns
+out not to be true in some cases, we'll provide a module parameter to force
+modes.
+
+This driver also supports the ADM1025A, which differs from the ADM1025
+only in that it has "open-drain VID inputs while the ADM1025 has on-chip
+100k pull-ups on the VID inputs". It doesn't make any difference for us.
diff --git a/Documentation/i2c/chips/adm1026 b/Documentation/i2c/chips/adm1026
new file mode 100644
index 000000000000..473c689d7924
--- /dev/null
+++ b/Documentation/i2c/chips/adm1026
@@ -0,0 +1,93 @@
+Kernel driver adm1026
+=====================
+
+Supported chips:
+  * Analog Devices ADM1026
+    Prefix: 'adm1026'
+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
+    Datasheet: Publicly available at the Analog Devices website
+               http://www.analog.com/en/prod/0,,766_825_ADM1026,00.html
+
+Authors:
+        Philip Pokorny <ppokorny@penguincomputing.com> for Penguin Computing
+        Justin Thiessen <jthiessen@penguincomputing.com>
+
+Module Parameters
+-----------------
+
+* gpio_input: int array (min = 1, max = 17)
+  List of GPIO pins (0-16) to program as inputs
+* gpio_output: int array (min = 1, max = 17)
+  List of GPIO pins (0-16) to program as outputs
+* gpio_inverted: int array (min = 1, max = 17)
+  List of GPIO pins (0-16) to program as inverted
+* gpio_normal: int array (min = 1, max = 17)
+  List of GPIO pins (0-16) to program as normal/non-inverted
+* gpio_fan: int array (min = 1, max = 8)
+  List of GPIO pins (0-7) to program as fan tachs
+
+
+Description
+-----------
+
+This driver implements support for the Analog Devices ADM1026. Analog
+Devices calls it a "complete thermal system management controller."
+
+The ADM1026 implements three (3) temperature sensors, 17 voltage sensors,
+16 general purpose digital I/O lines, eight (8) fan speed sensors (8-bit),
+an analog output and a PWM output along with limit, alarm and mask bits for
+all of the above. There is even 8k bytes of EEPROM memory on chip.
+
+Temperatures are measured in degrees Celsius. There are two external
+sensor inputs and one internal sensor. Each sensor has a high and low
+limit. If the limit is exceeded, an interrupt (#SMBALERT) can be
+generated. The interrupts can be masked. In addition, there are over-temp
+limits for each sensor. If this limit is exceeded, the #THERM output will
+be asserted. The current temperature and limits have a resolution of 1
+degree.
+
+Fan rotation speeds are reported in RPM (rotations per minute) but measured
+in counts of a 22.5kHz internal clock. Each fan has a high limit which
+corresponds to a minimum fan speed. If the limit is exceeded, an interrupt
+can be generated. Each fan can be programmed to divide the reference clock
+by 1, 2, 4 or 8. Not all RPM values can accurately be represented, so some
+rounding is done. With a divider of 8, the slowest measurable speed of a
+two pulse per revolution fan is 661 RPM.
+
+There are 17 voltage sensors. An alarm is triggered if the voltage has
+crossed a programmable minimum or maximum limit. Note that minimum in this
+case always means 'closest to zero'; this is important for negative voltage
+measurements. Several inputs have integrated attenuators so they can measure
+higher voltages directly. 3.3V, 5V, 12V, -12V and battery voltage all have
+dedicated inputs. There are several inputs scaled to 0-3V full-scale range
+for SCSI terminator power. The remaining inputs are not scaled and have
+a 0-2.5V full-scale range. A 2.5V or 1.82V reference voltage is provided
+for negative voltage measurements.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may already
+have disappeared! Note that in the current implementation, all hardware
+registers are read whenever any data is read (unless it is less than 2.0
+seconds since the last update). This means that you can easily miss
+once-only alarms.
+
+The ADM1026 measures continuously. Analog inputs are measured about 4
+times a second. Fan speed measurement time depends on fan speed and
+divisor. It can take as long as 1.5 seconds to measure all fan speeds.
+
+The ADM1026 has the ability to automatically control fan speed based on the
+temperature sensor inputs. Both the PWM output and the DAC output can be
+used to control fan speed. Usually only one of these two outputs will be
+used. Write the minimum PWM or DAC value to the appropriate control
+register. Then set the low temperature limit in the tmin values for each
+temperature sensor. The range of control is fixed at 20 °C, and the
+largest difference between current and tmin of the temperature sensors sets
+the control output. See the datasheet for several example circuits for
+controlling fan speed with the PWM and DAC outputs. The fan speed sensors
+do not have PWM compensation, so it is probably best to control the fan
+voltage from the power lead rather than on the ground lead.
+
+The datasheet shows an example application with VID signals attached to
+GPIO lines. Unfortunately, the chip may not be connected to the VID lines
+in this way. The driver assumes that the chips *is* connected this way to
+get a VID voltage.
diff --git a/Documentation/i2c/chips/adm1031 b/Documentation/i2c/chips/adm1031
new file mode 100644
index 000000000000..130a38382b98
--- /dev/null
+++ b/Documentation/i2c/chips/adm1031
@@ -0,0 +1,35 @@
+Kernel driver adm1031
+=====================
+
+Supported chips:
+  * Analog Devices ADM1030
+    Prefix: 'adm1030'
+    Addresses scanned: I2C 0x2c to 0x2e
+    Datasheet: Publicly available at the Analog Devices website
+               http://products.analog.com/products/info.asp?product=ADM1030
+
+  * Analog Devices ADM1031
+    Prefix: 'adm1031'
+    Addresses scanned: I2C 0x2c to 0x2e
+    Datasheet: Publicly available at the Analog Devices website
+               http://products.analog.com/products/info.asp?product=ADM1031
+
+Authors:
+        Alexandre d'Alton <alex@alexdalton.org>
+        Jean Delvare <khali@linux-fr.org>
+
+Description
+-----------
+
+The ADM1030 and ADM1031 are digital temperature sensors and fan controllers.
+They sense their own temperature as well as the temperature of up to one
+(ADM1030) or two (ADM1031) external diodes.
+
+All temperature values are given in degrees Celsius. Resolution is 0.5
+degree for the local temperature, 0.125 degree for the remote temperatures.
+
+Each temperature channel has its own high and low limits, plus a critical
+limit.
+
+The ADM1030 monitors a single fan speed, while the ADM1031 monitors up to
+two. Each fan channel has its own low speed limit.
diff --git a/Documentation/i2c/chips/adm9240 b/Documentation/i2c/chips/adm9240
new file mode 100644
index 000000000000..35f618f32896
--- /dev/null
+++ b/Documentation/i2c/chips/adm9240
@@ -0,0 +1,177 @@
+Kernel driver adm9240
+=====================
+
+Supported chips:
+  * Analog Devices ADM9240
+    Prefix: 'adm9240'
+    Addresses scanned: I2C 0x2c - 0x2f
+    Datasheet: Publicly available at the Analog Devices website
+    http://www.analog.com/UploadedFiles/Data_Sheets/79857778ADM9240_0.pdf
+
+  * Dallas Semiconductor DS1780
+    Prefix: 'ds1780'
+    Addresses scanned: I2C 0x2c - 0x2f
+    Datasheet: Publicly available at the Dallas Semiconductor (Maxim) website
+    http://pdfserv.maxim-ic.com/en/ds/DS1780.pdf
+
+  * National Semiconductor LM81
+    Prefix: 'lm81'
+    Addresses scanned: I2C 0x2c - 0x2f
+    Datasheet: Publicly available at the National Semiconductor website
+    http://www.national.com/ds.cgi/LM/LM81.pdf
+
+Authors:
+    Frodo Looijaard <frodol@dds.nl>,
+    Philip Edelbrock <phil@netroedge.com>,
+    Michiel Rook <michiel@grendelproject.nl>,
+    Grant Coady <gcoady@gmail.com> with guidance
+        from Jean Delvare <khali@linux-fr.org>
+
+Interface
+---------
+The I2C addresses listed above assume BIOS has not changed the
+chip MSB 5-bit address. Each chip reports a unique manufacturer
+identification code as well as the chip revision/stepping level.
+
+Description
+-----------
+[From ADM9240] The ADM9240 is a complete system hardware monitor for
+microprocessor-based systems, providing measurement and limit comparison
+of up to four power supplies and two processor core voltages, plus
+temperature, two fan speeds and chassis intrusion. Measured values can
+be read out via an I2C-compatible serial System Management Bus, and values
+for limit comparisons can be programmed in over the same serial bus. The
+high speed successive approximation ADC allows frequent sampling of all
+analog channels to ensure a fast interrupt response to any out-of-limit
+measurement.
+
+The ADM9240, DS1780 and LM81 are register compatible, the following
+details are common to the three chips. Chip differences are described
+after this section.
+
+
+Measurements
+------------
+The measurement cycle
+
+The adm9240 driver will take a measurement reading no faster than once
+each two seconds. User-space may read sysfs interface faster than the
+measurement update rate and will receive cached data from the most
+recent measurement.
+
+ADM9240 has a very fast 320us temperature and voltage measurement cycle
+with independent fan speed measurement cycles counting alternating rising
+edges of the fan tacho inputs.
+
+DS1780 measurement cycle is about once per second including fan speed.
+
+LM81 measurement cycle is about once per 400ms including fan speed.
+The LM81 12-bit extended temperature measurement mode is not supported.
+
+Temperature
+-----------
+On chip temperature is reported as degrees Celsius as 9-bit signed data
+with resolution of 0.5 degrees Celsius. High and low temperature limits
+are 8-bit signed data with resolution of one degree Celsius.
+
+Temperature alarm is asserted once the temperature exceeds the high limit,
+and is cleared when the temperature falls below the temp1_max_hyst value.
+
+Fan Speed
+---------
+Two fan tacho inputs are provided, the ADM9240 gates an internal 22.5kHz
+clock via a divider to an 8-bit counter. Fan speed (rpm) is calculated by:
+
+rpm = (22500 * 60) / (count * divider)
+
+Automatic fan clock divider
+
+  * User sets 0 to fan_min limit
+    - low speed alarm is disabled
+    - fan clock divider not changed
+    - auto fan clock adjuster enabled for valid fan speed reading
+
+  * User sets fan_min limit too low
+    - low speed alarm is enabled
+    - fan clock divider set to max
+    - fan_min set to register value 254 which corresponds
+      to 664 rpm on adm9240
+    - low speed alarm will be asserted if fan speed is
+      less than minimum measurable speed
+    - auto fan clock adjuster disabled
+
+  * User sets reasonable fan speed
+    - low speed alarm is enabled
+    - fan clock divider set to suit fan_min
+    - auto fan clock adjuster enabled: adjusts fan_min
+
+  * User sets unreasonably high low fan speed limit
+    - resolution of the low speed limit may be reduced
+    - alarm will be asserted
+    - auto fan clock adjuster enabled: adjusts fan_min
+
+    * fan speed may be displayed as zero until the auto fan clock divider
+      adjuster brings fan speed clock divider back into chip measurement
+      range, this will occur within a few measurement cycles.
+
+Analog Output
+-------------
+An analog output provides a 0 to 1.25 volt signal intended for an external
+fan speed amplifier circuit. The analog output is set to maximum value on
+power up or reset. This doesn't do much on the test Intel SE440BX-2.
+
+Voltage Monitor
+
+Voltage (IN) measurement is internally scaled:
+
+    nr  label       nominal     maximum   resolution
+                      mV          mV         mV
+    0   +2.5V        2500        3320       13.0
+    1   Vccp1        2700        3600       14.1
+    2   +3.3V        3300        4380       17.2
+    3     +5V        5000        6640       26.0
+    4    +12V       12000       15940       62.5
+    5   Vccp2        2700        3600       14.1
+
+The reading is an unsigned 8-bit value, nominal voltage measurement is
+represented by a reading of 192, being 3/4 of the measurement range.
+
+An alarm is asserted for any voltage going below or above the set limits.
+
+The driver reports and accepts voltage limits scaled to the above table.
+
+VID Monitor
+-----------
+The chip has five inputs to read the 5-bit VID and reports the mV value
+based on detected CPU type.
+
+Chassis Intrusion
+-----------------
+An alarm is asserted when the CI pin goes active high. The ADM9240
+Datasheet has an example of an external temperature sensor driving
+this pin. On an Intel SE440BX-2 the Chassis Intrusion header is
+connected to a normally open switch.
+
+The ADM9240 provides an internal open drain on this line, and may output
+a 20 ms active low pulse to reset an external Chassis Intrusion latch.
+
+Clear the CI latch by writing value 1 to the sysfs chassis_clear file.
+
+Alarm flags reported as 16-bit word
+
+    bit     label               comment
+    ---     -------------       --------------------------
+     0      +2.5 V_Error        high or low limit exceeded
+     1      VCCP_Error          high or low limit exceeded
+     2      +3.3 V_Error        high or low limit exceeded
+     3      +5 V_Error          high or low limit exceeded
+     4      Temp_Error          temperature error
+     6      FAN1_Error          fan low limit exceeded
+     7      FAN2_Error          fan low limit exceeded
+     8      +12 V_Error         high or low limit exceeded
+     9      VCCP2_Error         high or low limit exceeded
+    12      Chassis_Error       CI pin went high
+
+Remaining bits are reserved and thus undefined. It is important to note
+that alarm bits may be cleared on read, user-space may latch alarms and
+provide the end-user with a method to clear alarm memory.
diff --git a/Documentation/i2c/chips/asb100 b/Documentation/i2c/chips/asb100
new file mode 100644
index 000000000000..ab7365e139be
--- /dev/null
+++ b/Documentation/i2c/chips/asb100
@@ -0,0 +1,72 @@
+Kernel driver asb100
+====================
+
+Supported Chips:
+  * Asus ASB100 and ASB100-A "Bach"
+    Prefix: 'asb100'
+    Addresses scanned: I2C 0x2d
+    Datasheet: none released
+
+Author: Mark M. Hoffman <mhoffman@lightlink.com>
+
+Description
+-----------
+
+This driver implements support for the Asus ASB100 and ASB100-A "Bach".
+These are custom ASICs available only on Asus mainboards. Asus refuses to
+supply a datasheet for these chips. Thanks go to many people who helped
+investigate their hardware, including:
+
+Vitaly V. Bursov
+Alexander van Kaam (author of MBM for Windows)
+Bertrik Sikken
+
+The ASB100 implements seven voltage sensors, three fan rotation speed
+sensors, four temperature sensors, VID lines and alarms. In addition to
+these, the ASB100-A also implements a single PWM controller for fans 2 and
+3 (i.e. one setting controls both.) If you have a plain ASB100, the PWM
+controller will simply not work (or maybe it will for you... it doesn't for
+me).
+
+Temperatures are measured and reported in degrees Celsius.
+
+Fan speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit.
+
+Voltage sensors (also known as IN sensors) report values in volts.
+
+The VID lines encode the core voltage value: the voltage level your
+processor should work with. This is hardcoded by the mainboard and/or
+processor itself. It is a value in volts.
+
+Alarms: (TODO question marks indicate may or may not work)
+
+0x0001 => in0 (?)
+0x0002 => in1 (?)
+0x0004 => in2
+0x0008 => in3
+0x0010 => temp1 (1)
+0x0020 => temp2
+0x0040 => fan1
+0x0080 => fan2
+0x0100 => in4
+0x0200 => in5 (?) (2)
+0x0400 => in6 (?) (2)
+0x0800 => fan3
+0x1000 => chassis switch
+0x2000 => temp3
+
+Alarm Notes:
+
+(1) This alarm will only trigger if the hysteresis value is 127C.
+I.e. it behaves the same as w83781d.
+
+(2) The min and max registers for these values appear to
+be read-only or otherwise stuck at 0x00.
+
+TODO:
+* Experiment with fan divisors > 8.
+* Experiment with temp. sensor types.
+* Are there really 13 voltage inputs? Probably not...
+* Cleanups, no doubt...
+
diff --git a/Documentation/i2c/chips/ds1621 b/Documentation/i2c/chips/ds1621
new file mode 100644
index 000000000000..1fee6f1e6bc5
--- /dev/null
+++ b/Documentation/i2c/chips/ds1621
@@ -0,0 +1,108 @@
+Kernel driver ds1621
+====================
+
+Supported chips:
+  * Dallas Semiconductor DS1621
+    Prefix: 'ds1621'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+  * Dallas Semiconductor DS1625
+    Prefix: 'ds1621'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Christian W. Zuckschwerdt <zany@triq.net>
+        valuable contributions by Jan M. Sendler <sendler@sendler.de>
+        ported to 2.6 by Aurelien Jarno <aurelien@aurel32.net>
+        with the help of Jean Delvare <khali@linux-fr.org>
+
+Module Parameters
+------------------
+
+* polarity int
+  Output's polarity: 0 = active high, 1 = active low
+
+Description
+-----------
+
+The DS1621 is a (one instance) digital thermometer and thermostat. It has
+both high and low temperature limits which can be user defined (i.e.
+programmed into non-volatile on-chip registers). Temperature range is -55
+degree Celsius to +125 in 0.5 increments. You may convert this into a
+Fahrenheit range of -67 to +257 degrees with 0.9 steps. If polarity
+parameter is not provided, original value is used.
+
+As for the thermostat, behavior can also be programmed using the polarity
+toggle. On the one hand ("heater"), the thermostat output of the chip,
+Tout, will trigger when the low limit temperature is met or underrun and
+stays high until the high limit is met or exceeded. On the other hand
+("cooler"), vice versa. That way "heater" equals "active low", whereas
+"conditioner" equals "active high". Please note that the DS1621 data sheet
+is somewhat misleading in this point since setting the polarity bit does
+not simply invert Tout.
+
+A second thing is that, during extensive testing, Tout showed a tolerance
+of up to +/- 0.5 degrees even when compared against precise temperature
+readings. Be sure to have a high vs. low temperature limit gap of al least
+1.0 degree Celsius to avoid Tout "bouncing", though!
+
+As for alarms, you can read the alarm status of the DS1621 via the 'alarms'
+/sys file interface. The result consists mainly of bit 6 and 5 of the
+configuration register of the chip; bit 6 (0x40 or 64) is the high alarm
+bit and bit 5 (0x20 or 32) the low one. These bits are set when the high or
+low limits are met or exceeded and are reset by the module as soon as the
+respective temperature ranges are left.
+
+The alarm registers are in no way suitable to find out about the actual
+status of Tout. They will only tell you about its history, whether or not
+any of the limits have ever been met or exceeded since last power-up or
+reset. Be aware: When testing, it showed that the status of Tout can change
+with neither of the alarms set.
+
+Temperature conversion of the DS1621 takes up to 1000ms; internal access to
+non-volatile registers may last for 10ms or below.
+
+High Accuracy Temperature Reading
+---------------------------------
+
+As said before, the temperature issued via the 9-bit i2c-bus data is
+somewhat arbitrary. Internally, the temperature conversion is of a
+different kind that is explained (not so...) well in the DS1621 data sheet.
+To cut the long story short: Inside the DS1621 there are two oscillators,
+both of them biassed by a temperature coefficient.
+
+Higher resolution of the temperature reading can be achieved using the
+internal projection, which means taking account of REG_COUNT and REG_SLOPE
+(the driver manages them):
+
+Taken from Dallas Semiconductors App Note 068: 'Increasing Temperature
+Resolution on the DS1620' and App Note 105: 'High Resolution Temperature
+Measurement with Dallas Direct-to-Digital Temperature Sensors'
+
+- Read the 9-bit temperature and strip the LSB (Truncate the .5 degs)
+- The resulting value is TEMP_READ.
+- Then, read REG_COUNT.
+- And then, REG_SLOPE.
+
+      TEMP = TEMP_READ - 0.25 + ((REG_SLOPE - REG_COUNT) / REG_SLOPE)
+
+Note that this is what the DONE bit in the DS1621 configuration register is
+good for: Internally, one temperature conversion takes up to 1000ms. Before
+that conversion is complete you will not be able to read valid things out
+of REG_COUNT and REG_SLOPE. The DONE bit, as you may have guessed by now,
+tells you whether the conversion is complete ("done", in plain English) and
+thus, whether the values you read are good or not.
+
+The DS1621 has two modes of operation: "Continuous" conversion, which can
+be understood as the default stand-alone mode where the chip gets the
+temperature and controls external devices via its Tout pin or tells other
+i2c's about it if they care. The other mode is called "1SHOT", that means
+that it only figures out about the temperature when it is explicitly told
+to do so; this can be seen as power saving mode.
+
+Now if you want to read REG_COUNT and REG_SLOPE, you have to either stop
+the continuous conversions until the contents of these registers are valid,
+or, in 1SHOT mode, you have to have one conversion made.
diff --git a/Documentation/i2c/chips/eeprom b/Documentation/i2c/chips/eeprom
new file mode 100644
index 000000000000..f7e8104b5764
--- /dev/null
+++ b/Documentation/i2c/chips/eeprom
@@ -0,0 +1,96 @@
+Kernel driver eeprom
+====================
+
+Supported chips:
+  * Any EEPROM chip in the designated address range
+    Prefix: 'eeprom'
+    Addresses scanned: I2C 0x50 - 0x57
+    Datasheets: Publicly available from:
+                Atmel (www.atmel.com),
+                Catalyst (www.catsemi.com),
+                Fairchild (www.fairchildsemi.com),
+                Microchip (www.microchip.com),
+                Philips (www.semiconductor.philips.com),
+                Rohm (www.rohm.com),
+                ST (www.st.com),
+                Xicor (www.xicor.com),
+                and others.
+
+        Chip     Size (bits)    Address
+        24C01     1K            0x50 (shadows at 0x51 - 0x57)
+        24C01A    1K            0x50 - 0x57 (Typical device on DIMMs)
+        24C02     2K            0x50 - 0x57
+        24C04     4K            0x50, 0x52, 0x54, 0x56
+                                (additional data at 0x51, 0x53, 0x55, 0x57)
+        24C08     8K            0x50, 0x54 (additional data at 0x51, 0x52,
+                                0x53, 0x55, 0x56, 0x57)
+        24C16    16K            0x50 (additional data at 0x51 - 0x57)
+        Sony      2K            0x57
+
+        Atmel     34C02B  2K    0x50 - 0x57, SW write protect at 0x30-37
+        Catalyst  34FC02  2K    0x50 - 0x57, SW write protect at 0x30-37
+        Catalyst  34RC02  2K    0x50 - 0x57, SW write protect at 0x30-37
+        Fairchild 34W02   2K    0x50 - 0x57, SW write protect at 0x30-37
+        Microchip 24AA52  2K    0x50 - 0x57, SW write protect at 0x30-37
+        ST        M34C02  2K    0x50 - 0x57, SW write protect at 0x30-37
+
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>,
+        Jean Delvare <khali@linux-fr.org>,
+        Greg Kroah-Hartman <greg@kroah.com>,
+        IBM Corp.
+
+Description
+-----------
+
+This is a simple EEPROM module meant to enable reading the first 256 bytes
+of an EEPROM (on a SDRAM DIMM for example). However, it will access serial
+EEPROMs on any I2C adapter. The supported devices are generically called
+24Cxx, and are listed above; however the numbering for these
+industry-standard devices may vary by manufacturer.
+
+This module was a programming exercise to get used to the new project
+organization laid out by Frodo, but it should be at least completely
+effective for decoding the contents of EEPROMs on DIMMs.
+
+DIMMS will typically contain a 24C01A or 24C02, or the 34C02 variants.
+The other devices will not be found on a DIMM because they respond to more
+than one address.
+
+DDC Monitors may contain any device. Often a 24C01, which responds to all 8
+addresses, is found.
+
+Recent Sony Vaio laptops have an EEPROM at 0x57. We couldn't get the
+specification, so it is guess work and far from being complete.
+
+The Microchip 24AA52/24LCS52, ST M34C02, and others support an additional
+software write protect register at 0x30 - 0x37 (0x20 less than the memory
+location). The chip responds to "write quick" detection at this address but
+does not respond to byte reads. If this register is present, the lower 128
+bytes of the memory array are not write protected. Any byte data write to
+this address will write protect the memory array permanently, and the
+device will no longer respond at the 0x30-37 address. The eeprom driver
+does not support this register.
+
+Lacking functionality:
+
+* Full support for larger devices (24C04, 24C08, 24C16). These are not
+typically found on a PC. These devices will appear as separate devices at
+multiple addresses.
+
+* Support for really large devices (24C32, 24C64, 24C128, 24C256, 24C512).
+These devices require two-byte address fields and are not supported.
+
+* Enable Writing. Again, no technical reason why not, but making it easy
+to change the contents of the EEPROMs (on DIMMs anyway) also makes it easy
+to disable the DIMMs (potentially preventing the computer from booting)
+until the values are restored somehow.
+
+Use:
+
+After inserting the module (and any other required SMBus/i2c modules), you
+should have some EEPROM directories in /sys/bus/i2c/devices/* of names such
+as "0-0050". Inside each of these is a series of files, the eeprom file
+contains the binary data from EEPROM.
diff --git a/Documentation/i2c/chips/fscher b/Documentation/i2c/chips/fscher
new file mode 100644
index 000000000000..64031659aff3
--- /dev/null
+++ b/Documentation/i2c/chips/fscher
@@ -0,0 +1,169 @@
+Kernel driver fscher
+====================
+
+Supported chips:
+  * Fujitsu-Siemens Hermes chip
+    Prefix: 'fscher'
+    Addresses scanned: I2C 0x73
+
+Authors:
+        Reinhard Nissl <rnissl@gmx.de> based on work
+        from Hermann Jung <hej@odn.de>,
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>
+
+Description
+-----------
+
+This driver implements support for the Fujitsu-Siemens Hermes chip. It is
+described in the 'Register Set Specification BMC Hermes based Systemboard'
+from Fujitsu-Siemens.
+
+The Hermes chip implements a hardware-based system management, e.g. for
+controlling fan speed and core voltage. There is also a watchdog counter on
+the chip which can trigger an alarm and even shut the system down.
+
+The chip provides three temperature values (CPU, motherboard and
+auxiliary), three voltage values (+12V, +5V and battery) and three fans
+(power supply, CPU and auxiliary).
+
+Temperatures are measured in degrees Celsius. The resolution is 1 degree.
+
+Fan rotation speeds are reported in RPM (rotations per minute). The value
+can be divided by a programmable divider (1, 2 or 4) which is stored on
+the chip.
+
+Voltage sensors (also known as "in" sensors) report their values in volts.
+
+All values are reported as final values from the driver. There is no need
+for further calculations.
+
+
+Detailed description
+--------------------
+
+Below you'll find a single line description of all the bit values. With
+this information, you're able to decode e. g. alarms, wdog, etc. To make
+use of the watchdog, you'll need to set the watchdog time and enable the
+watchdog. After that it is necessary to restart the watchdog time within
+the specified period of time, or a system reset will occur.
+
+* revision
+  READING & 0xff = 0x??: HERMES revision identification
+
+* alarms
+  READING & 0x80 = 0x80: CPU throttling active
+  READING & 0x80 = 0x00: CPU running at full speed
+
+  READING & 0x10 = 0x10: software event (see control:1)
+  READING & 0x10 = 0x00: no software event
+
+  READING & 0x08 = 0x08: watchdog event (see wdog:2)
+  READING & 0x08 = 0x00: no watchdog event
+
+  READING & 0x02 = 0x02: thermal event (see temp*:1)
+  READING & 0x02 = 0x00: no thermal event
+
+  READING & 0x01 = 0x01: fan event (see fan*:1)
+  READING & 0x01 = 0x00: no fan event
+
+  READING & 0x13 ! 0x00: ALERT LED is flashing
+
+* control
+  READING & 0x01 = 0x01: software event
+  READING & 0x01 = 0x00: no software event
+
+  WRITING & 0x01 = 0x01: set software event
+  WRITING & 0x01 = 0x00: clear software event
+
+* watchdog_control
+  READING & 0x80 = 0x80: power off on watchdog event while thermal event
+  READING & 0x80 = 0x00: watchdog power off disabled (just system reset enabled)
+
+  READING & 0x40 = 0x40: watchdog timebase 60 seconds (see also wdog:1)
+  READING & 0x40 = 0x00: watchdog timebase  2 seconds
+
+  READING & 0x10 = 0x10: watchdog enabled
+  READING & 0x10 = 0x00: watchdog disabled
+
+  WRITING & 0x80 = 0x80: enable "power off on watchdog event while thermal event"
+  WRITING & 0x80 = 0x00: disable "power off on watchdog event while thermal event"
+
+  WRITING & 0x40 = 0x40: set watchdog timebase to 60 seconds
+  WRITING & 0x40 = 0x00: set watchdog timebase to  2 seconds
+
+  WRITING & 0x20 = 0x20: disable watchdog
+
+  WRITING & 0x10 = 0x10: enable watchdog / restart watchdog time
+
+* watchdog_state
+  READING & 0x02 = 0x02: watchdog system reset occurred
+  READING & 0x02 = 0x00: no watchdog system reset occurred
+
+  WRITING & 0x02 = 0x02: clear watchdog event
+
+* watchdog_preset
+  READING & 0xff = 0x??: configured watch dog time in units (see wdog:3 0x40)
+
+  WRITING & 0xff = 0x??: configure watch dog time in units
+
+* in*     (0: +5V, 1: +12V, 2: onboard 3V battery)
+  READING: actual voltage value
+
+* temp*_status   (1: CPU sensor, 2: onboard sensor, 3: auxiliary sensor)
+  READING & 0x02 = 0x02: thermal event (overtemperature)
+  READING & 0x02 = 0x00: no thermal event
+
+  READING & 0x01 = 0x01: sensor is working
+  READING & 0x01 = 0x00: sensor is faulty
+
+  WRITING & 0x02 = 0x02: clear thermal event
+
+* temp*_input   (1: CPU sensor, 2: onboard sensor, 3: auxiliary sensor)
+  READING: actual temperature value
+
+* fan*_status   (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
+  READING & 0x04 = 0x04: fan event (fan fault)
+  READING & 0x04 = 0x00: no fan event
+
+  WRITING & 0x04 = 0x04: clear fan event
+
+* fan*_div (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
+        Divisors 2,4 and 8 are supported, both for reading and writing
+
+* fan*_pwm   (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
+  READING & 0xff = 0x00: fan may be switched off
+  READING & 0xff = 0x01: fan must run at least at minimum speed (supply: 6V)
+  READING & 0xff = 0xff: fan must run at maximum speed (supply: 12V)
+  READING & 0xff = 0x??: fan must run at least at given speed (supply: 6V..12V)
+
+  WRITING & 0xff = 0x00: fan may be switched off
+  WRITING & 0xff = 0x01: fan must run at least at minimum speed (supply: 6V)
+  WRITING & 0xff = 0xff: fan must run at maximum speed (supply: 12V)
+  WRITING & 0xff = 0x??: fan must run at least at given speed (supply: 6V..12V)
+
+* fan*_input   (1: power supply fan, 2: CPU fan, 3: auxiliary fan)
+  READING: actual RPM value
+
+
+Limitations
+-----------
+
+* Measuring fan speed
+It seems that the chip counts "ripples" (typical fans produce 2 ripples per
+rotation while VERAX fans produce 18) in a 9-bit register. This register is
+read out every second, then the ripple prescaler (2, 4 or 8) is applied and
+the result is stored in the 8 bit output register. Due to the limitation of
+the counting register to 9 bits, it is impossible to measure a VERAX fan
+properly (even with a prescaler of 8). At its maximum speed of 3500 RPM the
+fan produces 1080 ripples per second which causes the counting register to
+overflow twice, leading to only 186 RPM.
+
+* Measuring input voltages
+in2 ("battery") reports the voltage of the onboard lithium battery and not
++3.3V from the power supply.
+
+* Undocumented features
+Fujitsu-Siemens Computers has not documented all features of the chip so
+far. Their software, System Guard, shows that there are a still some
+features which cannot be controlled by this implementation.
diff --git a/Documentation/i2c/chips/gl518sm b/Documentation/i2c/chips/gl518sm
new file mode 100644
index 000000000000..ce0881883bca
--- /dev/null
+++ b/Documentation/i2c/chips/gl518sm
@@ -0,0 +1,74 @@
+Kernel driver gl518sm
+=====================
+
+Supported chips:
+  * Genesys Logic GL518SM release 0x00
+    Prefix: 'gl518sm'
+    Addresses scanned: I2C 0x2c and 0x2d
+    Datasheet: http://www.genesyslogic.com/pdf
+  * Genesys Logic GL518SM release 0x80
+    Prefix: 'gl518sm'
+    Addresses scanned: I2C 0x2c and 0x2d
+    Datasheet: http://www.genesyslogic.com/pdf
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Kyösti Mälkki <kmalkki@cc.hut.fi>
+        Hong-Gunn Chew <hglinux@gunnet.org>
+        Jean Delvare <khali@linux-fr.org>
+
+Description
+-----------
+
+IMPORTANT:
+
+For the revision 0x00 chip, the in0, in1, and in2  values (+5V, +3V,
+and +12V) CANNOT be read. This is a limitation of the chip, not the driver.
+
+This driver supports the Genesys Logic GL518SM chip. There are at least
+two revision of this chip, which we call revision 0x00 and 0x80. Revision
+0x80 chips support the reading of all voltages and revision 0x00 only
+for VIN3.
+
+The GL518SM implements one temperature sensor, two fan rotation speed
+sensors, and four voltage sensors. It can report alarms through the
+computer speakers.
+
+Temperatures are measured in degrees Celsius. An alarm goes off while the
+temperature is above the over temperature limit, and has not yet dropped
+below the hysteresis limit. The alarm always reflects the current
+situation. Measurements are guaranteed between -10 degrees and +110
+degrees, with a accuracy of +/-3 degrees.
+
+Rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. In
+case when you have selected to turn fan1 off, no fan1 alarm is triggered.
+
+Fan readings can be divided by a programmable divider (1, 2, 4 or 8) to
+give the readings more range or accuracy.  Not all RPM values can
+accurately be represented, so some rounding is done. With a divider
+of 2, the lowest representable value is around 1900 RPM.
+
+Voltage sensors (also known as VIN sensors) report their values in volts.
+An alarm is triggered if the voltage has crossed a programmable minimum or
+maximum limit. Note that minimum in this case always means 'closest to
+zero'; this is important for negative voltage measurements. The VDD input
+measures voltages between 0.000 and 5.865 volt, with a resolution of 0.023
+volt. The other inputs measure voltages between 0.000 and 4.845 volt, with
+a resolution of 0.019 volt. Note that revision 0x00 chips do not support
+reading the current voltage of any input except for VIN3; limit setting and
+alarms work fine, though.
+
+When an alarm is triggered, you can be warned by a beeping signal through your
+computer speaker. It is possible to enable all beeping globally, or only the
+beeping for some alarms.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once (except for temperature alarms). This means that the
+cause for the alarm may already have disappeared! Note that in the current
+implementation, all hardware registers are read whenever any data is read
+(unless it is less than 1.5 seconds since the last update). This means that
+you can easily miss once-only alarms.
+
+The GL518SM only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
diff --git a/Documentation/i2c/chips/it87 b/Documentation/i2c/chips/it87
new file mode 100644
index 000000000000..0d0195040d88
--- /dev/null
+++ b/Documentation/i2c/chips/it87
@@ -0,0 +1,96 @@
+Kernel driver it87
+==================
+
+Supported chips:
+  * IT8705F
+    Prefix: 'it87'
+    Addresses scanned: from Super I/O config space, or default ISA 0x290 (8 I/O ports)
+    Datasheet: Publicly available at the ITE website
+               http://www.ite.com.tw/
+  * IT8712F
+    Prefix: 'it8712'
+    Addresses scanned: I2C 0x28 - 0x2f
+                       from Super I/O config space, or default ISA 0x290 (8 I/O ports)
+    Datasheet: Publicly available at the ITE website
+               http://www.ite.com.tw/
+  * SiS950   [clone of IT8705F]
+    Prefix: 'sis950'
+    Addresses scanned: from Super I/O config space, or default ISA 0x290 (8 I/O ports)
+    Datasheet: No longer be available
+
+Author: Christophe Gauthron <chrisg@0-in.com>
+
+
+Module Parameters
+-----------------
+
+* update_vbat: int
+
+  0 if vbat should report power on value, 1 if vbat should be updated after
+  each read. Default is 0. On some boards the battery voltage is provided
+  by either the battery or the onboard power supply. Only the first reading
+  at power on will be the actual battery voltage (which the chip does
+  automatically). On other boards the battery voltage is always fed to
+  the chip so can be read at any time. Excessive reading may decrease
+  battery life but no information is given in the datasheet.
+
+* fix_pwm_polarity int
+
+  Force PWM polarity to active high (DANGEROUS). Some chips are
+  misconfigured by BIOS - PWM values would be inverted. This option tries
+  to fix this. Please contact your BIOS manufacturer and ask him for fix.
+
+Description
+-----------
+
+This driver implements support for the IT8705F, IT8712F and SiS950 chips.
+
+This driver also supports IT8712F, which adds SMBus access, and a VID
+input, used to report the Vcore voltage of the Pentium processor.
+The IT8712F additionally features VID inputs.
+
+These chips are 'Super I/O chips', supporting floppy disks, infrared ports,
+joysticks and other miscellaneous stuff. For hardware monitoring, they
+include an 'environment controller' with 3 temperature sensors, 3 fan
+rotation speed sensors, 8 voltage sensors, and associated alarms.
+
+Temperatures are measured in degrees Celsius. An alarm is triggered once
+when the Overtemperature Shutdown limit is crossed.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give the
+readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+Voltage sensors (also known as IN sensors) report their values in volts. An
+alarm is triggered if the voltage has crossed a programmable minimum or
+maximum limit. Note that minimum in this case always means 'closest to
+zero'; this is important for negative voltage measurements. All voltage
+inputs can measure voltages between 0 and 4.08 volts, with a resolution of
+0.016 volt. The battery voltage in8 does not have limit registers.
+
+The VID lines (IT8712F only) encode the core voltage value: the voltage
+level your processor should work with. This is hardcoded by the mainboard
+and/or processor itself. It is a value in volts.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may already
+have disappeared! Note that in the current implementation, all hardware
+registers are read whenever any data is read (unless it is less than 1.5
+seconds since the last update). This means that you can easily miss
+once-only alarms.
+
+The IT87xx only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
+
+To change sensor N to a thermistor, 'echo 2 > tempN_type' where N is 1, 2,
+or 3. To change sensor N to a thermal diode, 'echo 3 > tempN_type'.
+Give 0 for unused sensor. Any other value is invalid. To configure this at
+startup, consult lm_sensors's /etc/sensors.conf. (2 = thermistor;
+3 = thermal diode)
+
+The fan speed control features are limited to manual PWM mode. Automatic
+"Smart Guardian" mode control handling is not implemented. However
+if you want to go for "manual mode" just write 1 to pwmN_enable.
diff --git a/Documentation/i2c/chips/lm63 b/Documentation/i2c/chips/lm63
new file mode 100644
index 000000000000..31660bf97979
--- /dev/null
+++ b/Documentation/i2c/chips/lm63
@@ -0,0 +1,57 @@
+Kernel driver lm63
+==================
+
+Supported chips:
+  * National Semiconductor LM63
+    Prefix: 'lm63'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/pf/LM/LM63.html
+
+Author: Jean Delvare <khali@linux-fr.org>
+
+Thanks go to Tyan and especially Alex Buckingham for setting up a remote
+access to their S4882 test platform for this driver.
+  http://www.tyan.com/
+
+Description
+-----------
+
+The LM63 is a digital temperature sensor with integrated fan monitoring
+and control.
+
+The LM63 is basically an LM86 with fan speed monitoring and control
+capabilities added. It misses some of the LM86 features though:
+ - No low limit for local temperature.
+ - No critical limit for local temperature.
+ - Critical limit for remote temperature can be changed only once. We
+   will consider that the critical limit is read-only.
+
+The datasheet isn't very clear about what the tachometer reading is.
+
+An explanation from National Semiconductor: The two lower bits of the read
+value have to be masked out. The value is still 16 bit in width.
+
+All temperature values are given in degrees Celsius. Resolution is 1.0
+degree for the local temperature, 0.125 degree for the remote temperature.
+
+The fan speed is measured using a tachometer. Contrary to most chips which
+store the value in an 8-bit register and have a selectable clock divider
+to make sure that the result will fit in the register, the LM63 uses 16-bit
+value for measuring the speed of the fan. It can measure fan speeds down to
+83 RPM, at least in theory.
+
+Note that the pin used for fan monitoring is shared with an alert out
+function. Depending on how the board designer wanted to use the chip, fan
+speed monitoring will or will not be possible. The proper chip configuration
+is left to the BIOS, and the driver will blindly trust it.
+
+A PWM output can be used to control the speed of the fan. The LM63 has two
+PWM modes: manual and automatic. Automatic mode is not fully implemented yet
+(you cannot define your custom PWM/temperature curve), and mode change isn't
+supported either.
+
+The lm63 driver will not update its values more frequently than every
+second; reading them more often will do no harm, but will return 'old'
+values.
+
diff --git a/Documentation/i2c/chips/lm75 b/Documentation/i2c/chips/lm75
new file mode 100644
index 000000000000..8e6356fe05d7
--- /dev/null
+++ b/Documentation/i2c/chips/lm75
@@ -0,0 +1,65 @@
+Kernel driver lm75
+==================
+
+Supported chips:
+  * National Semiconductor LM75
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/
+  * Dallas Semiconductor DS75
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.maxim-ic.com/
+  * Dallas Semiconductor DS1775
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.maxim-ic.com/
+  * Maxim MAX6625, MAX6626
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4b
+    Datasheet: Publicly available at the Maxim website
+               http://www.maxim-ic.com/
+  * Microchip (TelCom) TCN75
+    Prefix: 'lm75'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Microchip website
+               http://www.microchip.com/
+
+Author: Frodo Looijaard <frodol@dds.nl>
+
+Description
+-----------
+
+The LM75 implements one temperature sensor. Limits can be set through the
+Overtemperature Shutdown register and Hysteresis register. Each value can be
+set and read to half-degree accuracy.
+An alarm is issued (usually to a connected LM78) when the temperature
+gets higher then the Overtemperature Shutdown value; it stays on until
+the temperature falls below the Hysteresis value.
+All temperatures are in degrees Celsius, and are guaranteed within a
+range of -55 to +125 degrees.
+
+The LM75 only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
+
+The LM75 is usually used in combination with LM78-like chips, to measure
+the temperature of the processor(s).
+
+The DS75, DS1775, MAX6625, and MAX6626 are supported as well.
+They are not distinguished from an LM75. While most of these chips
+have three additional bits of accuracy (12 vs. 9 for the LM75),
+the additional bits are not supported. Not only that, but these chips will
+not be detected if not in 9-bit precision mode (use the force parameter if
+needed).
+
+The TCN75 is supported as well, and is not distinguished from an LM75.
+
+The LM75 is essentially an industry standard; there may be other
+LM75 clones not listed here, with or without various enhancements,
+that are supported.
+
+The LM77 is not supported, contrary to what we pretended for a long time.
+Both chips are simply not compatible, value encoding differs.
diff --git a/Documentation/i2c/chips/lm77 b/Documentation/i2c/chips/lm77
new file mode 100644
index 000000000000..57c3a46d6370
--- /dev/null
+++ b/Documentation/i2c/chips/lm77
@@ -0,0 +1,22 @@
+Kernel driver lm77
+==================
+
+Supported chips:
+  * National Semiconductor LM77
+    Prefix: 'lm77'
+    Addresses scanned: I2C 0x48 - 0x4b
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/
+
+Author: Andras BALI <drewie@freemail.hu>
+
+Description
+-----------
+
+The LM77 implements one temperature sensor. The temperature
+sensor incorporates a band-gap type temperature sensor,
+10-bit ADC, and a digital comparator with user-programmable upper
+and lower limit values.
+
+Limits can be set through the Overtemperature Shutdown register and
+Hysteresis register.
diff --git a/Documentation/i2c/chips/lm78 b/Documentation/i2c/chips/lm78
new file mode 100644
index 000000000000..357086ed7f64
--- /dev/null
+++ b/Documentation/i2c/chips/lm78
@@ -0,0 +1,82 @@
+Kernel driver lm78
+==================
+
+Supported chips:
+  * National Semiconductor LM78
+    Prefix: 'lm78'
+    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/
+  * National Semiconductor LM78-J
+    Prefix: 'lm78-j'
+    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/
+  * National Semiconductor LM79
+    Prefix: 'lm79'
+    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/
+
+Author: Frodo Looijaard <frodol@dds.nl>
+
+Description
+-----------
+
+This driver implements support for the National Semiconductor LM78, LM78-J
+and LM79. They are described as 'Microprocessor System Hardware Monitors'.
+
+There is almost no difference between the three supported chips. Functionally,
+the LM78 and LM78-J are exactly identical. The LM79 has one more VID line,
+which is used to report the lower voltages newer Pentium processors use.
+From here on, LM7* means either of these three types.
+
+The LM7* implements one temperature sensor, three fan rotation speed sensors,
+seven voltage sensors, VID lines, alarms, and some miscellaneous stuff.
+
+Temperatures are measured in degrees Celsius. An alarm is triggered once
+when the Overtemperature Shutdown limit is crossed; it is triggered again
+as soon as it drops below the Hysteresis value. A more useful behavior
+can be found by setting the Hysteresis value to +127 degrees Celsius; in
+this case, alarms are issued during all the time when the actual temperature
+is above the Overtemperature Shutdown value. Measurements are guaranteed
+between -55 and +125 degrees, with a resolution of 1 degree.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+Voltage sensors (also known as IN sensors) report their values in volts.
+An alarm is triggered if the voltage has crossed a programmable minimum
+or maximum limit. Note that minimum in this case always means 'closest to
+zero'; this is important for negative voltage measurements. All voltage
+inputs can measure voltages between 0 and 4.08 volts, with a resolution
+of 0.016 volt.
+
+The VID lines encode the core voltage value: the voltage level your processor
+should work with. This is hardcoded by the mainboard and/or processor itself.
+It is a value in volts. When it is unconnected, you will often find the
+value 3.50 V here.
+
+In addition to the alarms described above, there are a couple of additional
+ones. There is a BTI alarm, which gets triggered when an external chip has
+crossed its limits. Usually, this is connected to all LM75 chips; if at
+least one crosses its limits, this bit gets set. The CHAS alarm triggers
+if your computer case is open. The FIFO alarms should never trigger; it
+indicates an internal error. The SMI_IN alarm indicates some other chip
+has triggered an SMI interrupt. As we do not use SMI interrupts at all,
+this condition usually indicates there is a problem with some other
+device.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may
+already have disappeared! Note that in the current implementation, all
+hardware registers are read whenever any data is read (unless it is less
+than 1.5 seconds since the last update). This means that you can easily
+miss once-only alarms.
+
+The LM7* only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
diff --git a/Documentation/i2c/chips/lm80 b/Documentation/i2c/chips/lm80
new file mode 100644
index 000000000000..cb5b407ba3e6
--- /dev/null
+++ b/Documentation/i2c/chips/lm80
@@ -0,0 +1,56 @@
+Kernel driver lm80
+==================
+
+Supported chips:
+  * National Semiconductor LM80
+    Prefix: 'lm80'
+    Addresses scanned: I2C 0x28 - 0x2f
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>
+
+Description
+-----------
+
+This driver implements support for the National Semiconductor LM80.
+It is described as a 'Serial Interface ACPI-Compatible Microprocessor
+System Hardware Monitor'.
+
+The LM80 implements one temperature sensor, two fan rotation speed sensors,
+seven voltage sensors, alarms, and some miscellaneous stuff.
+
+Temperatures are measured in degrees Celsius. There are two sets of limits
+which operate independently. When the HOT Temperature Limit is crossed,
+this will cause an alarm that will be reasserted until the temperature
+drops below the HOT Hysteresis. The Overtemperature Shutdown (OS) limits
+should work in the same way (but this must be checked; the datasheet
+is unclear about this). Measurements are guaranteed between -55 and
++125 degrees. The current temperature measurement has a resolution of
+0.0625 degrees; the limits have a resolution of 1 degree.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+Voltage sensors (also known as IN sensors) report their values in volts.
+An alarm is triggered if the voltage has crossed a programmable minimum
+or maximum limit. Note that minimum in this case always means 'closest to
+zero'; this is important for negative voltage measurements. All voltage
+inputs can measure voltages between 0 and 2.55 volts, with a resolution
+of 0.01 volt.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may
+already have disappeared! Note that in the current implementation, all
+hardware registers are read whenever any data is read (unless it is less
+than 2.0 seconds since the last update). This means that you can easily
+miss once-only alarms.
+
+The LM80 only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
diff --git a/Documentation/i2c/chips/lm83 b/Documentation/i2c/chips/lm83
new file mode 100644
index 000000000000..061d9ed8ff43
--- /dev/null
+++ b/Documentation/i2c/chips/lm83
@@ -0,0 +1,76 @@
+Kernel driver lm83
+==================
+
+Supported chips:
+  * National Semiconductor LM83
+    Prefix: 'lm83'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/pf/LM/LM83.html
+
+
+Author: Jean Delvare <khali@linux-fr.org>
+
+Description
+-----------
+
+The LM83 is a digital temperature sensor. It senses its own temperature as
+well as the temperature of up to three external diodes. It is compatible
+with many other devices such as the LM84 and all other ADM1021 clones.
+The main difference between the LM83 and the LM84 in that the later can
+only sense the temperature of one external diode.
+
+Using the adm1021 driver for a LM83 should work, but only two temperatures
+will be reported instead of four.
+
+The LM83 is only found on a handful of motherboards. Both a confirmed
+list and an unconfirmed list follow. If you can confirm or infirm the
+fact that any of these motherboards do actually have an LM83, please
+contact us. Note that the LM90 can easily be misdetected as a LM83.
+
+Confirmed motherboards:
+    SBS         P014
+
+Unconfirmed motherboards:
+    Gigabyte    GA-8IK1100
+    Iwill       MPX2
+    Soltek      SL-75DRV5
+
+The driver has been successfully tested by Magnus Forsström, who I'd
+like to thank here. More testers will be of course welcome.
+
+The fact that the LM83 is only scarcely used can be easily explained.
+Most motherboards come with more than just temperature sensors for
+health monitoring. They also have voltage and fan rotation speed
+sensors. This means that temperature-only chips are usually used as
+secondary chips coupled with another chip such as an IT8705F or similar
+chip, which provides more features. Since systems usually need three
+temperature sensors (motherboard, processor, power supply) and primary
+chips provide some temperature sensors, the secondary chip, if needed,
+won't have to handle more than two temperatures. Thus, ADM1021 clones
+are sufficient, and there is no need for a four temperatures sensor
+chip such as the LM83. The only case where using an LM83 would make
+sense is on SMP systems, such as the above-mentioned Iwill MPX2,
+because you want an additional temperature sensor for each additional
+CPU.
+
+On the SBS P014, this is different, since the LM83 is the only hardware
+monitoring chipset. One temperature sensor is used for the motherboard
+(actually measuring the LM83's own temperature), one is used for the
+CPU. The two other sensors must be used to measure the temperature of
+two other points of the motherboard. We suspect these points to be the
+north and south bridges, but this couldn't be confirmed.
+
+All temperature values are given in degrees Celsius. Local temperature
+is given within a range of 0 to +85 degrees. Remote temperatures are
+given within a range of 0 to +125 degrees. Resolution is 1.0 degree,
+accuracy is guaranteed to 3.0 degrees (see the datasheet for more
+details).
+
+Each sensor has its own high limit, but the critical limit is common to
+all four sensors. There is no hysteresis mechanism as found on most
+recent temperature sensors.
+
+The lm83 driver will not update its values more frequently than every
+other second; reading them more often will do no harm, but will return
+'old' values.
diff --git a/Documentation/i2c/chips/lm85 b/Documentation/i2c/chips/lm85
new file mode 100644
index 000000000000..9549237530cf
--- /dev/null
+++ b/Documentation/i2c/chips/lm85
@@ -0,0 +1,221 @@
+Kernel driver lm85
+==================
+
+Supported chips:
+  * National Semiconductor LM85 (B and C versions)
+    Prefix: 'lm85'
+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
+    Datasheet: http://www.national.com/pf/LM/LM85.html
+  * Analog Devices ADM1027
+    Prefix: 'adm1027'
+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
+    Datasheet: http://www.analog.com/en/prod/0,,766_825_ADM1027,00.html
+  * Analog Devices ADT7463
+    Prefix: 'adt7463'
+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
+    Datasheet: http://www.analog.com/en/prod/0,,766_825_ADT7463,00.html
+  * SMSC EMC6D100, SMSC EMC6D101
+    Prefix: 'emc6d100'
+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
+    Datasheet: http://www.smsc.com/main/tools/discontinued/6d100.pdf
+  * SMSC EMC6D102
+    Prefix: 'emc6d102'
+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
+    Datasheet: http://www.smsc.com/main/catalog/emc6d102.html
+
+Authors:
+        Philip Pokorny <ppokorny@penguincomputing.com>,
+        Frodo Looijaard <frodol@dds.nl>,
+        Richard Barrington <rich_b_nz@clear.net.nz>,
+        Margit Schubert-While <margitsw@t-online.de>,
+        Justin Thiessen <jthiessen@penguincomputing.com>
+
+Description
+-----------
+
+This driver implements support for the National Semiconductor LM85 and
+compatible chips including the Analog Devices ADM1027, ADT7463 and
+SMSC EMC6D10x chips family.
+
+The LM85 uses the 2-wire interface compatible with the SMBUS 2.0
+specification. Using an analog to digital converter it measures three (3)
+temperatures and five (5) voltages. It has four (4) 16-bit counters for
+measuring fan speed. Five (5) digital inputs are provided for sampling the
+VID signals from the processor to the VRM. Lastly, there are three (3) PWM
+outputs that can be used to control fan speed.
+
+The voltage inputs have internal scaling resistors so that the following
+voltage can be measured without external resistors:
+
+  2.5V, 3.3V, 5V, 12V, and CPU core voltage (2.25V)
+
+The temperatures measured are one internal diode, and two remote diodes.
+Remote 1 is generally the CPU temperature. These inputs are designed to
+measure a thermal diode like the one in a Pentium 4 processor in a socket
+423 or socket 478 package. They can also measure temperature using a
+transistor like the 2N3904.
+
+A sophisticated control system for the PWM outputs is designed into the
+LM85 that allows fan speed to be adjusted automatically based on any of the
+three temperature sensors. Each PWM output is individually adjustable and
+programmable. Once configured, the LM85 will adjust the PWM outputs in
+response to the measured temperatures without further host intervention.
+This feature can also be disabled for manual control of the PWM's.
+
+Each of the measured inputs (voltage, temperature, fan speed) has
+corresponding high/low limit values. The LM85 will signal an ALARM if any
+measured value exceeds either limit.
+
+The LM85 samples all inputs continuously. The lm85 driver will not read
+the registers more often than once a second. Further, configuration data is
+only read once each 5 minutes. There is twice as much config data as
+measurements, so this would seem to be a worthwhile optimization.
+
+Special Features
+----------------
+
+The LM85 has four fan speed monitoring modes. The ADM1027 has only two.
+Both have special circuitry to compensate for PWM interactions with the
+TACH signal from the fans. The ADM1027 can be configured to measure the
+speed of a two wire fan, but the input conditioning circuitry is different
+for 3-wire and 2-wire mode. For this reason, the 2-wire fan modes are not
+exposed to user control. The BIOS should initialize them to the correct
+mode. If you've designed your own ADM1027, you'll have to modify the
+init_client function and add an insmod parameter to set this up.
+
+To smooth the response of fans to changes in temperature, the LM85 has an
+optional filter for smoothing temperatures. The ADM1027 has the same
+config option but uses it to rate limit the changes to fan speed instead.
+
+The ADM1027 and ADT7463 have a 10-bit ADC and can therefore measure
+temperatures with 0.25 degC resolution. They also provide an offset to the
+temperature readings that is automatically applied during measurement.
+This offset can be used to zero out any errors due to traces and placement.
+The documentation says that the offset is in 0.25 degC steps, but in
+initial testing of the ADM1027 it was 1.00 degC steps. Analog Devices has
+confirmed this "bug". The ADT7463 is reported to work as described in the
+documentation. The current lm85 driver does not show the offset register.
+
+The ADT7463 has a THERM asserted counter. This counter has a 22.76ms
+resolution and a range of 5.8 seconds. The driver implements a 32-bit
+accumulator of the counter value to extend the range to over a year. The
+counter will stay at it's max value until read.
+
+See the vendor datasheets for more information. There is application note
+from National (AN-1260) with some additional information about the LM85.
+The Analog Devices datasheet is very detailed and describes a procedure for
+determining an optimal configuration for the automatic PWM control.
+
+The SMSC EMC6D100 & EMC6D101 monitor external voltages, temperatures, and
+fan speeds. They use this monitoring capability to alert the system to out
+of limit conditions and can automatically control the speeds of multiple
+fans in a PC or embedded system. The EMC6D101, available in a 24-pin SSOP
+package, and the EMC6D100, available in a 28-pin SSOP package, are designed
+to be register compatible. The EMC6D100 offers all the features of the
+EMC6D101 plus additional voltage monitoring and system control features.
+Unfortunately it is not possible to distinguish between the package
+versions on register level so these additional voltage inputs may read
+zero. The EMC6D102 features addtional ADC bits thus extending precision
+of voltage and temperature channels.
+
+
+Hardware Configurations
+-----------------------
+
+The LM85 can be jumpered for 3 different SMBus addresses. There are
+no other hardware configuration options for the LM85.
+
+The lm85 driver detects both LM85B and LM85C revisions of the chip. See the
+datasheet for a complete description of the differences. Other than
+identifying the chip, the driver behaves no differently with regard to
+these two chips. The LM85B is recommended for new designs.
+
+The ADM1027 and ADT7463 chips have an optional SMBALERT output that can be
+used to signal the chipset in case a limit is exceeded or the temperature
+sensors fail. Individual sensor interrupts can be masked so they won't
+trigger SMBALERT. The SMBALERT output if configured replaces one of the other
+functions (PWM2 or IN0). This functionality is not implemented in current
+driver.
+
+The ADT7463 also has an optional THERM output/input which can be connected
+to the processor PROC_HOT output. If available, the autofan control
+dynamic Tmin feature can be enabled to keep the system temperature within
+spec (just?!) with the least possible fan noise.
+
+Configuration Notes
+-------------------
+
+Besides standard interfaces driver adds following:
+
+* Temperatures and Zones
+
+Each temperature sensor is associated with a Zone. There are three
+sensors and therefore three zones (# 1, 2 and 3). Each zone has the following
+temperature configuration points:
+
+* temp#_auto_temp_off - temperature below which fans should be off or spinning very low.
+* temp#_auto_temp_min - temperature over which fans start to spin.
+* temp#_auto_temp_max - temperature when fans spin at full speed.
+* temp#_auto_temp_crit - temperature when all fans will run full speed.
+
+* PWM Control
+
+There are three PWM outputs. The LM85 datasheet suggests that the
+pwm3 output control both fan3 and fan4. Each PWM can be individually
+configured and assigned to a zone for it's control value. Each PWM can be
+configured individually according to the following options.
+
+* pwm#_auto_pwm_min - this specifies the PWM value for temp#_auto_temp_off
+                      temperature. (PWM value from 0 to 255)
+
+* pwm#_auto_pwm_freq - select base frequency of PWM output. You can select
+                       in range of 10.0 to 94.0 Hz in .1 Hz units.
+                       (Values 100 to 940).
+
+The pwm#_auto_pwm_freq can be set to one of the following 8 values. Setting the
+frequency to a value not on this list, will result in the next higher frequency
+being selected. The actual device frequency may vary slightly from this
+specification as designed by the manufacturer. Consult the datasheet for more
+details. (PWM Frequency values:  100, 150, 230, 300, 380, 470, 620, 940)
+
+* pwm#_auto_pwm_minctl - this flags selects for temp#_auto_temp_off temperature
+                         the bahaviour of fans. Write 1 to let fans spinning at
+                         pwm#_auto_pwm_min or write 0 to let them off.
+
+NOTE: It has been reported that there is a bug in the LM85 that causes the flag
+to be associated with the zones not the PWMs. This contradicts all the
+published documentation. Setting pwm#_min_ctl in this case actually affects all
+PWMs controlled by zone '#'.
+
+* PWM Controlling Zone selection
+
+* pwm#_auto_channels - controls zone that is associated with PWM
+
+Configuration choices:
+
+   Value     Meaning
+  ------  ------------------------------------------------
+      1    Controlled by Zone 1
+      2    Controlled by Zone 2
+      3    Controlled by Zone 3
+     23    Controlled by higher temp of Zone 2 or 3
+    123    Controlled by highest temp of Zone 1, 2 or 3
+      0    PWM always 0%  (off)
+     -1    PWM always 100%  (full on)
+     -2    Manual control (write to 'pwm#' to set)
+
+The National LM85's have two vendor specific configuration
+features. Tach. mode and Spinup Control. For more details on these,
+see the LM85 datasheet or Application Note AN-1260.
+
+The Analog Devices ADM1027 has several vendor specific enhancements.
+The number of pulses-per-rev of the fans can be set, Tach monitoring
+can be optimized for PWM operation, and an offset can be applied to
+the temperatures to compensate for systemic errors in the
+measurements.
+
+In addition to the ADM1027 features, the ADT7463 also has Tmin control
+and THERM asserted counts. Automatic Tmin control acts to adjust the
+Tmin value to maintain the measured temperature sensor at a specified
+temperature. There isn't much documentation on this feature in the
+ADT7463 data sheet. This is not supported by current driver.
diff --git a/Documentation/i2c/chips/lm87 b/Documentation/i2c/chips/lm87
new file mode 100644
index 000000000000..c952c57f0e11
--- /dev/null
+++ b/Documentation/i2c/chips/lm87
@@ -0,0 +1,73 @@
+Kernel driver lm87
+==================
+
+Supported chips:
+  * National Semiconductor LM87
+    Prefix: 'lm87'
+    Addresses scanned: I2C 0x2c - 0x2f
+    Datasheet: http://www.national.com/pf/LM/LM87.html
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>,
+        Mark Studebaker <mdsxyz123@yahoo.com>,
+        Stephen Rousset <stephen.rousset@rocketlogix.com>,
+        Dan Eaton <dan.eaton@rocketlogix.com>,
+        Jean Delvare <khali@linux-fr.org>,
+        Original 2.6 port Jeff Oliver
+
+Description
+-----------
+
+This driver implements support for the National Semiconductor LM87.
+
+The LM87 implements up to three temperature sensors, up to two fan
+rotation speed sensors, up to seven voltage sensors, alarms, and some
+miscellaneous stuff.
+
+Temperatures are measured in degrees Celsius. Each input has a high
+and low alarm settings. A high limit produces an alarm when the value
+goes above it, and an alarm is also produced when the value goes below
+the low limit.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+Voltage sensors (also known as IN sensors) report their values in
+volts. An alarm is triggered if the voltage has crossed a programmable
+minimum or maximum limit. Note that minimum in this case always means
+'closest to zero'; this is important for negative voltage measurements.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may
+already have disappeared! Note that in the current implementation, all
+hardware registers are read whenever any data is read (unless it is less
+than 1.0 seconds since the last update). This means that you can easily
+miss once-only alarms.
+
+The lm87 driver only updates its values each 1.0 seconds; reading it more
+often will do no harm, but will return 'old' values.
+
+
+Hardware Configurations
+-----------------------
+
+The LM87 has four pins which can serve one of two possible functions,
+depending on the hardware configuration.
+
+Some functions share pins, so not all functions are available at the same
+time. Which are depends on the hardware setup. This driver assumes that
+the BIOS configured the chip correctly. In that respect, it differs from
+the original driver (from lm_sensors for Linux 2.4), which would force the
+LM87 to an arbitrary, compile-time chosen mode, regardless of the actual
+chipset wiring.
+
+For reference, here is the list of exclusive functions:
+ - in0+in5 (default) or temp3
+ - fan1 (default) or in6
+ - fan2 (default) or in7
+ - VID lines (default) or IRQ lines (not handled by this driver)
diff --git a/Documentation/i2c/chips/lm90 b/Documentation/i2c/chips/lm90
new file mode 100644
index 000000000000..2c4cf39471f4
--- /dev/null
+++ b/Documentation/i2c/chips/lm90
@@ -0,0 +1,121 @@
+Kernel driver lm90
+==================
+
+Supported chips:
+  * National Semiconductor LM90
+    Prefix: 'lm90'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/pf/LM/LM90.html
+  * National Semiconductor LM89
+    Prefix: 'lm99'
+    Addresses scanned: I2C 0x4c and 0x4d
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/pf/LM/LM89.html
+  * National Semiconductor LM99
+    Prefix: 'lm99'
+    Addresses scanned: I2C 0x4c and 0x4d
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/pf/LM/LM99.html
+  * National Semiconductor LM86
+    Prefix: 'lm86'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/pf/LM/LM86.html
+  * Analog Devices ADM1032
+    Prefix: 'adm1032'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the Analog Devices website
+               http://products.analog.com/products/info.asp?product=ADM1032
+  * Analog Devices ADT7461
+    Prefix: 'adt7461'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the Analog Devices website
+               http://products.analog.com/products/info.asp?product=ADT7461
+    Note: Only if in ADM1032 compatibility mode
+  * Maxim MAX6657
+    Prefix: 'max6657'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the Maxim website
+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
+  * Maxim MAX6658
+    Prefix: 'max6657'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the Maxim website
+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
+  * Maxim MAX6659
+    Prefix: 'max6657'
+    Addresses scanned: I2C 0x4c, 0x4d (unsupported 0x4e)
+    Datasheet: Publicly available at the Maxim website
+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
+
+
+Author: Jean Delvare <khali@linux-fr.org>
+
+
+Description
+-----------
+
+The LM90 is a digital temperature sensor. It senses its own temperature as
+well as the temperature of up to one external diode. It is compatible
+with many other devices such as the LM86, the LM89, the LM99, the ADM1032,
+the MAX6657, MAX6658 and the MAX6659 all of which are supported by this driver.
+Note that there is no easy way to differentiate between the last three
+variants. The extra address and features of the MAX6659 are not supported by
+this driver. Additionally, the ADT7461 is supported if found in ADM1032
+compatibility mode.
+
+The specificity of this family of chipsets over the ADM1021/LM84
+family is that it features critical limits with hysteresis, and an
+increased resolution of the remote temperature measurement.
+
+The different chipsets of the family are not strictly identical, although
+very similar. This driver doesn't handle any specific feature for now,
+but could if there ever was a need for it. For reference, here comes a
+non-exhaustive list of specific features:
+
+LM90:
+  * Filter and alert configuration register at 0xBF.
+  * ALERT is triggered by temperatures over critical limits.
+
+LM86 and LM89:
+  * Same as LM90
+  * Better external channel accuracy
+
+LM99:
+  * Same as LM89
+  * External temperature shifted by 16 degrees down
+
+ADM1032:
+  * Consecutive alert register at 0x22.
+  * Conversion averaging.
+  * Up to 64 conversions/s.
+  * ALERT is triggered by open remote sensor.
+
+ADT7461
+  * Extended temperature range (breaks compatibility)
+  * Lower resolution for remote temperature
+
+MAX6657 and MAX6658:
+  * Remote sensor type selection
+
+MAX6659
+  * Selectable address
+  * Second critical temperature limit
+  * Remote sensor type selection
+
+All temperature values are given in degrees Celsius. Resolution
+is 1.0 degree for the local temperature, 0.125 degree for the remote
+temperature.
+
+Each sensor has its own high and low limits, plus a critical limit.
+Additionally, there is a relative hysteresis value common to both critical
+values. To make life easier to user-space applications, two absolute values
+are exported, one for each channel, but these values are of course linked.
+Only the local hysteresis can be set from user-space, and the same delta
+applies to the remote hysteresis.
+
+The lm90 driver will not update its values more frequently than every
+other second; reading them more often will do no harm, but will return
+'old' values.
+
diff --git a/Documentation/i2c/chips/lm92 b/Documentation/i2c/chips/lm92
new file mode 100644
index 000000000000..7705bfaa0708
--- /dev/null
+++ b/Documentation/i2c/chips/lm92
@@ -0,0 +1,37 @@
+Kernel driver lm92
+==================
+
+Supported chips:
+  * National Semiconductor LM92
+    Prefix: 'lm92'
+    Addresses scanned: I2C 0x48 - 0x4b
+    Datasheet: http://www.national.com/pf/LM/LM92.html
+  * National Semiconductor LM76
+    Prefix: 'lm92'
+    Addresses scanned: none, force parameter needed
+    Datasheet: http://www.national.com/pf/LM/LM76.html
+  * Maxim MAX6633/MAX6634/MAX6635
+    Prefix: 'lm92'
+    Addresses scanned: I2C 0x48 - 0x4b
+    MAX6633 with address in 0x40 - 0x47, 0x4c - 0x4f needs force parameter
+    and MAX6634 with address in 0x4c - 0x4f needs force parameter
+    Datasheet: http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3074
+
+Authors:
+        Abraham van der Merwe <abraham@2d3d.co.za>
+        Jean Delvare <khali@linux-fr.org>
+
+
+Description
+-----------
+
+This driver implements support for the National Semiconductor LM92
+temperature sensor.
+
+Each LM92 temperature sensor supports a single temperature sensor. There are
+alarms for high, low, and critical thresholds. There's also an hysteresis to
+control the thresholds for resetting alarms.
+
+Support was added later for the LM76 and Maxim MAX6633/MAX6634/MAX6635,
+which are mostly compatible. They have not all been tested, so you
+may need to use the force parameter.
diff --git a/Documentation/i2c/chips/max1619 b/Documentation/i2c/chips/max1619
new file mode 100644
index 000000000000..d6f8d9cd7d7f
--- /dev/null
+++ b/Documentation/i2c/chips/max1619
@@ -0,0 +1,29 @@
+Kernel driver max1619
+=====================
+
+Supported chips:
+  * Maxim MAX1619
+    Prefix: 'max1619'
+    Addresses scanned: I2C 0x18-0x1a, 0x29-0x2b, 0x4c-0x4e
+    Datasheet: Publicly available at the Maxim website
+               http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf
+
+Authors:
+        Alexey Fisher <fishor@mail.ru>,
+        Jean Delvare <khali@linux-fr.org>
+
+Description
+-----------
+
+The MAX1619 is a digital temperature sensor. It senses its own temperature as
+well as the temperature of up to one external diode.
+
+All temperature values are given in degrees Celsius. Resolution
+is 1.0 degree for the local temperature and for the remote temperature.
+
+Only the external sensor has high and low limits.
+
+The max1619 driver will not update its values more frequently than every
+other second; reading them more often will do no harm, but will return
+'old' values.
+
diff --git a/Documentation/i2c/chips/max6875 b/Documentation/i2c/chips/max6875
new file mode 100644
index 000000000000..b4fb49b41813
--- /dev/null
+++ b/Documentation/i2c/chips/max6875
@@ -0,0 +1,54 @@
+Kernel driver max6875
+=====================
+
+Supported chips:
+  * Maxim max6874, max6875
+    Prefixes: 'max6875'
+    Addresses scanned: 0x50, 0x52
+    Datasheets:
+        http://pdfserv.maxim-ic.com/en/ds/MAX6874-MAX6875.pdf
+
+Author: Ben Gardner <bgardner@wabtec.com>
+
+
+Module Parameters
+-----------------
+
+* allow_write int
+  Set to non-zero to enable write permission:
+  *0: Read only
+   1: Read and write
+
+
+Description
+-----------
+
+The MAXIM max6875 is a EEPROM-programmable power-supply sequencer/supervisor.
+It provides timed outputs that can be used as a watchdog, if properly wired.
+It also provides 512 bytes of user EEPROM.
+
+At reset, the max6875 reads the configuration eeprom into its configuration
+registers.  The chip then begins to operate according to the values in the
+registers.
+
+See the datasheet for details on how to program the EEPROM.
+
+
+Sysfs entries
+-------------
+
+eeprom_user   - 512 bytes of user-defined EEPROM space. Only writable if
+                allow_write was set and register 0x43 is 0.
+
+eeprom_config - 70 bytes of config EEPROM. Note that changes will not get
+                loaded into register space until a power cycle or device reset.
+
+reg_config    - 70 bytes of register space. Any changes take affect immediately.
+
+
+General Remarks
+---------------
+
+A typical application will require that the EEPROMs be programmed once and
+never altered afterwards.
+
diff --git a/Documentation/i2c/chips/pc87360 b/Documentation/i2c/chips/pc87360
new file mode 100644
index 000000000000..89a8fcfa78df
--- /dev/null
+++ b/Documentation/i2c/chips/pc87360
@@ -0,0 +1,189 @@
+Kernel driver pc87360
+=====================
+
+Supported chips:
+  * National Semiconductor PC87360, PC87363, PC87364, PC87365 and PC87366
+    Prefixes: 'pc87360', 'pc87363', 'pc87364', 'pc87365', 'pc87366'
+    Addresses scanned: none, address read from Super I/O config space
+    Datasheets:
+        http://www.national.com/pf/PC/PC87360.html
+        http://www.national.com/pf/PC/PC87363.html
+        http://www.national.com/pf/PC/PC87364.html
+        http://www.national.com/pf/PC/PC87365.html
+        http://www.national.com/pf/PC/PC87366.html
+
+Authors: Jean Delvare <khali@linux-fr.org>
+
+Thanks to Sandeep Mehta, Tonko de Rooy and Daniel Ceregatti for testing.
+Thanks to Rudolf Marek for helping me investigate conversion issues.
+
+
+Module Parameters
+-----------------
+
+* init int
+  Chip initialization level:
+   0: None
+  *1: Forcibly enable internal voltage and temperature channels, except in9
+   2: Forcibly enable all voltage and temperature channels, except in9
+   3: Forcibly enable all voltage and temperature channels, including in9
+
+Note that this parameter has no effect for the PC87360, PC87363 and PC87364
+chips.
+
+Also note that for the PC87366, initialization levels 2 and 3 don't enable
+all temperature channels, because some of them share pins with each other,
+so they can't be used at the same time.
+
+
+Description
+-----------
+
+The National Semiconductor PC87360 Super I/O chip contains monitoring and
+PWM control circuitry for two fans. The PC87363 chip is similar, and the
+PC87364 chip has monitoring and PWM control for a third fan.
+
+The National Semiconductor PC87365 and PC87366 Super I/O chips are complete
+hardware monitoring chipsets, not only controlling and monitoring three fans,
+but also monitoring eleven voltage inputs and two (PC87365) or up to four
+(PC87366) temperatures.
+
+  Chip        #vin    #fan    #pwm    #temp   devid
+
+  PC87360     -       2       2       -       0xE1
+  PC87363     -       2       2       -       0xE8
+  PC87364     -       3       3       -       0xE4
+  PC87365     11      3       3       2       0xE5
+  PC87366     11      3       3       3-4     0xE9
+
+The driver assumes that no more than one chip is present, and one of the
+standard Super I/O addresses is used (0x2E/0x2F or 0x4E/0x4F)
+
+Fan Monitoring
+--------------
+
+Fan rotation speeds are reported in RPM (revolutions per minute). An alarm
+is triggered if the rotation speed has dropped below a programmable limit.
+A different alarm is triggered if the fan speed is too low to be measured.
+
+Fan readings are affected by a programmable clock divider, giving the
+readings more range or accuracy. Usually, users have to learn how it works,
+but this driver implements dynamic clock divider selection, so you don't
+have to care no more.
+
+For reference, here are a few values about clock dividers:
+
+                slowest         accuracy        highest
+                measurable      around 3000     accurate
+    divider     speed (RPM)     RPM (RPM)       speed (RPM)
+         1        1882              18           6928
+         2         941              37           4898
+         4         470              74           3464
+         8         235             150           2449
+
+For the curious, here is how the values above were computed:
+ * slowest measurable speed: clock/(255*divider)
+ * accuracy around 3000 RPM: 3000^2/clock
+ * highest accurate speed: sqrt(clock*100)
+The clock speed for the PC87360 family is 480 kHz. I arbitrarily chose 100
+RPM as the lowest acceptable accuracy.
+
+As mentioned above, you don't have to care about this no more.
+
+Note that not all RPM values can be represented, even when the best clock
+divider is selected. This is not only true for the measured speeds, but
+also for the programmable low limits, so don't be surprised if you try to
+set, say, fan1_min to 2900 and it finally reads 2909.
+
+
+Fan Control
+-----------
+
+PWM (pulse width modulation) values range from 0 to 255, with 0 meaning
+that the fan is stopped, and 255 meaning that the fan goes at full speed.
+
+Be extremely careful when changing PWM values. Low PWM values, even
+non-zero, can stop the fan, which may cause irreversible damage to your
+hardware if temperature increases too much. When changing PWM values, go
+step by step and keep an eye on temperatures.
+
+One user reported problems with PWM. Changing PWM values would break fan
+speed readings. No explanation nor fix could be found.
+
+
+Temperature Monitoring
+----------------------
+
+Temperatures are reported in degrees Celsius. Each temperature measured has
+associated low, high and overtemperature limits, each of which triggers an
+alarm when crossed.
+
+The first two temperature channels are external. The third one (PC87366
+only) is internal.
+
+The PC87366 has three additional temperature channels, based on
+thermistors (as opposed to thermal diodes for the first three temperature
+channels). For technical reasons, these channels are held by the VLM
+(voltage level monitor) logical device, not the TMS (temperature
+measurement) one. As a consequence, these temperatures are exported as
+voltages, and converted into temperatures in user-space.
+
+Note that these three additional channels share their pins with the
+external thermal diode channels, so you (physically) can't use them all at
+the same time. Although it should be possible to mix the two sensor types,
+the documents from National Semiconductor suggest that motherboard
+manufacturers should choose one type and stick to it. So you will more
+likely have either channels 1 to 3 (thermal diodes) or 3 to 6 (internal
+thermal diode, and thermistors).
+
+
+Voltage Monitoring
+------------------
+
+Voltages are reported relatively to a reference voltage, either internal or
+external. Some of them (in7:Vsb, in8:Vdd and in10:AVdd) are divided by two
+internally, you will have to compensate in sensors.conf. Others (in0 to in6)
+are likely to be divided externally. The meaning of each of these inputs as
+well as the values of the resistors used for division is left to the
+motherboard manufacturers, so you will have to document yourself and edit
+sensors.conf accordingly. National Semiconductor has a document with
+recommended resistor values for some voltages, but this still leaves much
+room for per motherboard specificities, unfortunately. Even worse,
+motherboard manufacturers don't seem to care about National Semiconductor's
+recommendations.
+
+Each voltage measured has associated low and high limits, each of which
+triggers an alarm when crossed.
+
+When available, VID inputs are used to provide the nominal CPU Core voltage.
+The driver will default to VRM 9.0, but this can be changed from user-space.
+The chipsets can handle two sets of VID inputs (on dual-CPU systems), but
+the driver will only export one for now. This may change later if there is
+a need.
+
+
+General Remarks
+---------------
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may already
+have disappeared! Note that all hardware registers are read whenever any
+data is read (unless it is less than 2 seconds since the last update, in
+which case cached values are returned instead). As a consequence, when
+a once-only alarm triggers, it may take 2 seconds for it to show, and 2
+more seconds for it to disappear.
+
+Monitoring of in9 isn't enabled at lower init levels (<3) because that
+channel measures the battery voltage (Vbat). It is a known fact that
+repeatedly sampling the battery voltage reduces its lifetime. National
+Semiconductor smartly designed their chipset so that in9 is sampled only
+once every 1024 sampling cycles (that is every 34 minutes at the default
+sampling rate), so the effect is attenuated, but still present.
+
+
+Limitations
+-----------
+
+The datasheets suggests that some values (fan mins, fan dividers)
+shouldn't be changed once the monitoring has started, but we ignore that
+recommendation. We'll reconsider if it actually causes trouble.
diff --git a/Documentation/i2c/chips/pca9539 b/Documentation/i2c/chips/pca9539
new file mode 100644
index 000000000000..c4fce6a13537
--- /dev/null
+++ b/Documentation/i2c/chips/pca9539
@@ -0,0 +1,47 @@
+Kernel driver pca9539
+=====================
+
+Supported chips:
+  * Philips PCA9539
+    Prefix: 'pca9539'
+    Addresses scanned: 0x74 - 0x77
+    Datasheet:
+        http://www.semiconductors.philips.com/acrobat/datasheets/PCA9539_2.pdf
+
+Author: Ben Gardner <bgardner@wabtec.com>
+
+
+Description
+-----------
+
+The Philips PCA9539 is a 16 bit low power I/O device.
+All 16 lines can be individually configured as an input or output.
+The input sense can also be inverted.
+The 16 lines are split between two bytes.
+
+
+Sysfs entries
+-------------
+
+Each is a byte that maps to the 8 I/O bits.
+A '0' suffix is for bits 0-7, while '1' is for bits 8-15.
+
+input[01]     - read the current value
+output[01]    - sets the output value
+direction[01] - direction of each bit: 1=input, 0=output
+invert[01]    - toggle the input bit sense
+
+input reads the actual state of the line and is always available.
+The direction defaults to input for all channels.
+
+
+General Remarks
+---------------
+
+Note that each output, direction, and invert entry controls 8 lines.
+You should use the read, modify, write sequence.
+For example. to set output bit 0 of 1.
+  val=$(cat output0)
+  val=$(( $val | 1 ))
+  echo $val > output0
+
diff --git a/Documentation/i2c/chips/pcf8574 b/Documentation/i2c/chips/pcf8574
new file mode 100644
index 000000000000..2752c8ce3167
--- /dev/null
+++ b/Documentation/i2c/chips/pcf8574
@@ -0,0 +1,69 @@
+Kernel driver pcf8574
+=====================
+
+Supported chips:
+  * Philips PCF8574
+    Prefix: 'pcf8574'
+    Addresses scanned: I2C 0x20 - 0x27
+    Datasheet: Publicly available at the Philips Semiconductors website
+               http://www.semiconductors.philips.com/pip/PCF8574P.html
+
+ * Philips PCF8574A
+    Prefix: 'pcf8574a'
+    Addresses scanned: I2C 0x38 - 0x3f
+    Datasheet: Publicly available at the Philips Semiconductors website
+               http://www.semiconductors.philips.com/pip/PCF8574P.html
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>,
+        Dan Eaton <dan.eaton@rocketlogix.com>,
+        Aurelien Jarno <aurelien@aurel32.net>,
+        Jean Delvare <khali@linux-fr.org>,
+
+
+Description
+-----------
+The PCF8574(A) is an 8-bit I/O expander for the I2C bus produced by Philips
+Semiconductors. It is designed to provide a byte I2C interface to up to 16
+separate devices (8 x PCF8574 and 8 x PCF8574A).
+
+This device consists of a quasi-bidirectional port. Each of the eight I/Os
+can be independently used as an input or output. To setup an I/O as an
+input, you have to write a 1 to the corresponding output.
+
+For more informations see the datasheet.
+
+
+Accessing PCF8574(A) via /sys interface
+-------------------------------------
+
+! Be careful !
+The PCF8574(A) is plainly impossible to detect ! Stupid chip.
+So every chip with address in the interval [20..27] and [38..3f] are
+detected as PCF8574(A). If you have other chips in this address
+range, the workaround is to load this module after the one
+for your others chips.
+
+On detection (i.e. insmod, modprobe et al.), directories are being
+created for each detected PCF8574(A):
+
+/sys/bus/i2c/devices/<0>-<1>/
+where <0> is the bus the chip was detected on (e. g. i2c-0)
+and <1> the chip address ([20..27] or [38..3f]):
+
+(example: /sys/bus/i2c/devices/1-0020/)
+
+Inside these directories, there are two files each:
+read and write (and one file with chip name).
+
+The read file is read-only. Reading gives you the current I/O input
+if the corresponding output is set as 1, otherwise the current output
+value, that is to say 0.
+
+The write file is read/write. Writing a value outputs it on the I/O
+port. Reading returns the last written value.
+
+On module initialization the chip is configured as eight inputs (all
+outputs to 1), so you can connect any circuit to the PCF8574(A) without
+being afraid of short-circuit.
diff --git a/Documentation/i2c/chips/pcf8591 b/Documentation/i2c/chips/pcf8591
new file mode 100644
index 000000000000..5628fcf4207f
--- /dev/null
+++ b/Documentation/i2c/chips/pcf8591
@@ -0,0 +1,90 @@
+Kernel driver pcf8591
+=====================
+
+Supported chips:
+  * Philips PCF8591
+    Prefix: 'pcf8591'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Philips Semiconductor website
+               http://www.semiconductors.philips.com/pip/PCF8591P.html
+
+Authors:
+        Aurelien Jarno <aurelien@aurel32.net>
+        valuable contributions by Jan M. Sendler <sendler@sendler.de>,
+        Jean Delvare <khali@linux-fr.org>
+
+
+Description
+-----------
+The PCF8591 is an 8-bit A/D and D/A converter (4 analog inputs and one
+analog output) for the I2C bus produced by Philips Semiconductors. It
+is designed to provide a byte I2C interface to up to 4 separate devices.
+
+The PCF8591 has 4 analog inputs programmable as single-ended or
+differential inputs :
+- mode 0 : four single ended inputs
+        Pins AIN0 to AIN3 are single ended inputs for channels 0 to 3
+
+- mode 1 : three differential inputs
+        Pins AIN3 is the common negative differential input
+        Pins AIN0 to AIN2 are positive differential inputs for channels 0 to 2
+
+- mode 2 : single ended and differential mixed
+        Pins AIN0 and AIN1 are single ended inputs for channels 0 and 1
+        Pins AIN2 is the positive differential input for channel 3
+        Pins AIN3 is the negative differential input for channel 3
+
+- mode 3 : two differential inputs
+        Pins AIN0 is the positive differential input for channel 0
+        Pins AIN1 is the negative differential input for channel 0
+        Pins AIN2 is the positive differential input for channel 1
+        Pins AIN3 is the negative differential input for channel 1
+
+See the datasheet for details.
+
+Module parameters
+-----------------
+
+* input_mode int
+
+    Analog input mode:
+         0 = four single ended inputs
+         1 = three differential inputs
+         2 = single ended and differential mixed
+         3 = two differential inputs
+
+
+Accessing PCF8591 via /sys interface
+-------------------------------------
+
+! Be careful !
+The PCF8591 is plainly impossible to detect ! Stupid chip.
+So every chip with address in the interval [48..4f] is
+detected as PCF8591. If you have other chips in this address
+range, the workaround is to load this module after the one
+for your others chips.
+
+On detection (i.e. insmod, modprobe et al.), directories are being
+created for each detected PCF8591:
+
+/sys/bus/devices/<0>-<1>/
+where <0> is the bus the chip was detected on (e. g. i2c-0)
+and <1> the chip address ([48..4f])
+
+Inside these directories, there are such files:
+in0, in1, in2, in3, out0_enable, out0_output, name
+
+Name contains chip name.
+
+The in0, in1, in2 and in3 files are RO. Reading gives the value of the
+corresponding channel. Depending on the current analog inputs configuration,
+files in2 and/or in3 do not exist. Values range are from 0 to 255 for single
+ended inputs and -128 to +127 for differential inputs (8-bit ADC).
+
+The out0_enable file is RW. Reading gives "1" for analog output enabled and
+"0" for analog output disabled. Writing accepts "0" and "1" accordingly.
+
+The out0_output file is RW. Writing a number between 0 and 255 (8-bit DAC), send
+the value to the digital-to-analog converter. Note that a voltage will
+only appears on AOUT pin if aout0_enable equals 1. Reading returns the last
+value written.
diff --git a/Documentation/i2c/chips/sis5595 b/Documentation/i2c/chips/sis5595
new file mode 100644
index 000000000000..b7ae36b8cdf5
--- /dev/null
+++ b/Documentation/i2c/chips/sis5595
@@ -0,0 +1,106 @@
+Kernel driver sis5595
+=====================
+
+Supported chips:
+  * Silicon Integrated Systems Corp. SiS5595 Southbridge Hardware Monitor
+    Prefix: 'sis5595'
+    Addresses scanned: ISA in PCI-space encoded address
+    Datasheet: Publicly available at the Silicon Integrated Systems Corp. site.
+
+Authors:
+        Kyösti Mälkki <kmalkki@cc.hut.fi>,
+        Mark D. Studebaker <mdsxyz123@yahoo.com>,
+        Aurelien Jarno <aurelien@aurel32.net> 2.6 port
+
+   SiS southbridge has a LM78-like chip integrated on the same IC.
+   This driver is a customized copy of lm78.c
+
+   Supports following revisions:
+       Version         PCI ID          PCI Revision
+       1               1039/0008       AF or less
+       2               1039/0008       B0 or greater
+
+   Note: these chips contain a 0008 device which is incompatible with the
+        5595. We recognize these by the presence of the listed
+        "blacklist" PCI ID and refuse to load.
+
+   NOT SUPPORTED       PCI ID          BLACKLIST PCI ID
+        540            0008            0540
+        550            0008            0550
+       5513            0008            5511
+       5581            0008            5597
+       5582            0008            5597
+       5597            0008            5597
+        630            0008            0630
+        645            0008            0645
+        730            0008            0730
+        735            0008            0735
+
+
+Module Parameters
+-----------------
+force_addr=0xaddr       Set the I/O base address. Useful for boards
+                        that don't set the address in the BIOS. Does not do a
+                        PCI force; the device must still be present in lspci.
+                        Don't use this unless the driver complains that the
+                        base address is not set.
+                        Example: 'modprobe sis5595 force_addr=0x290'
+
+
+Description
+-----------
+
+The SiS5595 southbridge has integrated hardware monitor functions. It also
+has an I2C bus, but this driver only supports the hardware monitor. For the
+I2C bus driver see i2c-sis5595.
+
+The SiS5595 implements zero or one temperature sensor, two fan speed
+sensors, four or five voltage sensors, and alarms.
+
+On the first version of the chip, there are four voltage sensors and one
+temperature sensor.
+
+On the second version of the chip, the temperature sensor (temp) and the
+fifth voltage sensor (in4) share a pin which is configurable, but not
+through the driver. Sorry. The driver senses the configuration of the pin,
+which was hopefully set by the BIOS.
+
+Temperatures are measured in degrees Celsius. An alarm is triggered once
+when the max is crossed; it is also triggered when it drops below the min
+value. Measurements are guaranteed between -55 and +125 degrees, with a
+resolution of 1 degree.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+Voltage sensors (also known as IN sensors) report their values in volts. An
+alarm is triggered if the voltage has crossed a programmable minimum or
+maximum limit. Note that minimum in this case always means 'closest to
+zero'; this is important for negative voltage measurements. All voltage
+inputs can measure voltages between 0 and 4.08 volts, with a resolution of
+0.016 volt.
+
+In addition to the alarms described above, there is a BTI alarm, which gets
+triggered when an external chip has crossed its limits. Usually, this is
+connected to some LM75-like chip; if at least one crosses its limits, this
+bit gets set.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may already
+have disappeared! Note that in the current implementation, all hardware
+registers are read whenever any data is read (unless it is less than 1.5
+seconds since the last update). This means that you can easily miss
+once-only alarms.
+
+The SiS5595 only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
+
+Problems
+--------
+Some chips refuse to be enabled. We don't know why.
+The driver will recognize this and print a message in dmesg.
+
diff --git a/Documentation/i2c/chips/smsc47b397.txt b/Documentation/i2c/chips/smsc47b397
index 389edae7f8df..da9d80c96432 100644
--- a/Documentation/i2c/chips/smsc47b397.txt
+++ b/Documentation/i2c/chips/smsc47b397
@@ -1,7 +1,19 @@
+Kernel driver smsc47b397
+========================
+
+Supported chips:
+  * SMSC LPC47B397-NC
+    Prefix: 'smsc47b397'
+    Addresses scanned: none, address read from Super I/O config space
+    Datasheet: In this file
+
+Authors: Mark M. Hoffman <mhoffman@lightlink.com>
+         Utilitek Systems, Inc.
+
 November 23, 2004
 
 The following specification describes the SMSC LPC47B397-NC sensor chip
-(for which there is no public datasheet available).  This document was
+(for which there is no public datasheet available). This document was
 provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected
 by Mark M. Hoffman <mhoffman@lightlink.com>.
 
@@ -10,10 +22,10 @@ by Mark M. Hoffman <mhoffman@lightlink.com>.
 Methods for detecting the HP SIO and reading the thermal data on a dc7100.
 
 The thermal information on the dc7100 is contained in the SIO Hardware Monitor
-(HWM).  The information is accessed through an index/data pair.  The index/data
-pair is located at the HWM Base Address + 0 and the HWM Base Address + 1.  The
+(HWM). The information is accessed through an index/data pair. The index/data
+pair is located at the HWM Base Address + 0 and the HWM Base Address + 1. The
 HWM Base address can be obtained from Logical Device 8, registers 0x60 (MSB)
-and 0x61 (LSB).  Currently we are using 0x480 for the HWM Base Address and
+and 0x61 (LSB). Currently we are using 0x480 for the HWM Base Address and
 0x480 and 0x481 for the index/data pair.
 
 Reading temperature information.
@@ -50,7 +62,7 @@ Reading the tach LSB locks the tach MSB.
 The LSB Must be read first.
 
 How to convert the tach reading to RPM.
-The tach reading (TCount) is given by:  (Tach MSB * 256) + (Tach LSB)
+The tach reading (TCount) is given by: (Tach MSB * 256) + (Tach LSB)
 The SIO counts the number of 90kHz (11.111us) pulses per revolution.
 RPM = 60/(TCount * 11.111us)
 
@@ -72,20 +84,20 @@ To program the configuration registers, the following sequence must be followed:
 
 Enter Configuration Mode
 To place the chip into the Configuration State The config key (0x55) is written
-to the CONFIG PORT (0x2E). 
+to the CONFIG PORT (0x2E).
 
 Configuration Mode
 In configuration mode, the INDEX PORT is located at the CONFIG PORT address and
 the DATA PORT is at INDEX PORT address + 1.
 
-The desired configuration registers are accessed in two steps: 
+The desired configuration registers are accessed in two steps:
 a.      Write the index of the Logical Device Number Configuration Register
         (i.e., 0x07) to the INDEX PORT and then write the number of the
         desired logical device to the DATA PORT.
 
 b.      Write the address of the desired configuration register within the
         logical device to the INDEX PORT and then write or read the config-
-        uration register through the DATA PORT.  
+        uration register through the DATA PORT.
 
 Note: If accessing the Global Configuration Registers, step (a) is not required.
 
@@ -96,18 +108,18 @@ The chip returns to the RUN State.  (This is important).
 Programming Example
 The following is an example of how to read the SIO Device ID located at 0x20
 
-; ENTER CONFIGURATION MODE   
+; ENTER CONFIGURATION MODE
 MOV     DX,02EH
 MOV     AX,055H
 OUT     DX,AL
-; GLOBAL CONFIGURATION  REGISTER 
+; GLOBAL CONFIGURATION  REGISTER
 MOV     DX,02EH
 MOV     AL,20H
-OUT     DX,AL 
+OUT     DX,AL
 ; READ THE DATA
 MOV     DX,02FH
 IN      AL,DX
-; EXIT CONFIGURATION MODE     
+; EXIT CONFIGURATION MODE
 MOV     DX,02EH
 MOV     AX,0AAH
 OUT     DX,AL
@@ -122,12 +134,12 @@ Obtaining the HWM Base Address.
 The following is an example of how to read the HWM Base Address located in
 Logical Device 8.
 
-; ENTER CONFIGURATION MODE   
+; ENTER CONFIGURATION MODE
 MOV     DX,02EH
 MOV     AX,055H
 OUT     DX,AL
-; CONFIGURE REGISTER CRE0,   
-; LOGICAL DEVICE 8           
+; CONFIGURE REGISTER CRE0,
+; LOGICAL DEVICE 8
 MOV     DX,02EH
 MOV     AL,07H
 OUT     DX,AL ;Point to LD# Config Reg
@@ -135,12 +147,12 @@ MOV	DX,02FH
 MOV     AL, 08H
 OUT     DX,AL;Point to Logical Device 8
 ;
-MOV     DX,02EH 
+MOV     DX,02EH
 MOV     AL,60H
 OUT     DX,AL   ; Point to HWM Base Addr MSB
 MOV     DX,02FH
 IN      AL,DX   ; Get MSB of HWM Base Addr
-; EXIT CONFIGURATION MODE     
+; EXIT CONFIGURATION MODE
 MOV     DX,02EH
 MOV     AX,0AAH
 OUT     DX,AL
diff --git a/Documentation/i2c/chips/smsc47m1 b/Documentation/i2c/chips/smsc47m1
new file mode 100644
index 000000000000..34e6478c1425
--- /dev/null
+++ b/Documentation/i2c/chips/smsc47m1
@@ -0,0 +1,52 @@
+Kernel driver smsc47m1
+======================
+
+Supported chips:
+  * SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x and LPC47M192
+    Addresses scanned: none, address read from Super I/O config space
+    Prefix: 'smsc47m1'
+    Datasheets:
+        http://www.smsc.com/main/datasheets/47b27x.pdf
+        http://www.smsc.com/main/datasheets/47m10x.pdf
+        http://www.smsc.com/main/tools/discontinued/47m13x.pdf
+        http://www.smsc.com/main/datasheets/47m14x.pdf
+        http://www.smsc.com/main/tools/discontinued/47m15x.pdf
+        http://www.smsc.com/main/datasheets/47m192.pdf
+
+Authors:
+        Mark D. Studebaker <mdsxyz123@yahoo.com>,
+        With assistance from Bruce Allen <ballen@uwm.edu>, and his
+        fan.c program: http://www.lsc-group.phys.uwm.edu/%7Eballen/driver/
+        Gabriele Gorla <gorlik@yahoo.com>,
+        Jean Delvare <khali@linux-fr.org>
+
+Description
+-----------
+
+The Standard Microsystems Corporation (SMSC) 47M1xx Super I/O chips
+contain monitoring and PWM control circuitry for two fans.
+
+The 47M15x and 47M192 chips contain a full 'hardware monitoring block'
+in addition to the fan monitoring and control. The hardware monitoring
+block is not supported by the driver.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+PWM values are from 0 to 255.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may
+already have disappeared! Note that in the current implementation, all
+hardware registers are read whenever any data is read (unless it is less
+than 1.5 seconds since the last update). This means that you can easily
+miss once-only alarms.
+
+
+**********************
+The lm_sensors project gratefully acknowledges the support of
+Intel in the development of this driver.
diff --git a/Documentation/i2c/chips/via686a b/Documentation/i2c/chips/via686a
new file mode 100644
index 000000000000..b82014cb7c53
--- /dev/null
+++ b/Documentation/i2c/chips/via686a
@@ -0,0 +1,65 @@
+Kernel driver via686a
+=====================
+
+Supported chips:
+  * Via VT82C686A, VT82C686B  Southbridge Integrated Hardware Monitor
+    Prefix: 'via686a'
+    Addresses scanned: ISA in PCI-space encoded address
+    Datasheet: On request through web form (http://www.via.com.tw/en/support/datasheets/)
+
+Authors:
+        Kyösti Mälkki <kmalkki@cc.hut.fi>,
+        Mark D. Studebaker <mdsxyz123@yahoo.com>
+        Bob Dougherty <bobd@stanford.edu>
+        (Some conversion-factor data were contributed by
+        Jonathan Teh Soon Yew <j.teh@iname.com>
+        and Alex van Kaam <darkside@chello.nl>.)
+
+Module Parameters
+-----------------
+
+force_addr=0xaddr       Set the I/O base address. Useful for Asus A7V boards
+                        that don't set the address in the BIOS. Does not do a
+                        PCI force; the via686a must still be present in lspci.
+                        Don't use this unless the driver complains that the
+                        base address is not set.
+                        Example: 'modprobe via686a force_addr=0x6000'
+
+Description
+-----------
+
+The driver does not distinguish between the chips and reports
+all as a 686A.
+
+The Via 686a southbridge has integrated hardware monitor functionality.
+It also has an I2C bus, but this driver only supports the hardware monitor.
+For the I2C bus driver, see <file:Documentation/i2c/busses/i2c-viapro>
+
+The Via 686a implements three temperature sensors, two fan rotation speed
+sensors, five voltage sensors and alarms.
+
+Temperatures are measured in degrees Celsius. An alarm is triggered once
+when the Overtemperature Shutdown limit is crossed; it is triggered again
+as soon as it drops below the hysteresis value.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+Voltage sensors (also known as IN sensors) report their values in volts.
+An alarm is triggered if the voltage has crossed a programmable minimum
+or maximum limit. Voltages are internally scalled, so each voltage channel
+has a different resolution and range.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may
+already have disappeared! Note that in the current implementation, all
+hardware registers are read whenever any data is read (unless it is less
+than 1.5 seconds since the last update). This means that you can easily
+miss once-only alarms.
+
+The driver only updates its values each 1.5 seconds; reading it more often
+will do no harm, but will return 'old' values.
diff --git a/Documentation/i2c/chips/w83627hf b/Documentation/i2c/chips/w83627hf
new file mode 100644
index 000000000000..78f37c2d602e
--- /dev/null
+++ b/Documentation/i2c/chips/w83627hf
@@ -0,0 +1,66 @@
+Kernel driver w83627hf
+======================
+
+Supported chips:
+  * Winbond W83627HF (ISA accesses ONLY)
+    Prefix: 'w83627hf'
+    Addresses scanned: ISA address retrieved from Super I/O registers
+    Datasheet: http://www.winbond.com/PDF/sheet/w83627hf.pdf
+  * Winbond W83627THF
+    Prefix: 'w83627thf'
+    Addresses scanned: ISA address retrieved from Super I/O registers
+    Datasheet: http://www.winbond.com/PDF/sheet/w83627thf.pdf
+  * Winbond W83697HF
+    Prefix: 'w83697hf'
+    Addresses scanned: ISA address retrieved from Super I/O registers
+    Datasheet: http://www.winbond.com/PDF/sheet/697hf.pdf
+  * Winbond W83637HF
+    Prefix: 'w83637hf'
+    Addresses scanned: ISA address retrieved from Super I/O registers
+    Datasheet: http://www.winbond.com/PDF/sheet/w83637hf.pdf
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>,
+        Mark Studebaker <mdsxyz123@yahoo.com>,
+        Bernhard C. Schrenk <clemy@clemy.org>
+
+Module Parameters
+-----------------
+
+* force_addr: int
+  Initialize the ISA address of the sensors
+* force_i2c: int
+  Initialize the I2C address of the sensors
+* init: int
+  (default is 1)
+  Use 'init=0' to bypass initializing the chip.
+  Try this if your computer crashes when you load the module.
+
+Description
+-----------
+
+This driver implements support for ISA accesses *only* for
+the Winbond W83627HF, W83627THF, W83697HF and W83637HF Super I/O chips.
+We will refer to them collectively as Winbond chips.
+
+This driver supports ISA accesses, which should be more reliable
+than i2c accesses. Also, for Tyan boards which contain both a
+Super I/O chip and a second i2c-only Winbond chip (often a W83782D),
+using this driver will avoid i2c address conflicts and complex
+initialization that were required in the w83781d driver.
+
+If you really want i2c accesses for these Super I/O chips,
+use the w83781d driver. However this is not the preferred method
+now that this ISA driver has been developed.
+
+Technically, the w83627thf does not support a VID reading. However, it's
+possible or even likely that your mainboard maker has routed these signals
+to a specific set of general purpose IO pins (the Asus P4C800-E is one such
+board). The w83627thf driver now interprets these as VID. If the VID on
+your board doesn't work, first see doc/vid in the lm_sensors package. If
+that still doesn't help, email us at lm-sensors@lm-sensors.org.
+
+For further information on this driver see the w83781d driver
+documentation.
+
diff --git a/Documentation/i2c/chips/w83781d b/Documentation/i2c/chips/w83781d
new file mode 100644
index 000000000000..e5459333ba68
--- /dev/null
+++ b/Documentation/i2c/chips/w83781d
@@ -0,0 +1,402 @@
+Kernel driver w83781d
+=====================
+
+Supported chips:
+  * Winbond W83781D
+    Prefix: 'w83781d'
+    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
+    Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/w83781d.pdf
+  * Winbond W83782D
+    Prefix: 'w83782d'
+    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
+    Datasheet: http://www.winbond.com/PDF/sheet/w83782d.pdf
+  * Winbond W83783S
+    Prefix: 'w83783s'
+    Addresses scanned: I2C 0x2d
+    Datasheet: http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/w83783s.pdf
+  * Winbond W83627HF
+    Prefix: 'w83627hf'
+    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
+    Datasheet: http://www.winbond.com/PDF/sheet/w83627hf.pdf
+  * Asus AS99127F
+    Prefix: 'as99127f'
+    Addresses scanned: I2C 0x28 - 0x2f
+    Datasheet: Unavailable from Asus
+
+Authors:
+        Frodo Looijaard <frodol@dds.nl>,
+        Philip Edelbrock <phil@netroedge.com>,
+        Mark Studebaker <mdsxyz123@yahoo.com>
+
+Module parameters
+-----------------
+
+* init int
+  (default 1)
+  Use 'init=0' to bypass initializing the chip.
+  Try this if your computer crashes when you load the module.
+
+force_subclients=bus,caddr,saddr,saddr
+  This is used to force the i2c addresses for subclients of
+  a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b'
+  to force the subclients of chip 0x2d on bus 0 to i2c addresses
+  0x4a and 0x4b. This parameter is useful for certain Tyan boards.
+
+Description
+-----------
+
+This driver implements support for the Winbond W83781D, W83782D, W83783S,
+W83627HF chips, and the Asus AS99127F chips. We will refer to them
+collectively as W8378* chips.
+
+There is quite some difference between these chips, but they are similar
+enough that it was sensible to put them together in one driver.
+The W83627HF chip is assumed to be identical to the ISA W83782D.
+The Asus chips are similar to an I2C-only W83782D.
+
+Chip        #vin    #fanin  #pwm    #temp   wchipid vendid  i2c     ISA
+as99127f    7       3       0       3       0x31    0x12c3  yes     no
+as99127f rev.2 (type_name = as99127f)       0x31    0x5ca3  yes     no
+w83781d     7       3       0       3       0x10-1  0x5ca3  yes     yes
+w83627hf    9       3       2       3       0x21    0x5ca3  yes     yes(LPC)
+w83782d     9       3       2-4     3       0x30    0x5ca3  yes     yes
+w83783s     5-6     3       2       1-2     0x40    0x5ca3  yes     no
+
+Detection of these chips can sometimes be foiled because they can be in
+an internal state that allows no clean access. If you know the address
+of the chip, use a 'force' parameter; this will put them into a more
+well-behaved state first.
+
+The W8378* implements temperature sensors (three on the W83781D and W83782D,
+two on the W83783S), three fan rotation speed sensors, voltage sensors
+(seven on the W83781D, nine on the W83782D and six on the W83783S), VID
+lines, alarms with beep warnings, and some miscellaneous stuff.
+
+Temperatures are measured in degrees Celsius. There is always one main
+temperature sensor, and one (W83783S) or two (W83781D and W83782D) other
+sensors. An alarm is triggered for the main sensor once when the
+Overtemperature Shutdown limit is crossed; it is triggered again as soon as
+it drops below the Hysteresis value. A more useful behavior
+can be found by setting the Hysteresis value to +127 degrees Celsius; in
+this case, alarms are issued during all the time when the actual temperature
+is above the Overtemperature Shutdown value. The driver sets the
+hysteresis value for temp1 to 127 at initialization.
+
+For the other temperature sensor(s), an alarm is triggered when the
+temperature gets higher then the Overtemperature Shutdown value; it stays
+on until the temperature falls below the Hysteresis value. But on the
+W83781D, there is only one alarm that functions for both other sensors!
+Temperatures are guaranteed within a range of -55 to +125 degrees. The
+main temperature sensors has a resolution of 1 degree; the other sensor(s)
+of 0.5 degree.
+
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8 for the
+W83781D; 1, 2, 4, 8, 16, 32, 64 or 128 for the others) to give
+the readings more range or accuracy. Not all RPM values can accurately
+be represented, so some rounding is done. With a divider of 2, the lowest
+representable value is around 2600 RPM.
+
+Voltage sensors (also known as IN sensors) report their values in volts.
+An alarm is triggered if the voltage has crossed a programmable minimum
+or maximum limit. Note that minimum in this case always means 'closest to
+zero'; this is important for negative voltage measurements. All voltage
+inputs can measure voltages between 0 and 4.08 volts, with a resolution
+of 0.016 volt.
+
+The VID lines encode the core voltage value: the voltage level your processor
+should work with. This is hardcoded by the mainboard and/or processor itself.
+It is a value in volts. When it is unconnected, you will often find the
+value 3.50 V here.
+
+The W83782D and W83783S temperature conversion machine understands about
+several kinds of temperature probes. You can program the so-called
+beta value in the sensor files. '1' is the PII/Celeron diode, '2' is the
+TN3904 transistor, and 3435 the default thermistor value. Other values
+are (not yet) supported.
+
+In addition to the alarms described above, there is a CHAS alarm on the
+chips which triggers if your computer case is open.
+
+When an alarm goes off, you can be warned by a beeping signal through
+your computer speaker. It is possible to enable all beeping globally,
+or only the beeping for some alarms.
+
+If an alarm triggers, it will remain triggered until the hardware register
+is read at least once. This means that the cause for the alarm may
+already have disappeared! Note that in the current implementation, all
+hardware registers are read whenever any data is read (unless it is less
+than 1.5 seconds since the last update). This means that you can easily
+miss once-only alarms.
+
+The chips only update values each 1.5 seconds; reading them more often
+will do no harm, but will return 'old' values.
+
+AS99127F PROBLEMS
+-----------------
+The as99127f support was developed without the benefit of a datasheet.
+In most cases it is treated as a w83781d (although revision 2 of the
+AS99127F looks more like a w83782d).
+This support will be BETA until a datasheet is released.
+One user has reported problems with fans stopping
+occasionally.
+
+Note that the individual beep bits are inverted from the other chips.
+The driver now takes care of this so that user-space applications
+don't have to know about it.
+
+Known problems:
+        - Problems with diode/thermistor settings (supported?)
+        - One user reports fans stopping under high server load.
+        - Revision 2 seems to have 2 PWM registers but we don't know
+          how to handle them. More details below.
+
+These will not be fixed unless we get a datasheet.
+If you have problems, please lobby Asus to release a datasheet.
+Unfortunately several others have without success.
+Please do not send mail to us asking for better as99127f support.
+We have done the best we can without a datasheet.
+Please do not send mail to the author or the sensors group asking for
+a datasheet or ideas on how to convince Asus. We can't help.
+
+
+NOTES:
+-----
+  783s has no in1 so that in[2-6] are compatible with the 781d/782d.
+
+  783s pin is programmable for -5V or temp1; defaults to -5V,
+       no control in driver so temp1 doesn't work.
+
+  782d and 783s datasheets differ on which is pwm1 and which is pwm2.
+       We chose to follow 782d.
+
+  782d and 783s pin is programmable for fan3 input or pwm2 output;
+       defaults to fan3 input.
+       If pwm2 is enabled (with echo 255 1 > pwm2), then
+       fan3 will report 0.
+
+  782d has pwm1-2 for ISA, pwm1-4 for i2c. (pwm3-4 share pins with
+       the ISA pins)
+
+Data sheet updates:
+------------------
+        - PWM clock registers:
+
+                000: master /  512
+                001: master / 1024
+                010: master / 2048
+                011: master / 4096
+                100: master / 8192
+
+
+Answers from Winbond tech support
+---------------------------------
+>
+> 1) In the W83781D data sheet section 7.2 last paragraph, it talks about
+>    reprogramming the R-T table if the Beta of the thermistor is not
+>    3435K. The R-T table is described briefly in section 8.20.
+>    What formulas do I use to program a new R-T table for a given Beta?
+>
+        We are sorry that the calculation for R-T table value is
+confidential. If you have another Beta value of thermistor, we can help
+to calculate the R-T table for you. But you should give us real R-T
+Table which can be gotten by thermistor vendor. Therefore we will calculate
+them and obtain 32-byte data, and you can fill the 32-byte data to the
+register in Bank0.CR51 of W83781D.
+
+
+> 2) In the W83782D data sheet, it mentions that pins 38, 39, and 40 are
+>    programmable to be either thermistor or Pentium II diode inputs.
+>    How do I program them for diode inputs? I can't find any register
+>    to program these to be diode inputs.
+ --> You may program Bank0 CR[5Dh] and CR[59h] registers.
+
+        CR[5Dh]                 bit 1(VTIN1)    bit 2(VTIN2)   bit 3(VTIN3)
+
+        thermistor                0              0              0
+        diode                     1              1              1
+
+
+(error) CR[59h]                 bit 4(VTIN1)    bit 2(VTIN2)   bit 3(VTIN3)
+(right) CR[59h]                 bit 4(VTIN1)    bit 5(VTIN2)   bit 6(VTIN3)
+
+        PII thermal diode         1              1              1
+        2N3904  diode             0              0              0
+
+
+Asus Clones
+-----------
+
+We have no datasheets for the Asus clones (AS99127F and ASB100 Bach).
+Here are some very useful information that were given to us by Alex Van
+Kaam about how to detect these chips, and how to read their values. He
+also gives advice for another Asus chipset, the Mozart-2 (which we
+don't support yet). Thanks Alex!
+I reworded some parts and added personal comments.
+
+# Detection:
+
+AS99127F rev.1, AS99127F rev.2 and ASB100:
+- I2C address range: 0x29 - 0x2F
+- If register 0x58 holds 0x31 then we have an Asus (either ASB100 or
+  AS99127F)
+- Which one depends on register 0x4F (manufacturer ID):
+  0x06 or 0x94: ASB100
+  0x12 or 0xC3: AS99127F rev.1
+  0x5C or 0xA3: AS99127F rev.2
+  Note that 0x5CA3 is Winbond's ID (WEC), which let us think Asus get their
+  AS99127F rev.2 direct from Winbond. The other codes mean ATT and DVC,
+  respectively. ATT could stand for Asustek something (although it would be
+  very badly chosen IMHO), I don't know what DVC could stand for. Maybe
+  these codes simply aren't meant to be decoded that way.
+
+Mozart-2:
+- I2C address: 0x77
+- If register 0x58 holds 0x56 or 0x10 then we have a Mozart-2
+- Of the Mozart there are 3 types:
+  0x58=0x56, 0x4E=0x94, 0x4F=0x36: Asus ASM58 Mozart-2
+  0x58=0x56, 0x4E=0x94, 0x4F=0x06: Asus AS2K129R Mozart-2
+  0x58=0x10, 0x4E=0x5C, 0x4F=0xA3: Asus ??? Mozart-2
+  You can handle all 3 the exact same way :)
+
+# Temperature sensors:
+
+ASB100:
+- sensor 1: register 0x27
+- sensor 2 & 3 are the 2 LM75's on the SMBus
+- sensor 4: register 0x17
+Remark: I noticed that on Intel boards sensor 2 is used for the CPU
+  and 4 is ignored/stuck, on AMD boards sensor 4 is the CPU and sensor 2 is
+  either ignored or a socket temperature.
+
+AS99127F (rev.1 and 2 alike):
+- sensor 1: register 0x27
+- sensor 2 & 3 are the 2 LM75's on the SMBus
+Remark: Register 0x5b is suspected to be temperature type selector. Bit 1
+  would control temp1, bit 3 temp2 and bit 5 temp3.
+
+Mozart-2:
+- sensor 1: register 0x27
+- sensor 2: register 0x13
+
+# Fan sensors:
+
+ASB100, AS99127F (rev.1 and 2 alike):
+- 3 fans, identical to the W83781D
+
+Mozart-2:
+- 2 fans only, 1350000/RPM/div
+- fan 1: register 0x28,  divisor on register 0xA1 (bits 4-5)
+- fan 2: register 0x29,  divisor on register 0xA1 (bits 6-7)
+
+# Voltages:
+
+This is where there is a difference between AS99127F rev.1 and 2.
+Remark: The difference is similar to the difference between
+  W83781D and W83782D.
+
+ASB100:
+in0=r(0x20)*0.016
+in1=r(0x21)*0.016
+in2=r(0x22)*0.016
+in3=r(0x23)*0.016*1.68
+in4=r(0x24)*0.016*3.8
+in5=r(0x25)*(-0.016)*3.97
+in6=r(0x26)*(-0.016)*1.666
+
+AS99127F rev.1:
+in0=r(0x20)*0.016
+in1=r(0x21)*0.016
+in2=r(0x22)*0.016
+in3=r(0x23)*0.016*1.68
+in4=r(0x24)*0.016*3.8
+in5=r(0x25)*(-0.016)*3.97
+in6=r(0x26)*(-0.016)*1.503
+
+AS99127F rev.2:
+in0=r(0x20)*0.016
+in1=r(0x21)*0.016
+in2=r(0x22)*0.016
+in3=r(0x23)*0.016*1.68
+in4=r(0x24)*0.016*3.8
+in5=(r(0x25)*0.016-3.6)*5.14+3.6
+in6=(r(0x26)*0.016-3.6)*3.14+3.6
+
+Mozart-2:
+in0=r(0x20)*0.016
+in1=255
+in2=r(0x22)*0.016
+in3=r(0x23)*0.016*1.68
+in4=r(0x24)*0.016*4
+in5=255
+in6=255
+
+
+# PWM
+
+Additional info about PWM on the AS99127F (may apply to other Asus
+chips as well) by Jean Delvare as of 2004-04-09:
+
+AS99127F revision 2 seems to have two PWM registers at 0x59 and 0x5A,
+and a temperature sensor type selector at 0x5B (which basically means
+that they swapped registers 0x59 and 0x5B when you compare with Winbond
+chips).
+Revision 1 of the chip also has the temperature sensor type selector at
+0x5B, but PWM registers have no effect.
+
+We don't know exactly how the temperature sensor type selection works.
+Looks like bits 1-0 are for temp1, bits 3-2 for temp2 and bits 5-4 for
+temp3, although it is possible that only the most significant bit matters
+each time. So far, values other than 0 always broke the readings.
+
+PWM registers seem to be split in two parts: bit 7 is a mode selector,
+while the other bits seem to define a value or threshold.
+
+When bit 7 is clear, bits 6-0 seem to hold a threshold value. If the value
+is below a given limit, the fan runs at low speed. If the value is above
+the limit, the fan runs at full speed. We have no clue as to what the limit
+represents. Note that there seem to be some inertia in this mode, speed
+changes may need some time to trigger. Also, an hysteresis mechanism is
+suspected since walking through all the values increasingly and then
+decreasingly led to slightly different limits.
+
+When bit 7 is set, bits 3-0 seem to hold a threshold value, while bits 6-4
+would not be significant. If the value is below a given limit, the fan runs
+at full speed, while if it is above the limit it runs at low speed (so this
+is the contrary of the other mode, in a way). Here again, we don't know
+what the limit is supposed to represent.
+
+One remarkable thing is that the fans would only have two or three
+different speeds (transitional states left apart), not a whole range as
+you usually get with PWM.
+
+As a conclusion, you can write 0x00 or 0x8F to the PWM registers to make
+fans run at low speed, and 0x7F or 0x80 to make them run at full speed.
+
+Please contact us if you can figure out how it is supposed to work. As
+long as we don't know more, the w83781d driver doesn't handle PWM on
+AS99127F chips at all.
+
+Additional info about PWM on the AS99127F rev.1 by Hector Martin:
+
+I've been fiddling around with the (in)famous 0x59 register and
+found out the following values do work as a form of coarse pwm:
+
+0x80 - seems to turn fans off after some time(1-2 minutes)... might be
+some form of auto-fan-control based on temp? hmm (Qfan? this mobo is an
+old ASUS, it isn't marketed as Qfan. Maybe some beta pre-attemp at Qfan
+that was dropped at the BIOS)
+0x81 - off
+0x82 - slightly "on-ner" than off, but my fans do not get to move. I can
+hear the high-pitched PWM sound that motors give off at too-low-pwm.
+0x83 - now they do move. Estimate about 70% speed or so.
+0x84-0x8f - full on
+
+Changing the high nibble doesn't seem to do much except the high bit
+(0x80) must be set for PWM to work, else the current pwm doesn't seem to
+change.
+
+My mobo is an ASUS A7V266-E. This behavior is similar to what I got
+with speedfan under Windows, where 0-15% would be off, 15-2x% (can't
+remember the exact value) would be 70% and higher would be full on.
diff --git a/Documentation/i2c/chips/w83l785ts b/Documentation/i2c/chips/w83l785ts
new file mode 100644
index 000000000000..1841cedc25b2
--- /dev/null
+++ b/Documentation/i2c/chips/w83l785ts
@@ -0,0 +1,39 @@
+Kernel driver w83l785ts
+=======================
+
+Supported chips:
+  * Winbond W83L785TS-S
+    Prefix: 'w83l785ts'
+    Addresses scanned: I2C 0x2e
+    Datasheet: Publicly available at the Winbond USA website
+               http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf
+
+Authors:
+        Jean Delvare <khali@linux-fr.org>
+
+Description
+-----------
+
+The W83L785TS-S is a digital temperature sensor. It senses the
+temperature of a single external diode. The high limit is
+theoretically defined as 85 or 100 degrees C through a combination
+of external resistors, so the user cannot change it. Values seen so
+far suggest that the two possible limits are actually 95 and 110
+degrees C. The datasheet is rather poor and obviously inaccurate
+on several points including this one.
+
+All temperature values are given in degrees Celsius. Resolution
+is 1.0 degree. See the datasheet for details.
+
+The w83l785ts driver will not update its values more frequently than
+every other second; reading them more often will do no harm, but will
+return 'old' values.
+
+Known Issues
+------------
+
+On some systems (Asus), the BIOS is known to interfere with the driver
+and cause read errors. The driver will retry a given number of times
+(5 by default) and then give up, returning the old value (or 0 if
+there is no old value). It seems to work well enough so that you should
+not notice anything. Thanks to James Bolt for helping test this feature.
diff --git a/Documentation/i2c/porting-clients b/Documentation/i2c/porting-clients
index 56404918eabc..a7adbdd9ea8a 100644
--- a/Documentation/i2c/porting-clients
+++ b/Documentation/i2c/porting-clients
@@ -57,7 +57,7 @@ Technical changes:
   Documentation/i2c/sysfs-interface for the individual files. Also
   convert the units these files read and write to the specified ones.
   If you need to add a new type of file, please discuss it on the
-  sensors mailing list <sensors@stimpy.netroedge.com> by providing a
+  sensors mailing list <lm-sensors@lm-sensors.org> by providing a
   patch to the Documentation/i2c/sysfs-interface file.
 
 * [Attach] For I2C drivers, the attach function should make sure
diff --git a/Documentation/i2c/userspace-tools b/Documentation/i2c/userspace-tools
new file mode 100644
index 000000000000..2622aac65422
--- /dev/null
+++ b/Documentation/i2c/userspace-tools
@@ -0,0 +1,39 @@
+Introduction
+------------
+
+Most mainboards have sensor chips to monitor system health (like temperatures,
+voltages, fans speed). They are often connected through an I2C bus, but some
+are also connected directly through the ISA bus.
+
+The kernel drivers make the data from the sensor chips available in the /sys
+virtual filesystem. Userspace tools are then used to display or set or the
+data in a more friendly manner.
+
+Lm-sensors
+----------
+
+Core set of utilites that will allow you to obtain health information,
+setup monitoring limits etc. You can get them on their homepage
+http://www.lm-sensors.nu/ or as a package from your Linux distribution.
+
+If from website:
+Get lmsensors from project web site. Please note, you need only userspace
+part, so compile with "make user_install" target.
+
+General hints to get things working:
+
+0) get lm-sensors userspace utils
+1) compile all drivers in I2C section as modules in your kernel
+2) run sensors-detect script, it will tell you what modules you need to load.
+3) load them and run "sensors" command, you should see some results.
+4) fix sensors.conf, labels, limits, fan divisors
+5) if any more problems consult FAQ, or documentation
+
+Other utilites
+--------------
+
+If you want some graphical indicators of system health look for applications
+like: gkrellm, ksensors, xsensors, wmtemp, wmsensors, wmgtemp, ksysguardd,
+hardware-monitor
+
+If you are server administrator you can try snmpd or mrtgutils.
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
index ad27511e3c7d..f482dae81de3 100644
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
@@ -171,45 +171,31 @@ The following lists are used internally:
 
   normal_i2c: filled in by the module writer. 
      A list of I2C addresses which should normally be examined.
-   normal_i2c_range: filled in by the module writer.
-     A list of pairs of I2C addresses, each pair being an inclusive range of
-     addresses which should normally be examined.
    probe: insmod parameter. 
      A list of pairs. The first value is a bus number (-1 for any I2C bus), 
      the second is the address. These addresses are also probed, as if they 
      were in the 'normal' list.
-   probe_range: insmod parameter. 
-     A list of triples. The first value is a bus number (-1 for any I2C bus), 
-     the second and third are addresses.  These form an inclusive range of 
-     addresses that are also probed, as if they were in the 'normal' list.
    ignore: insmod parameter.
      A list of pairs. The first value is a bus number (-1 for any I2C bus), 
      the second is the I2C address. These addresses are never probed. 
      This parameter overrules 'normal' and 'probe', but not the 'force' lists.
-   ignore_range: insmod parameter. 
-     A list of triples. The first value is a bus number (-1 for any I2C bus), 
-     the second and third are addresses. These form an inclusive range of 
-     I2C addresses that are never probed.
-     This parameter overrules 'normal' and 'probe', but not the 'force' lists.
    force: insmod parameter. 
      A list of pairs. The first value is a bus number (-1 for any I2C bus),
      the second is the I2C address. A device is blindly assumed to be on
      the given address, no probing is done. 
 
-Fortunately, as a module writer, you just have to define the `normal' 
-and/or `normal_range' parameters. The complete declaration could look
-like this:
+Fortunately, as a module writer, you just have to define the `normal_i2c' 
+parameter. The complete declaration could look like this:
 
-  /* Scan 0x20 to 0x2f, 0x37, and 0x40 to 0x4f */
-  static unsigned short normal_i2c[] = { 0x37,I2C_CLIENT_END }; 
-  static unsigned short normal_i2c_range[] = { 0x20, 0x2f, 0x40, 0x4f, 
-                                               I2C_CLIENT_END };
+  /* Scan 0x37, and 0x48 to 0x4f */
+  static unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
   /* Magic definition of all other variables and things */
   I2C_CLIENT_INSMOD;
 
-Note that you *have* to call the two defined variables `normal_i2c' and
-`normal_i2c_range', without any prefix!
+Note that you *have* to call the defined variable `normal_i2c',
+without any prefix!
 
 
 Probing classes (sensors)
@@ -223,39 +209,17 @@ The following lists are used internally. They are all lists of integers.
 
    normal_i2c: filled in by the module writer. Terminated by SENSORS_I2C_END.
      A list of I2C addresses which should normally be examined.
-   normal_i2c_range: filled in by the module writer. Terminated by 
-     SENSORS_I2C_END
-     A list of pairs of I2C addresses, each pair being an inclusive range of
-     addresses which should normally be examined.
    normal_isa: filled in by the module writer. Terminated by SENSORS_ISA_END.
      A list of ISA addresses which should normally be examined.
-   normal_isa_range: filled in by the module writer. Terminated by 
-     SENSORS_ISA_END
-     A list of triples. The first two elements are ISA addresses, being an
-     range of addresses which should normally be examined. The third is the
-     modulo parameter: only addresses which are 0 module this value relative
-     to the first address of the range are actually considered.
    probe: insmod parameter. Initialize this list with SENSORS_I2C_END values.
      A list of pairs. The first value is a bus number (SENSORS_ISA_BUS for
      the ISA bus, -1 for any I2C bus), the second is the address. These
      addresses are also probed, as if they were in the 'normal' list.
-   probe_range: insmod parameter. Initialize this list with SENSORS_I2C_END 
-     values.
-     A list of triples. The first value is a bus number (SENSORS_ISA_BUS for
-     the ISA bus, -1 for any I2C bus), the second and third are addresses. 
-     These form an inclusive range of addresses that are also probed, as
-     if they were in the 'normal' list.
    ignore: insmod parameter. Initialize this list with SENSORS_I2C_END values.
      A list of pairs. The first value is a bus number (SENSORS_ISA_BUS for
      the ISA bus, -1 for any I2C bus), the second is the I2C address. These
      addresses are never probed. This parameter overrules 'normal' and 
      'probe', but not the 'force' lists.
-   ignore_range: insmod parameter. Initialize this list with SENSORS_I2C_END 
-      values.
-     A list of triples. The first value is a bus number (SENSORS_ISA_BUS for
-     the ISA bus, -1 for any I2C bus), the second and third are addresses. 
-     These form an inclusive range of I2C addresses that are never probed.
-     This parameter overrules 'normal' and 'probe', but not the 'force' lists.
 
 Also used is a list of pointers to sensors_force_data structures:
    force_data: insmod parameters. A list, ending with an element of which
@@ -269,16 +233,14 @@ Also used is a list of pointers to sensors_force_data structures:
 So we have a generic insmod variabled `force', and chip-specific variables
 `force_CHIPNAME'.
 
-Fortunately, as a module writer, you just have to define the `normal' 
-and/or `normal_range' parameters, and define what chip names are used. 
+Fortunately, as a module writer, you just have to define the `normal_i2c' 
+and `normal_isa' parameters, and define what chip names are used. 
 The complete declaration could look like this:
-  /* Scan i2c addresses 0x20 to 0x2f, 0x37, and 0x40 to 0x4f
-  static unsigned short normal_i2c[] = {0x37,SENSORS_I2C_END};
-  static unsigned short normal_i2c_range[] = {0x20,0x2f,0x40,0x4f,
-                                              SENSORS_I2C_END};
+  /* Scan i2c addresses 0x37, and 0x48 to 0x4f */
+  static unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
   /* Scan ISA address 0x290 */
   static unsigned int normal_isa[] = {0x0290,SENSORS_ISA_END};
-  static unsigned int normal_isa_range[] = {SENSORS_ISA_END};
 
   /* Define chips foo and bar, as well as all module parameters and things */
   SENSORS_INSMOD_2(foo,bar);
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 71ef0498d5e0..104a994b8289 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -615,9 +615,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   Module snd-hda-intel
   --------------------
 
-    Module for Intel HD Audio (ICH6, ICH6M, ICH7)
+    Module for Intel HD Audio (ICH6, ICH6M, ICH7), ATI SB450,
+               VIA VT8251/VT8237A
 
     model       - force the model name
+    position_fix - Fix DMA pointer (0 = FIFO size, 1 = none, 2 = POSBUF)
 
     Module supports up to 8 cards.
 
@@ -635,6 +637,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           5stack        5-jack in back, 2-jack in front
           5stack-digout 5-jack in back, 2-jack in front, a SPDIF out
           w810          3-jack
+          z71v          3-jack (HP shared SPDIF)
+          asus          3-jack
+          uniwill       3-jack
+          F1734         2-jack
 
         CMI9880
           minimal       3-jack in back
@@ -642,6 +648,15 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           full          6-jack in back, 2-jack in front
           full_dig      6-jack in back, 2-jack in front, SPDIF I/O
           allout        5-jack in back, 2-jack in front, SPDIF out
+          auto          auto-config reading BIOS (default)
+
+    Note 2: If you get click noises on output, try the module option
+            position_fix=1 or 2.  position_fix=1 will use the SD_LPIB
+            register value without FIFO size correction as the current
+            DMA pointer.  position_fix=2 will make the driver to use
+            the position buffer instead of reading SD_LPIB register.
+            (Usually SD_LPLIB register is more accurate than the
+            position buffer.)
 
   Module snd-hdsp
   ---------------
@@ -660,7 +675,19 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           module did formerly.  It will allocate the buffers in advance
           when any HDSP cards are found.  To make the buffer
           allocation sure, load snd-page-alloc module in the early
-          stage of boot sequence.
+          stage of boot sequence.  See "Early Buffer Allocation"
+          section.
+
+  Module snd-hdspm
+  ----------------
+
+    Module for RME HDSP MADI board.
+
+    precise_ptr         - Enable precise pointer, or disable.
+    line_outs_monitor   - Send playback streams to analog outs by default.
+    enable_monitor      - Enable Analog Out on Channel 63/64 by default.
+
+    See hdspm.txt for details.
 
   Module snd-ice1712
   ------------------
@@ -677,15 +704,19 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                         * TerraTec EWS 88D
                         * TerraTec EWX 24/96
                         * TerraTec DMX 6Fire
+                        * TerraTec Phase 88
                         * Hoontech SoundTrack DSP 24
                         * Hoontech SoundTrack DSP 24 Value
                         * Hoontech SoundTrack DSP 24 Media 7.1
+                        * Event Electronics, EZ8
                         * Digigram VX442
+                        * Lionstracs, Mediastaton
 
     model       - Use the given board model, one of the following:
                   delta1010, dio2496, delta66, delta44, audiophile, delta410,
                   delta1010lt, vx442, ewx2496, ews88mt, ews88mt_new, ews88d,
-                  dmx6fire, dsp24, dsp24_value, dsp24_71, ez8
+                  dmx6fire, dsp24, dsp24_value, dsp24_71, ez8,
+                  phase88, mediastation
     omni        - Omni I/O support for MidiMan M-Audio Delta44/66
     cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transciever)
                      in msec resolution, default value is 500 (0.5 sec)
@@ -694,20 +725,46 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     is not used with all Envy24 based cards (for example in the MidiMan Delta
     serie).
 
+    Note: The supported board is detected by reading EEPROM or PCI
+          SSID (if EEPROM isn't available).  You can override the
+          model by passing "model" module option in case that the
+          driver isn't configured properly or you want to try another
+          type for testing.
+
   Module snd-ice1724
   ------------------
 
-    Module for Envy24HT (VT/ICE1724) based PCI sound cards.
+    Module for Envy24HT (VT/ICE1724), Envy24PT (VT1720) based PCI sound cards.
                         * MidiMan M Audio Revolution 7.1
                         * AMP Ltd AUDIO2000
-                        * TerraTec Aureon Sky-5.1, Space-7.1
+                        * TerraTec Aureon 5.1 Sky
+                        * TerraTec Aureon 7.1 Space
+                        * TerraTec Aureon 7.1 Universe
+                        * TerraTec Phase 22
+                        * TerraTec Phase 28
+                        * AudioTrak Prodigy 7.1
+                        * AudioTrak Prodigy 192
+                        * Pontis MS300
+                        * Albatron K8X800 Pro II 
+                        * Chaintech ZNF3-150
+                        * Chaintech ZNF3-250
+                        * Chaintech 9CJS
+                        * Chaintech AV-710
+                        * Shuttle SN25P
 
     model       - Use the given board model, one of the following:
-                  revo71, amp2000, prodigy71, aureon51, aureon71,
-                  k8x800
+                  revo71, amp2000, prodigy71, prodigy192, aureon51,
+                  aureon71, universe, k8x800, phase22, phase28, ms300,
+                  av710
 
     Module supports up to 8 cards and autoprobe.
 
+    Note: The supported board is detected by reading EEPROM or PCI
+          SSID (if EEPROM isn't available).  You can override the
+          model by passing "model" module option in case that the
+          driver isn't configured properly or you want to try another
+          type for testing.
+
   Module snd-intel8x0
   -------------------
 
@@ -1026,7 +1083,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           module did formerly.  It will allocate the buffers in advance
           when any RME9652 cards are found.  To make the buffer
           allocation sure, load snd-page-alloc module in the early
-          stage of boot sequence.
+          stage of boot sequence.  See "Early Buffer Allocation"
+          section.
 
   Module snd-sa11xx-uda1341 (on arm only)
   ---------------------------------------
@@ -1211,16 +1269,18 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   ------------------
 
     Module for AC'97 motherboards based on VIA 82C686A/686B, 8233,
-    8233A, 8233C, 8235 (south) bridge.
+    8233A, 8233C, 8235, 8237 (south) bridge.
 
     mpu_port    - 0x300,0x310,0x320,0x330, otherwise obtain BIOS setup
                   [VIA686A/686B only]
     joystick    - Enable joystick (default off) [VIA686A/686B only]
     ac97_clock  - AC'97 codec clock base (default 48000Hz)
     dxs_support - support DXS channels,
-                  0 = auto (defalut), 1 = enable, 2 = disable,
-                  3 = 48k only, 4 = no VRA
-                  [VIA8233/C,8235 only]
+                  0 = auto (default), 1 = enable, 2 = disable,
+                  3 = 48k only, 4 = no VRA, 5 = enable any sample
+                  rate and different sample rates on different
+                  channels
+                  [VIA8233/C, 8235, 8237 only]
     ac97_quirk  - AC'97 workaround for strange hardware
                   See the description of intel8x0 module for details.
 
@@ -1232,18 +1292,23 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           default value 1.4.  Then the interrupt number will be
           assigned under 15. You might also upgrade your BIOS.
     
-    Note: VIA8233/5 (not VIA8233A) can support DXS (direct sound)
+    Note: VIA8233/5/7 (not VIA8233A) can support DXS (direct sound)
           channels as the first PCM.  On these channels, up to 4
-          streams can be played at the same time.
+          streams can be played at the same time, and the controller
+          can perform sample rate conversion with separate rates for
+          each channel.
           As default (dxs_support = 0), 48k fixed rate is chosen
           except for the known devices since the output is often
           noisy except for 48k on some mother boards due to the
           bug of BIOS.
-          Please try once dxs_support=1 and if it works on other
+          Please try once dxs_support=5 and if it works on other
           sample rates (e.g. 44.1kHz of mp3 playback), please let us
           know the PCI subsystem vendor/device id's (output of
           "lspci -nv").
-          If it doesn't work, try dxs_support=4.  If it still doesn't
+          If dxs_support=5 does not work, try dxs_support=4; if it
+          doesn't work too, try dxs_support=1.  (dxs_support=1 is
+          usually for old motherboards.  The correct implementated
+          board should work with 4 or 5.)  If it still doesn't
           work and the default setting is ok, dxs_support=3 is the
           right choice.  If the default setting doesn't work at all,
           try dxs_support=2 to disable the DXS channels.
@@ -1497,6 +1562,36 @@ Proc interfaces (/proc/asound)
            echo "rvplayer 0 0 block" > /proc/asound/card0/pcm0p/oss
 
 
+Early Buffer Allocation
+=======================
+
+Some drivers (e.g. hdsp) require the large contiguous buffers, and
+sometimes it's too late to find such spaces when the driver module is
+actually loaded due to memory fragmentation.  You can pre-allocate the
+PCM buffers by loading snd-page-alloc module and write commands to its
+proc file in prior, for example, in the early boot stage like
+/etc/init.d/*.local scripts.
+
+Reading the proc file /proc/drivers/snd-page-alloc shows the current
+usage of page allocation.  In writing, you can send the following
+commands to the snd-page-alloc driver:
+
+  - add VENDOR DEVICE MASK SIZE BUFFERS
+
+    VENDOR and DEVICE are PCI vendor and device IDs.  They take
+    integer numbers (0x prefix is needed for the hex).
+    MASK is the PCI DMA mask.  Pass 0 if not restricted.
+    SIZE is the size of each buffer to allocate.  You can pass
+    k and m suffix for KB and MB.  The max number is 16MB.
+    BUFFERS is the number of buffers to allocate.  It must be greater
+    than 0.  The max number is 4.
+
+  - erase
+
+    This will erase the all pre-allocated buffers which are not in
+    use.
+
+
 Links
 =====
 
diff --git a/Documentation/sound/alsa/CMIPCI.txt b/Documentation/sound/alsa/CMIPCI.txt
index 4a7df771b806..1872e24442a4 100644
--- a/Documentation/sound/alsa/CMIPCI.txt
+++ b/Documentation/sound/alsa/CMIPCI.txt
@@ -89,19 +89,22 @@ and use the interleaved 4 channel data.
 
 There are some control switchs affecting to the speaker connections:
 
-"Line-In As Rear"       - As mentioned above, the line-in jack is used
-        for the rear (3th and 4th channels) output.
-"Line-In As Bass"       - The line-in jack is used for the bass (5th
-        and 6th channels) output.
-"Mic As Center/LFE"     - The mic jack is used for the bass output.
-        If this switch is on, you cannot use a microphone as a capture
-        source, of course.
-
+"Line-In Mode"  - an enum control to change the behavior of line-in
+        jack.  Either "Line-In", "Rear Output" or "Bass Output" can
+        be selected.  The last item is available only with model 039
+        or newer. 
+        When "Rear Output" is chosen, the surround channels 3 and 4
+        are output to line-in jack.
+"Mic-In Mode"   - an enum control to change the behavior of mic-in
+        jack.  Either "Mic-In" or "Center/LFE Output" can be
+        selected. 
+        When "Center/LFE Output" is chosen, the center and bass
+        channels (channels 5 and 6) are output to mic-in jack. 
 
 Digital I/O
 -----------
 
-The CM8x38 provides the excellent SPDIF capability with very chip
+The CM8x38 provides the excellent SPDIF capability with very cheap
 price (yes, that's the reason I bought the card :)
 
 The SPDIF playback and capture are done via the third PCM device
@@ -122,8 +125,9 @@ respectively, so you cannot playback both analog and digital streams
 simultaneously.
 
 To enable SPDIF output, you need to turn on "IEC958 Output Switch"
-control via mixer or alsactl.  Then you'll see the red light on from
-the card so you know that's working obviously :)
+control via mixer or alsactl ("IEC958" is the official name of
+so-called S/PDIF).  Then you'll see the red light on from the card so
+you know that's working obviously :)
 The SPDIF input is always enabled, so you can hear SPDIF input data
 from line-out with "IEC958 In Monitor" switch at any time (see
 below).
@@ -205,9 +209,10 @@ In addition to the standard SB mixer, CM8x38 provides more functions.
 MIDI CONTROLLER
 ---------------
 
-The MPU401-UART interface is enabled as default only for the first
-(CMIPCI) card.  You need to set module option "midi_port" properly
-for the 2nd (CMIPCI) card.
+The MPU401-UART interface is disabled as default.  You need to set
+module option "mpu_port" with a valid I/O port address to enable the
+MIDI support.  The valid I/O ports are 0x300, 0x310, 0x320 and 0x330.
+Choose the value which doesn't conflict with other cards.
 
 There is _no_ hardware wavetable function on this chip (except for
 OPL3 synth below).
@@ -229,9 +234,11 @@ I don't know why..
 Joystick and Modem
 ------------------
 
-The joystick and modem should be available by enabling the control
-switch "Joystick" and "Modem" respectively.  But I myself have never
-tested them yet.
+The legacy joystick is supported.  To enable the joystick support, pass
+joystick_port=1 module option.  The value 1 means the auto-detection.
+If the auto-detection fails, try to pass the exact I/O address.
+
+The modem is enabled dynamically via a card control switch "Modem".
 
 
 Debugging Information
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index e789475304b6..db0b7d2dc477 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -371,7 +371,7 @@
           <listitem><para>create <function>probe()</function> callback.</para></listitem>
           <listitem><para>create <function>remove()</function> callback.</para></listitem>
           <listitem><para>create pci_driver table which contains the three pointers above.</para></listitem>
-          <listitem><para>create <function>init()</function> function just calling <function>pci_module_init()</function> to register the pci_driver table defined above.</para></listitem>
+          <listitem><para>create <function>init()</function> function just calling <function>pci_register_driver()</function> to register the pci_driver table defined above.</para></listitem>
           <listitem><para>create <function>exit()</function> function to call <function>pci_unregister_driver()</function> function.</para></listitem>
         </itemizedlist>
       </para>
@@ -1198,7 +1198,7 @@
   /* initialization of the module */
   static int __init alsa_card_mychip_init(void)
   {
-          return pci_module_init(&driver);
+          return pci_register_driver(&driver);
   }
 
   /* clean up the module */
@@ -1654,7 +1654,7 @@
 <![CDATA[
   static int __init alsa_card_mychip_init(void)
   {
-          return pci_module_init(&driver);
+          return pci_register_driver(&driver);
   }
 
   static void __exit alsa_card_mychip_exit(void)
diff --git a/Documentation/sound/alsa/emu10k1-jack.txt b/Documentation/sound/alsa/emu10k1-jack.txt
new file mode 100644
index 000000000000..751d45036a05
--- /dev/null
+++ b/Documentation/sound/alsa/emu10k1-jack.txt
@@ -0,0 +1,74 @@
+This document is a guide to using the emu10k1 based devices with JACK for low
+latency, multichannel recording functionality.  All of my recent work to allow
+Linux users to use the full capabilities of their hardware has been inspired 
+by the kX Project.  Without their work I never would have discovered the true
+power of this hardware.
+
+        http://www.kxproject.com
+                                                - Lee Revell, 2005.03.30
+
+Low latency, multichannel audio with JACK and the emu10k1/emu10k2
+-----------------------------------------------------------------
+
+Until recently, emu10k1 users on Linux did not have access to the same low
+latency, multichannel features offered by the "kX ASIO" feature of their
+Windows driver.  As of ALSA 1.0.9 this is no more!
+
+For those unfamiliar with kX ASIO, this consists of 16 capture and 16 playback
+channels.  With a post 2.6.9 Linux kernel, latencies down to 64 (1.33 ms) or
+even 32 (0.66ms) frames should work well.
+
+The configuration is slightly more involved than on Windows, as you have to
+select the correct device for JACK to use.  Actually, for qjackctl users it's
+fairly self explanatory - select Duplex, then for capture and playback select
+the multichannel devices, set the in and out channels to 16, and the sample
+rate to 48000Hz.  The command line looks like this:
+
+/usr/local/bin/jackd -R -dalsa -r48000 -p64 -n2 -D -Chw:0,2 -Phw:0,3 -S
+
+This will give you 16 input ports and 16 output ports.
+
+The 16 output ports map onto the 16 FX buses (or the first 16 of 64, for the
+Audigy).  The mapping from FX bus to physical output is described in
+SB-Live-mixer.txt (or Audigy-mixer.txt).
+
+The 16 input ports are connected to the 16 physical inputs.  Contrary to
+popular belief, all emu10k1 cards are multichannel cards.  Which of these
+input channels have physical inputs connected to them depends on the card
+model.  Trial and error is highly recommended; the pinout diagrams
+for the card have been reverse engineered by some enterprising kX users and are 
+available on the internet.  Meterbridge is helpful here, and the kX forums are
+packed with useful information.
+
+Each input port will either correspond to a digital (SPDIF) input, an analog
+input, or nothing.  The one exception is the SBLive! 5.1.  On these devices,
+the second and third input ports are wired to the center/LFE output.  You will
+still see 16 capture channels, but only 14 are available for recording inputs.
+
+This chart, borrowed from kxfxlib/da_asio51.cpp, describes the mapping of JACK
+ports to FXBUS2 (multitrack recording input) and EXTOUT (physical output)
+channels.
+
+/*JACK (& ASIO) mappings on 10k1 5.1 SBLive cards:
+--------------------------------------------
+JACK            Epilog          FXBUS2(nr)
+--------------------------------------------
+capture_1       asio14          FXBUS2(0xe)
+capture_2       asio15          FXBUS2(0xf)
+capture_3       asio0           FXBUS2(0x0)     
+~capture_4      Center          EXTOUT(0x11)    // mapped to by Center
+~capture_5      LFE             EXTOUT(0x12)    // mapped to by LFE
+capture_6       asio3           FXBUS2(0x3)
+capture_7       asio4           FXBUS2(0x4)
+capture_8       asio5           FXBUS2(0x5)
+capture_9       asio6           FXBUS2(0x6)
+capture_10      asio7           FXBUS2(0x7)
+capture_11      asio8           FXBUS2(0x8)
+capture_12      asio9           FXBUS2(0x9)
+capture_13      asio10          FXBUS2(0xa)
+capture_14      asio11          FXBUS2(0xb)
+capture_15      asio12          FXBUS2(0xc)
+capture_16      asio13          FXBUS2(0xd)
+*/
+
+TODO: describe use of ld10k1/qlo10k1 in conjunction with JACK
diff --git a/Documentation/sound/alsa/hdspm.txt b/Documentation/sound/alsa/hdspm.txt
new file mode 100644
index 000000000000..7a67ff71a9f8
--- /dev/null
+++ b/Documentation/sound/alsa/hdspm.txt
@@ -0,0 +1,362 @@
+Software Interface ALSA-DSP MADI Driver 
+
+(translated from German, so no good English ;-), 
+2004 - winfried ritsch
+
+
+
+ Full functionality has been added to the driver. Since some of
+ the Controls and startup-options  are ALSA-Standard and only the
+ special Controls are described and discussed below.
+
+
+ hardware functionality:
+
+   
+   Audio transmission:
+
+     number of channels --  depends on transmission mode
+
+                The number of channels chosen is from 1..Nmax. The reason to
+                use for a lower number of channels is only resource allocation,
+                since unused DMA channels are disabled and less memory is
+                allocated. So also the throughput of the PCI system can be
+                scaled. (Only important for low performance boards).
+
+       Single Speed -- 1..64 channels 
+
+                 (Note: Choosing the 56channel mode for transmission or as
+                 receiver, only 56 are transmitted/received over the MADI, but
+                 all 64 channels are available for the mixer, so channel count
+                 for the driver)
+
+       Double Speed -- 1..32 channels
+
+                 Note: Choosing the 56-channel mode for
+                 transmission/receive-mode , only 28 are transmitted/received
+                 over the MADI, but all 32 channels are available for the mixer,
+                 so channel count for the driver
+
+
+       Quad Speed -- 1..16 channels 
+
+                 Note: Choosing the 56-channel mode for
+                 transmission/receive-mode , only 14 are transmitted/received
+                 over the MADI, but all 16 channels are available for the mixer,
+                 so channel count for the driver
+
+     Format -- signed 32 Bit Little Endian (SNDRV_PCM_FMTBIT_S32_LE)
+
+     Sample Rates --
+
+       Single Speed -- 32000, 44100, 48000
+
+       Double Speed -- 64000, 88200, 96000 (untested)
+
+       Quad Speed -- 128000, 176400, 192000 (untested)
+
+     access-mode -- MMAP (memory mapped), Not interleaved
+     (PCM_NON-INTERLEAVED)
+
+     buffer-sizes -- 64,128,256,512,1024,2048,8192 Samples
+
+     fragments -- 2
+
+     Hardware-pointer -- 2 Modi
+
+
+                 The Card supports the readout of the actual Buffer-pointer,
+                 where DMA reads/writes. Since of the bulk mode of PCI it is only
+                 64 Byte accurate. SO it is not really usable for the
+                 ALSA-mid-level functions (here the buffer-ID gives a better
+                 result), but if MMAP is used by the application. Therefore it
+                 can be configured at load-time with the parameter
+                 precise-pointer.
+
+
+                 (Hint: Experimenting I found that the pointer is maximum 64 to
+                 large never to small. So if you subtract 64 you always have a
+                 safe pointer for writing, which is used on this mode inside
+                 ALSA. In theory now you can get now a latency as low as 16
+                 Samples, which is a quarter of the interrupt possibilities.)
+
+       Precise Pointer -- off
+                                        interrupt used for pointer-calculation
+
+       Precise Pointer -- on
+                                        hardware pointer used.
+
+   Controller:
+
+
+          Since DSP-MADI-Mixer has 8152 Fader, it does not make sense to
+          use the standard mixer-controls, since this would break most of
+          (especially graphic) ALSA-Mixer GUIs. So Mixer control has be
+          provided by a 2-dimensional controller using the
+          hwdep-interface. 
+
+     Also all 128+256 Peak and RMS-Meter can be accessed via the
+     hwdep-interface. Since it could be a performance problem always
+     copying and converting Peak and RMS-Levels even if you just need
+     one, I decided to export the hardware structure, so that of
+     needed some driver-guru can implement a memory-mapping of mixer
+     or peak-meters over ioctl, or also to do only copying and no
+     conversion. A test-application shows the usage of the controller.
+
+    Latency Controls --- not implemented !!!
+
+
+           Note: Within the windows-driver the latency is accessible of a
+           control-panel, but buffer-sizes are controlled with ALSA from
+           hwparams-calls and should not be changed in run-state, I did not
+           implement it here.
+
+
+    System Clock -- suspended !!!!
+
+        Name -- "System Clock Mode"
+
+        Access -- Read Write
+
+        Values -- "Master" "Slave"
+
+
+                  !!!! This is a hardware-function but is in conflict with the
+                  Clock-source controller, which is a kind of ALSA-standard. I
+                  makes sense to set the card to a special mode (master at some
+                  frequency or slave), since even not using an Audio-application
+                  a studio should have working synchronisations setup. So use
+                  Clock-source-controller instead !!!!
+
+    Clock Source  
+
+       Name -- "Sample Clock Source"
+
+       Access -- Read Write
+
+       Values -- "AutoSync", "Internal 32.0 kHz", "Internal 44.1 kHz",
+       "Internal 48.0 kHz", "Internal 64.0 kHz", "Internal 88.2 kHz",
+       "Internal 96.0 kHz"
+
+                 Choose between Master at a specific Frequency and so also the
+                 Speed-mode or Slave (Autosync). Also see  "Preferred Sync Ref"
+
+
+       !!!! This is no pure hardware function but was implemented by
+       ALSA by some ALSA-drivers before, so I use it also. !!!
+
+
+    Preferred Sync Ref
+
+       Name -- "Preferred Sync Reference"
+
+       Access -- Read Write
+
+       Values -- "Word" "MADI"
+
+
+                 Within the Auto-sync-Mode the preferred Sync Source can be
+                 chosen. If it is not available another is used if possible.
+
+                 Note: Since MADI has a much higher bit-rate than word-clock, the
+                 card should synchronise better in MADI Mode. But since the
+                 RME-PLL is very good, there are almost no problems with
+                 word-clock too. I never found a difference.
+
+
+    TX 64 channel --- 
+
+       Name -- "TX 64 channels mode"
+
+       Access -- Read Write
+
+       Values -- 0 1
+
+                 Using 64-channel-modus (1) or 56-channel-modus for
+                 MADI-transmission (0).
+
+
+                 Note: This control is for output only. Input-mode is detected
+                 automatically from hardware sending MADI.
+
+
+    Clear TMS ---
+
+       Name -- "Clear Track Marker"
+
+       Access -- Read Write
+
+       Values -- 0 1
+
+
+                 Don't use to lower 5 Audio-bits on AES as additional Bits.
+        
+
+    Safe Mode oder Auto Input --- 
+
+       Name -- "Safe Mode"
+
+       Access -- Read Write
+
+       Values -- 0 1
+
+       (default on)
+
+                 If on (1), then if either the optical or coaxial connection
+                 has a failure, there is a takeover to the working one, with no
+                 sample failure. Its only useful if you use the second as a
+                 backup connection.
+
+    Input --- 
+
+       Name -- "Input Select"
+
+       Access -- Read Write
+
+       Values -- optical coaxial
+
+
+                 Choosing the Input, optical or coaxial. If Safe-mode is active,
+                 this is the preferred Input.
+
+-------------- Mixer ----------------------
+
+    Mixer
+
+       Name -- "Mixer"
+
+       Access -- Read Write
+
+       Values - <channel-number 0-127> <Value 0-65535>
+
+
+                 Here as a first value the channel-index is taken to get/set the
+                 corresponding mixer channel, where 0-63 are the input to output
+                 fader and 64-127 the playback to outputs fader. Value 0
+                 is channel muted 0 and 32768 an amplification of  1.
+
+    Chn 1-64
+
+       fast mixer for the ALSA-mixer utils. The diagonal of the
+       mixer-matrix is implemented from playback to output.
+       
+
+    Line Out
+
+       Name  -- "Line Out"
+
+       Access -- Read Write
+
+       Values -- 0 1
+
+                 Switching on and off the analog out, which has nothing to do
+                 with mixing or routing. the analog outs reflects channel 63,64.
+
+
+--- information (only read access):
+ 
+    Sample Rate
+
+       Name -- "System Sample Rate"
+
+       Access -- Read-only
+
+                 getting the sample rate.
+
+
+    External Rate measured
+
+       Name -- "External Rate"
+
+       Access -- Read only
+
+
+                 Should be "Autosync Rate", but Name used is
+                 ALSA-Scheme. External Sample frequency liked used on Autosync is
+                 reported.
+
+
+    MADI Sync Status
+
+       Name -- "MADI Sync Lock Status"
+
+       Access -- Read
+
+       Values -- 0,1,2
+
+       MADI-Input is 0=Unlocked, 1=Locked, or 2=Synced.
+
+
+    Word Clock Sync Status
+
+       Name -- "Word Clock Lock Status"
+
+       Access -- Read
+
+       Values -- 0,1,2
+
+       Word Clock Input is 0=Unlocked, 1=Locked, or 2=Synced.
+
+    AutoSync
+
+       Name -- "AutoSync Reference"
+
+       Access -- Read
+
+       Values -- "WordClock", "MADI", "None"
+
+                 Sync-Reference is either "WordClock", "MADI" or none.
+
+   RX 64ch --- noch nicht implementiert
+
+       MADI-Receiver is in 64 channel mode oder 56 channel mode.
+
+
+   AB_inp   --- not tested 
+
+                 Used input for Auto-Input.
+
+
+   actual Buffer Position --- not implemented
+
+           !!! this is a ALSA internal function, so no control is used !!!
+
+
+
+Calling Parameter:
+
+   index int array (min = 1, max = 8), 
+     "Index value for RME HDSPM interface." card-index within ALSA
+
+     note: ALSA-standard
+
+   id string array (min = 1, max = 8), 
+     "ID string for RME HDSPM interface."
+
+     note: ALSA-standard
+
+   enable int array (min = 1, max = 8), 
+     "Enable/disable specific HDSPM sound-cards."
+
+     note: ALSA-standard
+
+   precise_ptr int array (min = 1, max = 8), 
+     "Enable precise pointer, or disable."
+
+     note: Use only when the application supports this (which is a special case).
+
+   line_outs_monitor int array (min = 1, max = 8), 
+     "Send playback streams to analog outs by default."
+
+
+          note: each playback channel is mixed to the same numbered output
+          channel (routed). This is against the ALSA-convention, where all
+          channels have to be muted on after loading the driver, but was
+          used before on other cards, so i historically use it again)
+
+
+
+   enable_monitor int array (min = 1, max = 8), 
+     "Enable Analog Out on Channel 63/64 by default."
+
+      note: here the analog output is enabled (but not routed).
\ No newline at end of file
diff --git a/Documentation/w1/w1.generic b/Documentation/w1/w1.generic
index eace3046a858..f937fbe1cacb 100644
--- a/Documentation/w1/w1.generic
+++ b/Documentation/w1/w1.generic
@@ -1,19 +1,92 @@
-Any w1 device must be connected to w1 bus master device - for example
-ds9490 usb device or w1-over-GPIO or RS232 converter.
-Driver for w1 bus master must provide several functions(you can find
-them in struct w1_bus_master definition in w1.h) which then will be
-called by w1 core to send various commands over w1 bus(by default it is
-reset and search commands). When some device is found on the bus, w1 core
-checks if driver for it's family is loaded.
-If driver is loaded w1 core creates new w1_slave object and registers it
-in the system(creates some generic sysfs files(struct w1_family_ops in
-w1_family.h), notifies any registered listener and so on...).
-It is device driver's business to provide any communication method
-upstream.
-For example w1_therm driver(ds18?20 thermal sensor family driver)
-provides temperature reading function which is bound to ->rbin() method
-of the above w1_family_ops structure.
-w1_smem - driver for simple 64bit memory cell provides ID reading
-method.
+The 1-wire (w1) subsystem
+------------------------------------------------------------------
+The 1-wire bus is a simple master-slave bus that communicates via a single
+signal wire (plus ground, so two wires).
+
+Devices communicate on the bus by pulling the signal to ground via an open
+drain output and by sampling the logic level of the signal line.
+
+The w1 subsystem provides the framework for managing w1 masters and
+communication with slaves.
+
+All w1 slave devices must be connected to a w1 bus master device.
+
+Example w1 master devices:
+    DS9490 usb device
+    W1-over-GPIO
+    DS2482 (i2c to w1 bridge)
+    Emulated devices, such as a RS232 converter, parallel port adapter, etc
+
+
+What does the w1 subsystem do?
+------------------------------------------------------------------
+When a w1 master driver registers with the w1 subsystem, the following occurs:
+
+ - sysfs entries for that w1 master are created
+ - the w1 bus is periodically searched for new slave devices
+
+When a device is found on the bus, w1 core checks if driver for it's family is
+loaded. If so, the family driver is attached to the slave.
+If there is no driver for the family, a simple sysfs entry is created
+for the slave device.
+
+
+W1 device families
+------------------------------------------------------------------
+Slave devices are handled by a driver written for a family of w1 devices.
+
+A family driver populates a struct w1_family_ops (see w1_family.h) and
+registers with the w1 subsystem.
+
+Current family drivers:
+w1_therm - (ds18?20 thermal sensor family driver)
+    provides temperature reading function which is bound to ->rbin() method
+    of the above w1_family_ops structure.
+
+w1_smem - driver for simple 64bit memory cell provides ID reading method.
 
 You can call above methods by reading appropriate sysfs files.
+
+
+What does a w1 master driver need to implement?
+------------------------------------------------------------------
+
+The driver for w1 bus master must provide at minimum two functions.
+
+Emulated devices must provide the ability to set the output signal level
+(write_bit) and sample the signal level (read_bit).
+
+Devices that support the 1-wire natively must provide the ability to write and
+sample a bit (touch_bit) and reset the bus (reset_bus).
+
+Most hardware provides higher-level functions that offload w1 handling.
+See struct w1_bus_master definition in w1.h for details.
+
+
+w1 master sysfs interface
+------------------------------------------------------------------
+<xx-xxxxxxxxxxxxx> - a directory for a found device. The format is family-serial
+bus                - (standard) symlink to the w1 bus
+driver             - (standard) symlink to the w1 driver
+w1_master_attempts - the number of times a search was attempted
+w1_master_max_slave_count
+                   - the maximum slaves that may be attached to a master
+w1_master_name     - the name of the device (w1_bus_masterX)
+w1_master_search   - the number of searches left to do, -1=continual (default)
+w1_master_slave_count
+                   - the number of slaves found
+w1_master_slaves   - the names of the slaves, one per line
+w1_master_timeout  - the delay in seconds between searches
+
+If you have a w1 bus that never changes (you don't add or remove devices),
+you can set w1_master_search to a positive value to disable searches.
+
+
+w1 slave sysfs interface
+------------------------------------------------------------------
+bus                - (standard) symlink to the w1 bus
+driver             - (standard) symlink to the w1 driver
+name               - the device name, usually the same as the directory name
+w1_slave           - (optional) a binary file whose meaning depends on the
+                     family driver
+
diff --git a/MAINTAINERS b/MAINTAINERS
index 0f88a70a15d8..4d44824884ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -194,7 +194,7 @@ S:	Maintained
 ADM1025 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
 ADT746X FAN DRIVER
@@ -242,7 +242,7 @@ S:	Maintained
 ALI1563 I2C DRIVER
 P:      Rudolf Marek
 M:      r.marek@sh.cvut.cz
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
 ALPHA PORT
@@ -1002,7 +1002,7 @@ P:	Greg Kroah-Hartman
 M:      greg@kroah.com
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.nu/
 S:      Maintained
 
@@ -1430,13 +1430,13 @@ S:	Supported
 LM83 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
 LM90 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks)
@@ -2075,7 +2075,7 @@ S:	Maintained
 SMSC47M1 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 S:      Odd Fixes
 
 SMB FILESYSTEM
@@ -2614,7 +2614,7 @@ S:	Orphan
 W1 DALLAS'S 1-WIRE BUS
 P:      Evgeniy Polyakov
 M:      johnpol@2ka.mipt.ru
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
 W83L51xD SD/MMC CARD INTERFACE DRIVER
@@ -2627,7 +2627,7 @@ S:	Maintained
 W83L785TS HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      sensors@stimpy.netroedge.com
+L:      lm-sensors@lm-sensors.org
 S:      Odd Fixes
 
 WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 34e603cc1716..ce4dfa8b834d 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -220,7 +220,7 @@ config IOSAPIC
 
 config IA64_SGI_SN_SIM
         bool "SGI Medusa Simulator Support"
-        depends on IA64_SGI_SN2
+        depends on IA64_SGI_SN2 || IA64_GENERIC
         help
           If you are compiling a kernel that will run under SGI's IA-64
           simulator (Medusa) then say Y, otherwise say N.
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 9086b789f6ac..47f45341ac62 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc3
-# Tue May  3 15:55:04 2005
+# Linux kernel version: 2.6.12-20050621
+# Tue Jun 21 14:03:24 2005
 #
 
 #
@@ -67,6 +67,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_TIME_INTERPOLATION=y
 CONFIG_EFI=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_IA64_GENERIC is not set
 CONFIG_IA64_DIG=y
 # CONFIG_IA64_HP_ZX1 is not set
@@ -285,6 +286,7 @@ CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -313,11 +315,8 @@ CONFIG_SCSI_FC_ATTRS=y
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
@@ -366,8 +365,10 @@ CONFIG_DM_ZERO=m
 # Fusion MPT device support
 #
 CONFIG_FUSION=y
-CONFIG_FUSION_MAX_SGE=40
-# CONFIG_FUSION_CTL is not set
+CONFIG_FUSION_SPI=y
+CONFIG_FUSION_FC=y
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=y
 
 #
 # IEEE 1394 (FireWire) support
@@ -506,9 +507,11 @@ CONFIG_E1000=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
+# CONFIG_BNX2 is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -598,7 +601,6 @@ CONFIG_GAMEPORT=m
 # CONFIG_GAMEPORT_VORTEX is not set
 # CONFIG_GAMEPORT_FM801 is not set
 # CONFIG_GAMEPORT_CS461X is not set
-CONFIG_SOUND_GAMEPORT=m
 
 #
 # Character devices
@@ -611,7 +613,6 @@ CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_CYCLADES is not set
 # CONFIG_MOXA_SMARTIO is not set
 # CONFIG_ISI is not set
-# CONFIG_SYNCLINK is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_N_HDLC is not set
 # CONFIG_SPECIALIX is not set
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 9997ef45ab23..7be8096e0561 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.10
-# Thu Jan  6 11:13:13 2005
+# Linux kernel version: 2.6.12
+# Tue Jun 21 11:30:42 2005
 #
 
 #
@@ -10,6 +10,7 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
@@ -21,24 +22,27 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=20
 CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+# CONFIG_CPUSETS is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SHMEM=y
 CONFIG_CC_ALIGN_FUNCTIONS=0
 CONFIG_CC_ALIGN_LABELS=0
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
 # CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
 
 #
 # Loadable module support
@@ -63,9 +67,11 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_TIME_INTERPOLATION=y
 CONFIG_EFI=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_IA64_GENERIC=y
 # CONFIG_IA64_DIG is not set
 # CONFIG_IA64_HP_ZX1 is not set
+# CONFIG_IA64_HP_ZX1_SWIOTLB is not set
 # CONFIG_IA64_SGI_SN2 is not set
 # CONFIG_IA64_HP_SIM is not set
 # CONFIG_ITANIUM is not set
@@ -77,6 +83,7 @@ CONFIG_IA64_PAGE_SIZE_16KB=y
 CONFIG_IA64_L1_CACHE_SHIFT=7
 CONFIG_NUMA=y
 CONFIG_VIRTUAL_MEM_MAP=y
+CONFIG_HOLES_IN_ZONE=y
 CONFIG_DISCONTIGMEM=y
 CONFIG_IA64_CYCLONE=y
 CONFIG_IOSAPIC=y
@@ -84,6 +91,7 @@ CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_SMP=y
 CONFIG_NR_CPUS=512
 CONFIG_HOTPLUG_CPU=y
+# CONFIG_SCHED_SMT is not set
 # CONFIG_PREEMPT is not set
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_IA32_SUPPORT=y
@@ -135,6 +143,7 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCI_NAMES=y
+# CONFIG_PCI_DEBUG is not set
 
 #
 # PCI Hotplug Support
@@ -144,7 +153,6 @@ CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_ACPI=m
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_PCIE is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
 #
@@ -153,10 +161,6 @@ CONFIG_HOTPLUG_PCI_ACPI=m
 # CONFIG_PCCARD is not set
 
 #
-# PC-card bridges
-#
-
-#
 # Device Drivers
 #
 
@@ -190,6 +194,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
@@ -209,6 +214,7 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
 
 #
 # ATA/ATAPI/MFM/RLL support
@@ -283,6 +289,7 @@ CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -310,13 +317,21 @@ CONFIG_SCSI_FC_ATTRS=y
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_BUSLOGIC is not set
+CONFIG_SCSI_SATA=y
+# CONFIG_SCSI_SATA_AHCI is not set
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_NV is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_QSTOR is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIS is not set
+# CONFIG_SCSI_SATA_ULI is not set
+# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_VITESSE=y
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
@@ -326,7 +341,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 # CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
 CONFIG_SCSI_QLOGIC_FC=y
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 CONFIG_SCSI_QLOGIC_1280=y
@@ -337,6 +351,7 @@ CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
 CONFIG_SCSI_QLA2322=m
 # CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -359,12 +374,16 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_EMC is not set
 
 #
 # Fusion MPT device support
 #
 CONFIG_FUSION=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_SPI=y
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_MAX_SGE=128
 # CONFIG_FUSION_CTL is not set
 
 #
@@ -387,7 +406,6 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-CONFIG_NETLINK_DEV=y
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
@@ -447,7 +465,6 @@ CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
 
 #
 # ARCnet devices
@@ -484,9 +501,7 @@ CONFIG_NET_PCI=y
 # CONFIG_FORCEDETH is not set
 # CONFIG_DGRS is not set
 CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
 CONFIG_E100=m
-# CONFIG_E100_NAPI is not set
 # CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
@@ -508,9 +523,11 @@ CONFIG_E1000=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=y
+# CONFIG_BNX2 is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -568,25 +585,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_EVBUG is not set
 
 #
-# Input I/O drivers
-#
-CONFIG_GAMEPORT=m
-CONFIG_SOUND_GAMEPORT=m
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GAMEPORT_L4 is not set
-# CONFIG_GAMEPORT_EMU10K1 is not set
-# CONFIG_GAMEPORT_VORTEX is not set
-# CONFIG_GAMEPORT_FM801 is not set
-# CONFIG_GAMEPORT_CS461x is not set
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-
-#
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
@@ -604,6 +602,23 @@ CONFIG_MOUSE_PS2=y
 # CONFIG_INPUT_MISC is not set
 
 #
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+CONFIG_GAMEPORT=m
+# CONFIG_GAMEPORT_NS558 is not set
+# CONFIG_GAMEPORT_L4 is not set
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_VORTEX is not set
+# CONFIG_GAMEPORT_FM801 is not set
+# CONFIG_GAMEPORT_CS461X is not set
+
+#
 # Character devices
 #
 CONFIG_VT=y
@@ -613,11 +628,15 @@ CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_ROCKETPORT is not set
 # CONFIG_CYCLADES is not set
 # CONFIG_MOXA_SMARTIO is not set
-# CONFIG_SYNCLINK is not set
+# CONFIG_ISI is not set
 # CONFIG_SYNCLINKMP is not set
 # CONFIG_N_HDLC is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_SX is not set
 # CONFIG_STALDRV is not set
 CONFIG_SGI_SNSC=y
+CONFIG_SGI_TIOCX=y
+CONFIG_SGI_MBCS=m
 
 #
 # Serial drivers
@@ -639,6 +658,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_SERIAL_SGI_IOC4=y
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -664,6 +684,7 @@ CONFIG_EFI_RTC=y
 CONFIG_AGP=m
 CONFIG_AGP_I460=m
 CONFIG_AGP_HP_ZX1=m
+CONFIG_AGP_SGI_TIOCA=m
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
@@ -675,9 +696,15 @@ CONFIG_HPET=y
 # CONFIG_HPET_RTC_IRQ is not set
 CONFIG_HPET_MMAP=y
 CONFIG_MAX_RAW_DEVS=256
+# CONFIG_HANGCHECK_TIMER is not set
 CONFIG_MMTIMER=y
 
 #
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
 # I2C support
 #
 # CONFIG_I2C is not set
@@ -761,6 +788,8 @@ CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS4281=m
 CONFIG_SND_EMU10K1=m
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_CA0106 is not set
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_NM256 is not set
@@ -785,13 +814,14 @@ CONFIG_SND_FM801=m
 # CONFIG_SND_INTEL8X0M is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
 # CONFIG_SND_VX222 is not set
+# CONFIG_SND_HDA_INTEL is not set
 
 #
 # USB devices
 #
 # CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_USX2Y is not set
 
 #
 # Open Sound System
@@ -801,6 +831,8 @@ CONFIG_SND_FM801=m
 #
 # USB support
 #
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
 
@@ -812,8 +844,6 @@ CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
 
 #
 # USB Host Controller Drivers
@@ -822,6 +852,8 @@ CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 
@@ -839,12 +871,11 @@ CONFIG_USB_UHCI_HCD=m
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_RW_DETECT is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
 # CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
@@ -894,6 +925,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=m
 
 #
 # USB port drivers
@@ -909,7 +941,6 @@ CONFIG_USB_HIDINPUT=y
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
-# CONFIG_USB_TIGL is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
@@ -918,6 +949,8 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_CYTHERM is not set
 # CONFIG_USB_PHIDGETKIT is not set
 # CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -970,7 +1003,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
+
+#
+# XFS support
+#
 CONFIG_XFS_FS=y
+CONFIG_XFS_EXPORT=y
 # CONFIG_XFS_RT is not set
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_SECURITY is not set
@@ -1048,7 +1086,7 @@ CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
+CONFIG_EXPORTFS=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -1134,6 +1172,8 @@ CONFIG_NLS_UTF8=m
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
 
 #
 # HP Simulator drivers
@@ -1150,14 +1190,17 @@ CONFIG_CRC32=y
 #
 # Kernel hacking
 #
+# CONFIG_PRINTK_TIME is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_LOG_BUF_SHIFT=20
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
 CONFIG_IA64_GRANULE_16MB=y
 # CONFIG_IA64_GRANULE_64MB is not set
 # CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1184,6 +1227,7 @@ CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/ia64/kernel/entry.h b/arch/ia64/kernel/entry.h
index 6d4ecec989b5..78eeb0793419 100644
--- a/arch/ia64/kernel/entry.h
+++ b/arch/ia64/kernel/entry.h
@@ -60,7 +60,7 @@
         .spillsp @priunat,SW(AR_UNAT)+16+(off);                                 \
         .spillsp ar.rnat,SW(AR_RNAT)+16+(off);                                  \
         .spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off);                          \
-        .spillsp pr,SW(PR)+16+(off))
+        .spillsp pr,SW(PR)+16+(off)
 
 #define DO_SAVE_SWITCH_STACK                    \
         movl r28=1f;                            \
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index d9c05d53435b..2bc085a73e30 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -405,17 +405,22 @@ ENTRY(nested_dtlb_miss)
          *              r30:    continuation address
          *              r31:    saved pr
          *
-         * Clobbered:   b0, r18, r19, r21, psr.dt (cleared)
+         * Clobbered:   b0, r18, r19, r21, r22, psr.dt (cleared)
          */
         rsm psr.dt                              // switch to using physical data addressing
         mov r19=IA64_KR(PT_BASE)                // get the page table base address
         shl r21=r16,3                           // shift bit 60 into sign bit
+        mov r18=cr.itir
         ;;
         shr.u r17=r16,61                        // get the region number into r17
+        extr.u r18=r18,2,6                      // get the faulting page size
         ;;
         cmp.eq p6,p7=5,r17                      // is faulting address in region 5?
-        shr.u r18=r16,PGDIR_SHIFT               // get bits 33-63 of faulting address
+        add r22=-PAGE_SHIFT,r18                 // adjustment for hugetlb address
+        add r18=PGDIR_SHIFT-PAGE_SHIFT,r18
         ;;
+        shr.u r22=r16,r22
+        shr.u r18=r16,r18
 (p7)    dep r17=r17,r19,(PAGE_SHIFT-3),3        // put region number bits in place
 
         srlz.d
@@ -428,7 +433,7 @@ ENTRY(nested_dtlb_miss)
 (p6)    dep r17=r18,r19,3,(PAGE_SHIFT-3)        // r17=PTA + IFA(33,42)*8
 (p7)    dep r17=r18,r17,3,(PAGE_SHIFT-6)        // r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8)
         cmp.eq p7,p6=0,r21                      // unused address bits all zeroes?
-        shr.u r18=r16,PMD_SHIFT                 // shift L2 index into position
+        shr.u r18=r22,PMD_SHIFT                 // shift L2 index into position
         ;;
         ld8 r17=[r17]                           // fetch the L1 entry (may be 0)
         ;;
@@ -436,7 +441,7 @@ ENTRY(nested_dtlb_miss)
         dep r17=r18,r17,3,(PAGE_SHIFT-3)        // compute address of L2 page table entry
         ;;
 (p7)    ld8 r17=[r17]                           // fetch the L2 entry (may be 0)
-        shr.u r19=r16,PAGE_SHIFT                // shift L3 index into position
+        shr.u r19=r22,PAGE_SHIFT                // shift L3 index into position
         ;;
 (p7)    cmp.eq.or.andcm p6,p7=r17,r0            // was L2 entry NULL?
         dep r17=r19,r17,3,(PAGE_SHIFT-3)        // compute address of L3 page table entry
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 575a8f657b31..6d57aebad485 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -945,6 +945,13 @@ access_uarea (struct task_struct *child, unsigned long addr,
                                 *data = (pt->cr_ipsr & IPSR_MASK);
                         return 0;
 
+                      case PT_AR_RSC:
+                        if (write_access)
+                                pt->ar_rsc = *data | (3 << 2); /* force PL3 */
+                        else
+                                *data = pt->ar_rsc;
+                        return 0;
+
                       case PT_AR_RNAT:
                         urbs_end = ia64_get_user_rbs_end(child, pt, NULL);
                         rnat_addr = (long) ia64_rse_rnat_addr((long *)
@@ -996,9 +1003,6 @@ access_uarea (struct task_struct *child, unsigned long addr,
                       case PT_AR_BSPSTORE:
                         ptr = pt_reg_addr(pt, ar_bspstore);
                         break;
-                      case PT_AR_RSC:
-                        ptr = pt_reg_addr(pt, ar_rsc);
-                        break;
                       case PT_AR_UNAT:
                         ptr = pt_reg_addr(pt, ar_unat);
                         break;
@@ -1234,7 +1238,7 @@ ptrace_getregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
 static long
 ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
 {
-        unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
+        unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0;
         struct unw_frame_info info;
         struct switch_stack *sw;
         struct ia64_fpreg fpval;
@@ -1267,7 +1271,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
         /* app regs */
 
         retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]);
-        retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]);
+        retval |= __get_user(rsc, &ppr->ar[PT_AUR_RSC]);
         retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]);
         retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]);
         retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]);
@@ -1365,6 +1369,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
         retval |= __get_user(nat_bits, &ppr->nat);
 
         retval |= access_uarea(child, PT_CR_IPSR, &psr, 1);
+        retval |= access_uarea(child, PT_AR_RSC, &rsc, 1);
         retval |= access_uarea(child, PT_AR_EC, &ec, 1);
         retval |= access_uarea(child, PT_AR_LC, &lc, 1);
         retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1);
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 499b7e5317cf..edd9f07860b2 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -94,7 +94,7 @@ sys_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, long arg2,
 static long
 restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
 {
-        unsigned long ip, flags, nat, um, cfm;
+        unsigned long ip, flags, nat, um, cfm, rsc;
         long err;
 
         /* Always make any pending restarted system calls return -EINTR */
@@ -106,7 +106,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
         err |= __get_user(ip, &sc->sc_ip);                      /* instruction pointer */
         err |= __get_user(cfm, &sc->sc_cfm);
         err |= __get_user(um, &sc->sc_um);                      /* user mask */
-        err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc);
+        err |= __get_user(rsc, &sc->sc_ar_rsc);
         err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat);
         err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr);
         err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs);
@@ -119,6 +119,7 @@ restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
         err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8);       /* r15 */
 
         scr->pt.cr_ifs = cfm | (1UL << 63);
+        scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */
 
         /* establish new instruction pointer: */
         scr->pt.cr_iip = ip & ~0x3UL;
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index 953095e2ce15..b49d4ddaab93 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -269,7 +269,7 @@ smp_call_function_single (int cpuid, void (*func) (void *info), void *info, int
         int me = get_cpu(); /* prevent preemption and reschedule on another processor */
 
         if (cpuid == me) {
-                printk("%s: trying to call self\n", __FUNCTION__);
+                printk(KERN_INFO "%s: trying to call self\n", __FUNCTION__);
                 put_cpu();
                 return -EBUSY;
         }
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 88641e5095b5..e3fc4edea113 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -33,8 +33,6 @@
 #include <asm/hw_irq.h>
 
 
-static int pci_routeirq;
-
 /*
  * Low-level SAL-based PCI configuration access functions. Note that SAL
  * calls are already serialized (via sal_lock), so we don't need another
@@ -139,24 +137,8 @@ static void acpi_map_iosapics(void)
 static int __init
 pci_acpi_init (void)
 {
-        struct pci_dev *dev = NULL;
-
-        printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
-
         acpi_map_iosapics();
 
-        if (pci_routeirq) {
-                /*
-                 * PCI IRQ routing is set up by pci_enable_device(), but we
-                 * also do it here in case there are still broken drivers that
-                 * don't use pci_enable_device().
-                 */
-                printk(KERN_INFO "PCI: Routing interrupts for all devices because \"pci=routeirq\" specified\n");
-                for_each_pci_dev(dev)
-                        acpi_pci_irq_enable(dev);
-        } else
-                printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\".  If it helps, post a report\n");
-
         return 0;
 }
 
@@ -500,8 +482,6 @@ pcibios_align_resource (void *data, struct resource *res,
 char * __init
 pcibios_setup (char *str)
 {
-        if (!strcmp(str, "routeirq"))
-                pci_routeirq = 1;
         return NULL;
 }
 
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c
index 86ca5cf81263..37ece1542799 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c
@@ -185,6 +185,26 @@ mpc834x_sys_init_IRQ(void)
         ipic_set_default_priority();
 }
 
+#if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374)
+extern ulong    ds1374_get_rtc_time(void);
+extern int      ds1374_set_rtc_time(ulong);
+
+static int __init
+mpc834x_rtc_hookup(void)
+{
+        struct timespec tv;
+
+        ppc_md.get_rtc_time = ds1374_get_rtc_time;
+        ppc_md.set_rtc_time = ds1374_set_rtc_time;
+
+        tv.tv_nsec = 0;
+        tv.tv_sec = (ppc_md.get_rtc_time)();
+        do_settimeofday(&tv);
+
+        return 0;
+}
+late_initcall(mpc834x_rtc_hookup);
+#endif
 static __inline__ void
 mpc834x_sys_set_bat(void)
 {
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 203b2ca61df8..b52c4317fefd 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -149,6 +149,7 @@ void __init
 mpc85xx_cds_init_IRQ(void)
 {
         bd_t *binfo = (bd_t *) __res;
+        int i;
 
         /* Determine the Physical Address of the OpenPIC regs */
         phys_addr_t OpenPIC_PAddr = binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
diff --git a/drivers/acorn/char/pcf8583.c b/drivers/acorn/char/pcf8583.c
index ad7ae7ab8920..141b4c237a50 100644
--- a/drivers/acorn/char/pcf8583.c
+++ b/drivers/acorn/char/pcf8583.c
@@ -26,11 +26,8 @@ static unsigned short normal_addr[] = { 0x50, I2C_CLIENT_END };
 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
-        .normal_i2c_range       = ignore,
         .probe                  = ignore,
-        .probe_range            = ignore,
         .ignore                 = ignore,
-        .ignore_range           = ignore,
         .force                  = ignore,
 };
 
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index c3d912cbbbc3..cc3a952401f2 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -49,7 +49,7 @@ static int i2c_debug=0;
 /*
  * Generate a start condition on the i2c bus.
  *
- * returns after the start condition has occured
+ * returns after the start condition has occurred
  */
 static void pca_start(struct i2c_algo_pca_data *adap)
 {
@@ -62,9 +62,9 @@ static void pca_start(struct i2c_algo_pca_data *adap)
 }
 
 /*
- * Generate a repeated start condition on the i2c bus 
+ * Generate a repeated start condition on the i2c bus
  *
- * return after the repeated start condition has occured
+ * return after the repeated start condition has occurred
  */
 static void pca_repeated_start(struct i2c_algo_pca_data *adap)
 {
@@ -82,7 +82,7 @@ static void pca_repeated_start(struct i2c_algo_pca_data *adap)
  * returns after the stop condition has been generated
  *
  * STOPs do not generate an interrupt or set the SI flag, since the
- * part returns the the idle state (0xf8). Hence we don't need to
+ * part returns the idle state (0xf8). Hence we don't need to
  * pca_wait here.
  */
 static void pca_stop(struct i2c_algo_pca_data *adap)
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index 35789bb7126a..f2785499237b 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -24,7 +24,6 @@
 
 /* Ported for SiByte SOCs by Broadcom Corporation.  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index a0018de3bef4..916ba5e40a96 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -7,7 +7,7 @@ menu "I2C Hardware Bus support"
 
 config I2C_ALI1535
         tristate "ALI 1535"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the SMB
           Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@ -31,7 +31,7 @@ config I2C_ALI1563
 
 config I2C_ALI15X3
         tristate "ALI 15x3"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the
           Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +41,7 @@ config I2C_ALI15X3
 
 config I2C_AMD756
         tristate "AMD 756/766/768/8111 and nVidia nForce"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the AMD
           756/766/768 mainboard I2C interfaces.  The driver also includes
@@ -66,7 +66,7 @@ config I2C_AMD756_S4882
 
 config I2C_AMD8111
         tristate "AMD 8111"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the
           second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -109,7 +109,7 @@ config I2C_HYDRA
 
 config I2C_I801
         tristate "Intel 82801 (ICH)"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the Intel
           801 family of mainboard I2C interfaces.  Specifically, the following
@@ -130,7 +130,7 @@ config I2C_I801
 
 config I2C_I810
         tristate "Intel 810/815"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the Intel
@@ -183,7 +183,7 @@ config I2C_IOP3XX
 
 config I2C_ISA
         tristate "ISA Bus support"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         help
           If you say yes to this option, support will be included for i2c
           interfaces that are on the ISA bus.
@@ -248,12 +248,11 @@ config I2C_MPC
           will be called i2c-mpc.
 
 config I2C_NFORCE2
-        tristate "Nvidia Nforce2"
-        depends on I2C && PCI && EXPERIMENTAL
+        tristate "Nvidia nForce2, nForce3 and nForce4"
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the Nvidia
-          Nforce2 family of mainboard I2C interfaces.
-          This driver also supports the nForce3 Pro 150 MCP.
+          nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-nforce2.
@@ -305,7 +304,7 @@ config I2C_PARPORT_LIGHT
 
 config I2C_PROSAVAGE
         tristate "S3/VIA (Pro)Savage"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the
@@ -388,7 +387,7 @@ config SCx200_ACB
 
 config I2C_SIS5595
         tristate "SiS 5595"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the 
           SiS5595 SMBus (a subset of I2C) interface.
@@ -398,7 +397,7 @@ config I2C_SIS5595
 
 config I2C_SIS630
         tristate "SiS 630/730"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the 
           SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -408,7 +407,7 @@ config I2C_SIS630
 
 config I2C_SIS96X
         tristate "SiS 96x"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the SiS
           96x SMBus (a subset of I2C) interfaces.  Specifically, the following
@@ -419,6 +418,7 @@ config I2C_SIS96X
             648/961
             650/961
             735
+            745
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-sis96x.
@@ -449,7 +449,7 @@ config I2C_VIA
 
 config I2C_VIAPRO
         tristate "VIA 82C596/82C686/823x"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the VIA
           82C596/82C686/823x I2C interfaces.  Specifically, the following 
@@ -467,7 +467,7 @@ config I2C_VIAPRO
 
 config I2C_VOODOO3
         tristate "Voodoo 3"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index b00cd4098221..f634a0780cf0 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -53,7 +53,6 @@
 
 /* Note: we assume there can only be one ALI1535, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 5bd6a4a77c1e..0f781a1a3323 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -60,7 +60,6 @@
 
 /* Note: we assume there can only be one ALI15X3, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index eca5ed3738b8..6347ebc6fb53 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -37,7 +37,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index af22b401a38b..d6644481d2a0 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -8,7 +8,6 @@
  * the Free Software Foundation version 2.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 75831a20b0bd..a7ff112e49bf 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -27,7 +27,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 0a7720000a0c..6930b660e508 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -25,7 +25,6 @@
 /* Partialy rewriten by Oleg I. Vdovikin for mmapped support of 
    for Alpha Processor Inc. UP-2000(+) boards */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-frodo.c b/drivers/i2c/busses/i2c-frodo.c
index e093829a0bf7..b6f52f5a4138 100644
--- a/drivers/i2c/busses/i2c-frodo.c
+++ b/drivers/i2c/busses/i2c-frodo.c
@@ -12,7 +12,6 @@
  * version 2 as published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 59c238c42e8c..45e6efb1dcd1 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -41,7 +41,6 @@
 
 /* Note: we assume there can only be one I801, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-i810.c b/drivers/i2c/busses/i2c-i810.c
index ef358bd9c3da..0ff7016e0629 100644
--- a/drivers/i2c/busses/i2c-i810.c
+++ b/drivers/i2c/busses/i2c-i810.c
@@ -34,7 +34,6 @@
    i815                 1132           
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index bb885215c08d..93ca36dc777e 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -695,7 +695,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
 
         dev->irq = iic_force_poll ? -1 : ocp->def->irq;
         if (dev->irq >= 0){
-                /* Disable interrupts until we finish intialization,
+                /* Disable interrupts until we finish initialization,
                    assumes level-sensitive IRQ setup...
                  */
                 iic_interrupt_mode(dev, 0);
diff --git a/drivers/i2c/busses/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_iic.h
index d819a955d890..2b3219d00e92 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.h
+++ b/drivers/i2c/busses/i2c-ibm_iic.h
@@ -22,7 +22,6 @@
 #ifndef __I2C_IBM_IIC_H_
 #define __I2C_IBM_IIC_H_
 
-#include <linux/config.h>
 #include <linux/i2c.h> 
 
 struct iic_regs {
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index c961ba4cfb32..6b682e903f09 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -85,7 +85,7 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
         u32 cr = IOP3XX_ICR_GCD | IOP3XX_ICR_SCLEN | IOP3XX_ICR_UE;
 
         /* 
-         * Everytime unit enable is asserted, GPOD needs to be cleared
+         * Every time unit enable is asserted, GPOD needs to be cleared
          * on IOP321 to avoid data corruption on the bus.
          */
 #ifdef CONFIG_ARCH_IOP321
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 0f54a2a0afa5..00e7f7157b75 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -24,7 +24,6 @@
    the SMBus and the ISA bus very much easier. See lm78.c for an example
    of this. */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c
index 702e3def1b81..5f5d2944808b 100644
--- a/drivers/i2c/busses/i2c-ite.c
+++ b/drivers/i2c/busses/i2c-ite.c
@@ -33,7 +33,6 @@
 /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
    Frodo Looijaard <frodol@dds.nl> */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index 21cd54d02302..ec943cad2314 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -26,11 +26,6 @@
  * 'enabled' to drive the GPIOs.
  */
 
-#include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG   1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index 8c55eafc3a09..f6f5ca31fdba 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -26,11 +26,6 @@
  *       that is passed as the platform_data to this driver.
  */
 
-#include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG   1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index 867d443e7133..363e545fc01f 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -46,7 +46,6 @@
     sound driver to be happy
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 6f33496d31c3..d41ca31dbcb2 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -325,7 +325,7 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
         if (i2c->irq != OCP_IRQ_NA)
         {
                 if ((result = request_irq(ocp->def->irq, mpc_i2c_isr,
-                                          0, "i2c-mpc", i2c)) < 0) {
+                                          SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
                         printk(KERN_ERR
                                "i2c-mpc - failed to attach interrupt\n");
                         goto fail_irq;
@@ -333,6 +333,9 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
         } else
                 i2c->irq = 0;
 
+        mpc_i2c_setclock(i2c);
+        ocp_set_drvdata(ocp, i2c);
+
         i2c->adap = mpc_ops;
         i2c_set_adapdata(&i2c->adap, i2c);
 
@@ -341,8 +344,6 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
                 goto fail_add;
         }
 
-        mpc_i2c_setclock(i2c);
-        ocp_set_drvdata(ocp, i2c);
         return result;
 
       fail_add:
@@ -358,8 +359,8 @@ static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
 static void __devexit mpc_i2c_remove(struct ocp_device *ocp)
 {
         struct mpc_i2c *i2c = ocp_get_drvdata(ocp);
-        ocp_set_drvdata(ocp, NULL);
         i2c_del_adapter(&i2c->adap);
+        ocp_set_drvdata(ocp, NULL);
 
         if (ocp->def->irq != OCP_IRQ_NA)
                 free_irq(i2c->irq, i2c);
@@ -424,12 +425,15 @@ static int fsl_i2c_probe(struct device *device)
 
         if (i2c->irq != 0)
                 if ((result = request_irq(i2c->irq, mpc_i2c_isr,
-                                          0, "fsl-i2c", i2c)) < 0) {
+                                          SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
                         printk(KERN_ERR
                                "i2c-mpc - failed to attach interrupt\n");
                         goto fail_irq;
                 }
 
+        mpc_i2c_setclock(i2c);
+        dev_set_drvdata(device, i2c);
+
         i2c->adap = mpc_ops;
         i2c_set_adapdata(&i2c->adap, i2c);
         i2c->adap.dev.parent = &pdev->dev;
@@ -438,8 +442,6 @@ static int fsl_i2c_probe(struct device *device)
                 goto fail_add;
         }
 
-        mpc_i2c_setclock(i2c);
-        dev_set_drvdata(device, i2c);
         return result;
 
       fail_add:
@@ -456,8 +458,8 @@ static int fsl_i2c_remove(struct device *device)
 {
         struct mpc_i2c *i2c = dev_get_drvdata(device);
 
-        dev_set_drvdata(device, NULL);
         i2c_del_adapter(&i2c->adap);
+        dev_set_drvdata(device, NULL);
 
         if (i2c->irq != 0)
                 free_irq(i2c->irq, i2c);
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 6d13127c8c4e..74eb89aa9350 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -37,7 +37,6 @@
 
 /* Note: we assume there can only be one nForce2, with two SMBus interfaces */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index cb5e722301d8..3e5eba9fcacb 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -24,7 +24,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * ------------------------------------------------------------------------ */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index e9560bab51c4..71a2502fe069 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -24,7 +24,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * ------------------------------------------------------------------------ */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -131,7 +130,7 @@ static int parport_getsda(void *data)
 /* Encapsulate the functions above in the correct structure.
    Note that this is only a template, from which the real structures are
    copied. The attaching code will set getscl to NULL for adapters that
-   cannot read SCL back, and will also make the the data field point to
+   cannot read SCL back, and will also make the data field point to
    the parallel port structure. */
 static struct i2c_algo_bit_data parport_algo_data = {
         .setsda         = parport_setsda,
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 9c611134db9c..d9b4ddbad7e0 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 646381b6b3bf..1f80ba9da6f1 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -28,7 +28,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c
index 13d66289933b..83fd16d61ce5 100644
--- a/drivers/i2c/busses/i2c-prosavage.c
+++ b/drivers/i2c/busses/i2c-prosavage.c
@@ -54,7 +54,6 @@
  *    (Additional documentation needed :(
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-rpx.c b/drivers/i2c/busses/i2c-rpx.c
index 9497b1b6852f..0ebec3c1a54e 100644
--- a/drivers/i2c/busses/i2c-rpx.c
+++ b/drivers/i2c/busses/i2c-rpx.c
@@ -11,7 +11,6 @@
  * changed to eliminate RPXLite references.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index fcfa51c1436b..a3b38257cc3d 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 
@@ -533,7 +534,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
 /* s3c24xx_i2c_xfer
  *
  * first port of call from the i2c bus code when an message needs
- * transfering across the i2c bus.
+ * transferring across the i2c bus.
 */
 
 static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,
diff --git a/drivers/i2c/busses/i2c-savage4.c b/drivers/i2c/busses/i2c-savage4.c
index 092d0323c6c6..0c8518298e4d 100644
--- a/drivers/i2c/busses/i2c-savage4.c
+++ b/drivers/i2c/busses/i2c-savage4.c
@@ -29,7 +29,6 @@
    it easier to add later.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index e5dd90bdb04a..1c99536b673b 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/i2c-algo-sibyte.h>
 #include <asm/sibyte/sb1250_regs.h>
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 425733b019b6..2b5911cfb7b5 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -55,7 +55,6 @@
  * Add adapter resets
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 58df63df1540..f58455e7689e 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -48,7 +48,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 3cac6d43bce5..6484792e23a1 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -32,7 +32,6 @@
     We assume there can only be one SiS96x with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index 19c805ead4d8..00d94e886955 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -21,7 +21,6 @@
 
 #define DEBUG 1
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 2cbc4cd22366..040b8abeabba 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -21,7 +21,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 0bb60a636e16..6b5008005c6f 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -33,7 +33,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
index 3edf0e34155e..b675773b0cc1 100644
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ b/drivers/i2c/busses/i2c-voodoo3.c
@@ -27,7 +27,6 @@
 /* This interfaces to the I2C bus of the Voodoo3 to gain access to
     the BT869 and possibly other I2C devices. */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 1c4159a93623..a18bdd9aa7ba 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -24,7 +24,6 @@
 
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 74d23cfce2a3..a0982da09803 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -1,5 +1,5 @@
 #
-# I2C Sensor device configuration
+# I2C Sensor and "other" chip configuration
 #
 
 menu "Hardware Sensors Chip support"
@@ -11,7 +11,7 @@ config I2C_SENSOR
 
 config SENSORS_ADM1021
         tristate "Analog Devices ADM1021 and compatibles"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1021 
@@ -29,6 +29,7 @@ config SENSORS_ADM1025
         help
           If you say yes here you get support for Analog Devices ADM1025
           and Philips NE1619 sensor chips.
+
           This driver can also be built as a module.  If so, the module
           will be called adm1025.
 
@@ -38,6 +39,8 @@ config SENSORS_ADM1026
         select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1026
+          sensor chip.
+
           This driver can also be built as a module.  If so, the module
           will be called adm1026.
 
@@ -48,9 +51,21 @@ config SENSORS_ADM1031
         help
           If you say yes here you get support for Analog Devices ADM1031 
           and ADM1030 sensor chips.
+
           This driver can also be built as a module.  If so, the module
           will be called adm1031.
 
+config SENSORS_ADM9240
+        tristate "Analog Devices ADM9240 and compatibles"
+        depends on I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Analog Devices ADM9240,
+          Dallas DS1780, National Semiconductor LM81 sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called adm9240.
+
 config SENSORS_ASB100
         tristate "Asus ASB100 Bach"
         depends on I2C && EXPERIMENTAL
@@ -62,6 +77,19 @@ config SENSORS_ASB100
           This driver can also be built as a module.  If so, the module
           will be called asb100.
 
+config SENSORS_ATXP1
+        tristate "Attansic ATXP1 VID controller"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Attansic ATXP1 VID
+          controller.
+
+          If your board have such a chip, you are able to control your CPU
+          core and other voltages.
+
+          This driver can also be built as a module.  If so, the module
+          will be called atxp1.
+
 config SENSORS_DS1621
         tristate "Dallas Semiconductor DS1621 and DS1625"
         depends on I2C && EXPERIMENTAL
@@ -97,7 +125,7 @@ config SENSORS_FSCPOS
 
 config SENSORS_GL518SM
         tristate "Genesys Logic GL518SM"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for Genesys Logic GL518SM
@@ -119,7 +147,7 @@ config SENSORS_GL520SM
 
 config SENSORS_IT87
         tristate "ITE IT87xx and compatibles"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for ITE IT87xx sensor chips
@@ -143,7 +171,7 @@ config SENSORS_LM63
 
 config SENSORS_LM75
         tristate "National Semiconductor LM75 and compatibles"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM75
@@ -174,8 +202,7 @@ config SENSORS_LM78
         select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM78,
-          LM78-J and LM79.  This can also be built as a module which can be
-          inserted and removed while the kernel is running.
+          LM78-J and LM79.
 
           This driver can also be built as a module.  If so, the module
           will be called lm78.
@@ -208,7 +235,7 @@ config SENSORS_LM85
         select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM85
-          sensor chips and clones: ADT7463 and ADM1027.
+          sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027.
 
           This driver can also be built as a module.  If so, the module
           will be called lm85.
@@ -307,14 +334,14 @@ config SENSORS_SMSC47M1
         help
           If you say yes here you get support for the integrated fan
           monitoring and control capabilities of the SMSC LPC47B27x,
-          LPC47M10x, LPC47M13x and LPC47M14x chips.
+          LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x and LPC47M192 chips.
 
           This driver can also be built as a module.  If so, the module
           will be called smsc47m1.
 
 config SENSORS_VIA686A
         tristate "VIA686A"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_SENSOR
         select I2C_ISA
         help
@@ -326,7 +353,7 @@ config SENSORS_VIA686A
 
 config SENSORS_W83781D
         tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for the Winbond W8378x series
@@ -360,22 +387,47 @@ config SENSORS_W83627HF
           This driver can also be built as a module.  If so, the module
           will be called w83627hf.
 
+config SENSORS_W83627EHF
+        tristate "Winbond W83627EHF"
+        depends on I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get preliminary support for the hardware
+          monitoring functionality of the Winbond W83627EHF Super-I/O chip.
+          Only fan and temperature inputs are supported at the moment, while
+          the chip does much more than that.
+
+          This driver can also be built as a module.  If so, the module
+          will be called w83627ehf.
+
 endmenu
 
 menu "Other I2C Chip support"
         depends on I2C
 
 config SENSORS_DS1337
-        tristate "Dallas Semiconductor DS1337 Real Time Clock"
+        tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
         depends on I2C && EXPERIMENTAL
         select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
-          DS1337 real-time clock chips. 
+          DS1337 and DS1339 real-time clock chips.
 
           This driver can also be built as a module.  If so, the module
           will be called ds1337.
 
+config SENSORS_DS1374
+        tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
+        depends on I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Dallas Semiconductor
+          DS1374 real-time clock chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ds1374.
+
 config SENSORS_EEPROM
         tristate "EEPROM reader"
         depends on I2C && EXPERIMENTAL
@@ -399,6 +451,16 @@ config SENSORS_PCF8574
           This driver can also be built as a module.  If so, the module
           will be called pcf8574.
 
+config SENSORS_PCA9539
+        tristate "Philips PCA9539 16-bit I/O port"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Philips PCA9539
+          16-bit I/O port.
+
+          This driver can also be built as a module.  If so, the module
+          will be called pca9539.
+
 config SENSORS_PCF8591
         tristate "Philips PCF8591"
         depends on I2C && EXPERIMENTAL
@@ -431,6 +493,23 @@ config ISP1301_OMAP
           This driver can also be built as a module.  If so, the module
           will be called isp1301_omap.
 
+# NOTE:  This isn't really OMAP-specific, except for the current
+# interface location in  <include/asm-arm/arch-omap/tps65010.h>
+# and having mostly OMAP-specific board support
+config TPS65010
+        tristate "TPS6501x Power Management chips"
+        depends on I2C && ARCH_OMAP
+        default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
+        help
+          If you say yes here you get support for the TPS6501x series of
+          Power Management chips.  These include voltage regulators,
+          lithium ion/polymer battery charging, and other features that
+          are often used in portable devices like cell phones and cameras.
+
+          This driver can also be built as a module.  If so, the module
+          will be called tps65010.
+
+
 config SENSORS_M41T00
         tristate "ST M41T00 RTC chip"
         depends on I2C && PPC32
@@ -440,4 +519,16 @@ config SENSORS_M41T00
           This driver can also be built as a module.  If so, the module
           will be called m41t00.
 
+config SENSORS_MAX6875
+        tristate "MAXIM MAX6875 Power supply supervisor"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the MAX6875
+          EEPROM-Programmable, Hex/Quad, Power-Suppy Sequencers/Supervisors.
+
+          This provides a interface to program the EEPROM and reset the chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called max6875.
+
 endmenu
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 65599161a172..b5e6d2f84f97 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the kernel hardware sensors chip drivers.
+# Makefile for sensor and "other" I2C chip drivers.
 #
 
 # asb100, then w83781d go first, as they can override other drivers' addresses.
@@ -11,7 +11,10 @@ obj-$(CONFIG_SENSORS_ADM1021)	+= adm1021.o
 obj-$(CONFIG_SENSORS_ADM1025)   += adm1025.o
 obj-$(CONFIG_SENSORS_ADM1026)   += adm1026.o
 obj-$(CONFIG_SENSORS_ADM1031)   += adm1031.o
+obj-$(CONFIG_SENSORS_ADM9240)   += adm9240.o
+obj-$(CONFIG_SENSORS_ATXP1)     += atxp1.o
 obj-$(CONFIG_SENSORS_DS1337)    += ds1337.o
+obj-$(CONFIG_SENSORS_DS1374)    += ds1374.o
 obj-$(CONFIG_SENSORS_DS1621)    += ds1621.o
 obj-$(CONFIG_SENSORS_EEPROM)    += eeprom.o
 obj-$(CONFIG_SENSORS_FSCHER)    += fscher.o
@@ -30,8 +33,10 @@ obj-$(CONFIG_SENSORS_LM87)	+= lm87.o
 obj-$(CONFIG_SENSORS_LM90)      += lm90.o
 obj-$(CONFIG_SENSORS_LM92)      += lm92.o
 obj-$(CONFIG_SENSORS_MAX1619)   += max1619.o
+obj-$(CONFIG_SENSORS_MAX6875)   += max6875.o
 obj-$(CONFIG_SENSORS_M41T00)    += m41t00.o
 obj-$(CONFIG_SENSORS_PC87360)   += pc87360.o
+obj-$(CONFIG_SENSORS_PCA9539)   += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)   += pcf8574.o
 obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
 obj-$(CONFIG_SENSORS_RTC8564)   += rtc8564.o
@@ -39,8 +44,11 @@ obj-$(CONFIG_SENSORS_SIS5595)	+= sis5595.o
 obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
 obj-$(CONFIG_SENSORS_SMSC47M1)  += smsc47m1.o
 obj-$(CONFIG_SENSORS_VIA686A)   += via686a.o
+obj-$(CONFIG_SENSORS_W83627EHF) += w83627ehf.o
 obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o
+
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
+obj-$(CONFIG_TPS65010)          += tps65010.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c
index 9058c3956710..d2c774c32f45 100644
--- a/drivers/i2c/chips/adm1021.c
+++ b/drivers/i2c/chips/adm1021.c
@@ -19,7 +19,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -103,8 +102,6 @@ struct adm1021_data {
         u8      remote_temp_hyst;
         u8      remote_temp_input;
         u8      alarms;
-        /* special values for ADM1021 only */
-        u8      die_code;
         /* Special values for ADM1023 only */
         u8      remote_temp_prec;
         u8      remote_temp_os_prec;
@@ -156,7 +153,6 @@ static ssize_t show_##value(struct device *dev, struct device_attribute *attr, c
         return sprintf(buf, "%d\n", data->value);                       \
 }
 show2(alarms);
-show2(die_code);
 
 #define set(value, reg) \
 static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
@@ -183,7 +179,6 @@ static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_remote_temp_max, set_remot
 static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_remote_temp_hyst, set_remote_temp_hyst);
 static DEVICE_ATTR(temp2_input, S_IRUGO, show_remote_temp_input, NULL);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
-static DEVICE_ATTR(die_code, S_IRUGO, show_die_code, NULL);
 
 
 static int adm1021_attach_adapter(struct i2c_adapter *adapter)
@@ -307,8 +302,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_temp2_min);
         device_create_file(&new_client->dev, &dev_attr_temp2_input);
         device_create_file(&new_client->dev, &dev_attr_alarms);
-        if (data->type == adm1021)
-                device_create_file(&new_client->dev, &dev_attr_die_code);
 
         return 0;
 
@@ -371,8 +364,6 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
                 data->remote_temp_max = adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R);
                 data->remote_temp_hyst = adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R);
                 data->alarms = adm1021_read_value(client, ADM1021_REG_STATUS) & 0x7c;
-                if (data->type == adm1021)
-                        data->die_code = adm1021_read_value(client, ADM1021_REG_DIE_CODE);
                 if (data->type == adm1023) {
                         data->remote_temp_prec = adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC);
                         data->remote_temp_os_prec = adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC);
diff --git a/drivers/i2c/chips/adm1025.c b/drivers/i2c/chips/adm1025.c
index 111f0c86c933..e452d0daf906 100644
--- a/drivers/i2c/chips/adm1025.c
+++ b/drivers/i2c/chips/adm1025.c
@@ -45,7 +45,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -287,7 +286,9 @@ static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char
         struct adm1025_data *data = adm1025_update_device(dev);
         return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
 }
+/* in1_ref is deprecated in favour of cpu0_vid, remove after 2005-11-11 */
 static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
 static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -437,7 +438,9 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
         device_create_file(&new_client->dev, &dev_attr_temp2_max);
         device_create_file(&new_client->dev, &dev_attr_alarms);
+        /* in1_ref is deprecated, remove after 2005-11-11 */
         device_create_file(&new_client->dev, &dev_attr_in1_ref);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
         device_create_file(&new_client->dev, &dev_attr_vrm);
 
         /* Pin 11 is either in4 (+12V) or VID4 */
diff --git a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c
index b15fafe8f111..3c85fe150cd7 100644
--- a/drivers/i2c/chips/adm1026.c
+++ b/drivers/i2c/chips/adm1026.c
@@ -23,15 +23,14 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
-#include <linux/i2c-sysfs.h>
 #include <linux/i2c-vid.h>
+#include <linux/hwmon-sysfs.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
@@ -1225,8 +1224,9 @@ static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, c
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
 }
-
+/* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
 static DEVICE_ATTR(vid, S_IRUGO, show_vid_reg, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 
 static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -1666,7 +1666,9 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
         device_create_file(&new_client->dev, &dev_attr_temp1_crit_enable);
         device_create_file(&new_client->dev, &dev_attr_temp2_crit_enable);
         device_create_file(&new_client->dev, &dev_attr_temp3_crit_enable);
+        /* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
         device_create_file(&new_client->dev, &dev_attr_vid);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
         device_create_file(&new_client->dev, &dev_attr_vrm);
         device_create_file(&new_client->dev, &dev_attr_alarms);
         device_create_file(&new_client->dev, &dev_attr_alarm_mask);
diff --git a/drivers/i2c/chips/adm1031.c b/drivers/i2c/chips/adm1031.c
index 2163dba467c4..9168e983ca1d 100644
--- a/drivers/i2c/chips/adm1031.c
+++ b/drivers/i2c/chips/adm1031.c
@@ -440,7 +440,7 @@ pwm_reg(2);
 
 /*
  * That function checks the cases where the fan reading is not
- * relevent.  It is used to provide 0 as fan reading when the fan is
+ * relevant.  It is used to provide 0 as fan reading when the fan is
  * not supposed to run
  */
 static int trust_fan_readings(struct adm1031_data *data, int chan)
diff --git a/drivers/i2c/chips/adm9240.c b/drivers/i2c/chips/adm9240.c
new file mode 100644
index 000000000000..5c68e9c311aa
--- /dev/null
+++ b/drivers/i2c/chips/adm9240.c
@@ -0,0 +1,791 @@
+/*
+ * adm9240.c    Part of lm_sensors, Linux kernel modules for hardware
+ *              monitoring
+ *
+ * Copyright (C) 1999   Frodo Looijaard <frodol@dds.nl>
+ *                      Philip Edelbrock <phil@netroedge.com>
+ * Copyright (C) 2003   Michiel Rook <michiel@grendelproject.nl>
+ * Copyright (C) 2005   Grant Coady <gcoady@gmail.com> with valuable
+ *                              guidance from Jean Delvare
+ *
+ * Driver supports      Analog Devices          ADM9240
+ *                      Dallas Semiconductor    DS1780
+ *                      National Semiconductor  LM81
+ *
+ * ADM9240 is the reference, DS1780 and LM81 are register compatibles
+ *
+ * Voltage      Six inputs are scaled by chip, VID also reported
+ * Temperature  Chip temperature to 0.5'C, maximum and max_hysteris
+ * Fans         2 fans, low speed alarm, automatic fan clock divider
+ * Alarms       16-bit map of active alarms
+ * Analog Out   0..1250 mV output
+ *
+ * Chassis Intrusion: clear CI latch with 'echo 1 > chassis_clear'
+ *
+ * Test hardware: Intel SE440BX-2 desktop motherboard --Grant
+ *
+ * LM81 extended temp reading not implemented
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+#include <linux/i2c-vid.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
+                                        I2C_CLIENT_END };
+
+static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
+
+/* Insmod parameters */
+SENSORS_INSMOD_3(adm9240, ds1780, lm81);
+
+/* ADM9240 registers */
+#define ADM9240_REG_MAN_ID              0x3e
+#define ADM9240_REG_DIE_REV             0x3f
+#define ADM9240_REG_CONFIG              0x40
+
+#define ADM9240_REG_IN(nr)              (0x20 + (nr))   /* 0..5 */
+#define ADM9240_REG_IN_MAX(nr)          (0x2b + (nr) * 2)
+#define ADM9240_REG_IN_MIN(nr)          (0x2c + (nr) * 2)
+#define ADM9240_REG_FAN(nr)             (0x28 + (nr))   /* 0..1 */
+#define ADM9240_REG_FAN_MIN(nr)         (0x3b + (nr))
+#define ADM9240_REG_INT(nr)             (0x41 + (nr))
+#define ADM9240_REG_INT_MASK(nr)        (0x43 + (nr))
+#define ADM9240_REG_TEMP                0x27
+#define ADM9240_REG_TEMP_HIGH           0x39
+#define ADM9240_REG_TEMP_HYST           0x3a
+#define ADM9240_REG_ANALOG_OUT          0x19
+#define ADM9240_REG_CHASSIS_CLEAR       0x46
+#define ADM9240_REG_VID_FAN_DIV         0x47
+#define ADM9240_REG_I2C_ADDR            0x48
+#define ADM9240_REG_VID4                0x49
+#define ADM9240_REG_TEMP_CONF           0x4b
+
+/* generalised scaling with integer rounding */
+static inline int SCALE(long val, int mul, int div)
+{
+        if (val < 0)
+                return (val * mul - div / 2) / div;
+        else
+                return (val * mul + div / 2) / div;
+}
+
+/* adm9240 internally scales voltage measurements */
+static const u16 nom_mv[] = { 2500, 2700, 3300, 5000, 12000, 2700 };
+
+static inline unsigned int IN_FROM_REG(u8 reg, int n)
+{
+        return SCALE(reg, nom_mv[n], 192);
+}
+
+static inline u8 IN_TO_REG(unsigned long val, int n)
+{
+        return SENSORS_LIMIT(SCALE(val, 192, nom_mv[n]), 0, 255);
+}
+
+/* temperature range: -40..125, 127 disables temperature alarm */
+static inline s8 TEMP_TO_REG(long val)
+{
+        return SENSORS_LIMIT(SCALE(val, 1, 1000), -40, 127);
+}
+
+/* two fans, each with low fan speed limit */
+static inline unsigned int FAN_FROM_REG(u8 reg, u8 div)
+{
+        if (!reg) /* error */
+                return -1;
+
+        if (reg == 255)
+                return 0;
+
+        return SCALE(1350000, 1, reg * div);
+}
+
+/* analog out 0..1250mV */
+static inline u8 AOUT_TO_REG(unsigned long val)
+{
+        return SENSORS_LIMIT(SCALE(val, 255, 1250), 0, 255);
+}
+
+static inline unsigned int AOUT_FROM_REG(u8 reg)
+{
+        return SCALE(reg, 1250, 255);
+}
+
+static int adm9240_attach_adapter(struct i2c_adapter *adapter);
+static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind);
+static void adm9240_init_client(struct i2c_client *client);
+static int adm9240_detach_client(struct i2c_client *client);
+static struct adm9240_data *adm9240_update_device(struct device *dev);
+
+/* driver data */
+static struct i2c_driver adm9240_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "adm9240",
+        .id             = I2C_DRIVERID_ADM9240,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = adm9240_attach_adapter,
+        .detach_client  = adm9240_detach_client,
+};
+
+/* per client data */
+struct adm9240_data {
+        enum chips type;
+        struct i2c_client client;
+        struct semaphore update_lock;
+        char valid;
+        unsigned long last_updated_measure;
+        unsigned long last_updated_config;
+
+        u8 in[6];               /* ro   in0_input */
+        u8 in_max[6];           /* rw   in0_max */
+        u8 in_min[6];           /* rw   in0_min */
+        u8 fan[2];              /* ro   fan1_input */
+        u8 fan_min[2];          /* rw   fan1_min */
+        u8 fan_div[2];          /* rw   fan1_div, read-only accessor */
+        s16 temp;               /* ro   temp1_input, 9-bit sign-extended */
+        s8 temp_high;           /* rw   temp1_max */
+        s8 temp_hyst;           /* rw   temp1_max_hyst */
+        u16 alarms;             /* ro   alarms */
+        u8 aout;                /* rw   aout_output */
+        u8 vid;                 /* ro   vid */
+        u8 vrm;                 /* --   vrm set on startup, no accessor */
+};
+
+/* i2c byte read/write interface */
+static int adm9240_read_value(struct i2c_client *client, u8 reg)
+{
+        return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int adm9240_write_value(struct i2c_client *client, u8 reg, u8 value)
+{
+        return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+/*** sysfs accessors ***/
+
+/* temperature */
+#define show_temp(value, scale)                                 \
+static ssize_t show_##value(struct device *dev,                 \
+                            struct device_attribute *attr,      \
+                            char *buf)                          \
+{                                                               \
+        struct adm9240_data *data = adm9240_update_device(dev); \
+        return sprintf(buf, "%d\n", data->value * scale);       \
+}
+show_temp(temp_high, 1000);
+show_temp(temp_hyst, 1000);
+show_temp(temp, 500); /* 0.5'C per bit */
+
+#define set_temp(value, reg)                                    \
+static ssize_t set_##value(struct device *dev,                  \
+                           struct device_attribute *attr,       \
+                           const char *buf, size_t count)       \
+{                                                               \
+        struct i2c_client *client = to_i2c_client(dev);         \
+        struct adm9240_data *data = adm9240_update_device(dev); \
+        long temp = simple_strtoul(buf, NULL, 10);              \
+                                                                \
+        down(&data->update_lock);                               \
+        data->value = TEMP_TO_REG(temp);                        \
+        adm9240_write_value(client, reg, data->value);          \
+        up(&data->update_lock);                                 \
+        return count;                                           \
+}
+
+set_temp(temp_high, ADM9240_REG_TEMP_HIGH);
+set_temp(temp_hyst, ADM9240_REG_TEMP_HYST);
+
+static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,
+                show_temp_high, set_temp_high);
+static DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,
+                show_temp_hyst, set_temp_hyst);
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL);
+
+/* voltage */
+static ssize_t show_in(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr], nr));
+}
+
+static ssize_t show_in_min(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr], nr));
+}
+
+static ssize_t show_in_max(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr], nr));
+}
+
+static ssize_t set_in_min(struct device *dev, const char *buf,
+                size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_min[nr] = IN_TO_REG(val, nr);
+        adm9240_write_value(client, ADM9240_REG_IN_MIN(nr), data->in_min[nr]);
+        up(&data->update_lock);
+        return count;
+}
+
+static ssize_t set_in_max(struct device *dev, const char *buf,
+                size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_max[nr] = IN_TO_REG(val, nr);
+        adm9240_write_value(client, ADM9240_REG_IN_MAX(nr), data->in_max[nr]);
+        up(&data->update_lock);
+        return count;
+}
+
+#define show_in_offset(offset)                                          \
+static ssize_t show_in##offset(struct device *dev,                      \
+                               struct device_attribute *attr,           \
+                               char *buf)                               \
+{                                                                       \
+        return show_in(dev, buf, offset);                               \
+}                                                                       \
+static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); \
+static ssize_t show_in##offset##_min(struct device *dev,                \
+                                     struct device_attribute *attr,     \
+                                     char *buf)                         \
+{                                                                       \
+        return show_in_min(dev, buf, offset);                           \
+}                                                                       \
+static ssize_t show_in##offset##_max(struct device *dev,                \
+                                     struct device_attribute *attr,     \
+                                     char *buf)                         \
+{                                                                       \
+        return show_in_max(dev, buf, offset);                           \
+}                                                                       \
+static ssize_t                                                          \
+set_in##offset##_min(struct device *dev,                                \
+                     struct device_attribute *attr, const char *buf,    \
+                     size_t count)                                      \
+{                                                                       \
+        return set_in_min(dev, buf, count, offset);                     \
+}                                                                       \
+static ssize_t                                                          \
+set_in##offset##_max(struct device *dev,                                \
+                     struct device_attribute *attr, const char *buf,    \
+                     size_t count)                                      \
+{                                                                       \
+        return set_in_max(dev, buf, count, offset);                     \
+}                                                                       \
+static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,                 \
+                show_in##offset##_min, set_in##offset##_min);           \
+static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,                 \
+                show_in##offset##_max, set_in##offset##_max);
+
+show_in_offset(0);
+show_in_offset(1);
+show_in_offset(2);
+show_in_offset(3);
+show_in_offset(4);
+show_in_offset(5);
+
+/* fans */
+static ssize_t show_fan(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr],
+                                1 << data->fan_div[nr]));
+}
+
+static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[nr],
+                                1 << data->fan_div[nr]));
+}
+
+static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", 1 << data->fan_div[nr]);
+}
+
+/* write new fan div, callers must hold data->update_lock */
+static void adm9240_write_fan_div(struct i2c_client *client, int nr,
+                u8 fan_div)
+{
+        u8 reg, old, shift = (nr + 2) * 2;
+
+        reg = adm9240_read_value(client, ADM9240_REG_VID_FAN_DIV);
+        old = (reg >> shift) & 3;
+        reg &= ~(3 << shift);
+        reg |= (fan_div << shift);
+        adm9240_write_value(client, ADM9240_REG_VID_FAN_DIV, reg);
+        dev_dbg(&client->dev, "fan%d clock divider changed from %u "
+                        "to %u\n", nr + 1, 1 << old, 1 << fan_div);
+}
+
+/* 
+ * set fan speed low limit:
+ *
+ * - value is zero: disable fan speed low limit alarm
+ *
+ * - value is below fan speed measurement range: enable fan speed low
+ *   limit alarm to be asserted while fan speed too slow to measure
+ *
+ * - otherwise: select fan clock divider to suit fan speed low limit,
+ *   measurement code may adjust registers to ensure fan speed reading
+ */
+static ssize_t set_fan_min(struct device *dev, const char *buf,
+                size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        u8 new_div;
+
+        down(&data->update_lock);
+
+        if (!val) {
+                data->fan_min[nr] = 255;
+                new_div = data->fan_div[nr];
+
+                dev_dbg(&client->dev, "fan%u low limit set disabled\n",
+                                nr + 1);
+
+        } else if (val < 1350000 / (8 * 254)) {
+                new_div = 3;
+                data->fan_min[nr] = 254;
+
+                dev_dbg(&client->dev, "fan%u low limit set minimum %u\n",
+                                nr + 1, FAN_FROM_REG(254, 1 << new_div));
+
+        } else {
+                unsigned int new_min = 1350000 / val;
+
+                new_div = 0;
+                while (new_min > 192 && new_div < 3) {
+                        new_div++;
+                        new_min /= 2;
+                }
+                if (!new_min) /* keep > 0 */
+                        new_min++;
+
+                data->fan_min[nr] = new_min;
+
+                dev_dbg(&client->dev, "fan%u low limit set fan speed %u\n",
+                                nr + 1, FAN_FROM_REG(new_min, 1 << new_div));
+        }
+
+        if (new_div != data->fan_div[nr]) {
+                data->fan_div[nr] = new_div;
+                adm9240_write_fan_div(client, nr, new_div);
+        }
+        adm9240_write_value(client, ADM9240_REG_FAN_MIN(nr),
+                        data->fan_min[nr]);
+
+        up(&data->update_lock);
+        return count;
+}
+
+#define show_fan_offset(offset)                                         \
+static ssize_t show_fan_##offset (struct device *dev,                   \
+                                  struct device_attribute *attr,        \
+                                  char *buf)                            \
+{                                                                       \
+return show_fan(dev, buf, offset - 1);                                  \
+}                                                                       \
+static ssize_t show_fan_##offset##_div (struct device *dev,             \
+                                        struct device_attribute *attr,  \
+                                        char *buf)                      \
+{                                                                       \
+return show_fan_div(dev, buf, offset - 1);                              \
+}                                                                       \
+static ssize_t show_fan_##offset##_min (struct device *dev,             \
+                                        struct device_attribute *attr,  \
+                                        char *buf)                      \
+{                                                                       \
+return show_fan_min(dev, buf, offset - 1);                              \
+}                                                                       \
+static ssize_t set_fan_##offset##_min (struct device *dev,              \
+                                       struct device_attribute *attr,   \
+                                       const char *buf, size_t count)   \
+{                                                                       \
+return set_fan_min(dev, buf, count, offset - 1);                        \
+}                                                                       \
+static DEVICE_ATTR(fan##offset##_input, S_IRUGO,                        \
+                show_fan_##offset, NULL);                               \
+static DEVICE_ATTR(fan##offset##_div, S_IRUGO,                          \
+                show_fan_##offset##_div, NULL);                         \
+static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
+                show_fan_##offset##_min, set_fan_##offset##_min);
+
+show_fan_offset(1);
+show_fan_offset(2);
+
+/* alarms */
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%u\n", data->alarms);
+}
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+
+/* vid */
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
+}
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
+
+/* analog output */
+static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
+}
+
+static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->aout = AOUT_TO_REG(val);
+        adm9240_write_value(client, ADM9240_REG_ANALOG_OUT, data->aout);
+        up(&data->update_lock);
+        return count;
+}
+static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);
+
+/* chassis_clear */
+static ssize_t chassis_clear(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val = simple_strtol(buf, NULL, 10);
+
+        if (val == 1) {
+                adm9240_write_value(client, ADM9240_REG_CHASSIS_CLEAR, 0x80);
+                dev_dbg(&client->dev, "chassis intrusion latch cleared\n");
+        }
+        return count;
+}
+static DEVICE_ATTR(chassis_clear, S_IWUSR, NULL, chassis_clear);
+
+
+/*** sensor chip detect and driver install ***/
+
+static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *new_client;
+        struct adm9240_data *data;
+        int err = 0;
+        const char *name = "";
+        u8 man_id, die_rev;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        if (!(data = kmalloc(sizeof(struct adm9240_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+        memset(data, 0, sizeof(struct adm9240_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &adm9240_driver;
+        new_client->flags = 0;
+
+        if (kind == 0) {
+                kind = adm9240;
+        }
+
+        if (kind < 0) {
+
+                /* verify chip: reg address should match i2c address */
+                if (adm9240_read_value(new_client, ADM9240_REG_I2C_ADDR)
+                                != address) {
+                        dev_err(&adapter->dev, "detect fail: address match, "
+                                        "0x%02x\n", address);
+                        goto exit_free;
+                }
+
+                /* check known chip manufacturer */
+                man_id = adm9240_read_value(new_client, ADM9240_REG_MAN_ID);
+
+                if (man_id == 0x23) {
+                        kind = adm9240;
+                } else if (man_id == 0xda) {
+                        kind = ds1780;
+                } else if (man_id == 0x01) {
+                        kind = lm81;
+                } else {
+                        dev_err(&adapter->dev, "detect fail: unknown manuf, "
+                                        "0x%02x\n", man_id);
+                        goto exit_free;
+                }
+
+                /* successful detect, print chip info */
+                die_rev = adm9240_read_value(new_client, ADM9240_REG_DIE_REV);
+                dev_info(&adapter->dev, "found %s revision %u\n",
+                                man_id == 0x23 ? "ADM9240" :
+                                man_id == 0xda ? "DS1780" : "LM81", die_rev);
+        }
+
+        /* either forced or detected chip kind */
+        if (kind == adm9240) {
+                name = "adm9240";
+        } else if (kind == ds1780) {
+                name = "ds1780";
+        } else if (kind == lm81) {
+                name = "lm81";
+        }
+
+        /* fill in the remaining client fields and attach */
+        strlcpy(new_client->name, name, I2C_NAME_SIZE);
+        data->type = kind;
+        init_MUTEX(&data->update_lock);
+
+        if ((err = i2c_attach_client(new_client)))
+                goto exit_free;
+
+        adm9240_init_client(new_client);
+
+        /* populate sysfs filesystem */
+        device_create_file(&new_client->dev, &dev_attr_in0_input);
+        device_create_file(&new_client->dev, &dev_attr_in0_min);
+        device_create_file(&new_client->dev, &dev_attr_in0_max);
+        device_create_file(&new_client->dev, &dev_attr_in1_input);
+        device_create_file(&new_client->dev, &dev_attr_in1_min);
+        device_create_file(&new_client->dev, &dev_attr_in1_max);
+        device_create_file(&new_client->dev, &dev_attr_in2_input);
+        device_create_file(&new_client->dev, &dev_attr_in2_min);
+        device_create_file(&new_client->dev, &dev_attr_in2_max);
+        device_create_file(&new_client->dev, &dev_attr_in3_input);
+        device_create_file(&new_client->dev, &dev_attr_in3_min);
+        device_create_file(&new_client->dev, &dev_attr_in3_max);
+        device_create_file(&new_client->dev, &dev_attr_in4_input);
+        device_create_file(&new_client->dev, &dev_attr_in4_min);
+        device_create_file(&new_client->dev, &dev_attr_in4_max);
+        device_create_file(&new_client->dev, &dev_attr_in5_input);
+        device_create_file(&new_client->dev, &dev_attr_in5_min);
+        device_create_file(&new_client->dev, &dev_attr_in5_max);
+        device_create_file(&new_client->dev, &dev_attr_temp1_max);
+        device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
+        device_create_file(&new_client->dev, &dev_attr_temp1_input);
+        device_create_file(&new_client->dev, &dev_attr_fan1_input);
+        device_create_file(&new_client->dev, &dev_attr_fan1_div);
+        device_create_file(&new_client->dev, &dev_attr_fan1_min);
+        device_create_file(&new_client->dev, &dev_attr_fan2_input);
+        device_create_file(&new_client->dev, &dev_attr_fan2_div);
+        device_create_file(&new_client->dev, &dev_attr_fan2_min);
+        device_create_file(&new_client->dev, &dev_attr_alarms);
+        device_create_file(&new_client->dev, &dev_attr_aout_output);
+        device_create_file(&new_client->dev, &dev_attr_chassis_clear);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
+
+        return 0;
+exit_free:
+        kfree(new_client);
+exit:
+        return err;
+}
+
+static int adm9240_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_detect(adapter, &addr_data, adm9240_detect);
+}
+
+static int adm9240_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        if ((err = i2c_detach_client(client))) {
+                dev_err(&client->dev, "Client deregistration failed, "
+                                "client not detached.\n");
+                return err;
+        }
+
+        kfree(i2c_get_clientdata(client));
+        return 0;
+}
+
+static void adm9240_init_client(struct i2c_client *client)
+{
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG);
+        u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3;
+
+        data->vrm = i2c_which_vrm(); /* need this to report vid as mV */
+
+        dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
+                        data->vrm % 10);
+
+        if (conf & 1) { /* measurement cycle running: report state */
+
+                dev_info(&client->dev, "status: config 0x%02x mode %u\n",
+                                conf, mode);
+
+        } else { /* cold start: open limits before starting chip */
+                int i;
+
+                for (i = 0; i < 6; i++)
+                {
+                        adm9240_write_value(client,
+                                        ADM9240_REG_IN_MIN(i), 0);
+                        adm9240_write_value(client,
+                                        ADM9240_REG_IN_MAX(i), 255);
+                }
+                adm9240_write_value(client, ADM9240_REG_FAN_MIN(0), 255);
+                adm9240_write_value(client, ADM9240_REG_FAN_MIN(1), 255);
+                adm9240_write_value(client, ADM9240_REG_TEMP_HIGH, 127);
+                adm9240_write_value(client, ADM9240_REG_TEMP_HYST, 127);
+
+                /* start measurement cycle */
+                adm9240_write_value(client, ADM9240_REG_CONFIG, 1);
+
+                dev_info(&client->dev, "cold start: config was 0x%02x "
+                                "mode %u\n", conf, mode);
+        }
+}
+
+static struct adm9240_data *adm9240_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        int i;
+
+        down(&data->update_lock);
+
+        /* minimum measurement cycle: 1.75 seconds */
+        if (time_after(jiffies, data->last_updated_measure + (HZ * 7 / 4))
+                        || !data->valid) {
+
+                for (i = 0; i < 6; i++) /* read voltages */
+                {
+                        data->in[i] = adm9240_read_value(client,
+                                        ADM9240_REG_IN(i));
+                }
+                data->alarms = adm9240_read_value(client,
+                                        ADM9240_REG_INT(0)) |
+                                        adm9240_read_value(client,
+                                        ADM9240_REG_INT(1)) << 8;
+
+                /* read temperature: assume temperature changes less than
+                 * 0.5'C per two measurement cycles thus ignore possible
+                 * but unlikely aliasing error on lsb reading. --Grant */
+                data->temp = ((adm9240_read_value(client,
+                                        ADM9240_REG_TEMP) << 8) |
+                                        adm9240_read_value(client,
+                                        ADM9240_REG_TEMP_CONF)) / 128;
+
+                for (i = 0; i < 2; i++) /* read fans */
+                {
+                        data->fan[i] = adm9240_read_value(client,
+                                        ADM9240_REG_FAN(i));
+
+                        /* adjust fan clock divider on overflow */
+                        if (data->valid && data->fan[i] == 255 &&
+                                        data->fan_div[i] < 3) {
+
+                                adm9240_write_fan_div(client, i,
+                                                ++data->fan_div[i]);
+
+                                /* adjust fan_min if active, but not to 0 */
+                                if (data->fan_min[i] < 255 &&
+                                                data->fan_min[i] >= 2)
+                                        data->fan_min[i] /= 2;
+                        }
+                }
+                data->last_updated_measure = jiffies;
+        }
+
+        /* minimum config reading cycle: 300 seconds */
+        if (time_after(jiffies, data->last_updated_config + (HZ * 300))
+                        || !data->valid) {
+
+                for (i = 0; i < 6; i++)
+                {
+                        data->in_min[i] = adm9240_read_value(client,
+                                        ADM9240_REG_IN_MIN(i));
+                        data->in_max[i] = adm9240_read_value(client,
+                                        ADM9240_REG_IN_MAX(i));
+                }
+                for (i = 0; i < 2; i++)
+                {
+                        data->fan_min[i] = adm9240_read_value(client,
+                                        ADM9240_REG_FAN_MIN(i));
+                }
+                data->temp_high = adm9240_read_value(client,
+                                ADM9240_REG_TEMP_HIGH);
+                data->temp_hyst = adm9240_read_value(client,
+                                ADM9240_REG_TEMP_HYST);
+
+                /* read fan divs and 5-bit VID */
+                i = adm9240_read_value(client, ADM9240_REG_VID_FAN_DIV);
+                data->fan_div[0] = (i >> 4) & 3;
+                data->fan_div[1] = (i >> 6) & 3;
+                data->vid = i & 0x0f;
+                data->vid |= (adm9240_read_value(client,
+                                        ADM9240_REG_VID4) & 1) << 4;
+                /* read analog out */
+                data->aout = adm9240_read_value(client,
+                                ADM9240_REG_ANALOG_OUT);
+
+                data->last_updated_config = jiffies;
+                data->valid = 1;
+        }
+        up(&data->update_lock);
+        return data;
+}
+
+static int __init sensors_adm9240_init(void)
+{
+        return i2c_add_driver(&adm9240_driver);
+}
+
+static void __exit sensors_adm9240_exit(void)
+{
+        i2c_del_driver(&adm9240_driver);
+}
+
+MODULE_AUTHOR("Michiel Rook <michiel@grendelproject.nl>, "
+                "Grant Coady <gcoady@gmail.com> and others");
+MODULE_DESCRIPTION("ADM9240/DS1780/LM81 driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_adm9240_init);
+module_exit(sensors_adm9240_exit);
+
diff --git a/drivers/i2c/chips/asb100.c b/drivers/i2c/chips/asb100.c
index 4a47b4493e34..70d996d6fe0a 100644
--- a/drivers/i2c/chips/asb100.c
+++ b/drivers/i2c/chips/asb100.c
@@ -42,6 +42,7 @@
 #include <linux/i2c-sensor.h>
 #include <linux/i2c-vid.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include "lm75.h"
 
 /*
@@ -168,8 +169,6 @@ static int ASB100_PWM_FROM_REG(u8 reg)
         return reg * 16;
 }
 
-#define ALARMS_FROM_REG(val) (val)
-
 #define DIV_FROM_REG(val) (1 << (val))
 
 /* FAN DIV: 1, 2, 4, or 8 (defaults to 2)
@@ -556,7 +555,7 @@ device_create_file(&client->dev, &dev_attr_vrm);
 static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
-        return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
diff --git a/drivers/i2c/chips/atxp1.c b/drivers/i2c/chips/atxp1.c
new file mode 100644
index 000000000000..5c6597aa2c7f
--- /dev/null
+++ b/drivers/i2c/chips/atxp1.c
@@ -0,0 +1,361 @@
+/*
+    atxp1.c - kernel module for setting CPU VID and general purpose
+                     I/Os using the Attansic ATXP1 chip.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+#include <linux/i2c-vid.h>
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
+MODULE_VERSION("0.6.2");
+MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
+
+#define ATXP1_VID       0x00
+#define ATXP1_CVID      0x01
+#define ATXP1_GPIO1     0x06
+#define ATXP1_GPIO2     0x0a
+#define ATXP1_VIDENA    0x20
+#define ATXP1_VIDMASK   0x1f
+#define ATXP1_GPIO1MASK 0x0f
+
+static unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
+static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
+
+SENSORS_INSMOD_1(atxp1);
+
+static int atxp1_attach_adapter(struct i2c_adapter * adapter);
+static int atxp1_detach_client(struct i2c_client * client);
+static struct atxp1_data * atxp1_update_device(struct device *dev);
+static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind);
+
+static struct i2c_driver atxp1_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "atxp1",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = atxp1_attach_adapter,
+        .detach_client  = atxp1_detach_client,
+};
+
+struct atxp1_data {
+        struct i2c_client client;
+        struct semaphore update_lock;
+        unsigned long last_updated;
+        u8 valid;
+        struct {
+                u8 vid;         /* VID output register */
+                u8 cpu_vid; /* VID input from CPU */
+                u8 gpio1;   /* General purpose I/O register 1 */
+                u8 gpio2;   /* General purpose I/O register 2 */
+        } reg;
+        u8 vrm;                 /* Detected CPU VRM */
+};
+
+static struct atxp1_data * atxp1_update_device(struct device *dev)
+{
+        struct i2c_client *client;
+        struct atxp1_data *data;
+
+        client = to_i2c_client(dev);
+        data = i2c_get_clientdata(client);
+
+        down(&data->update_lock);
+
+        if ((jiffies - data->last_updated > HZ) ||
+            (jiffies < data->last_updated) ||
+            !data->valid) {
+
+                /* Update local register data */
+                data->reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID);
+                data->reg.cpu_vid = i2c_smbus_read_byte_data(client, ATXP1_CVID);
+                data->reg.gpio1 = i2c_smbus_read_byte_data(client, ATXP1_GPIO1);
+                data->reg.gpio2 = i2c_smbus_read_byte_data(client, ATXP1_GPIO2);
+
+                data->valid = 1;
+        }
+
+        up(&data->update_lock);
+
+        return(data);
+}
+
+/* sys file functions for cpu0_vid */
+static ssize_t atxp1_showvcore(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        int size;
+        struct atxp1_data *data;
+
+        data = atxp1_update_device(dev);
+
+        size = sprintf(buf, "%d\n", vid_from_reg(data->reg.vid & ATXP1_VIDMASK, data->vrm));
+
+        return size;
+}
+
+static ssize_t atxp1_storevcore(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct atxp1_data *data;
+        struct i2c_client *client;
+        char vid;
+        char cvid;
+        unsigned int vcore;
+
+        client = to_i2c_client(dev);
+        data = atxp1_update_device(dev);
+
+        vcore = simple_strtoul(buf, NULL, 10);
+        vcore /= 25;
+        vcore *= 25;
+
+        /* Calculate VID */
+        vid = vid_to_reg(vcore, data->vrm);
+
+        if (vid < 0) {
+                dev_err(dev, "VID calculation failed.\n");
+                return -1;
+        }
+
+        /* If output enabled, use control register value. Otherwise original CPU VID */
+        if (data->reg.vid & ATXP1_VIDENA)
+                cvid = data->reg.vid & ATXP1_VIDMASK;
+        else
+                cvid = data->reg.cpu_vid;
+
+        /* Nothing changed, aborting */
+        if (vid == cvid)
+                return count;
+
+        dev_info(dev, "Setting VCore to %d mV (0x%02x)\n", vcore, vid);
+
+        /* Write every 25 mV step to increase stability */
+        if (cvid > vid) {
+                for (; cvid >= vid; cvid--) {
+                        i2c_smbus_write_byte_data(client, ATXP1_VID, cvid | ATXP1_VIDENA);
+                }
+        }
+        else {
+                for (; cvid <= vid; cvid++) {
+                        i2c_smbus_write_byte_data(client, ATXP1_VID, cvid | ATXP1_VIDENA);
+                }
+        }
+
+        data->valid = 0;
+
+        return count;
+}
+
+/* CPU core reference voltage
+    unit: millivolt
+*/
+static DEVICE_ATTR(cpu0_vid, S_IRUGO | S_IWUSR, atxp1_showvcore, atxp1_storevcore);
+
+/* sys file functions for GPIO1 */
+static ssize_t atxp1_showgpio1(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        int size;
+        struct atxp1_data *data;
+
+        data = atxp1_update_device(dev);
+
+        size = sprintf(buf, "0x%02x\n", data->reg.gpio1 & ATXP1_GPIO1MASK);
+
+        return size;
+}
+
+static ssize_t atxp1_storegpio1(struct device *dev, struct device_attribute *attr, const char*buf, size_t count)
+{
+        struct atxp1_data *data;
+        struct i2c_client *client;
+        unsigned int value;
+
+        client = to_i2c_client(dev);
+        data = atxp1_update_device(dev);
+
+        value = simple_strtoul(buf, NULL, 16);
+
+        value &= ATXP1_GPIO1MASK;
+
+        if (value != (data->reg.gpio1 & ATXP1_GPIO1MASK)) {
+                dev_info(dev, "Writing 0x%x to GPIO1.\n", value);
+
+                i2c_smbus_write_byte_data(client, ATXP1_GPIO1, value);
+
+                data->valid = 0;
+        }
+
+        return count;
+}
+
+/* GPIO1 data register
+    unit: Four bit as hex (e.g. 0x0f)
+*/
+static DEVICE_ATTR(gpio1, S_IRUGO | S_IWUSR, atxp1_showgpio1, atxp1_storegpio1);
+
+/* sys file functions for GPIO2 */
+static ssize_t atxp1_showgpio2(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        int size;
+        struct atxp1_data *data;
+
+        data = atxp1_update_device(dev);
+
+        size = sprintf(buf, "0x%02x\n", data->reg.gpio2);
+
+        return size;
+}
+
+static ssize_t atxp1_storegpio2(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct atxp1_data *data;
+        struct i2c_client *client;
+        unsigned int value;
+
+        client = to_i2c_client(dev);
+        data = atxp1_update_device(dev);
+
+        value = simple_strtoul(buf, NULL, 16) & 0xff;
+
+        if (value != data->reg.gpio2) {
+                dev_info(dev, "Writing 0x%x to GPIO1.\n", value);
+
+                i2c_smbus_write_byte_data(client, ATXP1_GPIO2, value);
+
+                data->valid = 0;
+        }
+
+        return count;
+}
+
+/* GPIO2 data register
+    unit: Eight bit as hex (e.g. 0xff)
+*/
+static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
+
+
+static int atxp1_attach_adapter(struct i2c_adapter *adapter)
+{
+        return i2c_detect(adapter, &addr_data, &atxp1_detect);
+};
+
+static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client * new_client;
+        struct atxp1_data * data;
+        int err = 0;
+        u8 temp;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        if (!(data = kmalloc(sizeof(struct atxp1_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        memset(data, 0, sizeof(struct atxp1_data));
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &atxp1_driver;
+        new_client->flags = 0;
+
+        /* Detect ATXP1, checking if vendor ID registers are all zero */
+        if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) &&
+             (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) &&
+             (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) &&
+             (i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) {
+
+                /* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
+                 * showing the same as register 0x00 */
+                temp = i2c_smbus_read_byte_data(new_client, 0x00);
+
+                if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
+                         (i2c_smbus_read_byte_data(new_client, 0x11) == temp) ))
+                        goto exit_free;
+        }
+
+        /* Get VRM */
+        data->vrm = i2c_which_vrm();
+
+        if ((data->vrm != 90) && (data->vrm != 91)) {
+                dev_err(&new_client->dev, "Not supporting VRM %d.%d\n",
+                                data->vrm / 10, data->vrm % 10);
+                goto exit_free;
+        }
+
+        strncpy(new_client->name, "atxp1", I2C_NAME_SIZE);
+
+        data->valid = 0;
+
+        init_MUTEX(&data->update_lock);
+
+        err = i2c_attach_client(new_client);
+
+        if (err)
+        {
+                dev_err(&new_client->dev, "Attach client error.\n");
+                goto exit_free;
+        }
+
+        device_create_file(&new_client->dev, &dev_attr_gpio1);
+        device_create_file(&new_client->dev, &dev_attr_gpio2);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
+
+        dev_info(&new_client->dev, "Using VRM: %d.%d\n",
+                         data->vrm / 10, data->vrm % 10);
+
+        return 0;
+
+exit_free:
+        kfree(data);
+exit:
+        return err;
+};
+
+static int atxp1_detach_client(struct i2c_client * client)
+{
+        int err;
+
+        err = i2c_detach_client(client);
+
+        if (err)
+                dev_err(&client->dev, "Failed to detach client.\n");
+        else
+                kfree(i2c_get_clientdata(client));
+
+        return err;
+};
+
+static int __init atxp1_init(void)
+{
+        return i2c_add_driver(&atxp1_driver);
+};
+
+static void __exit atxp1_exit(void)
+{
+        i2c_del_driver(&atxp1_driver);
+};
+
+module_init(atxp1_init);
+module_exit(atxp1_exit);
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 07f16c3fb084..74ece8ac1c23 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -3,17 +3,16 @@
  *
  *  Copyright (C) 2005 James Chapman <jchapman@katalix.com>
  *
- *      based on linux/drivers/acron/char/pcf8583.c
+ *      based on linux/drivers/acorn/char/pcf8583.c
  *  Copyright (C) 2000 Russell King
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
- * Driver for Dallas Semiconductor DS1337 real time clock chip
+ * Driver for Dallas Semiconductor DS1337 and DS1339 real time clock chip
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -69,13 +68,11 @@ static struct i2c_driver ds1337_driver = {
 struct ds1337_data {
         struct i2c_client client;
         struct list_head list;
-        int id;
 };
 
 /*
  * Internal variables
  */
-static int ds1337_id;
 static LIST_HEAD(ds1337_clients);
 
 static inline int ds1337_read(struct i2c_client *client, u8 reg, u8 *value)
@@ -95,7 +92,6 @@ static inline int ds1337_read(struct i2c_client *client, u8 reg, u8 *value)
  */
 static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
 {
-        struct ds1337_data *data = i2c_get_clientdata(client);
         int result;
         u8 buf[7];
         u8 val;
@@ -103,9 +99,7 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
         u8 offs = 0;
 
         if (!dt) {
-                dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n",
-                        __FUNCTION__);
-
+                dev_dbg(&client->dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__);
                 return -EINVAL;
         }
 
@@ -119,98 +113,86 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
         msg[1].len = sizeof(buf);
         msg[1].buf = &buf[0];
 
-        result = client->adapter->algo->master_xfer(client->adapter,
-                                                    &msg[0], 2);
+        result = i2c_transfer(client->adapter, msg, 2);
 
-        dev_dbg(&client->adapter->dev,
-                "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n",
+        dev_dbg(&client->dev, "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n",
                 __FUNCTION__, result, buf[0], buf[1], buf[2], buf[3],
                 buf[4], buf[5], buf[6]);
 
-        if (result >= 0) {
-                dt->tm_sec = BCD_TO_BIN(buf[0]);
-                dt->tm_min = BCD_TO_BIN(buf[1]);
+        if (result == 2) {
+                dt->tm_sec = BCD2BIN(buf[0]);
+                dt->tm_min = BCD2BIN(buf[1]);
                 val = buf[2] & 0x3f;
-                dt->tm_hour = BCD_TO_BIN(val);
-                dt->tm_wday = BCD_TO_BIN(buf[3]) - 1;
-                dt->tm_mday = BCD_TO_BIN(buf[4]);
+                dt->tm_hour = BCD2BIN(val);
+                dt->tm_wday = BCD2BIN(buf[3]) - 1;
+                dt->tm_mday = BCD2BIN(buf[4]);
                 val = buf[5] & 0x7f;
-                dt->tm_mon = BCD_TO_BIN(val);
-                dt->tm_year = 1900 + BCD_TO_BIN(buf[6]);
+                dt->tm_mon = BCD2BIN(val) - 1;
+                dt->tm_year = BCD2BIN(buf[6]);
                 if (buf[5] & 0x80)
                         dt->tm_year += 100;
 
-                dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, "
+                dev_dbg(&client->dev, "%s: secs=%d, mins=%d, "
                         "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n",
                         __FUNCTION__, dt->tm_sec, dt->tm_min,
                         dt->tm_hour, dt->tm_mday,
                         dt->tm_mon, dt->tm_year, dt->tm_wday);
-        } else {
-                dev_err(&client->adapter->dev, "ds1337[%d]: error reading "
-                        "data! %d\n", data->id, result);
-                result = -EIO;
+
+                return 0;
         }
 
-        return result;
+        dev_err(&client->dev, "error reading data! %d\n", result);
+        return -EIO;
 }
 
 static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
 {
-        struct ds1337_data *data = i2c_get_clientdata(client);
         int result;
         u8 buf[8];
         u8 val;
         struct i2c_msg msg[1];
 
         if (!dt) {
-                dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n",
-                        __FUNCTION__);
-
+                dev_dbg(&client->dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__);
                 return -EINVAL;
         }
 
-        dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, hours=%d, "
+        dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n", __FUNCTION__,
                 dt->tm_sec, dt->tm_min, dt->tm_hour,
                 dt->tm_mday, dt->tm_mon, dt->tm_year, dt->tm_wday);
 
         buf[0] = 0;             /* reg offset */
-        buf[1] = BIN_TO_BCD(dt->tm_sec);
-        buf[2] = BIN_TO_BCD(dt->tm_min);
-        buf[3] = BIN_TO_BCD(dt->tm_hour) | (1 << 6);
-        buf[4] = BIN_TO_BCD(dt->tm_wday) + 1;
-        buf[5] = BIN_TO_BCD(dt->tm_mday);
-        buf[6] = BIN_TO_BCD(dt->tm_mon);
-        if (dt->tm_year >= 2000) {
-                val = dt->tm_year - 2000;
+        buf[1] = BIN2BCD(dt->tm_sec);
+        buf[2] = BIN2BCD(dt->tm_min);
+        buf[3] = BIN2BCD(dt->tm_hour) | (1 << 6);
+        buf[4] = BIN2BCD(dt->tm_wday) + 1;
+        buf[5] = BIN2BCD(dt->tm_mday);
+        buf[6] = BIN2BCD(dt->tm_mon) + 1;
+        val = dt->tm_year;
+        if (val >= 100) {
+                val -= 100;
                 buf[6] |= (1 << 7);
-        } else {
-                val = dt->tm_year - 1900;
         }
-        buf[7] = BIN_TO_BCD(val);
+        buf[7] = BIN2BCD(val);
 
         msg[0].addr = client->addr;
         msg[0].flags = 0;
         msg[0].len = sizeof(buf);
         msg[0].buf = &buf[0];
 
-        result = client->adapter->algo->master_xfer(client->adapter,
-                                                    &msg[0], 1);
-        if (result < 0) {
-                dev_err(&client->adapter->dev, "ds1337[%d]: error "
-                        "writing data! %d\n", data->id, result);
-                result = -EIO;
-        } else {
-                result = 0;
-        }
+        result = i2c_transfer(client->adapter, msg, 1);
+        if (result == 1)
+                return 0;
 
-        return result;
+        dev_err(&client->dev, "error writing data! %d\n", result);
+        return -EIO;
 }
 
 static int ds1337_command(struct i2c_client *client, unsigned int cmd,
                           void *arg)
 {
-        dev_dbg(&client->adapter->dev, "%s: cmd=%d\n", __FUNCTION__, cmd);
+        dev_dbg(&client->dev, "%s: cmd=%d\n", __FUNCTION__, cmd);
 
         switch (cmd) {
         case DS1337_GET_DATE:
@@ -228,7 +210,7 @@ static int ds1337_command(struct i2c_client *client, unsigned int cmd,
  * Public API for access to specific device. Useful for low-level
  * RTC access from kernel code.
  */
-int ds1337_do_command(int id, int cmd, void *arg)
+int ds1337_do_command(int bus, int cmd, void *arg)
 {
         struct list_head *walk;
         struct list_head *tmp;
@@ -236,7 +218,7 @@ int ds1337_do_command(int id, int cmd, void *arg)
 
         list_for_each_safe(walk, tmp, &ds1337_clients) {
                 data = list_entry(walk, struct ds1337_data, list);
-                if (data->id == id)
+                if (data->client.adapter->nr == bus)
                         return ds1337_command(&data->client, cmd, arg);
         }
 
@@ -346,7 +328,6 @@ static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind)
         ds1337_init_client(new_client);
 
         /* Add client to local list */
-        data->id = ds1337_id++;
         list_add(&data->list, &ds1337_clients);
 
         return 0;
@@ -398,5 +379,7 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
 MODULE_DESCRIPTION("DS1337 RTC driver");
 MODULE_LICENSE("GPL");
 
+EXPORT_SYMBOL_GPL(ds1337_do_command);
+
 module_init(ds1337_init);
 module_exit(ds1337_exit);
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
new file mode 100644
index 000000000000..a445736d8838
--- /dev/null
+++ b/drivers/i2c/chips/ds1374.c
@@ -0,0 +1,260 @@
+/*
+ * drivers/i2c/chips/ds1374.c
+ *
+ * I2C client/driver for the Maxim/Dallas DS1374 Real-Time Clock
+ *
+ * Author: Randy Vinson <rvinson@mvista.com>
+ *
+ * Based on the m41t00.c by Mark Greer <mgreer@mvista.com>
+ *
+ * 2005 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+/*
+ * This i2c client/driver wedges between the drivers/char/genrtc.c RTC
+ * interface and the SMBus interface of the i2c subsystem.
+ * It would be more efficient to use i2c msgs/i2c_transfer directly but, as
+ * recommened in .../Documentation/i2c/writing-clients section
+ * "Sending and receiving", using SMBus level communication is preferred.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+
+#define DS1374_REG_TOD0         0x00
+#define DS1374_REG_TOD1         0x01
+#define DS1374_REG_TOD2         0x02
+#define DS1374_REG_TOD3         0x03
+#define DS1374_REG_WDALM0       0x04
+#define DS1374_REG_WDALM1       0x05
+#define DS1374_REG_WDALM2       0x06
+#define DS1374_REG_CR           0x07
+#define DS1374_REG_SR           0x08
+#define DS1374_REG_SR_OSF       0x80
+#define DS1374_REG_TCR          0x09
+
+#define DS1374_DRV_NAME         "ds1374"
+
+static DECLARE_MUTEX(ds1374_mutex);
+
+static struct i2c_driver ds1374_driver;
+static struct i2c_client *save_client;
+
+static unsigned short ignore[] = { I2C_CLIENT_END };
+static unsigned short normal_addr[] = { 0x68, I2C_CLIENT_END };
+
+static struct i2c_client_address_data addr_data = {
+        .normal_i2c = normal_addr,
+        .probe = ignore,
+        .ignore = ignore,
+        .force = ignore,
+};
+
+static ulong ds1374_read_rtc(void)
+{
+        ulong time = 0;
+        int reg = DS1374_REG_WDALM0;
+
+        while (reg--) {
+                s32 tmp;
+                if ((tmp = i2c_smbus_read_byte_data(save_client, reg)) < 0) {
+                        dev_warn(&save_client->dev,
+                                 "can't read from rtc chip\n");
+                        return 0;
+                }
+                time = (time << 8) | (tmp & 0xff);
+        }
+        return time;
+}
+
+static void ds1374_write_rtc(ulong time)
+{
+        int reg;
+
+        for (reg = DS1374_REG_TOD0; reg < DS1374_REG_WDALM0; reg++) {
+                if (i2c_smbus_write_byte_data(save_client, reg, time & 0xff)
+                    < 0) {
+                        dev_warn(&save_client->dev,
+                                 "can't write to rtc chip\n");
+                        break;
+                }
+                time = time >> 8;
+        }
+}
+
+static void ds1374_check_rtc_status(void)
+{
+        s32 tmp;
+
+        tmp = i2c_smbus_read_byte_data(save_client, DS1374_REG_SR);
+        if (tmp < 0) {
+                dev_warn(&save_client->dev,
+                         "can't read status from rtc chip\n");
+                return;
+        }
+        if (tmp & DS1374_REG_SR_OSF) {
+                dev_warn(&save_client->dev,
+                         "oscillator discontinuity flagged, time unreliable\n");
+                tmp &= ~DS1374_REG_SR_OSF;
+                tmp = i2c_smbus_write_byte_data(save_client, DS1374_REG_SR,
+                                                tmp & 0xff);
+                if (tmp < 0)
+                        dev_warn(&save_client->dev,
+                                 "can't clear discontinuity notification\n");
+        }
+}
+
+ulong ds1374_get_rtc_time(void)
+{
+        ulong t1, t2;
+        int limit = 10;         /* arbitrary retry limit */
+
+        down(&ds1374_mutex);
+
+        /*
+         * Since the reads are being performed one byte at a time using
+         * the SMBus vs a 4-byte i2c transfer, there is a chance that a
+         * carry will occur during the read. To detect this, 2 reads are
+         * performed and compared.
+         */
+        do {
+                t1 = ds1374_read_rtc();
+                t2 = ds1374_read_rtc();
+        } while (t1 != t2 && limit--);
+
+        up(&ds1374_mutex);
+
+        if (t1 != t2) {
+                dev_warn(&save_client->dev,
+                         "can't get consistent time from rtc chip\n");
+                t1 = 0;
+        }
+
+        return t1;
+}
+
+static void ds1374_set_tlet(ulong arg)
+{
+        ulong t1, t2;
+        int limit = 10;         /* arbitrary retry limit */
+
+        t1 = *(ulong *) arg;
+
+        down(&ds1374_mutex);
+
+        /*
+         * Since the writes are being performed one byte at a time using
+         * the SMBus vs a 4-byte i2c transfer, there is a chance that a
+         * carry will occur during the write. To detect this, the write
+         * value is read back and compared.
+         */
+        do {
+                ds1374_write_rtc(t1);
+                t2 = ds1374_read_rtc();
+        } while (t1 != t2 && limit--);
+
+        up(&ds1374_mutex);
+
+        if (t1 != t2)
+                dev_warn(&save_client->dev,
+                         "can't confirm time set from rtc chip\n");
+}
+
+ulong new_time;
+
+DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet, (ulong) & new_time);
+
+int ds1374_set_rtc_time(ulong nowtime)
+{
+        new_time = nowtime;
+
+        if (in_interrupt())
+                tasklet_schedule(&ds1374_tasklet);
+        else
+                ds1374_set_tlet((ulong) & new_time);
+
+        return 0;
+}
+
+/*
+ *****************************************************************************
+ *
+ *      Driver Interface
+ *
+ *****************************************************************************
+ */
+static int ds1374_probe(struct i2c_adapter *adap, int addr, int kind)
+{
+        struct i2c_client *client;
+        int rc;
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!client)
+                return -ENOMEM;
+
+        memset(client, 0, sizeof(struct i2c_client));
+        strncpy(client->name, DS1374_DRV_NAME, I2C_NAME_SIZE);
+        client->flags = I2C_DF_NOTIFY;
+        client->addr = addr;
+        client->adapter = adap;
+        client->driver = &ds1374_driver;
+
+        if ((rc = i2c_attach_client(client)) != 0) {
+                kfree(client);
+                return rc;
+        }
+
+        save_client = client;
+
+        ds1374_check_rtc_status();
+
+        return 0;
+}
+
+static int ds1374_attach(struct i2c_adapter *adap)
+{
+        return i2c_probe(adap, &addr_data, ds1374_probe);
+}
+
+static int ds1374_detach(struct i2c_client *client)
+{
+        int rc;
+
+        if ((rc = i2c_detach_client(client)) == 0) {
+                kfree(i2c_get_clientdata(client));
+                tasklet_kill(&ds1374_tasklet);
+        }
+        return rc;
+}
+
+static struct i2c_driver ds1374_driver = {
+        .owner = THIS_MODULE,
+        .name = DS1374_DRV_NAME,
+        .id = I2C_DRIVERID_DS1374,
+        .flags = I2C_DF_NOTIFY,
+        .attach_adapter = ds1374_attach,
+        .detach_client = ds1374_detach,
+};
+
+static int __init ds1374_init(void)
+{
+        return i2c_add_driver(&ds1374_driver);
+}
+
+static void __exit ds1374_exit(void)
+{
+        i2c_del_driver(&ds1374_driver);
+}
+
+module_init(ds1374_init);
+module_exit(ds1374_exit);
+
+MODULE_AUTHOR("Randy Vinson <rvinson@mvista.com>");
+MODULE_DESCRIPTION("Maxim/Dallas DS1374 RTC I2C Client Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/chips/ds1621.c b/drivers/i2c/chips/ds1621.c
index 4ae15bd5dcfb..5360d58804f6 100644
--- a/drivers/i2c/chips/ds1621.c
+++ b/drivers/i2c/chips/ds1621.c
@@ -121,7 +121,7 @@ static int ds1621_write_value(struct i2c_client *client, u8 reg, u16 value)
 static void ds1621_init_client(struct i2c_client *client)
 {
         int reg = ds1621_read_value(client, DS1621_REG_CONF);
-        /* switch to continous conversion mode */
+        /* switch to continuous conversion mode */
         reg &= ~ DS1621_REG_CONFIG_1SHOT;
 
         /* setup output polarity */
@@ -303,7 +303,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
                 data->temp_max = ds1621_read_value(client,
                                                     DS1621_REG_TEMP_MAX);
 
-                /* reset alarms if neccessary */
+                /* reset alarms if necessary */
                 new_conf = data->conf;
                 if (data->temp < data->temp_min)
                         new_conf &= ~DS1621_ALARM_TEMP_LOW;
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index cbdfa2db6f7c..addf0adc24d4 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -26,7 +26,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/chips/fscher.c b/drivers/i2c/chips/fscher.c
index c3f37dbec11a..da411741c2c5 100644
--- a/drivers/i2c/chips/fscher.c
+++ b/drivers/i2c/chips/fscher.c
@@ -26,7 +26,6 @@
  *  and Philip Edelbrock <phil@netroedge.com>
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c
index 4316a1562251..6bedf729dcf5 100644
--- a/drivers/i2c/chips/gl518sm.c
+++ b/drivers/i2c/chips/gl518sm.c
@@ -36,7 +36,6 @@
  * 2004-01-31  Code review and approval. (Jean Delvare)
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 7f29a8aff165..354a26295672 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -145,7 +145,6 @@ static inline void notresponding(struct isp1301 *isp)
 static unsigned short normal_i2c[] = {
         ISP_BASE, ISP_BASE + 1,
         I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD;
 
diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
index 007bdf9e7e2a..db20c9e47393 100644
--- a/drivers/i2c/chips/it87.c
+++ b/drivers/i2c/chips/it87.c
@@ -31,7 +31,6 @@
     type at module load time.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -39,6 +38,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/i2c-vid.h>
+#include <linux/hwmon-sysfs.h>
 #include <asm/io.h>
 
 
@@ -173,8 +173,6 @@ static inline u8 FAN_TO_REG(long rpm, int div)
                                         ((val)+500)/1000),-128,127))
 #define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*1000)
 
-#define ALARMS_FROM_REG(val) (val)
-
 #define PWM_TO_REG(val)   ((val) >> 1)
 #define PWM_FROM_REG(val) (((val)&0x7f) << 1)
 
@@ -241,27 +239,42 @@ static struct i2c_driver it87_driver = {
         .detach_client  = it87_detach_client,
 };
 
-static ssize_t show_in(struct device *dev, char *buf, int nr)
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr]));
 }
 
-static ssize_t show_in_min(struct device *dev, char *buf, int nr)
+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr]));
 }
 
-static ssize_t show_in_max(struct device *dev, char *buf, int nr)
+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr]));
 }
 
-static ssize_t set_in_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
@@ -273,9 +286,12 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_in_max(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
@@ -289,38 +305,14 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 }
 
 #define show_in_offset(offset)                                  \
-static ssize_t                                                  \
-        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
-{                                                               \
-        return show_in(dev, buf, offset);                       \
-}                                                               \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,          \
+                show_in, NULL, offset);
 
 #define limit_in_offset(offset)                                 \
-static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
-{                                                               \
-        return show_in_min(dev, buf, offset);                   \
-}                                                               \
-static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
-{                                                               \
-        return show_in_max(dev, buf, offset);                   \
-}                                                               \
-static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr,         \
-                const char *buf, size_t count)                  \
-{                                                               \
-        return set_in_min(dev, buf, count, offset);             \
-}                                                               \
-static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
-                        const char *buf, size_t count)          \
-{                                                               \
-        return set_in_max(dev, buf, count, offset);             \
-}                                                               \
-static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,         \
-                show_in##offset##_min, set_in##offset##_min);   \
-static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,         \
-                show_in##offset##_max, set_in##offset##_max);
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,  \
+                show_in_min, set_in_min, offset);               \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,  \
+                show_in_max, set_in_max, offset);
 
 show_in_offset(0);
 limit_in_offset(0);
@@ -341,24 +333,39 @@ limit_in_offset(7);
 show_in_offset(8);
 
 /* 3 temperatures */
-static ssize_t show_temp(struct device *dev, char *buf, int nr)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
 }
-static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr]));
 }
-static ssize_t show_temp_min(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[nr]));
 }
-static ssize_t set_temp_max(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -369,9 +376,12 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_temp_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -383,42 +393,23 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
         return count;
 }
 #define show_temp_offset(offset)                                        \
-static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
-{                                                                       \
-        return show_temp(dev, buf, offset - 1);                         \
-}                                                                       \
-static ssize_t                                                          \
-show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)         \
-{                                                                       \
-        return show_temp_max(dev, buf, offset - 1);                     \
-}                                                                       \
-static ssize_t                                                          \
-show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)         \
-{                                                                       \
-        return show_temp_min(dev, buf, offset - 1);                     \
-}                                                                       \
-static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr,              \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_temp_max(dev, buf, count, offset - 1);               \
-}                                                                       \
-static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr,              \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_temp_min(dev, buf, count, offset - 1);               \
-}                                                                       \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \
-static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,               \
-                show_temp_##offset##_max, set_temp_##offset##_max);     \
-static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,               \
-                show_temp_##offset##_min, set_temp_##offset##_min);     
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,                \
+                show_temp, NULL, offset - 1);                           \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,        \
+                show_temp_max, set_temp_max, offset - 1);               \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,        \
+                show_temp_min, set_temp_min, offset - 1);
 
 show_temp_offset(1);
 show_temp_offset(2);
 show_temp_offset(3);
 
-static ssize_t show_sensor(struct device *dev, char *buf, int nr)
+static ssize_t show_sensor(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         u8 reg = data->sensor; /* In case the value is updated while we use it */
         
@@ -428,9 +419,12 @@ static ssize_t show_sensor(struct device *dev, char *buf, int nr)
                 return sprintf(buf, "2\n");  /* thermistor */
         return sprintf(buf, "0\n");      /* disabled */
 }
-static ssize_t set_sensor(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_sensor(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -453,53 +447,67 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
         return count;
 }
 #define show_sensor_offset(offset)                                      \
-static ssize_t show_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf)      \
-{                                                                       \
-        return show_sensor(dev, buf, offset - 1);                       \
-}                                                                       \
-static ssize_t set_sensor_##offset (struct device *dev, struct device_attribute *attr,          \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_sensor(dev, buf, count, offset - 1);                 \
-}                                                                       \
-static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR,              \
-                show_sensor_##offset, set_sensor_##offset);
+static SENSOR_DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR,       \
+                show_sensor, set_sensor, offset - 1);
 
 show_sensor_offset(1);
 show_sensor_offset(2);
 show_sensor_offset(3);
 
 /* 3 Fans */
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr], 
                                 DIV_FROM_REG(data->fan_div[nr])));
 }
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n",
                 FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])));
 }
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]));
 }
-static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n", (data->fan_main_ctrl & (1 << nr)) ? 1 : 0);
 }
-static ssize_t show_pwm(struct device *dev, char *buf, int nr)
+static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n", data->manual_pwm_ctl[nr]);
 }
-static ssize_t set_fan_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -510,9 +518,12 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_fan_div(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -550,9 +561,12 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_pwm_enable(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_pwm_enable(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -581,9 +595,12 @@ static ssize_t set_pwm_enable(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_pwm(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -599,64 +616,23 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
         return count;
 }
 
-#define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{                                                                       \
-        return show_fan(dev, buf, offset - 1);                          \
-}                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
-{                                                                       \
-        return show_fan_min(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
-{                                                                       \
-        return show_fan_div(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
-        const char *buf, size_t count)                                  \
-{                                                                       \
-        return set_fan_min(dev, buf, count, offset - 1);                \
-}                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr,               \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_fan_div(dev, buf, count, offset - 1);                \
-}                                                                       \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL); \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
-                show_fan_##offset##_min, set_fan_##offset##_min);       \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,                \
-                show_fan_##offset##_div, set_fan_##offset##_div);
+#define show_fan_offset(offset)                                 \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,         \
+                show_fan, NULL, offset - 1);                    \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                show_fan_min, set_fan_min, offset - 1);         \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
+                show_fan_div, set_fan_div, offset - 1);
 
 show_fan_offset(1);
 show_fan_offset(2);
 show_fan_offset(3);
 
 #define show_pwm_offset(offset)                                         \
-static ssize_t show_pwm##offset##_enable (struct device *dev, struct device_attribute *attr,            \
-        char *buf)                                                      \
-{                                                                       \
-        return show_pwm_enable(dev, buf, offset - 1);                   \
-}                                                                       \
-static ssize_t show_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
-{                                                                       \
-        return show_pwm(dev, buf, offset - 1);                          \
-}                                                                       \
-static ssize_t set_pwm##offset##_enable (struct device *dev, struct device_attribute *attr,             \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_pwm_enable(dev, buf, count, offset - 1);             \
-}                                                                       \
-static ssize_t set_pwm##offset (struct device *dev, struct device_attribute *attr,                      \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_pwm(dev, buf, count, offset - 1);                    \
-}                                                                       \
-static DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,             \
-                show_pwm##offset##_enable,                              \
-                set_pwm##offset##_enable);                              \
-static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,                      \
-                show_pwm##offset , set_pwm##offset );
+static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,      \
+                show_pwm_enable, set_pwm_enable, offset - 1);           \
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,               \
+                show_pwm, set_pwm, offset - 1);
 
 show_pwm_offset(1);
 show_pwm_offset(2);
@@ -666,7 +642,7 @@ show_pwm_offset(3);
 static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct it87_data *data = it87_update_device(dev);
-        return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
@@ -864,60 +840,60 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         it87_init_client(new_client, data);
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_in0_input);
-        device_create_file(&new_client->dev, &dev_attr_in1_input);
-        device_create_file(&new_client->dev, &dev_attr_in2_input);
-        device_create_file(&new_client->dev, &dev_attr_in3_input);
-        device_create_file(&new_client->dev, &dev_attr_in4_input);
-        device_create_file(&new_client->dev, &dev_attr_in5_input);
-        device_create_file(&new_client->dev, &dev_attr_in6_input);
-        device_create_file(&new_client->dev, &dev_attr_in7_input);
-        device_create_file(&new_client->dev, &dev_attr_in8_input);
-        device_create_file(&new_client->dev, &dev_attr_in0_min);
-        device_create_file(&new_client->dev, &dev_attr_in1_min);
-        device_create_file(&new_client->dev, &dev_attr_in2_min);
-        device_create_file(&new_client->dev, &dev_attr_in3_min);
-        device_create_file(&new_client->dev, &dev_attr_in4_min);
-        device_create_file(&new_client->dev, &dev_attr_in5_min);
-        device_create_file(&new_client->dev, &dev_attr_in6_min);
-        device_create_file(&new_client->dev, &dev_attr_in7_min);
-        device_create_file(&new_client->dev, &dev_attr_in0_max);
-        device_create_file(&new_client->dev, &dev_attr_in1_max);
-        device_create_file(&new_client->dev, &dev_attr_in2_max);
-        device_create_file(&new_client->dev, &dev_attr_in3_max);
-        device_create_file(&new_client->dev, &dev_attr_in4_max);
-        device_create_file(&new_client->dev, &dev_attr_in5_max);
-        device_create_file(&new_client->dev, &dev_attr_in6_max);
-        device_create_file(&new_client->dev, &dev_attr_in7_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp3_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp3_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_min);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp3_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_type);
-        device_create_file(&new_client->dev, &dev_attr_temp2_type);
-        device_create_file(&new_client->dev, &dev_attr_temp3_type);
-        device_create_file(&new_client->dev, &dev_attr_fan1_input);
-        device_create_file(&new_client->dev, &dev_attr_fan2_input);
-        device_create_file(&new_client->dev, &dev_attr_fan3_input);
-        device_create_file(&new_client->dev, &dev_attr_fan1_min);
-        device_create_file(&new_client->dev, &dev_attr_fan2_min);
-        device_create_file(&new_client->dev, &dev_attr_fan3_min);
-        device_create_file(&new_client->dev, &dev_attr_fan1_div);
-        device_create_file(&new_client->dev, &dev_attr_fan2_div);
-        device_create_file(&new_client->dev, &dev_attr_fan3_div);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_type.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_type.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_type.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_div.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
         if (enable_pwm_interface) {
-                device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
-                device_create_file(&new_client->dev, &dev_attr_pwm2_enable);
-                device_create_file(&new_client->dev, &dev_attr_pwm3_enable);
-                device_create_file(&new_client->dev, &dev_attr_pwm1);
-                device_create_file(&new_client->dev, &dev_attr_pwm2);
-                device_create_file(&new_client->dev, &dev_attr_pwm3);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm1_enable.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm2_enable.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm3_enable.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm1.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm2.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm3.dev_attr);
         }
 
         if (data->type == it8712) {
@@ -954,7 +930,7 @@ static int it87_detach_client(struct i2c_client *client)
         return 0;
 }
 
-/* The SMBus locks itself, but ISA access must be locked explicitely! 
+/* The SMBus locks itself, but ISA access must be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
@@ -974,7 +950,7 @@ static int it87_read_value(struct i2c_client *client, u8 reg)
                 return i2c_smbus_read_byte_data(client, reg);
 }
 
-/* The SMBus locks itself, but ISA access muse be locked explicitely! 
+/* The SMBus locks itself, but ISA access muse be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
diff --git a/drivers/i2c/chips/lm63.c b/drivers/i2c/chips/lm63.c
index bc68e031392b..7c6f9ea5a254 100644
--- a/drivers/i2c/chips/lm63.c
+++ b/drivers/i2c/chips/lm63.c
@@ -1,7 +1,7 @@
 /*
  * lm63.c - driver for the National Semiconductor LM63 temperature sensor
  *          with integrated fan control
- * Copyright (C) 2004  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2004-2005  Jean Delvare <khali@linux-fr.org>
  * Based on the lm90 driver.
  *
  * The LM63 is a sensor chip made by National Semiconductor. It measures
@@ -37,13 +37,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/hwmon-sysfs.h>
 
 /*
  * Addresses to scan
@@ -99,9 +99,9 @@ SENSORS_INSMOD_1(lm63);
  * Conversions and various macros
  * For tachometer counts, the LM63 uses 16-bit values.
  * For local temperature and high limit, remote critical limit and hysteresis
- * value, it uses signed 8-bit values with LSB = 1 degree Celcius.
+ * value, it uses signed 8-bit values with LSB = 1 degree Celsius.
  * For remote temperature, low and high limits, it uses signed 11-bit values
- * with LSB = 0.125 degree Celcius, left-justified in 16-bit registers.
+ * with LSB = 0.125 degree Celsius, left-justified in 16-bit registers.
  */
 
 #define FAN_FROM_REG(reg)       ((reg) == 0xFFFC || (reg) == 0 ? 0 : \
@@ -158,16 +158,16 @@ struct lm63_data {
 
         /* registers values */
         u8 config, config_fan;
-        u16 fan1_input;
-        u16 fan1_low;
+        u16 fan[2];     /* 0: input
+                           1: low limit */
         u8 pwm1_freq;
         u8 pwm1_value;
-        s8 temp1_input;
-        s8 temp1_high;
-        s16 temp2_input;
-        s16 temp2_high;
-        s16 temp2_low;
-        s8 temp2_crit;
+        s8 temp8[3];    /* 0: local input
+                           1: local high limit
+                           2: remote critical limit */
+        s16 temp11[3];  /* 0: remote input
+                           1: remote low limit
+                           2: remote high limit */
         u8 temp2_crit_hyst;
         u8 alarms;
 };
@@ -176,33 +176,33 @@ struct lm63_data {
  * Sysfs callback functions and files
  */
 
-#define show_fan(value) \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct lm63_data *data = lm63_update_device(dev); \
-        return sprintf(buf, "%d\n", FAN_FROM_REG(data->value)); \
+static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index]));
 }
-show_fan(fan1_input);
-show_fan(fan1_low);
 
-static ssize_t set_fan1_low(struct device *dev, struct device_attribute *attr, const char *buf,
-        size_t count)
+static ssize_t set_fan(struct device *dev, struct device_attribute *dummy,
+                       const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
         down(&data->update_lock);
-        data->fan1_low = FAN_TO_REG(val);
+        data->fan[1] = FAN_TO_REG(val);
         i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_LSB,
-                                  data->fan1_low & 0xFF);
+                                  data->fan[1] & 0xFF);
         i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_MSB,
-                                  data->fan1_low >> 8);
+                                  data->fan[1] >> 8);
         up(&data->update_lock);
         return count;
 }
 
-static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_pwm1(struct device *dev, struct device_attribute *dummy,
+                         char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", data->pwm1_value >= 2 * data->pwm1_freq ?
@@ -210,7 +210,8 @@ static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char
                        (2 * data->pwm1_freq));
 }
 
-static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_pwm1(struct device *dev, struct device_attribute *dummy,
+                        const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
@@ -229,77 +230,83 @@ static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const
         return count;
 }
 
-static ssize_t show_pwm1_enable(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_pwm1_enable(struct device *dev, struct device_attribute *dummy,
+                                char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", data->config_fan & 0x20 ? 1 : 2);
 }
 
-#define show_temp8(value) \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct lm63_data *data = lm63_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->value)); \
+static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp8[attr->index]));
 }
-#define show_temp11(value) \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct lm63_data *data = lm63_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->value)); \
+
+static ssize_t set_temp8(struct device *dev, struct device_attribute *dummy,
+                         const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm63_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp8[1] = TEMP8_TO_REG(val);
+        i2c_smbus_write_byte_data(client, LM63_REG_LOCAL_HIGH, data->temp8[1]);
+        up(&data->update_lock);
+        return count;
 }
-show_temp8(temp1_input);
-show_temp8(temp1_high);
-show_temp11(temp2_input);
-show_temp11(temp2_high);
-show_temp11(temp2_low);
-show_temp8(temp2_crit);
-
-#define set_temp8(value, reg) \
-static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm63_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->value = TEMP8_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg, data->value); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,
+                           char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->temp11[attr->index]));
 }
-#define set_temp11(value, reg_msb, reg_lsb) \
-static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm63_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->value = TEMP11_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg_msb, data->value >> 8); \
-        i2c_smbus_write_byte_data(client, reg_lsb, data->value & 0xff); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
+                          const char *buf, size_t count)
+{
+        static const u8 reg[4] = {
+                LM63_REG_REMOTE_LOW_MSB,
+                LM63_REG_REMOTE_LOW_LSB,
+                LM63_REG_REMOTE_HIGH_MSB,
+                LM63_REG_REMOTE_HIGH_LSB,
+        };
+
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm63_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        data->temp11[nr] = TEMP11_TO_REG(val);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],
+                                  data->temp11[nr] >> 8);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],
+                                  data->temp11[nr] & 0xff);
+        up(&data->update_lock);
+        return count;
 }
-set_temp8(temp1_high, LM63_REG_LOCAL_HIGH);
-set_temp11(temp2_high, LM63_REG_REMOTE_HIGH_MSB, LM63_REG_REMOTE_HIGH_LSB);
-set_temp11(temp2_low, LM63_REG_REMOTE_LOW_MSB, LM63_REG_REMOTE_LOW_LSB);
 
 /* Hysteresis register holds a relative value, while we want to present
    an absolute to user-space */
-static ssize_t show_temp2_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_temp2_crit_hyst(struct device *dev, struct device_attribute *dummy,
+                                    char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
-        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp2_crit)
+        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp8[2])
                        - TEMP8_FROM_REG(data->temp2_crit_hyst));
 }
 
 /* And now the other way around, user-space provides an absolute
    hysteresis value and we have to store a relative one */
-static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *attr, const char *buf,
-        size_t count)
+static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *dummy,
+                                   const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
@@ -307,36 +314,37 @@ static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *
         long hyst;
 
         down(&data->update_lock);
-        hyst = TEMP8_FROM_REG(data->temp2_crit) - val;
+        hyst = TEMP8_FROM_REG(data->temp8[2]) - val;
         i2c_smbus_write_byte_data(client, LM63_REG_REMOTE_TCRIT_HYST,
                                   HYST_TO_REG(hyst));
         up(&data->update_lock);
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
+                           char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
 }
 
-static DEVICE_ATTR(fan1_input, S_IRUGO, show_fan1_input, NULL);
-static DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan1_low,
-        set_fan1_low);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan,
+        set_fan, 1);
 
 static DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm1, set_pwm1);
 static DEVICE_ATTR(pwm1_enable, S_IRUGO, show_pwm1_enable, NULL);
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1_input, NULL);
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp1_high,
-        set_temp1_high);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp8, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 1);
 
-static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp2_input, NULL);
-static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp2_low,
-        set_temp2_low);
-static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp2_high,
-        set_temp2_high);
-static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp2_crit, NULL);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 1);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 2);
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp8, NULL, 2);
 static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_temp2_crit_hyst,
         set_temp2_crit_hyst);
 
@@ -430,17 +438,25 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Register sysfs hooks */
         if (data->config & 0x04) { /* tachometer enabled */
-                device_create_file(&new_client->dev, &dev_attr_fan1_input);
-                device_create_file(&new_client->dev, &dev_attr_fan1_min);
+                device_create_file(&new_client->dev,
+                                   &sensor_dev_attr_fan1_input.dev_attr);
+                device_create_file(&new_client->dev,
+                                   &sensor_dev_attr_fan1_min.dev_attr);
         }
         device_create_file(&new_client->dev, &dev_attr_pwm1);
         device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_temp2_crit_hyst);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
@@ -511,14 +527,14 @@ static struct lm63_data *lm63_update_device(struct device *dev)
         if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
                 if (data->config & 0x04) { /* tachometer enabled  */
                         /* order matters for fan1_input */
-                        data->fan1_input = i2c_smbus_read_byte_data(client,
-                                           LM63_REG_TACH_COUNT_LSB) & 0xFC;
-                        data->fan1_input |= i2c_smbus_read_byte_data(client,
-                                            LM63_REG_TACH_COUNT_MSB) << 8;
-                        data->fan1_low = (i2c_smbus_read_byte_data(client,
-                                          LM63_REG_TACH_LIMIT_LSB) & 0xFC)
-                                       | (i2c_smbus_read_byte_data(client,
-                                          LM63_REG_TACH_LIMIT_MSB) << 8);
+                        data->fan[0] = i2c_smbus_read_byte_data(client,
+                                       LM63_REG_TACH_COUNT_LSB) & 0xFC;
+                        data->fan[0] |= i2c_smbus_read_byte_data(client,
+                                        LM63_REG_TACH_COUNT_MSB) << 8;
+                        data->fan[1] = (i2c_smbus_read_byte_data(client,
+                                        LM63_REG_TACH_LIMIT_LSB) & 0xFC)
+                                     | (i2c_smbus_read_byte_data(client,
+                                        LM63_REG_TACH_LIMIT_MSB) << 8);
                 }
 
                 data->pwm1_freq = i2c_smbus_read_byte_data(client,
@@ -528,26 +544,26 @@ static struct lm63_data *lm63_update_device(struct device *dev)
                 data->pwm1_value = i2c_smbus_read_byte_data(client,
                                    LM63_REG_PWM_VALUE);
 
-                data->temp1_input = i2c_smbus_read_byte_data(client,
-                                    LM63_REG_LOCAL_TEMP);
-                data->temp1_high = i2c_smbus_read_byte_data(client,
-                                   LM63_REG_LOCAL_HIGH);
+                data->temp8[0] = i2c_smbus_read_byte_data(client,
+                                 LM63_REG_LOCAL_TEMP);
+                data->temp8[1] = i2c_smbus_read_byte_data(client,
+                                 LM63_REG_LOCAL_HIGH);
 
                 /* order matters for temp2_input */
-                data->temp2_input = i2c_smbus_read_byte_data(client,
-                                    LM63_REG_REMOTE_TEMP_MSB) << 8;
-                data->temp2_input |= i2c_smbus_read_byte_data(client,
-                                     LM63_REG_REMOTE_TEMP_LSB);
-                data->temp2_high = (i2c_smbus_read_byte_data(client,
-                                   LM63_REG_REMOTE_HIGH_MSB) << 8)
-                                 | i2c_smbus_read_byte_data(client,
-                                   LM63_REG_REMOTE_HIGH_LSB);
-                data->temp2_low = (i2c_smbus_read_byte_data(client,
+                data->temp11[0] = i2c_smbus_read_byte_data(client,
+                                  LM63_REG_REMOTE_TEMP_MSB) << 8;
+                data->temp11[0] |= i2c_smbus_read_byte_data(client,
+                                   LM63_REG_REMOTE_TEMP_LSB);
+                data->temp11[1] = (i2c_smbus_read_byte_data(client,
                                   LM63_REG_REMOTE_LOW_MSB) << 8)
                                 | i2c_smbus_read_byte_data(client,
                                   LM63_REG_REMOTE_LOW_LSB);
-                data->temp2_crit = i2c_smbus_read_byte_data(client,
-                                   LM63_REG_REMOTE_TCRIT);
+                data->temp11[2] = (i2c_smbus_read_byte_data(client,
+                                  LM63_REG_REMOTE_HIGH_MSB) << 8)
+                                | i2c_smbus_read_byte_data(client,
+                                  LM63_REG_REMOTE_HIGH_LSB);
+                data->temp8[2] = i2c_smbus_read_byte_data(client,
+                                 LM63_REG_REMOTE_TCRIT);
                 data->temp2_crit_hyst = i2c_smbus_read_byte_data(client,
                                         LM63_REG_REMOTE_TCRIT_HYST);
 
diff --git a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c
index 57c51ac37c04..5be164ed278e 100644
--- a/drivers/i2c/chips/lm75.c
+++ b/drivers/i2c/chips/lm75.c
@@ -18,7 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/lm77.c b/drivers/i2c/chips/lm77.c
index 9d15cd5189f6..b98f44952997 100644
--- a/drivers/i2c/chips/lm77.c
+++ b/drivers/i2c/chips/lm77.c
@@ -25,7 +25,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/lm78.c b/drivers/i2c/chips/lm78.c
index 21b195ff3871..29241469dcba 100644
--- a/drivers/i2c/chips/lm78.c
+++ b/drivers/i2c/chips/lm78.c
@@ -18,7 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -671,7 +670,7 @@ static int lm78_detach_client(struct i2c_client *client)
         return 0;
 }
 
-/* The SMBus locks itself, but ISA access must be locked explicitely! 
+/* The SMBus locks itself, but ISA access must be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks,
@@ -690,7 +689,7 @@ static int lm78_read_value(struct i2c_client *client, u8 reg)
                 return i2c_smbus_read_byte_data(client, reg);
 }
 
-/* The SMBus locks itself, but ISA access muse be locked explicitely! 
+/* The SMBus locks itself, but ISA access muse be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks,
diff --git a/drivers/i2c/chips/lm80.c b/drivers/i2c/chips/lm80.c
index 404057b70e90..8100595feb44 100644
--- a/drivers/i2c/chips/lm80.c
+++ b/drivers/i2c/chips/lm80.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/lm83.c b/drivers/i2c/chips/lm83.c
index 4d6d7d21e14b..a49008b444c8 100644
--- a/drivers/i2c/chips/lm83.c
+++ b/drivers/i2c/chips/lm83.c
@@ -1,7 +1,7 @@
 /*
  * lm83.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2005  Jean Delvare <khali@linux-fr.org>
  *
  * Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is
  * a sensor chip made by National Semiconductor. It reports up to four
@@ -27,13 +27,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/hwmon-sysfs.h>
 
 /*
  * Addresses to scan
@@ -81,7 +81,7 @@ SENSORS_INSMOD_1(lm83);
 
 /*
  * Conversions and various macros
- * The LM83 uses signed 8-bit values with LSB = 1 degree Celcius.
+ * The LM83 uses signed 8-bit values with LSB = 1 degree Celsius.
  */
 
 #define TEMP_FROM_REG(val)      ((val) * 1000)
@@ -94,21 +94,20 @@ static const u8 LM83_REG_R_TEMP[] = {
         LM83_REG_R_LOCAL_TEMP,
         LM83_REG_R_REMOTE1_TEMP,
         LM83_REG_R_REMOTE2_TEMP,
-        LM83_REG_R_REMOTE3_TEMP
-};
-
-static const u8 LM83_REG_R_HIGH[] = {
+        LM83_REG_R_REMOTE3_TEMP,
         LM83_REG_R_LOCAL_HIGH,
         LM83_REG_R_REMOTE1_HIGH,
         LM83_REG_R_REMOTE2_HIGH,
-        LM83_REG_R_REMOTE3_HIGH
+        LM83_REG_R_REMOTE3_HIGH,
+        LM83_REG_R_TCRIT,
 };
 
 static const u8 LM83_REG_W_HIGH[] = {
         LM83_REG_W_LOCAL_HIGH,
         LM83_REG_W_REMOTE1_HIGH,
         LM83_REG_W_REMOTE2_HIGH,
-        LM83_REG_W_REMOTE3_HIGH
+        LM83_REG_W_REMOTE3_HIGH,
+        LM83_REG_W_TCRIT,
 };
 
 /*
@@ -144,9 +143,9 @@ struct lm83_data {
         unsigned long last_updated; /* in jiffies */
 
         /* registers values */
-        s8 temp_input[4];
-        s8 temp_high[4];
-        s8 temp_crit;
+        s8 temp[9];     /* 0..3: input 1-4,
+                           4..7: high limit 1-4,
+                           8   : critical limit */
         u16 alarms; /* bitvector, combined */
 };
 
@@ -154,65 +153,55 @@ struct lm83_data {
  * Sysfs stuff
  */
 
-#define show_temp(suffix, value) \
-static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct lm83_data *data = lm83_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
+static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
+                         char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm83_data *data = lm83_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
 }
-show_temp(input1, temp_input[0]);
-show_temp(input2, temp_input[1]);
-show_temp(input3, temp_input[2]);
-show_temp(input4, temp_input[3]);
-show_temp(high1, temp_high[0]);
-show_temp(high2, temp_high[1]);
-show_temp(high3, temp_high[2]);
-show_temp(high4, temp_high[3]);
-show_temp(crit, temp_crit);
-
-#define set_temp(suffix, value, reg) \
-static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm83_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->value = TEMP_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg, data->value); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm83_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        data->temp[nr] = TEMP_TO_REG(val);
+        i2c_smbus_write_byte_data(client, LM83_REG_W_HIGH[nr - 4],
+                                  data->temp[nr]);
+        up(&data->update_lock);
+        return count;
 }
-set_temp(high1, temp_high[0], LM83_REG_W_LOCAL_HIGH);
-set_temp(high2, temp_high[1], LM83_REG_W_REMOTE1_HIGH);
-set_temp(high3, temp_high[2], LM83_REG_W_REMOTE2_HIGH);
-set_temp(high4, temp_high[3], LM83_REG_W_REMOTE3_HIGH);
-set_temp(crit, temp_crit, LM83_REG_W_TCRIT);
 
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
+                           char *buf)
 {
         struct lm83_data *data = lm83_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
 }
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);
-static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input2, NULL);
-static DEVICE_ATTR(temp3_input, S_IRUGO, show_temp_input3, NULL);
-static DEVICE_ATTR(temp4_input, S_IRUGO, show_temp_input4, NULL);
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_high1,
-    set_temp_high1);
-static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_high2,
-    set_temp_high2);
-static DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp_high3,
-    set_temp_high3);
-static DEVICE_ATTR(temp4_max, S_IWUSR | S_IRUGO, show_temp_high4,
-    set_temp_high4);
-static DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL);
-static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit, NULL);
-static DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp_crit,
-    set_temp_crit);
-static DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp_crit, NULL);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 4);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 5);
+static SENSOR_DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 6);
+static SENSOR_DEVICE_ATTR(temp4_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 7);
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 8);
+static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp, NULL, 8);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /*
@@ -323,18 +312,30 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
          */
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp3_input);
-        device_create_file(&new_client->dev, &dev_attr_temp4_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp3_max);
-        device_create_file(&new_client->dev, &dev_attr_temp4_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp3_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp4_crit);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp4_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp4_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp4_crit.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
         return 0;
@@ -370,16 +371,11 @@ static struct lm83_data *lm83_update_device(struct device *dev)
                 int nr;
 
                 dev_dbg(&client->dev, "Updating lm83 data.\n");
-                for (nr = 0; nr < 4 ; nr++) {
-                        data->temp_input[nr] =
+                for (nr = 0; nr < 9; nr++) {
+                        data->temp[nr] =
                             i2c_smbus_read_byte_data(client,
                             LM83_REG_R_TEMP[nr]);
-                        data->temp_high[nr] =
-                            i2c_smbus_read_byte_data(client,
-                            LM83_REG_R_HIGH[nr]);
                 }
-                data->temp_crit =
-                    i2c_smbus_read_byte_data(client, LM83_REG_R_TCRIT);
                 data->alarms =
                     i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1)
                     + (i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS2)
diff --git a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c
index b1976775b4ba..b4d7fd418264 100644
--- a/drivers/i2c/chips/lm85.c
+++ b/drivers/i2c/chips/lm85.c
@@ -23,7 +23,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -285,8 +284,6 @@ static int ZONE_TO_REG( int zone )
 /* i2c-vid.h defines vid_from_reg() */
 #define VID_FROM_REG(val,vrm) (vid_from_reg((val),(vrm)))
 
-#define ALARMS_FROM_REG(val) (val)
-
 /* Unlike some other drivers we DO NOT set initial limits.  Use
  * the config file to set limits.  Some users have reported
  * motherboards shutting down when we set limits in a previous
@@ -481,7 +478,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm85_data *data = lm85_update_device(dev);
-        return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
diff --git a/drivers/i2c/chips/lm87.c b/drivers/i2c/chips/lm87.c
index 4372b61a0882..1921ed1af182 100644
--- a/drivers/i2c/chips/lm87.c
+++ b/drivers/i2c/chips/lm87.c
@@ -52,7 +52,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c
index 9b127a07f56b..a67dcadf7cb0 100644
--- a/drivers/i2c/chips/lm90.c
+++ b/drivers/i2c/chips/lm90.c
@@ -1,7 +1,7 @@
 /*
  * lm90.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003-2004  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2005  Jean Delvare <khali@linux-fr.org>
  *
  * Based on the lm83 driver. The LM90 is a sensor chip made by National
  * Semiconductor. It reports up to two temperatures (its own plus up to
@@ -19,7 +19,7 @@
  * Complete datasheets can be obtained from National's website at:
  *   http://www.national.com/pf/LM/LM89.html
  *   http://www.national.com/pf/LM/LM99.html
- * Note that there is no way to differenciate between both chips.
+ * Note that there is no way to differentiate between both chips.
  *
  * This driver also supports the LM86, another sensor chip made by
  * National Semiconductor. It is exactly similar to the LM90 except it
@@ -39,7 +39,7 @@
  * chips made by Maxim. These chips are similar to the LM86. Complete
  * datasheet can be obtained at Maxim's website at:
  *   http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
- * Note that there is no easy way to differenciate between the three
+ * Note that there is no easy way to differentiate between the three
  * variants. The extra address and features of the MAX6659 are not
  * supported by this driver.
  *
@@ -70,13 +70,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/hwmon-sysfs.h>
 
 /*
  * Addresses to scan
@@ -139,9 +139,9 @@ SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
 /*
  * Conversions and various macros
  * For local temperatures and limits, critical limits and the hysteresis
- * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celcius.
+ * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celsius.
  * For remote temperatures and limits, it uses signed 11-bit values with
- * LSB = 0.125 degree Celcius, left-justified in 16-bit registers.
+ * LSB = 0.125 degree Celsius, left-justified in 16-bit registers.
  */
 
 #define TEMP1_FROM_REG(val)     ((val) * 1000)
@@ -206,9 +206,14 @@ struct lm90_data {
         int kind;
 
         /* registers values */
-        s8 temp_input1, temp_low1, temp_high1; /* local */
-        s16 temp_input2, temp_low2, temp_high2; /* remote, combined */
-        s8 temp_crit1, temp_crit2;
+        s8 temp8[5];    /* 0: local input
+                           1: local low limit
+                           2: local high limit
+                           3: local critical limit
+                           4: remote critical limit */
+        s16 temp11[3];  /* 0: remote input
+                           1: remote low limit
+                           2: remote high limit */
         u8 temp_hyst;
         u8 alarms; /* bitvector */
 };
@@ -217,75 +222,88 @@ struct lm90_data {
  * Sysfs stuff
  */
 
-#define show_temp(value, converter) \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct lm90_data *data = lm90_update_device(dev); \
-        return sprintf(buf, "%d\n", converter(data->value)); \
+static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm90_data *data = lm90_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->temp8[attr->index]));
+}
+
+static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,
+                         const char *buf, size_t count)
+{
+        static const u8 reg[4] = {
+                LM90_REG_W_LOCAL_LOW,
+                LM90_REG_W_LOCAL_HIGH,
+                LM90_REG_W_LOCAL_CRIT,
+                LM90_REG_W_REMOTE_CRIT,
+        };
+
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm90_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        if (data->kind == adt7461)
+                data->temp8[nr] = TEMP1_TO_REG_ADT7461(val);
+        else
+                data->temp8[nr] = TEMP1_TO_REG(val);
+        i2c_smbus_write_byte_data(client, reg[nr - 1], data->temp8[nr]);
+        up(&data->update_lock);
+        return count;
 }
-show_temp(temp_input1, TEMP1_FROM_REG);
-show_temp(temp_input2, TEMP2_FROM_REG);
-show_temp(temp_low1, TEMP1_FROM_REG);
-show_temp(temp_low2, TEMP2_FROM_REG);
-show_temp(temp_high1, TEMP1_FROM_REG);
-show_temp(temp_high2, TEMP2_FROM_REG);
-show_temp(temp_crit1, TEMP1_FROM_REG);
-show_temp(temp_crit2, TEMP1_FROM_REG);
-
-#define set_temp1(value, reg) \
-static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm90_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        if (data->kind == adt7461) \
-                data->value = TEMP1_TO_REG_ADT7461(val); \
-        else \
-                data->value = TEMP1_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg, data->value); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,
+                           char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm90_data *data = lm90_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP2_FROM_REG(data->temp11[attr->index]));
 }
-#define set_temp2(value, regh, regl) \
-static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm90_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        if (data->kind == adt7461) \
-                data->value = TEMP2_TO_REG_ADT7461(val); \
-        else \
-                data->value = TEMP2_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, regh, data->value >> 8); \
-        i2c_smbus_write_byte_data(client, regl, data->value & 0xff); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
+                          const char *buf, size_t count)
+{
+        static const u8 reg[4] = {
+                LM90_REG_W_REMOTE_LOWH,
+                LM90_REG_W_REMOTE_LOWL,
+                LM90_REG_W_REMOTE_HIGHH,
+                LM90_REG_W_REMOTE_HIGHL,
+        };
+
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm90_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        if (data->kind == adt7461)
+                data->temp11[nr] = TEMP2_TO_REG_ADT7461(val);
+        else
+                data->temp11[nr] = TEMP2_TO_REG(val);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],
+                                  data->temp11[nr] >> 8);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],
+                                  data->temp11[nr] & 0xff);
+        up(&data->update_lock);
+        return count;
 }
-set_temp1(temp_low1, LM90_REG_W_LOCAL_LOW);
-set_temp2(temp_low2, LM90_REG_W_REMOTE_LOWH, LM90_REG_W_REMOTE_LOWL);
-set_temp1(temp_high1, LM90_REG_W_LOCAL_HIGH);
-set_temp2(temp_high2, LM90_REG_W_REMOTE_HIGHH, LM90_REG_W_REMOTE_HIGHL);
-set_temp1(temp_crit1, LM90_REG_W_LOCAL_CRIT);
-set_temp1(temp_crit2, LM90_REG_W_REMOTE_CRIT);
-
-#define show_temp_hyst(value, basereg) \
-static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct lm90_data *data = lm90_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->basereg) \
-                       - TEMP1_FROM_REG(data->temp_hyst)); \
+
+static ssize_t show_temphyst(struct device *dev, struct device_attribute *devattr,
+                             char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm90_data *data = lm90_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->temp8[attr->index])
+                       - TEMP1_FROM_REG(data->temp_hyst));
 }
-show_temp_hyst(temp_hyst1, temp_crit1);
-show_temp_hyst(temp_hyst2, temp_crit2);
 
-static ssize_t set_temp_hyst1(struct device *dev, struct device_attribute *attr, const char *buf,
-        size_t count)
+static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,
+                            const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm90_data *data = i2c_get_clientdata(client);
@@ -293,36 +311,37 @@ static ssize_t set_temp_hyst1(struct device *dev, struct device_attribute *attr,
         long hyst;
 
         down(&data->update_lock);
-        hyst = TEMP1_FROM_REG(data->temp_crit1) - val;
+        hyst = TEMP1_FROM_REG(data->temp8[3]) - val;
         i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST,
                                   HYST_TO_REG(hyst));
         up(&data->update_lock);
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
+                           char *buf)
 {
         struct lm90_data *data = lm90_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
 }
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);
-static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input2, NULL);
-static DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp_low1,
-        set_temp_low1);
-static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp_low2,
-        set_temp_low2);
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_high1,
-        set_temp_high1);
-static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_high2,
-        set_temp_high2);
-static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp_crit1,
-        set_temp_crit1);
-static DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp_crit2,
-        set_temp_crit2);
-static DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temp_hyst1,
-        set_temp_hyst1);
-static DEVICE_ATTR(temp2_crit_hyst, S_IRUGO, show_temp_hyst2, NULL);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp8, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 1);
+static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 1);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 2);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 2);
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 3);
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 4);
+static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temphyst,
+        set_temphyst, 3);
+static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IRUGO, show_temphyst, NULL, 4);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /*
@@ -481,16 +500,26 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
         lm90_init_client(new_client);
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_min);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit_hyst);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_min.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit_hyst.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit_hyst.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
         return 0;
@@ -541,16 +570,16 @@ static struct lm90_data *lm90_update_device(struct device *dev)
                 u8 oldh, newh;
 
                 dev_dbg(&client->dev, "Updating lm90 data.\n");
-                data->temp_input1 = i2c_smbus_read_byte_data(client,
-                                    LM90_REG_R_LOCAL_TEMP);
-                data->temp_high1 = i2c_smbus_read_byte_data(client,
-                                   LM90_REG_R_LOCAL_HIGH);
-                data->temp_low1 = i2c_smbus_read_byte_data(client,
-                                  LM90_REG_R_LOCAL_LOW);
-                data->temp_crit1 = i2c_smbus_read_byte_data(client,
-                                   LM90_REG_R_LOCAL_CRIT);
-                data->temp_crit2 = i2c_smbus_read_byte_data(client,
-                                   LM90_REG_R_REMOTE_CRIT);
+                data->temp8[0] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_TEMP);
+                data->temp8[1] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_LOW);
+                data->temp8[2] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_HIGH);
+                data->temp8[3] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_CRIT);
+                data->temp8[4] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_REMOTE_CRIT);
                 data->temp_hyst = i2c_smbus_read_byte_data(client,
                                   LM90_REG_R_TCRIT_HYST);
 
@@ -570,13 +599,13 @@ static struct lm90_data *lm90_update_device(struct device *dev)
                  */
                 oldh = i2c_smbus_read_byte_data(client,
                        LM90_REG_R_REMOTE_TEMPH);
-                data->temp_input2 = i2c_smbus_read_byte_data(client,
-                                    LM90_REG_R_REMOTE_TEMPL);
+                data->temp11[0] = i2c_smbus_read_byte_data(client,
+                                  LM90_REG_R_REMOTE_TEMPL);
                 newh = i2c_smbus_read_byte_data(client,
                        LM90_REG_R_REMOTE_TEMPH);
                 if (newh != oldh) {
-                        data->temp_input2 = i2c_smbus_read_byte_data(client,
-                                            LM90_REG_R_REMOTE_TEMPL);
+                        data->temp11[0] = i2c_smbus_read_byte_data(client,
+                                          LM90_REG_R_REMOTE_TEMPL);
 #ifdef DEBUG
                         oldh = i2c_smbus_read_byte_data(client,
                                LM90_REG_R_REMOTE_TEMPH);
@@ -586,16 +615,16 @@ static struct lm90_data *lm90_update_device(struct device *dev)
                                          "wrong.\n");
 #endif
                 }
-                data->temp_input2 |= (newh << 8);
+                data->temp11[0] |= (newh << 8);
 
-                data->temp_high2 = (i2c_smbus_read_byte_data(client,
+                data->temp11[1] = (i2c_smbus_read_byte_data(client,
+                                   LM90_REG_R_REMOTE_LOWH) << 8) +
+                                   i2c_smbus_read_byte_data(client,
+                                   LM90_REG_R_REMOTE_LOWL);
+                data->temp11[2] = (i2c_smbus_read_byte_data(client,
                                    LM90_REG_R_REMOTE_HIGHH) << 8) +
                                    i2c_smbus_read_byte_data(client,
                                    LM90_REG_R_REMOTE_HIGHL);
-                data->temp_low2 = (i2c_smbus_read_byte_data(client,
-                                  LM90_REG_R_REMOTE_LOWH) << 8) +
-                                  i2c_smbus_read_byte_data(client,
-                                  LM90_REG_R_REMOTE_LOWL);
                 data->alarms = i2c_smbus_read_byte_data(client,
                                LM90_REG_R_STATUS);
 
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index e771566dffa8..5e463c47bfbc 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -40,11 +40,8 @@ static unsigned short normal_addr[] = { 0x68, I2C_CLIENT_END };
 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
-        .normal_i2c_range       = ignore,
         .probe                  = ignore,
-        .probe_range            = ignore,
         .ignore                 = ignore,
-        .ignore_range           = ignore,
         .force                  = ignore,
 };
 
diff --git a/drivers/i2c/chips/max1619.c b/drivers/i2c/chips/max1619.c
index 30a196155fd9..bf553dcd97d6 100644
--- a/drivers/i2c/chips/max1619.c
+++ b/drivers/i2c/chips/max1619.c
@@ -26,7 +26,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
new file mode 100644
index 000000000000..fe6b150ec4c2
--- /dev/null
+++ b/drivers/i2c/chips/max6875.c
@@ -0,0 +1,473 @@
+/*
+    max6875.c - driver for MAX6874/MAX6875
+
+    Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
+
+    Based on i2c/chips/eeprom.c
+
+    The MAX6875 has two EEPROM sections: config and user.
+    At reset, the config EEPROM is read into the registers.
+
+    This driver make 3 binary files available in sysfs:
+      reg_config    - direct access to the registers
+      eeprom_config - acesses configuration eeprom space
+      eeprom_user   - free for application use
+
+    In our application, we put device serial & model numbers in user eeprom.
+
+    Notes:
+      1) The datasheet says that register 0x44 / EEPROM 0x8044 should NOT
+         be overwritten, so the driver explicitly prevents that.
+      2) It's a good idea to keep the config (0x45) locked in config EEPROM.
+         You can temporarily enable config writes by changing register 0x45.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+*/
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = {0x50, 0x52, I2C_CLIENT_END};
+static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
+
+/* Insmod parameters */
+SENSORS_INSMOD_1(max6875);
+
+/* this param will prevent 'accidental' writes to the eeprom */
+static int allow_write = 0;
+module_param(allow_write, int, 0);
+MODULE_PARM_DESC(allow_write,
+                 "Enable write access:\n"
+                 "*0: Read only\n"
+                 " 1: Read/Write access");
+
+/* The MAX6875 can only read/write 16 bytes at a time */
+#define SLICE_SIZE                      16
+#define SLICE_BITS                      4
+
+/* CONFIG EEPROM is at addresses 0x8000 - 0x8045, registers are at 0 - 0x45 */
+#define CONFIG_EEPROM_BASE              0x8000
+#define CONFIG_EEPROM_SIZE              0x0046
+#define CONFIG_EEPROM_SLICES            5
+
+/* USER EEPROM is at addresses 0x8100 - 0x82FF */
+#define USER_EEPROM_BASE                0x8100
+#define USER_EEPROM_SIZE                0x0200
+#define USER_EEPROM_SLICES              32
+
+/* MAX6875 commands */
+#define MAX6875_CMD_BLOCK_WRITE         0x83
+#define MAX6875_CMD_BLOCK_READ          0x84
+#define MAX6875_CMD_REBOOT              0x88
+
+enum max6875_area_type {
+        max6875_register_config=0,
+        max6875_eeprom_config,
+        max6875_eeprom_user,
+        max6857_max
+};
+
+struct eeprom_block {
+        enum max6875_area_type  type;
+        u8                      slices;
+        u32                     size;
+        u32                     valid;
+        u32                     base;
+        unsigned long           *updated;
+        u8                      *data;
+};
+
+/* Each client has this additional data */
+struct max6875_data {
+        struct i2c_client       client;
+        struct semaphore        update_lock;
+        struct eeprom_block     blocks[max6857_max];
+        /* the above structs point into the arrays below */
+        u8 data[USER_EEPROM_SIZE + (CONFIG_EEPROM_SIZE*2)];
+        unsigned long last_updated[USER_EEPROM_SLICES + (CONFIG_EEPROM_SLICES*2)];
+};
+
+static int max6875_attach_adapter(struct i2c_adapter *adapter);
+static int max6875_detect(struct i2c_adapter *adapter, int address, int kind);
+static int max6875_detach_client(struct i2c_client *client);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver max6875_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "max6875",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = max6875_attach_adapter,
+        .detach_client  = max6875_detach_client,
+};
+
+static int max6875_update_slice(struct i2c_client *client,
+                                struct eeprom_block *blk,
+                                int slice)
+{
+        struct max6875_data *data = i2c_get_clientdata(client);
+        int i, j, addr, count;
+        u8 rdbuf[SLICE_SIZE];
+        int retval = 0;
+
+        if (slice >= blk->slices)
+                return -1;
+
+        down(&data->update_lock);
+
+        if (!(blk->valid & (1 << slice)) ||
+            (jiffies - blk->updated[slice] > 300 * HZ) ||
+            (jiffies < blk->updated[slice])) {
+                dev_dbg(&client->dev, "Starting eeprom update, slice %u, base %u\n",
+                        slice, blk->base);
+
+                addr = blk->base + (slice << SLICE_BITS);
+                count = blk->size - (slice << SLICE_BITS);
+                if (count > SLICE_SIZE) {
+                        count = SLICE_SIZE;
+                }
+
+                /* Preset the read address */
+                if (addr < 0x100) {
+                        /* select the register */
+                        if (i2c_smbus_write_byte(client, addr & 0xFF)) {
+                                dev_dbg(&client->dev, "max6875 register select has failed!\n");
+                                retval = -1;
+                                goto exit;
+                        }
+                } else {
+                        /* select the eeprom */
+                        if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
+                                dev_dbg(&client->dev, "max6875 address set has failed!\n");
+                                retval = -1;
+                                goto exit;
+                        }
+                }
+
+                if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+                        if (i2c_smbus_read_i2c_block_data(client, MAX6875_CMD_BLOCK_READ,
+                                                          rdbuf) != SLICE_SIZE)
+                        {
+                                retval = -1;
+                                goto exit;
+                        }
+
+                        memcpy(&blk->data[slice << SLICE_BITS], rdbuf, count);
+                } else {
+                        for (i = 0; i < count; i++) {
+                                j = i2c_smbus_read_byte(client);
+                                if (j < 0)
+                                {
+                                        retval = -1;
+                                        goto exit;
+                                }
+                                blk->data[(slice << SLICE_BITS) + i] = (u8) j;
+                        }
+                }
+                blk->updated[slice] = jiffies;
+                blk->valid |= (1 << slice);
+        }
+        exit:
+        up(&data->update_lock);
+        return retval;
+}
+
+static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off, size_t count,
+                            enum max6875_area_type area_type)
+{
+        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
+        struct max6875_data *data = i2c_get_clientdata(client);
+        struct eeprom_block *blk;
+        int slice;
+
+        blk = &data->blocks[area_type];
+
+        if (off > blk->size)
+                return 0;
+        if (off + count > blk->size)
+                count = blk->size - off;
+
+        /* Only refresh slices which contain requested bytes */
+        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
+                max6875_update_slice(client, blk, slice);
+
+        memcpy(buf, &blk->data[off], count);
+
+        return count;
+}
+
+static ssize_t max6875_user_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_read(kobj, buf, off, count, max6875_eeprom_user);
+}
+
+static ssize_t max6875_config_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_read(kobj, buf, off, count, max6875_eeprom_config);
+}
+
+static ssize_t max6875_cfgreg_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_read(kobj, buf, off, count, max6875_register_config);
+}
+
+
+static ssize_t max6875_write(struct kobject *kobj, char *buf, loff_t off, size_t count,
+                             enum max6875_area_type area_type)
+{
+        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
+        struct max6875_data *data = i2c_get_clientdata(client);
+        struct eeprom_block *blk;
+        int slice, addr, retval;
+        ssize_t sent = 0;
+
+        blk = &data->blocks[area_type];
+
+        if (off > blk->size)
+                return 0;
+        if ((off + count) > blk->size)
+                count = blk->size - off;
+
+        if (down_interruptible(&data->update_lock))
+                return -EAGAIN;
+
+        /* writing to a register is done with i2c_smbus_write_byte_data() */
+        if (blk->type == max6875_register_config) {
+                for (sent = 0; sent < count; sent++) {
+                        addr = off + sent;
+                        if (addr == 0x44)
+                                continue;
+
+                        retval = i2c_smbus_write_byte_data(client, addr, buf[sent]);
+                }
+        } else {
+                int cmd, val;
+
+                /* We are writing to EEPROM */
+                for (sent = 0; sent < count; sent++) {
+                        addr = blk->base + off + sent;
+                        cmd = addr >> 8;
+                        val = (addr & 0xff) | (buf[sent] << 8); // reversed
+
+                        if (addr == 0x8044)
+                                continue;
+
+                        retval = i2c_smbus_write_word_data(client, cmd, val);
+
+                        if (retval) {
+                                goto error_exit;
+                        }
+
+                        /* A write takes up to 11 ms */
+                        msleep(11);
+                }
+        }
+
+        /* Invalidate the scratch buffer */
+        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
+                blk->valid &= ~(1 << slice);
+
+        error_exit:
+        up(&data->update_lock);
+
+        return sent;
+}
+
+static ssize_t max6875_user_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_write(kobj, buf, off, count, max6875_eeprom_user);
+}
+
+static ssize_t max6875_config_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_write(kobj, buf, off, count, max6875_eeprom_config);
+}
+
+static ssize_t max6875_cfgreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_write(kobj, buf, off, count, max6875_register_config);
+}
+
+static struct bin_attribute user_eeprom_attr = {
+        .attr = {
+                .name = "eeprom_user",
+                .mode = S_IRUGO | S_IWUSR | S_IWGRP,
+                .owner = THIS_MODULE,
+        },
+        .size  = USER_EEPROM_SIZE,
+        .read  = max6875_user_read,
+        .write = max6875_user_write,
+};
+
+static struct bin_attribute config_eeprom_attr = {
+        .attr = {
+                .name = "eeprom_config",
+                .mode = S_IRUGO | S_IWUSR,
+                .owner = THIS_MODULE,
+        },
+        .size  = CONFIG_EEPROM_SIZE,
+        .read  = max6875_config_read,
+        .write = max6875_config_write,
+};
+
+static struct bin_attribute config_register_attr = {
+        .attr = {
+                .name = "reg_config",
+                .mode = S_IRUGO | S_IWUSR,
+                .owner = THIS_MODULE,
+        },
+        .size  = CONFIG_EEPROM_SIZE,
+        .read  = max6875_cfgreg_read,
+        .write = max6875_cfgreg_write,
+};
+
+static int max6875_attach_adapter(struct i2c_adapter *adapter)
+{
+        return i2c_detect(adapter, &addr_data, max6875_detect);
+}
+
+/* This function is called by i2c_detect */
+static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *new_client;
+        struct max6875_data *data;
+        int err = 0;
+
+        /* There are three ways we can read the EEPROM data:
+           (1) I2C block reads (faster, but unsupported by most adapters)
+           (2) Consecutive byte reads (100% overhead)
+           (3) Regular byte data reads (200% overhead)
+           The third method is not implemented by this driver because all
+           known adapters support at least the second. */
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA |
+                                     I2C_FUNC_SMBUS_BYTE |
+                                     I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
+                goto exit;
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet.
+           But it allows us to access eeprom_{read,write}_value. */
+        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+        memset(data, 0, sizeof(struct max6875_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &max6875_driver;
+        new_client->flags = 0;
+
+        /* Setup the user section */
+        data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
+        data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;
+        data->blocks[max6875_eeprom_user].size    = USER_EEPROM_SIZE;
+        data->blocks[max6875_eeprom_user].base    = USER_EEPROM_BASE;
+        data->blocks[max6875_eeprom_user].data    = data->data;
+        data->blocks[max6875_eeprom_user].updated = data->last_updated;
+
+        /* Setup the config section */
+        data->blocks[max6875_eeprom_config].type    = max6875_eeprom_config;
+        data->blocks[max6875_eeprom_config].slices  = CONFIG_EEPROM_SLICES;
+        data->blocks[max6875_eeprom_config].size    = CONFIG_EEPROM_SIZE;
+        data->blocks[max6875_eeprom_config].base    = CONFIG_EEPROM_BASE;
+        data->blocks[max6875_eeprom_config].data    = &data->data[USER_EEPROM_SIZE];
+        data->blocks[max6875_eeprom_config].updated = &data->last_updated[USER_EEPROM_SLICES];
+
+        /* Setup the register section */
+        data->blocks[max6875_register_config].type    = max6875_register_config;
+        data->blocks[max6875_register_config].slices  = CONFIG_EEPROM_SLICES;
+        data->blocks[max6875_register_config].size    = CONFIG_EEPROM_SIZE;
+        data->blocks[max6875_register_config].base    = 0;
+        data->blocks[max6875_register_config].data    = &data->data[USER_EEPROM_SIZE+CONFIG_EEPROM_SIZE];
+        data->blocks[max6875_register_config].updated = &data->last_updated[USER_EEPROM_SLICES+CONFIG_EEPROM_SLICES];
+
+        /* Init the data */
+        memset(data->data, 0xff, sizeof(data->data));
+
+        /* Fill in the remaining client fields */
+        strlcpy(new_client->name, "max6875", I2C_NAME_SIZE);
+        init_MUTEX(&data->update_lock);
+
+        /* Verify that the chip is really what we think it is */
+        if ((max6875_update_slice(new_client, &data->blocks[max6875_eeprom_config], 4) < 0) ||
+            (max6875_update_slice(new_client, &data->blocks[max6875_register_config], 4) < 0))
+                goto exit_kfree;
+
+        /* 0x41,0x42 must be zero and 0x40 must match in eeprom and registers */
+        if ((data->blocks[max6875_eeprom_config].data[0x41] != 0) ||
+            (data->blocks[max6875_eeprom_config].data[0x42] != 0) ||
+            (data->blocks[max6875_register_config].data[0x41] != 0) ||
+            (data->blocks[max6875_register_config].data[0x42] != 0) ||
+            (data->blocks[max6875_eeprom_config].data[0x40] !=
+             data->blocks[max6875_register_config].data[0x40]))
+                goto exit_kfree;
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(new_client)))
+                goto exit_kfree;
+
+        /* create the sysfs eeprom files with the correct permissions */
+        if (allow_write == 0) {
+                user_eeprom_attr.attr.mode &= ~S_IWUGO;
+                user_eeprom_attr.write = NULL;
+                config_eeprom_attr.attr.mode &= ~S_IWUGO;
+                config_eeprom_attr.write = NULL;
+                config_register_attr.attr.mode &= ~S_IWUGO;
+                config_register_attr.write = NULL;
+        }
+        sysfs_create_bin_file(&new_client->dev.kobj, &user_eeprom_attr);
+        sysfs_create_bin_file(&new_client->dev.kobj, &config_eeprom_attr);
+        sysfs_create_bin_file(&new_client->dev.kobj, &config_register_attr);
+
+        return 0;
+
+exit_kfree:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int max6875_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        err = i2c_detach_client(client);
+        if (err) {
+                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+                return err;
+        }
+
+        kfree(i2c_get_clientdata(client));
+
+        return 0;
+}
+
+static int __init max6875_init(void)
+{
+        return i2c_add_driver(&max6875_driver);
+}
+
+static void __exit max6875_exit(void)
+{
+        i2c_del_driver(&max6875_driver);
+}
+
+
+MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
+MODULE_DESCRIPTION("MAX6875 driver");
+MODULE_LICENSE("GPL");
+
+module_init(max6875_init);
+module_exit(max6875_exit);
diff --git a/drivers/i2c/chips/pc87360.c b/drivers/i2c/chips/pc87360.c
index 65637b2cd170..876c68f3af31 100644
--- a/drivers/i2c/chips/pc87360.c
+++ b/drivers/i2c/chips/pc87360.c
@@ -33,7 +33,6 @@
  *  the standard Super-I/O addresses is used (0x2E/0x2F or 0x4E/0x4F).
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
new file mode 100644
index 000000000000..9f3ad45daae2
--- /dev/null
+++ b/drivers/i2c/chips/pca9539.c
@@ -0,0 +1,192 @@
+/*
+    pca9539.c - 16-bit I/O port with interrupt and reset
+
+    Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/i2c-sensor.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = {0x74, 0x75, 0x76, 0x77, I2C_CLIENT_END};
+static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
+
+/* Insmod parameters */
+SENSORS_INSMOD_1(pca9539);
+
+enum pca9539_cmd
+{
+        PCA9539_INPUT_0         = 0,
+        PCA9539_INPUT_1         = 1,
+        PCA9539_OUTPUT_0        = 2,
+        PCA9539_OUTPUT_1        = 3,
+        PCA9539_INVERT_0        = 4,
+        PCA9539_INVERT_1        = 5,
+        PCA9539_DIRECTION_0     = 6,
+        PCA9539_DIRECTION_1     = 7,
+};
+
+static int pca9539_attach_adapter(struct i2c_adapter *adapter);
+static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind);
+static int pca9539_detach_client(struct i2c_client *client);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver pca9539_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "pca9539",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = pca9539_attach_adapter,
+        .detach_client  = pca9539_detach_client,
+};
+
+struct pca9539_data {
+        struct i2c_client client;
+};
+
+/* following are the sysfs callback functions */
+static ssize_t pca9539_show(struct device *dev, struct device_attribute *attr,
+                            char *buf)
+{
+        struct sensor_device_attribute *psa = to_sensor_dev_attr(attr);
+        struct i2c_client *client = to_i2c_client(dev);
+        return sprintf(buf, "%d\n", i2c_smbus_read_byte_data(client,
+                                                             psa->index));
+}
+
+static ssize_t pca9539_store(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
+{
+        struct sensor_device_attribute *psa = to_sensor_dev_attr(attr);
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val = simple_strtoul(buf, NULL, 0);
+        if (val > 0xff)
+                return -EINVAL;
+        i2c_smbus_write_byte_data(client, psa->index, val);
+        return count;
+}
+
+/* Define the device attributes */
+
+#define PCA9539_ENTRY_RO(name, cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, pca9539_show, NULL, cmd_idx)
+
+#define PCA9539_ENTRY_RW(name, cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO | S_IWUSR, pca9539_show, \
+                                  pca9539_store, cmd_idx)
+
+PCA9539_ENTRY_RO(input0, PCA9539_INPUT_0);
+PCA9539_ENTRY_RO(input1, PCA9539_INPUT_1);
+PCA9539_ENTRY_RW(output0, PCA9539_OUTPUT_0);
+PCA9539_ENTRY_RW(output1, PCA9539_OUTPUT_1);
+PCA9539_ENTRY_RW(invert0, PCA9539_INVERT_0);
+PCA9539_ENTRY_RW(invert1, PCA9539_INVERT_1);
+PCA9539_ENTRY_RW(direction0, PCA9539_DIRECTION_0);
+PCA9539_ENTRY_RW(direction1, PCA9539_DIRECTION_1);
+
+static struct attribute *pca9539_attributes[] = {
+        &sensor_dev_attr_input0.dev_attr.attr,
+        &sensor_dev_attr_input1.dev_attr.attr,
+        &sensor_dev_attr_output0.dev_attr.attr,
+        &sensor_dev_attr_output1.dev_attr.attr,
+        &sensor_dev_attr_invert0.dev_attr.attr,
+        &sensor_dev_attr_invert1.dev_attr.attr,
+        &sensor_dev_attr_direction0.dev_attr.attr,
+        &sensor_dev_attr_direction1.dev_attr.attr,
+        NULL
+};
+
+static struct attribute_group pca9539_defattr_group = {
+        .attrs = pca9539_attributes,
+};
+
+static int pca9539_attach_adapter(struct i2c_adapter *adapter)
+{
+        return i2c_detect(adapter, &addr_data, pca9539_detect);
+}
+
+/* This function is called by i2c_detect */
+static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *new_client;
+        struct pca9539_data *data;
+        int err = 0;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet. */
+        if (!(data = kmalloc(sizeof(struct pca9539_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+        memset(data, 0, sizeof(struct pca9539_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &pca9539_driver;
+        new_client->flags = 0;
+
+        /* Detection: the pca9539 only has 8 registers (0-7).
+           A read of 7 should succeed, but a read of 8 should fail. */
+        if ((i2c_smbus_read_byte_data(new_client, 7) < 0) ||
+            (i2c_smbus_read_byte_data(new_client, 8) >= 0))
+                goto exit_kfree;
+
+        strlcpy(new_client->name, "pca9539", I2C_NAME_SIZE);
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(new_client)))
+                goto exit_kfree;
+
+        /* Register sysfs hooks (don't care about failure) */
+        sysfs_create_group(&new_client->dev.kobj, &pca9539_defattr_group);
+
+        return 0;
+
+exit_kfree:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int pca9539_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        if ((err = i2c_detach_client(client))) {
+                dev_err(&client->dev, "Client deregistration failed.\n");
+                return err;
+        }
+
+        kfree(i2c_get_clientdata(client));
+        return 0;
+}
+
+static int __init pca9539_init(void)
+{
+        return i2c_add_driver(&pca9539_driver);
+}
+
+static void __exit pca9539_exit(void)
+{
+        i2c_del_driver(&pca9539_driver);
+}
+
+MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
+MODULE_DESCRIPTION("PCA9539 driver");
+MODULE_LICENSE("GPL");
+
+module_init(pca9539_init);
+module_exit(pca9539_exit);
+
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index 4956e9effd75..cfcf64654080 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -57,7 +57,7 @@ SENSORS_INSMOD_2(pcf8574, pcf8574a);
 struct pcf8574_data {
         struct i2c_client client;
 
-        u8 read, write;                 /* Register values */
+        u8 write;                       /* Remember last written value */
 };
 
 static int pcf8574_attach_adapter(struct i2c_adapter *adapter);
@@ -79,9 +79,7 @@ static struct i2c_driver pcf8574_driver = {
 static ssize_t show_read(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
-        struct pcf8574_data *data = i2c_get_clientdata(client);
-        data->read = i2c_smbus_read_byte(client); 
-        return sprintf(buf, "%u\n", data->read);
+        return sprintf(buf, "%u\n", i2c_smbus_read_byte(client));
 }
 
 static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 5a9deddb626b..588fc2261a91 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -19,7 +19,6 @@
 #include <linux/string.h>
 #include <linux/rtc.h>          /* get the user-level API */
 #include <linux/init.h>
-#include <linux/init.h>
 
 #include "rtc8564.h"
 
@@ -66,11 +65,8 @@ static unsigned short normal_addr[] = { 0x51, I2C_CLIENT_END };
 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
-        .normal_i2c_range       = ignore,
         .probe                  = ignore,
-        .probe_range            = ignore,
         .ignore                 = ignore,
-        .ignore_range           = ignore,
         .force                  = ignore,
 };
 
diff --git a/drivers/i2c/chips/sis5595.c b/drivers/i2c/chips/sis5595.c
index c6650727a27d..6bbfc8fb4f13 100644
--- a/drivers/i2c/chips/sis5595.c
+++ b/drivers/i2c/chips/sis5595.c
@@ -57,6 +57,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 
 
diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/i2c/chips/smsc47m1.c
index 13d6d4a8bc7d..897117a7213f 100644
--- a/drivers/i2c/chips/smsc47m1.c
+++ b/drivers/i2c/chips/smsc47m1.c
@@ -372,14 +372,16 @@ static int smsc47m1_find(int *address)
          * SMSC LPC47M10x/LPC47M13x (device id 0x59), LPC47M14x (device id
          * 0x5F) and LPC47B27x (device id 0x51) have fan control.
          * The LPC47M15x and LPC47M192 chips "with hardware monitoring block"
-         * can do much more besides (device id 0x60, unsupported).
+         * can do much more besides (device id 0x60).
          */
         if (val == 0x51)
-                printk(KERN_INFO "smsc47m1: Found SMSC47B27x\n");
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n");
         else if (val == 0x59)
-                printk(KERN_INFO "smsc47m1: Found SMSC47M10x/SMSC47M13x\n");
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M10x/LPC47M13x\n");
         else if (val == 0x5F)
-                printk(KERN_INFO "smsc47m1: Found SMSC47M14x\n");
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n");
+        else if (val == 0x60)
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M15x/LPC47M192\n");
         else {
                 superio_exit();
                 return -ENODEV;
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
new file mode 100644
index 000000000000..c0ac01b60039
--- /dev/null
+++ b/drivers/i2c/chips/tps65010.c
@@ -0,0 +1,1072 @@
+/*
+ * tps65010 - driver for tps6501x power management chips
+ *
+ * Copyright (C) 2004 Texas Instruments
+ * Copyright (C) 2004-2005 David Brownell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#undef  DEBUG
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/suspend.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+
+#include <asm/arch/gpio.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/tps65010.h>
+
+/*-------------------------------------------------------------------------*/
+
+#define DRIVER_VERSION  "2 May 2005"
+#define DRIVER_NAME     (tps65010_driver.name)
+
+MODULE_DESCRIPTION("TPS6501x Power Management Driver");
+MODULE_LICENSE("GPL");
+
+/* only two addresses possible */
+#define TPS_BASE        0x48
+static unsigned short normal_i2c[] = {
+        TPS_BASE,
+        I2C_CLIENT_END };
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
+static struct i2c_driver tps65010_driver;
+
+/*-------------------------------------------------------------------------*/
+
+/* This driver handles a family of multipurpose chips, which incorporate
+ * voltage regulators, lithium ion/polymer battery charging, GPIOs, LEDs,
+ * and other features often needed in portable devices like cell phones
+ * or digital cameras.
+ *
+ * The tps65011 and tps65013 have different voltage settings compared
+ * to tps65010 and tps65012.  The tps65013 has a NO_CHG status/irq.
+ * All except tps65010 have "wait" mode, possibly defaulted so that
+ * battery-insert != device-on.
+ *
+ * We could distinguish between some models by checking VDCDC1.UVLO or
+ * other registers, unless they've been changed already after powerup
+ * as part of board setup by a bootloader.
+ */
+enum tps_model {
+        TPS_UNKNOWN = 0,
+        TPS65010,
+        TPS65011,
+        TPS65012,
+        TPS65013,
+};
+
+struct tps65010 {
+        struct i2c_client       client;
+        struct semaphore        lock;
+        int                     irq;
+        struct work_struct      work;
+        struct dentry           *file;
+        unsigned                charging:1;
+        unsigned                por:1;
+        unsigned                model:8;
+        u16                     vbus;
+        unsigned long           flags;
+#define FLAG_VBUS_CHANGED       0
+#define FLAG_IRQ_ENABLE         1
+
+        /* copies of last register state */
+        u8                      chgstatus, regstatus, chgconf;
+        u8                      nmask1, nmask2;
+
+        /* plus four GPIOs, probably used to switch power */
+};
+
+#define POWER_POLL_DELAY        msecs_to_jiffies(800)
+
+/*-------------------------------------------------------------------------*/
+
+#if     defined(DEBUG) || defined(CONFIG_DEBUG_FS)
+
+static void dbg_chgstat(char *buf, size_t len, u8 chgstatus)
+{
+        snprintf(buf, len, "%02x%s%s%s%s%s%s%s%s\n",
+                chgstatus,
+                (chgstatus & TPS_CHG_USB) ? " USB" : "",
+                (chgstatus & TPS_CHG_AC) ? " AC" : "",
+                (chgstatus & TPS_CHG_THERM) ? " therm" : "",
+                (chgstatus & TPS_CHG_TERM) ? " done" :
+                        ((chgstatus & (TPS_CHG_USB|TPS_CHG_AC))
+                                ? " (charging)" : ""),
+                (chgstatus & TPS_CHG_TAPER_TMO) ? " taper_tmo" : "",
+                (chgstatus & TPS_CHG_CHG_TMO) ? " charge_tmo" : "",
+                (chgstatus & TPS_CHG_PRECHG_TMO) ? " prechg_tmo" : "",
+                (chgstatus & TPS_CHG_TEMP_ERR) ? " temp_err" : "");
+}
+
+static void dbg_regstat(char *buf, size_t len, u8 regstatus)
+{
+        snprintf(buf, len, "%02x %s%s%s%s%s%s%s%s\n",
+                regstatus,
+                (regstatus & TPS_REG_ONOFF) ? "off" : "(on)",
+                (regstatus & TPS_REG_COVER) ? " uncover" : "",
+                (regstatus & TPS_REG_UVLO) ? " UVLO" : "",
+                (regstatus & TPS_REG_NO_CHG) ? " NO_CHG" : "",
+                (regstatus & TPS_REG_PG_LD02) ? " ld01_bad" : "",
+                (regstatus & TPS_REG_PG_LD01) ? " ld01_bad" : "",
+                (regstatus & TPS_REG_PG_MAIN) ? " main_bad" : "",
+                (regstatus & TPS_REG_PG_CORE) ? " core_bad" : "");
+}
+
+static void dbg_chgconf(int por, char *buf, size_t len, u8 chgconfig)
+{
+        char *hibit;
+
+        if (por)
+                hibit = (chgconfig & TPS_CHARGE_POR)
+                                ? "POR=69ms" : "POR=1sec";
+        else
+                hibit = (chgconfig & TPS65013_AUA) ? "AUA" : "";
+
+        snprintf(buf, len, "%02x %s%s%s AC=%d%% USB=%dmA %sCharge\n",
+                chgconfig, hibit,
+                (chgconfig & TPS_CHARGE_RESET) ? " reset" : "",
+                (chgconfig & TPS_CHARGE_FAST) ? " fast" : "",
+                ({int p; switch ((chgconfig >> 3) & 3) {
+                case 3:         p = 100; break;
+                case 2:         p = 75; break;
+                case 1:         p = 50; break;
+                default:        p = 25; break;
+                }; p; }),
+                (chgconfig & TPS_VBUS_CHARGING)
+                        ? ((chgconfig & TPS_VBUS_500MA) ? 500 : 100)
+                        : 0,
+                (chgconfig & TPS_CHARGE_ENABLE) ? "" : "No");
+}
+
+#endif
+
+#ifdef  DEBUG
+
+static void show_chgstatus(const char *label, u8 chgstatus)
+{
+        char buf [100];
+
+        dbg_chgstat(buf, sizeof buf, chgstatus);
+        pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
+}
+
+static void show_regstatus(const char *label, u8 regstatus)
+{
+        char buf [100];
+
+        dbg_regstat(buf, sizeof buf, regstatus);
+        pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
+}
+
+static void show_chgconfig(int por, const char *label, u8 chgconfig)
+{
+        char buf [100];
+
+        dbg_chgconf(por, buf, sizeof buf, chgconfig);
+        pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
+}
+
+#else
+
+static inline void show_chgstatus(const char *label, u8 chgstatus) { }
+static inline void show_regstatus(const char *label, u8 chgstatus) { }
+static inline void show_chgconfig(int por, const char *label, u8 chgconfig) { }
+
+#endif
+
+#ifdef  CONFIG_DEBUG_FS
+
+static int dbg_show(struct seq_file *s, void *_)
+{
+        struct tps65010 *tps = s->private;
+        u8              value, v2;
+        unsigned        i;
+        char            buf[100];
+        const char      *chip;
+
+        switch (tps->model) {
+        case TPS65010:  chip = "tps65010"; break;
+        case TPS65011:  chip = "tps65011"; break;
+        case TPS65012:  chip = "tps65012"; break;
+        case TPS65013:  chip = "tps65013"; break;
+        default:        chip = NULL; break;
+        }
+        seq_printf(s, "driver  %s\nversion %s\nchip    %s\n\n",
+                        DRIVER_NAME, DRIVER_VERSION, chip);
+
+        down(&tps->lock);
+
+        /* FIXME how can we tell whether a battery is present?
+         * likely involves a charge gauging chip (like BQ26501).
+         */
+
+        seq_printf(s, "%scharging\n\n", tps->charging ? "" : "(not) ");
+
+
+        /* registers for monitoring battery charging and status; note
+         * that reading chgstat and regstat may ack IRQs...
+         */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_CHGCONFIG);
+        dbg_chgconf(tps->por, buf, sizeof buf, value);
+        seq_printf(s, "chgconfig %s", buf);
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_CHGSTATUS);
+        dbg_chgstat(buf, sizeof buf, value);
+        seq_printf(s, "chgstat   %s", buf);
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_MASK1);
+        dbg_chgstat(buf, sizeof buf, value);
+        seq_printf(s, "mask1     %s", buf);
+        /* ignore ackint1 */
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_REGSTATUS);
+        dbg_regstat(buf, sizeof buf, value);
+        seq_printf(s, "regstat   %s", buf);
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_MASK2);
+        dbg_regstat(buf, sizeof buf, value);
+        seq_printf(s, "mask2     %s\n", buf);
+        /* ignore ackint2 */
+
+        (void) schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
+
+
+        /* VMAIN voltage, enable lowpower, etc */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC1);
+        seq_printf(s, "vdcdc1    %02x\n", value);
+
+        /* VCORE voltage, vibrator on/off */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC2);
+        seq_printf(s, "vdcdc2    %02x\n", value);
+
+        /* both LD0s, and their lowpower behavior */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_VREGS1);
+        seq_printf(s, "vregs1    %02x\n\n", value);
+
+
+        /* LEDs and GPIOs */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_LED1_ON);
+        v2 = i2c_smbus_read_byte_data(&tps->client, TPS_LED1_PER);
+        seq_printf(s, "led1 %s, on=%02x, per=%02x, %d/%d msec\n",
+                (value & 0x80)
+                        ? ((v2 & 0x80) ? "on" : "off")
+                        : ((v2 & 0x80) ? "blink" : "(nPG)"),
+                value, v2,
+                (value & 0x7f) * 10, (v2 & 0x7f) * 100);
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_LED2_ON);
+        v2 = i2c_smbus_read_byte_data(&tps->client, TPS_LED2_PER);
+        seq_printf(s, "led2 %s, on=%02x, per=%02x, %d/%d msec\n",
+                (value & 0x80)
+                        ? ((v2 & 0x80) ? "on" : "off")
+                        : ((v2 & 0x80) ? "blink" : "off"),
+                value, v2,
+                (value & 0x7f) * 10, (v2 & 0x7f) * 100);
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_DEFGPIO);
+        v2 = i2c_smbus_read_byte_data(&tps->client, TPS_MASK3);
+        seq_printf(s, "defgpio %02x mask3 %02x\n", value, v2);
+
+        for (i = 0; i < 4; i++) {
+                if (value & (1 << (4 +i)))
+                        seq_printf(s, "  gpio%d-out %s\n", i + 1,
+                                (value & (1 << i)) ? "low" : "hi ");
+                else
+                        seq_printf(s, "  gpio%d-in  %s %s %s\n", i + 1,
+                                (value & (1 << i)) ? "hi " : "low",
+                                (v2 & (1 << i)) ? "no-irq" : "irq",
+                                (v2 & (1 << (4 + i))) ? "rising" : "falling");
+        }
+
+        up(&tps->lock);
+        return 0;
+}
+
+static int dbg_tps_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, dbg_show, inode->u.generic_ip);
+}
+
+static struct file_operations debug_fops = {
+        .open           = dbg_tps_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+#define DEBUG_FOPS      &debug_fops
+
+#else
+#define DEBUG_FOPS      NULL
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+/* handle IRQS in a task context, so we can use I2C calls */
+static void tps65010_interrupt(struct tps65010 *tps)
+{
+        u8 tmp = 0, mask, poll;
+
+        /* IRQs won't trigger irqs for certain events, but we can get
+         * others by polling (normally, with external power applied).
+         */
+        poll = 0;
+
+        /* regstatus irqs */
+        if (tps->nmask2) {
+                tmp = i2c_smbus_read_byte_data(&tps->client, TPS_REGSTATUS);
+                mask = tmp ^ tps->regstatus;
+                tps->regstatus = tmp;
+                mask &= tps->nmask2;
+        } else
+                mask = 0;
+        if (mask) {
+                tps->regstatus =  tmp;
+                /* may need to shut something down ... */
+
+                /* "off" usually means deep sleep */
+                if (tmp & TPS_REG_ONOFF) {
+                        pr_info("%s: power off button\n", DRIVER_NAME);
+#if 0
+                        /* REVISIT:  this might need its own workqueue
+                         * plus tweaks including deadlock avoidance ...
+                         */
+                        software_suspend();
+#endif
+                        poll = 1;
+                }
+        }
+
+        /* chgstatus irqs */
+        if (tps->nmask1) {
+                tmp = i2c_smbus_read_byte_data(&tps->client, TPS_CHGSTATUS);
+                mask = tmp ^ tps->chgstatus;
+                tps->chgstatus = tmp;
+                mask &= tps->nmask1;
+        } else
+                mask = 0;
+        if (mask) {
+                unsigned        charging = 0;
+
+                show_chgstatus("chg/irq", tmp);
+                if (tmp & (TPS_CHG_USB|TPS_CHG_AC))
+                        show_chgconfig(tps->por, "conf", tps->chgconf);
+
+                /* Unless it was turned off or disabled, we charge any
+                 * battery whenever there's power available for it
+                 * and the charger hasn't been disabled.
+                 */
+                if (!(tps->chgstatus & ~(TPS_CHG_USB|TPS_CHG_AC))
+                                && (tps->chgstatus & (TPS_CHG_USB|TPS_CHG_AC))
+                                && (tps->chgconf & TPS_CHARGE_ENABLE)
+                                ) {
+                        if (tps->chgstatus & TPS_CHG_USB) {
+                                /* VBUS options are readonly until reconnect */
+                                if (mask & TPS_CHG_USB)
+                                        set_bit(FLAG_VBUS_CHANGED, &tps->flags);
+                                charging = 1;
+                        } else if (tps->chgstatus & TPS_CHG_AC)
+                                charging = 1;
+                }
+                if (charging != tps->charging) {
+                        tps->charging = charging;
+                        pr_info("%s: battery %scharging\n",
+                                DRIVER_NAME, charging ? "" :
+                                ((tps->chgstatus & (TPS_CHG_USB|TPS_CHG_AC))
+                                        ? "NOT " : "dis"));
+                }
+        }
+
+        /* always poll to detect (a) power removal, without tps65013
+         * NO_CHG IRQ; or (b) restart of charging after stop.
+         */
+        if ((tps->model != TPS65013 || !tps->charging)
+                        && (tps->chgstatus & (TPS_CHG_USB|TPS_CHG_AC)))
+                poll = 1;
+        if (poll)
+                (void) schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
+
+        /* also potentially gpio-in rise or fall */
+}
+
+/* handle IRQs and polling using keventd for now */
+static void tps65010_work(void *_tps)
+{
+        struct tps65010         *tps = _tps;
+
+        down(&tps->lock);
+
+        tps65010_interrupt(tps);
+
+        if (test_and_clear_bit(FLAG_VBUS_CHANGED, &tps->flags)) {
+                int     status;
+                u8      chgconfig, tmp;
+
+                chgconfig = i2c_smbus_read_byte_data(&tps->client,
+                                        TPS_CHGCONFIG);
+                chgconfig &= ~(TPS_VBUS_500MA | TPS_VBUS_CHARGING);
+                if (tps->vbus == 500)
+                        chgconfig |= TPS_VBUS_500MA | TPS_VBUS_CHARGING;
+                else if (tps->vbus >= 100)
+                        chgconfig |= TPS_VBUS_CHARGING;
+
+                status = i2c_smbus_write_byte_data(&tps->client,
+                                TPS_CHGCONFIG, chgconfig);
+
+                /* vbus update fails unless VBUS is connected! */
+                tmp = i2c_smbus_read_byte_data(&tps->client, TPS_CHGCONFIG);
+                tps->chgconf = tmp;
+                show_chgconfig(tps->por, "update vbus", tmp);
+        }
+
+        if (test_and_clear_bit(FLAG_IRQ_ENABLE, &tps->flags))
+                enable_irq(tps->irq);
+
+        up(&tps->lock);
+}
+
+static irqreturn_t tps65010_irq(int irq, void *_tps, struct pt_regs *regs)
+{
+        struct tps65010         *tps = _tps;
+
+        disable_irq_nosync(irq);
+        set_bit(FLAG_IRQ_ENABLE, &tps->flags);
+        (void) schedule_work(&tps->work);
+        return IRQ_HANDLED;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static struct tps65010 *the_tps;
+
+static int __exit tps65010_detach_client(struct i2c_client *client)
+{
+        struct tps65010         *tps;
+
+        tps = container_of(client, struct tps65010, client);
+#ifdef  CONFIG_ARM
+        if (machine_is_omap_h2())
+                omap_free_gpio(58);
+        if (machine_is_omap_osk())
+                omap_free_gpio(OMAP_MPUIO(1));
+#endif
+        free_irq(tps->irq, tps);
+        debugfs_remove(tps->file);
+        if (i2c_detach_client(client) == 0)
+                kfree(tps);
+        the_tps = 0;
+        return 0;
+}
+
+static int tps65010_noscan(struct i2c_adapter *bus)
+{
+        /* pure paranoia, in case someone adds another i2c bus
+         * after our init section's gone...
+         */
+        return -ENODEV;
+}
+
+/* no error returns, they'd just make bus scanning stop */
+static int __init
+tps65010_probe(struct i2c_adapter *bus, int address, int kind)
+{
+        struct tps65010         *tps;
+        int                     status;
+
+        if (the_tps) {
+                dev_dbg(&bus->dev, "only one %s for now\n", DRIVER_NAME);
+                return 0;
+        }
+
+        tps = kmalloc(sizeof *tps, GFP_KERNEL);
+        if (!tps)
+                return 0;
+
+        memset(tps, 0, sizeof *tps);
+        init_MUTEX(&tps->lock);
+        INIT_WORK(&tps->work, tps65010_work, tps);
+        tps->irq = -1;
+        tps->client.addr = address;
+        i2c_set_clientdata(&tps->client, tps);
+        tps->client.adapter = bus;
+        tps->client.driver = &tps65010_driver;
+        strlcpy(tps->client.name, DRIVER_NAME, I2C_NAME_SIZE);
+
+        status = i2c_attach_client(&tps->client);
+        if (status < 0) {
+                dev_dbg(&bus->dev, "can't attach %s to device %d, err %d\n",
+                                DRIVER_NAME, address, status);
+fail1:
+                kfree(tps);
+                return 0;
+        }
+
+#ifdef  CONFIG_ARM
+        if (machine_is_omap_h2()) {
+                tps->model = TPS65010;
+                omap_cfg_reg(W4_GPIO58);
+                tps->irq = OMAP_GPIO_IRQ(58);
+                omap_request_gpio(58);
+                omap_set_gpio_direction(58, 1);
+                omap_set_gpio_edge_ctrl(58, OMAP_GPIO_FALLING_EDGE);
+        }
+        if (machine_is_omap_osk()) {
+                tps->model = TPS65010;
+                // omap_cfg_reg(U19_1610_MPUIO1);
+                tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1));
+                omap_request_gpio(OMAP_MPUIO(1));
+                omap_set_gpio_direction(OMAP_MPUIO(1), 1);
+                omap_set_gpio_edge_ctrl(OMAP_MPUIO(1), OMAP_GPIO_FALLING_EDGE);
+        }
+        if (machine_is_omap_h3()) {
+                tps->model = TPS65013;
+
+                // FIXME set up this board's IRQ ...
+        }
+#else
+#define set_irq_type(num,trigger)       do{}while(0)
+#endif
+
+        if (tps->irq > 0) {
+                set_irq_type(tps->irq, IRQT_LOW);
+                status = request_irq(tps->irq, tps65010_irq,
+                        SA_SAMPLE_RANDOM, DRIVER_NAME, tps);
+                if (status < 0) {
+                        dev_dbg(&tps->client.dev, "can't get IRQ %d, err %d\n",
+                                        tps->irq, status);
+                        i2c_detach_client(&tps->client);
+                        goto fail1;
+                }
+#ifdef  CONFIG_ARM
+                /* annoying race here, ideally we'd have an option
+                 * to claim the irq now and enable it later.
+                 */
+                disable_irq(tps->irq);
+                set_bit(FLAG_IRQ_ENABLE, &tps->flags);
+#endif
+        } else
+                printk(KERN_WARNING "%s: IRQ not configured!\n",
+                                DRIVER_NAME);
+
+
+        switch (tps->model) {
+        case TPS65010:
+        case TPS65012:
+                tps->por = 1;
+                break;
+        case TPS_UNKNOWN:
+                printk(KERN_WARNING "%s: unknown TPS chip\n", DRIVER_NAME);
+                break;
+        /* else CHGCONFIG.POR is replaced by AUA, enabling a WAIT mode */
+        }
+        tps->chgconf = i2c_smbus_read_byte_data(&tps->client, TPS_CHGCONFIG);
+        show_chgconfig(tps->por, "conf/init", tps->chgconf);
+
+        show_chgstatus("chg/init",
+                i2c_smbus_read_byte_data(&tps->client, TPS_CHGSTATUS));
+        show_regstatus("reg/init",
+                i2c_smbus_read_byte_data(&tps->client, TPS_REGSTATUS));
+
+        pr_debug("%s: vdcdc1 0x%02x, vdcdc2 %02x, vregs1 %02x\n", DRIVER_NAME,
+                i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC1),
+                i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC2),
+                i2c_smbus_read_byte_data(&tps->client, TPS_VREGS1));
+        pr_debug("%s: defgpio 0x%02x, mask3 0x%02x\n", DRIVER_NAME,
+                i2c_smbus_read_byte_data(&tps->client, TPS_DEFGPIO),
+                i2c_smbus_read_byte_data(&tps->client, TPS_MASK3));
+
+        tps65010_driver.attach_adapter = tps65010_noscan;
+        the_tps = tps;
+
+#if     defined(CONFIG_USB_GADGET) && !defined(CONFIG_USB_OTG)
+        /* USB hosts can't draw VBUS.  OTG devices could, later
+         * when OTG infrastructure enables it.  USB peripherals
+         * could be relying on VBUS while booting, though.
+         */
+        tps->vbus = 100;
+#endif
+
+        /* unmask the "interesting" irqs, then poll once to
+         * kickstart monitoring, initialize shadowed status
+         * registers, and maybe disable VBUS draw.
+         */
+        tps->nmask1 = ~0;
+        (void) i2c_smbus_write_byte_data(&tps->client, TPS_MASK1, ~tps->nmask1);
+
+        tps->nmask2 = TPS_REG_ONOFF;
+        if (tps->model == TPS65013)
+                tps->nmask2 |= TPS_REG_NO_CHG;
+        (void) i2c_smbus_write_byte_data(&tps->client, TPS_MASK2, ~tps->nmask2);
+
+        (void) i2c_smbus_write_byte_data(&tps->client, TPS_MASK3, 0x0f
+                | i2c_smbus_read_byte_data(&tps->client, TPS_MASK3));
+
+        tps65010_work(tps);
+
+        tps->file = debugfs_create_file(DRIVER_NAME, S_IRUGO, NULL,
+                                tps, DEBUG_FOPS);
+        return 0;
+}
+
+static int __init tps65010_scan_bus(struct i2c_adapter *bus)
+{
+        if (!i2c_check_functionality(bus, I2C_FUNC_SMBUS_BYTE_DATA))
+                return -EINVAL;
+        return i2c_probe(bus, &addr_data, tps65010_probe);
+}
+
+static struct i2c_driver tps65010_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "tps65010",
+        .id             = 888,          /* FIXME assign "official" value */
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = tps65010_scan_bus,
+        .detach_client  = __exit_p(tps65010_detach_client),
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* Draw from VBUS:
+ *   0 mA -- DON'T DRAW (might supply power instead)
+ * 100 mA -- usb unit load (slowest charge rate)
+ * 500 mA -- usb high power (fast battery charge)
+ */
+int tps65010_set_vbus_draw(unsigned mA)
+{
+        unsigned long   flags;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        /* assumes non-SMP */
+        local_irq_save(flags);
+        if (mA >= 500)
+                mA = 500;
+        else if (mA >= 100)
+                mA = 100;
+        else
+                mA = 0;
+        the_tps->vbus = mA;
+        if ((the_tps->chgstatus & TPS_CHG_USB)
+                        && test_and_set_bit(
+                                FLAG_VBUS_CHANGED, &the_tps->flags)) {
+                /* gadget drivers call this in_irq() */
+                (void) schedule_work(&the_tps->work);
+        }
+        local_irq_restore(flags);
+
+        return 0;
+}
+EXPORT_SYMBOL(tps65010_set_vbus_draw);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_gpio_out_value parameter:
+ * gpio:  GPIO1, GPIO2, GPIO3 or GPIO4
+ * value: LOW or HIGH
+ */
+int tps65010_set_gpio_out_value(unsigned gpio, unsigned value)
+{
+        int      status;
+        unsigned defgpio;
+
+        if (!the_tps)
+                return -ENODEV;
+        if ((gpio < GPIO1) || (gpio > GPIO4))
+                return -EINVAL;
+
+        down(&the_tps->lock);
+
+        defgpio = i2c_smbus_read_byte_data(&the_tps->client, TPS_DEFGPIO);
+
+        /* Configure GPIO for output */
+        defgpio |= 1 << (gpio + 3);
+
+        /* Writing 1 forces a logic 0 on that GPIO and vice versa */
+        switch (value) {
+        case LOW:
+                defgpio |= 1 << (gpio - 1);    /* set GPIO low by writing 1 */
+                break;
+        /* case HIGH: */
+        default:
+                defgpio &= ~(1 << (gpio - 1)); /* set GPIO high by writing 0 */
+                break;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                TPS_DEFGPIO, defgpio);
+
+        pr_debug("%s: gpio%dout = %s, defgpio 0x%02x\n", DRIVER_NAME,
+                gpio, value ? "high" : "low",
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_DEFGPIO));
+
+        up(&the_tps->lock);
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_gpio_out_value);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_led parameter:
+ * led:  LED1 or LED2
+ * mode: ON, OFF or BLINK
+ */
+int tps65010_set_led(unsigned led, unsigned mode)
+{
+        int      status;
+        unsigned led_on, led_per, offs;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        if(led == LED1)
+                offs = 0;
+        else {
+                offs = 2;
+                led = LED2;
+        }
+
+        down(&the_tps->lock);
+
+        dev_dbg (&the_tps->client.dev, "led%i_on   0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_ON + offs));
+
+        dev_dbg (&the_tps->client.dev, "led%i_per  0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_PER + offs));
+
+        switch (mode) {
+        case OFF:
+                led_on  = 1 << 7;
+                led_per = 0 << 7;
+                break;
+        case ON:
+                led_on  = 1 << 7;
+                led_per = 1 << 7;
+                break;
+        case BLINK:
+                led_on  = 0x30 | (0 << 7);
+                led_per = 0x08 | (1 << 7);
+                break;
+        default:
+                printk(KERN_ERR "%s: Wrong mode parameter for tps65010_set_led()\n",
+                       DRIVER_NAME);
+                up(&the_tps->lock);
+                return -EINVAL;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_LED1_ON + offs, led_on);
+
+        if (status != 0) {
+                printk(KERN_ERR "%s: Failed to write led%i_on register\n",
+                       DRIVER_NAME, led);
+                up(&the_tps->lock);
+                return status;
+        }
+
+        dev_dbg (&the_tps->client.dev, "led%i_on   0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_ON + offs));
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_LED1_PER + offs, led_per);
+
+        if (status != 0) {
+                printk(KERN_ERR "%s: Failed to write led%i_per register\n",
+                       DRIVER_NAME, led);
+                up(&the_tps->lock);
+                return status;
+        }
+
+        dev_dbg (&the_tps->client.dev, "led%i_per  0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_PER + offs));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_led);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_vib parameter:
+ * value: ON or OFF
+ */
+int tps65010_set_vib(unsigned value)
+{
+        int      status;
+        unsigned vdcdc2;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        vdcdc2 = i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC2);
+        vdcdc2 &= ~(1 << 1);
+        if (value)
+                vdcdc2 |= (1 << 1);
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                TPS_VDCDC2, vdcdc2);
+
+        pr_debug("%s: vibrator %s\n", DRIVER_NAME, value ? "on" : "off");
+
+        up(&the_tps->lock);
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_vib);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_low_pwr parameter:
+ * mode: ON or OFF
+ */
+int tps65010_set_low_pwr(unsigned mode)
+{
+        int      status;
+        unsigned vdcdc1;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        pr_debug("%s: %s low_pwr, vdcdc1 0x%02x\n", DRIVER_NAME,
+                mode ? "enable" : "disable",
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        vdcdc1 = i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1);
+
+        switch (mode) {
+        case OFF:
+                vdcdc1 &= ~TPS_ENABLE_LP; /* disable ENABLE_LP bit */
+                break;
+        /* case ON: */
+        default:
+                vdcdc1 |= TPS_ENABLE_LP;  /* enable ENABLE_LP bit */
+                break;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_VDCDC1, vdcdc1);
+
+        if (status != 0)
+                printk(KERN_ERR "%s: Failed to write vdcdc1 register\n",
+                       DRIVER_NAME);
+        else
+                pr_debug("%s: vdcdc1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_low_pwr);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_config_vregs1 parameter:
+ * value to be written to VREGS1 register
+ * Note: The complete register is written, set all bits you need
+ */
+int tps65010_config_vregs1(unsigned value)
+{
+        int      status;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_VREGS1, value);
+
+        if (status != 0)
+                printk(KERN_ERR "%s: Failed to write vregs1 register\n",
+                        DRIVER_NAME);
+        else
+                pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65010_config_vregs1);
+
+/*-------------------------------------------------------------------------*/
+/* tps65013_set_low_pwr parameter:
+ * mode: ON or OFF
+ */
+
+/* FIXME: Assumes AC or USB power is present. Setting AUA bit is not
+        required if power supply is through a battery */
+
+int tps65013_set_low_pwr(unsigned mode)
+{
+        int      status;
+        unsigned vdcdc1, chgconfig;
+
+        if (!the_tps || the_tps->por)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        pr_debug("%s: %s low_pwr, chgconfig 0x%02x vdcdc1 0x%02x\n",
+                DRIVER_NAME,
+                mode ? "enable" : "disable",
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_CHGCONFIG),
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        chgconfig = i2c_smbus_read_byte_data(&the_tps->client, TPS_CHGCONFIG);
+        vdcdc1 = i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1);
+
+        switch (mode) {
+        case OFF:
+                chgconfig &= ~TPS65013_AUA; /* disable AUA bit */
+                vdcdc1 &= ~TPS_ENABLE_LP; /* disable ENABLE_LP bit */
+                break;
+        /* case ON: */
+        default:
+                chgconfig |= TPS65013_AUA;  /* enable AUA bit */
+                vdcdc1 |= TPS_ENABLE_LP;  /* enable ENABLE_LP bit */
+                break;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_CHGCONFIG, chgconfig);
+        if (status != 0) {
+                printk(KERN_ERR "%s: Failed to write chconfig register\n",
+         DRIVER_NAME);
+                up(&the_tps->lock);
+                return status;
+        }
+
+        chgconfig = i2c_smbus_read_byte_data(&the_tps->client, TPS_CHGCONFIG);
+        the_tps->chgconf = chgconfig;
+        show_chgconfig(0, "chgconf", chgconfig);
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_VDCDC1, vdcdc1);
+
+        if (status != 0)
+                printk(KERN_ERR "%s: Failed to write vdcdc1 register\n",
+         DRIVER_NAME);
+        else
+                pr_debug("%s: vdcdc1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65013_set_low_pwr);
+
+/*-------------------------------------------------------------------------*/
+
+static int __init tps_init(void)
+{
+        u32     tries = 3;
+        int     status = -ENODEV;
+
+        printk(KERN_INFO "%s: version %s\n", DRIVER_NAME, DRIVER_VERSION);
+
+        /* some boards have startup glitches */
+        while (tries--) {
+                status = i2c_add_driver(&tps65010_driver);
+                if (the_tps)
+                        break;
+                i2c_del_driver(&tps65010_driver);
+                if (!tries) {
+                        printk(KERN_ERR "%s: no chip?\n", DRIVER_NAME);
+                        return -ENODEV;
+                }
+                pr_debug("%s: re-probe ...\n", DRIVER_NAME);
+                msleep(10);
+        }
+
+#if defined(CONFIG_ARM)
+        if (machine_is_omap_osk()) {
+
+                // FIXME: More should be placed in the initialization code
+                //        of the submodules (DSP, ethernet, power management,
+                //        board-osk.c). Careful: I2C is initialized "late".
+
+                /* Let LED1 (D9) blink */
+                tps65010_set_led(LED1, BLINK);
+
+                /* Disable LED 2 (D2) */
+                tps65010_set_led(LED2, OFF);
+
+                /* Set GPIO 1 HIGH to disable VBUS power supply;
+                 * OHCI driver powers it up/down as needed.
+                 */
+                tps65010_set_gpio_out_value(GPIO1, HIGH);
+
+                /* Set GPIO 2 low to turn on LED D3 */
+                tps65010_set_gpio_out_value(GPIO2, HIGH);
+
+                /* Set GPIO 3 low to take ethernet out of reset */
+                tps65010_set_gpio_out_value(GPIO3, LOW);
+
+                /* gpio4 for VDD_DSP */
+
+                /* Enable LOW_PWR */
+                tps65010_set_low_pwr(ON);
+
+                /* Switch VLDO2 to 3.0V for AIC23 */
+                tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V | TPS_LDO1_ENABLE);
+
+        } else if (machine_is_omap_h2()) {
+                /* gpio3 for SD, gpio4 for VDD_DSP */
+
+                /* Enable LOW_PWR */
+                tps65010_set_low_pwr(ON);
+        } else if (machine_is_omap_h3()) {
+                /* gpio4 for SD, gpio3 for VDD_DSP */
+#ifdef CONFIG_PM
+                /* Enable LOW_PWR */
+                tps65013_set_low_pwr(ON);
+#endif
+        }
+#endif
+
+        return status;
+}
+/* NOTE:  this MUST be initialized before the other parts of the system
+ * that rely on it ... but after the i2c bus on which this relies.
+ * That is, much earlier than on PC-type systems, which don't often use
+ * I2C as a core system bus.
+ */
+subsys_initcall(tps_init);
+
+static void __exit tps_exit(void)
+{
+        i2c_del_driver(&tps65010_driver);
+}
+module_exit(tps_exit);
+
diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c
index fefc24a9251a..137d9b7cacd4 100644
--- a/drivers/i2c/chips/via686a.c
+++ b/drivers/i2c/chips/via686a.c
@@ -1,12 +1,12 @@
 /*
     via686a.c - Part of lm_sensors, Linux kernel modules
                 for hardware monitoring
-                
+
     Copyright (c) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>,
                         Kyösti Mälkki <kmalkki@cc.hut.fi>,
                         Mark Studebaker <mdsxyz123@yahoo.com>,
                         and Bob Dougherty <bobd@stanford.edu>
-    (Some conversion-factor data were contributed by Jonathan Teh Soon Yew 
+    (Some conversion-factor data were contributed by Jonathan Teh Soon Yew
     <j.teh@iname.com> and Alex van Kaam <darkside@chello.nl>.)
 
     This program is free software; you can redistribute it and/or modify
@@ -30,11 +30,9 @@
     Warning - only supports a single device.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
@@ -66,49 +64,46 @@ SENSORS_INSMOD_1(via686a);
 /* Many VIA686A constants specified below */
 
 /* Length of ISA address segment */
-#define VIA686A_EXTENT 0x80
-#define VIA686A_BASE_REG 0x70
-#define VIA686A_ENABLE_REG 0x74
+#define VIA686A_EXTENT          0x80
+#define VIA686A_BASE_REG        0x70
+#define VIA686A_ENABLE_REG      0x74
 
 /* The VIA686A registers */
 /* ins numbered 0-4 */
-#define VIA686A_REG_IN_MAX(nr) (0x2b + ((nr) * 2))
-#define VIA686A_REG_IN_MIN(nr) (0x2c + ((nr) * 2))
-#define VIA686A_REG_IN(nr)     (0x22 + (nr))
+#define VIA686A_REG_IN_MAX(nr)  (0x2b + ((nr) * 2))
+#define VIA686A_REG_IN_MIN(nr)  (0x2c + ((nr) * 2))
+#define VIA686A_REG_IN(nr)      (0x22 + (nr))
 
 /* fans numbered 1-2 */
-#define VIA686A_REG_FAN_MIN(nr) (0x3a + (nr))
-#define VIA686A_REG_FAN(nr)     (0x28 + (nr))
-
-/* the following values are as speced by VIA: */
-static const u8 regtemp[] = { 0x20, 0x21, 0x1f };
-static const u8 regover[] = { 0x39, 0x3d, 0x1d };
-static const u8 reghyst[] = { 0x3a, 0x3e, 0x1e };
+#define VIA686A_REG_FAN_MIN(nr) (0x3a + (nr))
+#define VIA686A_REG_FAN(nr)     (0x28 + (nr))
 
 /* temps numbered 1-3 */
-#define VIA686A_REG_TEMP(nr)            (regtemp[nr])
-#define VIA686A_REG_TEMP_OVER(nr)       (regover[nr])
-#define VIA686A_REG_TEMP_HYST(nr)       (reghyst[nr])
-#define VIA686A_REG_TEMP_LOW1   0x4b    // bits 7-6
-#define VIA686A_REG_TEMP_LOW23  0x49    // 2 = bits 5-4, 3 = bits 7-6
-
-#define VIA686A_REG_ALARM1 0x41
-#define VIA686A_REG_ALARM2 0x42
-#define VIA686A_REG_FANDIV 0x47
-#define VIA686A_REG_CONFIG 0x40
-/* The following register sets temp interrupt mode (bits 1-0 for temp1, 
+static const u8 VIA686A_REG_TEMP[]      = { 0x20, 0x21, 0x1f };
+static const u8 VIA686A_REG_TEMP_OVER[] = { 0x39, 0x3d, 0x1d };
+static const u8 VIA686A_REG_TEMP_HYST[] = { 0x3a, 0x3e, 0x1e };
+/* bits 7-6 */
+#define VIA686A_REG_TEMP_LOW1   0x4b
+/* 2 = bits 5-4, 3 = bits 7-6 */
+#define VIA686A_REG_TEMP_LOW23  0x49
+
+#define VIA686A_REG_ALARM1      0x41
+#define VIA686A_REG_ALARM2      0x42
+#define VIA686A_REG_FANDIV      0x47
+#define VIA686A_REG_CONFIG      0x40
+/* The following register sets temp interrupt mode (bits 1-0 for temp1,
  3-2 for temp2, 5-4 for temp3).  Modes are:
     00 interrupt stays as long as value is out-of-range
     01 interrupt is cleared once register is read (default)
     10 comparator mode- like 00, but ignores hysteresis
     11 same as 00 */
-#define VIA686A_REG_TEMP_MODE 0x4b
+#define VIA686A_REG_TEMP_MODE           0x4b
 /* We'll just assume that you want to set all 3 simultaneously: */
-#define VIA686A_TEMP_MODE_MASK 0x3F
-#define VIA686A_TEMP_MODE_CONTINUOUS (0x00)
+#define VIA686A_TEMP_MODE_MASK          0x3F
+#define VIA686A_TEMP_MODE_CONTINUOUS    0x00
 
 /* Conversions. Limit checking is only done on the TO_REG
-   variants. 
+   variants.
 
 ********* VOLTAGE CONVERSIONS (Bob Dougherty) ********
  From HWMon.cpp (Copyright 1998-2000 Jonathan Teh Soon Yew):
@@ -121,7 +116,7 @@ static const u8 reghyst[] = { 0x3a, 0x3e, 0x1e };
  That is:
  volts = (25*regVal+133)*factor
  regVal = (volts/factor-133)/25
- (These conversions were contributed by Jonathan Teh Soon Yew 
+ (These conversions were contributed by Jonathan Teh Soon Yew
  <j.teh@iname.com>) */
 static inline u8 IN_TO_REG(long val, int inNum)
 {
@@ -182,55 +177,55 @@ static inline u8 FAN_TO_REG(long rpm, int div)
       else
               return double(temp)*0.924-127.33;
 
- A fifth-order polynomial fits the unofficial data (provided by Alex van 
- Kaam <darkside@chello.nl>) a bit better.  It also give more reasonable 
- numbers on my machine (ie. they agree with what my BIOS tells me).  
+ A fifth-order polynomial fits the unofficial data (provided by Alex van
+ Kaam <darkside@chello.nl>) a bit better.  It also give more reasonable
+ numbers on my machine (ie. they agree with what my BIOS tells me).
  Here's the fifth-order fit to the 8-bit data:
- temp = 1.625093e-10*val^5 - 1.001632e-07*val^4 + 2.457653e-05*val^3 - 
+ temp = 1.625093e-10*val^5 - 1.001632e-07*val^4 + 2.457653e-05*val^3 -
         2.967619e-03*val^2 + 2.175144e-01*val - 7.090067e+0.
 
- (2000-10-25- RFD: thanks to Uwe Andersen <uandersen@mayah.com> for 
+ (2000-10-25- RFD: thanks to Uwe Andersen <uandersen@mayah.com> for
  finding my typos in this formula!)
 
- Alas, none of the elegant function-fit solutions will work because we 
- aren't allowed to use floating point in the kernel and doing it with 
- integers doesn't rpovide enough precision.  So we'll do boring old 
- look-up table stuff.  The unofficial data (see below) have effectively 
- 7-bit resolution (they are rounded to the nearest degree).  I'm assuming 
- that the transfer function of the device is monotonic and smooth, so a 
- smooth function fit to the data will allow us to get better precision.  
+ Alas, none of the elegant function-fit solutions will work because we
+ aren't allowed to use floating point in the kernel and doing it with
+ integers doesn't provide enough precision.  So we'll do boring old
+ look-up table stuff.  The unofficial data (see below) have effectively
+ 7-bit resolution (they are rounded to the nearest degree).  I'm assuming
+ that the transfer function of the device is monotonic and smooth, so a
+ smooth function fit to the data will allow us to get better precision.
  I used the 5th-order poly fit described above and solved for
- VIA register values 0-255.  I *10 before rounding, so we get tenth-degree 
- precision.  (I could have done all 1024 values for our 10-bit readings, 
- but the function is very linear in the useful range (0-80 deg C), so 
- we'll just use linear interpolation for 10-bit readings.)  So, tempLUT 
+ VIA register values 0-255.  I *10 before rounding, so we get tenth-degree
+ precision.  (I could have done all 1024 values for our 10-bit readings,
+ but the function is very linear in the useful range (0-80 deg C), so
+ we'll just use linear interpolation for 10-bit readings.)  So, tempLUT
  is the temp at via register values 0-255: */
 static const long tempLUT[] =
-    { -709, -688, -667, -646, -627, -607, -589, -570, -553, -536, -519,
-            -503, -487, -471, -456, -442, -428, -414, -400, -387, -375,
-            -362, -350, -339, -327, -316, -305, -295, -285, -275, -265,
-            -255, -246, -237, -229, -220, -212, -204, -196, -188, -180,
-            -173, -166, -159, -152, -145, -139, -132, -126, -120, -114,
-            -108, -102, -96, -91, -85, -80, -74, -69, -64, -59, -54, -49,
-            -44, -39, -34, -29, -25, -20, -15, -11, -6, -2, 3, 7, 12, 16,
-            20, 25, 29, 33, 37, 42, 46, 50, 54, 59, 63, 67, 71, 75, 79, 84,
-            88, 92, 96, 100, 104, 109, 113, 117, 121, 125, 130, 134, 138,
-            142, 146, 151, 155, 159, 163, 168, 172, 176, 181, 185, 189,
-            193, 198, 202, 206, 211, 215, 219, 224, 228, 232, 237, 241,
-            245, 250, 254, 259, 263, 267, 272, 276, 281, 285, 290, 294,
-            299, 303, 307, 312, 316, 321, 325, 330, 334, 339, 344, 348,
-            353, 357, 362, 366, 371, 376, 380, 385, 390, 395, 399, 404,
-            409, 414, 419, 423, 428, 433, 438, 443, 449, 454, 459, 464,
-            469, 475, 480, 486, 491, 497, 502, 508, 514, 520, 526, 532,
-            538, 544, 551, 557, 564, 571, 578, 584, 592, 599, 606, 614,
-            621, 629, 637, 645, 654, 662, 671, 680, 689, 698, 708, 718,
-            728, 738, 749, 759, 770, 782, 793, 805, 818, 830, 843, 856,
-            870, 883, 898, 912, 927, 943, 958, 975, 991, 1008, 1026, 1044,
-            1062, 1081, 1101, 1121, 1141, 1162, 1184, 1206, 1229, 1252,
-            1276, 1301, 1326, 1352, 1378, 1406, 1434, 1462
+{ -709, -688, -667, -646, -627, -607, -589, -570, -553, -536, -519,
+        -503, -487, -471, -456, -442, -428, -414, -400, -387, -375,
+        -362, -350, -339, -327, -316, -305, -295, -285, -275, -265,
+        -255, -246, -237, -229, -220, -212, -204, -196, -188, -180,
+        -173, -166, -159, -152, -145, -139, -132, -126, -120, -114,
+        -108, -102, -96, -91, -85, -80, -74, -69, -64, -59, -54, -49,
+        -44, -39, -34, -29, -25, -20, -15, -11, -6, -2, 3, 7, 12, 16,
+        20, 25, 29, 33, 37, 42, 46, 50, 54, 59, 63, 67, 71, 75, 79, 84,
+        88, 92, 96, 100, 104, 109, 113, 117, 121, 125, 130, 134, 138,
+        142, 146, 151, 155, 159, 163, 168, 172, 176, 181, 185, 189,
+        193, 198, 202, 206, 211, 215, 219, 224, 228, 232, 237, 241,
+        245, 250, 254, 259, 263, 267, 272, 276, 281, 285, 290, 294,
+        299, 303, 307, 312, 316, 321, 325, 330, 334, 339, 344, 348,
+        353, 357, 362, 366, 371, 376, 380, 385, 390, 395, 399, 404,
+        409, 414, 419, 423, 428, 433, 438, 443, 449, 454, 459, 464,
+        469, 475, 480, 486, 491, 497, 502, 508, 514, 520, 526, 532,
+        538, 544, 551, 557, 564, 571, 578, 584, 592, 599, 606, 614,
+        621, 629, 637, 645, 654, 662, 671, 680, 689, 698, 708, 718,
+        728, 738, 749, 759, 770, 782, 793, 805, 818, 830, 843, 856,
+        870, 883, 898, 912, 927, 943, 958, 975, 991, 1008, 1026, 1044,
+        1062, 1081, 1101, 1121, 1141, 1162, 1184, 1206, 1229, 1252,
+        1276, 1301, 1326, 1352, 1378, 1406, 1434, 1462
 };
 
-/* the original LUT values from Alex van Kaam <darkside@chello.nl> 
+/* the original LUT values from Alex van Kaam <darkside@chello.nl>
    (for via register values 12-240):
 {-50,-49,-47,-45,-43,-41,-39,-38,-37,-35,-34,-33,-32,-31,
 -30,-29,-28,-27,-26,-25,-24,-24,-23,-22,-21,-20,-20,-19,-18,-17,-17,-16,-15,
@@ -245,26 +240,26 @@ static const long tempLUT[] =
 
 
  Here's the reverse LUT.  I got it by doing a 6-th order poly fit (needed
- an extra term for a good fit to these inverse data!) and then 
- solving for each temp value from -50 to 110 (the useable range for 
- this chip).  Here's the fit: 
- viaRegVal = -1.160370e-10*val^6 +3.193693e-08*val^5 - 1.464447e-06*val^4 
+ an extra term for a good fit to these inverse data!) and then
+ solving for each temp value from -50 to 110 (the useable range for
+ this chip).  Here's the fit:
+ viaRegVal = -1.160370e-10*val^6 +3.193693e-08*val^5 - 1.464447e-06*val^4
  - 2.525453e-04*val^3 + 1.424593e-02*val^2 + 2.148941e+00*val +7.275808e+01)
  Note that n=161: */
 static const u8 viaLUT[] =
-    { 12, 12, 13, 14, 14, 15, 16, 16, 17, 18, 18, 19, 20, 20, 21, 22, 23,
-            23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 36, 37, 39, 40,
-            41, 43, 45, 46, 48, 49, 51, 53, 55, 57, 59, 60, 62, 64, 66,
-            69, 71, 73, 75, 77, 79, 82, 84, 86, 88, 91, 93, 95, 98, 100,
-            103, 105, 107, 110, 112, 115, 117, 119, 122, 124, 126, 129,
-            131, 134, 136, 138, 140, 143, 145, 147, 150, 152, 154, 156,
-            158, 160, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180,
-            182, 183, 185, 187, 188, 190, 192, 193, 195, 196, 198, 199,
-            200, 202, 203, 205, 206, 207, 208, 209, 210, 211, 212, 213,
-            214, 215, 216, 217, 218, 219, 220, 221, 222, 222, 223, 224,
-            225, 226, 226, 227, 228, 228, 229, 230, 230, 231, 232, 232,
-            233, 233, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239,
-            239, 240
+{ 12, 12, 13, 14, 14, 15, 16, 16, 17, 18, 18, 19, 20, 20, 21, 22, 23,
+        23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 36, 37, 39, 40,
+        41, 43, 45, 46, 48, 49, 51, 53, 55, 57, 59, 60, 62, 64, 66,
+        69, 71, 73, 75, 77, 79, 82, 84, 86, 88, 91, 93, 95, 98, 100,
+        103, 105, 107, 110, 112, 115, 117, 119, 122, 124, 126, 129,
+        131, 134, 136, 138, 140, 143, 145, 147, 150, 152, 154, 156,
+        158, 160, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180,
+        182, 183, 185, 187, 188, 190, 192, 193, 195, 196, 198, 199,
+        200, 202, 203, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+        214, 215, 216, 217, 218, 219, 220, 221, 222, 222, 223, 224,
+        225, 226, 226, 227, 228, 228, 229, 230, 230, 231, 232, 232,
+        233, 233, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239,
+        239, 240
 };
 
 /* Converting temps to (8-bit) hyst and over registers
@@ -272,7 +267,7 @@ static const u8 viaLUT[] =
    The +50 is because the temps start at -50 */
 static inline u8 TEMP_TO_REG(long val)
 {
-        return viaLUT[val <= -50000 ? 0 : val >= 110000 ? 160 : 
+        return viaLUT[val <= -50000 ? 0 : val >= 110000 ? 160 :
                       (val < 0 ? val - 500 : val + 500) / 1000 + 50];
 }
 
@@ -291,11 +286,9 @@ static inline long TEMP_FROM_REG10(u16 val)
 
         /* do some linear interpolation */
         return (tempLUT[eightBits] * (4 - twoBits) +
-                tempLUT[eightBits + 1] * twoBits) * 25;
+                tempLUT[eightBits + 1] * twoBits) * 25;
 }
 
-#define ALARMS_FROM_REG(val) (val)
-
 #define DIV_FROM_REG(val) (1 << (val))
 #define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
 
@@ -358,28 +351,28 @@ static ssize_t show_in_max(struct device *dev, char *buf, int nr) {
         return sprintf(buf, "%ld\n", IN_FROM_REG(data->in_max[nr], nr));
 }
 
-static ssize_t set_in_min(struct device *dev, const char *buf, 
+static ssize_t set_in_min(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
         down(&data->update_lock);
-        data->in_min[nr] = IN_TO_REG(val,nr);
-        via686a_write_value(client, VIA686A_REG_IN_MIN(nr), 
+        data->in_min[nr] = IN_TO_REG(val, nr);
+        via686a_write_value(client, VIA686A_REG_IN_MIN(nr),
                         data->in_min[nr]);
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_in_max(struct device *dev, const char *buf, 
+static ssize_t set_in_max(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
         down(&data->update_lock);
-        data->in_max[nr] = IN_TO_REG(val,nr);
-        via686a_write_value(client, VIA686A_REG_IN_MAX(nr), 
+        data->in_max[nr] = IN_TO_REG(val, nr);
+        via686a_write_value(client, VIA686A_REG_IN_MAX(nr),
                         data->in_max[nr]);
         up(&data->update_lock);
         return count;
@@ -435,7 +428,7 @@ static ssize_t show_temp_hyst(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
         return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp_hyst[nr]));
 }
-static ssize_t set_temp_over(struct device *dev, const char *buf, 
+static ssize_t set_temp_over(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -443,11 +436,12 @@ static ssize_t set_temp_over(struct device *dev, const char *buf,
 
         down(&data->update_lock);
         data->temp_over[nr] = TEMP_TO_REG(val);
-        via686a_write_value(client, VIA686A_REG_TEMP_OVER(nr), data->temp_over[nr]);
+        via686a_write_value(client, VIA686A_REG_TEMP_OVER[nr],
+                            data->temp_over[nr]);
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_temp_hyst(struct device *dev, const char *buf, 
+static ssize_t set_temp_hyst(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -455,7 +449,8 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
 
         down(&data->update_lock);
         data->temp_hyst[nr] = TEMP_TO_REG(val);
-        via686a_write_value(client, VIA686A_REG_TEMP_HYST(nr), data->temp_hyst[nr]);
+        via686a_write_value(client, VIA686A_REG_TEMP_HYST[nr],
+                            data->temp_hyst[nr]);
         up(&data->update_lock);
         return count;
 }
@@ -488,7 +483,7 @@ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL);\
 static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,               \
                 show_temp_##offset##_over, set_temp_##offset##_over);   \
 static DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR,          \
-                show_temp_##offset##_hyst, set_temp_##offset##_hyst);   
+                show_temp_##offset##_hyst, set_temp_##offset##_hyst);
 
 show_temp_offset(1);
 show_temp_offset(2);
@@ -497,19 +492,19 @@ show_temp_offset(3);
 /* 2 Fans */
 static ssize_t show_fan(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr], 
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr],
                                 DIV_FROM_REG(data->fan_div[nr])) );
 }
 static ssize_t show_fan_min(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n",
+        return sprintf(buf, "%d\n",
                 FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])) );
 }
 static ssize_t show_fan_div(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n", DIV_FROM_REG(data->fan_div[nr]) );
+        return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]) );
 }
-static ssize_t set_fan_min(struct device *dev, const char *buf, 
+static ssize_t set_fan_min(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -521,7 +516,7 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_fan_div(struct device *dev, const char *buf, 
+static ssize_t set_fan_div(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -572,7 +567,7 @@ show_fan_offset(2);
 /* Alarms */
 static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
@@ -612,11 +607,12 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* 8231 requires multiple of 256, we enforce that on 686 as well */
-        if(force_addr)
+        if (force_addr)
                 address = force_addr & 0xFF00;
 
-        if(force_addr) {
-                dev_warn(&adapter->dev,"forcing ISA address 0x%04X\n", address);
+        if (force_addr) {
+                dev_warn(&adapter->dev, "forcing ISA address 0x%04X\n",
+                         address);
                 if (PCIBIOS_SUCCESSFUL !=
                     pci_write_config_word(s_bridge, VIA686A_BASE_REG, address))
                         return -ENODEV;
@@ -625,17 +621,17 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
             pci_read_config_word(s_bridge, VIA686A_ENABLE_REG, &val))
                 return -ENODEV;
         if (!(val & 0x0001)) {
-                dev_warn(&adapter->dev,"enabling sensors\n");
+                dev_warn(&adapter->dev, "enabling sensors\n");
                 if (PCIBIOS_SUCCESSFUL !=
                     pci_write_config_word(s_bridge, VIA686A_ENABLE_REG,
-                                      val | 0x0001))
+                                          val | 0x0001))
                         return -ENODEV;
         }
 
         /* Reserve the ISA region */
         if (!request_region(address, VIA686A_EXTENT, via686a_driver.name)) {
-                dev_err(&adapter->dev,"region 0x%x already in use!\n",
-                       address);
+                dev_err(&adapter->dev, "region 0x%x already in use!\n",
+                        address);
                 return -ENODEV;
         }
 
@@ -660,7 +656,7 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
                 goto ERROR3;
-        
+
         /* Initialize the VIA686A chip */
         via686a_init_client(new_client);
 
@@ -699,9 +695,9 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
-      ERROR3:
+ERROR3:
         kfree(data);
-      ERROR0:
+ERROR0:
         release_region(address, VIA686A_EXTENT);
         return err;
 }
@@ -732,7 +728,7 @@ static void via686a_init_client(struct i2c_client *client)
         via686a_write_value(client, VIA686A_REG_CONFIG, (reg|0x01)&0x7F);
 
         /* Configure temp interrupt mode for continuous-interrupt operation */
-        via686a_write_value(client, VIA686A_REG_TEMP_MODE, 
+        via686a_write_value(client, VIA686A_REG_TEMP_MODE,
                             via686a_read_value(client, VIA686A_REG_TEMP_MODE) &
                             !(VIA686A_TEMP_MODE_MASK | VIA686A_TEMP_MODE_CONTINUOUS));
 }
@@ -764,15 +760,15 @@ static struct via686a_data *via686a_update_device(struct device *dev)
                 }
                 for (i = 0; i <= 2; i++) {
                         data->temp[i] = via686a_read_value(client,
-                                                 VIA686A_REG_TEMP(i)) << 2;
+                                                 VIA686A_REG_TEMP[i]) << 2;
                         data->temp_over[i] =
                             via686a_read_value(client,
-                                               VIA686A_REG_TEMP_OVER(i));
+                                               VIA686A_REG_TEMP_OVER[i]);
                         data->temp_hyst[i] =
                             via686a_read_value(client,
-                                               VIA686A_REG_TEMP_HYST(i));
+                                               VIA686A_REG_TEMP_HYST[i]);
                 }
-                /* add in lower 2 bits 
+                /* add in lower 2 bits
                    temp1 uses bits 7-6 of VIA686A_REG_TEMP_LOW1
                    temp2 uses bits 5-4 of VIA686A_REG_TEMP_LOW23
                    temp3 uses bits 7-6 of VIA686A_REG_TEMP_LOW23
@@ -804,35 +800,36 @@ static struct via686a_data *via686a_update_device(struct device *dev)
 }
 
 static struct pci_device_id via686a_pci_ids[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
-       { 0, }
+        { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
+        { 0, }
 };
 
 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
 
 static int __devinit via686a_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *id)
+                                       const struct pci_device_id *id)
 {
-       u16 val;
-       int addr = 0;
-
-       if (PCIBIOS_SUCCESSFUL !=
-           pci_read_config_word(dev, VIA686A_BASE_REG, &val))
-               return -ENODEV;
-
-       addr = val & ~(VIA686A_EXTENT - 1);
-       if (addr == 0 && force_addr == 0) {
-               dev_err(&dev->dev,"base address not set - upgrade BIOS or use force_addr=0xaddr\n");
-               return -ENODEV;
-       }
-       if (force_addr)
-               addr = force_addr;      /* so detect will get called */
-
-       if (!addr) {
-               dev_err(&dev->dev,"No Via 686A sensors found.\n");
-               return -ENODEV;
-       }
-       normal_isa[0] = addr;
+        u16 val;
+        int addr = 0;
+
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_word(dev, VIA686A_BASE_REG, &val))
+                return -ENODEV;
+
+        addr = val & ~(VIA686A_EXTENT - 1);
+        if (addr == 0 && force_addr == 0) {
+                dev_err(&dev->dev, "base address not set - upgrade BIOS "
+                        "or use force_addr=0xaddr\n");
+                return -ENODEV;
+        }
+        if (force_addr)
+                addr = force_addr;      /* so detect will get called */
+
+        if (!addr) {
+                dev_err(&dev->dev, "No Via 686A sensors found.\n");
+                return -ENODEV;
+        }
+        normal_isa[0] = addr;
 
         s_bridge = pci_dev_get(dev);
         if (i2c_add_driver(&via686a_driver)) {
@@ -848,14 +845,14 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev,
 }
 
 static struct pci_driver via686a_pci_driver = {
-       .name            = "via686a",
-       .id_table        = via686a_pci_ids,
-       .probe           = via686a_pci_probe,
+        .name           = "via686a",
+        .id_table       = via686a_pci_ids,
+        .probe          = via686a_pci_probe,
 };
 
 static int __init sm_via686a_init(void)
 {
-       return pci_register_driver(&via686a_pci_driver);
+        return pci_register_driver(&via686a_pci_driver);
 }
 
 static void __exit sm_via686a_exit(void)
@@ -869,8 +866,8 @@ static void __exit sm_via686a_exit(void)
 }
 
 MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, "
-              "Mark Studebaker <mdsxyz123@yahoo.com> "
-             "and Bob Dougherty <bobd@stanford.edu>");
+              "Mark Studebaker <mdsxyz123@yahoo.com> "
+              "and Bob Dougherty <bobd@stanford.edu>");
 MODULE_DESCRIPTION("VIA 686A Sensor device");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/i2c/chips/w83627ehf.c b/drivers/i2c/chips/w83627ehf.c
new file mode 100644
index 000000000000..8a40b6976e1a
--- /dev/null
+++ b/drivers/i2c/chips/w83627ehf.c
@@ -0,0 +1,846 @@
+/*
+    w83627ehf - Driver for the hardware monitoring functionality of
+                the Winbond W83627EHF Super-I/O chip
+    Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
+
+    Shamelessly ripped from the w83627hf driver
+    Copyright (C) 2003  Mark Studebaker
+
+    Thanks to Leon Moonen, Steve Cliffe and Grant Coady for their help
+    in testing and debugging this driver.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+    Supports the following chips:
+
+    Chip        #vin    #fan    #pwm    #temp   chip_id man_id
+    w83627ehf   -       5       -       3       0x88    0x5ca3
+
+    This is a preliminary version of the driver, only supporting the
+    fan and temperature inputs. The chip does much more than that.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+#include <asm/io.h>
+#include "lm75.h"
+
+/* Addresses to scan
+   The actual ISA address is read from Super-I/O configuration space */
+static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
+
+/* Insmod parameters */
+SENSORS_INSMOD_1(w83627ehf);
+
+/*
+ * Super-I/O constants and functions
+ */
+
+static int REG;         /* The register to read/write */
+static int VAL;         /* The value to read/write */
+
+#define W83627EHF_LD_HWM        0x0b
+
+#define SIO_REG_LDSEL           0x07    /* Logical device select */
+#define SIO_REG_DEVID           0x20    /* Device ID (2 bytes) */
+#define SIO_REG_ENABLE          0x30    /* Logical device enable */
+#define SIO_REG_ADDR            0x60    /* Logical device address (2 bytes) */
+
+#define SIO_W83627EHF_ID        0x8840
+#define SIO_ID_MASK             0xFFC0
+
+static inline void
+superio_outb(int reg, int val)
+{
+        outb(reg, REG);
+        outb(val, VAL);
+}
+
+static inline int
+superio_inb(int reg)
+{
+        outb(reg, REG);
+        return inb(VAL);
+}
+
+static inline void
+superio_select(int ld)
+{
+        outb(SIO_REG_LDSEL, REG);
+        outb(ld, VAL);
+}
+
+static inline void
+superio_enter(void)
+{
+        outb(0x87, REG);
+        outb(0x87, REG);
+}
+
+static inline void
+superio_exit(void)
+{
+        outb(0x02, REG);
+        outb(0x02, VAL);
+}
+
+/*
+ * ISA constants
+ */
+
+#define REGION_LENGTH           8
+#define ADDR_REG_OFFSET         5
+#define DATA_REG_OFFSET         6
+
+#define W83627EHF_REG_BANK              0x4E
+#define W83627EHF_REG_CONFIG            0x40
+#define W83627EHF_REG_CHIP_ID           0x49
+#define W83627EHF_REG_MAN_ID            0x4F
+
+static const u16 W83627EHF_REG_FAN[] = { 0x28, 0x29, 0x2a, 0x3f, 0x553 };
+static const u16 W83627EHF_REG_FAN_MIN[] = { 0x3b, 0x3c, 0x3d, 0x3e, 0x55c };
+
+#define W83627EHF_REG_TEMP1             0x27
+#define W83627EHF_REG_TEMP1_HYST        0x3a
+#define W83627EHF_REG_TEMP1_OVER        0x39
+static const u16 W83627EHF_REG_TEMP[] = { 0x150, 0x250 };
+static const u16 W83627EHF_REG_TEMP_HYST[] = { 0x153, 0x253 };
+static const u16 W83627EHF_REG_TEMP_OVER[] = { 0x155, 0x255 };
+static const u16 W83627EHF_REG_TEMP_CONFIG[] = { 0x152, 0x252 };
+
+/* Fan clock dividers are spread over the following five registers */
+#define W83627EHF_REG_FANDIV1           0x47
+#define W83627EHF_REG_FANDIV2           0x4B
+#define W83627EHF_REG_VBAT              0x5D
+#define W83627EHF_REG_DIODE             0x59
+#define W83627EHF_REG_SMI_OVT           0x4C
+
+/*
+ * Conversions
+ */
+
+static inline unsigned int
+fan_from_reg(u8 reg, unsigned int div)
+{
+        if (reg == 0 || reg == 255)
+                return 0;
+        return 1350000U / (reg * div);
+}
+
+static inline unsigned int
+div_from_reg(u8 reg)
+{
+        return 1 << reg;
+}
+
+static inline int
+temp1_from_reg(s8 reg)
+{
+        return reg * 1000;
+}
+
+static inline s8
+temp1_to_reg(int temp)
+{
+        if (temp <= -128000)
+                return -128;
+        if (temp >= 127000)
+                return 127;
+        if (temp < 0)
+                return (temp - 500) / 1000;
+        return (temp + 500) / 1000;
+}
+
+/*
+ * Data structures and manipulation thereof
+ */
+
+struct w83627ehf_data {
+        struct i2c_client client;
+        struct semaphore lock;
+
+        struct semaphore update_lock;
+        char valid;             /* !=0 if following fields are valid */
+        unsigned long last_updated;     /* In jiffies */
+
+        /* Register values */
+        u8 fan[5];
+        u8 fan_min[5];
+        u8 fan_div[5];
+        u8 has_fan;             /* some fan inputs can be disabled */
+        s8 temp1;
+        s8 temp1_max;
+        s8 temp1_max_hyst;
+        s16 temp[2];
+        s16 temp_max[2];
+        s16 temp_max_hyst[2];
+};
+
+static inline int is_word_sized(u16 reg)
+{
+        return (((reg & 0xff00) == 0x100
+              || (reg & 0xff00) == 0x200)
+             && ((reg & 0x00ff) == 0x50
+              || (reg & 0x00ff) == 0x53
+              || (reg & 0x00ff) == 0x55));
+}
+
+/* We assume that the default bank is 0, thus the following two functions do
+   nothing for registers which live in bank 0. For others, they respectively
+   set the bank register to the correct value (before the register is
+   accessed), and back to 0 (afterwards). */
+static inline void w83627ehf_set_bank(struct i2c_client *client, u16 reg)
+{
+        if (reg & 0xff00) {
+                outb_p(W83627EHF_REG_BANK, client->addr + ADDR_REG_OFFSET);
+                outb_p(reg >> 8, client->addr + DATA_REG_OFFSET);
+        }
+}
+
+static inline void w83627ehf_reset_bank(struct i2c_client *client, u16 reg)
+{
+        if (reg & 0xff00) {
+                outb_p(W83627EHF_REG_BANK, client->addr + ADDR_REG_OFFSET);
+                outb_p(0, client->addr + DATA_REG_OFFSET);
+        }
+}
+
+static u16 w83627ehf_read_value(struct i2c_client *client, u16 reg)
+{
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        int res, word_sized = is_word_sized(reg);
+
+        down(&data->lock);
+
+        w83627ehf_set_bank(client, reg);
+        outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET);
+        res = inb_p(client->addr + DATA_REG_OFFSET);
+        if (word_sized) {
+                outb_p((reg & 0xff) + 1,
+                       client->addr + ADDR_REG_OFFSET);
+                res = (res << 8) + inb_p(client->addr + DATA_REG_OFFSET);
+        }
+        w83627ehf_reset_bank(client, reg);
+
+        up(&data->lock);
+
+        return res;
+}
+
+static int w83627ehf_write_value(struct i2c_client *client, u16 reg, u16 value)
+{
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        int word_sized = is_word_sized(reg);
+
+        down(&data->lock);
+
+        w83627ehf_set_bank(client, reg);
+        outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET);
+        if (word_sized) {
+                outb_p(value >> 8, client->addr + DATA_REG_OFFSET);
+                outb_p((reg & 0xff) + 1,
+                       client->addr + ADDR_REG_OFFSET);
+        }
+        outb_p(value & 0xff, client->addr + DATA_REG_OFFSET);
+        w83627ehf_reset_bank(client, reg);
+
+        up(&data->lock);
+        return 0;
+}
+
+/* This function assumes that the caller holds data->update_lock */
+static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)
+{
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        u8 reg;
+
+        switch (nr) {
+        case 0:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0xcf)
+                    | ((data->fan_div[0] & 0x03) << 4);
+                w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xdf)
+                    | ((data->fan_div[0] & 0x04) << 3);
+                w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg);
+                break;
+        case 1:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0x3f)
+                    | ((data->fan_div[1] & 0x03) << 6);
+                w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xbf)
+                    | ((data->fan_div[1] & 0x04) << 4);
+                w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg);
+                break;
+        case 2:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV2) & 0x3f)
+                    | ((data->fan_div[2] & 0x03) << 6);
+                w83627ehf_write_value(client, W83627EHF_REG_FANDIV2, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0x7f)
+                    | ((data->fan_div[2] & 0x04) << 5);
+                w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg);
+                break;
+        case 3:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_DIODE) & 0xfc)
+                    | (data->fan_div[3] & 0x03);
+                w83627ehf_write_value(client, W83627EHF_REG_DIODE, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_SMI_OVT) & 0x7f)
+                    | ((data->fan_div[3] & 0x04) << 5);
+                w83627ehf_write_value(client, W83627EHF_REG_SMI_OVT, reg);
+                break;
+        case 4:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_DIODE) & 0x73)
+                    | ((data->fan_div[4] & 0x03) << 3)
+                    | ((data->fan_div[4] & 0x04) << 5);
+                w83627ehf_write_value(client, W83627EHF_REG_DIODE, reg);
+                break;
+        }
+}
+
+static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        int i;
+
+        down(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + HZ)
+         || !data->valid) {
+                /* Fan clock dividers */
+                i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1);
+                data->fan_div[0] = (i >> 4) & 0x03;
+                data->fan_div[1] = (i >> 6) & 0x03;
+                i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV2);
+                data->fan_div[2] = (i >> 6) & 0x03;
+                i = w83627ehf_read_value(client, W83627EHF_REG_VBAT);
+                data->fan_div[0] |= (i >> 3) & 0x04;
+                data->fan_div[1] |= (i >> 4) & 0x04;
+                data->fan_div[2] |= (i >> 5) & 0x04;
+                if (data->has_fan & ((1 << 3) | (1 << 4))) {
+                        i = w83627ehf_read_value(client, W83627EHF_REG_DIODE);
+                        data->fan_div[3] = i & 0x03;
+                        data->fan_div[4] = ((i >> 2) & 0x03)
+                                         | ((i >> 5) & 0x04);
+                }
+                if (data->has_fan & (1 << 3)) {
+                        i = w83627ehf_read_value(client, W83627EHF_REG_SMI_OVT);
+                        data->fan_div[3] |= (i >> 5) & 0x04;
+                }
+
+                /* Measured fan speeds and limits */
+                for (i = 0; i < 5; i++) {
+                        if (!(data->has_fan & (1 << i)))
+                                continue;
+
+                        data->fan[i] = w83627ehf_read_value(client,
+                                       W83627EHF_REG_FAN[i]);
+                        data->fan_min[i] = w83627ehf_read_value(client,
+                                           W83627EHF_REG_FAN_MIN[i]);
+
+                        /* If we failed to measure the fan speed and clock
+                           divider can be increased, let's try that for next
+                           time */
+                        if (data->fan[i] == 0xff
+                         && data->fan_div[i] < 0x07) {
+                                dev_dbg(&client->dev, "Increasing fan %d "
+                                        "clock divider from %u to %u\n",
+                                        i, div_from_reg(data->fan_div[i]),
+                                        div_from_reg(data->fan_div[i] + 1));
+                                data->fan_div[i]++;
+                                w83627ehf_write_fan_div(client, i);
+                                /* Preserve min limit if possible */
+                                if (data->fan_min[i] >= 2
+                                 && data->fan_min[i] != 255)
+                                        w83627ehf_write_value(client,
+                                                W83627EHF_REG_FAN_MIN[i],
+                                                (data->fan_min[i] /= 2));
+                        }
+                }
+
+                /* Measured temperatures and limits */
+                data->temp1 = w83627ehf_read_value(client,
+                              W83627EHF_REG_TEMP1);
+                data->temp1_max = w83627ehf_read_value(client,
+                                  W83627EHF_REG_TEMP1_OVER);
+                data->temp1_max_hyst = w83627ehf_read_value(client,
+                                       W83627EHF_REG_TEMP1_HYST);
+                for (i = 0; i < 2; i++) {
+                        data->temp[i] = w83627ehf_read_value(client,
+                                        W83627EHF_REG_TEMP[i]);
+                        data->temp_max[i] = w83627ehf_read_value(client,
+                                            W83627EHF_REG_TEMP_OVER[i]);
+                        data->temp_max_hyst[i] = w83627ehf_read_value(client,
+                                                 W83627EHF_REG_TEMP_HYST[i]);
+                }
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        up(&data->update_lock);
+        return data;
+}
+
+/*
+ * Sysfs callback functions
+ */
+
+#define show_fan_reg(reg) \
+static ssize_t \
+show_##reg(struct device *dev, char *buf, int nr) \
+{ \
+        struct w83627ehf_data *data = w83627ehf_update_device(dev); \
+        return sprintf(buf, "%d\n", \
+                       fan_from_reg(data->reg[nr], \
+                                    div_from_reg(data->fan_div[nr]))); \
+}
+show_fan_reg(fan);
+show_fan_reg(fan_min);
+
+static ssize_t
+show_fan_div(struct device *dev, char *buf, int nr)
+{
+        struct w83627ehf_data *data = w83627ehf_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       div_from_reg(data->fan_div[nr]));
+}
+
+static ssize_t
+store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        unsigned int val = simple_strtoul(buf, NULL, 10);
+        unsigned int reg;
+        u8 new_div;
+
+        down(&data->update_lock);
+        if (!val) {
+                /* No min limit, alarm disabled */
+                data->fan_min[nr] = 255;
+                new_div = data->fan_div[nr]; /* No change */
+                dev_info(dev, "fan%u low limit and alarm disabled\n", nr + 1);
+        } else if ((reg = 1350000U / val) >= 128 * 255) {
+                /* Speed below this value cannot possibly be represented,
+                   even with the highest divider (128) */
+                data->fan_min[nr] = 254;
+                new_div = 7; /* 128 == (1 << 7) */
+                dev_warn(dev, "fan%u low limit %u below minimum %u, set to "
+                         "minimum\n", nr + 1, val, fan_from_reg(254, 128));
+        } else if (!reg) {
+                /* Speed above this value cannot possibly be represented,
+                   even with the lowest divider (1) */
+                data->fan_min[nr] = 1;
+                new_div = 0; /* 1 == (1 << 0) */
+                dev_warn(dev, "fan%u low limit %u above maximum %u, set to "
+                         "maximum\n", nr + 1, val, fan_from_reg(1, 1));
+        } else {
+                /* Automatically pick the best divider, i.e. the one such
+                   that the min limit will correspond to a register value
+                   in the 96..192 range */
+                new_div = 0;
+                while (reg > 192 && new_div < 7) {
+                        reg >>= 1;
+                        new_div++;
+                }
+                data->fan_min[nr] = reg;
+        }
+
+        /* Write both the fan clock divider (if it changed) and the new
+           fan min (unconditionally) */
+        if (new_div != data->fan_div[nr]) {
+                if (new_div > data->fan_div[nr])
+                        data->fan[nr] >>= (data->fan_div[nr] - new_div);
+                else
+                        data->fan[nr] <<= (new_div - data->fan_div[nr]);
+
+                dev_dbg(dev, "fan%u clock divider changed from %u to %u\n",
+                        nr + 1, div_from_reg(data->fan_div[nr]),
+                        div_from_reg(new_div));
+                data->fan_div[nr] = new_div;
+                w83627ehf_write_fan_div(client, nr);
+        }
+        w83627ehf_write_value(client, W83627EHF_REG_FAN_MIN[nr],
+                              data->fan_min[nr]);
+        up(&data->update_lock);
+
+        return count;
+}
+
+#define sysfs_fan_offset(offset) \
+static ssize_t \
+show_reg_fan_##offset(struct device *dev, struct device_attribute *attr, \
+                      char *buf) \
+{ \
+        return show_fan(dev, buf, offset-1); \
+} \
+static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
+                   show_reg_fan_##offset, NULL);
+
+#define sysfs_fan_min_offset(offset) \
+static ssize_t \
+show_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, \
+                           char *buf) \
+{ \
+        return show_fan_min(dev, buf, offset-1); \
+} \
+static ssize_t \
+store_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, \
+                            const char *buf, size_t count) \
+{ \
+        return store_fan_min(dev, buf, count, offset-1); \
+} \
+static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                   show_reg_fan##offset##_min, \
+                   store_reg_fan##offset##_min);
+
+#define sysfs_fan_div_offset(offset) \
+static ssize_t \
+show_reg_fan##offset##_div(struct device *dev, struct device_attribute *attr, \
+                           char *buf) \
+{ \
+        return show_fan_div(dev, buf, offset - 1); \
+} \
+static DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
+                   show_reg_fan##offset##_div, NULL);
+
+sysfs_fan_offset(1);
+sysfs_fan_min_offset(1);
+sysfs_fan_div_offset(1);
+sysfs_fan_offset(2);
+sysfs_fan_min_offset(2);
+sysfs_fan_div_offset(2);
+sysfs_fan_offset(3);
+sysfs_fan_min_offset(3);
+sysfs_fan_div_offset(3);
+sysfs_fan_offset(4);
+sysfs_fan_min_offset(4);
+sysfs_fan_div_offset(4);
+sysfs_fan_offset(5);
+sysfs_fan_min_offset(5);
+sysfs_fan_div_offset(5);
+
+#define show_temp1_reg(reg) \
+static ssize_t \
+show_##reg(struct device *dev, struct device_attribute *attr, \
+           char *buf) \
+{ \
+        struct w83627ehf_data *data = w83627ehf_update_device(dev); \
+        return sprintf(buf, "%d\n", temp1_from_reg(data->reg)); \
+}
+show_temp1_reg(temp1);
+show_temp1_reg(temp1_max);
+show_temp1_reg(temp1_max_hyst);
+
+#define store_temp1_reg(REG, reg) \
+static ssize_t \
+store_temp1_##reg(struct device *dev, struct device_attribute *attr, \
+                  const char *buf, size_t count) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct w83627ehf_data *data = i2c_get_clientdata(client); \
+        u32 val = simple_strtoul(buf, NULL, 10); \
+ \
+        down(&data->update_lock); \
+        data->temp1_##reg = temp1_to_reg(val); \
+        w83627ehf_write_value(client, W83627EHF_REG_TEMP1_##REG, \
+                              data->temp1_##reg); \
+        up(&data->update_lock); \
+        return count; \
+}
+store_temp1_reg(OVER, max);
+store_temp1_reg(HYST, max_hyst);
+
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1, NULL);
+static DEVICE_ATTR(temp1_max, S_IRUGO| S_IWUSR,
+                   show_temp1_max, store_temp1_max);
+static DEVICE_ATTR(temp1_max_hyst, S_IRUGO| S_IWUSR,
+                   show_temp1_max_hyst, store_temp1_max_hyst);
+
+#define show_temp_reg(reg) \
+static ssize_t \
+show_##reg (struct device *dev, char *buf, int nr) \
+{ \
+        struct w83627ehf_data *data = w83627ehf_update_device(dev); \
+        return sprintf(buf, "%d\n", \
+                       LM75_TEMP_FROM_REG(data->reg[nr])); \
+}
+show_temp_reg(temp);
+show_temp_reg(temp_max);
+show_temp_reg(temp_max_hyst);
+
+#define store_temp_reg(REG, reg) \
+static ssize_t \
+store_##reg (struct device *dev, const char *buf, size_t count, int nr) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct w83627ehf_data *data = i2c_get_clientdata(client); \
+        u32 val = simple_strtoul(buf, NULL, 10); \
+ \
+        down(&data->update_lock); \
+        data->reg[nr] = LM75_TEMP_TO_REG(val); \
+        w83627ehf_write_value(client, W83627EHF_REG_TEMP_##REG[nr], \
+                              data->reg[nr]); \
+        up(&data->update_lock); \
+        return count; \
+}
+store_temp_reg(OVER, temp_max);
+store_temp_reg(HYST, temp_max_hyst);
+
+#define sysfs_temp_offset(offset) \
+static ssize_t \
+show_reg_temp##offset (struct device *dev, struct device_attribute *attr, \
+                       char *buf) \
+{ \
+        return show_temp(dev, buf, offset - 2); \
+} \
+static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+                   show_reg_temp##offset, NULL);
+
+#define sysfs_temp_reg_offset(reg, offset) \
+static ssize_t \
+show_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, \
+                              char *buf) \
+{ \
+        return show_temp_##reg(dev, buf, offset - 2); \
+} \
+static ssize_t \
+store_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, \
+                               const char *buf, size_t count) \
+{ \
+        return store_temp_##reg(dev, buf, count, offset - 2); \
+} \
+static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, \
+                   show_reg_temp##offset##_##reg, \
+                   store_reg_temp##offset##_##reg);
+
+sysfs_temp_offset(2);
+sysfs_temp_reg_offset(max, 2);
+sysfs_temp_reg_offset(max_hyst, 2);
+sysfs_temp_offset(3);
+sysfs_temp_reg_offset(max, 3);
+sysfs_temp_reg_offset(max_hyst, 3);
+
+/*
+ * Driver and client management
+ */
+
+static struct i2c_driver w83627ehf_driver;
+
+static void w83627ehf_init_client(struct i2c_client *client)
+{
+        int i;
+        u8 tmp;
+
+        /* Start monitoring is needed */
+        tmp = w83627ehf_read_value(client, W83627EHF_REG_CONFIG);
+        if (!(tmp & 0x01))
+                w83627ehf_write_value(client, W83627EHF_REG_CONFIG,
+                                      tmp | 0x01);
+
+        /* Enable temp2 and temp3 if needed */
+        for (i = 0; i < 2; i++) {
+                tmp = w83627ehf_read_value(client,
+                                           W83627EHF_REG_TEMP_CONFIG[i]);
+                if (tmp & 0x01)
+                        w83627ehf_write_value(client,
+                                              W83627EHF_REG_TEMP_CONFIG[i],
+                                              tmp & 0xfe);
+        }
+}
+
+static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        struct w83627ehf_data *data;
+        int i, err = 0;
+
+        if (!i2c_is_isa_adapter(adapter))
+                return 0;
+
+        if (!request_region(address, REGION_LENGTH, w83627ehf_driver.name)) {
+                err = -EBUSY;
+                goto exit;
+        }
+
+        if (!(data = kmalloc(sizeof(struct w83627ehf_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit_release;
+        }
+        memset(data, 0, sizeof(struct w83627ehf_data));
+
+        client = &data->client;
+        i2c_set_clientdata(client, data);
+        client->addr = address;
+        init_MUTEX(&data->lock);
+        client->adapter = adapter;
+        client->driver = &w83627ehf_driver;
+        client->flags = 0;
+
+        strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
+        data->valid = 0;
+        init_MUTEX(&data->update_lock);
+
+        /* Tell the i2c layer a new client has arrived */
+        if ((err = i2c_attach_client(client)))
+                goto exit_free;
+
+        /* Initialize the chip */
+        w83627ehf_init_client(client);
+
+        /* A few vars need to be filled upon startup */
+        for (i = 0; i < 5; i++)
+                data->fan_min[i] = w83627ehf_read_value(client,
+                                   W83627EHF_REG_FAN_MIN[i]);
+
+        /* It looks like fan4 and fan5 pins can be alternatively used
+           as fan on/off switches */
+        data->has_fan = 0x07; /* fan1, fan2 and fan3 */
+        i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1);
+        if (i & (1 << 2))
+                data->has_fan |= (1 << 3);
+        if (i & (1 << 0))
+                data->has_fan |= (1 << 4);
+
+        /* Register sysfs hooks */
+        device_create_file(&client->dev, &dev_attr_fan1_input);
+        device_create_file(&client->dev, &dev_attr_fan1_min);
+        device_create_file(&client->dev, &dev_attr_fan1_div);
+        device_create_file(&client->dev, &dev_attr_fan2_input);
+        device_create_file(&client->dev, &dev_attr_fan2_min);
+        device_create_file(&client->dev, &dev_attr_fan2_div);
+        device_create_file(&client->dev, &dev_attr_fan3_input);
+        device_create_file(&client->dev, &dev_attr_fan3_min);
+        device_create_file(&client->dev, &dev_attr_fan3_div);
+
+        if (data->has_fan & (1 << 3)) {
+                device_create_file(&client->dev, &dev_attr_fan4_input);
+                device_create_file(&client->dev, &dev_attr_fan4_min);
+                device_create_file(&client->dev, &dev_attr_fan4_div);
+        }
+        if (data->has_fan & (1 << 4)) {
+                device_create_file(&client->dev, &dev_attr_fan5_input);
+                device_create_file(&client->dev, &dev_attr_fan5_min);
+                device_create_file(&client->dev, &dev_attr_fan5_div);
+        }
+
+        device_create_file(&client->dev, &dev_attr_temp1_input);
+        device_create_file(&client->dev, &dev_attr_temp1_max);
+        device_create_file(&client->dev, &dev_attr_temp1_max_hyst);
+        device_create_file(&client->dev, &dev_attr_temp2_input);
+        device_create_file(&client->dev, &dev_attr_temp2_max);
+        device_create_file(&client->dev, &dev_attr_temp2_max_hyst);
+        device_create_file(&client->dev, &dev_attr_temp3_input);
+        device_create_file(&client->dev, &dev_attr_temp3_max);
+        device_create_file(&client->dev, &dev_attr_temp3_max_hyst);
+
+        return 0;
+
+exit_free:
+        kfree(data);
+exit_release:
+        release_region(address, REGION_LENGTH);
+exit:
+        return err;
+}
+
+static int w83627ehf_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_detect(adapter, &addr_data, w83627ehf_detect);
+}
+
+static int w83627ehf_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        if ((err = i2c_detach_client(client))) {
+                dev_err(&client->dev, "Client deregistration failed, "
+                        "client not detached.\n");
+                return err;
+        }
+        release_region(client->addr, REGION_LENGTH);
+        kfree(i2c_get_clientdata(client));
+
+        return 0;
+}
+
+static struct i2c_driver w83627ehf_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "w83627ehf",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = w83627ehf_attach_adapter,
+        .detach_client  = w83627ehf_detach_client,
+};
+
+static int __init w83627ehf_find(int sioaddr, int *address)
+{
+        u16 val;
+
+        REG = sioaddr;
+        VAL = sioaddr + 1;
+        superio_enter();
+
+        val = (superio_inb(SIO_REG_DEVID) << 8)
+            | superio_inb(SIO_REG_DEVID + 1);
+        if ((val & SIO_ID_MASK) != SIO_W83627EHF_ID) {
+                superio_exit();
+                return -ENODEV;
+        }
+
+        superio_select(W83627EHF_LD_HWM);
+        val = (superio_inb(SIO_REG_ADDR) << 8)
+            | superio_inb(SIO_REG_ADDR + 1);
+        *address = val & ~(REGION_LENGTH - 1);
+        if (*address == 0) {
+                superio_exit();
+                return -ENODEV;
+        }
+
+        /* Activate logical device if needed */
+        val = superio_inb(SIO_REG_ENABLE);
+        if (!(val & 0x01))
+                superio_outb(SIO_REG_ENABLE, val | 0x01);
+
+        superio_exit();
+        return 0;
+}
+
+static int __init sensors_w83627ehf_init(void)
+{
+        if (w83627ehf_find(0x2e, &normal_isa[0])
+         && w83627ehf_find(0x4e, &normal_isa[0]))
+                return -ENODEV;
+
+        return i2c_add_driver(&w83627ehf_driver);
+}
+
+static void __exit sensors_w83627ehf_exit(void)
+{
+        i2c_del_driver(&w83627ehf_driver);
+}
+
+MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
+MODULE_DESCRIPTION("W83627EHF driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_w83627ehf_init);
+module_exit(sensors_w83627ehf_exit);
diff --git a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c
index 4f1bff572c1c..bd87a42e068a 100644
--- a/drivers/i2c/chips/w83627hf.c
+++ b/drivers/i2c/chips/w83627hf.c
@@ -264,7 +264,7 @@ static inline u8 DIV_TO_REG(long val)
 {
         int i;
         val = SENSORS_LIMIT(val, 1, 128) >> 1;
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 7; i++) {
                 if (val == 0)
                         break;
                 val >>= 1;
diff --git a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c
index c3926d2d8ac6..0bb131ce09eb 100644
--- a/drivers/i2c/chips/w83781d.c
+++ b/drivers/i2c/chips/w83781d.c
@@ -28,14 +28,11 @@
     as99127f rev.2 (type_name = as99127f)       0x31    0x5ca3  yes     no
     w83781d     7       3       0       3       0x10-1  0x5ca3  yes     yes
     w83627hf    9       3       2       3       0x21    0x5ca3  yes     yes(LPC)
-    w83627thf   9       3       2       3       0x90    0x5ca3  no      yes(LPC)
     w83782d     9       3       2-4     3       0x30    0x5ca3  yes     yes
     w83783s     5-6     3       2       1-2     0x40    0x5ca3  yes     no
-    w83697hf    8       2       2       2       0x60    0x5ca3  no      yes(LPC)
 
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -53,7 +50,7 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
 static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_6(w83781d, w83782d, w83783s, w83627hf, as99127f, w83697hf);
+SENSORS_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
                     "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
@@ -173,7 +170,6 @@ FAN_TO_REG(long rpm, int div)
                                                 : (val)) / 1000, 0, 0xff))
 #define TEMP_FROM_REG(val)              (((val) & 0x80 ? (val)-0x100 : (val)) * 1000)
 
-#define ALARMS_FROM_REG(val)            (val)
 #define PWM_FROM_REG(val)               (val)
 #define PWM_TO_REG(val)                 (SENSORS_LIMIT((val),0,255))
 #define BEEP_MASK_FROM_REG(val,type)    ((type) == as99127f ? \
@@ -193,7 +189,7 @@ DIV_TO_REG(long val, enum chips type)
         val = SENSORS_LIMIT(val, 1,
                             ((type == w83781d
                               || type == as99127f) ? 8 : 128)) >> 1;
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 7; i++) {
                 if (val == 0)
                         break;
                 val >>= 1;
@@ -524,7 +520,7 @@ static ssize_t
 show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
-        return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 
 static
@@ -1000,13 +996,6 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                 err = -EINVAL;
                 goto ERROR0;
         }
-        if (!is_isa && kind == w83697hf) {
-                dev_err(&adapter->dev,
-                        "Cannot force ISA-only chip for I2C address 0x%02x.\n",
-                        address);
-                err = -EINVAL;
-                goto ERROR0;
-        }
         
         if (is_isa)
                 if (!request_region(address, W83781D_EXTENT,
@@ -1139,12 +1128,10 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                 else if (val1 == 0x40 && vendid == winbond && !is_isa
                                 && address == 0x2d)
                         kind = w83783s;
-                else if ((val1 == 0x21 || val1 == 0x90) && vendid == winbond)
+                else if (val1 == 0x21 && vendid == winbond)
                         kind = w83627hf;
                 else if (val1 == 0x31 && !is_isa && address >= 0x28)
                         kind = as99127f;
-                else if (val1 == 0x60 && vendid == winbond && is_isa)
-                        kind = w83697hf;
                 else {
                         if (kind == 0)
                                 dev_warn(&new_client->dev, "Ignoring 'force' "
@@ -1163,14 +1150,9 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         } else if (kind == w83783s) {
                 client_name = "w83783s";
         } else if (kind == w83627hf) {
-                if (val1 == 0x90)
-                        client_name = "w83627thf";
-                else
-                        client_name = "w83627hf";
+                client_name = "w83627hf";
         } else if (kind == as99127f) {
                 client_name = "as99127f";
-        } else if (kind == w83697hf) {
-                client_name = "w83697hf";
         }
 
         /* Fill in the remaining client fields and put into the global list */
@@ -1208,7 +1190,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Register sysfs hooks */
         device_create_file_in(new_client, 0);
-        if (kind != w83783s && kind != w83697hf)
+        if (kind != w83783s)
                 device_create_file_in(new_client, 1);
         device_create_file_in(new_client, 2);
         device_create_file_in(new_client, 3);
@@ -1222,24 +1204,19 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
 
         device_create_file_fan(new_client, 1);
         device_create_file_fan(new_client, 2);
-        if (kind != w83697hf)
-                device_create_file_fan(new_client, 3);
+        device_create_file_fan(new_client, 3);
 
         device_create_file_temp(new_client, 1);
         device_create_file_temp(new_client, 2);
-        if (kind != w83783s && kind != w83697hf)
+        if (kind != w83783s)
                 device_create_file_temp(new_client, 3);
 
-        if (kind != w83697hf)
-                device_create_file_vid(new_client);
-
-        if (kind != w83697hf)
-                device_create_file_vrm(new_client);
+        device_create_file_vid(new_client);
+        device_create_file_vrm(new_client);
 
         device_create_file_fan_div(new_client, 1);
         device_create_file_fan_div(new_client, 2);
-        if (kind != w83697hf)
-                device_create_file_fan_div(new_client, 3);
+        device_create_file_fan_div(new_client, 3);
 
         device_create_file_alarms(new_client);
 
@@ -1258,7 +1235,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         if (kind != as99127f && kind != w83781d) {
                 device_create_file_sensor(new_client, 1);
                 device_create_file_sensor(new_client, 2);
-                if (kind != w83783s && kind != w83697hf)
+                if (kind != w83783s)
                         device_create_file_sensor(new_client, 3);
         }
 
@@ -1481,7 +1458,7 @@ w83781d_init_client(struct i2c_client *client)
                                 else
                                         data->sens[i - 1] = 2;
                         }
-                        if ((type == w83783s || type == w83697hf) && (i == 2))
+                        if (type == w83783s && i == 2)
                                 break;
                 }
         }
@@ -1497,7 +1474,7 @@ w83781d_init_client(struct i2c_client *client)
                 }
 
                 /* Enable temp3 */
-                if (type != w83783s && type != w83697hf) {
+                if (type != w83783s) {
                         tmp = w83781d_read_value(client,
                                 W83781D_REG_TEMP3_CONFIG);
                         if (tmp & 0x01) {
@@ -1538,8 +1515,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                 dev_dbg(dev, "Starting device update\n");
 
                 for (i = 0; i <= 8; i++) {
-                        if ((data->type == w83783s || data->type == w83697hf)
-                            && (i == 1))
+                        if (data->type == w83783s && i == 1)
                                 continue;       /* 783S has no in1 */
                         data->in[i] =
                             w83781d_read_value(client, W83781D_REG_IN(i));
@@ -1547,7 +1523,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                             w83781d_read_value(client, W83781D_REG_IN_MIN(i));
                         data->in_max[i] =
                             w83781d_read_value(client, W83781D_REG_IN_MAX(i));
-                        if ((data->type != w83782d) && (data->type != w83697hf)
+                        if ((data->type != w83782d)
                             && (data->type != w83627hf) && (i == 6))
                                 break;
                 }
@@ -1583,7 +1559,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                     w83781d_read_value(client, W83781D_REG_TEMP_OVER(2));
                 data->temp_max_hyst_add[0] =
                     w83781d_read_value(client, W83781D_REG_TEMP_HYST(2));
-                if (data->type != w83783s && data->type != w83697hf) {
+                if (data->type != w83783s) {
                         data->temp_add[1] =
                             w83781d_read_value(client, W83781D_REG_TEMP(3));
                         data->temp_max_add[1] =
@@ -1594,26 +1570,18 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                                                W83781D_REG_TEMP_HYST(3));
                 }
                 i = w83781d_read_value(client, W83781D_REG_VID_FANDIV);
-                if (data->type != w83697hf) {
-                        data->vid = i & 0x0f;
-                        data->vid |=
-                            (w83781d_read_value(client, W83781D_REG_CHIPID) &
-                             0x01)
-                            << 4;
-                }
+                data->vid = i & 0x0f;
+                data->vid |= (w83781d_read_value(client,
+                                        W83781D_REG_CHIPID) & 0x01) << 4;
                 data->fan_div[0] = (i >> 4) & 0x03;
                 data->fan_div[1] = (i >> 6) & 0x03;
-                if (data->type != w83697hf) {
-                        data->fan_div[2] = (w83781d_read_value(client,
-                                                               W83781D_REG_PIN)
-                                            >> 6) & 0x03;
-                }
+                data->fan_div[2] = (w83781d_read_value(client,
+                                        W83781D_REG_PIN) >> 6) & 0x03;
                 if ((data->type != w83781d) && (data->type != as99127f)) {
                         i = w83781d_read_value(client, W83781D_REG_VBAT);
                         data->fan_div[0] |= (i >> 3) & 0x04;
                         data->fan_div[1] |= (i >> 4) & 0x04;
-                        if (data->type != w83697hf)
-                                data->fan_div[2] |= (i >> 5) & 0x04;
+                        data->fan_div[2] |= (i >> 5) & 0x04;
                 }
                 data->alarms =
                     w83781d_read_value(client,
diff --git a/drivers/i2c/chips/w83l785ts.c b/drivers/i2c/chips/w83l785ts.c
index 74d4b58e4237..4469d52aba4c 100644
--- a/drivers/i2c/chips/w83l785ts.c
+++ b/drivers/i2c/chips/w83l785ts.c
@@ -30,7 +30,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index a22e53badacb..51ce268998cd 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -21,7 +21,6 @@
    All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
    SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -239,7 +238,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         }
 
         /* detach any active clients. This must be done first, because
-         * it can fail; in which case we give upp. */
+         * it can fail; in which case we give up. */
         list_for_each_safe(item, _n, &adap->clients) {
                 client = list_entry(item, struct i2c_client, list);
 
@@ -612,27 +611,16 @@ int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
         struct i2c_adapter *adap=client->adapter;
         struct i2c_msg msg;
 
-        if (client->adapter->algo->master_xfer) {
-                msg.addr   = client->addr;
-                msg.flags = client->flags & I2C_M_TEN;
-                msg.len = count;
-                msg.buf = (char *)buf;
+        msg.addr = client->addr;
+        msg.flags = client->flags & I2C_M_TEN;
+        msg.len = count;
+        msg.buf = (char *)buf;
         
-                dev_dbg(&client->adapter->dev, "master_send: writing %d bytes.\n",
-                        count);
-        
-                down(&adap->bus_lock);
-                ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->bus_lock);
+        ret = i2c_transfer(adap, &msg, 1);
 
-                /* if everything went ok (i.e. 1 msg transmitted), return #bytes
-                 * transmitted, else error code.
-                 */
-                return (ret == 1 )? count : ret;
-        } else {
-                dev_err(&client->adapter->dev, "I2C level transfers not supported\n");
-                return -ENOSYS;
-        }
+        /* If everything went ok (i.e. 1 msg transmitted), return #bytes
+           transmitted, else error code. */
+        return (ret == 1) ? count : ret;
 }
 
 int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
@@ -640,31 +628,18 @@ int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
         struct i2c_adapter *adap=client->adapter;
         struct i2c_msg msg;
         int ret;
-        if (client->adapter->algo->master_xfer) {
-                msg.addr   = client->addr;
-                msg.flags = client->flags & I2C_M_TEN;
-                msg.flags |= I2C_M_RD;
-                msg.len = count;
-                msg.buf = buf;
-
-                dev_dbg(&client->adapter->dev, "master_recv: reading %d bytes.\n",
-                        count);
-        
-                down(&adap->bus_lock);
-                ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->bus_lock);
-        
-                dev_dbg(&client->adapter->dev, "master_recv: return:%d (count:%d, addr:0x%02x)\n",
-                        ret, count, client->addr);
-        
-                /* if everything went ok (i.e. 1 msg transmitted), return #bytes
-                * transmitted, else error code.
-                */
-                return (ret == 1 )? count : ret;
-        } else {
-                dev_err(&client->adapter->dev, "I2C level transfers not supported\n");
-                return -ENOSYS;
-        }
+
+        msg.addr = client->addr;
+        msg.flags = client->flags & I2C_M_TEN;
+        msg.flags |= I2C_M_RD;
+        msg.len = count;
+        msg.buf = buf;
+
+        ret = i2c_transfer(adap, &msg, 1);
+
+        /* If everything went ok (i.e. 1 msg transmitted), return #bytes
+           transmitted, else error code. */
+        return (ret == 1) ? count : ret;
 }
 
 
@@ -742,18 +717,6 @@ int i2c_probe(struct i2c_adapter *adapter,
                                 found = 1;
                         }
                 }
-                for (i = 0;
-                     !found && (address_data->ignore_range[i] != I2C_CLIENT_END);
-                     i += 3) {
-                        if (((adap_id == address_data->ignore_range[i]) ||
-                            ((address_data->ignore_range[i]==ANY_I2C_BUS))) &&
-                            (addr >= address_data->ignore_range[i+1]) &&
-                            (addr <= address_data->ignore_range[i+2])) {
-                                dev_dbg(&adapter->dev, "found ignore_range parameter for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
-                                found = 1;
-                        }
-                }
                 if (found) 
                         continue;
 
@@ -770,17 +733,6 @@ int i2c_probe(struct i2c_adapter *adapter,
                 }
 
                 for (i = 0;
-                     !found && (address_data->normal_i2c_range[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if ((addr >= address_data->normal_i2c_range[i]) &&
-                            (addr <= address_data->normal_i2c_range[i+1])) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found normal i2c_range entry for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
-                        }
-                }
-
-                for (i = 0;
                      !found && (address_data->probe[i] != I2C_CLIENT_END);
                      i += 2) {
                         if (((adap_id == address_data->probe[i]) ||
@@ -791,18 +743,6 @@ int i2c_probe(struct i2c_adapter *adapter,
                                         "addr %04x\n", adap_id,addr);
                         }
                 }
-                for (i = 0;
-                     !found && (address_data->probe_range[i] != I2C_CLIENT_END);
-                     i += 3) {
-                        if (((adap_id == address_data->probe_range[i]) ||
-                           (address_data->probe_range[i] == ANY_I2C_BUS)) &&
-                           (addr >= address_data->probe_range[i+1]) &&
-                           (addr <= address_data->probe_range[i+2])) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found probe_range parameter for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
-                        }
-                }
                 if (!found) 
                         continue;
 
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 86c4d0149e82..bc5d557e5dd9 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -29,7 +29,6 @@
 /* The devfs code is contributed by Philipp Matthias Hahn 
    <pmhahn@titan.lahn.de> */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -214,7 +213,7 @@ static int i2cdev_ioctl(struct inode *inode, struct file *file,
                                    sizeof(rdwr_arg)))
                         return -EFAULT;
 
-                /* Put an arbritrary limit on the number of messages that can
+                /* Put an arbitrary limit on the number of messages that can
                  * be sent at once */
                 if (rdwr_arg.nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
                         return -EINVAL;
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 0bdb47f08c2a..61400f04015e 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -51,8 +51,10 @@
 static int                      do_probe( struct i2c_adapter *adapter, int addr, int kind);
 
 /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */
-static unsigned short           normal_i2c[] = { 0x49, 0x2c, I2C_CLIENT_END };
-static unsigned short           normal_i2c_range[] = { 0x48, 0x4f, 0x2c, 0x2f, I2C_CLIENT_END };
+static unsigned short           normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
+                                                 0x4c, 0x4d, 0x4e, 0x4f,
+                                                 0x2c, 0x2d, 0x2e, 0x2f,
+                                                 I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD;
 
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 80254caa444c..48989eda2400 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -384,22 +384,14 @@ static unsigned short normal_i2c[] =
         I2C_ADV7171 >> 1, (I2C_ADV7171 >> 1) + 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7170;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 95d0974b0ab5..f898b6586374 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -434,22 +434,14 @@ static unsigned short normal_i2c[] =
         I2C_ADV7176 >> 1, (I2C_ADV7176 >> 1) + 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7175;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index cf0db2554a80..8733588f6db3 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -500,22 +500,14 @@ static unsigned short normal_i2c[] = {
         I2C_BT819 >> 1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt819;
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index efe605a113a1..07f72f64c5f7 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -39,8 +39,8 @@
 MODULE_LICENSE("GPL");
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_BT832_ALT1>>1,I2C_BT832_ALT2>>1,I2C_CLIENT_END};
+static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
+                                       I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 /* ---------------------------------------------------------------------- */
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 72c7eb0f8c24..a5d529ccf3ad 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -288,22 +288,14 @@ bt856_command (struct i2c_client *client,
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 static unsigned short normal_i2c[] = { I2C_BT856 >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt856;
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 7fbb8581a87d..09464d624a6b 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -147,7 +147,6 @@ static unsigned short normal_i2c[] = {
         I2C_MSP3400C_ALT  >> 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index ba69f09cbdd1..b8054da31ffd 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -64,7 +64,6 @@ static struct video_device saa_template;	/* Declared near bottom */
 
 /* Addresses to scan */
 static unsigned short normal_i2c[]       = { I2C_ADDRESS, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 static struct i2c_client client_template;
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index d74caa139f0a..7ffa2e9a9bf3 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -132,7 +132,6 @@ static struct video_device saa_template;	/* Declared near bottom */
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 static struct i2c_client client_template;
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 64273b438530..22d055d8a695 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -463,22 +463,14 @@ static unsigned short normal_i2c[] = {
         (I2C_SAA7110 >> 1) + 1,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7110;
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 0a873112ae23..fcd897382fcf 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -482,22 +482,14 @@ saa7111_command (struct i2c_client *client,
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 static unsigned short normal_i2c[] = { I2C_SAA7111 >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7111;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index e73023695e58..2ba997f5ef1d 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -820,22 +820,14 @@ saa7114_command (struct i2c_client *client,
  */
 static unsigned short normal_i2c[] =
     { I2C_SAA7114 >> 1, I2C_SAA7114A >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7114;
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 1db022682980..42c2b565c9fe 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -22,7 +22,6 @@
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder");
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 5f0b224c3cb6..108e7a4a0273 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -380,22 +380,14 @@ saa7185_command (struct i2c_client *client,
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 static unsigned short normal_i2c[] = { I2C_SAA7185 >> 1, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7185;
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 376a4a439e9b..07ba6d3ed08c 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -74,7 +74,6 @@ static unsigned short normal_i2c[] = {
         I2C_TDA7432 >> 1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END, I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 /* Structure of address and subaddresses for the tda7432 */
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index b5177c6f54f6..c29bdfc3244e 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -43,7 +43,6 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
 /* addresses to scan, found only at 0x42 (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_TDA9840, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 4f1114c033a1..97b113e070f3 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -44,7 +44,6 @@ static unsigned short normal_i2c[] =  {
     I2C_TDA9875 >> 1,
     I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 /* This is a superset of the TDA9875 */
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index debef1910c37..7e6e6dd966a2 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -33,7 +33,6 @@ static unsigned short normal_i2c[] = {
         0x96 >>1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = {I2C_CLIENT_END,I2C_CLIENT_END};
 I2C_CLIENT_INSMOD;
 
 /* insmod options */
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 3ec39550bf46..b44db8a7b94d 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -43,7 +43,6 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
 /* addresses to scan, found only at 0x03 and/or 0x43 (7-bit) */
 static unsigned short normal_i2c[] = { I2C_TEA6415C_1, I2C_TEA6415C_2, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index bd10710fd909..48d4db7d507b 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -40,7 +40,6 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
 
 /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
 static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 /* magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 6b20aa902a8f..51748c6578d1 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -34,19 +34,14 @@ static int this_adap;
 static struct i2c_client client_template;
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned short normal_i2c_range[] = {0x60, 0x61, I2C_CLIENT_END};
-static unsigned short probe[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2]  = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2]       = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2]        = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
 
 static struct i2c_client_address_data addr_data = {
-        normal_i2c, normal_i2c_range, 
-        probe, probe_range, 
-        ignore, ignore_range, 
-        force
+        .normal_i2c     = normal_i2c,
+        .probe          = &ignore,
+        .ignore         = &ignore,
+        .force          = &ignore,
 };
 
 /* ---------------------------------------------------------------------- */
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 6212388edb75..81882ddab859 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -28,10 +28,8 @@
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
         0x4b, /* tda8290 */
-        I2C_CLIENT_END
-};
-static unsigned short normal_i2c_range[] = {
-        0x60, 0x6f,
+        0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+        0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
         I2C_CLIENT_END
 };
 I2C_CLIENT_INSMOD;
@@ -225,9 +223,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 static int tuner_probe(struct i2c_adapter *adap)
 {
         if (0 != addr) {
-                normal_i2c[0]       = addr;
-                normal_i2c_range[0] = addr;
-                normal_i2c_range[1] = addr;
+                normal_i2c[0] = addr;
+                normal_i2c[1] = I2C_CLIENT_END;
         }
         this_adap = 0;
 
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 80dc34f18c2c..41b635e0d3c6 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -148,7 +148,6 @@ static unsigned short normal_i2c[] = {
         I2C_TDA9874   >> 1,
         I2C_PIC16C54  >> 1,
         I2C_CLIENT_END };
-static unsigned short normal_i2c_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 static struct i2c_driver driver;
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index e1443a0937e3..3d216973798c 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -482,7 +482,6 @@ static unsigned short normal_i2c[] = {
         0xa0 >> 1,
         I2C_CLIENT_END,
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 struct i2c_driver i2c_driver_tveeprom;
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 0fd6c9a70917..5dbd9f6bf353 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -569,22 +569,14 @@ static unsigned short normal_i2c[] =
     { I2C_VPX3220 >> 1, (I2C_VPX3220 >> 1) + 4,
         I2C_CLIENT_END
 };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
-        .normal_i2c_range       = normal_i2c_range,
-        .probe                  = probe,
-        .probe_range            = probe_range,
-        .ignore                 = ignore,
-        .ignore_range           = ignore_range,
-        .force                  = force
+        .probe                  = &ignore,
+        .ignore                 = &ignore,
+        .force                  = &ignore,
 };
 
 static struct i2c_driver vpx3220_i2c_driver;
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index e529841cd83d..67f85344f0cc 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1230,7 +1230,6 @@ static int maven_shutdown_client(struct i2c_client* clnt) {
 }
 
 static unsigned short normal_i2c[] = { MAVEN_I2CID, I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { MAVEN_I2CID, MAVEN_I2CID, I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 static struct i2c_driver maven_driver;
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 2ab65c902fe5..4f120796273e 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -3,9 +3,9 @@ menu "Dallas's 1-wire bus"
 config W1
         tristate "Dallas's 1-wire support"
         ---help---
-          Dallas's 1-wire bus is usefull to connect slow 1-pin devices 
+          Dallas's 1-wire bus is usefull to connect slow 1-pin devices
           such as iButtons and thermal sensors.
-          
+
           If you want W1 support, you should say Y here.
 
           This W1 support can also be built as a module.  If so, the module
@@ -17,8 +17,8 @@ config W1_MATROX
         help
           Say Y here if you want to communicate with your 1-wire devices
           using Matrox's G400 GPIO pins.
-          
-          This support is also available as a module.  If so, the module 
+
+          This support is also available as a module.  If so, the module
           will be called matrox_w1.ko.
 
 config W1_DS9490
@@ -27,17 +27,17 @@ config W1_DS9490
         help
           Say Y here if you want to have a driver for DS9490R UWB <-> W1 bridge.
 
-          This support is also available as a module.  If so, the module 
+          This support is also available as a module.  If so, the module
           will be called ds9490r.ko.
 
-config W1_DS9490_BRIDGE
+config W1_DS9490R_BRIDGE
         tristate "DS9490R USB <-> W1 transport layer for 1-wire"
         depends on W1_DS9490
         help
           Say Y here if you want to communicate with your 1-wire devices
           using DS9490R USB bridge.
 
-          This support is also available as a module.  If so, the module 
+          This support is also available as a module.  If so, the module
           will be called ds_w1_bridge.ko.
 
 config W1_THERM
@@ -51,7 +51,7 @@ config W1_SMEM
         tristate "Simple 64bit memory family implementation"
         depends on W1
         help
-          Say Y here if you want to connect 1-wire 
+          Say Y here if you want to connect 1-wire
           simple 64bit memory rom(ds2401/ds2411/ds1990*) to you wire.
 
 endmenu
diff --git a/drivers/w1/ds_w1_bridge.c b/drivers/w1/ds_w1_bridge.c
index 0baaeb5fd630..7bddd8ac7d7f 100644
--- a/drivers/w1/ds_w1_bridge.c
+++ b/drivers/w1/ds_w1_bridge.c
@@ -83,11 +83,11 @@ static u8 ds9490r_read_byte(unsigned long data)
         return byte;
 }
 
-static void ds9490r_write_block(unsigned long data, u8 *buf, int len)
+static void ds9490r_write_block(unsigned long data, const u8 *buf, int len)
 {
         struct ds_device *dev = (struct ds_device *)data;
 
-        ds_write_block(dev, buf, len);
+        ds_write_block(dev, (u8 *)buf, len);
 }
 
 static u8 ds9490r_read_block(unsigned long data, u8 *buf, int len)
diff --git a/drivers/w1/matrox_w1.c b/drivers/w1/matrox_w1.c
index e565416458ea..0b03f8f93f63 100644
--- a/drivers/w1/matrox_w1.c
+++ b/drivers/w1/matrox_w1.c
@@ -1,8 +1,8 @@
 /*
- *      matrox_w1.c
+ *      matrox_w1.c
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@ static struct pci_driver matrox_w1_pci_driver = {
         .remove = __devexit_p(matrox_w1_remove),
 };
 
-/* 
+/*
  * Matrox G400 DDC registers.
  */
 
@@ -177,8 +177,8 @@ static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
 
         dev->bus_master = (struct w1_bus_master *)(dev + 1);
 
-        /* 
-         * True for G400, for some other we need resource 0, see drivers/video/matrox/matroxfb_base.c 
+        /*
+         * True for G400, for some other we need resource 0, see drivers/video/matrox/matroxfb_base.c
          */
 
         dev->phys_addr = pci_resource_start(pdev, 1);
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 24a192e3b8b4..b460927ec32a 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -1,8 +1,8 @@
 /*
- *      w1.c
+ *      w1.c
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,6 +59,19 @@ static pid_t control_thread;
 static int control_needs_exit;
 static DECLARE_COMPLETION(w1_control_complete);
 
+/* stuff for the default family */
+static ssize_t w1_famdefault_read_name(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
+        return(sprintf(buf, "%s\n", sl->name));
+}
+static struct w1_family_ops w1_default_fops = {
+        .rname = &w1_famdefault_read_name,
+};
+static struct w1_family w1_default_family = {
+        .fops = &w1_default_fops,
+};
+
 static int w1_master_match(struct device *dev, struct device_driver *drv)
 {
         return 1;
@@ -99,6 +112,20 @@ static ssize_t w1_default_read_bin(struct kobject *kobj, char *buf, loff_t off,
         return sprintf(buf, "No family registered.\n");
 }
 
+static struct device_attribute w1_slave_attribute =
+        __ATTR(name, S_IRUGO, w1_default_read_name, NULL);
+
+static struct bin_attribute w1_slave_bin_attribute = {
+        .attr = {
+                .name = "w1_slave",
+                .mode = S_IRUGO,
+                .owner = THIS_MODULE,
+        },
+        .size = W1_SLAVE_DATA_SIZE,
+        .read = &w1_default_read_bin,
+};
+
+
 static struct bus_type w1_bus_type = {
         .name = "w1",
         .match = w1_master_match,
@@ -119,34 +146,49 @@ struct device w1_device = {
         .release = &w1_master_release
 };
 
-static struct device_attribute w1_slave_attribute = {
-        .attr = {
-                        .name = "name",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_default_read_name,
-};
-
-static struct device_attribute w1_slave_attribute_val = {
-        .attr = {
-                        .name = "value",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_default_read_name,
-};
-
 static ssize_t w1_master_attribute_show_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct w1_master *md = container_of (dev, struct w1_master, dev);
+        struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
-        
+
         if (down_interruptible (&md->mutex))
                 return -EBUSY;
 
         count = sprintf(buf, "%s\n", md->name);
-        
+
+        up(&md->mutex);
+
+        return count;
+}
+
+static ssize_t w1_master_attribute_store_search(struct device * dev,
+                                                struct device_attribute *attr,
+                                                const char * buf, size_t count)
+{
+        struct w1_master *md = container_of(dev, struct w1_master, dev);
+
+        if (down_interruptible (&md->mutex))
+                return -EBUSY;
+
+        md->search_count = simple_strtol(buf, NULL, 0);
+
+        up(&md->mutex);
+
+        return count;
+}
+
+static ssize_t w1_master_attribute_show_search(struct device *dev,
+                                               struct device_attribute *attr,
+                                               char *buf)
+{
+        struct w1_master *md = container_of(dev, struct w1_master, dev);
+        ssize_t count;
+
+        if (down_interruptible (&md->mutex))
+                return -EBUSY;
+
+        count = sprintf(buf, "%d\n", md->search_count);
+
         up(&md->mutex);
 
         return count;
@@ -156,12 +198,12 @@ static ssize_t w1_master_attribute_show_pointer(struct device *dev, struct devic
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
-        
+
         if (down_interruptible(&md->mutex))
                 return -EBUSY;
 
         count = sprintf(buf, "0x%p\n", md->bus_master);
-        
+
         up(&md->mutex);
         return count;
 }
@@ -177,12 +219,12 @@ static ssize_t w1_master_attribute_show_max_slave_count(struct device *dev, stru
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
-        
+
         if (down_interruptible(&md->mutex))
                 return -EBUSY;
 
         count = sprintf(buf, "%d\n", md->max_slave_count);
-        
+
         up(&md->mutex);
         return count;
 }
@@ -191,12 +233,12 @@ static ssize_t w1_master_attribute_show_attempts(struct device *dev, struct devi
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
-        
+
         if (down_interruptible(&md->mutex))
                 return -EBUSY;
 
         count = sprintf(buf, "%lu\n", md->attempts);
-        
+
         up(&md->mutex);
         return count;
 }
@@ -205,18 +247,17 @@ static ssize_t w1_master_attribute_show_slave_count(struct device *dev, struct d
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         ssize_t count;
-        
+
         if (down_interruptible(&md->mutex))
                 return -EBUSY;
 
         count = sprintf(buf, "%d\n", md->slave_count);
-        
+
         up(&md->mutex);
         return count;
 }
 
 static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device_attribute *attr, char *buf)
-
 {
         struct w1_master *md = container_of(dev, struct w1_master, dev);
         int c = PAGE_SIZE;
@@ -233,7 +274,7 @@ static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device
                 list_for_each_safe(ent, n, &md->slist) {
                         sl = list_entry(ent, struct w1_slave, w1_slave_entry);
 
-                        c -= snprintf(buf + PAGE_SIZE - c, c, "%s\n", sl->name);
+                        c -= snprintf(buf + PAGE_SIZE - c, c, "%s\n", sl->name);
                 }
         }
 
@@ -242,73 +283,52 @@ static ssize_t w1_master_attribute_show_slaves(struct device *dev, struct device
         return PAGE_SIZE - c;
 }
 
-static struct device_attribute w1_master_attribute_slaves = {
-        .attr = {
-                        .name = "w1_master_slaves",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE,
-        },
-        .show = &w1_master_attribute_show_slaves,
-};
-static struct device_attribute w1_master_attribute_slave_count = {
-        .attr = {
-                        .name = "w1_master_slave_count",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_master_attribute_show_slave_count,
-};
-static struct device_attribute w1_master_attribute_attempts = {
-        .attr = {
-                        .name = "w1_master_attempts",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_master_attribute_show_attempts,
-};
-static struct device_attribute w1_master_attribute_max_slave_count = {
-        .attr = {
-                        .name = "w1_master_max_slave_count",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_master_attribute_show_max_slave_count,
-};
-static struct device_attribute w1_master_attribute_timeout = {
-        .attr = {
-                        .name = "w1_master_timeout",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_master_attribute_show_timeout,
-};
-static struct device_attribute w1_master_attribute_pointer = {
-        .attr = {
-                        .name = "w1_master_pointer",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_master_attribute_show_pointer,
-};
-static struct device_attribute w1_master_attribute_name = {
-        .attr = {
-                        .name = "w1_master_name",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE
-        },
-        .show = &w1_master_attribute_show_name,
+#define W1_MASTER_ATTR_RO(_name, _mode)                         \
+        struct device_attribute w1_master_attribute_##_name =   \
+                __ATTR(w1_master_##_name, _mode,                \
+                       w1_master_attribute_show_##_name, NULL)
+
+#define W1_MASTER_ATTR_RW(_name, _mode)                         \
+        struct device_attribute w1_master_attribute_##_name =   \
+                __ATTR(w1_master_##_name, _mode,                \
+                       w1_master_attribute_show_##_name,        \
+                       w1_master_attribute_store_##_name)
+
+static W1_MASTER_ATTR_RO(name, S_IRUGO);
+static W1_MASTER_ATTR_RO(slaves, S_IRUGO);
+static W1_MASTER_ATTR_RO(slave_count, S_IRUGO);
+static W1_MASTER_ATTR_RO(max_slave_count, S_IRUGO);
+static W1_MASTER_ATTR_RO(attempts, S_IRUGO);
+static W1_MASTER_ATTR_RO(timeout, S_IRUGO);
+static W1_MASTER_ATTR_RO(pointer, S_IRUGO);
+static W1_MASTER_ATTR_RW(search, S_IRUGO | S_IWUGO);
+
+static struct attribute *w1_master_default_attrs[] = {
+        &w1_master_attribute_name.attr,
+        &w1_master_attribute_slaves.attr,
+        &w1_master_attribute_slave_count.attr,
+        &w1_master_attribute_max_slave_count.attr,
+        &w1_master_attribute_attempts.attr,
+        &w1_master_attribute_timeout.attr,
+        &w1_master_attribute_pointer.attr,
+        &w1_master_attribute_search.attr,
+        NULL
 };
 
-static struct bin_attribute w1_slave_bin_attribute = {
-        .attr = {
-                        .name = "w1_slave",
-                        .mode = S_IRUGO,
-                        .owner = THIS_MODULE,
-        },
-        .size = W1_SLAVE_DATA_SIZE,
-        .read = &w1_default_read_bin,
+static struct attribute_group w1_master_defattr_group = {
+        .attrs = w1_master_default_attrs,
 };
 
+int w1_create_master_attributes(struct w1_master *master)
+{
+        return sysfs_create_group(&master->dev.kobj, &w1_master_defattr_group);
+}
+
+void w1_destroy_master_attributes(struct w1_master *master)
+{
+        sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
+}
+
 static int __w1_attach_slave_device(struct w1_slave *sl)
 {
         int err;
@@ -319,13 +339,13 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
         sl->dev.release = &w1_slave_release;
 
         snprintf(&sl->dev.bus_id[0], sizeof(sl->dev.bus_id),
-                  "%02x-%012llx",
-                  (unsigned int) sl->reg_num.family,
-                  (unsigned long long) sl->reg_num.id);
-        snprintf (&sl->name[0], sizeof(sl->name),
-                  "%02x-%012llx",
-                  (unsigned int) sl->reg_num.family,
-                  (unsigned long long) sl->reg_num.id);
+                 "%02x-%012llx",
+                 (unsigned int) sl->reg_num.family,
+                 (unsigned long long) sl->reg_num.id);
+        snprintf(&sl->name[0], sizeof(sl->name),
+                 "%02x-%012llx",
+                 (unsigned int) sl->reg_num.family,
+                 (unsigned long long) sl->reg_num.id);
 
         dev_dbg(&sl->dev, "%s: registering %s.\n", __func__,
                 &sl->dev.bus_id[0]);
@@ -333,48 +353,36 @@ static int __w1_attach_slave_device(struct w1_slave *sl)
         err = device_register(&sl->dev);
         if (err < 0) {
                 dev_err(&sl->dev,
-                         "Device registration [%s] failed. err=%d\n",
-                         sl->dev.bus_id, err);
+                        "Device registration [%s] failed. err=%d\n",
+                        sl->dev.bus_id, err);
                 return err;
         }
 
         memcpy(&sl->attr_bin, &w1_slave_bin_attribute, sizeof(sl->attr_bin));
         memcpy(&sl->attr_name, &w1_slave_attribute, sizeof(sl->attr_name));
-        memcpy(&sl->attr_val, &w1_slave_attribute_val, sizeof(sl->attr_val));
-        
+
         sl->attr_bin.read = sl->family->fops->rbin;
         sl->attr_name.show = sl->family->fops->rname;
-        sl->attr_val.show = sl->family->fops->rval;
-        sl->attr_val.attr.name = sl->family->fops->rvalname;
 
         err = device_create_file(&sl->dev, &sl->attr_name);
         if (err < 0) {
                 dev_err(&sl->dev,
-                         "sysfs file creation for [%s] failed. err=%d\n",
-                         sl->dev.bus_id, err);
-                device_unregister(&sl->dev);
-                return err;
-        }
-
-        err = device_create_file(&sl->dev, &sl->attr_val);
-        if (err < 0) {
-                dev_err(&sl->dev,
-                         "sysfs file creation for [%s] failed. err=%d\n",
-                         sl->dev.bus_id, err);
-                device_remove_file(&sl->dev, &sl->attr_name);
+                        "sysfs file creation for [%s] failed. err=%d\n",
+                        sl->dev.bus_id, err);
                 device_unregister(&sl->dev);
                 return err;
         }
 
-        err = sysfs_create_bin_file(&sl->dev.kobj, &sl->attr_bin);
-        if (err < 0) {
-                dev_err(&sl->dev,
-                         "sysfs file creation for [%s] failed. err=%d\n",
-                         sl->dev.bus_id, err);
-                device_remove_file(&sl->dev, &sl->attr_name);
-                device_remove_file(&sl->dev, &sl->attr_val);
-                device_unregister(&sl->dev);
-                return err;
+        if ( sl->attr_bin.read ) {
+                err = sysfs_create_bin_file(&sl->dev.kobj, &sl->attr_bin);
+                if (err < 0) {
+                        dev_err(&sl->dev,
+                                "sysfs file creation for [%s] failed. err=%d\n",
+                                sl->dev.bus_id, err);
+                        device_remove_file(&sl->dev, &sl->attr_name);
+                        device_unregister(&sl->dev);
+                        return err;
+                }
         }
 
         list_add_tail(&sl->w1_slave_entry, &sl->master->slist);
@@ -410,12 +418,10 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
         spin_lock(&w1_flock);
         f = w1_family_registered(rn->family);
         if (!f) {
-                spin_unlock(&w1_flock);
+                f= &w1_default_family;
                 dev_info(&dev->dev, "Family %x for %02x.%012llx.%02x is not registered.\n",
                           rn->family, rn->family,
                           (unsigned long long)rn->id, rn->crc);
-                kfree(sl);
-                return -ENODEV;
         }
         __w1_family_get(f);
         spin_unlock(&w1_flock);
@@ -445,7 +451,7 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
 static void w1_slave_detach(struct w1_slave *sl)
 {
         struct w1_netlink_msg msg;
-        
+
         dev_info(&sl->dev, "%s: detaching %s.\n", __func__, sl->name);
 
         while (atomic_read(&sl->refcnt)) {
@@ -456,12 +462,15 @@ static void w1_slave_detach(struct w1_slave *sl)
                         flush_signals(current);
         }
 
-        sysfs_remove_bin_file (&sl->dev.kobj, &sl->attr_bin);
+        if ( sl->attr_bin.read ) {
+                sysfs_remove_bin_file (&sl->dev.kobj, &sl->attr_bin);
+        }
         device_remove_file(&sl->dev, &sl->attr_name);
-        device_remove_file(&sl->dev, &sl->attr_val);
         device_unregister(&sl->dev);
         w1_family_put(sl->family);
 
+        sl->master->slave_count--;
+
         memcpy(&msg.id.id, &sl->reg_num, sizeof(msg.id.id));
         msg.type = W1_SLAVE_REMOVE;
         w1_netlink_send(sl->master, &msg);
@@ -471,8 +480,8 @@ static struct w1_master *w1_search_master(unsigned long data)
 {
         struct w1_master *dev;
         int found = 0;
-        
-        spin_lock_irq(&w1_mlock);
+
+        spin_lock_bh(&w1_mlock);
         list_for_each_entry(dev, &w1_masters, w1_master_entry) {
                 if (dev->bus_master->data == data) {
                         found = 1;
@@ -480,12 +489,26 @@ static struct w1_master *w1_search_master(unsigned long data)
                         break;
                 }
         }
-        spin_unlock_irq(&w1_mlock);
+        spin_unlock_bh(&w1_mlock);
 
         return (found)?dev:NULL;
 }
 
-void w1_slave_found(unsigned long data, u64 rn)
+void w1_reconnect_slaves(struct w1_family *f)
+{
+        struct w1_master *dev;
+
+        spin_lock_bh(&w1_mlock);
+        list_for_each_entry(dev, &w1_masters, w1_master_entry) {
+                dev_info(&dev->dev, "Reconnecting slaves in %s into new family %02x.\n",
+                                dev->name, f->fid);
+                set_bit(W1_MASTER_NEED_RECONNECT, &dev->flags);
+        }
+        spin_unlock_bh(&w1_mlock);
+}
+
+
+static void w1_slave_found(unsigned long data, u64 rn)
 {
         int slave_count;
         struct w1_slave *sl;
@@ -500,7 +523,7 @@ void w1_slave_found(unsigned long data, u64 rn)
                                 data);
                 return;
         }
-        
+
         tmp = (struct w1_reg_num *) &rn;
 
         slave_count = 0;
@@ -513,8 +536,7 @@ void w1_slave_found(unsigned long data, u64 rn)
                     sl->reg_num.crc == tmp->crc) {
                         set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
                         break;
-                }
-                else if (sl->reg_num.family == tmp->family) {
+                } else if (sl->reg_num.family == tmp->family) {
                         family_found = 1;
                         break;
                 }
@@ -528,30 +550,43 @@ void w1_slave_found(unsigned long data, u64 rn)
                 rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) {
                 w1_attach_slave_device(dev, tmp);
         }
-                        
+
         atomic_dec(&dev->refcnt);
 }
 
-void w1_search(struct w1_master *dev)
+/**
+ * Performs a ROM Search & registers any devices found.
+ * The 1-wire search is a simple binary tree search.
+ * For each bit of the address, we read two bits and write one bit.
+ * The bit written will put to sleep all devies that don't match that bit.
+ * When the two reads differ, the direction choice is obvious.
+ * When both bits are 0, we must choose a path to take.
+ * When we can scan all 64 bits without having to choose a path, we are done.
+ *
+ * See "Application note 187 1-wire search algorithm" at www.maxim-ic.com
+ *
+ * @dev        The master device to search
+ * @cb         Function to call when a device is found
+ */
+void w1_search(struct w1_master *dev, w1_slave_found_callback cb)
 {
-        u64 last, rn, tmp;
-        int i, count = 0;
-        int last_family_desc, last_zero, last_device;
-        int search_bit, id_bit, comp_bit, desc_bit;
+        u64 last_rn, rn, tmp64;
+        int i, slave_count = 0;
+        int last_zero, last_device;
+        int search_bit, desc_bit;
+        u8  triplet_ret = 0;
 
-        search_bit = id_bit = comp_bit = 0;
-        rn = tmp = last = 0;
-        last_device = last_zero = last_family_desc = 0;
+        search_bit = 0;
+        rn = last_rn = 0;
+        last_device = 0;
+        last_zero = -1;
 
         desc_bit = 64;
 
-        while (!(id_bit && comp_bit) && !last_device
-                && count++ < dev->max_slave_count) {
-                last = rn;
+        while ( !last_device && (slave_count++ < dev->max_slave_count) ) {
+                last_rn = rn;
                 rn = 0;
 
-                last_family_desc = 0;
-
                 /*
                  * Reset bus and all 1-wire device state machines
                  * so they can respond to our requests.
@@ -563,94 +598,46 @@ void w1_search(struct w1_master *dev)
                         break;
                 }
 
-#if 1
+                /* Start the search */
                 w1_write_8(dev, W1_SEARCH);
                 for (i = 0; i < 64; ++i) {
-                        /*
-                         * Read 2 bits from bus.
-                         * All who don't sleep must send ID bit and COMPLEMENT ID bit.
-                         * They actually are ANDed between all senders.
-                         */
-                        id_bit = w1_touch_bit(dev, 1);
-                        comp_bit = w1_touch_bit(dev, 1);
-
-                        if (id_bit && comp_bit)
-                                break;
-
-                        if (id_bit == 0 && comp_bit == 0) {
-                                if (i == desc_bit)
-                                        search_bit = 1;
-                                else if (i > desc_bit)
-                                        search_bit = 0;
-                                else
-                                        search_bit = ((last >> i) & 0x1);
-
-                                if (search_bit == 0) {
-                                        last_zero = i;
-                                        if (last_zero < 9)
-                                                last_family_desc = last_zero;
-                                }
-
-                        }
+                        /* Determine the direction/search bit */
+                        if (i == desc_bit)
+                                search_bit = 1;   /* took the 0 path last time, so take the 1 path */
+                        else if (i > desc_bit)
+                                search_bit = 0;   /* take the 0 path on the next branch */
                         else
-                                search_bit = id_bit;
+                                search_bit = ((last_rn >> i) & 0x1);
 
-                        tmp = search_bit;
-                        rn |= (tmp << i);
+                        /** Read two bits and write one bit */
+                        triplet_ret = w1_triplet(dev, search_bit);
 
-                        /*
-                         * Write 1 bit to bus
-                         * and make all who don't have "search_bit" in "i"'th position
-                         * in it's registration number sleep.
-                         */
-                        if (dev->bus_master->touch_bit)
-                                w1_touch_bit(dev, search_bit);
-                        else
-                                w1_write_bit(dev, search_bit);
+                        /* quit if no device responded */
+                        if ( (triplet_ret & 0x03) == 0x03 )
+                                break;
 
-                }
-#endif
+                        /* If both directions were valid, and we took the 0 path... */
+                        if (triplet_ret == 0)
+                                last_zero = i;
 
-                if (desc_bit == last_zero)
-                        last_device = 1;
+                        /* extract the direction taken & update the device number */
+                        tmp64 = (triplet_ret >> 2);
+                        rn |= (tmp64 << i);
+                }
 
-                desc_bit = last_zero;
-        
-                w1_slave_found(dev->bus_master->data, rn);
+                if ( (triplet_ret & 0x03) != 0x03 ) {
+                        if ( (desc_bit == last_zero) || (last_zero < 0))
+                                last_device = 1;
+                        desc_bit = last_zero;
+                        cb(dev->bus_master->data, rn);
+                }
         }
 }
 
-int w1_create_master_attributes(struct w1_master *dev)
-{
-        if (    device_create_file(&dev->dev, &w1_master_attribute_slaves) < 0 ||
-                device_create_file(&dev->dev, &w1_master_attribute_slave_count) < 0 ||
-                device_create_file(&dev->dev, &w1_master_attribute_attempts) < 0 ||
-                device_create_file(&dev->dev, &w1_master_attribute_max_slave_count) < 0 ||
-                device_create_file(&dev->dev, &w1_master_attribute_timeout) < 0||
-                device_create_file(&dev->dev, &w1_master_attribute_pointer) < 0||
-                device_create_file(&dev->dev, &w1_master_attribute_name) < 0)
-                return -EINVAL;
-
-        return 0;
-}
-
-void w1_destroy_master_attributes(struct w1_master *dev)
+static int w1_control(void *data)
 {
-        device_remove_file(&dev->dev, &w1_master_attribute_slaves);
-        device_remove_file(&dev->dev, &w1_master_attribute_slave_count);
-        device_remove_file(&dev->dev, &w1_master_attribute_attempts);
-        device_remove_file(&dev->dev, &w1_master_attribute_max_slave_count);
-        device_remove_file(&dev->dev, &w1_master_attribute_timeout);
-        device_remove_file(&dev->dev, &w1_master_attribute_pointer);
-        device_remove_file(&dev->dev, &w1_master_attribute_name);
-}
-
-
-int w1_control(void *data)
-{
-        struct w1_slave *sl;
-        struct w1_master *dev;
-        struct list_head *ent, *ment, *n, *mn;
+        struct w1_slave *sl, *sln;
+        struct w1_master *dev, *n;
         int err, have_to_wait = 0;
 
         daemonize("w1_control");
@@ -665,10 +652,8 @@ int w1_control(void *data)
                 if (signal_pending(current))
                         flush_signals(current);
 
-                list_for_each_safe(ment, mn, &w1_masters) {
-                        dev = list_entry(ment, struct w1_master, w1_master_entry);
-
-                        if (!control_needs_exit && !dev->need_exit)
+                list_for_each_entry_safe(dev, n, &w1_masters, w1_master_entry) {
+                        if (!control_needs_exit && !dev->flags)
                                 continue;
                         /*
                          * Little race: we can create thread but not set the flag.
@@ -679,12 +664,8 @@ int w1_control(void *data)
                                 continue;
                         }
 
-                        spin_lock(&w1_mlock);
-                        list_del(&dev->w1_master_entry);
-                        spin_unlock(&w1_mlock);
-
                         if (control_needs_exit) {
-                                dev->need_exit = 1;
+                                set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
 
                                 err = kill_proc(dev->kpid, SIGTERM, 1);
                                 if (err)
@@ -693,24 +674,42 @@ int w1_control(void *data)
                                                  dev->kpid);
                         }
 
-                        wait_for_completion(&dev->dev_exited);
-
-                        list_for_each_safe(ent, n, &dev->slist) {
-                                sl = list_entry(ent, struct w1_slave, w1_slave_entry);
+                        if (test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
+                                wait_for_completion(&dev->dev_exited);
+                                spin_lock_bh(&w1_mlock);
+                                list_del(&dev->w1_master_entry);
+                                spin_unlock_bh(&w1_mlock);
 
-                                if (!sl)
-                                        dev_warn(&dev->dev,
-                                                  "%s: slave entry is NULL.\n",
-                                                  __func__);
-                                else {
+                                list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
                                         list_del(&sl->w1_slave_entry);
 
                                         w1_slave_detach(sl);
                                         kfree(sl);
                                 }
+                                w1_destroy_master_attributes(dev);
+                                atomic_dec(&dev->refcnt);
+                                continue;
+                        }
+
+                        if (test_bit(W1_MASTER_NEED_RECONNECT, &dev->flags)) {
+                                dev_info(&dev->dev, "Reconnecting slaves in device %s.\n", dev->name);
+                                down(&dev->mutex);
+                                list_for_each_entry(sl, &dev->slist, w1_slave_entry) {
+                                        if (sl->family->fid == W1_FAMILY_DEFAULT) {
+                                                struct w1_reg_num rn;
+                                                list_del(&sl->w1_slave_entry);
+                                                w1_slave_detach(sl);
+
+                                                memcpy(&rn, &sl->reg_num, sizeof(rn));
+
+                                                kfree(sl);
+
+                                                w1_attach_slave_device(dev, &rn);
+                                        }
+                                }
+                                clear_bit(W1_MASTER_NEED_RECONNECT, &dev->flags);
+                                up(&dev->mutex);
                         }
-                        w1_destroy_master_attributes(dev);
-                        atomic_dec(&dev->refcnt);
                 }
         }
 
@@ -720,51 +719,50 @@ int w1_control(void *data)
 int w1_process(void *data)
 {
         struct w1_master *dev = (struct w1_master *) data;
-        struct list_head *ent, *n;
-        struct w1_slave *sl;
+        struct w1_slave *sl, *sln;
 
         daemonize("%s", dev->name);
         allow_signal(SIGTERM);
 
-        while (!dev->need_exit) {
+        while (!test_bit(W1_MASTER_NEED_EXIT, &dev->flags)) {
                 try_to_freeze(PF_FREEZE);
                 msleep_interruptible(w1_timeout * 1000);
 
                 if (signal_pending(current))
                         flush_signals(current);
 
-                if (dev->need_exit)
+                if (test_bit(W1_MASTER_NEED_EXIT, &dev->flags))
                         break;
 
                 if (!dev->initialized)
                         continue;
 
+                if (dev->search_count == 0)
+                        continue;
+
                 if (down_interruptible(&dev->mutex))
                         continue;
 
-                list_for_each_safe(ent, n, &dev->slist) {
-                        sl = list_entry(ent, struct w1_slave, w1_slave_entry);
+                list_for_each_entry(sl, &dev->slist, w1_slave_entry)
+                        clear_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
 
-                        if (sl)
-                                clear_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
-                }
-                
                 w1_search_devices(dev, w1_slave_found);
 
-                list_for_each_safe(ent, n, &dev->slist) {
-                        sl = list_entry(ent, struct w1_slave, w1_slave_entry);
-
-                        if (sl && !test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) {
+                list_for_each_entry_safe(sl, sln, &dev->slist, w1_slave_entry) {
+                        if (!test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags) && !--sl->ttl) {
                                 list_del (&sl->w1_slave_entry);
 
                                 w1_slave_detach (sl);
                                 kfree (sl);
 
                                 dev->slave_count--;
-                        }
-                        else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
+                        } else if (test_bit(W1_SLAVE_ACTIVE, (unsigned long *)&sl->flags))
                                 sl->ttl = dev->slave_ttl;
                 }
+
+                if (dev->search_count > 0)
+                        dev->search_count--;
+
                 up(&dev->mutex);
         }
 
@@ -774,7 +772,7 @@ int w1_process(void *data)
         return 0;
 }
 
-int w1_init(void)
+static int w1_init(void)
 {
         int retval;
 
@@ -814,18 +812,14 @@ err_out_exit_init:
         return retval;
 }
 
-void w1_fini(void)
+static void w1_fini(void)
 {
         struct w1_master *dev;
-        struct list_head *ent, *n;
 
-        list_for_each_safe(ent, n, &w1_masters) {
-                dev = list_entry(ent, struct w1_master, w1_master_entry);
+        list_for_each_entry(dev, &w1_masters, w1_master_entry)
                 __w1_remove_master_device(dev);
-        }
 
         control_needs_exit = 1;
-
         wait_for_completion(&w1_control_complete);
 
         driver_unregister(&w1_driver);
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index abbddaf3f8e2..4f0a986e33e3 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -1,8 +1,8 @@
 /*
- *      w1.h
+ *      w1.h
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,36 +74,86 @@ struct w1_slave
         int                     ttl;
 
         struct w1_master        *master;
-        struct w1_family        *family;
-        struct device           dev;
-        struct completion       dev_released;
+        struct w1_family        *family;
+        struct device           dev;
+        struct completion       dev_released;
 
-        struct bin_attribute    attr_bin;
-        struct device_attribute attr_name, attr_val;
+        struct bin_attribute    attr_bin;
+        struct device_attribute attr_name;
 };
 
 typedef void (* w1_slave_found_callback)(unsigned long, u64);
 
+
+/**
+ * Note: read_bit and write_bit are very low level functions and should only
+ * be used with hardware that doesn't really support 1-wire operations,
+ * like a parallel/serial port.
+ * Either define read_bit and write_bit OR define, at minimum, touch_bit and
+ * reset_bus.
+ */
 struct w1_bus_master
 {
-        unsigned long           data;
-
-        u8                      (*read_bit)(unsigned long);
-        void                    (*write_bit)(unsigned long, u8);
-        
-        u8                      (*read_byte)(unsigned long);
-        void                    (*write_byte)(unsigned long, u8);
-        
-        u8                      (*read_block)(unsigned long, u8 *, int);
-        void                    (*write_block)(unsigned long, u8 *, int);
-        
-        u8                      (*touch_bit)(unsigned long, u8);
-  
-        u8                      (*reset_bus)(unsigned long);
-
-        void                    (*search)(unsigned long, w1_slave_found_callback);
+        /** the first parameter in all the functions below */
+        unsigned long   data;
+
+        /**
+         * Sample the line level
+         * @return the level read (0 or 1)
+         */
+        u8              (*read_bit)(unsigned long);
+
+        /** Sets the line level */
+        void            (*write_bit)(unsigned long, u8);
+
+        /**
+         * touch_bit is the lowest-level function for devices that really
+         * support the 1-wire protocol.
+         * touch_bit(0) = write-0 cycle
+         * touch_bit(1) = write-1 / read cycle
+         * @return the bit read (0 or 1)
+         */
+        u8              (*touch_bit)(unsigned long, u8);
+
+        /**
+         * Reads a bytes. Same as 8 touch_bit(1) calls.
+         * @return the byte read
+         */
+        u8              (*read_byte)(unsigned long);
+
+        /**
+         * Writes a byte. Same as 8 touch_bit(x) calls.
+         */
+        void            (*write_byte)(unsigned long, u8);
+
+        /**
+         * Same as a series of read_byte() calls
+         * @return the number of bytes read
+         */
+        u8              (*read_block)(unsigned long, u8 *, int);
+
+        /** Same as a series of write_byte() calls */
+        void            (*write_block)(unsigned long, const u8 *, int);
+
+        /**
+         * Combines two reads and a smart write for ROM searches
+         * @return bit0=Id bit1=comp_id bit2=dir_taken
+         */
+        u8              (*triplet)(unsigned long, u8);
+
+        /**
+         * long write-0 with a read for the presence pulse detection
+         * @return -1=Error, 0=Device present, 1=No device present
+         */
+        u8              (*reset_bus)(unsigned long);
+
+        /** Really nice hardware can handles the ROM searches */
+        void            (*search)(unsigned long, w1_slave_found_callback);
 };
 
+#define W1_MASTER_NEED_EXIT             0
+#define W1_MASTER_NEED_RECONNECT        1
+
 struct w1_master
 {
         struct list_head        w1_master_entry;
@@ -115,30 +165,31 @@ struct w1_master
         int                     slave_ttl;
         int                     initialized;
         u32                     id;
+        int                     search_count;
 
         atomic_t                refcnt;
 
         void                    *priv;
         int                     priv_size;
 
-        int                     need_exit;
+        long                    flags;
+
         pid_t                   kpid;
-        struct semaphore        mutex;
+        struct semaphore        mutex;
 
         struct device_driver    *driver;
-        struct device           dev;
-        struct completion       dev_released;
-        struct completion       dev_exited;
+        struct device           dev;
+        struct completion       dev_released;
+        struct completion       dev_exited;
 
         struct w1_bus_master    *bus_master;
 
         u32                     seq, groups;
-        struct sock             *nls;
+        struct sock             *nls;
 };
 
 int w1_create_master_attributes(struct w1_master *);
-void w1_destroy_master_attributes(struct w1_master *);
-void w1_search(struct w1_master *dev);
+void w1_search(struct w1_master *dev, w1_slave_found_callback cb);
 
 #endif /* __KERNEL__ */
 
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index d1d56eca1061..02eee57d3c0c 100644
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -1,8 +1,8 @@
 /*
- *      w1_family.c
+ *      w1_family.c
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,10 +27,11 @@
 
 DEFINE_SPINLOCK(w1_flock);
 static LIST_HEAD(w1_families);
+extern void w1_reconnect_slaves(struct w1_family *f);
 
 static int w1_check_family(struct w1_family *f)
 {
-        if (!f->fops->rname || !f->fops->rbin || !f->fops->rval || !f->fops->rvalname)
+        if (!f->fops->rname || !f->fops->rbin)
                 return -EINVAL;
 
         return 0;
@@ -60,9 +61,10 @@ int w1_register_family(struct w1_family *newf)
                 newf->need_exit = 0;
                 list_add_tail(&newf->family_entry, &w1_families);
         }
-
         spin_unlock(&w1_flock);
 
+        w1_reconnect_slaves(newf);
+
         return ret;
 }
 
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index 07fa49412a90..b26da01bbc38 100644
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -1,8 +1,8 @@
 /*
- *      w1_family.h
+ *      w1_family.h
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,11 @@
 #include <asm/atomic.h>
 
 #define W1_FAMILY_DEFAULT       0
-#define W1_FAMILY_THERM         0x10
-#define W1_FAMILY_SMEM          0x01
+#define W1_FAMILY_SMEM_01       0x01
+#define W1_FAMILY_SMEM_81       0x81
+#define W1_THERM_DS18S20        0x10
+#define W1_THERM_DS1822         0x22
+#define W1_THERM_DS18B20        0x28
 
 #define MAXNAMELEN              32
 
@@ -36,18 +39,15 @@ struct w1_family_ops
 {
         ssize_t (* rname)(struct device *, struct device_attribute *, char *);
         ssize_t (* rbin)(struct kobject *, char *, loff_t, size_t);
-        
-        ssize_t (* rval)(struct device *, struct device_attribute *, char *);
-        unsigned char rvalname[MAXNAMELEN];
 };
 
 struct w1_family
 {
         struct list_head        family_entry;
         u8                      fid;
-        
+
         struct w1_family_ops    *fops;
-        
+
         atomic_t                refcnt;
         u8                      need_exit;
 };
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 5f0bafbbd575..35e85d961702 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -1,8 +1,8 @@
 /*
- *      w1_int.c
+ *      w1_int.c
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,8 +39,9 @@ extern spinlock_t w1_mlock;
 
 extern int w1_process(void *);
 
-struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
-              struct device_driver *driver, struct device *device)
+static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
+                                       struct device_driver *driver,
+                                       struct device *device)
 {
         struct w1_master *dev;
         int err;
@@ -60,14 +61,15 @@ struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
 
         dev->bus_master = (struct w1_bus_master *)(dev + 1);
 
-        dev->owner              = THIS_MODULE;
-        dev->max_slave_count    = slave_count;
-        dev->slave_count        = 0;
-        dev->attempts           = 0;
-        dev->kpid               = -1;
-        dev->initialized        = 0;
-        dev->id                 = id;
+        dev->owner              = THIS_MODULE;
+        dev->max_slave_count    = slave_count;
+        dev->slave_count        = 0;
+        dev->attempts           = 0;
+        dev->kpid               = -1;
+        dev->initialized        = 0;
+        dev->id                 = id;
         dev->slave_ttl          = slave_ttl;
+        dev->search_count       = -1; /* continual scan */
 
         atomic_set(&dev->refcnt, 2);
 
@@ -105,7 +107,7 @@ struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
         return dev;
 }
 
-void w1_free_dev(struct w1_master *dev)
+static void w1_free_dev(struct w1_master *dev)
 {
         device_unregister(&dev->dev);
         if (dev->nls && dev->nls->sk_socket)
@@ -120,6 +122,13 @@ int w1_add_master_device(struct w1_bus_master *master)
         int retval = 0;
         struct w1_netlink_msg msg;
 
+        /* validate minimum functionality */
+        if (!(master->touch_bit && master->reset_bus) &&
+            !(master->write_bit && master->read_bit)) {
+                printk(KERN_ERR "w1_add_master_device: invalid function set\n");
+                return(-EINVAL);
+        }
+
         dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_driver, &w1_device);
         if (!dev)
                 return -ENOMEM;
@@ -153,7 +162,7 @@ int w1_add_master_device(struct w1_bus_master *master)
         return 0;
 
 err_out_kill_thread:
-        dev->need_exit = 1;
+        set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
         if (kill_proc(dev->kpid, SIGTERM, 1))
                 dev_err(&dev->dev,
                          "Failed to send signal to w1 kernel thread %d.\n",
@@ -171,7 +180,7 @@ void __w1_remove_master_device(struct w1_master *dev)
         int err;
         struct w1_netlink_msg msg;
 
-        dev->need_exit = 1;
+        set_bit(W1_MASTER_NEED_EXIT, &dev->flags);
         err = kill_proc(dev->kpid, SIGTERM, 1);
         if (err)
                 dev_err(&dev->dev,
@@ -197,10 +206,8 @@ void __w1_remove_master_device(struct w1_master *dev)
 void w1_remove_master_device(struct w1_bus_master *bm)
 {
         struct w1_master *dev = NULL;
-        struct list_head *ent, *n;
 
-        list_for_each_safe(ent, n, &w1_masters) {
-                dev = list_entry(ent, struct w1_master, w1_master_entry);
+        list_for_each_entry(dev, &w1_masters, w1_master_entry) {
                 if (!dev->initialized)
                         continue;
 
diff --git a/drivers/w1/w1_int.h b/drivers/w1/w1_int.h
index fdb531e87faa..4274082d2262 100644
--- a/drivers/w1/w1_int.h
+++ b/drivers/w1/w1_int.h
@@ -1,8 +1,8 @@
 /*
- *      w1_int.h
+ *      w1_int.h
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,6 @@
 
 #include "w1.h"
 
-struct w1_master * w1_alloc_dev(u32, int, int, struct device_driver *, struct device *);
-void w1_free_dev(struct w1_master *dev);
 int w1_add_master_device(struct w1_bus_master *);
 void w1_remove_master_device(struct w1_bus_master *);
 void __w1_remove_master_device(struct w1_master *);
diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c
index 02796b5a39f6..00f032220173 100644
--- a/drivers/w1/w1_io.c
+++ b/drivers/w1/w1_io.c
@@ -1,8 +1,8 @@
 /*
- *      w1_io.c
+ *      w1_io.c
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,15 +55,29 @@ void w1_delay(unsigned long tm)
         udelay(tm * w1_delay_parm);
 }
 
+static void w1_write_bit(struct w1_master *dev, int bit);
+static u8 w1_read_bit(struct w1_master *dev);
+
+/**
+ * Generates a write-0 or write-1 cycle and samples the level.
+ */
 u8 w1_touch_bit(struct w1_master *dev, int bit)
 {
         if (dev->bus_master->touch_bit)
                 return dev->bus_master->touch_bit(dev->bus_master->data, bit);
-        else
+        else if (bit)
                 return w1_read_bit(dev);
+        else {
+                w1_write_bit(dev, 0);
+                return(0);
+        }
 }
 
-void w1_write_bit(struct w1_master *dev, int bit)
+/**
+ * Generates a write-0 or write-1 cycle.
+ * Only call if dev->bus_master->touch_bit is NULL
+ */
+static void w1_write_bit(struct w1_master *dev, int bit)
 {
         if (bit) {
                 dev->bus_master->write_bit(dev->bus_master->data, 0);
@@ -78,6 +92,12 @@ void w1_write_bit(struct w1_master *dev, int bit)
         }
 }
 
+/**
+ * Writes 8 bits.
+ *
+ * @param dev     the master device
+ * @param byte    the byte to write
+ */
 void w1_write_8(struct w1_master *dev, u8 byte)
 {
         int i;
@@ -86,10 +106,15 @@ void w1_write_8(struct w1_master *dev, u8 byte)
                 dev->bus_master->write_byte(dev->bus_master->data, byte);
         else
                 for (i = 0; i < 8; ++i)
-                        w1_write_bit(dev, (byte >> i) & 0x1);
+                        w1_touch_bit(dev, (byte >> i) & 0x1);
 }
 
-u8 w1_read_bit(struct w1_master *dev)
+
+/**
+ * Generates a write-1 cycle and samples the level.
+ * Only call if dev->bus_master->touch_bit is NULL
+ */
+static u8 w1_read_bit(struct w1_master *dev)
 {
         int result;
 
@@ -104,6 +129,53 @@ u8 w1_read_bit(struct w1_master *dev)
         return result & 0x1;
 }
 
+/**
+ * Does a triplet - used for searching ROM addresses.
+ * Return bits:
+ *  bit 0 = id_bit
+ *  bit 1 = comp_bit
+ *  bit 2 = dir_taken
+ * If both bits 0 & 1 are set, the search should be restarted.
+ *
+ * @param dev     the master device
+ * @param bdir    the bit to write if both id_bit and comp_bit are 0
+ * @return        bit fields - see above
+ */
+u8 w1_triplet(struct w1_master *dev, int bdir)
+{
+        if ( dev->bus_master->triplet )
+                return(dev->bus_master->triplet(dev->bus_master->data, bdir));
+        else {
+                u8 id_bit   = w1_touch_bit(dev, 1);
+                u8 comp_bit = w1_touch_bit(dev, 1);
+                u8 retval;
+
+                if ( id_bit && comp_bit )
+                        return(0x03);  /* error */
+
+                if ( !id_bit && !comp_bit ) {
+                        /* Both bits are valid, take the direction given */
+                        retval = bdir ? 0x04 : 0;
+                } else {
+                        /* Only one bit is valid, take that direction */
+                        bdir = id_bit;
+                        retval = id_bit ? 0x05 : 0x02;
+                }
+
+                if ( dev->bus_master->touch_bit )
+                        w1_touch_bit(dev, bdir);
+                else
+                        w1_write_bit(dev, bdir);
+                return(retval);
+        }
+}
+
+/**
+ * Reads 8 bits.
+ *
+ * @param dev     the master device
+ * @return        the byte read
+ */
 u8 w1_read_8(struct w1_master * dev)
 {
         int i;
@@ -113,12 +185,20 @@ u8 w1_read_8(struct w1_master * dev)
                 res = dev->bus_master->read_byte(dev->bus_master->data);
         else
                 for (i = 0; i < 8; ++i)
-                        res |= (w1_read_bit(dev) << i);
+                        res |= (w1_touch_bit(dev,1) << i);
 
         return res;
 }
 
-void w1_write_block(struct w1_master *dev, u8 *buf, int len)
+/**
+ * Writes a series of bytes.
+ *
+ * @param dev     the master device
+ * @param buf     pointer to the data to write
+ * @param len     the number of bytes to write
+ * @return        the byte read
+ */
+void w1_write_block(struct w1_master *dev, const u8 *buf, int len)
 {
         int i;
 
@@ -129,6 +209,14 @@ void w1_write_block(struct w1_master *dev, u8 *buf, int len)
                         w1_write_8(dev, buf[i]);
 }
 
+/**
+ * Reads a series of bytes.
+ *
+ * @param dev     the master device
+ * @param buf     pointer to the buffer to fill
+ * @param len     the number of bytes to read
+ * @return        the number of bytes read
+ */
 u8 w1_read_block(struct w1_master *dev, u8 *buf, int len)
 {
         int i;
@@ -145,9 +233,15 @@ u8 w1_read_block(struct w1_master *dev, u8 *buf, int len)
         return ret;
 }
 
+/**
+ * Issues a reset bus sequence.
+ *
+ * @param  dev The bus master pointer
+ * @return     0=Device present, 1=No device present or error
+ */
 int w1_reset_bus(struct w1_master *dev)
 {
-        int result = 0;
+        int result;
 
         if (dev->bus_master->reset_bus)
                 result = dev->bus_master->reset_bus(dev->bus_master->data) & 0x1;
@@ -180,12 +274,11 @@ void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb)
         if (dev->bus_master->search)
                 dev->bus_master->search(dev->bus_master->data, cb);
         else
-                w1_search(dev);
+                w1_search(dev, cb);
 }
 
-EXPORT_SYMBOL(w1_write_bit);
+EXPORT_SYMBOL(w1_touch_bit);
 EXPORT_SYMBOL(w1_write_8);
-EXPORT_SYMBOL(w1_read_bit);
 EXPORT_SYMBOL(w1_read_8);
 EXPORT_SYMBOL(w1_reset_bus);
 EXPORT_SYMBOL(w1_calc_crc8);
diff --git a/drivers/w1/w1_io.h b/drivers/w1/w1_io.h
index 6c573005a712..af5829778aaa 100644
--- a/drivers/w1/w1_io.h
+++ b/drivers/w1/w1_io.h
@@ -1,8 +1,8 @@
 /*
- *      w1_io.h
+ *      w1_io.h
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,13 +26,12 @@
 
 void w1_delay(unsigned long);
 u8 w1_touch_bit(struct w1_master *, int);
-void w1_write_bit(struct w1_master *, int);
+u8 w1_triplet(struct w1_master *dev, int bdir);
 void w1_write_8(struct w1_master *, u8);
-u8 w1_read_bit(struct w1_master *);
 u8 w1_read_8(struct w1_master *);
 int w1_reset_bus(struct w1_master *);
 u8 w1_calc_crc8(u8 *, int);
-void w1_write_block(struct w1_master *, u8 *, int);
+void w1_write_block(struct w1_master *, const u8 *, int);
 u8 w1_read_block(struct w1_master *, u8 *, int);
 void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb);
 
diff --git a/drivers/w1/w1_log.h b/drivers/w1/w1_log.h
index a6bf6f44dce2..fe6bdf43380f 100644
--- a/drivers/w1/w1_log.h
+++ b/drivers/w1/w1_log.h
@@ -1,8 +1,8 @@
 /*
- *      w1_log.h
+ *      w1_log.h
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
index ea1b530abad0..8615756946df 100644
--- a/drivers/w1/w1_netlink.h
+++ b/drivers/w1/w1_netlink.h
@@ -33,13 +33,13 @@ enum w1_netlink_message_types {
         W1_MASTER_REMOVE,
 };
 
-struct w1_netlink_msg 
+struct w1_netlink_msg
 {
         __u8                            type;
         __u8                            reserved[3];
         union
         {
-                struct w1_reg_num       id;
+                struct w1_reg_num       id;
                 __u64                   w1_id;
                 struct
                 {
diff --git a/drivers/w1/w1_smem.c b/drivers/w1/w1_smem.c
index 674eb75a9bad..70d2d469963c 100644
--- a/drivers/w1/w1_smem.c
+++ b/drivers/w1/w1_smem.c
@@ -1,8 +1,8 @@
 /*
- *      w1_smem.c
+ *      w1_smem.c
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the smems of the GNU General Public License as published by
@@ -37,14 +37,11 @@ MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
 MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family.");
 
 static ssize_t w1_smem_read_name(struct device *, struct device_attribute *attr, char *);
-static ssize_t w1_smem_read_val(struct device *, struct device_attribute *attr, char *);
 static ssize_t w1_smem_read_bin(struct kobject *, char *, loff_t, size_t);
 
 static struct w1_family_ops w1_smem_fops = {
         .rname = &w1_smem_read_name,
         .rbin = &w1_smem_read_bin,
-        .rval = &w1_smem_read_val,
-        .rvalname = "id",
 };
 
 static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *attr, char *buf)
@@ -54,23 +51,10 @@ static ssize_t w1_smem_read_name(struct device *dev, struct device_attribute *at
         return sprintf(buf, "%s\n", sl->name);
 }
 
-static ssize_t w1_smem_read_val(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
-        int i;
-        ssize_t count = 0;
-        
-        for (i = 0; i < 8; ++i)
-                count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
-        count += sprintf(buf + count, "\n");
-
-        return count;
-}
-
 static ssize_t w1_smem_read_bin(struct kobject *kobj, char *buf, loff_t off, size_t count)
 {
         struct w1_slave *sl = container_of(container_of(kobj, struct device, kobj),
-                                                struct w1_slave, dev);
+                                           struct w1_slave, dev);
         int i;
 
         atomic_inc(&sl->refcnt);
@@ -90,7 +74,7 @@ static ssize_t w1_smem_read_bin(struct kobject *kobj, char *buf, loff_t off, siz
         for (i = 0; i < 8; ++i)
                 count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
         count += sprintf(buf + count, "\n");
-        
+
 out:
         up(&sl->master->mutex);
 out_dec:
@@ -99,19 +83,37 @@ out_dec:
         return count;
 }
 
-static struct w1_family w1_smem_family = {
-        .fid = W1_FAMILY_SMEM,
+static struct w1_family w1_smem_family_01 = {
+        .fid = W1_FAMILY_SMEM_01,
+        .fops = &w1_smem_fops,
+};
+
+static struct w1_family w1_smem_family_81 = {
+        .fid = W1_FAMILY_SMEM_81,
         .fops = &w1_smem_fops,
 };
 
 static int __init w1_smem_init(void)
 {
-        return w1_register_family(&w1_smem_family);
+        int err;
+
+        err = w1_register_family(&w1_smem_family_01);
+        if (err)
+                return err;
+        
+        err = w1_register_family(&w1_smem_family_81);
+        if (err) {
+                w1_unregister_family(&w1_smem_family_01);
+                return err;
+        }
+
+        return 0;
 }
 
 static void __exit w1_smem_fini(void)
 {
-        w1_unregister_family(&w1_smem_family);
+        w1_unregister_family(&w1_smem_family_01);
+        w1_unregister_family(&w1_smem_family_81);
 }
 
 module_init(w1_smem_init);
diff --git a/drivers/w1/w1_therm.c b/drivers/w1/w1_therm.c
index 70310f7a722e..165526c9360a 100644
--- a/drivers/w1/w1_therm.c
+++ b/drivers/w1/w1_therm.c
@@ -1,8 +1,8 @@
 /*
- *      w1_therm.c
+ *      w1_therm.c
  *
  * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
- * 
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the therms of the GNU General Public License as published by
@@ -38,19 +38,56 @@ MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
 MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, temperature family.");
 
 static u8 bad_roms[][9] = {
-                                {0xaa, 0x00, 0x4b, 0x46, 0xff, 0xff, 0x0c, 0x10, 0x87}, 
+                                {0xaa, 0x00, 0x4b, 0x46, 0xff, 0xff, 0x0c, 0x10, 0x87},
                                 {}
                         };
 
 static ssize_t w1_therm_read_name(struct device *, struct device_attribute *attr, char *);
-static ssize_t w1_therm_read_temp(struct device *, struct device_attribute *attr, char *);
 static ssize_t w1_therm_read_bin(struct kobject *, char *, loff_t, size_t);
 
 static struct w1_family_ops w1_therm_fops = {
         .rname = &w1_therm_read_name,
         .rbin = &w1_therm_read_bin,
-        .rval = &w1_therm_read_temp,
-        .rvalname = "temp1_input",
+};
+
+static struct w1_family w1_therm_family_DS18S20 = {
+        .fid = W1_THERM_DS18S20,
+        .fops = &w1_therm_fops,
+};
+
+static struct w1_family w1_therm_family_DS18B20 = {
+        .fid = W1_THERM_DS18B20,
+        .fops = &w1_therm_fops,
+};
+static struct w1_family w1_therm_family_DS1822 = {
+        .fid = W1_THERM_DS1822,
+        .fops = &w1_therm_fops,
+};
+
+struct w1_therm_family_converter
+{
+        u8                      broken;
+        u16                     reserved;
+        struct w1_family        *f;
+        int                     (*convert)(u8 rom[9]);
+};
+
+static inline int w1_DS18B20_convert_temp(u8 rom[9]);
+static inline int w1_DS18S20_convert_temp(u8 rom[9]);
+
+static struct w1_therm_family_converter w1_therm_families[] = {
+        {
+                .f              = &w1_therm_family_DS18S20,
+                .convert        = w1_DS18S20_convert_temp
+        },
+        {
+                .f              = &w1_therm_family_DS1822,
+                .convert        = w1_DS18B20_convert_temp
+        },
+        {
+                .f              = &w1_therm_family_DS18B20,
+                .convert        = w1_DS18B20_convert_temp
+        },
 };
 
 static ssize_t w1_therm_read_name(struct device *dev, struct device_attribute *attr, char *buf)
@@ -60,9 +97,19 @@ static ssize_t w1_therm_read_name(struct device *dev, struct device_attribute *a
         return sprintf(buf, "%s\n", sl->name);
 }
 
-static inline int w1_convert_temp(u8 rom[9])
+static inline int w1_DS18B20_convert_temp(u8 rom[9])
+{
+        int t = (rom[1] << 8) | rom[0];
+        t /= 16;
+        return t;
+}
+
+static inline int w1_DS18S20_convert_temp(u8 rom[9])
 {
         int t, h;
+
+        if (!rom[7])
+                return 0;
         
         if (rom[1] == 0)
                 t = ((s32)rom[0] >> 1)*1000;
@@ -77,11 +124,15 @@ static inline int w1_convert_temp(u8 rom[9])
         return t;
 }
 
-static ssize_t w1_therm_read_temp(struct device *dev, struct device_attribute *attr, char *buf)
+static inline int w1_convert_temp(u8 rom[9], u8 fid)
 {
-        struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
+        int i;
+
+        for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i)
+                if (w1_therm_families[i].f->fid == fid)
+                        return w1_therm_families[i].convert(rom);
 
-        return sprintf(buf, "%d\n", w1_convert_temp(sl->rom));
+        return 0;
 }
 
 static int w1_therm_check_rom(u8 rom[9])
@@ -98,7 +149,7 @@ static int w1_therm_check_rom(u8 rom[9])
 static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, size_t count)
 {
         struct w1_slave *sl = container_of(container_of(kobj, struct device, kobj),
-                                                struct w1_slave, dev);
+                                           struct w1_slave, dev);
         struct w1_master *dev = sl->master;
         u8 rom[9], crc, verdict;
         int i, max_trying = 10;
@@ -133,7 +184,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si
                         unsigned int tm = 750;
 
                         memcpy(&match[1], (u64 *) & sl->reg_num, 8);
-                        
+
                         w1_write_block(dev, match, 9);
 
                         w1_write_8(dev, W1_CONVERT_TEMP);
@@ -146,7 +197,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si
 
                         if (!w1_reset_bus (dev)) {
                                 w1_write_block(dev, match, 9);
-                                
+
                                 w1_write_8(dev, W1_READ_SCRATCHPAD);
                                 if ((count = w1_read_block(dev, rom, 9)) != 9) {
                                         dev_warn(&dev->dev, "w1_read_block() returned %d instead of 9.\n", count);
@@ -176,7 +227,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si
         for (i = 0; i < 9; ++i)
                 count += sprintf(buf + count, "%02x ", sl->rom[i]);
         
-        count += sprintf(buf + count, "t=%d\n", w1_convert_temp(rom));
+        count += sprintf(buf + count, "t=%d\n", w1_convert_temp(rom, sl->family->fid));
 out:
         up(&dev->mutex);
 out_dec:
@@ -186,19 +237,26 @@ out_dec:
         return count;
 }
 
-static struct w1_family w1_therm_family = {
-        .fid = W1_FAMILY_THERM,
-        .fops = &w1_therm_fops,
-};
-
 static int __init w1_therm_init(void)
 {
-        return w1_register_family(&w1_therm_family);
+        int err, i;
+
+        for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i) {
+                err = w1_register_family(w1_therm_families[i].f);
+                if (err)
+                        w1_therm_families[i].broken = 1;
+        }
+
+        return 0;
 }
 
 static void __exit w1_therm_fini(void)
 {
-        w1_unregister_family(&w1_therm_family);
+        int i;
+
+        for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i)
+                if (!w1_therm_families[i].broken)
+                        w1_unregister_family(w1_therm_families[i].f);
 }
 
 module_init(w1_therm_init);
diff --git a/fs/Kconfig b/fs/Kconfig
index 178e27494b74..a7c0cc3203cb 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1268,6 +1268,7 @@ config NFS_FS
         depends on INET
         select LOCKD
         select SUNRPC
+        select NFS_ACL_SUPPORT if NFS_V3_ACL
         help
           If you are connected to some other (usually local) Unix computer
           (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing
@@ -1310,6 +1311,16 @@ config NFS_V3
 
           If unsure, say Y.
 
+config NFS_V3_ACL
+        bool "Provide client support for the NFSv3 ACL protocol extension"
+        depends on NFS_V3
+        help
+          Implement the NFSv3 ACL protocol extension for manipulating POSIX
+          Access Control Lists.  The server should also be compiled with
+          the NFSv3 ACL protocol extension; see the CONFIG_NFSD_V3_ACL option.
+
+          If unsure, say N.
+
 config NFS_V4
         bool "Provide NFSv4 client support (EXPERIMENTAL)"
         depends on NFS_FS && EXPERIMENTAL
@@ -1353,6 +1364,7 @@ config NFSD
         select LOCKD
         select SUNRPC
         select EXPORTFS
+        select NFS_ACL_SUPPORT if NFSD_V3_ACL || NFSD_V2_ACL
         help
           If you want your Linux box to act as an NFS *server*, so that other
           computers on your local network which support NFS can access certain
@@ -1376,6 +1388,10 @@ config NFSD
           To compile the NFS server support as a module, choose M here: the
           module will be called nfsd.  If unsure, say N.
 
+config NFSD_V2_ACL
+        bool
+        depends on NFSD
+
 config NFSD_V3
         bool "Provide NFSv3 server support"
         depends on NFSD
@@ -1383,6 +1399,16 @@ config NFSD_V3
           If you would like to include the NFSv3 server as well as the NFSv2
           server, say Y here.  If unsure, say Y.
 
+config NFSD_V3_ACL
+        bool "Provide server support for the NFSv3 ACL protocol extension"
+        depends on NFSD_V3
+        select NFSD_V2_ACL
+        help
+          Implement the NFSv3 ACL protocol extension for manipulating POSIX
+          Access Control Lists on exported file systems. NFS clients should
+          be compiled with the NFSv3 ACL protocol extension; see the
+          CONFIG_NFS_V3_ACL option.  If unsure, say N.
+
 config NFSD_V4
         bool "Provide NFSv4 server support (EXPERIMENTAL)"
         depends on NFSD_V3 && EXPERIMENTAL
@@ -1427,6 +1453,15 @@ config LOCKD_V4
 config EXPORTFS
         tristate
 
+config NFS_ACL_SUPPORT
+        tristate
+        select FS_POSIX_ACL
+
+config NFS_COMMON
+        bool
+        depends on NFSD || NFS_FS
+        default y
+
 config SUNRPC
         tristate
 
diff --git a/fs/Makefile b/fs/Makefile
index 443f2bc56ccf..fc92e59e9faf 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_BINFMT_FLAT)	+= binfmt_flat.o
 
 obj-$(CONFIG_FS_MBCACHE)        += mbcache.o
 obj-$(CONFIG_FS_POSIX_ACL)      += posix_acl.o xattr_acl.o
+obj-$(CONFIG_NFS_COMMON)        += nfs_common/
 
 obj-$(CONFIG_QUOTA)             += dquot.o
 obj-$(CONFIG_QFMT_V1)           += quota_v1.o
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index ef7103b8c5bd..006bb9e14579 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -31,7 +31,7 @@ static int			reclaimer(void *ptr);
  * This is the representation of a blocked client lock.
  */
 struct nlm_wait {
-        struct nlm_wait *       b_next;         /* linked list */
+        struct list_head        b_list;         /* linked list */
         wait_queue_head_t       b_wait;         /* where to wait on */
         struct nlm_host *       b_host;
         struct file_lock *      b_lock;         /* local file lock */
@@ -39,27 +39,54 @@ struct nlm_wait {
         u32                     b_status;       /* grant callback status */
 };
 
-static struct nlm_wait *        nlm_blocked;
+static LIST_HEAD(nlm_blocked);
 
 /*
- * Block on a lock
+ * Queue up a lock for blocking so that the GRANTED request can see it
  */
-int
-nlmclnt_block(struct nlm_host *host, struct file_lock *fl, u32 *statp)
+int nlmclnt_prepare_block(struct nlm_rqst *req, struct nlm_host *host, struct file_lock *fl)
+{
+        struct nlm_wait *block;
+
+        BUG_ON(req->a_block != NULL);
+        block = kmalloc(sizeof(*block), GFP_KERNEL);
+        if (block == NULL)
+                return -ENOMEM;
+        block->b_host = host;
+        block->b_lock = fl;
+        init_waitqueue_head(&block->b_wait);
+        block->b_status = NLM_LCK_BLOCKED;
+
+        list_add(&block->b_list, &nlm_blocked);
+        req->a_block = block;
+
+        return 0;
+}
+
+void nlmclnt_finish_block(struct nlm_rqst *req)
 {
-        struct nlm_wait block, **head;
-        int             err;
-        u32             pstate;
+        struct nlm_wait *block = req->a_block;
 
-        block.b_host   = host;
-        block.b_lock   = fl;
-        init_waitqueue_head(&block.b_wait);
-        block.b_status = NLM_LCK_BLOCKED;
-        block.b_next   = nlm_blocked;
-        nlm_blocked    = &block;
+        if (block == NULL)
+                return;
+        req->a_block = NULL;
+        list_del(&block->b_list);
+        kfree(block);
+}
+
+/*
+ * Block on a lock
+ */
+long nlmclnt_block(struct nlm_rqst *req, long timeout)
+{
+        struct nlm_wait *block = req->a_block;
+        long ret;
 
-        /* Remember pseudo nsm state */
-        pstate = host->h_state;
+        /* A borken server might ask us to block even if we didn't
+         * request it. Just say no!
+         */
+        if (!req->a_args.block)
+                return -EAGAIN;
 
         /* Go to sleep waiting for GRANT callback. Some servers seem
          * to lose callbacks, however, so we're going to poll from
@@ -69,28 +96,16 @@ nlmclnt_block(struct nlm_host *host, struct file_lock *fl, u32 *statp)
          * a 1 minute timeout would do. See the comment before
          * nlmclnt_lock for an explanation.
          */
-        sleep_on_timeout(&block.b_wait, 30*HZ);
-
-        for (head = &nlm_blocked; *head; head = &(*head)->b_next) {
-                if (*head == &block) {
-                        *head = block.b_next;
-                        break;
-                }
-        }
+        ret = wait_event_interruptible_timeout(block->b_wait,
+                        block->b_status != NLM_LCK_BLOCKED,
+                        timeout);
 
-        if (!signalled()) {
-                *statp = block.b_status;
-                return 0;
+        if (block->b_status != NLM_LCK_BLOCKED) {
+                req->a_res.status = block->b_status;
+                block->b_status = NLM_LCK_BLOCKED;
         }
 
-        /* Okay, we were interrupted. Cancel the pending request
-         * unless the server has rebooted.
-         */
-        if (pstate == host->h_state && (err = nlmclnt_cancel(host, fl)) < 0)
-                printk(KERN_NOTICE
-                        "lockd: CANCEL call failed (errno %d)\n", -err);
-
-        return -ERESTARTSYS;
+        return ret;
 }
 
 /*
@@ -100,27 +115,23 @@ u32
 nlmclnt_grant(struct nlm_lock *lock)
 {
         struct nlm_wait *block;
+        u32 res = nlm_lck_denied;
 
         /*
          * Look up blocked request based on arguments. 
          * Warning: must not use cookie to match it!
          */
-        for (block = nlm_blocked; block; block = block->b_next) {
-                if (nlm_compare_locks(block->b_lock, &lock->fl))
-                        break;
+        list_for_each_entry(block, &nlm_blocked, b_list) {
+                if (nlm_compare_locks(block->b_lock, &lock->fl)) {
+                        /* Alright, we found a lock. Set the return status
+                         * and wake up the caller
+                         */
+                        block->b_status = NLM_LCK_GRANTED;
+                        wake_up(&block->b_wait);
+                        res = nlm_granted;
+                }
         }
-
-        /* Ooops, no blocked request found. */
-        if (block == NULL)
-                return nlm_lck_denied;
-
-        /* Alright, we found the lock. Set the return status and
-         * wake up the caller.
-         */
-        block->b_status = NLM_LCK_GRANTED;
-        wake_up(&block->b_wait);
-
-        return nlm_granted;
+        return res;
 }
 
 /*
@@ -230,7 +241,7 @@ restart:
         host->h_reclaiming = 0;
 
         /* Now, wake up all processes that sleep on a blocked lock */
-        for (block = nlm_blocked; block; block = block->b_next) {
+        list_for_each_entry(block, &nlm_blocked, b_list) {
                 if (block->b_host == host) {
                         block->b_status = NLM_LCK_DENIED_GRACE_PERIOD;
                         wake_up(&block->b_wait);
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index a4407619b1f1..fd77ed1d710d 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -21,6 +21,7 @@
 
 #define NLMDBG_FACILITY         NLMDBG_CLIENT
 #define NLMCLNT_GRACE_WAIT      (5*HZ)
+#define NLMCLNT_POLL_TIMEOUT    (30*HZ)
 
 static int      nlmclnt_test(struct nlm_rqst *, struct file_lock *);
 static int      nlmclnt_lock(struct nlm_rqst *, struct file_lock *);
@@ -553,7 +554,8 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
 {
         struct nlm_host *host = req->a_host;
         struct nlm_res  *resp = &req->a_res;
-        int             status;
+        long timeout;
+        int status;
 
         if (!host->h_monitored && nsm_monitor(host) < 0) {
                 printk(KERN_NOTICE "lockd: failed to monitor %s\n",
@@ -562,15 +564,32 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
                 goto out;
         }
 
-        do {
-                if ((status = nlmclnt_call(req, NLMPROC_LOCK)) >= 0) {
-                        if (resp->status != NLM_LCK_BLOCKED)
-                                break;
-                        status = nlmclnt_block(host, fl, &resp->status);
-                }
+        if (req->a_args.block) {
+                status = nlmclnt_prepare_block(req, host, fl);
                 if (status < 0)
                         goto out;
-        } while (resp->status == NLM_LCK_BLOCKED && req->a_args.block);
+        }
+        for(;;) {
+                status = nlmclnt_call(req, NLMPROC_LOCK);
+                if (status < 0)
+                        goto out_unblock;
+                if (resp->status != NLM_LCK_BLOCKED)
+                        break;
+                /* Wait on an NLM blocking lock */
+                timeout = nlmclnt_block(req, NLMCLNT_POLL_TIMEOUT);
+                /* Did a reclaimer thread notify us of a server reboot? */
+                if (resp->status ==  NLM_LCK_DENIED_GRACE_PERIOD)
+                        continue;
+                if (resp->status != NLM_LCK_BLOCKED)
+                        break;
+                if (timeout >= 0)
+                        continue;
+                /* We were interrupted. Send a CANCEL request to the server
+                 * and exit
+                 */
+                status = (int)timeout;
+                goto out_unblock;
+        }
 
         if (resp->status == NLM_LCK_GRANTED) {
                 fl->fl_u.nfs_fl.state = host->h_state;
@@ -579,6 +598,11 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
                 do_vfs_lock(fl);
         }
         status = nlm_stat_to_errno(resp->status);
+out_unblock:
+        nlmclnt_finish_block(req);
+        /* Cancel the blocked request if it is still pending */
+        if (resp->status == NLM_LCK_BLOCKED)
+                nlmclnt_cancel(host, fl);
 out:
         nlmclnt_release_lockargs(req);
         return status;
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 52707c5ad6ea..82c77df81c5f 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -189,17 +189,15 @@ nlm_bind_host(struct nlm_host *host)
                         goto forgetit;
 
                 xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout);
+                xprt->nocong = 1;       /* No congestion control for NLM */
+                xprt->resvport = 1;     /* NLM requires a reserved port */
 
                 /* Existing NLM servers accept AUTH_UNIX only */
                 clnt = rpc_create_client(xprt, host->h_name, &nlm_program,
                                         host->h_version, RPC_AUTH_UNIX);
-                if (IS_ERR(clnt)) {
-                        xprt_destroy(xprt);
+                if (IS_ERR(clnt))
                         goto forgetit;
-                }
                 clnt->cl_autobind = 1;  /* turn on pmap queries */
-                xprt->nocong = 1;       /* No congestion control for NLM */
-                xprt->resvport = 1;     /* NLM requires a reserved port */
 
                 host->h_rpcclnt = clnt;
         }
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 6fc1bebeec1d..2d144abe84ad 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -115,20 +115,19 @@ nsm_create(void)
         xprt = xprt_create_proto(IPPROTO_UDP, &sin, NULL);
         if (IS_ERR(xprt))
                 return (struct rpc_clnt *)xprt;
+        xprt->resvport = 1;     /* NSM requires a reserved port */
 
         clnt = rpc_create_client(xprt, "localhost",
                                 &nsm_program, SM_VERSION,
                                 RPC_AUTH_NULL);
         if (IS_ERR(clnt))
-                goto out_destroy;
+                goto out_err;
         clnt->cl_softrtry = 1;
         clnt->cl_chatty   = 1;
         clnt->cl_oneshot  = 1;
-        xprt->resvport = 1;     /* NSM requires a reserved port */
         return clnt;
 
-out_destroy:
-        xprt_destroy(xprt);
+out_err:
         return clnt;
 }
 
diff --git a/fs/locks.c b/fs/locks.c
index 3fa6a7ce57a7..a0bc03495bd4 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1548,6 +1548,8 @@ int fcntl_getlk(struct file *filp, struct flock __user *l)
 
         if (filp->f_op && filp->f_op->lock) {
                 error = filp->f_op->lock(filp, F_GETLK, &file_lock);
+                if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
+                        file_lock.fl_ops->fl_release_private(&file_lock);
                 if (error < 0)
                         goto out;
                 else
@@ -1690,6 +1692,8 @@ int fcntl_getlk64(struct file *filp, struct flock64 __user *l)
 
         if (filp->f_op && filp->f_op->lock) {
                 error = filp->f_op->lock(filp, F_GETLK, &file_lock);
+                if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
+                        file_lock.fl_ops->fl_release_private(&file_lock);
                 if (error < 0)
                         goto out;
                 else
@@ -1873,6 +1877,8 @@ void locks_remove_flock(struct file *filp)
                         .fl_end = OFFSET_MAX,
                 };
                 filp->f_op->flock(filp, F_SETLKW, &fl);
+                if (fl.fl_ops && fl.fl_ops->fl_release_private)
+                        fl.fl_ops->fl_release_private(&fl);
         }
 
         lock_kernel();
diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile
index b4baa031edf4..8b3bb715d177 100644
--- a/fs/nfs/Makefile
+++ b/fs/nfs/Makefile
@@ -8,6 +8,7 @@ nfs-y 			:= dir.o file.o inode.o nfs2xdr.o pagelist.o \
                            proc.o read.o symlink.o unlink.o write.o
 nfs-$(CONFIG_ROOT_NFS)  += nfsroot.o mount_clnt.o      
 nfs-$(CONFIG_NFS_V3)    += nfs3proc.o nfs3xdr.o
+nfs-$(CONFIG_NFS_V3_ACL)        += nfs3acl.o
 nfs-$(CONFIG_NFS_V4)    += nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o \
                            delegation.o idmap.o \
                            callback.o callback_xdr.o callback_proc.o
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 560d6175dd58..f2ca782aba33 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -14,6 +14,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/nfs_fs.h>
+#include "nfs4_fs.h"
 #include "callback.h"
 
 #define NFSDBG_FACILITY NFSDBG_CALLBACK
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index ece27e42b93b..65f1e19e4d19 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -8,6 +8,7 @@
 #include <linux/config.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_fs.h>
+#include "nfs4_fs.h"
 #include "callback.h"
 #include "delegation.h"
 
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index d271df9df2b2..7c33b9a81a94 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -10,6 +10,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_fs.h>
+#include "nfs4_fs.h"
 #include "callback.h"
 
 #define CB_OP_TAGLEN_MAXSZ      (512)
@@ -410,7 +411,6 @@ static int nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *resp
         xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base);
 
         p = (uint32_t*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len);
-        rqstp->rq_res.head[0].iov_len = PAGE_SIZE;
         xdr_init_encode(&xdr_out, &rqstp->rq_res, p);
 
         decode_compound_hdr_arg(&xdr_in, &hdr_arg);
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 5b9c60f97791..d7f7eb669d03 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -16,6 +16,7 @@
 #include <linux/nfs_fs.h>
 #include <linux/nfs_xdr.h>
 
+#include "nfs4_fs.h"
 #include "delegation.h"
 
 static struct nfs_delegation *nfs_alloc_delegation(void)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index ff6155f5e8d9..b38a57e78a63 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -32,6 +32,7 @@
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
 
+#include "nfs4_fs.h"
 #include "delegation.h"
 
 #define NFS_PARANOIA 1
@@ -50,8 +51,10 @@ static int nfs_mknod(struct inode *, struct dentry *, int, dev_t);
 static int nfs_rename(struct inode *, struct dentry *,
                       struct inode *, struct dentry *);
 static int nfs_fsync_dir(struct file *, struct dentry *, int);
+static loff_t nfs_llseek_dir(struct file *, loff_t, int);
 
 struct file_operations nfs_dir_operations = {
+        .llseek         = nfs_llseek_dir,
         .read           = generic_read_dir,
         .readdir        = nfs_readdir,
         .open           = nfs_opendir,
@@ -74,6 +77,27 @@ struct inode_operations nfs_dir_inode_operations = {
         .setattr        = nfs_setattr,
 };
 
+#ifdef CONFIG_NFS_V3
+struct inode_operations nfs3_dir_inode_operations = {
+        .create         = nfs_create,
+        .lookup         = nfs_lookup,
+        .link           = nfs_link,
+        .unlink         = nfs_unlink,
+        .symlink        = nfs_symlink,
+        .mkdir          = nfs_mkdir,
+        .rmdir          = nfs_rmdir,
+        .mknod          = nfs_mknod,
+        .rename         = nfs_rename,
+        .permission     = nfs_permission,
+        .getattr        = nfs_getattr,
+        .setattr        = nfs_setattr,
+        .listxattr      = nfs3_listxattr,
+        .getxattr       = nfs3_getxattr,
+        .setxattr       = nfs3_setxattr,
+        .removexattr    = nfs3_removexattr,
+};
+#endif  /* CONFIG_NFS_V3 */
+
 #ifdef CONFIG_NFS_V4
 
 static struct dentry *nfs_atomic_lookup(struct inode *, struct dentry *, struct nameidata *);
@@ -90,6 +114,9 @@ struct inode_operations nfs4_dir_inode_operations = {
         .permission     = nfs_permission,
         .getattr        = nfs_getattr,
         .setattr        = nfs_setattr,
+        .getxattr       = nfs4_getxattr,
+        .setxattr       = nfs4_setxattr,
+        .listxattr      = nfs4_listxattr,
 };
 
 #endif /* CONFIG_NFS_V4 */
@@ -116,7 +143,8 @@ typedef struct {
         struct page     *page;
         unsigned long   page_index;
         u32             *ptr;
-        u64             target;
+        u64             *dir_cookie;
+        loff_t          current_index;
         struct nfs_entry *entry;
         decode_dirent_t decode;
         int             plus;
@@ -164,12 +192,10 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
         NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
         /* Ensure consistent page alignment of the data.
          * Note: assumes we have exclusive access to this mapping either
-         *       throught inode->i_sem or some other mechanism.
+         *       through inode->i_sem or some other mechanism.
          */
-        if (page->index == 0) {
-                invalidate_inode_pages(inode->i_mapping);
-                NFS_I(inode)->readdir_timestamp = timestamp;
-        }
+        if (page->index == 0)
+                invalidate_inode_pages2_range(inode->i_mapping, PAGE_CACHE_SIZE, -1);
         unlock_page(page);
         return 0;
  error:
@@ -202,22 +228,22 @@ void dir_page_release(nfs_readdir_descriptor_t *desc)
 
 /*
  * Given a pointer to a buffer that has already been filled by a call
- * to readdir, find the next entry.
+ * to readdir, find the next entry with cookie '*desc->dir_cookie'.
  *
  * If the end of the buffer has been reached, return -EAGAIN, if not,
  * return the offset within the buffer of the next entry to be
  * read.
  */
 static inline
-int find_dirent(nfs_readdir_descriptor_t *desc, struct page *page)
+int find_dirent(nfs_readdir_descriptor_t *desc)
 {
         struct nfs_entry *entry = desc->entry;
         int             loop_count = 0,
                         status;
 
         while((status = dir_decode(desc)) == 0) {
-                dfprintk(VFS, "NFS: found cookie %Lu\n", (long long)entry->cookie);
-                if (entry->prev_cookie == desc->target)
+                dfprintk(VFS, "NFS: found cookie %Lu\n", (unsigned long long)entry->cookie);
+                if (entry->prev_cookie == *desc->dir_cookie)
                         break;
                 if (loop_count++ > 200) {
                         loop_count = 0;
@@ -229,8 +255,44 @@ int find_dirent(nfs_readdir_descriptor_t *desc, struct page *page)
 }
 
 /*
- * Find the given page, and call find_dirent() in order to try to
- * return the next entry.
+ * Given a pointer to a buffer that has already been filled by a call
+ * to readdir, find the entry at offset 'desc->file->f_pos'.
+ *
+ * If the end of the buffer has been reached, return -EAGAIN, if not,
+ * return the offset within the buffer of the next entry to be
+ * read.
+ */
+static inline
+int find_dirent_index(nfs_readdir_descriptor_t *desc)
+{
+        struct nfs_entry *entry = desc->entry;
+        int             loop_count = 0,
+                        status;
+
+        for(;;) {
+                status = dir_decode(desc);
+                if (status)
+                        break;
+
+                dfprintk(VFS, "NFS: found cookie %Lu at index %Ld\n", (unsigned long long)entry->cookie, desc->current_index);
+
+                if (desc->file->f_pos == desc->current_index) {
+                        *desc->dir_cookie = entry->cookie;
+                        break;
+                }
+                desc->current_index++;
+                if (loop_count++ > 200) {
+                        loop_count = 0;
+                        schedule();
+                }
+        }
+        dfprintk(VFS, "NFS: find_dirent_index() returns %d\n", status);
+        return status;
+}
+
+/*
+ * Find the given page, and call find_dirent() or find_dirent_index in
+ * order to try to return the next entry.
  */
 static inline
 int find_dirent_page(nfs_readdir_descriptor_t *desc)
@@ -253,7 +315,10 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)
         /* NOTE: Someone else may have changed the READDIRPLUS flag */
         desc->page = page;
         desc->ptr = kmap(page);         /* matching kunmap in nfs_do_filldir */
-        status = find_dirent(desc, page);
+        if (*desc->dir_cookie != 0)
+                status = find_dirent(desc);
+        else
+                status = find_dirent_index(desc);
         if (status < 0)
                 dir_page_release(desc);
  out:
@@ -268,7 +333,8 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)
  * Recurse through the page cache pages, and return a
  * filled nfs_entry structure of the next directory entry if possible.
  *
- * The target for the search is 'desc->target'.
+ * The target for the search is '*desc->dir_cookie' if non-0,
+ * 'desc->file->f_pos' otherwise
  */
 static inline
 int readdir_search_pagecache(nfs_readdir_descriptor_t *desc)
@@ -276,7 +342,16 @@ int readdir_search_pagecache(nfs_readdir_descriptor_t *desc)
         int             loop_count = 0;
         int             res;
 
-        dfprintk(VFS, "NFS: readdir_search_pagecache() searching for cookie %Lu\n", (long long)desc->target);
+        /* Always search-by-index from the beginning of the cache */
+        if (*desc->dir_cookie == 0) {
+                dfprintk(VFS, "NFS: readdir_search_pagecache() searching for offset %Ld\n", (long long)desc->file->f_pos);
+                desc->page_index = 0;
+                desc->entry->cookie = desc->entry->prev_cookie = 0;
+                desc->entry->eof = 0;
+                desc->current_index = 0;
+        } else
+                dfprintk(VFS, "NFS: readdir_search_pagecache() searching for cookie %Lu\n", (unsigned long long)*desc->dir_cookie);
+
         for (;;) {
                 res = find_dirent_page(desc);
                 if (res != -EAGAIN)
@@ -313,7 +388,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
         int             loop_count = 0,
                         res;
 
-        dfprintk(VFS, "NFS: nfs_do_filldir() filling starting @ cookie %Lu\n", (long long)desc->target);
+        dfprintk(VFS, "NFS: nfs_do_filldir() filling starting @ cookie %Lu\n", (long long)entry->cookie);
 
         for(;;) {
                 unsigned d_type = DT_UNKNOWN;
@@ -333,10 +408,11 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
                 }
 
                 res = filldir(dirent, entry->name, entry->len, 
-                              entry->prev_cookie, fileid, d_type);
+                              file->f_pos, fileid, d_type);
                 if (res < 0)
                         break;
-                file->f_pos = desc->target = entry->cookie;
+                file->f_pos++;
+                *desc->dir_cookie = entry->cookie;
                 if (dir_decode(desc) != 0) {
                         desc->page_index ++;
                         break;
@@ -349,7 +425,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc, void *dirent,
         dir_page_release(desc);
         if (dentry != NULL)
                 dput(dentry);
-        dfprintk(VFS, "NFS: nfs_do_filldir() filling ended @ cookie %Lu; returning = %d\n", (long long)desc->target, res);
+        dfprintk(VFS, "NFS: nfs_do_filldir() filling ended @ cookie %Lu; returning = %d\n", (unsigned long long)*desc->dir_cookie, res);
         return res;
 }
 
@@ -375,14 +451,14 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
         struct page     *page = NULL;
         int             status;
 
-        dfprintk(VFS, "NFS: uncached_readdir() searching for cookie %Lu\n", (long long)desc->target);
+        dfprintk(VFS, "NFS: uncached_readdir() searching for cookie %Lu\n", (unsigned long long)*desc->dir_cookie);
 
         page = alloc_page(GFP_HIGHUSER);
         if (!page) {
                 status = -ENOMEM;
                 goto out;
         }
-        desc->error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, desc->target,
+        desc->error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, *desc->dir_cookie,
                                                 page,
                                                 NFS_SERVER(inode)->dtsize,
                                                 desc->plus);
@@ -391,7 +467,7 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
         desc->ptr = kmap(page);         /* matching kunmap in nfs_do_filldir */
         if (desc->error >= 0) {
                 if ((status = dir_decode(desc)) == 0)
-                        desc->entry->prev_cookie = desc->target;
+                        desc->entry->prev_cookie = *desc->dir_cookie;
         } else
                 status = -EIO;
         if (status < 0)
@@ -412,8 +488,9 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent,
         goto out;
 }
 
-/* The file offset position is now represented as a true offset into the
- * page cache as is the case in most of the other filesystems.
+/* The file offset position represents the dirent entry number.  A
+   last cookie cache takes care of the common case of reading the
+   whole directory.
  */
 static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
@@ -435,15 +512,15 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         }
 
         /*
-         * filp->f_pos points to the file offset in the page cache.
-         * but if the cache has meanwhile been zapped, we need to
-         * read from the last dirent to revalidate f_pos
-         * itself.
+         * filp->f_pos points to the dirent entry number.
+         * *desc->dir_cookie has the cookie for the next entry. We have
+         * to either find the entry with the appropriate number or
+         * revalidate the cookie.
          */
         memset(desc, 0, sizeof(*desc));
 
         desc->file = filp;
-        desc->target = filp->f_pos;
+        desc->dir_cookie = &((struct nfs_open_context *)filp->private_data)->dir_cookie;
         desc->decode = NFS_PROTO(inode)->decode_dirent;
         desc->plus = NFS_USE_READDIRPLUS(inode);
 
@@ -455,9 +532,10 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 
         while(!desc->entry->eof) {
                 res = readdir_search_pagecache(desc);
+
                 if (res == -EBADCOOKIE) {
                         /* This means either end of directory */
-                        if (desc->entry->cookie != desc->target) {
+                        if (*desc->dir_cookie && desc->entry->cookie != *desc->dir_cookie) {
                                 /* Or that the server has 'lost' a cookie */
                                 res = uncached_readdir(desc, dirent, filldir);
                                 if (res >= 0)
@@ -490,6 +568,28 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
         return 0;
 }
 
+loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
+{
+        down(&filp->f_dentry->d_inode->i_sem);
+        switch (origin) {
+                case 1:
+                        offset += filp->f_pos;
+                case 0:
+                        if (offset >= 0)
+                                break;
+                default:
+                        offset = -EINVAL;
+                        goto out;
+        }
+        if (offset != filp->f_pos) {
+                filp->f_pos = offset;
+                ((struct nfs_open_context *)filp->private_data)->dir_cookie = 0;
+        }
+out:
+        up(&filp->f_dentry->d_inode->i_sem);
+        return offset;
+}
+
 /*
  * All directory operations under NFS are synchronous, so fsync()
  * is a dummy operation.
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 68df803f27ca..d6a30c844de3 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -517,7 +517,7 @@ retry:
         result = tot_bytes;
 
 out:
-        nfs_end_data_update_defer(inode);
+        nfs_end_data_update(inode);
         nfs_writedata_free(wdata);
         return result;
 
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 55c907592490..5621ba9885f4 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -71,6 +71,18 @@ struct inode_operations nfs_file_inode_operations = {
         .setattr        = nfs_setattr,
 };
 
+#ifdef CONFIG_NFS_V3
+struct inode_operations nfs3_file_inode_operations = {
+        .permission     = nfs_permission,
+        .getattr        = nfs_getattr,
+        .setattr        = nfs_setattr,
+        .listxattr      = nfs3_listxattr,
+        .getxattr       = nfs3_getxattr,
+        .setxattr       = nfs3_setxattr,
+        .removexattr    = nfs3_removexattr,
+};
+#endif  /* CONFIG_NFS_v3 */
+
 /* Hack for future NFS swap support */
 #ifndef IS_SWAPFILE
 # define IS_SWAPFILE(inode)     (0)
@@ -116,6 +128,21 @@ nfs_file_release(struct inode *inode, struct file *filp)
 }
 
 /**
+ * nfs_revalidate_file - Revalidate the page cache & related metadata
+ * @inode - pointer to inode struct
+ * @file - pointer to file
+ */
+static int nfs_revalidate_file(struct inode *inode, struct file *filp)
+{
+        int retval = 0;
+
+        if ((NFS_FLAGS(inode) & NFS_INO_REVAL_PAGECACHE) || nfs_attribute_timeout(inode))
+                retval = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
+        nfs_revalidate_mapping(inode, filp->f_mapping);
+        return 0;
+}
+
+/**
  * nfs_revalidate_size - Revalidate the file size
  * @inode - pointer to inode struct
  * @file - pointer to struct file
@@ -137,7 +164,8 @@ static int nfs_revalidate_file_size(struct inode *inode, struct file *filp)
                 goto force_reval;
         if (nfsi->npages != 0)
                 return 0;
-        return nfs_revalidate_inode(server, inode);
+        if (!(NFS_FLAGS(inode) & NFS_INO_REVAL_PAGECACHE) && !nfs_attribute_timeout(inode))
+                return 0;
 force_reval:
         return __nfs_revalidate_inode(server, inode);
 }
@@ -198,7 +226,7 @@ nfs_file_read(struct kiocb *iocb, char __user * buf, size_t count, loff_t pos)
                 dentry->d_parent->d_name.name, dentry->d_name.name,
                 (unsigned long) count, (unsigned long) pos);
 
-        result = nfs_revalidate_inode(NFS_SERVER(inode), inode);
+        result = nfs_revalidate_file(inode, iocb->ki_filp);
         if (!result)
                 result = generic_file_aio_read(iocb, buf, count, pos);
         return result;
@@ -216,7 +244,7 @@ nfs_file_sendfile(struct file *filp, loff_t *ppos, size_t count,
                 dentry->d_parent->d_name.name, dentry->d_name.name,
                 (unsigned long) count, (unsigned long long) *ppos);
 
-        res = nfs_revalidate_inode(NFS_SERVER(inode), inode);
+        res = nfs_revalidate_file(inode, filp);
         if (!res)
                 res = generic_file_sendfile(filp, ppos, count, actor, target);
         return res;
@@ -232,7 +260,7 @@ nfs_file_mmap(struct file * file, struct vm_area_struct * vma)
         dfprintk(VFS, "nfs: mmap(%s/%s)\n",
                 dentry->d_parent->d_name.name, dentry->d_name.name);
 
-        status = nfs_revalidate_inode(NFS_SERVER(inode), inode);
+        status = nfs_revalidate_file(inode, file);
         if (!status)
                 status = generic_file_mmap(file, vma);
         return status;
@@ -321,9 +349,15 @@ nfs_file_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t
         result = -EBUSY;
         if (IS_SWAPFILE(inode))
                 goto out_swapfile;
-        result = nfs_revalidate_inode(NFS_SERVER(inode), inode);
-        if (result)
-                goto out;
+        /*
+         * O_APPEND implies that we must revalidate the file length.
+         */
+        if (iocb->ki_filp->f_flags & O_APPEND) {
+                result = nfs_revalidate_file_size(inode, iocb->ki_filp);
+                if (result)
+                        goto out;
+        }
+        nfs_revalidate_mapping(inode, iocb->ki_filp->f_mapping);
 
         result = count;
         if (!count)
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 87f4f9aeac86..ffb8df91dc34 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -50,6 +50,7 @@
 #include <linux/nfs_fs.h>
 
 #include <linux/nfs_idmap.h>
+#include "nfs4_fs.h"
 
 #define IDMAP_HASH_SZ          128
 
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index f2317f3e29f9..4845911f1c63 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -39,6 +39,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
+#include "nfs4_fs.h"
 #include "delegation.h"
 
 #define NFSDBG_FACILITY         NFSDBG_VFS
@@ -63,6 +64,7 @@ static void nfs_clear_inode(struct inode *);
 static void nfs_umount_begin(struct super_block *);
 static int  nfs_statfs(struct super_block *, struct kstatfs *);
 static int  nfs_show_options(struct seq_file *, struct vfsmount *);
+static void nfs_zap_acl_cache(struct inode *);
 
 static struct rpc_program       nfs_program;
 
@@ -106,6 +108,21 @@ static struct rpc_program	nfs_program = {
         .pipe_dir_name          = "/nfs",
 };
 
+#ifdef CONFIG_NFS_V3_ACL
+static struct rpc_stat          nfsacl_rpcstat = { &nfsacl_program };
+static struct rpc_version *     nfsacl_version[] = {
+        [3]                     = &nfsacl_version3,
+};
+
+struct rpc_program              nfsacl_program = {
+        .name =                 "nfsacl",
+        .number =               NFS_ACL_PROGRAM,
+        .nrvers =               sizeof(nfsacl_version) / sizeof(nfsacl_version[0]),
+        .version =              nfsacl_version,
+        .stats =                &nfsacl_rpcstat,
+};
+#endif  /* CONFIG_NFS_V3_ACL */
+
 static inline unsigned long
 nfs_fattr_to_ino_t(struct nfs_fattr *fattr)
 {
@@ -118,7 +135,7 @@ nfs_write_inode(struct inode *inode, int sync)
         int flags = sync ? FLUSH_WAIT : 0;
         int ret;
 
-        ret = nfs_commit_inode(inode, 0, 0, flags);
+        ret = nfs_commit_inode(inode, flags);
         if (ret < 0)
                 return ret;
         return 0;
@@ -140,10 +157,6 @@ nfs_delete_inode(struct inode * inode)
         clear_inode(inode);
 }
 
-/*
- * For the moment, the only task for the NFS clear_inode method is to
- * release the mmap credential
- */
 static void
 nfs_clear_inode(struct inode *inode)
 {
@@ -152,6 +165,7 @@ nfs_clear_inode(struct inode *inode)
 
         nfs_wb_all(inode);
         BUG_ON (!list_empty(&nfsi->open_files));
+        nfs_zap_acl_cache(inode);
         cred = nfsi->cache_access.cred;
         if (cred)
                 put_rpccred(cred);
@@ -161,11 +175,13 @@ nfs_clear_inode(struct inode *inode)
 void
 nfs_umount_begin(struct super_block *sb)
 {
-        struct nfs_server *server = NFS_SB(sb);
-        struct rpc_clnt *rpc;
+        struct rpc_clnt *rpc = NFS_SB(sb)->client;
 
         /* -EIO all pending I/O */
-        if ((rpc = server->client) != NULL)
+        if (!IS_ERR(rpc))
+                rpc_killall_tasks(rpc);
+        rpc = NFS_SB(sb)->client_acl;
+        if (!IS_ERR(rpc))
                 rpc_killall_tasks(rpc);
 }
 
@@ -366,13 +382,15 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
         xprt = xprt_create_proto(tcp ? IPPROTO_TCP : IPPROTO_UDP,
                                  &server->addr, &timeparms);
         if (IS_ERR(xprt)) {
-                printk(KERN_WARNING "NFS: cannot create RPC transport.\n");
+                dprintk("%s: cannot create RPC transport. Error = %ld\n",
+                                __FUNCTION__, PTR_ERR(xprt));
                 return (struct rpc_clnt *)xprt;
         }
         clnt = rpc_create_client(xprt, server->hostname, &nfs_program,
                                  server->rpc_ops->version, data->pseudoflavor);
         if (IS_ERR(clnt)) {
-                printk(KERN_WARNING "NFS: cannot create RPC client.\n");
+                dprintk("%s: cannot create RPC client. Error = %ld\n",
+                                __FUNCTION__, PTR_ERR(xprt));
                 goto out_fail;
         }
 
@@ -383,7 +401,6 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
         return clnt;
 
 out_fail:
-        xprt_destroy(xprt);
         return clnt;
 }
 
@@ -427,21 +444,16 @@ nfs_fill_super(struct super_block *sb, struct nfs_mount_data *data, int silent)
 
         /* Check NFS protocol revision and initialize RPC op vector
          * and file handle pool. */
-        if (server->flags & NFS_MOUNT_VER3) {
 #ifdef CONFIG_NFS_V3
+        if (server->flags & NFS_MOUNT_VER3) {
                 server->rpc_ops = &nfs_v3_clientops;
                 server->caps |= NFS_CAP_READDIRPLUS;
-                if (data->version < 4) {
-                        printk(KERN_NOTICE "NFS: NFSv3 not supported by mount program.\n");
-                        return -EIO;
-                }
-#else
-                printk(KERN_NOTICE "NFS: NFSv3 not supported.\n");
-                return -EIO;
-#endif
         } else {
                 server->rpc_ops = &nfs_v2_clientops;
         }
+#else
+        server->rpc_ops = &nfs_v2_clientops;
+#endif
 
         /* Fill in pseudoflavor for mount version < 5 */
         if (!(data->flags & NFS_MOUNT_SECFLAVOUR))
@@ -455,17 +467,34 @@ nfs_fill_super(struct super_block *sb, struct nfs_mount_data *data, int silent)
                 return PTR_ERR(server->client);
         /* RFC 2623, sec 2.3.2 */
         if (authflavor != RPC_AUTH_UNIX) {
+                struct rpc_auth *auth;
+
                 server->client_sys = rpc_clone_client(server->client);
                 if (IS_ERR(server->client_sys))
                         return PTR_ERR(server->client_sys);
-                if (!rpcauth_create(RPC_AUTH_UNIX, server->client_sys))
-                        return -ENOMEM;
+                auth = rpcauth_create(RPC_AUTH_UNIX, server->client_sys);
+                if (IS_ERR(auth))
+                        return PTR_ERR(auth);
         } else {
                 atomic_inc(&server->client->cl_count);
                 server->client_sys = server->client;
         }
-
         if (server->flags & NFS_MOUNT_VER3) {
+#ifdef CONFIG_NFS_V3_ACL
+                if (!(server->flags & NFS_MOUNT_NOACL)) {
+                        server->client_acl = rpc_bind_new_program(server->client, &nfsacl_program, 3);
+                        /* No errors! Assume that Sun nfsacls are supported */
+                        if (!IS_ERR(server->client_acl))
+                                server->caps |= NFS_CAP_ACLS;
+                }
+#else
+                server->flags &= ~NFS_MOUNT_NOACL;
+#endif /* CONFIG_NFS_V3_ACL */
+                /*
+                 * The VFS shouldn't apply the umask to mode bits. We will
+                 * do so ourselves when necessary.
+                 */
+                sb->s_flags |= MS_POSIXACL;
                 if (server->namelen == 0 || server->namelen > NFS3_MAXNAMLEN)
                         server->namelen = NFS3_MAXNAMLEN;
                 sb->s_time_gran = 1;
@@ -549,6 +578,7 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
                 { NFS_MOUNT_NOCTO, ",nocto", "" },
                 { NFS_MOUNT_NOAC, ",noac", "" },
                 { NFS_MOUNT_NONLM, ",nolock", ",lock" },
+                { NFS_MOUNT_NOACL, ",noacl", "" },
                 { 0, NULL, NULL }
         };
         struct proc_nfs_info *nfs_infop;
@@ -590,9 +620,19 @@ nfs_zap_caches(struct inode *inode)
 
         memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
         if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
-                nfsi->flags |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS;
+                nfsi->flags |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
         else
-                nfsi->flags |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS;
+                nfsi->flags |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
+}
+
+static void nfs_zap_acl_cache(struct inode *inode)
+{
+        void (*clear_acl_cache)(struct inode *);
+
+        clear_acl_cache = NFS_PROTO(inode)->clear_acl_cache;
+        if (clear_acl_cache != NULL)
+                clear_acl_cache(inode);
+        NFS_I(inode)->flags &= ~NFS_INO_INVALID_ACL;
 }
 
 /*
@@ -689,7 +729,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
                 /* Why so? Because we want revalidate for devices/FIFOs, and
                  * that's precisely what we have in nfs_file_inode_operations.
                  */
-                inode->i_op = &nfs_file_inode_operations;
+                inode->i_op = NFS_SB(sb)->rpc_ops->file_inode_ops;
                 if (S_ISREG(inode->i_mode)) {
                         inode->i_fop = &nfs_file_operations;
                         inode->i_data.a_ops = &nfs_file_aops;
@@ -792,7 +832,7 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
                 }
         }
         if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0)
-                NFS_FLAGS(inode) |= NFS_INO_INVALID_ACCESS;
+                NFS_FLAGS(inode) |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
         nfs_end_data_update(inode);
         unlock_kernel();
         return error;
@@ -851,7 +891,7 @@ struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, struct rp
                 ctx->state = NULL;
                 ctx->lockowner = current->files;
                 ctx->error = 0;
-                init_waitqueue_head(&ctx->waitq);
+                ctx->dir_cookie = 0;
         }
         return ctx;
 }
@@ -1015,6 +1055,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
                 goto out;
         }
         flags = nfsi->flags;
+        nfsi->flags &= ~NFS_INO_REVAL_PAGECACHE;
         /*
          * We may need to keep the attributes marked as invalid if
          * we raced with nfs_end_attr_update().
@@ -1022,21 +1063,9 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
         if (verifier == nfsi->cache_change_attribute)
                 nfsi->flags &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME);
         /* Do the page cache invalidation */
-        if (flags & NFS_INO_INVALID_DATA) {
-                if (S_ISREG(inode->i_mode)) {
-                        if (filemap_fdatawrite(inode->i_mapping) == 0)
-                                filemap_fdatawait(inode->i_mapping);
-                        nfs_wb_all(inode);
-                }
-                nfsi->flags &= ~NFS_INO_INVALID_DATA;
-                invalidate_inode_pages2(inode->i_mapping);
-                memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
-                dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",
-                                inode->i_sb->s_id,
-                                (long long)NFS_FILEID(inode));
-                /* This ensures we revalidate dentries */
-                nfsi->cache_change_attribute++;
-        }
+        nfs_revalidate_mapping(inode, inode->i_mapping);
+        if (flags & NFS_INO_INVALID_ACL)
+                nfs_zap_acl_cache(inode);
         dfprintk(PAGECACHE, "NFS: (%s/%Ld) revalidation complete\n",
                 inode->i_sb->s_id,
                 (long long)NFS_FILEID(inode));
@@ -1074,6 +1103,34 @@ int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
 }
 
 /**
+ * nfs_revalidate_mapping - Revalidate the pagecache
+ * @inode - pointer to host inode
+ * @mapping - pointer to mapping
+ */
+void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
+{
+        struct nfs_inode *nfsi = NFS_I(inode);
+
+        if (nfsi->flags & NFS_INO_INVALID_DATA) {
+                if (S_ISREG(inode->i_mode)) {
+                        if (filemap_fdatawrite(mapping) == 0)
+                                filemap_fdatawait(mapping);
+                        nfs_wb_all(inode);
+                }
+                invalidate_inode_pages2(mapping);
+                nfsi->flags &= ~NFS_INO_INVALID_DATA;
+                if (S_ISDIR(inode->i_mode)) {
+                        memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
+                        /* This ensures we revalidate child dentries */
+                        nfsi->cache_change_attribute++;
+                }
+                dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",
+                                inode->i_sb->s_id,
+                                (long long)NFS_FILEID(inode));
+        }
+}
+
+/**
  * nfs_begin_data_update
  * @inode - pointer to inode
  * Declare that a set of operations will update file data on the server
@@ -1106,27 +1163,6 @@ void nfs_end_data_update(struct inode *inode)
 }
 
 /**
- * nfs_end_data_update_defer
- * @inode - pointer to inode
- * Declare end of the operations that will update file data
- * This will defer marking the inode as needing revalidation
- * unless there are no other pending updates.
- */
-void nfs_end_data_update_defer(struct inode *inode)
-{
-        struct nfs_inode *nfsi = NFS_I(inode);
-
-        if (atomic_dec_and_test(&nfsi->data_updates)) {
-                /* Mark the attribute cache for revalidation */
-                nfsi->flags |= NFS_INO_INVALID_ATTR;
-                /* Directories and symlinks: invalidate page cache too */
-                if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))
-                        nfsi->flags |= NFS_INO_INVALID_DATA;
-                nfsi->cache_change_attribute ++;
-        }
-}
-
-/**
  * nfs_refresh_inode - verify consistency of the inode attribute cache
  * @inode - pointer to inode
  * @fattr - updated attributes
@@ -1152,8 +1188,11 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
                 if ((fattr->valid & NFS_ATTR_PRE_CHANGE) != 0
                                 && nfsi->change_attr == fattr->pre_change_attr)
                         nfsi->change_attr = fattr->change_attr;
-                if (!data_unstable && nfsi->change_attr != fattr->change_attr)
+                if (nfsi->change_attr != fattr->change_attr) {
                         nfsi->flags |= NFS_INO_INVALID_ATTR;
+                        if (!data_unstable)
+                                nfsi->flags |= NFS_INO_REVAL_PAGECACHE;
+                }
         }
 
         if ((fattr->valid & NFS_ATTR_FATTR) == 0)
@@ -1176,18 +1215,22 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
         }
 
         /* Verify a few of the more important attributes */
-        if (!data_unstable) {
-                if (!timespec_equal(&inode->i_mtime, &fattr->mtime)
-                                || cur_size != new_isize)
-                        nfsi->flags |= NFS_INO_INVALID_ATTR;
-        } else if (S_ISREG(inode->i_mode) && new_isize > cur_size)
-                        nfsi->flags |= NFS_INO_INVALID_ATTR;
+        if (!timespec_equal(&inode->i_mtime, &fattr->mtime)) {
+                nfsi->flags |= NFS_INO_INVALID_ATTR;
+                if (!data_unstable)
+                        nfsi->flags |= NFS_INO_REVAL_PAGECACHE;
+        }
+        if (cur_size != new_isize) {
+                nfsi->flags |= NFS_INO_INVALID_ATTR;
+                if (nfsi->npages == 0)
+                        nfsi->flags |= NFS_INO_REVAL_PAGECACHE;
+        }
 
         /* Have any file permissions changed? */
         if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
                         || inode->i_uid != fattr->uid
                         || inode->i_gid != fattr->gid)
-                nfsi->flags |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS;
+                nfsi->flags |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL;
 
         /* Has the link count changed? */
         if (inode->i_nlink != fattr->nlink)
@@ -1215,10 +1258,8 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
 static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsigned long verifier)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
-        __u64           new_size;
-        loff_t          new_isize;
+        loff_t cur_isize, new_isize;
         unsigned int    invalid = 0;
-        loff_t          cur_isize;
         int data_unstable;
 
         dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
@@ -1251,61 +1292,56 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign
         /* Are we racing with known updates of the metadata on the server? */
         data_unstable = ! nfs_verify_change_attribute(inode, verifier);
 
-        /* Check if the file size agrees */
-        new_size = fattr->size;
+        /* Check if our cached file size is stale */
         new_isize = nfs_size_to_loff_t(fattr->size);
         cur_isize = i_size_read(inode);
-        if (cur_isize != new_size) {
-#ifdef NFS_DEBUG_VERBOSE
-                printk(KERN_DEBUG "NFS: isize change on %s/%ld\n", inode->i_sb->s_id, inode->i_ino);
-#endif
-                /*
-                 * If we have pending writebacks, things can get
-                 * messy.
-                 */
-                if (S_ISREG(inode->i_mode) && data_unstable) {
-                        if (new_isize > cur_isize) {
+        if (new_isize != cur_isize) {
+                /* Do we perhaps have any outstanding writes? */
+                if (nfsi->npages == 0) {
+                        /* No, but did we race with nfs_end_data_update()? */
+                        if (verifier  ==  nfsi->cache_change_attribute) {
                                 inode->i_size = new_isize;
-                                invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
+                                invalid |= NFS_INO_INVALID_DATA;
                         }
-                } else {
+                        invalid |= NFS_INO_INVALID_ATTR;
+                } else if (new_isize > cur_isize) {
                         inode->i_size = new_isize;
                         invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
                 }
+                dprintk("NFS: isize change on server for file %s/%ld\n",
+                                inode->i_sb->s_id, inode->i_ino);
         }
 
-        /*
-         * Note: we don't check inode->i_mtime since pipes etc.
-         *       can change this value in VFS without requiring a
-         *       cache revalidation.
-         */
+        /* Check if the mtime agrees */
         if (!timespec_equal(&inode->i_mtime, &fattr->mtime)) {
                 memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime));
-#ifdef NFS_DEBUG_VERBOSE
-                printk(KERN_DEBUG "NFS: mtime change on %s/%ld\n", inode->i_sb->s_id, inode->i_ino);
-#endif
+                dprintk("NFS: mtime change on server for file %s/%ld\n",
+                                inode->i_sb->s_id, inode->i_ino);
                 if (!data_unstable)
                         invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
         }
 
         if ((fattr->valid & NFS_ATTR_FATTR_V4)
             && nfsi->change_attr != fattr->change_attr) {
-#ifdef NFS_DEBUG_VERBOSE
-                printk(KERN_DEBUG "NFS: change_attr change on %s/%ld\n",
+                dprintk("NFS: change_attr change on server for file %s/%ld\n",
                        inode->i_sb->s_id, inode->i_ino);
-#endif
                 nfsi->change_attr = fattr->change_attr;
                 if (!data_unstable)
-                        invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS;
+                        invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
         }
 
-        memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
+        /* If ctime has changed we should definitely clear access+acl caches */
+        if (!timespec_equal(&inode->i_ctime, &fattr->ctime)) {
+                if (!data_unstable)
+                        invalid |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
+                memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
+        }
         memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
 
         if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
             inode->i_uid != fattr->uid ||
             inode->i_gid != fattr->gid)
-                invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS;
+                invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
 
         inode->i_mode = fattr->mode;
         inode->i_nlink = fattr->nlink;
@@ -1385,74 +1421,95 @@ static struct super_block *nfs_get_sb(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *raw_data)
 {
         int error;
-        struct nfs_server *server;
+        struct nfs_server *server = NULL;
         struct super_block *s;
         struct nfs_fh *root;
         struct nfs_mount_data *data = raw_data;
 
-        if (!data) {
-                printk("nfs_read_super: missing data argument\n");
-                return ERR_PTR(-EINVAL);
+        s = ERR_PTR(-EINVAL);
+        if (data == NULL) {
+                dprintk("%s: missing data argument\n", __FUNCTION__);
+                goto out_err;
+        }
+        if (data->version <= 0 || data->version > NFS_MOUNT_VERSION) {
+                dprintk("%s: bad mount version\n", __FUNCTION__);
+                goto out_err;
         }
+        switch (data->version) {
+                case 1:
+                        data->namlen = 0;
+                case 2:
+                        data->bsize  = 0;
+                case 3:
+                        if (data->flags & NFS_MOUNT_VER3) {
+                                dprintk("%s: mount structure version %d does not support NFSv3\n",
+                                                __FUNCTION__,
+                                                data->version);
+                                goto out_err;
+                        }
+                        data->root.size = NFS2_FHSIZE;
+                        memcpy(data->root.data, data->old_root.data, NFS2_FHSIZE);
+                case 4:
+                        if (data->flags & NFS_MOUNT_SECFLAVOUR) {
+                                dprintk("%s: mount structure version %d does not support strong security\n",
+                                                __FUNCTION__,
+                                                data->version);
+                                goto out_err;
+                        }
+                case 5:
+                        memset(data->context, 0, sizeof(data->context));
+        }
+#ifndef CONFIG_NFS_V3
+        /* If NFSv3 is not compiled in, return -EPROTONOSUPPORT */
+        s = ERR_PTR(-EPROTONOSUPPORT);
+        if (data->flags & NFS_MOUNT_VER3) {
+                dprintk("%s: NFSv3 not compiled into kernel\n", __FUNCTION__);
+                goto out_err;
+        }
+#endif /* CONFIG_NFS_V3 */
 
+        s = ERR_PTR(-ENOMEM);
         server = kmalloc(sizeof(struct nfs_server), GFP_KERNEL);
         if (!server)
-                return ERR_PTR(-ENOMEM);
+                goto out_err;
         memset(server, 0, sizeof(struct nfs_server));
         /* Zero out the NFS state stuff */
         init_nfsv4_state(server);
-
-        if (data->version != NFS_MOUNT_VERSION) {
-                printk("nfs warning: mount version %s than kernel\n",
-                        data->version < NFS_MOUNT_VERSION ? "older" : "newer");
-                if (data->version < 2)
-                        data->namlen = 0;
-                if (data->version < 3)
-                        data->bsize  = 0;
-                if (data->version < 4) {
-                        data->flags &= ~NFS_MOUNT_VER3;
-                        data->root.size = NFS2_FHSIZE;
-                        memcpy(data->root.data, data->old_root.data, NFS2_FHSIZE);
-                }
-                if (data->version < 5)
-                        data->flags &= ~NFS_MOUNT_SECFLAVOUR;
-        }
+        server->client = server->client_sys = server->client_acl = ERR_PTR(-EINVAL);
 
         root = &server->fh;
         if (data->flags & NFS_MOUNT_VER3)
                 root->size = data->root.size;
         else
                 root->size = NFS2_FHSIZE;
+        s = ERR_PTR(-EINVAL);
         if (root->size > sizeof(root->data)) {
-                printk("nfs_get_sb: invalid root filehandle\n");
-                kfree(server);
-                return ERR_PTR(-EINVAL);
+                dprintk("%s: invalid root filehandle\n", __FUNCTION__);
+                goto out_err;
         }
         memcpy(root->data, data->root.data, root->size);
 
         /* We now require that the mount process passes the remote address */
         memcpy(&server->addr, &data->addr, sizeof(server->addr));
         if (server->addr.sin_addr.s_addr == INADDR_ANY) {
-                printk("NFS: mount program didn't pass remote address!\n");
-                kfree(server);
-                return ERR_PTR(-EINVAL);
+                dprintk("%s: mount program didn't pass remote address!\n",
+                                __FUNCTION__);
+                goto out_err;
         }
 
-        s = sget(fs_type, nfs_compare_super, nfs_set_super, server);
-
-        if (IS_ERR(s) || s->s_root) {
-                kfree(server);
-                return s;
+        /* Fire up rpciod if not yet running */
+        s = ERR_PTR(rpciod_up());
+        if (IS_ERR(s)) {
+                dprintk("%s: couldn't start rpciod! Error = %ld\n",
+                                __FUNCTION__, PTR_ERR(s));
+                goto out_err;
         }
 
-        s->s_flags = flags;
+        s = sget(fs_type, nfs_compare_super, nfs_set_super, server);
+        if (IS_ERR(s) || s->s_root)
+                goto out_rpciod_down;
 
-        /* Fire up rpciod if not yet running */
-        if (rpciod_up() != 0) {
-                printk(KERN_WARNING "NFS: couldn't start rpciod!\n");
-                kfree(server);
-                return ERR_PTR(-EIO);
-        }
+        s->s_flags = flags;
 
         error = nfs_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
         if (error) {
@@ -1462,6 +1519,11 @@ static struct super_block *nfs_get_sb(struct file_system_type *fs_type,
         }
         s->s_flags |= MS_ACTIVE;
         return s;
+out_rpciod_down:
+        rpciod_down();
+out_err:
+        kfree(server);
+        return s;
 }
 
 static void nfs_kill_super(struct super_block *s)
@@ -1470,10 +1532,12 @@ static void nfs_kill_super(struct super_block *s)
 
         kill_anon_super(s);
 
-        if (server->client != NULL && !IS_ERR(server->client))
+        if (!IS_ERR(server->client))
                 rpc_shutdown_client(server->client);
-        if (server->client_sys != NULL && !IS_ERR(server->client_sys))
+        if (!IS_ERR(server->client_sys))
                 rpc_shutdown_client(server->client_sys);
+        if (!IS_ERR(server->client_acl))
+                rpc_shutdown_client(server->client_acl);
 
         if (!(server->flags & NFS_MOUNT_NONLM))
                 lockd_down();   /* release rpc.lockd */
@@ -1594,15 +1658,19 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
 
         clp = nfs4_get_client(&server->addr.sin_addr);
         if (!clp) {
-                printk(KERN_WARNING "NFS: failed to create NFS4 client.\n");
+                dprintk("%s: failed to create NFS4 client.\n", __FUNCTION__);
                 return -EIO;
         }
 
         /* Now create transport and client */
         authflavour = RPC_AUTH_UNIX;
         if (data->auth_flavourlen != 0) {
-                if (data->auth_flavourlen > 1)
-                        printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavours.\n");
+                if (data->auth_flavourlen != 1) {
+                        dprintk("%s: Invalid number of RPC auth flavours %d.\n",
+                                        __FUNCTION__, data->auth_flavourlen);
+                        err = -EINVAL;
+                        goto out_fail;
+                }
                 if (copy_from_user(&authflavour, data->auth_flavours, sizeof(authflavour))) {
                         err = -EFAULT;
                         goto out_fail;
@@ -1610,21 +1678,22 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
         }
 
         down_write(&clp->cl_sem);
-        if (clp->cl_rpcclient == NULL) {
+        if (IS_ERR(clp->cl_rpcclient)) {
                 xprt = xprt_create_proto(proto, &server->addr, &timeparms);
                 if (IS_ERR(xprt)) {
                         up_write(&clp->cl_sem);
-                        printk(KERN_WARNING "NFS: cannot create RPC transport.\n");
                         err = PTR_ERR(xprt);
+                        dprintk("%s: cannot create RPC transport. Error = %d\n",
+                                        __FUNCTION__, err);
                         goto out_fail;
                 }
                 clnt = rpc_create_client(xprt, server->hostname, &nfs_program,
                                 server->rpc_ops->version, authflavour);
                 if (IS_ERR(clnt)) {
                         up_write(&clp->cl_sem);
-                        printk(KERN_WARNING "NFS: cannot create RPC client.\n");
-                        xprt_destroy(xprt);
                         err = PTR_ERR(clnt);
+                        dprintk("%s: cannot create RPC client. Error = %d\n",
+                                        __FUNCTION__, err);
                         goto out_fail;
                 }
                 clnt->cl_intr     = 1;
@@ -1656,21 +1725,26 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
         clp = NULL;
 
         if (IS_ERR(clnt)) {
-                printk(KERN_WARNING "NFS: cannot create RPC client.\n");
-                return PTR_ERR(clnt);
+                err = PTR_ERR(clnt);
+                dprintk("%s: cannot create RPC client. Error = %d\n",
+                                __FUNCTION__, err);
+                return err;
         }
 
         server->client    = clnt;
 
         if (server->nfs4_state->cl_idmap == NULL) {
-                printk(KERN_WARNING "NFS: failed to create idmapper.\n");
+                dprintk("%s: failed to create idmapper.\n", __FUNCTION__);
                 return -ENOMEM;
         }
 
         if (clnt->cl_auth->au_flavor != authflavour) {
-                if (rpcauth_create(authflavour, clnt) == NULL) {
-                        printk(KERN_WARNING "NFS: couldn't create credcache!\n");
-                        return -ENOMEM;
+                struct rpc_auth *auth;
+
+                auth = rpcauth_create(authflavour, clnt);
+                if (IS_ERR(auth)) {
+                        dprintk("%s: couldn't create credcache!\n", __FUNCTION__);
+                        return PTR_ERR(auth);
                 }
         }
 
@@ -1730,8 +1804,12 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
         struct nfs4_mount_data *data = raw_data;
         void *p;
 
-        if (!data) {
-                printk("nfs_read_super: missing data argument\n");
+        if (data == NULL) {
+                dprintk("%s: missing data argument\n", __FUNCTION__);
+                return ERR_PTR(-EINVAL);
+        }
+        if (data->version <= 0 || data->version > NFS4_MOUNT_VERSION) {
+                dprintk("%s: bad mount version\n", __FUNCTION__);
                 return ERR_PTR(-EINVAL);
         }
 
@@ -1741,11 +1819,7 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
         memset(server, 0, sizeof(struct nfs_server));
         /* Zero out the NFS state stuff */
         init_nfsv4_state(server);
-
-        if (data->version != NFS4_MOUNT_VERSION) {
-                printk("nfs warning: mount version %s than kernel\n",
-                        data->version < NFS4_MOUNT_VERSION ? "older" : "newer");
-        }
+        server->client = server->client_sys = server->client_acl = ERR_PTR(-EINVAL);
 
         p = nfs_copy_user_string(NULL, &data->hostname, 256);
         if (IS_ERR(p))
@@ -1773,11 +1847,20 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
         }
         if (server->addr.sin_family != AF_INET ||
             server->addr.sin_addr.s_addr == INADDR_ANY) {
-                printk("NFS: mount program didn't pass remote IP address!\n");
+                dprintk("%s: mount program didn't pass remote IP address!\n",
+                                __FUNCTION__);
                 s = ERR_PTR(-EINVAL);
                 goto out_free;
         }
 
+        /* Fire up rpciod if not yet running */
+        s = ERR_PTR(rpciod_up());
+        if (IS_ERR(s)) {
+                dprintk("%s: couldn't start rpciod! Error = %ld\n",
+                                __FUNCTION__, PTR_ERR(s));
+                goto out_free;
+        }
+
         s = sget(fs_type, nfs4_compare_super, nfs_set_super, server);
 
         if (IS_ERR(s) || s->s_root)
@@ -1785,13 +1868,6 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
 
         s->s_flags = flags;
 
-        /* Fire up rpciod if not yet running */
-        if (rpciod_up() != 0) {
-                printk(KERN_WARNING "NFS: couldn't start rpciod!\n");
-                s = ERR_PTR(-EIO);
-                goto out_free;
-        }
-
         error = nfs4_fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
         if (error) {
                 up_write(&s->s_umount);
@@ -1875,6 +1951,13 @@ static struct inode *nfs_alloc_inode(struct super_block *sb)
         if (!nfsi)
                 return NULL;
         nfsi->flags = 0;
+#ifdef CONFIG_NFS_V3_ACL
+        nfsi->acl_access = ERR_PTR(-EAGAIN);
+        nfsi->acl_default = ERR_PTR(-EAGAIN);
+#endif
+#ifdef CONFIG_NFS_V4
+        nfsi->nfs4_acl = NULL;
+#endif /* CONFIG_NFS_V4 */
         return &nfsi->vfs_inode;
 }
 
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index 9d3ddad96d9e..0e82617f2de0 100644
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -80,9 +80,7 @@ mnt_create(char *hostname, struct sockaddr_in *srvaddr, int version,
         clnt = rpc_create_client(xprt, hostname,
                                 &mnt_program, version,
                                 RPC_AUTH_UNIX);
-        if (IS_ERR(clnt)) {
-                xprt_destroy(xprt);
-        } else {
+        if (!IS_ERR(clnt)) {
                 clnt->cl_softrtry = 1;
                 clnt->cl_chatty   = 1;
                 clnt->cl_oneshot  = 1;
diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
new file mode 100644
index 000000000000..ee3536fc84a3
--- /dev/null
+++ b/fs/nfs/nfs3acl.c
@@ -0,0 +1,403 @@
+#include <linux/fs.h>
+#include <linux/nfs.h>
+#include <linux/nfs3.h>
+#include <linux/nfs_fs.h>
+#include <linux/xattr_acl.h>
+#include <linux/nfsacl.h>
+
+#define NFSDBG_FACILITY NFSDBG_PROC
+
+ssize_t nfs3_listxattr(struct dentry *dentry, char *buffer, size_t size)
+{
+        struct inode *inode = dentry->d_inode;
+        struct posix_acl *acl;
+        int pos=0, len=0;
+
+#       define output(s) do {                                           \
+                        if (pos + sizeof(s) <= size) {                  \
+                                memcpy(buffer + pos, s, sizeof(s));     \
+                                pos += sizeof(s);                       \
+                        }                                               \
+                        len += sizeof(s);                               \
+                } while(0)
+
+        acl = nfs3_proc_getacl(inode, ACL_TYPE_ACCESS);
+        if (IS_ERR(acl))
+                return PTR_ERR(acl);
+        if (acl) {
+                output("system.posix_acl_access");
+                posix_acl_release(acl);
+        }
+
+        if (S_ISDIR(inode->i_mode)) {
+                acl = nfs3_proc_getacl(inode, ACL_TYPE_DEFAULT);
+                if (IS_ERR(acl))
+                        return PTR_ERR(acl);
+                if (acl) {
+                        output("system.posix_acl_default");
+                        posix_acl_release(acl);
+                }
+        }
+
+#       undef output
+
+        if (!buffer || len <= size)
+                return len;
+        return -ERANGE;
+}
+
+ssize_t nfs3_getxattr(struct dentry *dentry, const char *name,
+                void *buffer, size_t size)
+{
+        struct inode *inode = dentry->d_inode;
+        struct posix_acl *acl;
+        int type, error = 0;
+
+        if (strcmp(name, XATTR_NAME_ACL_ACCESS) == 0)
+                type = ACL_TYPE_ACCESS;
+        else if (strcmp(name, XATTR_NAME_ACL_DEFAULT) == 0)
+                type = ACL_TYPE_DEFAULT;
+        else
+                return -EOPNOTSUPP;
+
+        acl = nfs3_proc_getacl(inode, type);
+        if (IS_ERR(acl))
+                return PTR_ERR(acl);
+        else if (acl) {
+                if (type == ACL_TYPE_ACCESS && acl->a_count == 0)
+                        error = -ENODATA;
+                else
+                        error = posix_acl_to_xattr(acl, buffer, size);
+                posix_acl_release(acl);
+        } else
+                error = -ENODATA;
+
+        return error;
+}
+
+int nfs3_setxattr(struct dentry *dentry, const char *name,
+             const void *value, size_t size, int flags)
+{
+        struct inode *inode = dentry->d_inode;
+        struct posix_acl *acl;
+        int type, error;
+
+        if (strcmp(name, XATTR_NAME_ACL_ACCESS) == 0)
+                type = ACL_TYPE_ACCESS;
+        else if (strcmp(name, XATTR_NAME_ACL_DEFAULT) == 0)
+                type = ACL_TYPE_DEFAULT;
+        else
+                return -EOPNOTSUPP;
+
+        acl = posix_acl_from_xattr(value, size);
+        if (IS_ERR(acl))
+                return PTR_ERR(acl);
+        error = nfs3_proc_setacl(inode, type, acl);
+        posix_acl_release(acl);
+
+        return error;
+}
+
+int nfs3_removexattr(struct dentry *dentry, const char *name)
+{
+        struct inode *inode = dentry->d_inode;
+        int type;
+
+        if (strcmp(name, XATTR_NAME_ACL_ACCESS) == 0)
+                type = ACL_TYPE_ACCESS;
+        else if (strcmp(name, XATTR_NAME_ACL_DEFAULT) == 0)
+                type = ACL_TYPE_DEFAULT;
+        else
+                return -EOPNOTSUPP;
+
+        return nfs3_proc_setacl(inode, type, NULL);
+}
+
+static void __nfs3_forget_cached_acls(struct nfs_inode *nfsi)
+{
+        if (!IS_ERR(nfsi->acl_access)) {
+                posix_acl_release(nfsi->acl_access);
+                nfsi->acl_access = ERR_PTR(-EAGAIN);
+        }
+        if (!IS_ERR(nfsi->acl_default)) {
+                posix_acl_release(nfsi->acl_default);
+                nfsi->acl_default = ERR_PTR(-EAGAIN);
+        }
+}
+
+void nfs3_forget_cached_acls(struct inode *inode)
+{
+        dprintk("NFS: nfs3_forget_cached_acls(%s/%ld)\n", inode->i_sb->s_id,
+                inode->i_ino);
+        spin_lock(&inode->i_lock);
+        __nfs3_forget_cached_acls(NFS_I(inode));
+        spin_unlock(&inode->i_lock);
+}
+
+static struct posix_acl *nfs3_get_cached_acl(struct inode *inode, int type)
+{
+        struct nfs_inode *nfsi = NFS_I(inode);
+        struct posix_acl *acl = ERR_PTR(-EINVAL);
+
+        spin_lock(&inode->i_lock);
+        switch(type) {
+                case ACL_TYPE_ACCESS:
+                        acl = nfsi->acl_access;
+                        break;
+
+                case ACL_TYPE_DEFAULT:
+                        acl = nfsi->acl_default;
+                        break;
+
+                default:
+                        goto out;
+        }
+        if (IS_ERR(acl))
+                acl = ERR_PTR(-EAGAIN);
+        else
+                acl = posix_acl_dup(acl);
+out:
+        spin_unlock(&inode->i_lock);
+        dprintk("NFS: nfs3_get_cached_acl(%s/%ld, %d) = %p\n", inode->i_sb->s_id,
+                inode->i_ino, type, acl);
+        return acl;
+}
+
+static void nfs3_cache_acls(struct inode *inode, struct posix_acl *acl,
+                    struct posix_acl *dfacl)
+{
+        struct nfs_inode *nfsi = NFS_I(inode);
+
+        dprintk("nfs3_cache_acls(%s/%ld, %p, %p)\n", inode->i_sb->s_id,
+                inode->i_ino, acl, dfacl);
+        spin_lock(&inode->i_lock);
+        __nfs3_forget_cached_acls(NFS_I(inode));
+        nfsi->acl_access = posix_acl_dup(acl);
+        nfsi->acl_default = posix_acl_dup(dfacl);
+        spin_unlock(&inode->i_lock);
+}
+
+struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type)
+{
+        struct nfs_server *server = NFS_SERVER(inode);
+        struct nfs_fattr fattr;
+        struct page *pages[NFSACL_MAXPAGES] = { };
+        struct nfs3_getaclargs args = {
+                .fh = NFS_FH(inode),
+                /* The xdr layer may allocate pages here. */
+                .pages = pages,
+        };
+        struct nfs3_getaclres res = {
+                .fattr =        &fattr,
+        };
+        struct posix_acl *acl;
+        int status, count;
+
+        if (!nfs_server_capable(inode, NFS_CAP_ACLS))
+                return ERR_PTR(-EOPNOTSUPP);
+
+        status = nfs_revalidate_inode(server, inode);
+        if (status < 0)
+                return ERR_PTR(status);
+        acl = nfs3_get_cached_acl(inode, type);
+        if (acl != ERR_PTR(-EAGAIN))
+                return acl;
+        acl = NULL;
+
+        /*
+         * Only get the access acl when explicitly requested: We don't
+         * need it for access decisions, and only some applications use
+         * it. Applications which request the access acl first are not
+         * penalized from this optimization.
+         */
+        if (type == ACL_TYPE_ACCESS)
+                args.mask |= NFS_ACLCNT|NFS_ACL;
+        if (S_ISDIR(inode->i_mode))
+                args.mask |= NFS_DFACLCNT|NFS_DFACL;
+        if (args.mask == 0)
+                return NULL;
+
+        dprintk("NFS call getacl\n");
+        status = rpc_call(server->client_acl, ACLPROC3_GETACL,
+                          &args, &res, 0);
+        dprintk("NFS reply getacl: %d\n", status);
+
+        /* pages may have been allocated at the xdr layer. */
+        for (count = 0; count < NFSACL_MAXPAGES && args.pages[count]; count++)
+                __free_page(args.pages[count]);
+
+        switch (status) {
+                case 0:
+                        status = nfs_refresh_inode(inode, &fattr);
+                        break;
+                case -EPFNOSUPPORT:
+                case -EPROTONOSUPPORT:
+                        dprintk("NFS_V3_ACL extension not supported; disabling\n");
+                        server->caps &= ~NFS_CAP_ACLS;
+                case -ENOTSUPP:
+                        status = -EOPNOTSUPP;
+                default:
+                        goto getout;
+        }
+        if ((args.mask & res.mask) != args.mask) {
+                status = -EIO;
+                goto getout;
+        }
+
+        if (res.acl_access != NULL) {
+                if (posix_acl_equiv_mode(res.acl_access, NULL) == 0) {
+                        posix_acl_release(res.acl_access);
+                        res.acl_access = NULL;
+                }
+        }
+        nfs3_cache_acls(inode, res.acl_access, res.acl_default);
+
+        switch(type) {
+                case ACL_TYPE_ACCESS:
+                        acl = res.acl_access;
+                        res.acl_access = NULL;
+                        break;
+
+                case ACL_TYPE_DEFAULT:
+                        acl = res.acl_default;
+                        res.acl_default = NULL;
+        }
+
+getout:
+        posix_acl_release(res.acl_access);
+        posix_acl_release(res.acl_default);
+
+        if (status != 0) {
+                posix_acl_release(acl);
+                acl = ERR_PTR(status);
+        }
+        return acl;
+}
+
+static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
+                  struct posix_acl *dfacl)
+{
+        struct nfs_server *server = NFS_SERVER(inode);
+        struct nfs_fattr fattr;
+        struct page *pages[NFSACL_MAXPAGES] = { };
+        struct nfs3_setaclargs args = {
+                .inode = inode,
+                .mask = NFS_ACL,
+                .acl_access = acl,
+                .pages = pages,
+        };
+        int status, count;
+
+        status = -EOPNOTSUPP;
+        if (!nfs_server_capable(inode, NFS_CAP_ACLS))
+                goto out;
+
+        /* We are doing this here, because XDR marshalling can only
+           return -ENOMEM. */
+        status = -ENOSPC;
+        if (acl != NULL && acl->a_count > NFS_ACL_MAX_ENTRIES)
+                goto out;
+        if (dfacl != NULL && dfacl->a_count > NFS_ACL_MAX_ENTRIES)
+                goto out;
+        if (S_ISDIR(inode->i_mode)) {
+                args.mask |= NFS_DFACL;
+                args.acl_default = dfacl;
+        }
+
+        dprintk("NFS call setacl\n");
+        nfs_begin_data_update(inode);
+        status = rpc_call(server->client_acl, ACLPROC3_SETACL,
+                          &args, &fattr, 0);
+        NFS_FLAGS(inode) |= NFS_INO_INVALID_ACCESS;
+        nfs_end_data_update(inode);
+        dprintk("NFS reply setacl: %d\n", status);
+
+        /* pages may have been allocated at the xdr layer. */
+        for (count = 0; count < NFSACL_MAXPAGES && args.pages[count]; count++)
+                __free_page(args.pages[count]);
+
+        switch (status) {
+                case 0:
+                        status = nfs_refresh_inode(inode, &fattr);
+                        break;
+                case -EPFNOSUPPORT:
+                case -EPROTONOSUPPORT:
+                        dprintk("NFS_V3_ACL SETACL RPC not supported"
+                                        "(will not retry)\n");
+                        server->caps &= ~NFS_CAP_ACLS;
+                case -ENOTSUPP:
+                        status = -EOPNOTSUPP;
+        }
+out:
+        return status;
+}
+
+int nfs3_proc_setacl(struct inode *inode, int type, struct posix_acl *acl)
+{
+        struct posix_acl *alloc = NULL, *dfacl = NULL;
+        int status;
+
+        if (S_ISDIR(inode->i_mode)) {
+                switch(type) {
+                        case ACL_TYPE_ACCESS:
+                                alloc = dfacl = nfs3_proc_getacl(inode,
+                                                ACL_TYPE_DEFAULT);
+                                if (IS_ERR(alloc))
+                                        goto fail;
+                                break;
+
+                        case ACL_TYPE_DEFAULT:
+                                dfacl = acl;
+                                alloc = acl = nfs3_proc_getacl(inode,
+                                                ACL_TYPE_ACCESS);
+                                if (IS_ERR(alloc))
+                                        goto fail;
+                                break;
+
+                        default:
+                                return -EINVAL;
+                }
+        } else if (type != ACL_TYPE_ACCESS)
+                        return -EINVAL;
+
+        if (acl == NULL) {
+                alloc = acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
+                if (IS_ERR(alloc))
+                        goto fail;
+        }
+        status = nfs3_proc_setacls(inode, acl, dfacl);
+        posix_acl_release(alloc);
+        return status;
+
+fail:
+        return PTR_ERR(alloc);
+}
+
+int nfs3_proc_set_default_acl(struct inode *dir, struct inode *inode,
+                mode_t mode)
+{
+        struct posix_acl *dfacl, *acl;
+        int error = 0;
+
+        dfacl = nfs3_proc_getacl(dir, ACL_TYPE_DEFAULT);
+        if (IS_ERR(dfacl)) {
+                error = PTR_ERR(dfacl);
+                return (error == -EOPNOTSUPP) ? 0 : error;
+        }
+        if (!dfacl)
+                return 0;
+        acl = posix_acl_clone(dfacl, GFP_KERNEL);
+        error = -ENOMEM;
+        if (!acl)
+                goto out_release_dfacl;
+        error = posix_acl_create_masq(acl, &mode);
+        if (error < 0)
+                goto out_release_acl;
+        error = nfs3_proc_setacls(inode, acl, S_ISDIR(inode->i_mode) ?
+                                                      dfacl : NULL);
+out_release_acl:
+        posix_acl_release(acl);
+out_release_dfacl:
+        posix_acl_release(dfacl);
+        return error;
+}
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 3878494dfc2c..7851569b31c6 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -17,6 +17,7 @@
 #include <linux/nfs_page.h>
 #include <linux/lockd/bind.h>
 #include <linux/smp_lock.h>
+#include <linux/nfs_mount.h>
 
 #define NFSDBG_FACILITY         NFSDBG_PROC
 
@@ -45,7 +46,7 @@ static inline int
 nfs3_rpc_call_wrapper(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp, int flags)
 {
         struct rpc_message msg = {
-                .rpc_proc       = &nfs3_procedures[proc],
+                .rpc_proc       = &clnt->cl_procinfo[proc],
                 .rpc_argp       = argp,
                 .rpc_resp       = resp,
         };
@@ -313,7 +314,8 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
                 .fh             = &fhandle,
                 .fattr          = &fattr
         };
-        int                     status;
+        mode_t mode = sattr->ia_mode;
+        int status;
 
         dprintk("NFS call  create %s\n", dentry->d_name.name);
         arg.createmode = NFS3_CREATE_UNCHECKED;
@@ -323,6 +325,8 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
                 arg.verifier[1] = current->pid;
         }
 
+        sattr->ia_mode &= ~current->fs->umask;
+
 again:
         dir_attr.valid = 0;
         fattr.valid = 0;
@@ -369,6 +373,9 @@ again:
                 nfs_refresh_inode(dentry->d_inode, &fattr);
                 dprintk("NFS reply setattr (post-create): %d\n", status);
         }
+        if (status != 0)
+                goto out;
+        status = nfs3_proc_set_default_acl(dir, dentry->d_inode, mode);
 out:
         dprintk("NFS reply create: %d\n", status);
         return status;
@@ -538,15 +545,24 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
                 .fh             = &fhandle,
                 .fattr          = &fattr
         };
-        int                     status;
+        int mode = sattr->ia_mode;
+        int status;
 
         dprintk("NFS call  mkdir %s\n", dentry->d_name.name);
         dir_attr.valid = 0;
         fattr.valid = 0;
+
+        sattr->ia_mode &= ~current->fs->umask;
+
         status = rpc_call(NFS_CLIENT(dir), NFS3PROC_MKDIR, &arg, &res, 0);
         nfs_refresh_inode(dir, &dir_attr);
-        if (status == 0)
-                status = nfs_instantiate(dentry, &fhandle, &fattr);
+        if (status != 0)
+                goto out;
+        status = nfs_instantiate(dentry, &fhandle, &fattr);
+        if (status != 0)
+                goto out;
+        status = nfs3_proc_set_default_acl(dir, dentry->d_inode, mode);
+out:
         dprintk("NFS reply mkdir: %d\n", status);
         return status;
 }
@@ -641,6 +657,7 @@ nfs3_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
                 .fh             = &fh,
                 .fattr          = &fattr
         };
+        mode_t mode = sattr->ia_mode;
         int status;
 
         switch (sattr->ia_mode & S_IFMT) {
@@ -653,12 +670,20 @@ nfs3_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
 
         dprintk("NFS call  mknod %s %u:%u\n", dentry->d_name.name,
                         MAJOR(rdev), MINOR(rdev));
+
+        sattr->ia_mode &= ~current->fs->umask;
+
         dir_attr.valid = 0;
         fattr.valid = 0;
         status = rpc_call(NFS_CLIENT(dir), NFS3PROC_MKNOD, &arg, &res, 0);
         nfs_refresh_inode(dir, &dir_attr);
-        if (status == 0)
-                status = nfs_instantiate(dentry, &fh, &fattr);
+        if (status != 0)
+                goto out;
+        status = nfs_instantiate(dentry, &fh, &fattr);
+        if (status != 0)
+                goto out;
+        status = nfs3_proc_set_default_acl(dir, dentry->d_inode, mode);
+out:
         dprintk("NFS reply mknod: %d\n", status);
         return status;
 }
@@ -825,7 +850,8 @@ nfs3_proc_lock(struct file *filp, int cmd, struct file_lock *fl)
 struct nfs_rpc_ops      nfs_v3_clientops = {
         .version        = 3,                    /* protocol version */
         .dentry_ops     = &nfs_dentry_operations,
-        .dir_inode_ops  = &nfs_dir_inode_operations,
+        .dir_inode_ops  = &nfs3_dir_inode_operations,
+        .file_inode_ops = &nfs3_file_inode_operations,
         .getroot        = nfs3_proc_get_root,
         .getattr        = nfs3_proc_getattr,
         .setattr        = nfs3_proc_setattr,
@@ -856,4 +882,5 @@ struct nfs_rpc_ops	nfs_v3_clientops = {
         .file_open      = nfs_open,
         .file_release   = nfs_release,
         .lock           = nfs3_proc_lock,
+        .clear_acl_cache = nfs3_forget_cached_acls,
 };
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index a3593d47e5ab..db4a904810a4 100644
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -21,6 +21,7 @@
 #include <linux/nfs.h>
 #include <linux/nfs3.h>
 #include <linux/nfs_fs.h>
+#include <linux/nfsacl.h>
 
 #define NFSDBG_FACILITY         NFSDBG_XDR
 
@@ -79,6 +80,11 @@ extern int			nfs_stat_to_errno(int);
 #define NFS3_pathconfres_sz     (1+NFS3_post_op_attr_sz+6)
 #define NFS3_commitres_sz       (1+NFS3_wcc_data_sz+2)
 
+#define ACL3_getaclargs_sz      (NFS3_fh_sz+1)
+#define ACL3_setaclargs_sz      (NFS3_fh_sz+1+2*(2+5*3))
+#define ACL3_getaclres_sz       (1+NFS3_post_op_attr_sz+1+2*(2+5*3))
+#define ACL3_setaclres_sz       (1+NFS3_post_op_attr_sz)
+
 /*
  * Map file type to S_IFMT bits
  */
@@ -627,6 +633,74 @@ nfs3_xdr_commitargs(struct rpc_rqst *req, u32 *p, struct nfs_writeargs *args)
         return 0;
 }
 
+#ifdef CONFIG_NFS_V3_ACL
+/*
+ * Encode GETACL arguments
+ */
+static int
+nfs3_xdr_getaclargs(struct rpc_rqst *req, u32 *p,
+                    struct nfs3_getaclargs *args)
+{
+        struct rpc_auth *auth = req->rq_task->tk_auth;
+        unsigned int replen;
+
+        p = xdr_encode_fhandle(p, args->fh);
+        *p++ = htonl(args->mask);
+        req->rq_slen = xdr_adjust_iovec(req->rq_svec, p);
+
+        if (args->mask & (NFS_ACL | NFS_DFACL)) {
+                /* Inline the page array */
+                replen = (RPC_REPHDRSIZE + auth->au_rslack +
+                          ACL3_getaclres_sz) << 2;
+                xdr_inline_pages(&req->rq_rcv_buf, replen, args->pages, 0,
+                                 NFSACL_MAXPAGES << PAGE_SHIFT);
+        }
+        return 0;
+}
+
+/*
+ * Encode SETACL arguments
+ */
+static int
+nfs3_xdr_setaclargs(struct rpc_rqst *req, u32 *p,
+                   struct nfs3_setaclargs *args)
+{
+        struct xdr_buf *buf = &req->rq_snd_buf;
+        unsigned int base, len_in_head, len = nfsacl_size(
+                (args->mask & NFS_ACL)   ? args->acl_access  : NULL,
+                (args->mask & NFS_DFACL) ? args->acl_default : NULL);
+        int count, err;
+
+        p = xdr_encode_fhandle(p, NFS_FH(args->inode));
+        *p++ = htonl(args->mask);
+        base = (char *)p - (char *)buf->head->iov_base;
+        /* put as much of the acls into head as possible. */
+        len_in_head = min_t(unsigned int, buf->head->iov_len - base, len);
+        len -= len_in_head;
+        req->rq_slen = xdr_adjust_iovec(req->rq_svec, p + (len_in_head >> 2));
+
+        for (count = 0; (count << PAGE_SHIFT) < len; count++) {
+                args->pages[count] = alloc_page(GFP_KERNEL);
+                if (!args->pages[count]) {
+                        while (count)
+                                __free_page(args->pages[--count]);
+                        return -ENOMEM;
+                }
+        }
+        xdr_encode_pages(buf, args->pages, 0, len);
+
+        err = nfsacl_encode(buf, base, args->inode,
+                            (args->mask & NFS_ACL) ?
+                            args->acl_access : NULL, 1, 0);
+        if (err > 0)
+                err = nfsacl_encode(buf, base + err, args->inode,
+                                    (args->mask & NFS_DFACL) ?
+                                    args->acl_default : NULL, 1,
+                                    NFS_ACL_DEFAULT);
+        return (err > 0) ? 0 : err;
+}
+#endif  /* CONFIG_NFS_V3_ACL */
+
 /*
  * NFS XDR decode functions
  */
@@ -978,6 +1052,54 @@ nfs3_xdr_commitres(struct rpc_rqst *req, u32 *p, struct nfs_writeres *res)
         return 0;
 }
 
+#ifdef CONFIG_NFS_V3_ACL
+/*
+ * Decode GETACL reply
+ */
+static int
+nfs3_xdr_getaclres(struct rpc_rqst *req, u32 *p,
+                   struct nfs3_getaclres *res)
+{
+        struct xdr_buf *buf = &req->rq_rcv_buf;
+        int status = ntohl(*p++);
+        struct posix_acl **acl;
+        unsigned int *aclcnt;
+        int err, base;
+
+        if (status != 0)
+                return -nfs_stat_to_errno(status);
+        p = xdr_decode_post_op_attr(p, res->fattr);
+        res->mask = ntohl(*p++);
+        if (res->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
+                return -EINVAL;
+        base = (char *)p - (char *)req->rq_rcv_buf.head->iov_base;
+
+        acl = (res->mask & NFS_ACL) ? &res->acl_access : NULL;
+        aclcnt = (res->mask & NFS_ACLCNT) ? &res->acl_access_count : NULL;
+        err = nfsacl_decode(buf, base, aclcnt, acl);
+
+        acl = (res->mask & NFS_DFACL) ? &res->acl_default : NULL;
+        aclcnt = (res->mask & NFS_DFACLCNT) ? &res->acl_default_count : NULL;
+        if (err > 0)
+                err = nfsacl_decode(buf, base + err, aclcnt, acl);
+        return (err > 0) ? 0 : err;
+}
+
+/*
+ * Decode setacl reply.
+ */
+static int
+nfs3_xdr_setaclres(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr)
+{
+        int status = ntohl(*p++);
+
+        if (status)
+                return -nfs_stat_to_errno(status);
+        xdr_decode_post_op_attr(p, fattr);
+        return 0;
+}
+#endif  /* CONFIG_NFS_V3_ACL */
+
 #ifndef MAX
 # define MAX(a, b)      (((a) > (b))? (a) : (b))
 #endif
@@ -1021,3 +1143,28 @@ struct rpc_version		nfs_version3 = {
         .procs                  = nfs3_procedures
 };
 
+#ifdef CONFIG_NFS_V3_ACL
+static struct rpc_procinfo      nfs3_acl_procedures[] = {
+        [ACLPROC3_GETACL] = {
+                .p_proc = ACLPROC3_GETACL,
+                .p_encode = (kxdrproc_t) nfs3_xdr_getaclargs,
+                .p_decode = (kxdrproc_t) nfs3_xdr_getaclres,
+                .p_bufsiz = MAX(ACL3_getaclargs_sz, ACL3_getaclres_sz) << 2,
+                .p_timer = 1,
+        },
+        [ACLPROC3_SETACL] = {
+                .p_proc = ACLPROC3_SETACL,
+                .p_encode = (kxdrproc_t) nfs3_xdr_setaclargs,
+                .p_decode = (kxdrproc_t) nfs3_xdr_setaclres,
+                .p_bufsiz = MAX(ACL3_setaclargs_sz, ACL3_setaclres_sz) << 2,
+                .p_timer = 0,
+        },
+};
+
+struct rpc_version              nfsacl_version3 = {
+        .number                 = 3,
+        .nrprocs                = sizeof(nfs3_acl_procedures)/
+                                  sizeof(nfs3_acl_procedures[0]),
+        .procs                  = nfs3_acl_procedures,
+};
+#endif  /* CONFIG_NFS_V3_ACL */
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
new file mode 100644
index 000000000000..ec1a22d7b876
--- /dev/null
+++ b/fs/nfs/nfs4_fs.h
@@ -0,0 +1,253 @@
+/*
+ * linux/fs/nfs/nfs4_fs.h
+ *
+ * Copyright (C) 2005 Trond Myklebust
+ *
+ * NFSv4-specific filesystem definitions and declarations
+ */
+
+#ifndef __LINUX_FS_NFS_NFS4_FS_H
+#define __LINUX_FS_NFS_NFS4_FS_H
+
+#ifdef CONFIG_NFS_V4
+
+struct idmap;
+
+/*
+ * In a seqid-mutating op, this macro controls which error return
+ * values trigger incrementation of the seqid.
+ *
+ * from rfc 3010:
+ * The client MUST monotonically increment the sequence number for the
+ * CLOSE, LOCK, LOCKU, OPEN, OPEN_CONFIRM, and OPEN_DOWNGRADE
+ * operations.  This is true even in the event that the previous
+ * operation that used the sequence number received an error.  The only
+ * exception to this rule is if the previous operation received one of
+ * the following errors: NFSERR_STALE_CLIENTID, NFSERR_STALE_STATEID,
+ * NFSERR_BAD_STATEID, NFSERR_BAD_SEQID, NFSERR_BADXDR,
+ * NFSERR_RESOURCE, NFSERR_NOFILEHANDLE.
+ *
+ */
+#define seqid_mutating_err(err)       \
+(((err) != NFSERR_STALE_CLIENTID) &&  \
+ ((err) != NFSERR_STALE_STATEID)  &&  \
+ ((err) != NFSERR_BAD_STATEID)    &&  \
+ ((err) != NFSERR_BAD_SEQID)      &&  \
+ ((err) != NFSERR_BAD_XDR)        &&  \
+ ((err) != NFSERR_RESOURCE)       &&  \
+ ((err) != NFSERR_NOFILEHANDLE))
+
+enum nfs4_client_state {
+        NFS4CLNT_OK  = 0,
+};
+
+/*
+ * The nfs4_client identifies our client state to the server.
+ */
+struct nfs4_client {
+        struct list_head        cl_servers;     /* Global list of servers */
+        struct in_addr          cl_addr;        /* Server identifier */
+        u64                     cl_clientid;    /* constant */
+        nfs4_verifier           cl_confirm;
+        unsigned long           cl_state;
+
+        u32                     cl_lockowner_id;
+
+        /*
+         * The following rwsem ensures exclusive access to the server
+         * while we recover the state following a lease expiration.
+         */
+        struct rw_semaphore     cl_sem;
+
+        struct list_head        cl_delegations;
+        struct list_head        cl_state_owners;
+        struct list_head        cl_unused;
+        int                     cl_nunused;
+        spinlock_t              cl_lock;
+        atomic_t                cl_count;
+
+        struct rpc_clnt *       cl_rpcclient;
+        struct rpc_cred *       cl_cred;
+
+        struct list_head        cl_superblocks; /* List of nfs_server structs */
+
+        unsigned long           cl_lease_time;
+        unsigned long           cl_last_renewal;
+        struct work_struct      cl_renewd;
+        struct work_struct      cl_recoverd;
+
+        wait_queue_head_t       cl_waitq;
+        struct rpc_wait_queue   cl_rpcwaitq;
+
+        /* used for the setclientid verifier */
+        struct timespec         cl_boot_time;
+
+        /* idmapper */
+        struct idmap *          cl_idmap;
+
+        /* Our own IP address, as a null-terminated string.
+         * This is used to generate the clientid, and the callback address.
+         */
+        char                    cl_ipaddr[16];
+        unsigned char           cl_id_uniquifier;
+};
+
+/*
+ * NFS4 state_owners and lock_owners are simply labels for ordered
+ * sequences of RPC calls. Their sole purpose is to provide once-only
+ * semantics by allowing the server to identify replayed requests.
+ *
+ * The ->so_sema is held during all state_owner seqid-mutating operations:
+ * OPEN, OPEN_DOWNGRADE, and CLOSE. Its purpose is to properly serialize
+ * so_seqid.
+ */
+struct nfs4_state_owner {
+        struct list_head     so_list;    /* per-clientid list of state_owners */
+        struct nfs4_client   *so_client;
+        u32                  so_id;      /* 32-bit identifier, unique */
+        struct semaphore     so_sema;
+        u32                  so_seqid;   /* protected by so_sema */
+        atomic_t             so_count;
+
+        struct rpc_cred      *so_cred;   /* Associated cred */
+        struct list_head     so_states;
+        struct list_head     so_delegations;
+};
+
+/*
+ * struct nfs4_state maintains the client-side state for a given
+ * (state_owner,inode) tuple (OPEN) or state_owner (LOCK).
+ *
+ * OPEN:
+ * In order to know when to OPEN_DOWNGRADE or CLOSE the state on the server,
+ * we need to know how many files are open for reading or writing on a
+ * given inode. This information too is stored here.
+ *
+ * LOCK: one nfs4_state (LOCK) to hold the lock stateid nfs4_state(OPEN)
+ */
+
+struct nfs4_lock_state {
+        struct list_head        ls_locks;       /* Other lock stateids */
+        struct nfs4_state *     ls_state;       /* Pointer to open state */
+        fl_owner_t              ls_owner;       /* POSIX lock owner */
+#define NFS_LOCK_INITIALIZED 1
+        int                     ls_flags;
+        u32                     ls_seqid;
+        u32                     ls_id;
+        nfs4_stateid            ls_stateid;
+        atomic_t                ls_count;
+};
+
+/* bits for nfs4_state->flags */
+enum {
+        LK_STATE_IN_USE,
+        NFS_DELEGATED_STATE,
+};
+
+struct nfs4_state {
+        struct list_head open_states;   /* List of states for the same state_owner */
+        struct list_head inode_states;  /* List of states for the same inode */
+        struct list_head lock_states;   /* List of subservient lock stateids */
+
+        struct nfs4_state_owner *owner; /* Pointer to the open owner */
+        struct inode *inode;            /* Pointer to the inode */
+
+        unsigned long flags;            /* Do we hold any locks? */
+        struct semaphore lock_sema;     /* Serializes file locking operations */
+        spinlock_t state_lock;          /* Protects the lock_states list */
+
+        nfs4_stateid stateid;
+
+        unsigned int nreaders;
+        unsigned int nwriters;
+        int state;                      /* State on the server (R,W, or RW) */
+        atomic_t count;
+};
+
+
+struct nfs4_exception {
+        long timeout;
+        int retry;
+};
+
+struct nfs4_state_recovery_ops {
+        int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *);
+        int (*recover_lock)(struct nfs4_state *, struct file_lock *);
+};
+
+extern struct dentry_operations nfs4_dentry_operations;
+extern struct inode_operations nfs4_dir_inode_operations;
+
+/* inode.c */
+extern ssize_t nfs4_getxattr(struct dentry *, const char *, void *, size_t);
+extern int nfs4_setxattr(struct dentry *, const char *, const void *, size_t, int);
+extern ssize_t nfs4_listxattr(struct dentry *, char *, size_t);
+
+
+/* nfs4proc.c */
+extern int nfs4_map_errors(int err);
+extern int nfs4_proc_setclientid(struct nfs4_client *, u32, unsigned short);
+extern int nfs4_proc_setclientid_confirm(struct nfs4_client *);
+extern int nfs4_proc_async_renew(struct nfs4_client *);
+extern int nfs4_proc_renew(struct nfs4_client *);
+extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state, mode_t mode);
+extern struct inode *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);
+extern int nfs4_open_revalidate(struct inode *, struct dentry *, int);
+
+extern struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops;
+extern struct nfs4_state_recovery_ops nfs4_network_partition_recovery_ops;
+
+extern const u32 nfs4_fattr_bitmap[2];
+extern const u32 nfs4_statfs_bitmap[2];
+extern const u32 nfs4_pathconf_bitmap[2];
+extern const u32 nfs4_fsinfo_bitmap[2];
+
+/* nfs4renewd.c */
+extern void nfs4_schedule_state_renewal(struct nfs4_client *);
+extern void nfs4_renewd_prepare_shutdown(struct nfs_server *);
+extern void nfs4_kill_renewd(struct nfs4_client *);
+extern void nfs4_renew_state(void *);
+
+/* nfs4state.c */
+extern void init_nfsv4_state(struct nfs_server *);
+extern void destroy_nfsv4_state(struct nfs_server *);
+extern struct nfs4_client *nfs4_get_client(struct in_addr *);
+extern void nfs4_put_client(struct nfs4_client *clp);
+extern int nfs4_init_client(struct nfs4_client *clp);
+extern struct nfs4_client *nfs4_find_client(struct in_addr *);
+extern u32 nfs4_alloc_lockowner_id(struct nfs4_client *);
+
+extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *);
+extern void nfs4_put_state_owner(struct nfs4_state_owner *);
+extern void nfs4_drop_state_owner(struct nfs4_state_owner *);
+extern struct nfs4_state * nfs4_get_open_state(struct inode *, struct nfs4_state_owner *);
+extern void nfs4_put_open_state(struct nfs4_state *);
+extern void nfs4_close_state(struct nfs4_state *, mode_t);
+extern struct nfs4_state *nfs4_find_state(struct inode *, struct rpc_cred *, mode_t mode);
+extern void nfs4_increment_seqid(int status, struct nfs4_state_owner *sp);
+extern void nfs4_schedule_state_recovery(struct nfs4_client *);
+extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl);
+extern void nfs4_increment_lock_seqid(int status, struct nfs4_lock_state *ls);
+extern void nfs4_copy_stateid(nfs4_stateid *, struct nfs4_state *, fl_owner_t);
+
+extern const nfs4_stateid zero_stateid;
+
+/* nfs4xdr.c */
+extern uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus);
+extern struct rpc_procinfo nfs4_procedures[];
+
+struct nfs4_mount_data;
+
+/* callback_xdr.c */
+extern struct svc_version nfs4_callback_version1;
+
+#else
+
+#define init_nfsv4_state(server)  do { } while (0)
+#define destroy_nfsv4_state(server)       do { } while (0)
+#define nfs4_put_state_owner(inode, owner) do { } while (0)
+#define nfs4_put_open_state(state) do { } while (0)
+#define nfs4_close_state(a, b) do { } while (0)
+
+#endif /* CONFIG_NFS_V4 */
+#endif /* __LINUX_FS_NFS_NFS4_FS.H */
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1d5cb3e80c3e..1b76f80aedb9 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -48,6 +48,7 @@
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
 
+#include "nfs4_fs.h"
 #include "delegation.h"
 
 #define NFSDBG_FACILITY         NFSDBG_PROC
@@ -62,8 +63,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
 extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus);
 extern struct rpc_procinfo nfs4_procedures[];
 
-extern nfs4_stateid zero_stateid;
-
 /* Prevent leaks of NFSv4 errors into userland */
 int nfs4_map_errors(int err)
 {
@@ -104,7 +103,7 @@ const u32 nfs4_statfs_bitmap[2] = {
         | FATTR4_WORD1_SPACE_TOTAL
 };
 
-u32 nfs4_pathconf_bitmap[2] = {
+const u32 nfs4_pathconf_bitmap[2] = {
         FATTR4_WORD0_MAXLINK
         | FATTR4_WORD0_MAXNAME,
         0
@@ -124,7 +123,7 @@ static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry,
 
         BUG_ON(readdir->count < 80);
         if (cookie > 2) {
-                readdir->cookie = (cookie > 2) ? cookie : 0;
+                readdir->cookie = cookie;
                 memcpy(&readdir->verifier, verifier, sizeof(readdir->verifier));
                 return;
         }
@@ -270,14 +269,9 @@ static int nfs4_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state *sta
         int err;
         do {
                 err = _nfs4_open_reclaim(sp, state);
-                switch (err) {
-                        case 0:
-                        case -NFS4ERR_STALE_CLIENTID:
-                        case -NFS4ERR_STALE_STATEID:
-                        case -NFS4ERR_EXPIRED:
-                                return err;
-                }
-                err = nfs4_handle_exception(server, err, &exception);
+                if (err != -NFS4ERR_DELAY)
+                        break;
+                nfs4_handle_exception(server, err, &exception);
         } while (exception.retry);
         return err;
 }
@@ -509,6 +503,20 @@ out_stale:
         goto out_nodeleg;
 }
 
+static inline int nfs4_do_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state, struct dentry *dentry)
+{
+        struct nfs_server *server = NFS_SERVER(dentry->d_inode);
+        struct nfs4_exception exception = { };
+        int err;
+
+        do {
+                err = _nfs4_open_expired(sp, state, dentry);
+                if (err == -NFS4ERR_DELAY)
+                        nfs4_handle_exception(server, err, &exception);
+        } while (exception.retry);
+        return err;
+}
+
 static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state)
 {
         struct nfs_inode *nfsi = NFS_I(state->inode);
@@ -521,7 +529,7 @@ static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *sta
                         continue;
                 get_nfs_open_context(ctx);
                 spin_unlock(&state->inode->i_lock);
-                status = _nfs4_open_expired(sp, state, ctx->dentry);
+                status = nfs4_do_open_expired(sp, state, ctx->dentry);
                 put_nfs_open_context(ctx);
                 return status;
         }
@@ -748,11 +756,10 @@ static int _nfs4_do_setattr(struct nfs_server *server, struct nfs_fattr *fattr,
 
         fattr->valid = 0;
 
-        if (state != NULL)
+        if (state != NULL) {
                 msg.rpc_cred = state->owner->so_cred;
-        if (sattr->ia_valid & ATTR_SIZE)
-                nfs4_copy_stateid(&arg.stateid, state, NULL);
-        else
+                nfs4_copy_stateid(&arg.stateid, state, current->files);
+        } else
                 memcpy(&arg.stateid, &zero_stateid, sizeof(arg.stateid));
 
         return rpc_call_sync(server->client, &msg, 0);
@@ -1116,47 +1123,31 @@ static int
 nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
                   struct iattr *sattr)
 {
-        struct inode *          inode = dentry->d_inode;
-        int                     size_change = sattr->ia_valid & ATTR_SIZE;
-        struct nfs4_state       *state = NULL;
-        int need_iput = 0;
+        struct rpc_cred *cred;
+        struct inode *inode = dentry->d_inode;
+        struct nfs4_state *state;
         int status;
 
         fattr->valid = 0;
         
-        if (size_change) {
-                struct rpc_cred *cred = rpcauth_lookupcred(NFS_SERVER(inode)->client->cl_auth, 0);
-                if (IS_ERR(cred))
-                        return PTR_ERR(cred);
+        cred = rpcauth_lookupcred(NFS_SERVER(inode)->client->cl_auth, 0);
+        if (IS_ERR(cred))
+                return PTR_ERR(cred);
+        /* Search for an existing WRITE delegation first */
+        state = nfs4_open_delegated(inode, FMODE_WRITE, cred);
+        if (!IS_ERR(state)) {
+                /* NB: nfs4_open_delegated() bumps the inode->i_count */
+                iput(inode);
+        } else {
+                /* Search for an existing open(O_WRITE) stateid */
                 state = nfs4_find_state(inode, cred, FMODE_WRITE);
-                if (state == NULL) {
-                        state = nfs4_open_delegated(dentry->d_inode,
-                                        FMODE_WRITE, cred);
-                        if (IS_ERR(state))
-                                state = nfs4_do_open(dentry->d_parent->d_inode,
-                                                dentry, FMODE_WRITE,
-                                                NULL, cred);
-                        need_iput = 1;
-                }
-                put_rpccred(cred);
-                if (IS_ERR(state))
-                        return PTR_ERR(state);
-
-                if (state->inode != inode) {
-                        printk(KERN_WARNING "nfs: raced in setattr (%p != %p), returning -EIO\n", inode, state->inode);
-                        status = -EIO;
-                        goto out;
-                }
         }
+
         status = nfs4_do_setattr(NFS_SERVER(inode), fattr,
                         NFS_FH(inode), sattr, state);
-out:
-        if (state) {
-                inode = state->inode;
+        if (state != NULL)
                 nfs4_close_state(state, FMODE_WRITE);
-                if (need_iput)
-                        iput(inode);
-        }
+        put_rpccred(cred);
         return status;
 }
 
@@ -1731,6 +1722,10 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
         };
         int                     status;
 
+        dprintk("%s: dentry = %s/%s, cookie = %Lu\n", __FUNCTION__,
+                        dentry->d_parent->d_name.name,
+                        dentry->d_name.name,
+                        (unsigned long long)cookie);
         lock_kernel();
         nfs4_setup_readdir(cookie, NFS_COOKIEVERF(dir), dentry, &args);
         res.pgbase = args.pgbase;
@@ -1738,6 +1733,7 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
         if (status == 0)
                 memcpy(NFS_COOKIEVERF(dir), res.verifier.data, NFS4_VERIFIER_SIZE);
         unlock_kernel();
+        dprintk("%s: returns %d\n", __FUNCTION__, status);
         return status;
 }
 
@@ -2163,6 +2159,193 @@ nfs4_proc_file_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
+static inline int nfs4_server_supports_acls(struct nfs_server *server)
+{
+        return (server->caps & NFS_CAP_ACLS)
+                && (server->acl_bitmask & ACL4_SUPPORT_ALLOW_ACL)
+                && (server->acl_bitmask & ACL4_SUPPORT_DENY_ACL);
+}
+
+/* Assuming that XATTR_SIZE_MAX is a multiple of PAGE_CACHE_SIZE, and that
+ * it's OK to put sizeof(void) * (XATTR_SIZE_MAX/PAGE_CACHE_SIZE) bytes on
+ * the stack.
+ */
+#define NFS4ACL_MAXPAGES (XATTR_SIZE_MAX >> PAGE_CACHE_SHIFT)
+
+static void buf_to_pages(const void *buf, size_t buflen,
+                struct page **pages, unsigned int *pgbase)
+{
+        const void *p = buf;
+
+        *pgbase = offset_in_page(buf);
+        p -= *pgbase;
+        while (p < buf + buflen) {
+                *(pages++) = virt_to_page(p);
+                p += PAGE_CACHE_SIZE;
+        }
+}
+
+struct nfs4_cached_acl {
+        int cached;
+        size_t len;
+        char data[0];
+};
+
+static void nfs4_set_cached_acl(struct inode *inode, struct nfs4_cached_acl *acl)
+{
+        struct nfs_inode *nfsi = NFS_I(inode);
+
+        spin_lock(&inode->i_lock);
+        kfree(nfsi->nfs4_acl);
+        nfsi->nfs4_acl = acl;
+        spin_unlock(&inode->i_lock);
+}
+
+static void nfs4_zap_acl_attr(struct inode *inode)
+{
+        nfs4_set_cached_acl(inode, NULL);
+}
+
+static inline ssize_t nfs4_read_cached_acl(struct inode *inode, char *buf, size_t buflen)
+{
+        struct nfs_inode *nfsi = NFS_I(inode);
+        struct nfs4_cached_acl *acl;
+        int ret = -ENOENT;
+
+        spin_lock(&inode->i_lock);
+        acl = nfsi->nfs4_acl;
+        if (acl == NULL)
+                goto out;
+        if (buf == NULL) /* user is just asking for length */
+                goto out_len;
+        if (acl->cached == 0)
+                goto out;
+        ret = -ERANGE; /* see getxattr(2) man page */
+        if (acl->len > buflen)
+                goto out;
+        memcpy(buf, acl->data, acl->len);
+out_len:
+        ret = acl->len;
+out:
+        spin_unlock(&inode->i_lock);
+        return ret;
+}
+
+static void nfs4_write_cached_acl(struct inode *inode, const char *buf, size_t acl_len)
+{
+        struct nfs4_cached_acl *acl;
+
+        if (buf && acl_len <= PAGE_SIZE) {
+                acl = kmalloc(sizeof(*acl) + acl_len, GFP_KERNEL);
+                if (acl == NULL)
+                        goto out;
+                acl->cached = 1;
+                memcpy(acl->data, buf, acl_len);
+        } else {
+                acl = kmalloc(sizeof(*acl), GFP_KERNEL);
+                if (acl == NULL)
+                        goto out;
+                acl->cached = 0;
+        }
+        acl->len = acl_len;
+out:
+        nfs4_set_cached_acl(inode, acl);
+}
+
+static inline ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
+{
+        struct page *pages[NFS4ACL_MAXPAGES];
+        struct nfs_getaclargs args = {
+                .fh = NFS_FH(inode),
+                .acl_pages = pages,
+                .acl_len = buflen,
+        };
+        size_t resp_len = buflen;
+        void *resp_buf;
+        struct rpc_message msg = {
+                .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETACL],
+                .rpc_argp = &args,
+                .rpc_resp = &resp_len,
+        };
+        struct page *localpage = NULL;
+        int ret;
+
+        if (buflen < PAGE_SIZE) {
+                /* As long as we're doing a round trip to the server anyway,
+                 * let's be prepared for a page of acl data. */
+                localpage = alloc_page(GFP_KERNEL);
+                resp_buf = page_address(localpage);
+                if (localpage == NULL)
+                        return -ENOMEM;
+                args.acl_pages[0] = localpage;
+                args.acl_pgbase = 0;
+                args.acl_len = PAGE_SIZE;
+        } else {
+                resp_buf = buf;
+                buf_to_pages(buf, buflen, args.acl_pages, &args.acl_pgbase);
+        }
+        ret = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+        if (ret)
+                goto out_free;
+        if (resp_len > args.acl_len)
+                nfs4_write_cached_acl(inode, NULL, resp_len);
+        else
+                nfs4_write_cached_acl(inode, resp_buf, resp_len);
+        if (buf) {
+                ret = -ERANGE;
+                if (resp_len > buflen)
+                        goto out_free;
+                if (localpage)
+                        memcpy(buf, resp_buf, resp_len);
+        }
+        ret = resp_len;
+out_free:
+        if (localpage)
+                __free_page(localpage);
+        return ret;
+}
+
+static ssize_t nfs4_proc_get_acl(struct inode *inode, void *buf, size_t buflen)
+{
+        struct nfs_server *server = NFS_SERVER(inode);
+        int ret;
+
+        if (!nfs4_server_supports_acls(server))
+                return -EOPNOTSUPP;
+        ret = nfs_revalidate_inode(server, inode);
+        if (ret < 0)
+                return ret;
+        ret = nfs4_read_cached_acl(inode, buf, buflen);
+        if (ret != -ENOENT)
+                return ret;
+        return nfs4_get_acl_uncached(inode, buf, buflen);
+}
+
+static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
+{
+        struct nfs_server *server = NFS_SERVER(inode);
+        struct page *pages[NFS4ACL_MAXPAGES];
+        struct nfs_setaclargs arg = {
+                .fh             = NFS_FH(inode),
+                .acl_pages      = pages,
+                .acl_len        = buflen,
+        };
+        struct rpc_message msg = {
+                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_SETACL],
+                .rpc_argp       = &arg,
+                .rpc_resp       = NULL,
+        };
+        int ret;
+
+        if (!nfs4_server_supports_acls(server))
+                return -EOPNOTSUPP;
+        buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
+        ret = rpc_call_sync(NFS_SERVER(inode)->client, &msg, 0);
+        if (ret == 0)
+                nfs4_write_cached_acl(inode, buf, buflen);
+        return ret;
+}
+
 static int
 nfs4_async_handle_error(struct rpc_task *task, struct nfs_server *server)
 {
@@ -2448,14 +2631,11 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
         down_read(&clp->cl_sem);
         nlo.clientid = clp->cl_clientid;
         down(&state->lock_sema);
-        lsp = nfs4_find_lock_state(state, request->fl_owner);
-        if (lsp)
-                nlo.id = lsp->ls_id; 
-        else {
-                spin_lock(&clp->cl_lock);
-                nlo.id = nfs4_alloc_lockowner_id(clp);
-                spin_unlock(&clp->cl_lock);
-        }
+        status = nfs4_set_lock_state(state, request);
+        if (status != 0)
+                goto out;
+        lsp = request->fl_u.nfs4_fl.owner;
+        nlo.id = lsp->ls_id; 
         arg.u.lockt = &nlo;
         status = rpc_call_sync(server->client, &msg, 0);
         if (!status) {
@@ -2476,8 +2656,7 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock
                 request->fl_pid = 0;
                 status = 0;
         }
-        if (lsp)
-                nfs4_put_lock_state(lsp);
+out:
         up(&state->lock_sema);
         up_read(&clp->cl_sem);
         return status;
@@ -2537,28 +2716,26 @@ static int _nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock
         };
         struct nfs4_lock_state *lsp;
         struct nfs_locku_opargs luargs;
-        int status = 0;
+        int status;
                         
         down_read(&clp->cl_sem);
         down(&state->lock_sema);
-        lsp = nfs4_find_lock_state(state, request->fl_owner);
-        if (!lsp)
+        status = nfs4_set_lock_state(state, request);
+        if (status != 0)
                 goto out;
+        lsp = request->fl_u.nfs4_fl.owner;
         /* We might have lost the locks! */
-        if ((lsp->ls_flags & NFS_LOCK_INITIALIZED) != 0) {
-                luargs.seqid = lsp->ls_seqid;
-                memcpy(&luargs.stateid, &lsp->ls_stateid, sizeof(luargs.stateid));
-                arg.u.locku = &luargs;
-                status = rpc_call_sync(server->client, &msg, RPC_TASK_NOINTR);
-                nfs4_increment_lock_seqid(status, lsp);
-        }
+        if ((lsp->ls_flags & NFS_LOCK_INITIALIZED) == 0)
+                goto out;
+        luargs.seqid = lsp->ls_seqid;
+        memcpy(&luargs.stateid, &lsp->ls_stateid, sizeof(luargs.stateid));
+        arg.u.locku = &luargs;
+        status = rpc_call_sync(server->client, &msg, RPC_TASK_NOINTR);
+        nfs4_increment_lock_seqid(status, lsp);
 
-        if (status == 0) {
+        if (status == 0)
                 memcpy(&lsp->ls_stateid,  &res.u.stateid, 
                                 sizeof(lsp->ls_stateid));
-                nfs4_notify_unlck(state, request, lsp);
-        }
-        nfs4_put_lock_state(lsp);
 out:
         up(&state->lock_sema);
         if (status == 0)
@@ -2584,7 +2761,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *r
 {
         struct inode *inode = state->inode;
         struct nfs_server *server = NFS_SERVER(inode);
-        struct nfs4_lock_state *lsp;
+        struct nfs4_lock_state *lsp = request->fl_u.nfs4_fl.owner;
         struct nfs_lockargs arg = {
                 .fh = NFS_FH(inode),
                 .type = nfs4_lck_type(cmd, request),
@@ -2606,9 +2783,6 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *r
         };
         int status;
 
-        lsp = nfs4_get_lock_state(state, request->fl_owner);
-        if (lsp == NULL)
-                return -ENOMEM;
         if (!(lsp->ls_flags & NFS_LOCK_INITIALIZED)) {
                 struct nfs4_state_owner *owner = state->owner;
                 struct nfs_open_to_lock otl = {
@@ -2630,38 +2804,57 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *r
                 * seqid mutating errors */
                 nfs4_increment_seqid(status, owner);
                 up(&owner->so_sema);
+                if (status == 0) {
+                        lsp->ls_flags |= NFS_LOCK_INITIALIZED;
+                        lsp->ls_seqid++;
+                }
         } else {
                 struct nfs_exist_lock el = {
                         .seqid = lsp->ls_seqid,
                 };
                 memcpy(&el.stateid, &lsp->ls_stateid, sizeof(el.stateid));
                 largs.u.exist_lock = &el;
-                largs.new_lock_owner = 0;
                 arg.u.lock = &largs;
                 status = rpc_call_sync(server->client, &msg, RPC_TASK_NOINTR);
+                /* increment seqid on success, and * seqid mutating errors*/
+                nfs4_increment_lock_seqid(status, lsp);
         }
-        /* increment seqid on success, and * seqid mutating errors*/
-        nfs4_increment_lock_seqid(status, lsp);
         /* save the returned stateid. */
-        if (status == 0) {
+        if (status == 0)
                 memcpy(&lsp->ls_stateid, &res.u.stateid, sizeof(nfs4_stateid));
-                lsp->ls_flags |= NFS_LOCK_INITIALIZED;
-                if (!reclaim)
-                        nfs4_notify_setlk(state, request, lsp);
-        } else if (status == -NFS4ERR_DENIED)
+        else if (status == -NFS4ERR_DENIED)
                 status = -EAGAIN;
-        nfs4_put_lock_state(lsp);
         return status;
 }
 
 static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
 {
-        return _nfs4_do_setlk(state, F_SETLK, request, 1);
+        struct nfs_server *server = NFS_SERVER(state->inode);
+        struct nfs4_exception exception = { };
+        int err;
+
+        do {
+                err = _nfs4_do_setlk(state, F_SETLK, request, 1);
+                if (err != -NFS4ERR_DELAY)
+                        break;
+                nfs4_handle_exception(server, err, &exception);
+        } while (exception.retry);
+        return err;
 }
 
 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
 {
-        return _nfs4_do_setlk(state, F_SETLK, request, 0);
+        struct nfs_server *server = NFS_SERVER(state->inode);
+        struct nfs4_exception exception = { };
+        int err;
+
+        do {
+                err = _nfs4_do_setlk(state, F_SETLK, request, 0);
+                if (err != -NFS4ERR_DELAY)
+                        break;
+                nfs4_handle_exception(server, err, &exception);
+        } while (exception.retry);
+        return err;
 }
 
 static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
@@ -2671,7 +2864,9 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock
 
         down_read(&clp->cl_sem);
         down(&state->lock_sema);
-        status = _nfs4_do_setlk(state, cmd, request, 0);
+        status = nfs4_set_lock_state(state, request);
+        if (status == 0)
+                status = _nfs4_do_setlk(state, cmd, request, 0);
         up(&state->lock_sema);
         if (status == 0) {
                 /* Note: we always want to sleep here! */
@@ -2729,10 +2924,53 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request)
                 if (signalled())
                         break;
         } while(status < 0);
-
         return status;
 }
 
+
+#define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"
+
+int nfs4_setxattr(struct dentry *dentry, const char *key, const void *buf,
+                size_t buflen, int flags)
+{
+        struct inode *inode = dentry->d_inode;
+
+        if (strcmp(key, XATTR_NAME_NFSV4_ACL) != 0)
+                return -EOPNOTSUPP;
+
+        if (!S_ISREG(inode->i_mode) &&
+            (!S_ISDIR(inode->i_mode) || inode->i_mode & S_ISVTX))
+                return -EPERM;
+
+        return nfs4_proc_set_acl(inode, buf, buflen);
+}
+
+/* The getxattr man page suggests returning -ENODATA for unknown attributes,
+ * and that's what we'll do for e.g. user attributes that haven't been set.
+ * But we'll follow ext2/ext3's lead by returning -EOPNOTSUPP for unsupported
+ * attributes in kernel-managed attribute namespaces. */
+ssize_t nfs4_getxattr(struct dentry *dentry, const char *key, void *buf,
+                size_t buflen)
+{
+        struct inode *inode = dentry->d_inode;
+
+        if (strcmp(key, XATTR_NAME_NFSV4_ACL) != 0)
+                return -EOPNOTSUPP;
+
+        return nfs4_proc_get_acl(inode, buf, buflen);
+}
+
+ssize_t nfs4_listxattr(struct dentry *dentry, char *buf, size_t buflen)
+{
+        size_t len = strlen(XATTR_NAME_NFSV4_ACL) + 1;
+
+        if (buf && buflen < len)
+                return -ERANGE;
+        if (buf)
+                memcpy(buf, XATTR_NAME_NFSV4_ACL, len);
+        return len;
+}
+
 struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops = {
         .recover_open   = nfs4_open_reclaim,
         .recover_lock   = nfs4_lock_reclaim,
@@ -2743,10 +2981,20 @@ struct nfs4_state_recovery_ops nfs4_network_partition_recovery_ops = {
         .recover_lock   = nfs4_lock_expired,
 };
 
+static struct inode_operations nfs4_file_inode_operations = {
+        .permission     = nfs_permission,
+        .getattr        = nfs_getattr,
+        .setattr        = nfs_setattr,
+        .getxattr       = nfs4_getxattr,
+        .setxattr       = nfs4_setxattr,
+        .listxattr      = nfs4_listxattr,
+};
+
 struct nfs_rpc_ops      nfs_v4_clientops = {
         .version        = 4,                    /* protocol version */
         .dentry_ops     = &nfs4_dentry_operations,
         .dir_inode_ops  = &nfs4_dir_inode_operations,
+        .file_inode_ops = &nfs4_file_inode_operations,
         .getroot        = nfs4_proc_get_root,
         .getattr        = nfs4_proc_getattr,
         .setattr        = nfs4_proc_setattr,
@@ -2777,6 +3025,7 @@ struct nfs_rpc_ops	nfs_v4_clientops = {
         .file_open      = nfs4_proc_file_open,
         .file_release   = nfs4_proc_file_release,
         .lock           = nfs4_proc_lock,
+        .clear_acl_cache = nfs4_zap_acl_attr,
 };
 
 /*
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index 667e06f1c647..a3001628ad32 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -53,6 +53,7 @@
 #include <linux/nfs.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_fs.h>
+#include "nfs4_fs.h"
 
 #define NFSDBG_FACILITY NFSDBG_PROC
 
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 231cebce3c87..afe587d82f1e 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -46,24 +46,18 @@
 #include <linux/workqueue.h>
 #include <linux/bitops.h>
 
+#include "nfs4_fs.h"
 #include "callback.h"
 #include "delegation.h"
 
 #define OPENOWNER_POOL_SIZE     8
 
-static DEFINE_SPINLOCK(state_spinlock);
-
-nfs4_stateid zero_stateid;
-
-#if 0
-nfs4_stateid one_stateid =
-        { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-#endif
+const nfs4_stateid zero_stateid;
 
+static DEFINE_SPINLOCK(state_spinlock);
 static LIST_HEAD(nfs4_clientid_list);
 
 static void nfs4_recover_state(void *);
-extern void nfs4_renew_state(void *);
 
 void
 init_nfsv4_state(struct nfs_server *server)
@@ -116,6 +110,7 @@ nfs4_alloc_client(struct in_addr *addr)
         INIT_LIST_HEAD(&clp->cl_superblocks);
         init_waitqueue_head(&clp->cl_waitq);
         rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS4 client");
+        clp->cl_rpcclient = ERR_PTR(-EINVAL);
         clp->cl_boot_time = CURRENT_TIME;
         clp->cl_state = 1 << NFS4CLNT_OK;
         return clp;
@@ -137,7 +132,7 @@ nfs4_free_client(struct nfs4_client *clp)
         if (clp->cl_cred)
                 put_rpccred(clp->cl_cred);
         nfs_idmap_delete(clp);
-        if (clp->cl_rpcclient)
+        if (!IS_ERR(clp->cl_rpcclient))
                 rpc_shutdown_client(clp->cl_rpcclient);
         kfree(clp);
         nfs_callback_down();
@@ -365,7 +360,7 @@ nfs4_alloc_open_state(void)
         atomic_set(&state->count, 1);
         INIT_LIST_HEAD(&state->lock_states);
         init_MUTEX(&state->lock_sema);
-        rwlock_init(&state->state_lock);
+        spin_lock_init(&state->state_lock);
         return state;
 }
 
@@ -547,16 +542,6 @@ __nfs4_find_lock_state(struct nfs4_state *state, fl_owner_t fl_owner)
         return NULL;
 }
 
-struct nfs4_lock_state *
-nfs4_find_lock_state(struct nfs4_state *state, fl_owner_t fl_owner)
-{
-        struct nfs4_lock_state *lsp;
-        read_lock(&state->state_lock);
-        lsp = __nfs4_find_lock_state(state, fl_owner);
-        read_unlock(&state->state_lock);
-        return lsp;
-}
-
 /*
  * Return a compatible lock_state. If no initialized lock_state structure
  * exists, return an uninitialized one.
@@ -573,14 +558,13 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f
                 return NULL;
         lsp->ls_flags = 0;
         lsp->ls_seqid = 0;      /* arbitrary */
-        lsp->ls_id = -1; 
         memset(lsp->ls_stateid.data, 0, sizeof(lsp->ls_stateid.data));
         atomic_set(&lsp->ls_count, 1);
         lsp->ls_owner = fl_owner;
-        INIT_LIST_HEAD(&lsp->ls_locks);
         spin_lock(&clp->cl_lock);
         lsp->ls_id = nfs4_alloc_lockowner_id(clp);
         spin_unlock(&clp->cl_lock);
+        INIT_LIST_HEAD(&lsp->ls_locks);
         return lsp;
 }
 
@@ -590,121 +574,112 @@ static struct nfs4_lock_state *nfs4_alloc_lock_state(struct nfs4_state *state, f
  *
  * The caller must be holding state->lock_sema and clp->cl_sem
  */
-struct nfs4_lock_state *nfs4_get_lock_state(struct nfs4_state *state, fl_owner_t owner)
+static struct nfs4_lock_state *nfs4_get_lock_state(struct nfs4_state *state, fl_owner_t owner)
 {
-        struct nfs4_lock_state * lsp;
+        struct nfs4_lock_state *lsp, *new = NULL;
         
-        lsp = nfs4_find_lock_state(state, owner);
-        if (lsp == NULL)
-                lsp = nfs4_alloc_lock_state(state, owner);
+        for(;;) {
+                spin_lock(&state->state_lock);
+                lsp = __nfs4_find_lock_state(state, owner);
+                if (lsp != NULL)
+                        break;
+                if (new != NULL) {
+                        new->ls_state = state;
+                        list_add(&new->ls_locks, &state->lock_states);
+                        set_bit(LK_STATE_IN_USE, &state->flags);
+                        lsp = new;
+                        new = NULL;
+                        break;
+                }
+                spin_unlock(&state->state_lock);
+                new = nfs4_alloc_lock_state(state, owner);
+                if (new == NULL)
+                        return NULL;
+        }
+        spin_unlock(&state->state_lock);
+        kfree(new);
         return lsp;
 }
 
 /*
- * Byte-range lock aware utility to initialize the stateid of read/write
- * requests.
+ * Release reference to lock_state, and free it if we see that
+ * it is no longer in use
  */
-void
-nfs4_copy_stateid(nfs4_stateid *dst, struct nfs4_state *state, fl_owner_t fl_owner)
+static void nfs4_put_lock_state(struct nfs4_lock_state *lsp)
 {
-        if (test_bit(LK_STATE_IN_USE, &state->flags)) {
-                struct nfs4_lock_state *lsp;
+        struct nfs4_state *state;
 
-                lsp = nfs4_find_lock_state(state, fl_owner);
-                if (lsp) {
-                        memcpy(dst, &lsp->ls_stateid, sizeof(*dst));
-                        nfs4_put_lock_state(lsp);
-                        return;
-                }
-        }
-        memcpy(dst, &state->stateid, sizeof(*dst));
+        if (lsp == NULL)
+                return;
+        state = lsp->ls_state;
+        if (!atomic_dec_and_lock(&lsp->ls_count, &state->state_lock))
+                return;
+        list_del(&lsp->ls_locks);
+        if (list_empty(&state->lock_states))
+                clear_bit(LK_STATE_IN_USE, &state->flags);
+        spin_unlock(&state->state_lock);
+        kfree(lsp);
 }
 
-/*
-* Called with state->lock_sema and clp->cl_sem held.
-*/
-void nfs4_increment_lock_seqid(int status, struct nfs4_lock_state *lsp)
+static void nfs4_fl_copy_lock(struct file_lock *dst, struct file_lock *src)
 {
-        if (status == NFS_OK || seqid_mutating_err(-status))
-                lsp->ls_seqid++;
-}
+        struct nfs4_lock_state *lsp = src->fl_u.nfs4_fl.owner;
 
-/* 
-* Check to see if the request lock (type FL_UNLK) effects the fl lock.
-*
-* fl and request must have the same posix owner
-*
-* return: 
-* 0 -> fl not effected by request
-* 1 -> fl consumed by request
-*/
+        dst->fl_u.nfs4_fl.owner = lsp;
+        atomic_inc(&lsp->ls_count);
+}
 
-static int
-nfs4_check_unlock(struct file_lock *fl, struct file_lock *request)
+static void nfs4_fl_release_lock(struct file_lock *fl)
 {
-        if (fl->fl_start >= request->fl_start && fl->fl_end <= request->fl_end)
-                return 1;
-        return 0;
+        nfs4_put_lock_state(fl->fl_u.nfs4_fl.owner);
 }
 
-/*
- * Post an initialized lock_state on the state->lock_states list.
- */
-void nfs4_notify_setlk(struct nfs4_state *state, struct file_lock *request, struct nfs4_lock_state *lsp)
+static struct file_lock_operations nfs4_fl_lock_ops = {
+        .fl_copy_lock = nfs4_fl_copy_lock,
+        .fl_release_private = nfs4_fl_release_lock,
+};
+
+int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl)
 {
-        if (!list_empty(&lsp->ls_locks))
-                return;
-        atomic_inc(&lsp->ls_count);
-        write_lock(&state->state_lock);
-        list_add(&lsp->ls_locks, &state->lock_states);
-        set_bit(LK_STATE_IN_USE, &state->flags);
-        write_unlock(&state->state_lock);
+        struct nfs4_lock_state *lsp;
+
+        if (fl->fl_ops != NULL)
+                return 0;
+        lsp = nfs4_get_lock_state(state, fl->fl_owner);
+        if (lsp == NULL)
+                return -ENOMEM;
+        fl->fl_u.nfs4_fl.owner = lsp;
+        fl->fl_ops = &nfs4_fl_lock_ops;
+        return 0;
 }
 
-/* 
- * to decide to 'reap' lock state:
- * 1) search i_flock for file_locks with fl.lock_state = to ls.
- * 2) determine if unlock will consume found lock. 
- *      if so, reap
- *
- *      else, don't reap.
- *
+/*
+ * Byte-range lock aware utility to initialize the stateid of read/write
+ * requests.
  */
-void
-nfs4_notify_unlck(struct nfs4_state *state, struct file_lock *request, struct nfs4_lock_state *lsp)
+void nfs4_copy_stateid(nfs4_stateid *dst, struct nfs4_state *state, fl_owner_t fl_owner)
 {
-        struct inode *inode = state->inode;
-        struct file_lock *fl;
+        struct nfs4_lock_state *lsp;
 
-        for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
-                if (!(fl->fl_flags & FL_POSIX))
-                        continue;
-                if (fl->fl_owner != lsp->ls_owner)
-                        continue;
-                /* Exit if we find at least one lock which is not consumed */
-                if (nfs4_check_unlock(fl,request) == 0)
-                        return;
-        }
+        memcpy(dst, &state->stateid, sizeof(*dst));
+        if (test_bit(LK_STATE_IN_USE, &state->flags) == 0)
+                return;
 
-        write_lock(&state->state_lock);
-        list_del_init(&lsp->ls_locks);
-        if (list_empty(&state->lock_states))
-                clear_bit(LK_STATE_IN_USE, &state->flags);
-        write_unlock(&state->state_lock);
+        spin_lock(&state->state_lock);
+        lsp = __nfs4_find_lock_state(state, fl_owner);
+        if (lsp != NULL && (lsp->ls_flags & NFS_LOCK_INITIALIZED) != 0)
+                memcpy(dst, &lsp->ls_stateid, sizeof(*dst));
+        spin_unlock(&state->state_lock);
         nfs4_put_lock_state(lsp);
 }
 
 /*
- * Release reference to lock_state, and free it if we see that
- * it is no longer in use
- */
-void
-nfs4_put_lock_state(struct nfs4_lock_state *lsp)
+* Called with state->lock_sema and clp->cl_sem held.
+*/
+void nfs4_increment_lock_seqid(int status, struct nfs4_lock_state *lsp)
 {
-        if (!atomic_dec_and_test(&lsp->ls_count))
-                return;
-        BUG_ON (!list_empty(&lsp->ls_locks));
-        kfree(lsp);
+        if (status == NFS_OK || seqid_mutating_err(-status))
+                lsp->ls_seqid++;
 }
 
 /*
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 5f4de05763c9..6c564ef9489e 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -51,6 +51,7 @@
 #include <linux/nfs4.h>
 #include <linux/nfs_fs.h>
 #include <linux/nfs_idmap.h>
+#include "nfs4_fs.h"
 
 #define NFSDBG_FACILITY         NFSDBG_XDR
 
@@ -82,12 +83,16 @@ static int nfs_stat_to_errno(int);
 #define encode_getfh_maxsz      (op_encode_hdr_maxsz)
 #define decode_getfh_maxsz      (op_decode_hdr_maxsz + 1 + \
                                 ((3+NFS4_FHSIZE) >> 2))
-#define encode_getattr_maxsz    (op_encode_hdr_maxsz + 3)
+#define nfs4_fattr_bitmap_maxsz 3
+#define encode_getattr_maxsz    (op_encode_hdr_maxsz + nfs4_fattr_bitmap_maxsz)
 #define nfs4_name_maxsz         (1 + ((3 + NFS4_MAXNAMLEN) >> 2))
 #define nfs4_path_maxsz         (1 + ((3 + NFS4_MAXPATHLEN) >> 2))
-#define nfs4_fattr_bitmap_maxsz (36 + 2 * nfs4_name_maxsz)
-#define decode_getattr_maxsz    (op_decode_hdr_maxsz + 3 + \
-                                nfs4_fattr_bitmap_maxsz)
+/* This is based on getfattr, which uses the most attributes: */
+#define nfs4_fattr_value_maxsz  (1 + (1 + 2 + 2 + 4 + 2 + 1 + 1 + 2 + 2 + \
+                                3 + 3 + 3 + 2 * nfs4_name_maxsz))
+#define nfs4_fattr_maxsz        (nfs4_fattr_bitmap_maxsz + \
+                                nfs4_fattr_value_maxsz)
+#define decode_getattr_maxsz    (op_decode_hdr_maxsz + nfs4_fattr_maxsz)
 #define encode_savefh_maxsz     (op_encode_hdr_maxsz)
 #define decode_savefh_maxsz     (op_decode_hdr_maxsz)
 #define encode_fsinfo_maxsz     (op_encode_hdr_maxsz + 2)
@@ -122,11 +127,11 @@ static int nfs_stat_to_errno(int);
 #define encode_symlink_maxsz    (op_encode_hdr_maxsz + \
                                 1 + nfs4_name_maxsz + \
                                 nfs4_path_maxsz + \
-                                nfs4_fattr_bitmap_maxsz)
+                                nfs4_fattr_maxsz)
 #define decode_symlink_maxsz    (op_decode_hdr_maxsz + 8)
 #define encode_create_maxsz     (op_encode_hdr_maxsz + \
                                 2 + nfs4_name_maxsz + \
-                                nfs4_fattr_bitmap_maxsz)
+                                nfs4_fattr_maxsz)
 #define decode_create_maxsz     (op_decode_hdr_maxsz + 8)
 #define encode_delegreturn_maxsz (op_encode_hdr_maxsz + 4)
 #define decode_delegreturn_maxsz (op_decode_hdr_maxsz)
@@ -205,7 +210,7 @@ static int nfs_stat_to_errno(int);
 #define NFS4_enc_setattr_sz     (compound_encode_hdr_maxsz + \
                                 encode_putfh_maxsz + \
                                 op_encode_hdr_maxsz + 4 + \
-                                nfs4_fattr_bitmap_maxsz + \
+                                nfs4_fattr_maxsz + \
                                 encode_getattr_maxsz)
 #define NFS4_dec_setattr_sz     (compound_decode_hdr_maxsz + \
                                 decode_putfh_maxsz + \
@@ -360,6 +365,20 @@ static int nfs_stat_to_errno(int);
                                 encode_delegreturn_maxsz)
 #define NFS4_dec_delegreturn_sz (compound_decode_hdr_maxsz + \
                                 decode_delegreturn_maxsz)
+#define NFS4_enc_getacl_sz      (compound_encode_hdr_maxsz + \
+                                encode_putfh_maxsz + \
+                                encode_getattr_maxsz)
+#define NFS4_dec_getacl_sz      (compound_decode_hdr_maxsz + \
+                                decode_putfh_maxsz + \
+                                op_decode_hdr_maxsz + \
+                                nfs4_fattr_bitmap_maxsz + 1)
+#define NFS4_enc_setacl_sz      (compound_encode_hdr_maxsz + \
+                                encode_putfh_maxsz + \
+                                op_encode_hdr_maxsz + 4 + \
+                                nfs4_fattr_bitmap_maxsz + 1)
+#define NFS4_dec_setacl_sz      (compound_decode_hdr_maxsz + \
+                                decode_putfh_maxsz + \
+                                op_decode_hdr_maxsz + nfs4_fattr_bitmap_maxsz)
 
 static struct {
         unsigned int    mode;
@@ -459,7 +478,7 @@ static int encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const s
          * In the worst-case, this would be
          *   12(bitmap) + 4(attrlen) + 8(size) + 4(mode) + 4(atime) + 4(mtime)
          *          = 36 bytes, plus any contribution from variable-length fields
-         *            such as owner/group/acl's.
+         *            such as owner/group.
          */
         len = 16;
 
@@ -660,8 +679,6 @@ static int encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1
 
 static int encode_getfattr(struct xdr_stream *xdr, const u32* bitmask)
 {
-        extern u32 nfs4_fattr_bitmap[];
-
         return encode_getattr_two(xdr,
                         bitmask[0] & nfs4_fattr_bitmap[0],
                         bitmask[1] & nfs4_fattr_bitmap[1]);
@@ -669,8 +686,6 @@ static int encode_getfattr(struct xdr_stream *xdr, const u32* bitmask)
 
 static int encode_fsinfo(struct xdr_stream *xdr, const u32* bitmask)
 {
-        extern u32 nfs4_fsinfo_bitmap[];
-
         return encode_getattr_two(xdr, bitmask[0] & nfs4_fsinfo_bitmap[0],
                         bitmask[1] & nfs4_fsinfo_bitmap[1]);
 }
@@ -969,7 +984,6 @@ static int encode_putrootfh(struct xdr_stream *xdr)
 
 static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx)
 {
-        extern nfs4_stateid zero_stateid;
         nfs4_stateid stateid;
         uint32_t *p;
 
@@ -1000,6 +1014,10 @@ static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args)
 static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg *readdir, struct rpc_rqst *req)
 {
         struct rpc_auth *auth = req->rq_task->tk_auth;
+        uint32_t attrs[2] = {
+                FATTR4_WORD0_RDATTR_ERROR|FATTR4_WORD0_FILEID,
+                FATTR4_WORD1_MOUNTED_ON_FILEID,
+        };
         int replen;
         uint32_t *p;
 
@@ -1010,13 +1028,20 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg
         WRITE32(readdir->count >> 1);  /* We're not doing readdirplus */
         WRITE32(readdir->count);
         WRITE32(2);
-        if (readdir->bitmask[1] & FATTR4_WORD1_MOUNTED_ON_FILEID) {
-                WRITE32(0);
-                WRITE32(FATTR4_WORD1_MOUNTED_ON_FILEID);
-        } else {
-                WRITE32(FATTR4_WORD0_FILEID);
-                WRITE32(0);
-        }
+        /* Switch to mounted_on_fileid if the server supports it */
+        if (readdir->bitmask[1] & FATTR4_WORD1_MOUNTED_ON_FILEID)
+                attrs[0] &= ~FATTR4_WORD0_FILEID;
+        else
+                attrs[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;
+        WRITE32(attrs[0] & readdir->bitmask[0]);
+        WRITE32(attrs[1] & readdir->bitmask[1]);
+        dprintk("%s: cookie = %Lu, verifier = 0x%x%x, bitmap = 0x%x%x\n",
+                        __FUNCTION__,
+                        (unsigned long long)readdir->cookie,
+                        ((u32 *)readdir->verifier.data)[0],
+                        ((u32 *)readdir->verifier.data)[1],
+                        attrs[0] & readdir->bitmask[0],
+                        attrs[1] & readdir->bitmask[1]);
 
         /* set up reply kvec
          *    toplevel_status + taglen + rescount + OP_PUTFH + status
@@ -1025,6 +1050,9 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg
         replen = (RPC_REPHDRSIZE + auth->au_rslack + 9) << 2;
         xdr_inline_pages(&req->rq_rcv_buf, replen, readdir->pages,
                          readdir->pgbase, readdir->count);
+        dprintk("%s: inlined page args = (%u, %p, %u, %u)\n",
+                        __FUNCTION__, replen, readdir->pages,
+                        readdir->pgbase, readdir->count);
 
         return 0;
 }
@@ -1089,6 +1117,25 @@ static int encode_renew(struct xdr_stream *xdr, const struct nfs4_client *client
 }
 
 static int
+encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg)
+{
+        uint32_t *p;
+
+        RESERVE_SPACE(4+sizeof(zero_stateid.data));
+        WRITE32(OP_SETATTR);
+        WRITEMEM(zero_stateid.data, sizeof(zero_stateid.data));
+        RESERVE_SPACE(2*4);
+        WRITE32(1);
+        WRITE32(FATTR4_WORD0_ACL);
+        if (arg->acl_len % 4)
+                return -EINVAL;
+        RESERVE_SPACE(4);
+        WRITE32(arg->acl_len);
+        xdr_write_pages(xdr, arg->acl_pages, arg->acl_pgbase, arg->acl_len);
+        return 0;
+}
+
+static int
 encode_savefh(struct xdr_stream *xdr)
 {
         uint32_t *p;
@@ -1632,6 +1679,34 @@ out:
 }
 
 /*
+ * Encode a GETACL request
+ */
+static int
+nfs4_xdr_enc_getacl(struct rpc_rqst *req, uint32_t *p,
+                struct nfs_getaclargs *args)
+{
+        struct xdr_stream xdr;
+        struct rpc_auth *auth = req->rq_task->tk_auth;
+        struct compound_hdr hdr = {
+                .nops   = 2,
+        };
+        int replen, status;
+
+        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+        encode_compound_hdr(&xdr, &hdr);
+        status = encode_putfh(&xdr, args->fh);
+        if (status)
+                goto out;
+        status = encode_getattr_two(&xdr, FATTR4_WORD0_ACL, 0);
+        /* set up reply buffer: */
+        replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS4_dec_getacl_sz) << 2;
+        xdr_inline_pages(&req->rq_rcv_buf, replen,
+                args->acl_pages, args->acl_pgbase, args->acl_len);
+out:
+        return status;
+}
+
+/*
  * Encode a WRITE request
  */
 static int nfs4_xdr_enc_write(struct rpc_rqst *req, uint32_t *p, struct nfs_writeargs *args)
@@ -1697,7 +1772,6 @@ static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs
  */
 static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct nfs4_pathconf_arg *args)
 {
-        extern u32 nfs4_pathconf_bitmap[2];
         struct xdr_stream xdr;
         struct compound_hdr hdr = {
                 .nops = 2,
@@ -1718,7 +1792,6 @@ static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct
  */
 static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, const struct nfs4_statfs_arg *args)
 {
-        extern u32 nfs4_statfs_bitmap[];
         struct xdr_stream xdr;
         struct compound_hdr hdr = {
                 .nops = 2,
@@ -3003,6 +3076,11 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n
                 return status;
         READ_BUF(8);
         COPYMEM(readdir->verifier.data, 8);
+        dprintk("%s: verifier = 0x%x%x\n",
+                        __FUNCTION__,
+                        ((u32 *)readdir->verifier.data)[0],
+                        ((u32 *)readdir->verifier.data)[1]);
+
 
         hdrlen = (char *) p - (char *) iov->iov_base;
         recvd = rcvbuf->len - hdrlen;
@@ -3017,12 +3095,14 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n
         for (nr = 0; *p++; nr++) {
                 if (p + 3 > end)
                         goto short_pkt;
+                dprintk("cookie = %Lu, ", *((unsigned long long *)p));
                 p += 2;                 /* cookie */
                 len = ntohl(*p++);      /* filename length */
                 if (len > NFS4_MAXNAMLEN) {
                         printk(KERN_WARNING "NFS: giant filename in readdir (len 0x%x)\n", len);
                         goto err_unmap;
                 }
+                dprintk("filename = %*s\n", len, (char *)p);
                 p += XDR_QUADLEN(len);
                 if (p + 1 > end)
                         goto short_pkt;
@@ -3042,6 +3122,7 @@ out:
         kunmap_atomic(kaddr, KM_USER0);
         return 0;
 short_pkt:
+        dprintk("%s: short packet at entry %d\n", __FUNCTION__, nr);
         entry[0] = entry[1] = 0;
         /* truncate listing ? */
         if (!nr) {
@@ -3127,6 +3208,47 @@ static int decode_renew(struct xdr_stream *xdr)
         return decode_op_hdr(xdr, OP_RENEW);
 }
 
+static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
+                size_t *acl_len)
+{
+        uint32_t *savep;
+        uint32_t attrlen,
+                 bitmap[2] = {0};
+        struct kvec *iov = req->rq_rcv_buf.head;
+        int status;
+
+        *acl_len = 0;
+        if ((status = decode_op_hdr(xdr, OP_GETATTR)) != 0)
+                goto out;
+        if ((status = decode_attr_bitmap(xdr, bitmap)) != 0)
+                goto out;
+        if ((status = decode_attr_length(xdr, &attrlen, &savep)) != 0)
+                goto out;
+
+        if (unlikely(bitmap[0] & (FATTR4_WORD0_ACL - 1U)))
+                return -EIO;
+        if (likely(bitmap[0] & FATTR4_WORD0_ACL)) {
+                int hdrlen, recvd;
+
+                /* We ignore &savep and don't do consistency checks on
+                 * the attr length.  Let userspace figure it out.... */
+                hdrlen = (u8 *)xdr->p - (u8 *)iov->iov_base;
+                recvd = req->rq_rcv_buf.len - hdrlen;
+                if (attrlen > recvd) {
+                        printk(KERN_WARNING "NFS: server cheating in getattr"
+                                        " acl reply: attrlen %u > recvd %u\n",
+                                        attrlen, recvd);
+                        return -EINVAL;
+                }
+                if (attrlen <= *acl_len)
+                        xdr_read_pages(xdr, attrlen);
+                *acl_len = attrlen;
+        }
+
+out:
+        return status;
+}
+
 static int
 decode_savefh(struct xdr_stream *xdr)
 {
@@ -3418,6 +3540,71 @@ out:
 
 }
 
+/*
+ * Encode an SETACL request
+ */
+static int
+nfs4_xdr_enc_setacl(struct rpc_rqst *req, uint32_t *p, struct nfs_setaclargs *args)
+{
+        struct xdr_stream xdr;
+        struct compound_hdr hdr = {
+                .nops   = 2,
+        };
+        int status;
+
+        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+        encode_compound_hdr(&xdr, &hdr);
+        status = encode_putfh(&xdr, args->fh);
+        if (status)
+                goto out;
+        status = encode_setacl(&xdr, args);
+out:
+        return status;
+}
+/*
+ * Decode SETACL response
+ */
+static int
+nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, uint32_t *p, void *res)
+{
+        struct xdr_stream xdr;
+        struct compound_hdr hdr;
+        int status;
+
+        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+        status = decode_compound_hdr(&xdr, &hdr);
+        if (status)
+                goto out;
+        status = decode_putfh(&xdr);
+        if (status)
+                goto out;
+        status = decode_setattr(&xdr, res);
+out:
+        return status;
+}
+
+/*
+ * Decode GETACL response
+ */
+static int
+nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, uint32_t *p, size_t *acl_len)
+{
+        struct xdr_stream xdr;
+        struct compound_hdr hdr;
+        int status;
+
+        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+        status = decode_compound_hdr(&xdr, &hdr);
+        if (status)
+                goto out;
+        status = decode_putfh(&xdr);
+        if (status)
+                goto out;
+        status = decode_getacl(&xdr, rqstp, acl_len);
+
+out:
+        return status;
+}
 
 /*
  * Decode CLOSE response
@@ -3895,6 +4082,12 @@ uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus)
         }
         len = XDR_QUADLEN(ntohl(*p++)); /* attribute buffer length */
         if (len > 0) {
+                if (bitmap[0] & FATTR4_WORD0_RDATTR_ERROR) {
+                        bitmap[0] &= ~FATTR4_WORD0_RDATTR_ERROR;
+                        /* Ignore the return value of rdattr_error for now */
+                        p++;
+                        len--;
+                }
                 if (bitmap[0] == 0 && bitmap[1] == FATTR4_WORD1_MOUNTED_ON_FILEID)
                         xdr_decode_hyper(p, &entry->ino);
                 else if (bitmap[0] == FATTR4_WORD0_FILEID)
@@ -3934,6 +4127,8 @@ static struct {
         { NFS4ERR_DQUOT,        EDQUOT          },
         { NFS4ERR_STALE,        ESTALE          },
         { NFS4ERR_BADHANDLE,    EBADHANDLE      },
+        { NFS4ERR_BADOWNER,     EINVAL          },
+        { NFS4ERR_BADNAME,      EINVAL          },
         { NFS4ERR_BAD_COOKIE,   EBADCOOKIE      },
         { NFS4ERR_NOTSUPP,      ENOTSUPP        },
         { NFS4ERR_TOOSMALL,     ETOOSMALL       },
@@ -4019,6 +4214,8 @@ struct rpc_procinfo	nfs4_procedures[] = {
   PROC(READDIR,         enc_readdir,    dec_readdir),
   PROC(SERVER_CAPS,     enc_server_caps, dec_server_caps),
   PROC(DELEGRETURN,     enc_delegreturn, dec_delegreturn),
+  PROC(GETACL,          enc_getacl,     dec_getacl),
+  PROC(SETACL,          enc_setacl,     dec_setacl),
 };
 
 struct rpc_version              nfs_version4 = {
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index fd5bc596fe8a..1b272a135a31 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -124,6 +124,7 @@ enum {
         Opt_soft, Opt_hard, Opt_intr,
         Opt_nointr, Opt_posix, Opt_noposix, Opt_cto, Opt_nocto, Opt_ac, 
         Opt_noac, Opt_lock, Opt_nolock, Opt_v2, Opt_v3, Opt_udp, Opt_tcp,
+        Opt_acl, Opt_noacl,
         /* Error token */
         Opt_err
 };
@@ -158,6 +159,8 @@ static match_table_t __initdata tokens = {
         {Opt_udp, "udp"},
         {Opt_tcp, "proto=tcp"},
         {Opt_tcp, "tcp"},
+        {Opt_acl, "acl"},
+        {Opt_noacl, "noacl"},
         {Opt_err, NULL}
         
 };
@@ -266,6 +269,12 @@ static int __init root_nfs_parse(char *name, char *buf)
                         case Opt_tcp:
                                 nfs_data.flags |= NFS_MOUNT_TCP;
                                 break;
+                        case Opt_acl:
+                                nfs_data.flags &= ~NFS_MOUNT_NOACL;
+                                break;
+                        case Opt_noacl:
+                                nfs_data.flags |= NFS_MOUNT_NOACL;
+                                break;
                         default : 
                                 return 0;
                 }
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 4f1ba723848d..d53857b148e2 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -107,11 +107,38 @@ void nfs_unlock_request(struct nfs_page *req)
         smp_mb__before_clear_bit();
         clear_bit(PG_BUSY, &req->wb_flags);
         smp_mb__after_clear_bit();
-        wake_up_all(&req->wb_context->waitq);
+        wake_up_bit(&req->wb_flags, PG_BUSY);
         nfs_release_request(req);
 }
 
 /**
+ * nfs_set_page_writeback_locked - Lock a request for writeback
+ * @req:
+ */
+int nfs_set_page_writeback_locked(struct nfs_page *req)
+{
+        struct nfs_inode *nfsi = NFS_I(req->wb_context->dentry->d_inode);
+
+        if (!nfs_lock_request(req))
+                return 0;
+        radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_WRITEBACK);
+        return 1;
+}
+
+/**
+ * nfs_clear_page_writeback - Unlock request and wake up sleepers
+ */
+void nfs_clear_page_writeback(struct nfs_page *req)
+{
+        struct nfs_inode *nfsi = NFS_I(req->wb_context->dentry->d_inode);
+
+        spin_lock(&nfsi->req_lock);
+        radix_tree_tag_clear(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_WRITEBACK);
+        spin_unlock(&nfsi->req_lock);
+        nfs_unlock_request(req);
+}
+
+/**
  * nfs_clear_request - Free up all resources allocated to the request
  * @req:
  *
@@ -150,34 +177,15 @@ nfs_release_request(struct nfs_page *req)
         nfs_page_free(req);
 }
 
-/**
- * nfs_list_add_request - Insert a request into a sorted list
- * @req: request
- * @head: head of list into which to insert the request.
- *
- * Note that the wb_list is sorted by page index in order to facilitate
- * coalescing of requests.
- * We use an insertion sort that is optimized for the case of appended
- * writes.
- */
-void
-nfs_list_add_request(struct nfs_page *req, struct list_head *head)
+static int nfs_wait_bit_interruptible(void *word)
 {
-        struct list_head *pos;
+        int ret = 0;
 
-#ifdef NFS_PARANOIA
-        if (!list_empty(&req->wb_list)) {
-                printk(KERN_ERR "NFS: Add to list failed!\n");
-                BUG();
-        }
-#endif
-        list_for_each_prev(pos, head) {
-                struct nfs_page *p = nfs_list_entry(pos);
-                if (p->wb_index < req->wb_index)
-                        break;
-        }
-        list_add(&req->wb_list, pos);
-        req->wb_list_head = head;
+        if (signal_pending(current))
+                ret = -ERESTARTSYS;
+        else
+                schedule();
+        return ret;
 }
 
 /**
@@ -190,12 +198,22 @@ nfs_list_add_request(struct nfs_page *req, struct list_head *head)
 int
 nfs_wait_on_request(struct nfs_page *req)
 {
-        struct inode    *inode = req->wb_context->dentry->d_inode;
-        struct rpc_clnt *clnt = NFS_CLIENT(inode);
-
-        if (!NFS_WBACK_BUSY(req))
-                return 0;
-        return nfs_wait_event(clnt, req->wb_context->waitq, !NFS_WBACK_BUSY(req));
+        struct rpc_clnt *clnt = NFS_CLIENT(req->wb_context->dentry->d_inode);
+        sigset_t oldmask;
+        int ret = 0;
+
+        if (!test_bit(PG_BUSY, &req->wb_flags))
+                goto out;
+        /*
+         * Note: the call to rpc_clnt_sigmask() suffices to ensure that we
+         *       are not interrupted if intr flag is not set
+         */
+        rpc_clnt_sigmask(clnt, &oldmask);
+        ret = out_of_line_wait_on_bit(&req->wb_flags, PG_BUSY,
+                        nfs_wait_bit_interruptible, TASK_INTERRUPTIBLE);
+        rpc_clnt_sigunmask(clnt, &oldmask);
+out:
+        return ret;
 }
 
 /**
@@ -243,6 +261,62 @@ nfs_coalesce_requests(struct list_head *head, struct list_head *dst,
         return npages;
 }
 
+#define NFS_SCAN_MAXENTRIES 16
+/**
+ * nfs_scan_lock_dirty - Scan the radix tree for dirty requests
+ * @nfsi: NFS inode
+ * @dst: Destination list
+ * @idx_start: lower bound of page->index to scan
+ * @npages: idx_start + npages sets the upper bound to scan.
+ *
+ * Moves elements from one of the inode request lists.
+ * If the number of requests is set to 0, the entire address_space
+ * starting at index idx_start, is scanned.
+ * The requests are *not* checked to ensure that they form a contiguous set.
+ * You must be holding the inode's req_lock when calling this function
+ */
+int
+nfs_scan_lock_dirty(struct nfs_inode *nfsi, struct list_head *dst,
+              unsigned long idx_start, unsigned int npages)
+{
+        struct nfs_page *pgvec[NFS_SCAN_MAXENTRIES];
+        struct nfs_page *req;
+        unsigned long idx_end;
+        int found, i;
+        int res;
+
+        res = 0;
+        if (npages == 0)
+                idx_end = ~0;
+        else
+                idx_end = idx_start + npages - 1;
+
+        for (;;) {
+                found = radix_tree_gang_lookup_tag(&nfsi->nfs_page_tree,
+                                (void **)&pgvec[0], idx_start, NFS_SCAN_MAXENTRIES,
+                                NFS_PAGE_TAG_DIRTY);
+                if (found <= 0)
+                        break;
+                for (i = 0; i < found; i++) {
+                        req = pgvec[i];
+                        if (req->wb_index > idx_end)
+                                goto out;
+
+                        idx_start = req->wb_index + 1;
+
+                        if (nfs_set_page_writeback_locked(req)) {
+                                radix_tree_tag_clear(&nfsi->nfs_page_tree,
+                                                req->wb_index, NFS_PAGE_TAG_DIRTY);
+                                nfs_list_remove_request(req);
+                                nfs_list_add_request(req, dst);
+                                res++;
+                        }
+                }
+        }
+out:
+        return res;
+}
+
 /**
  * nfs_scan_list - Scan a list for matching requests
  * @head: One of the NFS inode request lists
@@ -280,7 +354,7 @@ nfs_scan_list(struct list_head *head, struct list_head *dst,
                 if (req->wb_index > idx_end)
                         break;
 
-                if (!nfs_lock_request(req))
+                if (!nfs_set_page_writeback_locked(req))
                         continue;
                 nfs_list_remove_request(req);
                 nfs_list_add_request(req, dst);
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index d31b4d6e5a5e..cedf636bcf3c 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -622,6 +622,7 @@ struct nfs_rpc_ops	nfs_v2_clientops = {
         .version        = 2,                   /* protocol version */
         .dentry_ops     = &nfs_dentry_operations,
         .dir_inode_ops  = &nfs_dir_inode_operations,
+        .file_inode_ops = &nfs_file_inode_operations,
         .getroot        = nfs_proc_get_root,
         .getattr        = nfs_proc_getattr,
         .setattr        = nfs_proc_setattr,
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index a0042fb58634..6f866b8aa2d5 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -173,7 +173,6 @@ static int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
         if (len < PAGE_CACHE_SIZE)
                 memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);
 
-        nfs_lock_request(new);
         nfs_list_add_request(new, &one_request);
         nfs_pagein_one(&one_request, inode);
         return 0;
@@ -185,7 +184,6 @@ static void nfs_readpage_release(struct nfs_page *req)
 
         nfs_clear_request(req);
         nfs_release_request(req);
-        nfs_unlock_request(req);
 
         dprintk("NFS: read done (%s/%Ld %d@%Ld)\n",
                         req->wb_context->dentry->d_inode->i_sb->s_id,
@@ -553,7 +551,6 @@ readpage_async_filler(void *data, struct page *page)
         }
         if (len < PAGE_CACHE_SIZE)
                 memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);
-        nfs_lock_request(new);
         nfs_list_add_request(new, desc->head);
         return 0;
 }
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 6f7a4af3bc46..5130eda231d7 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -220,7 +220,7 @@ static int nfs_writepage_sync(struct nfs_open_context *ctx, struct inode *inode,
                 ClearPageError(page);
 
 io_error:
-        nfs_end_data_update_defer(inode);
+        nfs_end_data_update(inode);
         nfs_writedata_free(wdata);
         return written ? written : result;
 }
@@ -352,7 +352,7 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
                 if (err < 0)
                         goto out;
         }
-        err = nfs_commit_inode(inode, 0, 0, wb_priority(wbc));
+        err = nfs_commit_inode(inode, wb_priority(wbc));
         if (err > 0) {
                 wbc->nr_to_write -= err;
                 err = 0;
@@ -401,7 +401,7 @@ static void nfs_inode_remove_request(struct nfs_page *req)
         nfsi->npages--;
         if (!nfsi->npages) {
                 spin_unlock(&nfsi->req_lock);
-                nfs_end_data_update_defer(inode);
+                nfs_end_data_update(inode);
                 iput(inode);
         } else
                 spin_unlock(&nfsi->req_lock);
@@ -446,6 +446,8 @@ nfs_mark_request_dirty(struct nfs_page *req)
         struct nfs_inode *nfsi = NFS_I(inode);
 
         spin_lock(&nfsi->req_lock);
+        radix_tree_tag_set(&nfsi->nfs_page_tree,
+                        req->wb_index, NFS_PAGE_TAG_DIRTY);
         nfs_list_add_request(req, &nfsi->dirty);
         nfsi->ndirty++;
         spin_unlock(&nfsi->req_lock);
@@ -503,13 +505,12 @@ nfs_wait_on_requests(struct inode *inode, unsigned long idx_start, unsigned int
 
         spin_lock(&nfsi->req_lock);
         next = idx_start;
-        while (radix_tree_gang_lookup(&nfsi->nfs_page_tree, (void **)&req, next, 1)) {
+        while (radix_tree_gang_lookup_tag(&nfsi->nfs_page_tree, (void **)&req, next, 1, NFS_PAGE_TAG_WRITEBACK)) {
                 if (req->wb_index > idx_end)
                         break;
 
                 next = req->wb_index + 1;
-                if (!NFS_WBACK_BUSY(req))
-                        continue;
+                BUG_ON(!NFS_WBACK_BUSY(req));
 
                 atomic_inc(&req->wb_count);
                 spin_unlock(&nfsi->req_lock);
@@ -538,12 +539,15 @@ static int
 nfs_scan_dirty(struct inode *inode, struct list_head *dst, unsigned long idx_start, unsigned int npages)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
-        int     res;
-        res = nfs_scan_list(&nfsi->dirty, dst, idx_start, npages);
-        nfsi->ndirty -= res;
-        sub_page_state(nr_dirty,res);
-        if ((nfsi->ndirty == 0) != list_empty(&nfsi->dirty))
-                printk(KERN_ERR "NFS: desynchronized value of nfs_i.ndirty.\n");
+        int res = 0;
+
+        if (nfsi->ndirty != 0) {
+                res = nfs_scan_lock_dirty(nfsi, dst, idx_start, npages);
+                nfsi->ndirty -= res;
+                sub_page_state(nr_dirty,res);
+                if ((nfsi->ndirty == 0) != list_empty(&nfsi->dirty))
+                        printk(KERN_ERR "NFS: desynchronized value of nfs_i.ndirty.\n");
+        }
         return res;
 }
 
@@ -562,11 +566,14 @@ static int
 nfs_scan_commit(struct inode *inode, struct list_head *dst, unsigned long idx_start, unsigned int npages)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
-        int     res;
-        res = nfs_scan_list(&nfsi->commit, dst, idx_start, npages);
-        nfsi->ncommit -= res;
-        if ((nfsi->ncommit == 0) != list_empty(&nfsi->commit))
-                printk(KERN_ERR "NFS: desynchronized value of nfs_i.ncommit.\n");
+        int res = 0;
+
+        if (nfsi->ncommit != 0) {
+                res = nfs_scan_list(&nfsi->commit, dst, idx_start, npages);
+                nfsi->ncommit -= res;
+                if ((nfsi->ncommit == 0) != list_empty(&nfsi->commit))
+                        printk(KERN_ERR "NFS: desynchronized value of nfs_i.ncommit.\n");
+        }
         return res;
 }
 #endif
@@ -750,7 +757,7 @@ int nfs_updatepage(struct file *file, struct page *page,
          * is entirely in cache, it may be more efficient to avoid
          * fragmenting write requests.
          */
-        if (PageUptodate(page) && inode->i_flock == NULL) {
+        if (PageUptodate(page) && inode->i_flock == NULL && !(file->f_mode & O_SYNC)) {
                 loff_t end_offs = i_size_read(inode) - 1;
                 unsigned long end_index = end_offs >> PAGE_CACHE_SHIFT;
 
@@ -821,7 +828,7 @@ out:
 #else
         nfs_inode_remove_request(req);
 #endif
-        nfs_unlock_request(req);
+        nfs_clear_page_writeback(req);
 }
 
 static inline int flush_task_priority(int how)
@@ -952,7 +959,7 @@ out_bad:
                 nfs_writedata_free(data);
         }
         nfs_mark_request_dirty(req);
-        nfs_unlock_request(req);
+        nfs_clear_page_writeback(req);
         return -ENOMEM;
 }
 
@@ -1002,7 +1009,7 @@ static int nfs_flush_one(struct list_head *head, struct inode *inode, int how)
                 struct nfs_page *req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
                 nfs_mark_request_dirty(req);
-                nfs_unlock_request(req);
+                nfs_clear_page_writeback(req);
         }
         return -ENOMEM;
 }
@@ -1029,7 +1036,7 @@ nfs_flush_list(struct list_head *head, int wpages, int how)
                 req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
                 nfs_mark_request_dirty(req);
-                nfs_unlock_request(req);
+                nfs_clear_page_writeback(req);
         }
         return error;
 }
@@ -1121,7 +1128,7 @@ static void nfs_writeback_done_full(struct nfs_write_data *data, int status)
                 nfs_inode_remove_request(req);
 #endif
         next:
-                nfs_unlock_request(req);
+                nfs_clear_page_writeback(req);
         }
 }
 
@@ -1210,36 +1217,24 @@ static void nfs_commit_rpcsetup(struct list_head *head,
                 struct nfs_write_data *data, int how)
 {
         struct rpc_task         *task = &data->task;
-        struct nfs_page         *first, *last;
+        struct nfs_page         *first;
         struct inode            *inode;
-        loff_t                  start, end, len;
 
         /* Set up the RPC argument and reply structs
          * NB: take care not to mess about with data->commit et al. */
 
         list_splice_init(head, &data->pages);
         first = nfs_list_entry(data->pages.next);
-        last = nfs_list_entry(data->pages.prev);
         inode = first->wb_context->dentry->d_inode;
 
-        /*
-         * Determine the offset range of requests in the COMMIT call.
-         * We rely on the fact that data->pages is an ordered list...
-         */
-        start = req_offset(first);
-        end = req_offset(last) + last->wb_bytes;
-        len = end - start;
-        /* If 'len' is not a 32-bit quantity, pass '0' in the COMMIT call */
-        if (end >= i_size_read(inode) || len < 0 || len > (~((u32)0) >> 1))
-                len = 0;
-
         data->inode       = inode;
         data->cred        = first->wb_context->cred;
 
         data->args.fh     = NFS_FH(data->inode);
-        data->args.offset = start;
-        data->args.count  = len;
-        data->res.count   = len;
+        /* Note: we always request a commit of the entire inode */
+        data->args.offset = 0;
+        data->args.count  = 0;
+        data->res.count   = 0;
         data->res.fattr   = &data->fattr;
         data->res.verf    = &data->verf;
         
@@ -1278,7 +1273,7 @@ nfs_commit_list(struct list_head *head, int how)
                 req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
                 nfs_mark_request_commit(req);
-                nfs_unlock_request(req);
+                nfs_clear_page_writeback(req);
         }
         return -ENOMEM;
 }
@@ -1324,7 +1319,7 @@ nfs_commit_done(struct rpc_task *task)
                 dprintk(" mismatch\n");
                 nfs_mark_request_dirty(req);
         next:
-                nfs_unlock_request(req);
+                nfs_clear_page_writeback(req);
                 res++;
         }
         sub_page_state(nr_unstable,res);
@@ -1342,16 +1337,23 @@ static int nfs_flush_inode(struct inode *inode, unsigned long idx_start,
         spin_lock(&nfsi->req_lock);
         res = nfs_scan_dirty(inode, &head, idx_start, npages);
         spin_unlock(&nfsi->req_lock);
-        if (res)
-                error = nfs_flush_list(&head, NFS_SERVER(inode)->wpages, how);
+        if (res) {
+                struct nfs_server *server = NFS_SERVER(inode);
+
+                /* For single writes, FLUSH_STABLE is more efficient */
+                if (res == nfsi->npages && nfsi->npages <= server->wpages) {
+                        if (res > 1 || nfs_list_entry(head.next)->wb_bytes <= server->wsize)
+                                how |= FLUSH_STABLE;
+                }
+                error = nfs_flush_list(&head, server->wpages, how);
+        }
         if (error < 0)
                 return error;
         return res;
 }
 
 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
-int nfs_commit_inode(struct inode *inode, unsigned long idx_start,
-                    unsigned int npages, int how)
+int nfs_commit_inode(struct inode *inode, int how)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
         LIST_HEAD(head);
@@ -1359,15 +1361,13 @@ int nfs_commit_inode(struct inode *inode, unsigned long idx_start,
                                 error = 0;
 
         spin_lock(&nfsi->req_lock);
-        res = nfs_scan_commit(inode, &head, idx_start, npages);
+        res = nfs_scan_commit(inode, &head, 0, 0);
+        spin_unlock(&nfsi->req_lock);
         if (res) {
-                res += nfs_scan_commit(inode, &head, 0, 0);
-                spin_unlock(&nfsi->req_lock);
                 error = nfs_commit_list(&head, how);
-        } else
-                spin_unlock(&nfsi->req_lock);
-        if (error < 0)
-                return error;
+                if (error < 0)
+                        return error;
+        }
         return res;
 }
 #endif
@@ -1389,7 +1389,7 @@ int nfs_sync_inode(struct inode *inode, unsigned long idx_start,
                         error = nfs_flush_inode(inode, idx_start, npages, how);
 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
                 if (error == 0)
-                        error = nfs_commit_inode(inode, idx_start, npages, how);
+                        error = nfs_commit_inode(inode, how);
 #endif
         } while (error > 0);
         return error;
diff --git a/fs/nfs_common/Makefile b/fs/nfs_common/Makefile
new file mode 100644
index 000000000000..f689ed82af3a
--- /dev/null
+++ b/fs/nfs_common/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for Linux filesystem routines that are shared by client and server.
+#
+
+obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o
+
+nfs_acl-objs := nfsacl.o
diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c
new file mode 100644
index 000000000000..18c58c32e326
--- /dev/null
+++ b/fs/nfs_common/nfsacl.c
@@ -0,0 +1,257 @@
+/*
+ * fs/nfs_common/nfsacl.c
+ *
+ *  Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
+ */
+
+/*
+ * The Solaris nfsacl protocol represents some ACLs slightly differently
+ * than POSIX 1003.1e draft 17 does (and we do):
+ *
+ *  - Minimal ACLs always have an ACL_MASK entry, so they have
+ *    four instead of three entries.
+ *  - The ACL_MASK entry in such minimal ACLs always has the same
+ *    permissions as the ACL_GROUP_OBJ entry. (In extended ACLs
+ *    the ACL_MASK and ACL_GROUP_OBJ entries may differ.)
+ *  - The identifier fields of the ACL_USER_OBJ and ACL_GROUP_OBJ
+ *    entries contain the identifiers of the owner and owning group.
+ *    (In POSIX ACLs we always set them to ACL_UNDEFINED_ID).
+ *  - ACL entries in the kernel are kept sorted in ascending order
+ *    of (e_tag, e_id). Solaris ACLs are unsorted.
+ */
+
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/sunrpc/xdr.h>
+#include <linux/nfsacl.h>
+#include <linux/nfs3.h>
+#include <linux/sort.h>
+
+MODULE_LICENSE("GPL");
+
+EXPORT_SYMBOL(nfsacl_encode);
+EXPORT_SYMBOL(nfsacl_decode);
+
+struct nfsacl_encode_desc {
+        struct xdr_array2_desc desc;
+        unsigned int count;
+        struct posix_acl *acl;
+        int typeflag;
+        uid_t uid;
+        gid_t gid;
+};
+
+static int
+xdr_nfsace_encode(struct xdr_array2_desc *desc, void *elem)
+{
+        struct nfsacl_encode_desc *nfsacl_desc =
+                (struct nfsacl_encode_desc *) desc;
+        u32 *p = (u32 *) elem;
+
+        if (nfsacl_desc->count < nfsacl_desc->acl->a_count) {
+                struct posix_acl_entry *entry =
+                        &nfsacl_desc->acl->a_entries[nfsacl_desc->count++];
+
+                *p++ = htonl(entry->e_tag | nfsacl_desc->typeflag);
+                switch(entry->e_tag) {
+                        case ACL_USER_OBJ:
+                                *p++ = htonl(nfsacl_desc->uid);
+                                break;
+                        case ACL_GROUP_OBJ:
+                                *p++ = htonl(nfsacl_desc->gid);
+                                break;
+                        case ACL_USER:
+                        case ACL_GROUP:
+                                *p++ = htonl(entry->e_id);
+                                break;
+                        default:  /* Solaris depends on that! */
+                                *p++ = 0;
+                                break;
+                }
+                *p++ = htonl(entry->e_perm & S_IRWXO);
+        } else {
+                const struct posix_acl_entry *pa, *pe;
+                int group_obj_perm = ACL_READ|ACL_WRITE|ACL_EXECUTE;
+
+                FOREACH_ACL_ENTRY(pa, nfsacl_desc->acl, pe) {
+                        if (pa->e_tag == ACL_GROUP_OBJ) {
+                                group_obj_perm = pa->e_perm & S_IRWXO;
+                                break;
+                        }
+                }
+                /* fake up ACL_MASK entry */
+                *p++ = htonl(ACL_MASK | nfsacl_desc->typeflag);
+                *p++ = htonl(0);
+                *p++ = htonl(group_obj_perm);
+        }
+
+        return 0;
+}
+
+unsigned int
+nfsacl_encode(struct xdr_buf *buf, unsigned int base, struct inode *inode,
+              struct posix_acl *acl, int encode_entries, int typeflag)
+{
+        int entries = (acl && acl->a_count) ? max_t(int, acl->a_count, 4) : 0;
+        struct nfsacl_encode_desc nfsacl_desc = {
+                .desc = {
+                        .elem_size = 12,
+                        .array_len = encode_entries ? entries : 0,
+                        .xcode = xdr_nfsace_encode,
+                },
+                .acl = acl,
+                .typeflag = typeflag,
+                .uid = inode->i_uid,
+                .gid = inode->i_gid,
+        };
+        int err;
+
+        if (entries > NFS_ACL_MAX_ENTRIES ||
+            xdr_encode_word(buf, base, entries))
+                return -EINVAL;
+        err = xdr_encode_array2(buf, base + 4, &nfsacl_desc.desc);
+        if (!err)
+                err = 8 + nfsacl_desc.desc.elem_size *
+                          nfsacl_desc.desc.array_len;
+        return err;
+}
+
+struct nfsacl_decode_desc {
+        struct xdr_array2_desc desc;
+        unsigned int count;
+        struct posix_acl *acl;
+};
+
+static int
+xdr_nfsace_decode(struct xdr_array2_desc *desc, void *elem)
+{
+        struct nfsacl_decode_desc *nfsacl_desc =
+                (struct nfsacl_decode_desc *) desc;
+        u32 *p = (u32 *) elem;
+        struct posix_acl_entry *entry;
+
+        if (!nfsacl_desc->acl) {
+                if (desc->array_len > NFS_ACL_MAX_ENTRIES)
+                        return -EINVAL;
+                nfsacl_desc->acl = posix_acl_alloc(desc->array_len, GFP_KERNEL);
+                if (!nfsacl_desc->acl)
+                        return -ENOMEM;
+                nfsacl_desc->count = 0;
+        }
+
+        entry = &nfsacl_desc->acl->a_entries[nfsacl_desc->count++];
+        entry->e_tag = ntohl(*p++) & ~NFS_ACL_DEFAULT;
+        entry->e_id = ntohl(*p++);
+        entry->e_perm = ntohl(*p++);
+
+        switch(entry->e_tag) {
+                case ACL_USER_OBJ:
+                case ACL_USER:
+                case ACL_GROUP_OBJ:
+                case ACL_GROUP:
+                case ACL_OTHER:
+                        if (entry->e_perm & ~S_IRWXO)
+                                return -EINVAL;
+                        break;
+                case ACL_MASK:
+                        /* Solaris sometimes sets additonal bits in the mask */
+                        entry->e_perm &= S_IRWXO;
+                        break;
+                default:
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int
+cmp_acl_entry(const void *x, const void *y)
+{
+        const struct posix_acl_entry *a = x, *b = y;
+
+        if (a->e_tag != b->e_tag)
+                return a->e_tag - b->e_tag;
+        else if (a->e_id > b->e_id)
+                return 1;
+        else if (a->e_id < b->e_id)
+                return -1;
+        else
+                return 0;
+}
+
+/*
+ * Convert from a Solaris ACL to a POSIX 1003.1e draft 17 ACL.
+ */
+static int
+posix_acl_from_nfsacl(struct posix_acl *acl)
+{
+        struct posix_acl_entry *pa, *pe,
+               *group_obj = NULL, *mask = NULL;
+
+        if (!acl)
+                return 0;
+
+        sort(acl->a_entries, acl->a_count, sizeof(struct posix_acl_entry),
+             cmp_acl_entry, NULL);
+
+        /* Clear undefined identifier fields and find the ACL_GROUP_OBJ
+           and ACL_MASK entries. */
+        FOREACH_ACL_ENTRY(pa, acl, pe) {
+                switch(pa->e_tag) {
+                        case ACL_USER_OBJ:
+                                pa->e_id = ACL_UNDEFINED_ID;
+                                break;
+                        case ACL_GROUP_OBJ:
+                                pa->e_id = ACL_UNDEFINED_ID;
+                                group_obj = pa;
+                                break;
+                        case ACL_MASK:
+                                mask = pa;
+                                /* fall through */
+                        case ACL_OTHER:
+                                pa->e_id = ACL_UNDEFINED_ID;
+                                break;
+                }
+        }
+        if (acl->a_count == 4 && group_obj && mask &&
+            mask->e_perm == group_obj->e_perm) {
+                /* remove bogus ACL_MASK entry */
+                memmove(mask, mask+1, (3 - (mask - acl->a_entries)) *
+                                      sizeof(struct posix_acl_entry));
+                acl->a_count = 3;
+        }
+        return 0;
+}
+
+unsigned int
+nfsacl_decode(struct xdr_buf *buf, unsigned int base, unsigned int *aclcnt,
+              struct posix_acl **pacl)
+{
+        struct nfsacl_decode_desc nfsacl_desc = {
+                .desc = {
+                        .elem_size = 12,
+                        .xcode = pacl ? xdr_nfsace_decode : NULL,
+                },
+        };
+        u32 entries;
+        int err;
+
+        if (xdr_decode_word(buf, base, &entries) ||
+            entries > NFS_ACL_MAX_ENTRIES)
+                return -EINVAL;
+        err = xdr_decode_array2(buf, base + 4, &nfsacl_desc.desc);
+        if (err)
+                return err;
+        if (pacl) {
+                if (entries != nfsacl_desc.desc.array_len ||
+                    posix_acl_from_nfsacl(nfsacl_desc.acl) != 0) {
+                        posix_acl_release(nfsacl_desc.acl);
+                        return -EINVAL;
+                }
+                *pacl = nfsacl_desc.acl;
+        }
+        if (aclcnt)
+                *aclcnt = entries;
+        return 8 + nfsacl_desc.desc.elem_size *
+                   nfsacl_desc.desc.array_len;
+}
diff --git a/fs/nfsd/Makefile b/fs/nfsd/Makefile
index b8680a247f8b..9f043f44c92f 100644
--- a/fs/nfsd/Makefile
+++ b/fs/nfsd/Makefile
@@ -6,7 +6,9 @@ obj-$(CONFIG_NFSD)	+= nfsd.o
 
 nfsd-y                  := nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
                            export.o auth.o lockd.o nfscache.o nfsxdr.o stats.o
+nfsd-$(CONFIG_NFSD_V2_ACL) += nfs2acl.o
 nfsd-$(CONFIG_NFSD_V3)  += nfs3proc.o nfs3xdr.o
+nfsd-$(CONFIG_NFSD_V3_ACL) += nfs3acl.o
 nfsd-$(CONFIG_NFSD_V4)  += nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o \
                            nfs4acl.o nfs4callback.o
 nfsd-objs               := $(nfsd-y)
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
new file mode 100644
index 000000000000..7cbf0682b2f0
--- /dev/null
+++ b/fs/nfsd/nfs2acl.c
@@ -0,0 +1,336 @@
+/*
+ * linux/fs/nfsd/nfsacl.c
+ *
+ * Process version 2 NFSACL requests.
+ *
+ * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
+ */
+
+#include <linux/sunrpc/svc.h>
+#include <linux/nfs.h>
+#include <linux/nfsd/nfsd.h>
+#include <linux/nfsd/cache.h>
+#include <linux/nfsd/xdr.h>
+#include <linux/nfsd/xdr3.h>
+#include <linux/posix_acl.h>
+#include <linux/nfsacl.h>
+
+#define NFSDDBG_FACILITY                NFSDDBG_PROC
+#define RETURN_STATUS(st)       { resp->status = (st); return (st); }
+
+/*
+ * NULL call.
+ */
+static int
+nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)
+{
+        return nfs_ok;
+}
+
+/*
+ * Get the Access and/or Default ACL of a file.
+ */
+static int nfsacld_proc_getacl(struct svc_rqst * rqstp,
+                struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)
+{
+        svc_fh *fh;
+        struct posix_acl *acl;
+        int nfserr = 0;
+
+        dprintk("nfsd: GETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
+
+        fh = fh_copy(&resp->fh, &argp->fh);
+        if ((nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP)))
+                RETURN_STATUS(nfserr_inval);
+
+        if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
+                RETURN_STATUS(nfserr_inval);
+        resp->mask = argp->mask;
+
+        if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {
+                acl = nfsd_get_posix_acl(fh, ACL_TYPE_ACCESS);
+                if (IS_ERR(acl)) {
+                        int err = PTR_ERR(acl);
+
+                        if (err == -ENODATA || err == -EOPNOTSUPP)
+                                acl = NULL;
+                        else {
+                                nfserr = nfserrno(err);
+                                goto fail;
+                        }
+                }
+                if (acl == NULL) {
+                        /* Solaris returns the inode's minimum ACL. */
+
+                        struct inode *inode = fh->fh_dentry->d_inode;
+                        acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
+                }
+                resp->acl_access = acl;
+        }
+        if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) {
+                /* Check how Solaris handles requests for the Default ACL
+                   of a non-directory! */
+
+                acl = nfsd_get_posix_acl(fh, ACL_TYPE_DEFAULT);
+                if (IS_ERR(acl)) {
+                        int err = PTR_ERR(acl);
+
+                        if (err == -ENODATA || err == -EOPNOTSUPP)
+                                acl = NULL;
+                        else {
+                                nfserr = nfserrno(err);
+                                goto fail;
+                        }
+                }
+                resp->acl_default = acl;
+        }
+
+        /* resp->acl_{access,default} are released in nfssvc_release_getacl. */
+        RETURN_STATUS(0);
+
+fail:
+        posix_acl_release(resp->acl_access);
+        posix_acl_release(resp->acl_default);
+        RETURN_STATUS(nfserr);
+}
+
+/*
+ * Set the Access and/or Default ACL of a file.
+ */
+static int nfsacld_proc_setacl(struct svc_rqst * rqstp,
+                struct nfsd3_setaclargs *argp,
+                struct nfsd_attrstat *resp)
+{
+        svc_fh *fh;
+        int nfserr = 0;
+
+        dprintk("nfsd: SETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
+
+        fh = fh_copy(&resp->fh, &argp->fh);
+        nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP);
+
+        if (!nfserr) {
+                nfserr = nfserrno( nfsd_set_posix_acl(
+                        fh, ACL_TYPE_ACCESS, argp->acl_access) );
+        }
+        if (!nfserr) {
+                nfserr = nfserrno( nfsd_set_posix_acl(
+                        fh, ACL_TYPE_DEFAULT, argp->acl_default) );
+        }
+
+        /* argp->acl_{access,default} may have been allocated in
+           nfssvc_decode_setaclargs. */
+        posix_acl_release(argp->acl_access);
+        posix_acl_release(argp->acl_default);
+        return nfserr;
+}
+
+/*
+ * Check file attributes
+ */
+static int nfsacld_proc_getattr(struct svc_rqst * rqstp,
+                struct nfsd_fhandle *argp, struct nfsd_attrstat *resp)
+{
+        dprintk("nfsd: GETATTR  %s\n", SVCFH_fmt(&argp->fh));
+
+        fh_copy(&resp->fh, &argp->fh);
+        return fh_verify(rqstp, &resp->fh, 0, MAY_NOP);
+}
+
+/*
+ * Check file access
+ */
+static int nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp,
+                struct nfsd3_accessres *resp)
+{
+        int nfserr;
+
+        dprintk("nfsd: ACCESS(2acl)   %s 0x%x\n",
+                        SVCFH_fmt(&argp->fh),
+                        argp->access);
+
+        fh_copy(&resp->fh, &argp->fh);
+        resp->access = argp->access;
+        nfserr = nfsd_access(rqstp, &resp->fh, &resp->access, NULL);
+        return nfserr;
+}
+
+/*
+ * XDR decode functions
+ */
+static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_getaclargs *argp)
+{
+        if (!(p = nfs2svc_decode_fh(p, &argp->fh)))
+                return 0;
+        argp->mask = ntohl(*p); p++;
+
+        return xdr_argsize_check(rqstp, p);
+}
+
+
+static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_setaclargs *argp)
+{
+        struct kvec *head = rqstp->rq_arg.head;
+        unsigned int base;
+        int n;
+
+        if (!(p = nfs2svc_decode_fh(p, &argp->fh)))
+                return 0;
+        argp->mask = ntohl(*p++);
+        if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT) ||
+            !xdr_argsize_check(rqstp, p))
+                return 0;
+
+        base = (char *)p - (char *)head->iov_base;
+        n = nfsacl_decode(&rqstp->rq_arg, base, NULL,
+                          (argp->mask & NFS_ACL) ?
+                          &argp->acl_access : NULL);
+        if (n > 0)
+                n = nfsacl_decode(&rqstp->rq_arg, base + n, NULL,
+                                  (argp->mask & NFS_DFACL) ?
+                                  &argp->acl_default : NULL);
+        return (n > 0);
+}
+
+static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd_fhandle *argp)
+{
+        if (!(p = nfs2svc_decode_fh(p, &argp->fh)))
+                return 0;
+        return xdr_argsize_check(rqstp, p);
+}
+
+static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_accessargs *argp)
+{
+        if (!(p = nfs2svc_decode_fh(p, &argp->fh)))
+                return 0;
+        argp->access = ntohl(*p++);
+
+        return xdr_argsize_check(rqstp, p);
+}
+
+/*
+ * XDR encode functions
+ */
+
+/* GETACL */
+static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_getaclres *resp)
+{
+        struct dentry *dentry = resp->fh.fh_dentry;
+        struct inode *inode = dentry->d_inode;
+        int w = nfsacl_size(
+                (resp->mask & NFS_ACL)   ? resp->acl_access  : NULL,
+                (resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
+        struct kvec *head = rqstp->rq_res.head;
+        unsigned int base;
+        int n;
+
+        if (dentry == NULL || dentry->d_inode == NULL)
+                return 0;
+        inode = dentry->d_inode;
+
+        p = nfs2svc_encode_fattr(rqstp, p, &resp->fh);
+        *p++ = htonl(resp->mask);
+        if (!xdr_ressize_check(rqstp, p))
+                return 0;
+        base = (char *)p - (char *)head->iov_base;
+
+        rqstp->rq_res.page_len = w;
+        while (w > 0) {
+                if (!svc_take_res_page(rqstp))
+                        return 0;
+                w -= PAGE_SIZE;
+        }
+
+        n = nfsacl_encode(&rqstp->rq_res, base, inode,
+                          resp->acl_access,
+                          resp->mask & NFS_ACL, 0);
+        if (n > 0)
+                n = nfsacl_encode(&rqstp->rq_res, base + n, inode,
+                                  resp->acl_default,
+                                  resp->mask & NFS_DFACL,
+                                  NFS_ACL_DEFAULT);
+        if (n <= 0)
+                return 0;
+        return 1;
+}
+
+static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd_attrstat *resp)
+{
+        p = nfs2svc_encode_fattr(rqstp, p, &resp->fh);
+        return xdr_ressize_check(rqstp, p);
+}
+
+/* ACCESS */
+static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_accessres *resp)
+{
+        p = nfs2svc_encode_fattr(rqstp, p, &resp->fh);
+        *p++ = htonl(resp->access);
+        return xdr_ressize_check(rqstp, p);
+}
+
+/*
+ * XDR release functions
+ */
+static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_getaclres *resp)
+{
+        fh_put(&resp->fh);
+        posix_acl_release(resp->acl_access);
+        posix_acl_release(resp->acl_default);
+        return 1;
+}
+
+static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd_fhandle *resp)
+{
+        fh_put(&resp->fh);
+        return 1;
+}
+
+#define nfsaclsvc_decode_voidargs       NULL
+#define nfsaclsvc_encode_voidres        NULL
+#define nfsaclsvc_release_void          NULL
+#define nfsd3_fhandleargs       nfsd_fhandle
+#define nfsd3_attrstatres       nfsd_attrstat
+#define nfsd3_voidres           nfsd3_voidargs
+struct nfsd3_voidargs { int dummy; };
+
+#define PROC(name, argt, rest, relt, cache, respsize)   \
+ { (svc_procfunc) nfsacld_proc_##name,          \
+   (kxdrproc_t) nfsaclsvc_decode_##argt##args,  \
+   (kxdrproc_t) nfsaclsvc_encode_##rest##res,   \
+   (kxdrproc_t) nfsaclsvc_release_##relt,               \
+   sizeof(struct nfsd3_##argt##args),           \
+   sizeof(struct nfsd3_##rest##res),            \
+   0,                                           \
+   cache,                                       \
+   respsize,                                    \
+ }
+
+#define ST 1            /* status*/
+#define AT 21           /* attributes */
+#define pAT (1+AT)      /* post attributes - conditional */
+#define ACL (1+NFS_ACL_MAX_ENTRIES*3)  /* Access Control List */
+
+static struct svc_procedure             nfsd_acl_procedures2[] = {
+  PROC(null,    void,           void,           void,     RC_NOCACHE, ST),
+  PROC(getacl,  getacl,         getacl,         getacl,   RC_NOCACHE, ST+1+2*(1+ACL)),
+  PROC(setacl,  setacl,         attrstat,       fhandle,  RC_NOCACHE, ST+AT),
+  PROC(getattr, fhandle,        attrstat,       fhandle,  RC_NOCACHE, ST+AT),
+  PROC(access,  access,         access,         fhandle,  RC_NOCACHE, ST+AT+1),
+};
+
+struct svc_version      nfsd_acl_version2 = {
+                .vs_vers        = 2,
+                .vs_nproc       = 5,
+                .vs_proc        = nfsd_acl_procedures2,
+                .vs_dispatch    = nfsd_dispatch,
+                .vs_xdrsize     = NFS3_SVC_XDRSIZE,
+};
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
new file mode 100644
index 000000000000..64ba40572fea
--- /dev/null
+++ b/fs/nfsd/nfs3acl.c
@@ -0,0 +1,267 @@
+/*
+ * linux/fs/nfsd/nfs3acl.c
+ *
+ * Process version 3 NFSACL requests.
+ *
+ * Copyright (C) 2002-2003 Andreas Gruenbacher <agruen@suse.de>
+ */
+
+#include <linux/sunrpc/svc.h>
+#include <linux/nfs3.h>
+#include <linux/nfsd/nfsd.h>
+#include <linux/nfsd/cache.h>
+#include <linux/nfsd/xdr3.h>
+#include <linux/posix_acl.h>
+#include <linux/nfsacl.h>
+
+#define RETURN_STATUS(st)       { resp->status = (st); return (st); }
+
+/*
+ * NULL call.
+ */
+static int
+nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)
+{
+        return nfs_ok;
+}
+
+/*
+ * Get the Access and/or Default ACL of a file.
+ */
+static int nfsd3_proc_getacl(struct svc_rqst * rqstp,
+                struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)
+{
+        svc_fh *fh;
+        struct posix_acl *acl;
+        int nfserr = 0;
+
+        fh = fh_copy(&resp->fh, &argp->fh);
+        if ((nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP)))
+                RETURN_STATUS(nfserr_inval);
+
+        if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
+                RETURN_STATUS(nfserr_inval);
+        resp->mask = argp->mask;
+
+        if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {
+                acl = nfsd_get_posix_acl(fh, ACL_TYPE_ACCESS);
+                if (IS_ERR(acl)) {
+                        int err = PTR_ERR(acl);
+
+                        if (err == -ENODATA || err == -EOPNOTSUPP)
+                                acl = NULL;
+                        else {
+                                nfserr = nfserrno(err);
+                                goto fail;
+                        }
+                }
+                if (acl == NULL) {
+                        /* Solaris returns the inode's minimum ACL. */
+
+                        struct inode *inode = fh->fh_dentry->d_inode;
+                        acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
+                }
+                resp->acl_access = acl;
+        }
+        if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) {
+                /* Check how Solaris handles requests for the Default ACL
+                   of a non-directory! */
+
+                acl = nfsd_get_posix_acl(fh, ACL_TYPE_DEFAULT);
+                if (IS_ERR(acl)) {
+                        int err = PTR_ERR(acl);
+
+                        if (err == -ENODATA || err == -EOPNOTSUPP)
+                                acl = NULL;
+                        else {
+                                nfserr = nfserrno(err);
+                                goto fail;
+                        }
+                }
+                resp->acl_default = acl;
+        }
+
+        /* resp->acl_{access,default} are released in nfs3svc_release_getacl. */
+        RETURN_STATUS(0);
+
+fail:
+        posix_acl_release(resp->acl_access);
+        posix_acl_release(resp->acl_default);
+        RETURN_STATUS(nfserr);
+}
+
+/*
+ * Set the Access and/or Default ACL of a file.
+ */
+static int nfsd3_proc_setacl(struct svc_rqst * rqstp,
+                struct nfsd3_setaclargs *argp,
+                struct nfsd3_attrstat *resp)
+{
+        svc_fh *fh;
+        int nfserr = 0;
+
+        fh = fh_copy(&resp->fh, &argp->fh);
+        nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP);
+
+        if (!nfserr) {
+                nfserr = nfserrno( nfsd_set_posix_acl(
+                        fh, ACL_TYPE_ACCESS, argp->acl_access) );
+        }
+        if (!nfserr) {
+                nfserr = nfserrno( nfsd_set_posix_acl(
+                        fh, ACL_TYPE_DEFAULT, argp->acl_default) );
+        }
+
+        /* argp->acl_{access,default} may have been allocated in
+           nfs3svc_decode_setaclargs. */
+        posix_acl_release(argp->acl_access);
+        posix_acl_release(argp->acl_default);
+        RETURN_STATUS(nfserr);
+}
+
+/*
+ * XDR decode functions
+ */
+static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_getaclargs *args)
+{
+        if (!(p = nfs3svc_decode_fh(p, &args->fh)))
+                return 0;
+        args->mask = ntohl(*p); p++;
+
+        return xdr_argsize_check(rqstp, p);
+}
+
+
+static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_setaclargs *args)
+{
+        struct kvec *head = rqstp->rq_arg.head;
+        unsigned int base;
+        int n;
+
+        if (!(p = nfs3svc_decode_fh(p, &args->fh)))
+                return 0;
+        args->mask = ntohl(*p++);
+        if (args->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT) ||
+            !xdr_argsize_check(rqstp, p))
+                return 0;
+
+        base = (char *)p - (char *)head->iov_base;
+        n = nfsacl_decode(&rqstp->rq_arg, base, NULL,
+                          (args->mask & NFS_ACL) ?
+                          &args->acl_access : NULL);
+        if (n > 0)
+                n = nfsacl_decode(&rqstp->rq_arg, base + n, NULL,
+                                  (args->mask & NFS_DFACL) ?
+                                  &args->acl_default : NULL);
+        return (n > 0);
+}
+
+/*
+ * XDR encode functions
+ */
+
+/* GETACL */
+static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_getaclres *resp)
+{
+        struct dentry *dentry = resp->fh.fh_dentry;
+
+        p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh);
+        if (resp->status == 0 && dentry && dentry->d_inode) {
+                struct inode *inode = dentry->d_inode;
+                int w = nfsacl_size(
+                        (resp->mask & NFS_ACL)   ? resp->acl_access  : NULL,
+                        (resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
+                struct kvec *head = rqstp->rq_res.head;
+                unsigned int base;
+                int n;
+
+                *p++ = htonl(resp->mask);
+                if (!xdr_ressize_check(rqstp, p))
+                        return 0;
+                base = (char *)p - (char *)head->iov_base;
+
+                rqstp->rq_res.page_len = w;
+                while (w > 0) {
+                        if (!svc_take_res_page(rqstp))
+                                return 0;
+                        w -= PAGE_SIZE;
+                }
+
+                n = nfsacl_encode(&rqstp->rq_res, base, inode,
+                                  resp->acl_access,
+                                  resp->mask & NFS_ACL, 0);
+                if (n > 0)
+                        n = nfsacl_encode(&rqstp->rq_res, base + n, inode,
+                                          resp->acl_default,
+                                          resp->mask & NFS_DFACL,
+                                          NFS_ACL_DEFAULT);
+                if (n <= 0)
+                        return 0;
+        } else
+                if (!xdr_ressize_check(rqstp, p))
+                        return 0;
+
+        return 1;
+}
+
+/* SETACL */
+static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_attrstat *resp)
+{
+        p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh);
+
+        return xdr_ressize_check(rqstp, p);
+}
+
+/*
+ * XDR release functions
+ */
+static int nfs3svc_release_getacl(struct svc_rqst *rqstp, u32 *p,
+                struct nfsd3_getaclres *resp)
+{
+        fh_put(&resp->fh);
+        posix_acl_release(resp->acl_access);
+        posix_acl_release(resp->acl_default);
+        return 1;
+}
+
+#define nfs3svc_decode_voidargs         NULL
+#define nfs3svc_release_void            NULL
+#define nfsd3_setaclres                 nfsd3_attrstat
+#define nfsd3_voidres                   nfsd3_voidargs
+struct nfsd3_voidargs { int dummy; };
+
+#define PROC(name, argt, rest, relt, cache, respsize)   \
+ { (svc_procfunc) nfsd3_proc_##name,            \
+   (kxdrproc_t) nfs3svc_decode_##argt##args,    \
+   (kxdrproc_t) nfs3svc_encode_##rest##res,     \
+   (kxdrproc_t) nfs3svc_release_##relt,         \
+   sizeof(struct nfsd3_##argt##args),           \
+   sizeof(struct nfsd3_##rest##res),            \
+   0,                                           \
+   cache,                                       \
+   respsize,                                    \
+ }
+
+#define ST 1            /* status*/
+#define AT 21           /* attributes */
+#define pAT (1+AT)      /* post attributes - conditional */
+#define ACL (1+NFS_ACL_MAX_ENTRIES*3)  /* Access Control List */
+
+static struct svc_procedure             nfsd_acl_procedures3[] = {
+  PROC(null,    void,           void,           void,     RC_NOCACHE, ST),
+  PROC(getacl,  getacl,         getacl,         getacl,   RC_NOCACHE, ST+1+2*(1+ACL)),
+  PROC(setacl,  setacl,         setacl,         fhandle,  RC_NOCACHE, ST+pAT),
+};
+
+struct svc_version      nfsd_acl_version3 = {
+                .vs_vers        = 3,
+                .vs_nproc       = 3,
+                .vs_proc        = nfsd_acl_procedures3,
+                .vs_dispatch    = nfsd_dispatch,
+                .vs_xdrsize     = NFS3_SVC_XDRSIZE,
+};
+
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 11f806835c5a..e0e134d6baba 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -71,6 +71,12 @@ decode_fh(u32 *p, struct svc_fh *fhp)
         return p + XDR_QUADLEN(size);
 }
 
+/* Helper function for NFSv3 ACL code */
+u32 *nfs3svc_decode_fh(u32 *p, struct svc_fh *fhp)
+{
+        return decode_fh(p, fhp);
+}
+
 static inline u32 *
 encode_fh(u32 *p, struct svc_fh *fhp)
 {
@@ -233,6 +239,13 @@ encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp)
         return p;
 }
 
+/* Helper for NFSv3 ACLs */
+u32 *
+nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp)
+{
+        return encode_post_op_attr(rqstp, p, fhp);
+}
+
 /*
  * Enocde weak cache consistency data
  */
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 1a55dfcb74bc..634465e9cfc6 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -430,7 +430,7 @@ nfsd4_probe_callback(struct nfs4_client *clp)
         clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX);
         if (IS_ERR(clnt)) {
                 dprintk("NFSD: couldn't create callback client\n");
-                goto out_xprt;
+                goto out_err;
         }
         clnt->cl_intr = 0;
         clnt->cl_softrtry = 1;
@@ -465,8 +465,6 @@ out_rpciod:
 out_clnt:
         rpc_shutdown_client(clnt);
         goto out_err;
-out_xprt:
-        xprt_destroy(xprt);
 out_err:
         dprintk("NFSD: warning: no callback path to client %.*s\n",
                 (int)clp->cl_name.len, clp->cl_name.data);
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 757f9d208034..0aa1b9603d7f 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -591,6 +591,7 @@ nfserrno (int errno)
                 { nfserr_dropit, -ENOMEM },
                 { nfserr_badname, -ESRCH },
                 { nfserr_io, -ETXTBSY },
+                { nfserr_notsupp, -EOPNOTSUPP },
                 { -1, -EIO }
         };
         int     i;
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 02ded7cfbdcf..904df604e86b 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -31,6 +31,7 @@
 #include <linux/nfsd/stats.h>
 #include <linux/nfsd/cache.h>
 #include <linux/lockd/bind.h>
+#include <linux/nfsacl.h>
 
 #define NFSDDBG_FACILITY        NFSDDBG_SVC
 
@@ -362,6 +363,32 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp)
         return 1;
 }
 
+#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
+static struct svc_stat  nfsd_acl_svcstats;
+static struct svc_version *     nfsd_acl_version[] = {
+        [2] = &nfsd_acl_version2,
+        [3] = &nfsd_acl_version3,
+};
+
+#define NFSD_ACL_NRVERS         (sizeof(nfsd_acl_version)/sizeof(nfsd_acl_version[0]))
+static struct svc_program       nfsd_acl_program = {
+        .pg_prog                = NFS_ACL_PROGRAM,
+        .pg_nvers               = NFSD_ACL_NRVERS,
+        .pg_vers                = nfsd_acl_version,
+        .pg_name                = "nfsd",
+        .pg_class               = "nfsd",
+        .pg_stats               = &nfsd_acl_svcstats,
+};
+
+static struct svc_stat  nfsd_acl_svcstats = {
+        .program        = &nfsd_acl_program,
+};
+
+#define nfsd_acl_program_p      &nfsd_acl_program
+#else
+#define nfsd_acl_program_p      NULL
+#endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */
+
 extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4;
 
 static struct svc_version *     nfsd_version[] = {
@@ -376,6 +403,7 @@ static struct svc_version *	nfsd_version[] = {
 
 #define NFSD_NRVERS             (sizeof(nfsd_version)/sizeof(nfsd_version[0]))
 struct svc_program              nfsd_program = {
+        .pg_next                = nfsd_acl_program_p,
         .pg_prog                = NFS_PROGRAM,          /* program number */
         .pg_nvers               = NFSD_NRVERS,          /* nr of entries in nfsd_version */
         .pg_vers                = nfsd_version,         /* version table */
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 948b08287c99..b45999ff33e6 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -49,6 +49,12 @@ decode_fh(u32 *p, struct svc_fh *fhp)
         return p + (NFS_FHSIZE >> 2);
 }
 
+/* Helper function for NFSv2 ACL code */
+u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp)
+{
+        return decode_fh(p, fhp);
+}
+
 static inline u32 *
 encode_fh(u32 *p, struct svc_fh *fhp)
 {
@@ -190,6 +196,11 @@ encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp)
         return p;
 }
 
+/* Helper function for NFSv2 ACL code */
+u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp)
+{
+        return encode_fattr(rqstp, p, fhp);
+}
 
 /*
  * XDR decode functions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index e3e9d217236e..ae3940dc85cc 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -46,8 +46,9 @@
 #include <linux/nfsd/nfsfh.h>
 #include <linux/quotaops.h>
 #include <linux/dnotify.h>
-#ifdef CONFIG_NFSD_V4
+#include <linux/xattr_acl.h>
 #include <linux/posix_acl.h>
+#ifdef CONFIG_NFSD_V4
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr_acl.h>
 #include <linux/xattr.h>
@@ -1857,3 +1858,107 @@ nfsd_racache_init(int cache_size)
         nfsdstats.ra_size = cache_size;
         return 0;
 }
+
+#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
+struct posix_acl *
+nfsd_get_posix_acl(struct svc_fh *fhp, int type)
+{
+        struct inode *inode = fhp->fh_dentry->d_inode;
+        char *name;
+        void *value = NULL;
+        ssize_t size;
+        struct posix_acl *acl;
+
+        if (!IS_POSIXACL(inode) || !inode->i_op || !inode->i_op->getxattr)
+                return ERR_PTR(-EOPNOTSUPP);
+        switch(type) {
+                case ACL_TYPE_ACCESS:
+                        name = XATTR_NAME_ACL_ACCESS;
+                        break;
+                case ACL_TYPE_DEFAULT:
+                        name = XATTR_NAME_ACL_DEFAULT;
+                        break;
+                default:
+                        return ERR_PTR(-EOPNOTSUPP);
+        }
+
+        size = inode->i_op->getxattr(fhp->fh_dentry, name, NULL, 0);
+
+        if (size < 0) {
+                acl = ERR_PTR(size);
+                goto getout;
+        } else if (size > 0) {
+                value = kmalloc(size, GFP_KERNEL);
+                if (!value) {
+                        acl = ERR_PTR(-ENOMEM);
+                        goto getout;
+                }
+                size = inode->i_op->getxattr(fhp->fh_dentry, name, value, size);
+                if (size < 0) {
+                        acl = ERR_PTR(size);
+                        goto getout;
+                }
+        }
+        acl = posix_acl_from_xattr(value, size);
+
+getout:
+        kfree(value);
+        return acl;
+}
+
+int
+nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl)
+{
+        struct inode *inode = fhp->fh_dentry->d_inode;
+        char *name;
+        void *value = NULL;
+        size_t size;
+        int error;
+
+        if (!IS_POSIXACL(inode) || !inode->i_op ||
+            !inode->i_op->setxattr || !inode->i_op->removexattr)
+                return -EOPNOTSUPP;
+        switch(type) {
+                case ACL_TYPE_ACCESS:
+                        name = XATTR_NAME_ACL_ACCESS;
+                        break;
+                case ACL_TYPE_DEFAULT:
+                        name = XATTR_NAME_ACL_DEFAULT;
+                        break;
+                default:
+                        return -EOPNOTSUPP;
+        }
+
+        if (acl && acl->a_count) {
+                size = xattr_acl_size(acl->a_count);
+                value = kmalloc(size, GFP_KERNEL);
+                if (!value)
+                        return -ENOMEM;
+                size = posix_acl_to_xattr(acl, value, size);
+                if (size < 0) {
+                        error = size;
+                        goto getout;
+                }
+        } else
+                size = 0;
+
+        if (!fhp->fh_locked)
+                fh_lock(fhp);  /* unlocking is done automatically */
+        if (size)
+                error = inode->i_op->setxattr(fhp->fh_dentry, name,
+                                              value, size, 0);
+        else {
+                if (!S_ISDIR(inode->i_mode) && type == ACL_TYPE_DEFAULT)
+                        error = 0;
+                else {
+                        error = inode->i_op->removexattr(fhp->fh_dentry, name);
+                        if (error == -ENODATA)
+                                error = 0;
+                }
+        }
+
+getout:
+        kfree(value);
+        return error;
+}
+#endif  /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */
diff --git a/include/asm-arm/arch-omap/tps65010.h b/include/asm-arm/arch-omap/tps65010.h
index 0f97bb2e8fce..b9aa2b3a3909 100644
--- a/include/asm-arm/arch-omap/tps65010.h
+++ b/include/asm-arm/arch-omap/tps65010.h
@@ -30,6 +30,66 @@
 
 /*
  * ----------------------------------------------------------------------------
+ * Registers, all 8 bits
+ * ----------------------------------------------------------------------------
+ */
+
+#define TPS_CHGSTATUS           0x01
+#       define  TPS_CHG_USB             (1 << 7)
+#       define  TPS_CHG_AC              (1 << 6)
+#       define  TPS_CHG_THERM           (1 << 5)
+#       define  TPS_CHG_TERM            (1 << 4)
+#       define  TPS_CHG_TAPER_TMO       (1 << 3)
+#       define  TPS_CHG_CHG_TMO         (1 << 2)
+#       define  TPS_CHG_PRECHG_TMO      (1 << 1)
+#       define  TPS_CHG_TEMP_ERR        (1 << 0)
+#define TPS_REGSTATUS           0x02
+#       define  TPS_REG_ONOFF           (1 << 7)
+#       define  TPS_REG_COVER           (1 << 6)
+#       define  TPS_REG_UVLO            (1 << 5)
+#       define  TPS_REG_NO_CHG          (1 << 4)        /* tps65013 */
+#       define  TPS_REG_PG_LD02         (1 << 3)
+#       define  TPS_REG_PG_LD01         (1 << 2)
+#       define  TPS_REG_PG_MAIN         (1 << 1)
+#       define  TPS_REG_PG_CORE         (1 << 0)
+#define TPS_MASK1               0x03
+#define TPS_MASK2               0x04
+#define TPS_ACKINT1             0x05
+#define TPS_ACKINT2             0x06
+#define TPS_CHGCONFIG           0x07
+#       define  TPS_CHARGE_POR          (1 << 7)        /* 65010/65012 */
+#       define  TPS65013_AUA            (1 << 7)        /* 65011/65013 */
+#       define  TPS_CHARGE_RESET        (1 << 6)
+#       define  TPS_CHARGE_FAST         (1 << 5)
+#       define  TPS_CHARGE_CURRENT      (3 << 3)
+#       define  TPS_VBUS_500MA          (1 << 2)
+#       define  TPS_VBUS_CHARGING       (1 << 1)
+#       define  TPS_CHARGE_ENABLE       (1 << 0)
+#define TPS_LED1_ON             0x08
+#define TPS_LED1_PER            0x09
+#define TPS_LED2_ON             0x0a
+#define TPS_LED2_PER            0x0b
+#define TPS_VDCDC1              0x0c
+#       define  TPS_ENABLE_LP           (1 << 3)
+#define TPS_VDCDC2              0x0d
+#define TPS_VREGS1              0x0e
+#       define  TPS_LDO2_ENABLE (1 << 7)
+#       define  TPS_LDO2_OFF    (1 << 6)
+#       define  TPS_VLDO2_3_0V  (3 << 4)
+#       define  TPS_VLDO2_2_75V (2 << 4)
+#       define  TPS_VLDO2_2_5V  (1 << 4)
+#       define  TPS_VLDO2_1_8V  (0 << 4)
+#       define  TPS_LDO1_ENABLE (1 << 3)
+#       define  TPS_LDO1_OFF    (1 << 2)
+#       define  TPS_VLDO1_3_0V  (3 << 0)
+#       define  TPS_VLDO1_2_75V (2 << 0)
+#       define  TPS_VLDO1_2_5V  (1 << 0)
+#       define  TPS_VLDO1_ADJ   (0 << 0)
+#define TPS_MASK3               0x0f
+#define TPS_DEFGPIO             0x10
+
+/*
+ * ----------------------------------------------------------------------------
  * Macros used by exported functions
  * ----------------------------------------------------------------------------
  */
@@ -71,10 +131,26 @@ extern int tps65010_set_gpio_out_value(unsigned gpio, unsigned value);
  */
 extern int tps65010_set_led(unsigned led, unsigned mode);
 
+/* tps65010_set_vib parameter:
+ * value: ON or OFF
+ */
+extern int tps65010_set_vib(unsigned value);
+
 /* tps65010_set_low_pwr parameter:
  * mode: ON or OFF
  */
 extern int tps65010_set_low_pwr(unsigned mode);
 
+/* tps65010_config_vregs1 parameter:
+ * value to be written to VREGS1 register
+ * Note: The complete register is written, set all bits you need
+ */
+extern int tps65010_config_vregs1(unsigned value);
+
+/* tps65013_set_low_pwr parameter:
+ * mode: ON or OFF
+ */
+extern int tps65013_set_low_pwr(unsigned mode);
+
 #endif /*  __ASM_ARCH_TPS65010_H */
 
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 047e7222df7a..73781ec165b4 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -315,7 +315,7 @@ extern struct efi_memory_map memmap;
  */
 static inline int efi_range_is_wc(unsigned long start, unsigned long len)
 {
-        int i;
+        unsigned long i;
 
         for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) {
                 unsigned long paddr = __pa(start + i);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9b8b696d4f15..e5a8db00df29 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -674,6 +674,7 @@ struct file_lock {
         struct lock_manager_operations *fl_lmops;       /* Callbacks for lockmanagers */
         union {
                 struct nfs_lock_info    nfs_fl;
+                struct nfs4_lock_info   nfs4_fl;
         } fl_u;
 };
 
diff --git a/include/linux/i2c-sysfs.h b/include/linux/hwmon-sysfs.h
index d7bf6ce11679..1b5018a965f5 100644
--- a/include/linux/i2c-sysfs.h
+++ b/include/linux/hwmon-sysfs.h
@@ -1,5 +1,5 @@
 /*
- *  i2c-sysfs.h - i2c chip driver sysfs defines
+ *  hwmon-sysfs.h - hardware monitoring chip driver sysfs defines
  *
  *  Copyright (C) 2005 Yani Ioannou <yani.ioannou@gmail.com>
  *
@@ -17,8 +17,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef _LINUX_I2C_SYSFS_H
-#define _LINUX_I2C_SYSFS_H
+#ifndef _LINUX_HWMON_SYSFS_H
+#define _LINUX_HWMON_SYSFS_H
 
 struct sensor_device_attribute{
         struct device_attribute dev_attr;
@@ -33,4 +33,4 @@ struct sensor_device_attribute sensor_dev_attr_##_name = {	\
         .index =        _index,                                 \
 }
 
-#endif /* _LINUX_I2C_SYSFS_H */
+#endif /* _LINUX_HWMON_SYSFS_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 89270ce51470..33f08258f22b 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -108,6 +108,7 @@
 #define I2C_DRIVERID_TDA7313    62      /* TDA7313 audio processor      */
 #define I2C_DRIVERID_MAX6900    63      /* MAX6900 real-time clock      */
 #define I2C_DRIVERID_SAA7114H   64      /* video decoder                */
+#define I2C_DRIVERID_DS1374     65      /* DS1374 real time clock       */
 
 
 #define I2C_DRIVERID_EXP0       0xF0    /* experimental use id's        */
diff --git a/include/linux/i2c-vid.h b/include/linux/i2c-vid.h
index 974835e3530f..41d0635e0ba9 100644
--- a/include/linux/i2c-vid.h
+++ b/include/linux/i2c-vid.h
@@ -97,3 +97,15 @@ static inline int vid_from_reg(int val, int vrm)
                                      2050 - (val) * 50);
         }
 }
+
+static inline int vid_to_reg(int val, int vrm)
+{
+        switch (vrm) {
+        case 91:                /* VRM 9.1 */
+        case 90:                /* VRM 9.0 */
+                return ((val >= 1100) && (val <= 1850) ?
+                        ((18499 - val * 10) / 25 + 5) / 10 : -1);
+        default:
+                return -1;
+        }
+}
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index ebcd745f4cd6..be837b13f297 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -290,11 +290,8 @@ static inline void i2c_set_adapdata (struct i2c_adapter *dev, void *data)
  */
 struct i2c_client_address_data {
         unsigned short *normal_i2c;
-        unsigned short *normal_i2c_range;
         unsigned short *probe;
-        unsigned short *probe_range;
         unsigned short *ignore;
-        unsigned short *ignore_range;
         unsigned short *force;
 };
 
@@ -563,24 +560,15 @@ union i2c_smbus_data {
 #define I2C_CLIENT_INSMOD \
   I2C_CLIENT_MODULE_PARM(probe, \
                       "List of adapter,address pairs to scan additionally"); \
-  I2C_CLIENT_MODULE_PARM(probe_range, \
-                      "List of adapter,start-addr,end-addr triples to scan " \
-                      "additionally"); \
   I2C_CLIENT_MODULE_PARM(ignore, \
                       "List of adapter,address pairs not to scan"); \
-  I2C_CLIENT_MODULE_PARM(ignore_range, \
-                      "List of adapter,start-addr,end-addr triples not to " \
-                      "scan"); \
   I2C_CLIENT_MODULE_PARM(force, \
                       "List of adapter,address pairs to boldly assume " \
                       "to be present"); \
         static struct i2c_client_address_data addr_data = {             \
                         .normal_i2c =           normal_i2c,             \
-                        .normal_i2c_range =     normal_i2c_range,       \
                         .probe =                probe,                  \
-                        .probe_range =          probe_range,            \
                         .ignore =               ignore,                 \
-                        .ignore_range =         ignore_range,           \
                         .force =                force,                  \
                 }
 
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 0d9d22578212..16d4e5a08e1d 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -72,6 +72,8 @@ struct nlm_lockowner {
         uint32_t pid;
 };
 
+struct nlm_wait;
+
 /*
  * Memory chunk for NLM client RPC request.
  */
@@ -81,6 +83,7 @@ struct nlm_rqst {
         struct nlm_host *       a_host;         /* host handle */
         struct nlm_args         a_args;         /* arguments */
         struct nlm_res          a_res;          /* result */
+        struct nlm_wait *       a_block;
         char                    a_owner[NLMCLNT_OHSIZE];
 };
 
@@ -142,7 +145,9 @@ extern unsigned long		nlmsvc_timeout;
  * Lockd client functions
  */
 struct nlm_rqst * nlmclnt_alloc_call(void);
-int               nlmclnt_block(struct nlm_host *, struct file_lock *, u32 *);
+int               nlmclnt_prepare_block(struct nlm_rqst *req, struct nlm_host *host, struct file_lock *fl);
+void              nlmclnt_finish_block(struct nlm_rqst *req);
+long              nlmclnt_block(struct nlm_rqst *req, long timeout);
 int               nlmclnt_cancel(struct nlm_host *, struct file_lock *);
 u32               nlmclnt_grant(struct nlm_lock *);
 void              nlmclnt_recovery(struct nlm_host *, u32);
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 5ca8a8d8ccdf..5bb5b2fd7ba2 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -382,6 +382,8 @@ enum {
         NFSPROC4_CLNT_READDIR,
         NFSPROC4_CLNT_SERVER_CAPS,
         NFSPROC4_CLNT_DELEGRETURN,
+        NFSPROC4_CLNT_GETACL,
+        NFSPROC4_CLNT_SETACL,
 };
 
 #endif
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index dbac7f363e5d..8ea249110fb0 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -15,7 +15,6 @@
 #include <linux/pagemap.h>
 #include <linux/rwsem.h>
 #include <linux/wait.h>
-#include <linux/uio.h>
 
 #include <linux/nfs_fs_sb.h>
 
@@ -29,7 +28,6 @@
 #include <linux/nfs4.h>
 #include <linux/nfs_xdr.h>
 #include <linux/rwsem.h>
-#include <linux/workqueue.h>
 #include <linux/mempool.h>
 
 /*
@@ -44,13 +42,6 @@
 #define NFS_DEF_FILE_IO_BUFFER_SIZE     4096
 
 /*
- * The upper limit on timeouts for the exponential backoff algorithm.
- */
-#define NFS_WRITEBACK_DELAY             (5*HZ)
-#define NFS_WRITEBACK_LOCKDELAY         (60*HZ)
-#define NFS_COMMIT_DELAY                (5*HZ)
-
-/*
  * superblock magic number for NFS
  */
 #define NFS_SUPER_MAGIC                 0x6969
@@ -60,9 +51,6 @@
  */
 #define NFS_RPC_SWAPFLAGS               (RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)
 
-#define NFS_RW_SYNC             0x0001  /* O_SYNC handling */
-#define NFS_RW_SWAP             0x0002  /* This is a swap request */
-
 /*
  * When flushing a cluster of dirty pages, there can be different
  * strategies:
@@ -96,7 +84,8 @@ struct nfs_open_context {
         int error;
 
         struct list_head list;
-        wait_queue_head_t waitq;
+
+        __u64 dir_cookie;
 };
 
 /*
@@ -104,6 +93,8 @@ struct nfs_open_context {
  */
 struct nfs_delegation;
 
+struct posix_acl;
+
 /*
  * nfs fs inode data in memory
  */
@@ -140,7 +131,6 @@ struct nfs_inode {
          *
          *      mtime != read_cache_mtime
          */
-        unsigned long           readdir_timestamp;
         unsigned long           read_cache_jiffies;
         unsigned long           attrtimeo;
         unsigned long           attrtimeo_timestamp;
@@ -158,6 +148,10 @@ struct nfs_inode {
         atomic_t                data_updates;
 
         struct nfs_access_entry cache_access;
+#ifdef CONFIG_NFS_V3_ACL
+        struct posix_acl        *acl_access;
+        struct posix_acl        *acl_default;
+#endif
 
         /*
          * This is the cookie verifier used for NFSv3 readdir
@@ -183,13 +177,13 @@ struct nfs_inode {
         wait_queue_head_t       nfs_i_wait;
 
 #ifdef CONFIG_NFS_V4
+        struct nfs4_cached_acl  *nfs4_acl;
         /* NFSv4 state */
         struct list_head        open_states;
         struct nfs_delegation   *delegation;
         int                      delegation_state;
         struct rw_semaphore     rwsem;
 #endif /* CONFIG_NFS_V4*/
-
         struct inode            vfs_inode;
 };
 
@@ -203,6 +197,8 @@ struct nfs_inode {
 #define NFS_INO_INVALID_DATA    0x0010          /* cached data is invalid */
 #define NFS_INO_INVALID_ATIME   0x0020          /* cached atime is invalid */
 #define NFS_INO_INVALID_ACCESS  0x0040          /* cached access cred invalid */
+#define NFS_INO_INVALID_ACL     0x0080          /* cached acls are invalid */
+#define NFS_INO_REVAL_PAGECACHE 0x1000          /* must revalidate pagecache */
 
 static inline struct nfs_inode *NFS_I(struct inode *inode)
 {
@@ -294,12 +290,12 @@ extern int nfs_release(struct inode *, struct file *);
 extern int nfs_attribute_timeout(struct inode *inode);
 extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);
 extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);
+extern void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping);
 extern int nfs_setattr(struct dentry *, struct iattr *);
 extern void nfs_begin_attr_update(struct inode *);
 extern void nfs_end_attr_update(struct inode *);
 extern void nfs_begin_data_update(struct inode *);
 extern void nfs_end_data_update(struct inode *);
-extern void nfs_end_data_update_defer(struct inode *);
 extern struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, struct rpc_cred *cred);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
@@ -314,6 +310,9 @@ extern u32 root_nfs_parse_addr(char *name); /*__init*/
  * linux/fs/nfs/file.c
  */
 extern struct inode_operations nfs_file_inode_operations;
+#ifdef CONFIG_NFS_V3
+extern struct inode_operations nfs3_file_inode_operations;
+#endif /* CONFIG_NFS_V3 */
 extern struct file_operations nfs_file_operations;
 extern struct address_space_operations nfs_file_aops;
 
@@ -329,6 +328,22 @@ static inline struct rpc_cred *nfs_file_cred(struct file *file)
 }
 
 /*
+ * linux/fs/nfs/xattr.c
+ */
+#ifdef CONFIG_NFS_V3_ACL
+extern ssize_t nfs3_listxattr(struct dentry *, char *, size_t);
+extern ssize_t nfs3_getxattr(struct dentry *, const char *, void *, size_t);
+extern int nfs3_setxattr(struct dentry *, const char *,
+                        const void *, size_t, int);
+extern int nfs3_removexattr (struct dentry *, const char *name);
+#else
+# define nfs3_listxattr NULL
+# define nfs3_getxattr NULL
+# define nfs3_setxattr NULL
+# define nfs3_removexattr NULL
+#endif
+
+/*
  * linux/fs/nfs/direct.c
  */
 extern ssize_t nfs_direct_IO(int, struct kiocb *, const struct iovec *, loff_t,
@@ -342,6 +357,9 @@ extern ssize_t nfs_file_direct_write(struct kiocb *iocb, const char __user *buf,
  * linux/fs/nfs/dir.c
  */
 extern struct inode_operations nfs_dir_inode_operations;
+#ifdef CONFIG_NFS_V3
+extern struct inode_operations nfs3_dir_inode_operations;
+#endif /* CONFIG_NFS_V3 */
 extern struct file_operations nfs_dir_operations;
 extern struct dentry_operations nfs_dentry_operations;
 
@@ -377,10 +395,10 @@ extern void nfs_commit_done(struct rpc_task *);
  */
 extern int  nfs_sync_inode(struct inode *, unsigned long, unsigned int, int);
 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
-extern int  nfs_commit_inode(struct inode *, unsigned long, unsigned int, int);
+extern int  nfs_commit_inode(struct inode *, int);
 #else
 static inline int
-nfs_commit_inode(struct inode *inode, unsigned long idx_start, unsigned int npages, int how)
+nfs_commit_inode(struct inode *inode, int how)
 {
         return 0;
 }
@@ -434,11 +452,6 @@ static inline void nfs_writedata_free(struct nfs_write_data *p)
         mempool_free(p, nfs_wdata_mempool);
 }
 
-/* Hack for future NFS swap support */
-#ifndef IS_SWAPFILE
-# define IS_SWAPFILE(inode)     (0)
-#endif
-
 /*
  * linux/fs/nfs/read.c
  */
@@ -468,6 +481,29 @@ static inline void nfs_readdata_free(struct nfs_read_data *p)
 extern void  nfs_readdata_release(struct rpc_task *task);
 
 /*
+ * linux/fs/nfs3proc.c
+ */
+#ifdef CONFIG_NFS_V3_ACL
+extern struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type);
+extern int nfs3_proc_setacl(struct inode *inode, int type,
+                            struct posix_acl *acl);
+extern int nfs3_proc_set_default_acl(struct inode *dir, struct inode *inode,
+                mode_t mode);
+extern void nfs3_forget_cached_acls(struct inode *inode);
+#else
+static inline int nfs3_proc_set_default_acl(struct inode *dir,
+                                            struct inode *inode,
+                                            mode_t mode)
+{
+        return 0;
+}
+
+static inline void nfs3_forget_cached_acls(struct inode *inode)
+{
+}
+#endif /* CONFIG_NFS_V3_ACL */
+
+/*
  * linux/fs/mount_clnt.c
  * (Used only by nfsroot module)
  */
@@ -515,230 +551,6 @@ extern void * nfs_root_data(void);
 
 #define NFS_JUKEBOX_RETRY_TIME (5 * HZ)
 
-#ifdef CONFIG_NFS_V4
-
-struct idmap;
-
-/*
- * In a seqid-mutating op, this macro controls which error return
- * values trigger incrementation of the seqid.
- *
- * from rfc 3010:
- * The client MUST monotonically increment the sequence number for the
- * CLOSE, LOCK, LOCKU, OPEN, OPEN_CONFIRM, and OPEN_DOWNGRADE
- * operations.  This is true even in the event that the previous
- * operation that used the sequence number received an error.  The only
- * exception to this rule is if the previous operation received one of
- * the following errors: NFSERR_STALE_CLIENTID, NFSERR_STALE_STATEID,
- * NFSERR_BAD_STATEID, NFSERR_BAD_SEQID, NFSERR_BADXDR,
- * NFSERR_RESOURCE, NFSERR_NOFILEHANDLE.
- *
- */
-#define seqid_mutating_err(err)       \
-(((err) != NFSERR_STALE_CLIENTID) &&  \
- ((err) != NFSERR_STALE_STATEID)  &&  \
- ((err) != NFSERR_BAD_STATEID)    &&  \
- ((err) != NFSERR_BAD_SEQID)      &&  \
- ((err) != NFSERR_BAD_XDR)        &&  \
- ((err) != NFSERR_RESOURCE)       &&  \
- ((err) != NFSERR_NOFILEHANDLE))
-
-enum nfs4_client_state {
-        NFS4CLNT_OK  = 0,
-};
-
-/*
- * The nfs4_client identifies our client state to the server.
- */
-struct nfs4_client {
-        struct list_head        cl_servers;     /* Global list of servers */
-        struct in_addr          cl_addr;        /* Server identifier */
-        u64                     cl_clientid;    /* constant */
-        nfs4_verifier           cl_confirm;
-        unsigned long           cl_state;
-
-        u32                     cl_lockowner_id;
-
-        /*
-         * The following rwsem ensures exclusive access to the server
-         * while we recover the state following a lease expiration.
-         */
-        struct rw_semaphore     cl_sem;
-
-        struct list_head        cl_delegations;
-        struct list_head        cl_state_owners;
-        struct list_head        cl_unused;
-        int                     cl_nunused;
-        spinlock_t              cl_lock;
-        atomic_t                cl_count;
-
-        struct rpc_clnt *       cl_rpcclient;
-        struct rpc_cred *       cl_cred;
-
-        struct list_head        cl_superblocks; /* List of nfs_server structs */
-
-        unsigned long           cl_lease_time;
-        unsigned long           cl_last_renewal;
-        struct work_struct      cl_renewd;
-        struct work_struct      cl_recoverd;
-
-        wait_queue_head_t       cl_waitq;
-        struct rpc_wait_queue   cl_rpcwaitq;
-
-        /* used for the setclientid verifier */
-        struct timespec         cl_boot_time;
-
-        /* idmapper */
-        struct idmap *          cl_idmap;
-
-        /* Our own IP address, as a null-terminated string.
-         * This is used to generate the clientid, and the callback address.
-         */
-        char                    cl_ipaddr[16];
-        unsigned char           cl_id_uniquifier;
-};
-
-/*
- * NFS4 state_owners and lock_owners are simply labels for ordered
- * sequences of RPC calls. Their sole purpose is to provide once-only
- * semantics by allowing the server to identify replayed requests.
- *
- * The ->so_sema is held during all state_owner seqid-mutating operations:
- * OPEN, OPEN_DOWNGRADE, and CLOSE. Its purpose is to properly serialize
- * so_seqid.
- */
-struct nfs4_state_owner {
-        struct list_head     so_list;    /* per-clientid list of state_owners */
-        struct nfs4_client   *so_client;
-        u32                  so_id;      /* 32-bit identifier, unique */
-        struct semaphore     so_sema;
-        u32                  so_seqid;   /* protected by so_sema */
-        atomic_t             so_count;
-
-        struct rpc_cred      *so_cred;   /* Associated cred */
-        struct list_head     so_states;
-        struct list_head     so_delegations;
-};
-
-/*
- * struct nfs4_state maintains the client-side state for a given
- * (state_owner,inode) tuple (OPEN) or state_owner (LOCK).
- *
- * OPEN:
- * In order to know when to OPEN_DOWNGRADE or CLOSE the state on the server,
- * we need to know how many files are open for reading or writing on a
- * given inode. This information too is stored here.
- *
- * LOCK: one nfs4_state (LOCK) to hold the lock stateid nfs4_state(OPEN)
- */
-
-struct nfs4_lock_state {
-        struct list_head        ls_locks;       /* Other lock stateids */
-        fl_owner_t              ls_owner;       /* POSIX lock owner */
-#define NFS_LOCK_INITIALIZED 1
-        int                     ls_flags;
-        u32                     ls_seqid;
-        u32                     ls_id;
-        nfs4_stateid            ls_stateid;
-        atomic_t                ls_count;
-};
-
-/* bits for nfs4_state->flags */
-enum {
-        LK_STATE_IN_USE,
-        NFS_DELEGATED_STATE,
-};
-
-struct nfs4_state {
-        struct list_head open_states;   /* List of states for the same state_owner */
-        struct list_head inode_states;  /* List of states for the same inode */
-        struct list_head lock_states;   /* List of subservient lock stateids */
-
-        struct nfs4_state_owner *owner; /* Pointer to the open owner */
-        struct inode *inode;            /* Pointer to the inode */
-
-        unsigned long flags;            /* Do we hold any locks? */
-        struct semaphore lock_sema;     /* Serializes file locking operations */
-        rwlock_t state_lock;            /* Protects the lock_states list */
-
-        nfs4_stateid stateid;
-
-        unsigned int nreaders;
-        unsigned int nwriters;
-        int state;                      /* State on the server (R,W, or RW) */
-        atomic_t count;
-};
-
-
-struct nfs4_exception {
-        long timeout;
-        int retry;
-};
-
-struct nfs4_state_recovery_ops {
-        int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *);
-        int (*recover_lock)(struct nfs4_state *, struct file_lock *);
-};
-
-extern struct dentry_operations nfs4_dentry_operations;
-extern struct inode_operations nfs4_dir_inode_operations;
-
-/* nfs4proc.c */
-extern int nfs4_map_errors(int err);
-extern int nfs4_proc_setclientid(struct nfs4_client *, u32, unsigned short);
-extern int nfs4_proc_setclientid_confirm(struct nfs4_client *);
-extern int nfs4_proc_async_renew(struct nfs4_client *);
-extern int nfs4_proc_renew(struct nfs4_client *);
-extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state, mode_t mode);
-extern struct inode *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);
-extern int nfs4_open_revalidate(struct inode *, struct dentry *, int);
-
-extern struct nfs4_state_recovery_ops nfs4_reboot_recovery_ops;
-extern struct nfs4_state_recovery_ops nfs4_network_partition_recovery_ops;
-
-/* nfs4renewd.c */
-extern void nfs4_schedule_state_renewal(struct nfs4_client *);
-extern void nfs4_renewd_prepare_shutdown(struct nfs_server *);
-extern void nfs4_kill_renewd(struct nfs4_client *);
-
-/* nfs4state.c */
-extern void init_nfsv4_state(struct nfs_server *);
-extern void destroy_nfsv4_state(struct nfs_server *);
-extern struct nfs4_client *nfs4_get_client(struct in_addr *);
-extern void nfs4_put_client(struct nfs4_client *clp);
-extern int nfs4_init_client(struct nfs4_client *clp);
-extern struct nfs4_client *nfs4_find_client(struct in_addr *);
-extern u32 nfs4_alloc_lockowner_id(struct nfs4_client *);
-
-extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *);
-extern void nfs4_put_state_owner(struct nfs4_state_owner *);
-extern void nfs4_drop_state_owner(struct nfs4_state_owner *);
-extern struct nfs4_state * nfs4_get_open_state(struct inode *, struct nfs4_state_owner *);
-extern void nfs4_put_open_state(struct nfs4_state *);
-extern void nfs4_close_state(struct nfs4_state *, mode_t);
-extern struct nfs4_state *nfs4_find_state(struct inode *, struct rpc_cred *, mode_t mode);
-extern void nfs4_increment_seqid(int status, struct nfs4_state_owner *sp);
-extern void nfs4_schedule_state_recovery(struct nfs4_client *);
-extern struct nfs4_lock_state *nfs4_find_lock_state(struct nfs4_state *state, fl_owner_t);
-extern struct nfs4_lock_state *nfs4_get_lock_state(struct nfs4_state *state, fl_owner_t);
-extern void nfs4_put_lock_state(struct nfs4_lock_state *state);
-extern void nfs4_increment_lock_seqid(int status, struct nfs4_lock_state *ls);
-extern void nfs4_notify_setlk(struct nfs4_state *, struct file_lock *, struct nfs4_lock_state *);
-extern void nfs4_notify_unlck(struct nfs4_state *, struct file_lock *, struct nfs4_lock_state *);
-extern void nfs4_copy_stateid(nfs4_stateid *, struct nfs4_state *, fl_owner_t);
-
-
-
-struct nfs4_mount_data;
-#else
-#define init_nfsv4_state(server)  do { } while (0)
-#define destroy_nfsv4_state(server)       do { } while (0)
-#define nfs4_put_state_owner(inode, owner) do { } while (0)
-#define nfs4_put_open_state(state) do { } while (0)
-#define nfs4_close_state(a, b) do { } while (0)
-#define nfs4_renewd_prepare_shutdown(server) do { } while (0)
-#endif
-
 #endif /* __KERNEL__ */
 
 /*
diff --git a/include/linux/nfs_fs_i.h b/include/linux/nfs_fs_i.h
index e9a749588a7b..e2c18dabff86 100644
--- a/include/linux/nfs_fs_i.h
+++ b/include/linux/nfs_fs_i.h
@@ -16,6 +16,11 @@ struct nfs_lock_info {
         struct nlm_lockowner *owner;
 };
 
+struct nfs4_lock_state;
+struct nfs4_lock_info {
+        struct nfs4_lock_state *owner;
+};
+
 /*
  * Lock flag values
  */
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index fc51645d61ee..3d3a305488cf 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -10,6 +10,7 @@
 struct nfs_server {
         struct rpc_clnt *       client;         /* RPC client handle */
         struct rpc_clnt *       client_sys;     /* 2nd handle for FSINFO */
+        struct rpc_clnt *       client_acl;     /* ACL RPC client handle */
         struct nfs_rpc_ops *    rpc_ops;        /* NFS protocol vector */
         struct backing_dev_info backing_dev_info;
         int                     flags;          /* various flags */
diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h
index 0071428231f9..659c75438454 100644
--- a/include/linux/nfs_mount.h
+++ b/include/linux/nfs_mount.h
@@ -58,6 +58,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_KERBEROS      0x0100  /* 3 */
 #define NFS_MOUNT_NONLM         0x0200  /* 3 */
 #define NFS_MOUNT_BROKEN_SUID   0x0400  /* 4 */
+#define NFS_MOUNT_NOACL         0x0800  /* 4 */
 #define NFS_MOUNT_STRICTLOCK    0x1000  /* reserved for NFSv4 */
 #define NFS_MOUNT_SECFLAVOUR    0x2000  /* 5 */
 #define NFS_MOUNT_FLAGMASK      0xFFFF
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 39e4895bcdb4..da2e077b65e2 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -20,12 +20,19 @@
 #include <asm/atomic.h>
 
 /*
+ * Valid flags for the radix tree
+ */
+#define NFS_PAGE_TAG_DIRTY      0
+#define NFS_PAGE_TAG_WRITEBACK  1
+
+/*
  * Valid flags for a dirty buffer
  */
 #define PG_BUSY                 0
 #define PG_NEED_COMMIT          1
 #define PG_NEED_RESCHED         2
 
+struct nfs_inode;
 struct nfs_page {
         struct list_head        wb_list,        /* Defines state of page: */
                                 *wb_list_head;  /*      read/write/commit */
@@ -54,14 +61,17 @@ extern	void nfs_clear_request(struct nfs_page *req);
 extern  void nfs_release_request(struct nfs_page *req);
 
 
-extern  void nfs_list_add_request(struct nfs_page *, struct list_head *);
-
+extern  int nfs_scan_lock_dirty(struct nfs_inode *nfsi, struct list_head *dst,
+                                unsigned long idx_start, unsigned int npages);
 extern  int nfs_scan_list(struct list_head *, struct list_head *,
                           unsigned long, unsigned int);
 extern  int nfs_coalesce_requests(struct list_head *, struct list_head *,
                                   unsigned int);
 extern  int nfs_wait_on_request(struct nfs_page *);
 extern  void nfs_unlock_request(struct nfs_page *req);
+extern  int nfs_set_page_writeback_locked(struct nfs_page *req);
+extern  void nfs_clear_page_writeback(struct nfs_page *req);
+
 
 /*
  * Lock the page of an asynchronous request without incrementing the wb_count
@@ -86,6 +96,18 @@ nfs_lock_request(struct nfs_page *req)
         return 1;
 }
 
+/**
+ * nfs_list_add_request - Insert a request into a list
+ * @req: request
+ * @head: head of list into which to insert the request.
+ */
+static inline void
+nfs_list_add_request(struct nfs_page *req, struct list_head *head)
+{
+        list_add_tail(&req->wb_list, head);
+        req->wb_list_head = head;
+}
+
 
 /**
  * nfs_list_remove_request - Remove a request from its wb_list
@@ -96,10 +118,6 @@ nfs_list_remove_request(struct nfs_page *req)
 {
         if (list_empty(&req->wb_list))
                 return;
-        if (!NFS_WBACK_BUSY(req)) {
-                printk(KERN_ERR "NFS: unlocked request attempted removed from list!\n");
-                BUG();
-        }
         list_del_init(&req->wb_list);
         req->wb_list_head = NULL;
 }
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 47037d9521cb..a2bf6914ff1b 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -2,6 +2,7 @@
 #define _LINUX_NFS_XDR_H
 
 #include <linux/sunrpc/xprt.h>
+#include <linux/nfsacl.h>
 
 struct nfs4_fsid {
         __u64 major;
@@ -326,6 +327,20 @@ struct nfs_setattrargs {
         const u32 *                     bitmask;
 };
 
+struct nfs_setaclargs {
+        struct nfs_fh *                 fh;
+        size_t                          acl_len;
+        unsigned int                    acl_pgbase;
+        struct page **                  acl_pages;
+};
+
+struct nfs_getaclargs {
+        struct nfs_fh *                 fh;
+        size_t                          acl_len;
+        unsigned int                    acl_pgbase;
+        struct page **                  acl_pages;
+};
+
 struct nfs_setattrres {
         struct nfs_fattr *              fattr;
         const struct nfs_server *       server;
@@ -354,6 +369,20 @@ struct nfs_readdirargs {
         struct page **          pages;
 };
 
+struct nfs3_getaclargs {
+        struct nfs_fh *         fh;
+        int                     mask;
+        struct page **          pages;
+};
+
+struct nfs3_setaclargs {
+        struct inode *          inode;
+        int                     mask;
+        struct posix_acl *      acl_access;
+        struct posix_acl *      acl_default;
+        struct page **          pages;
+};
+
 struct nfs_diropok {
         struct nfs_fh *         fh;
         struct nfs_fattr *      fattr;
@@ -477,6 +506,15 @@ struct nfs3_readdirres {
         int                     plus;
 };
 
+struct nfs3_getaclres {
+        struct nfs_fattr *      fattr;
+        int                     mask;
+        unsigned int            acl_access_count;
+        unsigned int            acl_default_count;
+        struct posix_acl *      acl_access;
+        struct posix_acl *      acl_default;
+};
+
 #ifdef CONFIG_NFS_V4
 
 typedef u64 clientid4;
@@ -667,6 +705,7 @@ struct nfs_rpc_ops {
         int     version;                /* Protocol version */
         struct dentry_operations *dentry_ops;
         struct inode_operations *dir_inode_ops;
+        struct inode_operations *file_inode_ops;
 
         int     (*getroot) (struct nfs_server *, struct nfs_fh *,
                             struct nfs_fsinfo *);
@@ -713,6 +752,7 @@ struct nfs_rpc_ops {
         int     (*file_open)   (struct inode *, struct file *);
         int     (*file_release) (struct inode *, struct file *);
         int     (*lock)(struct file *, int, struct file_lock *);
+        void    (*clear_acl_cache)(struct inode *);
 };
 
 /*
@@ -732,4 +772,7 @@ extern struct rpc_version	nfs_version2;
 extern struct rpc_version       nfs_version3;
 extern struct rpc_version       nfs_version4;
 
+extern struct rpc_version       nfsacl_version3;
+extern struct rpc_program       nfsacl_program;
+
 #endif
diff --git a/include/linux/nfsacl.h b/include/linux/nfsacl.h
new file mode 100644
index 000000000000..54487a99beb8
--- /dev/null
+++ b/include/linux/nfsacl.h
@@ -0,0 +1,58 @@
+/*
+ * File: linux/nfsacl.h
+ *
+ * (C) 2003 Andreas Gruenbacher <agruen@suse.de>
+ */
+#ifndef __LINUX_NFSACL_H
+#define __LINUX_NFSACL_H
+
+#define NFS_ACL_PROGRAM 100227
+
+#define ACLPROC2_GETACL         1
+#define ACLPROC2_SETACL         2
+#define ACLPROC2_GETATTR        3
+#define ACLPROC2_ACCESS         4
+
+#define ACLPROC3_GETACL         1
+#define ACLPROC3_SETACL         2
+
+
+/* Flags for the getacl/setacl mode */
+#define NFS_ACL                 0x0001
+#define NFS_ACLCNT              0x0002
+#define NFS_DFACL               0x0004
+#define NFS_DFACLCNT            0x0008
+
+/* Flag for Default ACL entries */
+#define NFS_ACL_DEFAULT         0x1000
+
+#ifdef __KERNEL__
+
+#include <linux/posix_acl.h>
+
+/* Maximum number of ACL entries over NFS */
+#define NFS_ACL_MAX_ENTRIES     1024
+
+#define NFSACL_MAXWORDS         (2*(2+3*NFS_ACL_MAX_ENTRIES))
+#define NFSACL_MAXPAGES         ((2*(8+12*NFS_ACL_MAX_ENTRIES) + PAGE_SIZE-1) \
+                                 >> PAGE_SHIFT)
+
+static inline unsigned int
+nfsacl_size(struct posix_acl *acl_access, struct posix_acl *acl_default)
+{
+        unsigned int w = 16;
+        w += max(acl_access ? (int)acl_access->a_count : 3, 4) * 12;
+        if (acl_default)
+                w += max((int)acl_default->a_count, 4) * 12;
+        return w;
+}
+
+extern unsigned int
+nfsacl_encode(struct xdr_buf *buf, unsigned int base, struct inode *inode,
+              struct posix_acl *acl, int encode_entries, int typeflag);
+extern unsigned int
+nfsacl_decode(struct xdr_buf *buf, unsigned int base, unsigned int *aclcnt,
+              struct posix_acl **pacl);
+
+#endif /* __KERNEL__ */
+#endif  /* __LINUX_NFSACL_H */
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 8f85d9a59607..4bf931d5ff56 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -15,6 +15,7 @@
 #include <linux/unistd.h>
 #include <linux/dirent.h>
 #include <linux/fs.h>
+#include <linux/posix_acl.h>
 #include <linux/mount.h>
 
 #include <linux/nfsd/debug.h>
@@ -124,6 +125,21 @@ int		nfsd_statfs(struct svc_rqst *, struct svc_fh *,
 int             nfsd_notify_change(struct inode *, struct iattr *);
 int             nfsd_permission(struct svc_export *, struct dentry *, int);
 
+#if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
+#ifdef CONFIG_NFSD_V2_ACL
+extern struct svc_version nfsd_acl_version2;
+#else
+#define nfsd_acl_version2 NULL
+#endif
+#ifdef CONFIG_NFSD_V3_ACL
+extern struct svc_version nfsd_acl_version3;
+#else
+#define nfsd_acl_version3 NULL
+#endif
+struct posix_acl *nfsd_get_posix_acl(struct svc_fh *, int);
+int nfsd_set_posix_acl(struct svc_fh *, int, struct posix_acl *);
+#endif
+
 
 /* 
  * NFSv4 State
diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h
index ecccef777dae..130d4f588a37 100644
--- a/include/linux/nfsd/xdr.h
+++ b/include/linux/nfsd/xdr.h
@@ -169,4 +169,8 @@ int nfssvc_encode_entry(struct readdir_cd *, const char *name,
 
 int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
 
+/* Helper functions for NFSv2 ACL code */
+u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp);
+u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp);
+
 #endif /* LINUX_NFSD_H */
diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
index 0ae9e0ef5f68..21e18ce7ca63 100644
--- a/include/linux/nfsd/xdr3.h
+++ b/include/linux/nfsd/xdr3.h
@@ -110,6 +110,19 @@ struct nfsd3_commitargs {
         __u32                   count;
 };
 
+struct nfsd3_getaclargs {
+        struct svc_fh           fh;
+        int                     mask;
+};
+
+struct posix_acl;
+struct nfsd3_setaclargs {
+        struct svc_fh           fh;
+        int                     mask;
+        struct posix_acl        *acl_access;
+        struct posix_acl        *acl_default;
+};
+
 struct nfsd3_attrstat {
         __u32                   status;
         struct svc_fh           fh;
@@ -209,6 +222,14 @@ struct nfsd3_commitres {
         struct svc_fh           fh;
 };
 
+struct nfsd3_getaclres {
+        __u32                   status;
+        struct svc_fh           fh;
+        int                     mask;
+        struct posix_acl        *acl_access;
+        struct posix_acl        *acl_default;
+};
+
 /* dummy type for release */
 struct nfsd3_fhandle_pair {
         __u32                   dummy;
@@ -241,6 +262,7 @@ union nfsd3_xdrstore {
         struct nfsd3_fsinfores          fsinfores;
         struct nfsd3_pathconfres        pathconfres;
         struct nfsd3_commitres          commitres;
+        struct nfsd3_getaclres          getaclres;
 };
 
 #define NFS3_SVC_XDRSIZE                sizeof(union nfsd3_xdrstore)
@@ -316,6 +338,10 @@ int nfs3svc_encode_entry(struct readdir_cd *, const char *name,
 int nfs3svc_encode_entry_plus(struct readdir_cd *, const char *name,
                                 int namlen, loff_t offset, ino_t ino,
                                 unsigned int);
+/* Helper functions for NFSv3 ACL code */
+u32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p,
+                                struct svc_fh *fhp);
+u32 *nfs3svc_decode_fh(u32 *p, struct svc_fh *fhp);
 
 
 #endif /* _LINUX_NFSD_XDR3_H */
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 2709caf4d128..ab151bbb66df 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -111,6 +111,11 @@ struct rpc_procinfo {
 struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,
                                 struct rpc_program *info,
                                 u32 version, rpc_authflavor_t authflavor);
+struct rpc_clnt *rpc_new_client(struct rpc_xprt *xprt, char *servname,
+                                struct rpc_program *info,
+                                u32 version, rpc_authflavor_t authflavor);
+struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
+                                struct rpc_program *, int);
 struct rpc_clnt *rpc_clone_client(struct rpc_clnt *);
 int             rpc_shutdown_client(struct rpc_clnt *);
 int             rpc_destroy_client(struct rpc_clnt *);
@@ -129,6 +134,7 @@ void		rpc_clnt_sigmask(struct rpc_clnt *clnt, sigset_t *oldset);
 void            rpc_clnt_sigunmask(struct rpc_clnt *clnt, sigset_t *oldset);
 void            rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
 size_t          rpc_max_payload(struct rpc_clnt *);
+int             rpc_ping(struct rpc_clnt *clnt, int flags);
 
 static __inline__
 int rpc_call(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp, int flags)
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 99d17ed7cebb..4d77e90d0b30 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -31,7 +31,6 @@ struct rpc_wait_queue;
 struct rpc_wait {
         struct list_head        list;           /* wait queue links */
         struct list_head        links;          /* Links to related tasks */
-        wait_queue_head_t       waitq;          /* sync: sleep on this q */
         struct rpc_wait_queue * rpc_waitq;      /* RPC wait queue we're on */
 };
 
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 37003970cf2e..5af8800e0ce3 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -185,6 +185,17 @@ xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)
         return vec->iov_len <= PAGE_SIZE;
 }
 
+static inline struct page *
+svc_take_res_page(struct svc_rqst *rqstp)
+{
+        if (rqstp->rq_arghi <= rqstp->rq_argused)
+                return NULL;
+        rqstp->rq_arghi--;
+        rqstp->rq_respages[rqstp->rq_resused] =
+                rqstp->rq_argpages[rqstp->rq_arghi];
+        return rqstp->rq_respages[rqstp->rq_resused++];
+}
+
 static inline int svc_take_page(struct svc_rqst *rqstp)
 {
         if (rqstp->rq_arghi <= rqstp->rq_argused)
@@ -240,9 +251,10 @@ struct svc_deferred_req {
 };
 
 /*
- * RPC program
+ * List of RPC programs on the same transport endpoint
  */
 struct svc_program {
+        struct svc_program *    pg_next;        /* other programs (same xprt) */
         u32                     pg_prog;        /* program number */
         unsigned int            pg_lovers;      /* lowest version */
         unsigned int            pg_hivers;      /* lowest version */
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 541dcf838abf..34ec3e8d99b3 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -146,7 +146,8 @@ extern void xdr_shift_buf(struct xdr_buf *, size_t);
 extern void xdr_buf_from_iov(struct kvec *, struct xdr_buf *);
 extern int xdr_buf_subsegment(struct xdr_buf *, struct xdr_buf *, int, int);
 extern int xdr_buf_read_netobj(struct xdr_buf *, struct xdr_netobj *, int);
-extern int read_bytes_from_xdr_buf(struct xdr_buf *buf, int base, void *obj, int len);
+extern int read_bytes_from_xdr_buf(struct xdr_buf *, int, void *, int);
+extern int write_bytes_to_xdr_buf(struct xdr_buf *, int, void *, int);
 
 /*
  * Helper structure for copying from an sk_buff.
@@ -160,7 +161,7 @@ typedef struct {
 
 typedef size_t (*skb_read_actor_t)(skb_reader_t *desc, void *to, size_t len);
 
-extern void xdr_partial_copy_from_skb(struct xdr_buf *, unsigned int,
+extern ssize_t xdr_partial_copy_from_skb(struct xdr_buf *, unsigned int,
                 skb_reader_t *, skb_read_actor_t);
 
 struct socket;
@@ -168,6 +169,22 @@ struct sockaddr;
 extern int xdr_sendpages(struct socket *, struct sockaddr *, int,
                 struct xdr_buf *, unsigned int, int);
 
+extern int xdr_encode_word(struct xdr_buf *, int, u32);
+extern int xdr_decode_word(struct xdr_buf *, int, u32 *);
+
+struct xdr_array2_desc;
+typedef int (*xdr_xcode_elem_t)(struct xdr_array2_desc *desc, void *elem);
+struct xdr_array2_desc {
+        unsigned int elem_size;
+        unsigned int array_len;
+        xdr_xcode_elem_t xcode;
+};
+
+extern int xdr_decode_array2(struct xdr_buf *buf, unsigned int base,
+                             struct xdr_array2_desc *desc);
+extern int xdr_encode_array2(struct xdr_buf *buf, unsigned int base,
+                             struct xdr_array2_desc *desc);
+
 /*
  * Provide some simple tools for XDR buffer overflow-checking etc.
  */
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 2433e279e071..1309c12b8f71 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -437,6 +437,7 @@ struct snd_ac97_build_ops {
         void (*suspend) (ac97_t *ac97);
         void (*resume) (ac97_t *ac97);
 #endif
+        void (*update_jacks) (ac97_t *ac97);    /* for jack-sharing */
 };
 
 struct _snd_ac97_bus_ops {
@@ -516,6 +517,9 @@ struct _snd_ac97 {
                 } ad18xx;
                 unsigned int dev_flags;         /* device specific */
         } spec;
+        /* jack-sharing info */
+        unsigned char indep_surround;
+        unsigned char channel_mode;
 };
 
 /* conditions */
@@ -569,8 +573,8 @@ enum {
 };
 
 struct ac97_quirk {
-        unsigned short vendor;  /* PCI vendor id */
-        unsigned short device;  /* PCI device id */
+        unsigned short subvendor; /* PCI subsystem vendor id */
+        unsigned short subdevice; /* PCI sybsystem device id */
         unsigned short mask;    /* device id bit mask, 0 = accept all */
         unsigned int codec_id;  /* codec id (if any), 0 = accept all */
         const char *name;       /* name shown as info */
diff --git a/include/sound/asound.h b/include/sound/asound.h
index a4d149f34541..9974f83cca44 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -113,9 +113,10 @@ enum sndrv_hwdep_iface {
         SNDRV_HWDEP_IFACE_BLUETOOTH,    /* Bluetooth audio */
         SNDRV_HWDEP_IFACE_USX2Y_PCM,    /* Tascam US122, US224 & US428 rawusb pcm */
         SNDRV_HWDEP_IFACE_PCXHR,        /* Digigram PCXHR */
+        SNDRV_HWDEP_IFACE_SB_RC,        /* SB Extigy/Audigy2NX remote control */
 
         /* Don't forget to change the following: */
-        SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_PCXHR
+        SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_SB_RC
 };
 
 struct sndrv_hwdep_info {
@@ -344,7 +345,7 @@ enum sndrv_pcm_hw_param {
         SNDRV_PCM_HW_PARAM_LAST_INTERVAL = SNDRV_PCM_HW_PARAM_TICK_TIME
 };
 
-#define SNDRV_PCM_HW_PARAMS_RUNTIME             (1<<0)
+#define SNDRV_PCM_HW_PARAMS_NORESAMPLE          (1<<0)  /* avoid rate resampling */
 
 struct sndrv_interval {
         unsigned int min, max;
@@ -559,7 +560,7 @@ enum {
  *  Timer section - /dev/snd/timer
  */
 
-#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_TIMER_VERSION             SNDRV_PROTOCOL_VERSION(2, 0, 4)
 
 enum sndrv_timer_class {
         SNDRV_TIMER_CLASS_NONE = -1,
@@ -672,10 +673,11 @@ enum {
         SNDRV_TIMER_IOCTL_INFO = _IOR('T', 0x11, struct sndrv_timer_info),
         SNDRV_TIMER_IOCTL_PARAMS = _IOW('T', 0x12, struct sndrv_timer_params),
         SNDRV_TIMER_IOCTL_STATUS = _IOR('T', 0x14, struct sndrv_timer_status),
-        SNDRV_TIMER_IOCTL_START = _IO('T', 0x20),
-        SNDRV_TIMER_IOCTL_STOP = _IO('T', 0x21),
-        SNDRV_TIMER_IOCTL_CONTINUE = _IO('T', 0x22),
-        SNDRV_TIMER_IOCTL_PAUSE = _IO('T', 0x23),
+        /* The following four ioctls are changed since 1.0.9 due to confliction */
+        SNDRV_TIMER_IOCTL_START = _IO('T', 0xa0),
+        SNDRV_TIMER_IOCTL_STOP = _IO('T', 0xa1),
+        SNDRV_TIMER_IOCTL_CONTINUE = _IO('T', 0xa2),
+        SNDRV_TIMER_IOCTL_PAUSE = _IO('T', 0xa3),
 };
 
 struct sndrv_timer_read {
diff --git a/include/sound/control.h b/include/sound/control.h
index 7b9444cd02f4..ef7903c7a327 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -106,7 +106,7 @@ typedef int (*snd_kctl_ioctl_func_t) (snd_card_t * card,
 void snd_ctl_notify(snd_card_t * card, unsigned int mask, snd_ctl_elem_id_t * id);
 
 snd_kcontrol_t *snd_ctl_new(snd_kcontrol_t * kcontrol, unsigned int access);
-snd_kcontrol_t *snd_ctl_new1(snd_kcontrol_new_t * kcontrolnew, void * private_data);
+snd_kcontrol_t *snd_ctl_new1(const snd_kcontrol_new_t * kcontrolnew, void * private_data);
 void snd_ctl_free_one(snd_kcontrol_t * kcontrol);
 int snd_ctl_add(snd_card_t * card, snd_kcontrol_t * kcontrol);
 int snd_ctl_remove(snd_card_t * card, snd_kcontrol_t * kcontrol);
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 43b6786abae5..c50b91958ff9 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -83,7 +83,8 @@
 #define IPR                     0x08            /* Global interrupt pending register            */
                                                 /* Clear pending interrupts by writing a 1 to   */
                                                 /* the relevant bits and zero to the other bits */
-
+#define IPR_P16V                0x80000000      /* Bit set when the CA0151 P16V chip wishes
+                                                   to interrupt */
 #define IPR_GPIOMSG             0x20000000      /* GPIO message interrupt (RE'd, still not sure 
                                                    which INTE bits enable it)                   */
 
@@ -746,6 +747,7 @@
                                                 /* Assumes sample lock                          */
 
 /* These three bitfields apply to CDSRCS, GPSRCS, and (except as noted) ZVSRCS.                 */
+#define SRCS_SPDIFVALID         0x04000000      /* SPDIF stream valid                           */
 #define SRCS_SPDIFLOCKED        0x02000000      /* SPDIF stream locked                          */
 #define SRCS_RATELOCKED         0x01000000      /* Sample rate locked                           */
 #define SRCS_ESTSAMPLERATE      0x0007ffff      /* Do not modify this field.                    */
@@ -803,10 +805,26 @@
 #define A_FXWC2                 0x75            /* Selects 0x9f-0x80 for FX recording           */
 
 #define A_SPDIF_SAMPLERATE      0x76            /* Set the sample rate of SPDIF output          */
-#define A_SPDIF_RATE_MASK       0x000000c0
+#define A_SAMPLE_RATE           0x76            /* Various sample rate settings. */
+#define A_SAMPLE_RATE_NOT_USED  0x0ffc111e      /* Bits that are not used and cannot be set.    */
+#define A_SAMPLE_RATE_UNKNOWN   0xf0030001      /* Bits that can be set, but have unknown use.  */
+#define A_SPDIF_RATE_MASK       0x000000e0      /* Any other values for rates, just use 48000   */
 #define A_SPDIF_48000           0x00000000
-#define A_SPDIF_44100           0x00000080
+#define A_SPDIF_192000          0x00000020
 #define A_SPDIF_96000           0x00000040
+#define A_SPDIF_44100           0x00000080
+
+#define A_I2S_CAPTURE_RATE_MASK 0x00000e00      /* This sets the capture PCM rate, but it is    */
+#define A_I2S_CAPTURE_48000     0x00000000      /* unclear if this sets the ADC rate as well.   */
+#define A_I2S_CAPTURE_192000    0x00000200
+#define A_I2S_CAPTURE_96000     0x00000400
+#define A_I2S_CAPTURE_44100     0x00000800
+
+#define A_PCM_RATE_MASK         0x0000e000      /* This sets the playback PCM rate on the P16V  */
+#define A_PCM_48000             0x00000000
+#define A_PCM_192000            0x00002000
+#define A_PCM_96000             0x00004000
+#define A_PCM_44100             0x00008000
 
 /* 0x77,0x78,0x79 "something i2s-related" - default to 0x01080000 on my audigy 2 ZS --rlrevell  */
 /* 0x7a, 0x7b - lookup tables */
@@ -1039,28 +1057,28 @@ typedef struct {
         u32 vendor;
         u32 device;
         u32 subsystem;
+        unsigned char revision;
         unsigned char emu10k1_chip; /* Original SB Live. Not SB Live 24bit. */
         unsigned char emu10k2_chip; /* Audigy 1 or Audigy 2. */
         unsigned char ca0102_chip;  /* Audigy 1 or Audigy 2. Not SB Audigy 2 Value. */
         unsigned char ca0108_chip;  /* Audigy 2 Value */
         unsigned char ca0151_chip;  /* P16V */
         unsigned char spk71;        /* Has 7.1 speakers */
+        unsigned char sblive51;     /* SBLive! 5.1 - extout 0x11 -> center, 0x12 -> lfe */
         unsigned char spdif_bug;    /* Has Spdif phasing bug */
         unsigned char ac97_chip;    /* Has an AC97 chip */
         unsigned char ecard;        /* APS EEPROM */
-        char * driver;
-        char * name;
+        const char *driver;
+        const char *name;
+        const char *id;         /* for backward compatibility - can be NULL if not needed */
 } emu_chip_details_t;
 
 struct _snd_emu10k1 {
         int irq;
 
         unsigned long port;                     /* I/O port number */
-        unsigned int APS: 1,                    /* APS flag */
-            no_ac97: 1,                         /* no AC'97 */
-            tos_link: 1,                        /* tos link detected */
-            rear_ac97: 1,                       /* rear channels are on AC'97 */
-            spk71:1;                            /* 7.1 configuration (Audigy 2 ZS) */
+        unsigned int tos_link: 1,               /* tos link detected */
+            rear_ac97: 1;                       /* rear channels are on AC'97 */
         const emu_chip_details_t *card_capabilities;    /* Contains profile of card capabilities */
         unsigned int audigy;                    /* is Audigy? */
         unsigned int revision;                  /* chip revision */
@@ -1109,7 +1127,10 @@ struct _snd_emu10k1 {
 
         emu10k1_voice_t voices[NUM_G];
         emu10k1_voice_t p16v_voices[4];
+        emu10k1_voice_t p16v_capture_voice;
         int p16v_device_offset;
+        u32 p16v_capture_source;
+        u32 p16v_capture_channel;
         emu10k1_pcm_mixer_t pcm_mixer[32];
         emu10k1_pcm_mixer_t efx_pcm_mixer[NUM_EFX_PLAYBACK];
         snd_kcontrol_t *ctl_send_routing;
@@ -1453,7 +1474,6 @@ int snd_emu10k1_fx8010_unregister_irq_handler(emu10k1_t *emu,
 #endif
 
 typedef struct {
-        unsigned int card;                      /* card type */
         unsigned int internal_tram_size;        /* in samples */
         unsigned int external_tram_size;        /* in samples */
         char fxbus_names[16][32];               /* names of FXBUSes */
diff --git a/include/sound/gus.h b/include/sound/gus.h
index 8b6287a6fff5..b4b461ca173d 100644
--- a/include/sound/gus.h
+++ b/include/sound/gus.h
@@ -526,9 +526,6 @@ extern void snd_gf1_adlib_write(snd_gus_card_t * gus, unsigned char reg, unsigne
 extern void snd_gf1_dram_addr(snd_gus_card_t * gus, unsigned int addr);
 extern void snd_gf1_poke(snd_gus_card_t * gus, unsigned int addr, unsigned char data);
 extern unsigned char snd_gf1_peek(snd_gus_card_t * gus, unsigned int addr);
-extern void snd_gf1_pokew(snd_gus_card_t * gus, unsigned int addr, unsigned short data);
-extern unsigned short snd_gf1_peekw(snd_gus_card_t * gus, unsigned int addr);
-extern void snd_gf1_dram_setmem(snd_gus_card_t * gus, unsigned int addr, unsigned short value, unsigned int count);
 extern void snd_gf1_write_addr(snd_gus_card_t * gus, unsigned char reg, unsigned int addr, short w_16bit);
 extern unsigned int snd_gf1_read_addr(snd_gus_card_t * gus, unsigned char reg, short w_16bit);
 extern void snd_gf1_i_ctrl_stop(snd_gus_card_t * gus, unsigned char reg);
@@ -544,9 +541,6 @@ extern inline unsigned short snd_gf1_i_read16(snd_gus_card_t * gus, unsigned cha
 {
         return snd_gf1_i_look16(gus, reg | 0x80);
 }
-extern void snd_gf1_i_adlib_write(snd_gus_card_t * gus, unsigned char reg, unsigned char data);
-extern void snd_gf1_i_write_addr(snd_gus_card_t * gus, unsigned char reg, unsigned int addr, short w_16bit);
-extern unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus, unsigned char reg, short w_16bit);
 
 extern void snd_gf1_select_active_voices(snd_gus_card_t * gus);
 
@@ -580,10 +574,6 @@ extern void snd_gf1_lfo_command(snd_gus_card_t * gus, int voice, unsigned char *
 
 void snd_gf1_mem_lock(snd_gf1_mem_t * alloc, int xup);
 int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block);
-snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,
-                                      unsigned int address);
-snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,
-                                       unsigned int *share_id);
 snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner,
                                        char *name, int size, int w_16,
                                        int align, unsigned int *share_id);
@@ -608,23 +598,13 @@ int snd_gf1_dma_transfer_block(snd_gus_card_t * gus,
 /* gus_volume.c */
 
 unsigned short snd_gf1_lvol_to_gvol_raw(unsigned int vol);
-unsigned int snd_gf1_gvol_to_lvol_raw(unsigned short gf1_vol);
-unsigned int snd_gf1_calc_ramp_rate(snd_gus_card_t * gus,
-                                    unsigned short start,
-                                    unsigned short end,
-                                    unsigned int us);
 unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq2);
-unsigned short snd_gf1_compute_pitchbend(unsigned short pitchbend, unsigned short sens);
-unsigned short snd_gf1_compute_freq(unsigned int freq,
-                                    unsigned int rate,
-                                    unsigned short mix_rate);
 
 /* gus_reset.c */
 
 void snd_gf1_set_default_handlers(snd_gus_card_t * gus, unsigned int what);
 void snd_gf1_smart_stop_voice(snd_gus_card_t * gus, unsigned short voice);
 void snd_gf1_stop_voice(snd_gus_card_t * gus, unsigned short voice);
-void snd_gf1_clear_voices(snd_gus_card_t * gus, unsigned short v_min, unsigned short v_max);
 void snd_gf1_stop_voices(snd_gus_card_t * gus, unsigned short v_min, unsigned short v_max);
 snd_gus_voice_t *snd_gf1_alloc_voice(snd_gus_card_t * gus, int type, int client, int port);
 void snd_gf1_free_voice(snd_gus_card_t * gus, snd_gus_voice_t *voice);
@@ -641,9 +621,6 @@ int snd_gf1_pcm_new(snd_gus_card_t * gus, int pcm_dev, int control_index, snd_pc
 
 #ifdef CONFIG_SND_DEBUG
 extern void snd_gf1_print_voice_registers(snd_gus_card_t * gus);
-extern void snd_gf1_print_global_registers(snd_gus_card_t * gus);
-extern void snd_gf1_print_setup_registers(snd_gus_card_t * gus);
-extern void snd_gf1_peek_print_block(snd_gus_card_t * gus, unsigned int addr, int count, int w_16bit);
 #endif
 
 /* gus.c */
diff --git a/include/sound/hdspm.h b/include/sound/hdspm.h
new file mode 100644
index 000000000000..c34427ccd0b3
--- /dev/null
+++ b/include/sound/hdspm.h
@@ -0,0 +1,131 @@
+#ifndef __SOUND_HDSPM_H         /* -*- linux-c -*- */
+#define __SOUND_HDSPM_H
+/*
+ *   Copyright (C) 2003 Winfried Ritsch (IEM)
+ *   based on hdsp.h from Thomas Charbonnel (thomas@undata.org)
+ *                      
+ *    
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
+#define HDSPM_MAX_CHANNELS      64
+
+/* -------------------- IOCTL Peak/RMS Meters -------------------- */
+
+typedef struct _snd_hdspm_peak_rms hdspm_peak_rms_t;
+
+/* peam rms level structure like we get from hardware 
+  
+   maybe in future we can memory map it so I just copy it
+   to user on ioctl call now an dont change anything
+   rms are made out of low and high values
+   where (long) ????_rms = (????_rms_l >> 8) + ((????_rms_h & 0xFFFFFF00)<<24)
+   (i asume so from the code)
+*/
+
+struct _snd_hdspm_peak_rms {
+
+        unsigned int level_offset[1024];
+
+        unsigned int input_peak[64];
+        unsigned int playback_peak[64];
+        unsigned int output_peak[64];
+        unsigned int xxx_peak[64];      /* not used */
+
+        unsigned int reserved[256];     /* not used */
+
+        unsigned int input_rms_l[64];
+        unsigned int playback_rms_l[64];
+        unsigned int output_rms_l[64];
+        unsigned int xxx_rms_l[64];     /* not used */
+
+        unsigned int input_rms_h[64];
+        unsigned int playback_rms_h[64];
+        unsigned int output_rms_h[64];
+        unsigned int xxx_rms_h[64];     /* not used */
+};
+
+struct sndrv_hdspm_peak_rms_ioctl {
+        hdspm_peak_rms_t *peak;
+};
+
+/* use indirect access due to the limit of ioctl bit size */
+#define SNDRV_HDSPM_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct sndrv_hdspm_peak_rms_ioctl)
+
+/* ------------ CONFIG block IOCTL ---------------------- */
+
+typedef struct _snd_hdspm_config_info hdspm_config_info_t;
+
+struct _snd_hdspm_config_info {
+        unsigned char pref_sync_ref;
+        unsigned char wordclock_sync_check;
+        unsigned char madi_sync_check;
+        unsigned int system_sample_rate;
+        unsigned int autosync_sample_rate;
+        unsigned char system_clock_mode;
+        unsigned char clock_source;
+        unsigned char autosync_ref;
+        unsigned char line_out;
+        unsigned int passthru;
+        unsigned int analog_out;
+};
+
+#define SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, hdspm_config_info_t)
+
+
+/* get Soundcard Version */
+
+typedef struct _snd_hdspm_version hdspm_version_t;
+
+struct _snd_hdspm_version {
+        unsigned short firmware_rev;
+};
+
+#define SNDRV_HDSPM_IOCTL_GET_VERSION _IOR('H', 0x43, hdspm_version_t)
+
+
+/* ------------- get Matrix Mixer IOCTL --------------- */
+
+/* MADI mixer: 64inputs+64playback in 64outputs = 8192 => *4Byte = 32768 Bytes */
+
+/* organisation is 64 channelfader in a continous memory block */
+/* equivalent to hardware definition, maybe for future feature of mmap of them */
+/* each of 64 outputs has 64 infader and 64 outfader: 
+   Ins to Outs mixer[out].in[in], Outstreams to Outs mixer[out].pb[pb] */
+
+#define HDSPM_MIXER_CHANNELS HDSPM_MAX_CHANNELS
+
+typedef struct _snd_hdspm_channelfader snd_hdspm_channelfader_t;
+
+struct _snd_hdspm_channelfader {
+        unsigned int in[HDSPM_MIXER_CHANNELS];
+        unsigned int pb[HDSPM_MIXER_CHANNELS];
+};
+
+typedef struct _snd_hdspm_mixer hdspm_mixer_t;
+
+struct _snd_hdspm_mixer {
+        snd_hdspm_channelfader_t ch[HDSPM_MIXER_CHANNELS];
+};
+
+struct sndrv_hdspm_mixer_ioctl {
+        hdspm_mixer_t *mixer;
+};
+
+/* use indirect access due to the limit of ioctl bit size */
+#define SNDRV_HDSPM_IOCTL_GET_MIXER _IOR('H', 0x44, struct sndrv_hdspm_mixer_ioctl)
+
+#endif                          /* __SOUND_HDSPM_H */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 53fc04d75bad..d935417575b5 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -848,23 +848,6 @@ int snd_interval_ratnum(snd_interval_t *i,
 
 void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params);
 void _snd_pcm_hw_param_setempty(snd_pcm_hw_params_t *params, snd_pcm_hw_param_t var);
-int snd_pcm_hw_param_min(snd_pcm_substream_t *substream, 
-                         snd_pcm_hw_params_t *params,
-                         snd_pcm_hw_param_t var,
-                         unsigned int val, int *dir);
-int snd_pcm_hw_param_max(snd_pcm_substream_t *substream, 
-                         snd_pcm_hw_params_t *params,
-                         snd_pcm_hw_param_t var,
-                         unsigned int val, int *dir);
-int snd_pcm_hw_param_setinteger(snd_pcm_substream_t *substream, 
-                                snd_pcm_hw_params_t *params,
-                                snd_pcm_hw_param_t var);
-int snd_pcm_hw_param_first(snd_pcm_substream_t *substream, 
-                           snd_pcm_hw_params_t *params,
-                           snd_pcm_hw_param_t var, int *dir);
-int snd_pcm_hw_param_last(snd_pcm_substream_t *substream, 
-                          snd_pcm_hw_params_t *params,
-                          snd_pcm_hw_param_t var, int *dir);
 int snd_pcm_hw_param_near(snd_pcm_substream_t *substream, 
                           snd_pcm_hw_params_t *params,
                           snd_pcm_hw_param_t var, 
@@ -876,7 +859,6 @@ int snd_pcm_hw_param_set(snd_pcm_substream_t *pcm,
 int snd_pcm_hw_params_choose(snd_pcm_substream_t *substream, snd_pcm_hw_params_t *params);
 
 int snd_pcm_hw_refine(snd_pcm_substream_t *substream, snd_pcm_hw_params_t *params);
-int snd_pcm_hw_params(snd_pcm_substream_t *substream, snd_pcm_hw_params_t *params);
 
 int snd_pcm_hw_constraints_init(snd_pcm_substream_t *substream);
 int snd_pcm_hw_constraints_complete(snd_pcm_substream_t *substream);
@@ -922,8 +904,22 @@ int snd_pcm_format_unsigned(snd_pcm_format_t format);
 int snd_pcm_format_linear(snd_pcm_format_t format);
 int snd_pcm_format_little_endian(snd_pcm_format_t format);
 int snd_pcm_format_big_endian(snd_pcm_format_t format);
+/**
+ * snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian
+ * @format: the format to check
+ *
+ * Returns 1 if the given PCM format is CPU-endian, 0 if
+ * opposite, or a negative error code if endian not specified.
+ */
+/* int snd_pcm_format_cpu_endian(snd_pcm_format_t format); */
+#ifdef SNDRV_LITTLE_ENDIAN
+#define snd_pcm_format_cpu_endian       snd_pcm_format_little_endian
+#else
+#define snd_pcm_format_cpu_endian       snd_pcm_format_big_endian
+#endif
 int snd_pcm_format_width(snd_pcm_format_t format);                      /* in bits */
 int snd_pcm_format_physical_width(snd_pcm_format_t format);             /* in bits */
+ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
 const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format);
 int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames);
 snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian);
diff --git a/include/sound/seq_midi_event.h b/include/sound/seq_midi_event.h
index 4357cac07500..8857e2bd31a5 100644
--- a/include/sound/seq_midi_event.h
+++ b/include/sound/seq_midi_event.h
@@ -41,9 +41,7 @@ struct snd_midi_event_t {
 };
 
 int snd_midi_event_new(int bufsize, snd_midi_event_t **rdev);
-int snd_midi_event_resize_buffer(snd_midi_event_t *dev, int bufsize);
 void snd_midi_event_free(snd_midi_event_t *dev);
-void snd_midi_event_init(snd_midi_event_t *dev);
 void snd_midi_event_reset_encode(snd_midi_event_t *dev);
 void snd_midi_event_reset_decode(snd_midi_event_t *dev);
 void snd_midi_event_no_status(snd_midi_event_t *dev, int on);
diff --git a/include/sound/seq_virmidi.h b/include/sound/seq_virmidi.h
index cf4e2388103f..1ad27e859af3 100644
--- a/include/sound/seq_virmidi.h
+++ b/include/sound/seq_virmidi.h
@@ -79,6 +79,5 @@ struct _snd_virmidi_dev {
 #define SNDRV_VIRMIDI_SEQ_DISPATCH      2
 
 int snd_virmidi_new(snd_card_t *card, int device, snd_rawmidi_t **rrmidi);
-int snd_virmidi_receive(snd_rawmidi_t *rmidi, snd_seq_event_t *ev);
 
 #endif /* __SOUND_SEQ_VIRMIDI */
diff --git a/include/sound/timer.h b/include/sound/timer.h
index 57fde990606e..1898511a0f38 100644
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
@@ -152,6 +152,4 @@ extern int snd_timer_pause(snd_timer_instance_t * timeri);
 
 extern void snd_timer_interrupt(snd_timer_t * timer, unsigned long ticks_left);
 
-extern unsigned int snd_timer_system_resolution(void);
-
 #endif /* __SOUND_TIMER_H */
diff --git a/include/sound/version.h b/include/sound/version.h
index 98b4230778ed..46acfa8c9988 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated by configure.  */
-#define CONFIG_SND_VERSION "1.0.9rc2"
-#define CONFIG_SND_DATE "  (Thu Mar 24 10:33:39 2005 UTC)"
+#define CONFIG_SND_VERSION "1.0.9"
+#define CONFIG_SND_DATE " (Sun May 29 07:31:02 2005 UTC)"
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 05107e0dc145..567b03b1c349 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -2,7 +2,7 @@
 # IP configuration
 #
 choice 
-        prompt "Choose IP: FIB lookup""
+        prompt "Choose IP: FIB lookup"
         depends on INET
         default IP_FIB_HASH
 
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 9bcec9b927b9..505e2d4b3d62 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -66,10 +66,10 @@ rpcauth_create(rpc_authflavor_t pseudoflavor, struct rpc_clnt *clnt)
         u32                     flavor = pseudoflavor_to_flavor(pseudoflavor);
 
         if (flavor >= RPC_AUTH_MAXFLAVOR || !(ops = auth_flavors[flavor]))
-                return NULL;
+                return ERR_PTR(-EINVAL);
         auth = ops->create(clnt, pseudoflavor);
-        if (!auth)
-                return NULL;
+        if (IS_ERR(auth))
+                return auth;
         if (clnt->cl_auth)
                 rpcauth_destroy(clnt->cl_auth);
         clnt->cl_auth = auth;
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index a33b627cbef4..2f7b867161d2 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -660,14 +660,16 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
 {
         struct gss_auth *gss_auth;
         struct rpc_auth * auth;
+        int err = -ENOMEM; /* XXX? */
 
         dprintk("RPC:      creating GSS authenticator for client %p\n",clnt);
 
         if (!try_module_get(THIS_MODULE))
-                return NULL;
+                return ERR_PTR(err);
         if (!(gss_auth = kmalloc(sizeof(*gss_auth), GFP_KERNEL)))
                 goto out_dec;
         gss_auth->client = clnt;
+        err = -EINVAL;
         gss_auth->mech = gss_mech_get_by_pseudoflavor(flavor);
         if (!gss_auth->mech) {
                 printk(KERN_WARNING "%s: Pseudoflavor %d not found!",
@@ -675,9 +677,8 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
                 goto err_free;
         }
         gss_auth->service = gss_pseudoflavor_to_service(gss_auth->mech, flavor);
-        /* FIXME: Will go away once privacy support is merged in */
-        if (gss_auth->service == RPC_GSS_SVC_PRIVACY)
-                gss_auth->service = RPC_GSS_SVC_INTEGRITY;
+        if (gss_auth->service == 0)
+                goto err_put_mech;
         INIT_LIST_HEAD(&gss_auth->upcalls);
         spin_lock_init(&gss_auth->lock);
         auth = &gss_auth->rpc_auth;
@@ -687,15 +688,18 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
         auth->au_flavor = flavor;
         atomic_set(&auth->au_count, 1);
 
-        if (rpcauth_init_credcache(auth, GSS_CRED_EXPIRE) < 0)
+        err = rpcauth_init_credcache(auth, GSS_CRED_EXPIRE);
+        if (err)
                 goto err_put_mech;
 
         snprintf(gss_auth->path, sizeof(gss_auth->path), "%s/%s",
                         clnt->cl_pathname,
                         gss_auth->mech->gm_name);
         gss_auth->dentry = rpc_mkpipe(gss_auth->path, clnt, &gss_upcall_ops, RPC_PIPE_WAIT_FOR_OPEN);
-        if (IS_ERR(gss_auth->dentry))
+        if (IS_ERR(gss_auth->dentry)) {
+                err = PTR_ERR(gss_auth->dentry);
                 goto err_put_mech;
+        }
 
         return auth;
 err_put_mech:
@@ -704,7 +708,7 @@ err_free:
         kfree(gss_auth);
 out_dec:
         module_put(THIS_MODULE);
-        return NULL;
+        return ERR_PTR(err);
 }
 
 static void
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 02bc029d46fe..f17e6153b688 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -97,12 +97,13 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
  * made to sleep too long.
  */
 struct rpc_clnt *
-rpc_create_client(struct rpc_xprt *xprt, char *servname,
+rpc_new_client(struct rpc_xprt *xprt, char *servname,
                   struct rpc_program *program, u32 vers,
                   rpc_authflavor_t flavor)
 {
         struct rpc_version      *version;
         struct rpc_clnt         *clnt = NULL;
+        struct rpc_auth         *auth;
         int err;
         int len;
 
@@ -157,10 +158,11 @@ rpc_create_client(struct rpc_xprt *xprt, char *servname,
         if (err < 0)
                 goto out_no_path;
 
-        err = -ENOMEM;
-        if (!rpcauth_create(flavor, clnt)) {
+        auth = rpcauth_create(flavor, clnt);
+        if (IS_ERR(auth)) {
                 printk(KERN_INFO "RPC: Couldn't create auth handle (flavor %u)\n",
                                 flavor);
+                err = PTR_ERR(auth);
                 goto out_no_auth;
         }
 
@@ -178,6 +180,37 @@ out_no_path:
                 kfree(clnt->cl_server);
         kfree(clnt);
 out_err:
+        xprt_destroy(xprt);
+        return ERR_PTR(err);
+}
+
+/**
+ * Create an RPC client
+ * @xprt - pointer to xprt struct
+ * @servname - name of server
+ * @info - rpc_program
+ * @version - rpc_program version
+ * @authflavor - rpc_auth flavour to use
+ *
+ * Creates an RPC client structure, then pings the server in order to
+ * determine if it is up, and if it supports this program and version.
+ *
+ * This function should never be called by asynchronous tasks such as
+ * the portmapper.
+ */
+struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,
+                struct rpc_program *info, u32 version, rpc_authflavor_t authflavor)
+{
+        struct rpc_clnt *clnt;
+        int err;
+        
+        clnt = rpc_new_client(xprt, servname, info, version, authflavor);
+        if (IS_ERR(clnt))
+                return clnt;
+        err = rpc_ping(clnt, RPC_TASK_SOFT|RPC_TASK_NOINTR);
+        if (err == 0)
+                return clnt;
+        rpc_shutdown_client(clnt);
         return ERR_PTR(err);
 }
 
@@ -208,6 +241,8 @@ rpc_clone_client(struct rpc_clnt *clnt)
         rpc_init_rtt(&new->cl_rtt_default, clnt->cl_xprt->timeout.to_initval);
         if (new->cl_auth)
                 atomic_inc(&new->cl_auth->au_count);
+        new->cl_pmap            = &new->cl_pmap_default;
+        rpc_init_wait_queue(&new->cl_pmap_default.pm_bindwait, "bindwait");
         return new;
 out_no_clnt:
         printk(KERN_INFO "RPC: out of memory in %s\n", __FUNCTION__);
@@ -296,6 +331,44 @@ rpc_release_client(struct rpc_clnt *clnt)
                 rpc_destroy_client(clnt);
 }
 
+/**
+ * rpc_bind_new_program - bind a new RPC program to an existing client
+ * @old - old rpc_client
+ * @program - rpc program to set
+ * @vers - rpc program version
+ *
+ * Clones the rpc client and sets up a new RPC program. This is mainly
+ * of use for enabling different RPC programs to share the same transport.
+ * The Sun NFSv2/v3 ACL protocol can do this.
+ */
+struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old,
+                                      struct rpc_program *program,
+                                      int vers)
+{
+        struct rpc_clnt *clnt;
+        struct rpc_version *version;
+        int err;
+
+        BUG_ON(vers >= program->nrvers || !program->version[vers]);
+        version = program->version[vers];
+        clnt = rpc_clone_client(old);
+        if (IS_ERR(clnt))
+                goto out;
+        clnt->cl_procinfo = version->procs;
+        clnt->cl_maxproc  = version->nrprocs;
+        clnt->cl_protname = program->name;
+        clnt->cl_prog     = program->number;
+        clnt->cl_vers     = version->number;
+        clnt->cl_stats    = program->stats;
+        err = rpc_ping(clnt, RPC_TASK_SOFT|RPC_TASK_NOINTR);
+        if (err != 0) {
+                rpc_shutdown_client(clnt);
+                clnt = ERR_PTR(err);
+        }
+out:    
+        return clnt;
+}
+
 /*
  * Default callback for async RPC calls
  */
@@ -305,38 +378,41 @@ rpc_default_callback(struct rpc_task *task)
 }
 
 /*
- *      Export the signal mask handling for aysnchronous code that
+ *      Export the signal mask handling for synchronous code that
  *      sleeps on RPC calls
  */
+#define RPC_INTR_SIGNALS (sigmask(SIGINT) | sigmask(SIGQUIT) | sigmask(SIGKILL))
  
+static void rpc_save_sigmask(sigset_t *oldset, int intr)
+{
+        unsigned long   sigallow = 0;
+        sigset_t sigmask;
+
+        /* Block all signals except those listed in sigallow */
+        if (intr)
+                sigallow |= RPC_INTR_SIGNALS;
+        siginitsetinv(&sigmask, sigallow);
+        sigprocmask(SIG_BLOCK, &sigmask, oldset);
+}
+
+static inline void rpc_task_sigmask(struct rpc_task *task, sigset_t *oldset)
+{
+        rpc_save_sigmask(oldset, !RPC_TASK_UNINTERRUPTIBLE(task));
+}
+
+static inline void rpc_restore_sigmask(sigset_t *oldset)
+{
+        sigprocmask(SIG_SETMASK, oldset, NULL);
+}
+
 void rpc_clnt_sigmask(struct rpc_clnt *clnt, sigset_t *oldset)
 {
-        unsigned long   sigallow = sigmask(SIGKILL);
-        unsigned long   irqflags;
-        
-        /* Turn off various signals */
-        if (clnt->cl_intr) {
-                struct k_sigaction *action = current->sighand->action;
-                if (action[SIGINT-1].sa.sa_handler == SIG_DFL)
-                        sigallow |= sigmask(SIGINT);
-                if (action[SIGQUIT-1].sa.sa_handler == SIG_DFL)
-                        sigallow |= sigmask(SIGQUIT);
-        }
-        spin_lock_irqsave(&current->sighand->siglock, irqflags);
-        *oldset = current->blocked;
-        siginitsetinv(&current->blocked, sigallow & ~oldset->sig[0]);
-        recalc_sigpending();
-        spin_unlock_irqrestore(&current->sighand->siglock, irqflags);
+        rpc_save_sigmask(oldset, clnt->cl_intr);
 }
 
 void rpc_clnt_sigunmask(struct rpc_clnt *clnt, sigset_t *oldset)
 {
-        unsigned long   irqflags;
-        
-        spin_lock_irqsave(&current->sighand->siglock, irqflags);
-        current->blocked = *oldset;
-        recalc_sigpending();
-        spin_unlock_irqrestore(&current->sighand->siglock, irqflags);
+        rpc_restore_sigmask(oldset);
 }
 
 /*
@@ -354,26 +430,26 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
 
         BUG_ON(flags & RPC_TASK_ASYNC);
 
-        rpc_clnt_sigmask(clnt, &oldset);                
-
         status = -ENOMEM;
         task = rpc_new_task(clnt, NULL, flags);
         if (task == NULL)
                 goto out;
 
+        /* Mask signals on RPC calls _and_ GSS_AUTH upcalls */
+        rpc_task_sigmask(task, &oldset);
+
         rpc_call_setup(task, msg, 0);
 
         /* Set up the call info struct and execute the task */
-        if (task->tk_status == 0)
+        if (task->tk_status == 0) {
                 status = rpc_execute(task);
-        else {
+        } else {
                 status = task->tk_status;
                 rpc_release_task(task);
         }
 
+        rpc_restore_sigmask(&oldset);
 out:
-        rpc_clnt_sigunmask(clnt, &oldset);              
-
         return status;
 }
 
@@ -394,8 +470,6 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
 
         flags |= RPC_TASK_ASYNC;
 
-        rpc_clnt_sigmask(clnt, &oldset);                
-
         /* Create/initialize a new RPC task */
         if (!callback)
                 callback = rpc_default_callback;
@@ -404,6 +478,9 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
                 goto out;
         task->tk_calldata = data;
 
+        /* Mask signals on GSS_AUTH upcalls */
+        rpc_task_sigmask(task, &oldset);                
+
         rpc_call_setup(task, msg, 0);
 
         /* Set up the call info struct and execute the task */
@@ -413,9 +490,8 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
         else
                 rpc_release_task(task);
 
+        rpc_restore_sigmask(&oldset);           
 out:
-        rpc_clnt_sigunmask(clnt, &oldset);              
-
         return status;
 }
 
@@ -593,7 +669,7 @@ call_allocate(struct rpc_task *task)
                 return;
         printk(KERN_INFO "RPC: buffer allocation failed for task %p\n", task); 
 
-        if (RPC_IS_ASYNC(task) || !(task->tk_client->cl_intr && signalled())) {
+        if (RPC_IS_ASYNC(task) || !signalled()) {
                 xprt_release(task);
                 task->tk_action = call_reserve;
                 rpc_delay(task, HZ>>4);
@@ -957,7 +1033,9 @@ call_header(struct rpc_task *task)
         *p++ = htonl(clnt->cl_prog);    /* program number */
         *p++ = htonl(clnt->cl_vers);    /* program version */
         *p++ = htonl(task->tk_msg.rpc_proc->p_proc);    /* procedure */
-        return rpcauth_marshcred(task, p);
+        p = rpcauth_marshcred(task, p);
+        req->rq_slen = xdr_adjust_iovec(&req->rq_svec[0], p);
+        return p;
 }
 
 /*
@@ -986,10 +1064,11 @@ call_verify(struct rpc_task *task)
                         case RPC_AUTH_ERROR:
                                 break;
                         case RPC_MISMATCH:
-                                printk(KERN_WARNING "%s: RPC call version mismatch!\n", __FUNCTION__);
-                                goto out_eio;
+                                dprintk("%s: RPC call version mismatch!\n", __FUNCTION__);
+                                error = -EPROTONOSUPPORT;
+                                goto out_err;
                         default:
-                                printk(KERN_WARNING "%s: RPC call rejected, unknown error: %x\n", __FUNCTION__, n);
+                                dprintk("%s: RPC call rejected, unknown error: %x\n", __FUNCTION__, n);
                                 goto out_eio;
                 }
                 if (--len < 0)
@@ -1040,23 +1119,26 @@ call_verify(struct rpc_task *task)
         case RPC_SUCCESS:
                 return p;
         case RPC_PROG_UNAVAIL:
-                printk(KERN_WARNING "RPC: call_verify: program %u is unsupported by server %s\n",
+                dprintk("RPC: call_verify: program %u is unsupported by server %s\n",
                                 (unsigned int)task->tk_client->cl_prog,
                                 task->tk_client->cl_server);
-                goto out_eio;
+                error = -EPFNOSUPPORT;
+                goto out_err;
         case RPC_PROG_MISMATCH:
-                printk(KERN_WARNING "RPC: call_verify: program %u, version %u unsupported by server %s\n",
+                dprintk("RPC: call_verify: program %u, version %u unsupported by server %s\n",
                                 (unsigned int)task->tk_client->cl_prog,
                                 (unsigned int)task->tk_client->cl_vers,
                                 task->tk_client->cl_server);
-                goto out_eio;
+                error = -EPROTONOSUPPORT;
+                goto out_err;
         case RPC_PROC_UNAVAIL:
-                printk(KERN_WARNING "RPC: call_verify: proc %p unsupported by program %u, version %u on server %s\n",
+                dprintk("RPC: call_verify: proc %p unsupported by program %u, version %u on server %s\n",
                                 task->tk_msg.rpc_proc,
                                 task->tk_client->cl_prog,
                                 task->tk_client->cl_vers,
                                 task->tk_client->cl_server);
-                goto out_eio;
+                error = -EOPNOTSUPP;
+                goto out_err;
         case RPC_GARBAGE_ARGS:
                 dprintk("RPC: %4d %s: server saw garbage\n", task->tk_pid, __FUNCTION__);
                 break;                  /* retry */
@@ -1069,7 +1151,7 @@ out_retry:
         task->tk_client->cl_stats->rpcgarbage++;
         if (task->tk_garb_retry) {
                 task->tk_garb_retry--;
-                dprintk(KERN_WARNING "RPC %s: retrying %4d\n", __FUNCTION__, task->tk_pid);
+                dprintk("RPC %s: retrying %4d\n", __FUNCTION__, task->tk_pid);
                 task->tk_action = call_bind;
                 return NULL;
         }
@@ -1083,3 +1165,30 @@ out_overflow:
         printk(KERN_WARNING "RPC %s: server reply was truncated.\n", __FUNCTION__);
         goto out_retry;
 }
+
+static int rpcproc_encode_null(void *rqstp, u32 *data, void *obj)
+{
+        return 0;
+}
+
+static int rpcproc_decode_null(void *rqstp, u32 *data, void *obj)
+{
+        return 0;
+}
+
+static struct rpc_procinfo rpcproc_null = {
+        .p_encode = rpcproc_encode_null,
+        .p_decode = rpcproc_decode_null,
+};
+
+int rpc_ping(struct rpc_clnt *clnt, int flags)
+{
+        struct rpc_message msg = {
+                .rpc_proc = &rpcproc_null,
+        };
+        int err;
+        msg.rpc_cred = authnull_ops.lookup_cred(NULL, NULL, 0);
+        err = rpc_call_sync(clnt, &msg, flags);
+        put_rpccred(msg.rpc_cred);
+        return err;
+}
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index d0b1d2c34a4d..4e81f2766923 100644
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -53,6 +53,9 @@ rpc_getport(struct rpc_task *task, struct rpc_clnt *clnt)
                         task->tk_pid, clnt->cl_server,
                         map->pm_prog, map->pm_vers, map->pm_prot);
 
+        /* Autobind on cloned rpc clients is discouraged */
+        BUG_ON(clnt->cl_parent != clnt);
+
         spin_lock(&pmap_lock);
         if (map->pm_binding) {
                 rpc_sleep_on(&map->pm_bindwait, task, NULL, NULL);
@@ -207,12 +210,10 @@ pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto)
         xprt->addr.sin_port = htons(RPC_PMAP_PORT);
 
         /* printk("pmap: create clnt\n"); */
-        clnt = rpc_create_client(xprt, hostname,
+        clnt = rpc_new_client(xprt, hostname,
                                 &pmap_program, RPC_PMAP_VERSION,
                                 RPC_AUTH_UNIX);
-        if (IS_ERR(clnt)) {
-                xprt_destroy(xprt);
-        } else {
+        if (!IS_ERR(clnt)) {
                 clnt->cl_softrtry = 1;
                 clnt->cl_chatty   = 1;
                 clnt->cl_oneshot  = 1;
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index c06614d0e31d..2d9eb7fbd521 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -290,7 +290,7 @@ static void rpc_make_runnable(struct rpc_task *task)
                         return;
                 }
         } else
-                wake_up(&task->u.tk_wait.waitq);
+                wake_up_bit(&task->tk_runstate, RPC_TASK_QUEUED);
 }
 
 /*
@@ -555,6 +555,38 @@ __rpc_atrun(struct rpc_task *task)
 }
 
 /*
+ * Helper that calls task->tk_exit if it exists and then returns
+ * true if we should exit __rpc_execute.
+ */
+static inline int __rpc_do_exit(struct rpc_task *task)
+{
+        if (task->tk_exit != NULL) {
+                lock_kernel();
+                task->tk_exit(task);
+                unlock_kernel();
+                /* If tk_action is non-null, we should restart the call */
+                if (task->tk_action != NULL) {
+                        if (!RPC_ASSASSINATED(task)) {
+                                /* Release RPC slot and buffer memory */
+                                xprt_release(task);
+                                rpc_free(task);
+                                return 0;
+                        }
+                        printk(KERN_ERR "RPC: dead task tried to walk away.\n");
+                }
+        }
+        return 1;
+}
+
+static int rpc_wait_bit_interruptible(void *word)
+{
+        if (signal_pending(current))
+                return -ERESTARTSYS;
+        schedule();
+        return 0;
+}
+
+/*
  * This is the RPC `scheduler' (or rather, the finite state machine).
  */
 static int __rpc_execute(struct rpc_task *task)
@@ -566,8 +598,7 @@ static int __rpc_execute(struct rpc_task *task)
 
         BUG_ON(RPC_IS_QUEUED(task));
 
- restarted:
-        while (1) {
+        for (;;) {
                 /*
                  * Garbage collection of pending timers...
                  */
@@ -600,11 +631,12 @@ static int __rpc_execute(struct rpc_task *task)
                  * by someone else.
                  */
                 if (!RPC_IS_QUEUED(task)) {
-                        if (!task->tk_action)
+                        if (task->tk_action != NULL) {
+                                lock_kernel();
+                                task->tk_action(task);
+                                unlock_kernel();
+                        } else if (__rpc_do_exit(task))
                                 break;
-                        lock_kernel();
-                        task->tk_action(task);
-                        unlock_kernel();
                 }
 
                 /*
@@ -624,44 +656,26 @@ static int __rpc_execute(struct rpc_task *task)
 
                 /* sync task: sleep here */
                 dprintk("RPC: %4d sync task going to sleep\n", task->tk_pid);
-                if (RPC_TASK_UNINTERRUPTIBLE(task)) {
-                        __wait_event(task->u.tk_wait.waitq, !RPC_IS_QUEUED(task));
-                } else {
-                        __wait_event_interruptible(task->u.tk_wait.waitq, !RPC_IS_QUEUED(task), status);
+                /* Note: Caller should be using rpc_clnt_sigmask() */
+                status = out_of_line_wait_on_bit(&task->tk_runstate,
+                                RPC_TASK_QUEUED, rpc_wait_bit_interruptible,
+                                TASK_INTERRUPTIBLE);
+                if (status == -ERESTARTSYS) {
                         /*
                          * When a sync task receives a signal, it exits with
                          * -ERESTARTSYS. In order to catch any callbacks that
                          * clean up after sleeping on some queue, we don't
                          * break the loop here, but go around once more.
                          */
-                        if (status == -ERESTARTSYS) {
-                                dprintk("RPC: %4d got signal\n", task->tk_pid);
-                                task->tk_flags |= RPC_TASK_KILLED;
-                                rpc_exit(task, -ERESTARTSYS);
-                                rpc_wake_up_task(task);
-                        }
+                        dprintk("RPC: %4d got signal\n", task->tk_pid);
+                        task->tk_flags |= RPC_TASK_KILLED;
+                        rpc_exit(task, -ERESTARTSYS);
+                        rpc_wake_up_task(task);
                 }
                 rpc_set_running(task);
                 dprintk("RPC: %4d sync task resuming\n", task->tk_pid);
         }
 
-        if (task->tk_exit) {
-                lock_kernel();
-                task->tk_exit(task);
-                unlock_kernel();
-                /* If tk_action is non-null, the user wants us to restart */
-                if (task->tk_action) {
-                        if (!RPC_ASSASSINATED(task)) {
-                                /* Release RPC slot and buffer memory */
-                                if (task->tk_rqstp)
-                                        xprt_release(task);
-                                rpc_free(task);
-                                goto restarted;
-                        }
-                        printk(KERN_ERR "RPC: dead task tries to walk away.\n");
-                }
-        }
-
         dprintk("RPC: %4d exit() = %d\n", task->tk_pid, task->tk_status);
         status = task->tk_status;
 
@@ -759,8 +773,6 @@ void rpc_init_task(struct rpc_task *task, struct rpc_clnt *clnt, rpc_action call
 
         /* Initialize workqueue for async tasks */
         task->tk_workqueue = rpciod_workqueue;
-        if (!RPC_IS_ASYNC(task))
-                init_waitqueue_head(&task->u.tk_wait.waitq);
 
         if (clnt) {
                 atomic_inc(&clnt->cl_users);
diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
index d4f26bf9e732..32e8acbc60fe 100644
--- a/net/sunrpc/sunrpc_syms.c
+++ b/net/sunrpc/sunrpc_syms.c
@@ -42,6 +42,7 @@ EXPORT_SYMBOL(rpc_release_task);
 /* RPC client functions */
 EXPORT_SYMBOL(rpc_create_client);
 EXPORT_SYMBOL(rpc_clone_client);
+EXPORT_SYMBOL(rpc_bind_new_program);
 EXPORT_SYMBOL(rpc_destroy_client);
 EXPORT_SYMBOL(rpc_shutdown_client);
 EXPORT_SYMBOL(rpc_release_client);
@@ -61,7 +62,6 @@ EXPORT_SYMBOL(rpc_mkpipe);
 
 /* Client transport */
 EXPORT_SYMBOL(xprt_create_proto);
-EXPORT_SYMBOL(xprt_destroy);
 EXPORT_SYMBOL(xprt_set_timeout);
 EXPORT_SYMBOL(xprt_udp_slot_table_entries);
 EXPORT_SYMBOL(xprt_tcp_slot_table_entries);
@@ -129,6 +129,10 @@ EXPORT_SYMBOL(xdr_encode_netobj);
 EXPORT_SYMBOL(xdr_encode_pages);
 EXPORT_SYMBOL(xdr_inline_pages);
 EXPORT_SYMBOL(xdr_shift_buf);
+EXPORT_SYMBOL(xdr_encode_word);
+EXPORT_SYMBOL(xdr_decode_word);
+EXPORT_SYMBOL(xdr_encode_array2);
+EXPORT_SYMBOL(xdr_decode_array2);
 EXPORT_SYMBOL(xdr_buf_from_iov);
 EXPORT_SYMBOL(xdr_buf_subsegment);
 EXPORT_SYMBOL(xdr_buf_read_netobj);
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index bb2d99f33315..e9bd91265f70 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -35,20 +35,24 @@ svc_create(struct svc_program *prog, unsigned int bufsize)
         if (!(serv = (struct svc_serv *) kmalloc(sizeof(*serv), GFP_KERNEL)))
                 return NULL;
         memset(serv, 0, sizeof(*serv));
+        serv->sv_name      = prog->pg_name;
         serv->sv_program   = prog;
         serv->sv_nrthreads = 1;
         serv->sv_stats     = prog->pg_stats;
         serv->sv_bufsz     = bufsize? bufsize : 4096;
-        prog->pg_lovers = prog->pg_nvers-1;
         xdrsize = 0;
-        for (vers=0; vers<prog->pg_nvers ; vers++)
-                if (prog->pg_vers[vers]) {
-                        prog->pg_hivers = vers;
-                        if (prog->pg_lovers > vers)
-                                prog->pg_lovers = vers;
-                        if (prog->pg_vers[vers]->vs_xdrsize > xdrsize)
-                                xdrsize = prog->pg_vers[vers]->vs_xdrsize;
-                }
+        while (prog) {
+                prog->pg_lovers = prog->pg_nvers-1;
+                for (vers=0; vers<prog->pg_nvers ; vers++)
+                        if (prog->pg_vers[vers]) {
+                                prog->pg_hivers = vers;
+                                if (prog->pg_lovers > vers)
+                                        prog->pg_lovers = vers;
+                                if (prog->pg_vers[vers]->vs_xdrsize > xdrsize)
+                                        xdrsize = prog->pg_vers[vers]->vs_xdrsize;
+                        }
+                prog = prog->pg_next;
+        }
         serv->sv_xdrsize   = xdrsize;
         INIT_LIST_HEAD(&serv->sv_threads);
         INIT_LIST_HEAD(&serv->sv_sockets);
@@ -56,8 +60,6 @@ svc_create(struct svc_program *prog, unsigned int bufsize)
         INIT_LIST_HEAD(&serv->sv_permsocks);
         spin_lock_init(&serv->sv_lock);
 
-        serv->sv_name      = prog->pg_name;
-
         /* Remove any stale portmap registrations */
         svc_register(serv, 0, 0);
 
@@ -281,6 +283,7 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp)
         rqstp->rq_res.len = 0;
         rqstp->rq_res.page_base = 0;
         rqstp->rq_res.page_len = 0;
+        rqstp->rq_res.buflen = PAGE_SIZE;
         rqstp->rq_res.tail[0].iov_len = 0;
         /* tcp needs a space for the record length... */
         if (rqstp->rq_prot == IPPROTO_TCP)
@@ -338,7 +341,10 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp)
                 goto sendit;
         }
                 
-        if (prog != progp->pg_prog)
+        for (progp = serv->sv_program; progp; progp = progp->pg_next)
+                if (prog == progp->pg_prog)
+                        break;
+        if (progp == NULL)
                 goto err_bad_prog;
 
         if (vers >= progp->pg_nvers ||
@@ -451,11 +457,7 @@ err_bad_auth:
         goto sendit;
 
 err_bad_prog:
-#ifdef RPC_PARANOIA
-        if (prog != 100227 || progp->pg_prog != 100003)
-                printk("svc: unknown program %d (me %d)\n", prog, progp->pg_prog);
-        /* else it is just a Solaris client seeing if ACLs are supported */
-#endif
+        dprintk("svc: unknown program %d\n", prog);
         serv->sv_stats->rpcbadfmt++;
         svc_putu32(resv, rpc_prog_unavail);
         goto sendit;
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 67b9f035ba86..8a4d9c106af1 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -176,21 +176,23 @@ xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset,
         xdr->buflen += len;
 }
 
-void
+ssize_t
 xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base,
                           skb_reader_t *desc,
                           skb_read_actor_t copy_actor)
 {
         struct page     **ppage = xdr->pages;
         unsigned int    len, pglen = xdr->page_len;
+        ssize_t         copied = 0;
         int             ret;
 
         len = xdr->head[0].iov_len;
         if (base < len) {
                 len -= base;
                 ret = copy_actor(desc, (char *)xdr->head[0].iov_base + base, len);
+                copied += ret;
                 if (ret != len || !desc->count)
-                        return;
+                        goto out;
                 base = 0;
         } else
                 base -= len;
@@ -210,6 +212,17 @@ xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base,
         do {
                 char *kaddr;
 
+                /* ACL likes to be lazy in allocating pages - ACLs
+                 * are small by default but can get huge. */
+                if (unlikely(*ppage == NULL)) {
+                        *ppage = alloc_page(GFP_ATOMIC);
+                        if (unlikely(*ppage == NULL)) {
+                                if (copied == 0)
+                                        copied = -ENOMEM;
+                                goto out;
+                        }
+                }
+
                 len = PAGE_CACHE_SIZE;
                 kaddr = kmap_atomic(*ppage, KM_SKB_SUNRPC_DATA);
                 if (base) {
@@ -225,14 +238,17 @@ xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base,
                 }
                 flush_dcache_page(*ppage);
                 kunmap_atomic(kaddr, KM_SKB_SUNRPC_DATA);
+                copied += ret;
                 if (ret != len || !desc->count)
-                        return;
+                        goto out;
                 ppage++;
         } while ((pglen -= len) != 0);
 copy_tail:
         len = xdr->tail[0].iov_len;
         if (base < len)
-                copy_actor(desc, (char *)xdr->tail[0].iov_base + base, len - base);
+                copied += copy_actor(desc, (char *)xdr->tail[0].iov_base + base, len - base);
+out:
+        return copied;
 }
 
 
@@ -616,12 +632,24 @@ xdr_shift_buf(struct xdr_buf *buf, size_t len)
 void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p)
 {
         struct kvec *iov = buf->head;
+        int scratch_len = buf->buflen - buf->page_len - buf->tail[0].iov_len;
 
+        BUG_ON(scratch_len < 0);
         xdr->buf = buf;
         xdr->iov = iov;
-        xdr->end = (uint32_t *)((char *)iov->iov_base + iov->iov_len);
-        buf->len = iov->iov_len = (char *)p - (char *)iov->iov_base;
-        xdr->p = p;
+        xdr->p = (uint32_t *)((char *)iov->iov_base + iov->iov_len);
+        xdr->end = (uint32_t *)((char *)iov->iov_base + scratch_len);
+        BUG_ON(iov->iov_len > scratch_len);
+
+        if (p != xdr->p && p != NULL) {
+                size_t len;
+
+                BUG_ON(p < xdr->p || p > xdr->end);
+                len = (char *)p - (char *)xdr->p;
+                xdr->p = p;
+                buf->len += len;
+                iov->iov_len += len;
+        }
 }
 EXPORT_SYMBOL(xdr_init_encode);
 
@@ -859,8 +887,34 @@ out:
         return status;
 }
 
-static int
-read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj)
+/* obj is assumed to point to allocated memory of size at least len: */
+int
+write_bytes_to_xdr_buf(struct xdr_buf *buf, int base, void *obj, int len)
+{
+        struct xdr_buf subbuf;
+        int this_len;
+        int status;
+
+        status = xdr_buf_subsegment(buf, &subbuf, base, len);
+        if (status)
+                goto out;
+        this_len = min(len, (int)subbuf.head[0].iov_len);
+        memcpy(subbuf.head[0].iov_base, obj, this_len);
+        len -= this_len;
+        obj += this_len;
+        this_len = min(len, (int)subbuf.page_len);
+        if (this_len)
+                _copy_to_pages(subbuf.pages, subbuf.page_base, obj, this_len);
+        len -= this_len;
+        obj += this_len;
+        this_len = min(len, (int)subbuf.tail[0].iov_len);
+        memcpy(subbuf.tail[0].iov_base, obj, this_len);
+out:
+        return status;
+}
+
+int
+xdr_decode_word(struct xdr_buf *buf, int base, u32 *obj)
 {
         u32     raw;
         int     status;
@@ -872,6 +926,14 @@ read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj)
         return 0;
 }
 
+int
+xdr_encode_word(struct xdr_buf *buf, int base, u32 obj)
+{
+        u32     raw = htonl(obj);
+
+        return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj));
+}
+
 /* If the netobj starting offset bytes from the start of xdr_buf is contained
  * entirely in the head or the tail, set object to point to it; otherwise
  * try to find space for it at the end of the tail, copy it there, and
@@ -882,7 +944,7 @@ xdr_buf_read_netobj(struct xdr_buf *buf, struct xdr_netobj *obj, int offset)
         u32     tail_offset = buf->head[0].iov_len + buf->page_len;
         u32     obj_end_offset;
 
-        if (read_u32_from_xdr_buf(buf, offset, &obj->len))
+        if (xdr_decode_word(buf, offset, &obj->len))
                 goto out;
         obj_end_offset = offset + 4 + obj->len;
 
@@ -915,3 +977,219 @@ xdr_buf_read_netobj(struct xdr_buf *buf, struct xdr_netobj *obj, int offset)
 out:
         return -1;
 }
+
+/* Returns 0 on success, or else a negative error code. */
+static int
+xdr_xcode_array2(struct xdr_buf *buf, unsigned int base,
+                 struct xdr_array2_desc *desc, int encode)
+{
+        char *elem = NULL, *c;
+        unsigned int copied = 0, todo, avail_here;
+        struct page **ppages = NULL;
+        int err;
+
+        if (encode) {
+                if (xdr_encode_word(buf, base, desc->array_len) != 0)
+                        return -EINVAL;
+        } else {
+                if (xdr_decode_word(buf, base, &desc->array_len) != 0 ||
+                    (unsigned long) base + 4 + desc->array_len *
+                                    desc->elem_size > buf->len)
+                        return -EINVAL;
+        }
+        base += 4;
+
+        if (!desc->xcode)
+                return 0;
+
+        todo = desc->array_len * desc->elem_size;
+
+        /* process head */
+        if (todo && base < buf->head->iov_len) {
+                c = buf->head->iov_base + base;
+                avail_here = min_t(unsigned int, todo,
+                                   buf->head->iov_len - base);
+                todo -= avail_here;
+
+                while (avail_here >= desc->elem_size) {
+                        err = desc->xcode(desc, c);
+                        if (err)
+                                goto out;
+                        c += desc->elem_size;
+                        avail_here -= desc->elem_size;
+                }
+                if (avail_here) {
+                        if (!elem) {
+                                elem = kmalloc(desc->elem_size, GFP_KERNEL);
+                                err = -ENOMEM;
+                                if (!elem)
+                                        goto out;
+                        }
+                        if (encode) {
+                                err = desc->xcode(desc, elem);
+                                if (err)
+                                        goto out;
+                                memcpy(c, elem, avail_here);
+                        } else
+                                memcpy(elem, c, avail_here);
+                        copied = avail_here;
+                }
+                base = buf->head->iov_len;  /* align to start of pages */
+        }
+
+        /* process pages array */
+        base -= buf->head->iov_len;
+        if (todo && base < buf->page_len) {
+                unsigned int avail_page;
+
+                avail_here = min(todo, buf->page_len - base);
+                todo -= avail_here;
+
+                base += buf->page_base;
+                ppages = buf->pages + (base >> PAGE_CACHE_SHIFT);
+                base &= ~PAGE_CACHE_MASK;
+                avail_page = min_t(unsigned int, PAGE_CACHE_SIZE - base,
+                                        avail_here);
+                c = kmap(*ppages) + base;
+
+                while (avail_here) {
+                        avail_here -= avail_page;
+                        if (copied || avail_page < desc->elem_size) {
+                                unsigned int l = min(avail_page,
+                                        desc->elem_size - copied);
+                                if (!elem) {
+                                        elem = kmalloc(desc->elem_size,
+                                                       GFP_KERNEL);
+                                        err = -ENOMEM;
+                                        if (!elem)
+                                                goto out;
+                                }
+                                if (encode) {
+                                        if (!copied) {
+                                                err = desc->xcode(desc, elem);
+                                                if (err)
+                                                        goto out;
+                                        }
+                                        memcpy(c, elem + copied, l);
+                                        copied += l;
+                                        if (copied == desc->elem_size)
+                                                copied = 0;
+                                } else {
+                                        memcpy(elem + copied, c, l);
+                                        copied += l;
+                                        if (copied == desc->elem_size) {
+                                                err = desc->xcode(desc, elem);
+                                                if (err)
+                                                        goto out;
+                                                copied = 0;
+                                        }
+                                }
+                                avail_page -= l;
+                                c += l;
+                        }
+                        while (avail_page >= desc->elem_size) {
+                                err = desc->xcode(desc, c);
+                                if (err)
+                                        goto out;
+                                c += desc->elem_size;
+                                avail_page -= desc->elem_size;
+                        }
+                        if (avail_page) {
+                                unsigned int l = min(avail_page,
+                                            desc->elem_size - copied);
+                                if (!elem) {
+                                        elem = kmalloc(desc->elem_size,
+                                                       GFP_KERNEL);
+                                        err = -ENOMEM;
+                                        if (!elem)
+                                                goto out;
+                                }
+                                if (encode) {
+                                        if (!copied) {
+                                                err = desc->xcode(desc, elem);
+                                                if (err)
+                                                        goto out;
+                                        }
+                                        memcpy(c, elem + copied, l);
+                                        copied += l;
+                                        if (copied == desc->elem_size)
+                                                copied = 0;
+                                } else {
+                                        memcpy(elem + copied, c, l);
+                                        copied += l;
+                                        if (copied == desc->elem_size) {
+                                                err = desc->xcode(desc, elem);
+                                                if (err)
+                                                        goto out;
+                                                copied = 0;
+                                        }
+                                }
+                        }
+                        if (avail_here) {
+                                kunmap(*ppages);
+                                ppages++;
+                                c = kmap(*ppages);
+                        }
+
+                        avail_page = min(avail_here,
+                                 (unsigned int) PAGE_CACHE_SIZE);
+                }
+                base = buf->page_len;  /* align to start of tail */
+        }
+
+        /* process tail */
+        base -= buf->page_len;
+        if (todo) {
+                c = buf->tail->iov_base + base;
+                if (copied) {
+                        unsigned int l = desc->elem_size - copied;
+
+                        if (encode)
+                                memcpy(c, elem + copied, l);
+                        else {
+                                memcpy(elem + copied, c, l);
+                                err = desc->xcode(desc, elem);
+                                if (err)
+                                        goto out;
+                        }
+                        todo -= l;
+                        c += l;
+                }
+                while (todo) {
+                        err = desc->xcode(desc, c);
+                        if (err)
+                                goto out;
+                        c += desc->elem_size;
+                        todo -= desc->elem_size;
+                }
+        }
+        err = 0;
+
+out:
+        if (elem)
+                kfree(elem);
+        if (ppages)
+                kunmap(*ppages);
+        return err;
+}
+
+int
+xdr_decode_array2(struct xdr_buf *buf, unsigned int base,
+                  struct xdr_array2_desc *desc)
+{
+        if (base >= buf->len)
+                return -EINVAL;
+
+        return xdr_xcode_array2(buf, base, desc, 0);
+}
+
+int
+xdr_encode_array2(struct xdr_buf *buf, unsigned int base,
+                  struct xdr_array2_desc *desc)
+{
+        if ((unsigned long) base + 4 + desc->array_len * desc->elem_size >
+            buf->head->iov_len + buf->page_len + buf->tail->iov_len)
+                return -EINVAL;
+
+        return xdr_xcode_array2(buf, base, desc, 1);
+}
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index c74a6bb94074..eca92405948f 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -569,8 +569,11 @@ void xprt_connect(struct rpc_task *task)
                 if (xprt->sock != NULL)
                         schedule_delayed_work(&xprt->sock_connect,
                                         RPC_REESTABLISH_TIMEOUT);
-                else
+                else {
                         schedule_work(&xprt->sock_connect);
+                        if (!RPC_IS_ASYNC(task))
+                                flush_scheduled_work();
+                }
         }
         return;
  out_write:
@@ -725,7 +728,8 @@ csum_partial_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
                 goto no_checksum;
 
         desc.csum = csum_partial(skb->data, desc.offset, skb->csum);
-        xdr_partial_copy_from_skb(xdr, 0, &desc, skb_read_and_csum_bits);
+        if (xdr_partial_copy_from_skb(xdr, 0, &desc, skb_read_and_csum_bits) < 0)
+                return -1;
         if (desc.offset != skb->len) {
                 unsigned int csum2;
                 csum2 = skb_checksum(skb, desc.offset, skb->len - desc.offset, 0);
@@ -737,7 +741,8 @@ csum_partial_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
                 return -1;
         return 0;
 no_checksum:
-        xdr_partial_copy_from_skb(xdr, 0, &desc, skb_read_bits);
+        if (xdr_partial_copy_from_skb(xdr, 0, &desc, skb_read_bits) < 0)
+                return -1;
         if (desc.count)
                 return -1;
         return 0;
@@ -821,10 +826,15 @@ tcp_copy_data(skb_reader_t *desc, void *p, size_t len)
 {
         if (len > desc->count)
                 len = desc->count;
-        if (skb_copy_bits(desc->skb, desc->offset, p, len))
+        if (skb_copy_bits(desc->skb, desc->offset, p, len)) {
+                dprintk("RPC:      failed to copy %zu bytes from skb. %zu bytes remain\n",
+                                len, desc->count);
                 return 0;
+        }
         desc->offset += len;
         desc->count -= len;
+        dprintk("RPC:      copied %zu bytes from skb. %zu bytes remain\n",
+                        len, desc->count);
         return len;
 }
 
@@ -863,6 +873,8 @@ tcp_read_fraghdr(struct rpc_xprt *xprt, skb_reader_t *desc)
 static void
 tcp_check_recm(struct rpc_xprt *xprt)
 {
+        dprintk("RPC:      xprt = %p, tcp_copied = %lu, tcp_offset = %u, tcp_reclen = %u, tcp_flags = %lx\n",
+                        xprt, xprt->tcp_copied, xprt->tcp_offset, xprt->tcp_reclen, xprt->tcp_flags);
         if (xprt->tcp_offset == xprt->tcp_reclen) {
                 xprt->tcp_flags |= XPRT_COPY_RECM;
                 xprt->tcp_offset = 0;
@@ -907,6 +919,7 @@ tcp_read_request(struct rpc_xprt *xprt, skb_reader_t *desc)
         struct rpc_rqst *req;
         struct xdr_buf *rcvbuf;
         size_t len;
+        ssize_t r;
 
         /* Find and lock the request corresponding to this xid */
         spin_lock(&xprt->sock_lock);
@@ -927,15 +940,40 @@ tcp_read_request(struct rpc_xprt *xprt, skb_reader_t *desc)
                 len = xprt->tcp_reclen - xprt->tcp_offset;
                 memcpy(&my_desc, desc, sizeof(my_desc));
                 my_desc.count = len;
-                xdr_partial_copy_from_skb(rcvbuf, xprt->tcp_copied,
+                r = xdr_partial_copy_from_skb(rcvbuf, xprt->tcp_copied,
                                           &my_desc, tcp_copy_data);
-                desc->count -= len;
-                desc->offset += len;
+                desc->count -= r;
+                desc->offset += r;
         } else
-                xdr_partial_copy_from_skb(rcvbuf, xprt->tcp_copied,
+                r = xdr_partial_copy_from_skb(rcvbuf, xprt->tcp_copied,
                                           desc, tcp_copy_data);
-        xprt->tcp_copied += len;
-        xprt->tcp_offset += len;
+
+        if (r > 0) {
+                xprt->tcp_copied += r;
+                xprt->tcp_offset += r;
+        }
+        if (r != len) {
+                /* Error when copying to the receive buffer,
+                 * usually because we weren't able to allocate
+                 * additional buffer pages. All we can do now
+                 * is turn off XPRT_COPY_DATA, so the request
+                 * will not receive any additional updates,
+                 * and time out.
+                 * Any remaining data from this record will
+                 * be discarded.
+                 */
+                xprt->tcp_flags &= ~XPRT_COPY_DATA;
+                dprintk("RPC:      XID %08x truncated request\n",
+                                ntohl(xprt->tcp_xid));
+                dprintk("RPC:      xprt = %p, tcp_copied = %lu, tcp_offset = %u, tcp_reclen = %u\n",
+                                xprt, xprt->tcp_copied, xprt->tcp_offset, xprt->tcp_reclen);
+                goto out;
+        }
+
+        dprintk("RPC:      XID %08x read %u bytes\n",
+                        ntohl(xprt->tcp_xid), r);
+        dprintk("RPC:      xprt = %p, tcp_copied = %lu, tcp_offset = %u, tcp_reclen = %u\n",
+                        xprt, xprt->tcp_copied, xprt->tcp_offset, xprt->tcp_reclen);
 
         if (xprt->tcp_copied == req->rq_private_buf.buflen)
                 xprt->tcp_flags &= ~XPRT_COPY_DATA;
@@ -944,6 +982,7 @@ tcp_read_request(struct rpc_xprt *xprt, skb_reader_t *desc)
                         xprt->tcp_flags &= ~XPRT_COPY_DATA;
         }
 
+out:
         if (!(xprt->tcp_flags & XPRT_COPY_DATA)) {
                 dprintk("RPC: %4d received reply complete\n",
                                 req->rq_task->tk_pid);
@@ -967,6 +1006,7 @@ tcp_read_discard(struct rpc_xprt *xprt, skb_reader_t *desc)
         desc->count -= len;
         desc->offset += len;
         xprt->tcp_offset += len;
+        dprintk("RPC:      discarded %u bytes\n", len);
         tcp_check_recm(xprt);
 }
 
@@ -1064,8 +1104,7 @@ tcp_state_change(struct sock *sk)
         case TCP_SYN_RECV:
                 break;
         default:
-                if (xprt_test_and_clear_connected(xprt))
-                        rpc_wake_up_status(&xprt->pending, -ENOTCONN);
+                xprt_disconnect(xprt);
                 break;
         }
  out:
@@ -1203,6 +1242,8 @@ xprt_transmit(struct rpc_task *task)
                         list_add_tail(&req->rq_list, &xprt->recv);
                         spin_unlock_bh(&xprt->sock_lock);
                         xprt_reset_majortimeo(req);
+                        /* Turn off autodisconnect */
+                        del_singleshot_timer_sync(&xprt->timer);
                 }
         } else if (!req->rq_bytes_sent)
                 return;
@@ -1333,8 +1374,6 @@ xprt_reserve(struct rpc_task *task)
                 spin_lock(&xprt->xprt_lock);
                 do_xprt_reserve(task);
                 spin_unlock(&xprt->xprt_lock);
-                if (task->tk_rqstp)
-                        del_timer_sync(&xprt->timer);
         }
 }
 
@@ -1649,6 +1688,10 @@ xprt_shutdown(struct rpc_xprt *xprt)
         rpc_wake_up(&xprt->backlog);
         wake_up(&xprt->cong_wait);
         del_timer_sync(&xprt->timer);
+
+        /* synchronously wait for connect worker to finish */
+        cancel_delayed_work(&xprt->sock_connect);
+        flush_scheduled_work();
 }
 
 /*
diff --git a/sound/Kconfig b/sound/Kconfig
index 047d59ea0573..ee794ae06040 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -42,6 +42,11 @@ menu "Advanced Linux Sound Architecture"
 config SND
         tristate "Advanced Linux Sound Architecture"
         depends on SOUND
+        help
+          Say 'Y' or 'M' to enable ALSA (Advanced Linux Sound Architecture),
+          the new base sound system.
+
+          For more information, see <http://www.alsa-project.org/>
 
 source "sound/core/Kconfig"
 
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index cdacf4d3a387..34c1740aa6e9 100644
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -14,5 +14,11 @@ config SND_SA11XX_UDA1341
           To compile this driver as a module, choose M here: the module
           will be called snd-sa11xx-uda1341.
 
+config SND_ARMAACI
+        tristate "ARM PrimeCell PL041 AC Link support"
+        depends on SND && ARM_AMBA
+        select SND_PCM
+        select SND_AC97_CODEC
+
 endmenu
 
diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index d7e7dc0c3cdf..f74ec28e1068 100644
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -6,3 +6,6 @@ snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o 
+
+obj-$(CONFIG_SND_ARMAACI)       += snd-aaci.o
+snd-aaci-objs                   := aaci.o devdma.o
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
new file mode 100644
index 000000000000..08cc3ddca96f
--- /dev/null
+++ b/sound/arm/aaci.c
@@ -0,0 +1,968 @@
+/*
+ *  linux/sound/arm/aaci.c - ARM PrimeCell AACI PL041 driver
+ *
+ *  Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *  Documentation: ARM DDI 0173B
+ */
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/hardware/amba.h>
+
+#include <sound/driver.h>
+#include <sound/core.h>
+#include <sound/initval.h>
+#include <sound/ac97_codec.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+
+#include "aaci.h"
+#include "devdma.h"
+
+#define DRIVER_NAME     "aaci-pl041"
+
+/*
+ * PM support is not complete.  Turn it off.
+ */
+#undef CONFIG_PM
+
+static void aaci_ac97_select_codec(struct aaci *aaci, ac97_t *ac97)
+{
+        u32 v, maincr = aaci->maincr | MAINCR_SCRA(ac97->num);
+
+        /*
+         * Ensure that the slot 1/2 RX registers are empty.
+         */
+        v = readl(aaci->base + AACI_SLFR);
+        if (v & SLFR_2RXV)
+                readl(aaci->base + AACI_SL2RX);
+        if (v & SLFR_1RXV)
+                readl(aaci->base + AACI_SL1RX);
+
+        writel(maincr, aaci->base + AACI_MAINCR);
+}
+
+/*
+ * P29:
+ *  The recommended use of programming the external codec through slot 1
+ *  and slot 2 data is to use the channels during setup routines and the
+ *  slot register at any other time.  The data written into slot 1, slot 2
+ *  and slot 12 registers is transmitted only when their corresponding
+ *  SI1TxEn, SI2TxEn and SI12TxEn bits are set in the AACI_MAINCR
+ *  register.
+ */
+static void aaci_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
+{
+        struct aaci *aaci = ac97->private_data;
+        u32 v;
+
+        if (ac97->num >= 4)
+                return;
+
+        down(&aaci->ac97_sem);
+
+        aaci_ac97_select_codec(aaci, ac97);
+
+        /*
+         * P54: You must ensure that AACI_SL2TX is always written
+         * to, if required, before data is written to AACI_SL1TX.
+         */
+        writel(val << 4, aaci->base + AACI_SL2TX);
+        writel(reg << 12, aaci->base + AACI_SL1TX);
+
+        /*
+         * Wait for the transmission of both slots to complete.
+         */
+        do {
+                v = readl(aaci->base + AACI_SLFR);
+        } while (v & (SLFR_1TXB|SLFR_2TXB));
+
+        up(&aaci->ac97_sem);
+}
+
+/*
+ * Read an AC'97 register.
+ */
+static unsigned short aaci_ac97_read(ac97_t *ac97, unsigned short reg)
+{
+        struct aaci *aaci = ac97->private_data;
+        u32 v;
+
+        if (ac97->num >= 4)
+                return ~0;
+
+        down(&aaci->ac97_sem);
+
+        aaci_ac97_select_codec(aaci, ac97);
+
+        /*
+         * Write the register address to slot 1.
+         */
+        writel((reg << 12) | (1 << 19), aaci->base + AACI_SL1TX);
+
+        /*
+         * Wait for the transmission to complete.
+         */
+        do {
+                v = readl(aaci->base + AACI_SLFR);
+        } while (v & SLFR_1TXB);
+
+        /*
+         * Give the AC'97 codec more than enough time
+         * to respond. (42us = ~2 frames at 48kHz.)
+         */
+        udelay(42);
+
+        /*
+         * Wait for slot 2 to indicate data.
+         */
+        do {
+                cond_resched();
+                v = readl(aaci->base + AACI_SLFR) & (SLFR_1RXV|SLFR_2RXV);
+        } while (v != (SLFR_1RXV|SLFR_2RXV));
+
+        v = readl(aaci->base + AACI_SL1RX) >> 12;
+        if (v == reg) {
+                v = readl(aaci->base + AACI_SL2RX) >> 4;
+        } else {
+                dev_err(&aaci->dev->dev,
+                        "wrong ac97 register read back (%x != %x)\n",
+                        v, reg);
+                v = ~0;
+        }
+
+        up(&aaci->ac97_sem);
+        return v;
+}
+
+static inline void aaci_chan_wait_ready(struct aaci_runtime *aacirun)
+{
+        u32 val;
+        int timeout = 5000;
+
+        do {
+                val = readl(aacirun->base + AACI_SR);
+        } while (val & (SR_TXB|SR_RXB) && timeout--);
+}
+
+
+
+/*
+ * Interrupt support.
+ */
+static void aaci_fifo_irq(struct aaci *aaci, u32 mask)
+{
+        if (mask & ISR_URINTR) {
+                writel(ICLR_TXUEC1, aaci->base + AACI_INTCLR);
+        }
+
+        if (mask & ISR_TXINTR) {
+                struct aaci_runtime *aacirun = &aaci->playback;
+                void *ptr;
+
+                if (!aacirun->substream || !aacirun->start) {
+                        dev_warn(&aaci->dev->dev, "TX interrupt???");
+                        writel(0, aacirun->base + AACI_IE);
+                        return;
+                }
+
+                ptr = aacirun->ptr;
+                do {
+                        unsigned int len = aacirun->fifosz;
+                        u32 val;
+
+                        if (aacirun->bytes <= 0) {
+                                aacirun->bytes += aacirun->period;
+                                aacirun->ptr = ptr;
+                                spin_unlock(&aaci->lock);
+                                snd_pcm_period_elapsed(aacirun->substream);
+                                spin_lock(&aaci->lock);
+                        }
+                        if (!(aacirun->cr & TXCR_TXEN))
+                                break;
+
+                        val = readl(aacirun->base + AACI_SR);
+                        if (!(val & SR_TXHE))
+                                break;
+                        if (!(val & SR_TXFE))
+                                len >>= 1;
+
+                        aacirun->bytes -= len;
+
+                        /* writing 16 bytes at a time */
+                        for ( ; len > 0; len -= 16) {
+                                asm(
+                                        "ldmia  %0!, {r0, r1, r2, r3}\n\t"
+                                        "stmia  %1, {r0, r1, r2, r3}"
+                                        : "+r" (ptr)
+                                        : "r" (aacirun->fifo)
+                                        : "r0", "r1", "r2", "r3", "cc");
+
+                                if (ptr >= aacirun->end)
+                                        ptr = aacirun->start;
+                        }
+                } while (1);
+
+                aacirun->ptr = ptr;
+        }
+}
+
+static irqreturn_t aaci_irq(int irq, void *devid, struct pt_regs *regs)
+{
+        struct aaci *aaci = devid;
+        u32 mask;
+        int i;
+
+        spin_lock(&aaci->lock);
+        mask = readl(aaci->base + AACI_ALLINTS);
+        if (mask) {
+                u32 m = mask;
+                for (i = 0; i < 4; i++, m >>= 7) {
+                        if (m & 0x7f) {
+                                aaci_fifo_irq(aaci, m);
+                        }
+                }
+        }
+        spin_unlock(&aaci->lock);
+
+        return mask ? IRQ_HANDLED : IRQ_NONE;
+}
+
+
+
+/*
+ * ALSA support.
+ */
+
+struct aaci_stream {
+        unsigned char codec_idx;
+        unsigned char rate_idx;
+};
+
+static struct aaci_stream aaci_streams[] = {
+        [ACSTREAM_FRONT] = {
+                .codec_idx      = 0,
+                .rate_idx       = AC97_RATES_FRONT_DAC,
+        },
+        [ACSTREAM_SURROUND] = {
+                .codec_idx      = 0,
+                .rate_idx       = AC97_RATES_SURR_DAC,
+        },
+        [ACSTREAM_LFE] = {
+                .codec_idx      = 0,
+                .rate_idx       = AC97_RATES_LFE_DAC,
+        },
+};
+
+static inline unsigned int aaci_rate_mask(struct aaci *aaci, int streamid)
+{
+        struct aaci_stream *s = aaci_streams + streamid;
+        return aaci->ac97_bus->codec[s->codec_idx]->rates[s->rate_idx];
+}
+
+static unsigned int rate_list[] = {
+        5512, 8000, 11025, 16000, 22050, 32000, 44100,
+        48000, 64000, 88200, 96000, 176400, 192000
+};
+
+/*
+ * Double-rate rule: we can support double rate iff channels == 2
+ *  (unimplemented)
+ */
+static int
+aaci_rule_rate_by_channels(snd_pcm_hw_params_t *p, snd_pcm_hw_rule_t *rule)
+{
+        struct aaci *aaci = rule->private;
+        unsigned int rate_mask = SNDRV_PCM_RATE_8000_48000|SNDRV_PCM_RATE_5512;
+        snd_interval_t *c = hw_param_interval(p, SNDRV_PCM_HW_PARAM_CHANNELS);
+
+        switch (c->max) {
+        case 6:
+                rate_mask &= aaci_rate_mask(aaci, ACSTREAM_LFE);
+        case 4:
+                rate_mask &= aaci_rate_mask(aaci, ACSTREAM_SURROUND);
+        case 2:
+                rate_mask &= aaci_rate_mask(aaci, ACSTREAM_FRONT);
+        }
+
+        return snd_interval_list(hw_param_interval(p, rule->var),
+                                 ARRAY_SIZE(rate_list), rate_list,
+                                 rate_mask);
+}
+
+static snd_pcm_hardware_t aaci_hw_info = {
+        .info                   = SNDRV_PCM_INFO_MMAP |
+                                  SNDRV_PCM_INFO_MMAP_VALID |
+                                  SNDRV_PCM_INFO_INTERLEAVED |
+                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                  SNDRV_PCM_INFO_RESUME,
+
+        /*
+         * ALSA doesn't support 18-bit or 20-bit packed into 32-bit
+         * words.  It also doesn't support 12-bit at all.
+         */
+        .formats                = SNDRV_PCM_FMTBIT_S16_LE,
+
+        /* should this be continuous or knot? */
+        .rates                  = SNDRV_PCM_RATE_CONTINUOUS,
+        .rate_max               = 48000,
+        .rate_min               = 4000,
+        .channels_min           = 2,
+        .channels_max           = 6,
+        .buffer_bytes_max       = 64 * 1024,
+        .period_bytes_min       = 256,
+        .period_bytes_max       = PAGE_SIZE,
+        .periods_min            = 4,
+        .periods_max            = PAGE_SIZE / 16,
+};
+
+static int aaci_pcm_open(struct aaci *aaci, snd_pcm_substream_t *substream,
+                         struct aaci_runtime *aacirun)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        int ret;
+
+        aacirun->substream = substream;
+        runtime->private_data = aacirun;
+        runtime->hw = aaci_hw_info;
+
+        /*
+         * FIXME: ALSA specifies fifo_size in bytes.  If we're in normal
+         * mode, each 32-bit word contains one sample.  If we're in
+         * compact mode, each 32-bit word contains two samples, effectively
+         * halving the FIFO size.  However, we don't know for sure which
+         * we'll be using at this point.  We set this to the lower limit.
+         */
+        runtime->hw.fifo_size = aaci->fifosize * 2;
+
+        /*
+         * Add rule describing hardware rate dependency
+         * on the number of channels.
+         */
+        ret = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                  aaci_rule_rate_by_channels, aaci,
+                                  SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  SNDRV_PCM_HW_PARAM_RATE, -1);
+        if (ret)
+                goto out;
+
+        ret = request_irq(aaci->dev->irq[0], aaci_irq, SA_SHIRQ|SA_INTERRUPT,
+                          DRIVER_NAME, aaci);
+        if (ret)
+                goto out;
+
+        return 0;
+
+ out:
+        return ret;
+}
+
+
+/*
+ * Common ALSA stuff
+ */
+static int aaci_pcm_close(snd_pcm_substream_t *substream)
+{
+        struct aaci *aaci = substream->private_data;
+        struct aaci_runtime *aacirun = substream->runtime->private_data;
+
+        WARN_ON(aacirun->cr & TXCR_TXEN);
+
+        aacirun->substream = NULL;
+        free_irq(aaci->dev->irq[0], aaci);
+
+        return 0;
+}
+
+static int aaci_pcm_hw_free(snd_pcm_substream_t *substream)
+{
+        struct aaci_runtime *aacirun = substream->runtime->private_data;
+
+        /*
+         * This must not be called with the device enabled.
+         */
+        WARN_ON(aacirun->cr & TXCR_TXEN);
+
+        if (aacirun->pcm_open)
+                snd_ac97_pcm_close(aacirun->pcm);
+        aacirun->pcm_open = 0;
+
+        /*
+         * Clear out the DMA and any allocated buffers.
+         */
+        devdma_hw_free(NULL, substream);
+
+        return 0;
+}
+
+static int aaci_pcm_hw_params(snd_pcm_substream_t *substream,
+                              struct aaci_runtime *aacirun,
+                              snd_pcm_hw_params_t *params)
+{
+        int err;
+
+        aaci_pcm_hw_free(substream);
+
+        err = devdma_hw_alloc(NULL, substream,
+                              params_buffer_bytes(params));
+        if (err < 0)
+                goto out;
+
+        err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params),
+                                params_channels(params),
+                                aacirun->pcm->r[0].slots);
+        if (err)
+                goto out;
+
+        aacirun->pcm_open = 1;
+
+ out:
+        return err;
+}
+
+static int aaci_pcm_prepare(snd_pcm_substream_t *substream)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        struct aaci_runtime *aacirun = runtime->private_data;
+
+        aacirun->start  = (void *)runtime->dma_area;
+        aacirun->end    = aacirun->start + runtime->dma_bytes;
+        aacirun->ptr    = aacirun->start;
+        aacirun->period =
+        aacirun->bytes  = frames_to_bytes(runtime, runtime->period_size);
+
+        return 0;
+}
+
+static snd_pcm_uframes_t aaci_pcm_pointer(snd_pcm_substream_t *substream)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        struct aaci_runtime *aacirun = runtime->private_data;
+        ssize_t bytes = aacirun->ptr - aacirun->start;
+
+        return bytes_to_frames(runtime, bytes);
+}
+
+static int aaci_pcm_mmap(snd_pcm_substream_t *substream, struct vm_area_struct *vma)
+{
+        return devdma_mmap(NULL, substream, vma);
+}
+
+
+/*
+ * Playback specific ALSA stuff
+ */
+static const u32 channels_to_txmask[] = {
+        [2] = TXCR_TX3 | TXCR_TX4,
+        [4] = TXCR_TX3 | TXCR_TX4 | TXCR_TX7 | TXCR_TX8,
+        [6] = TXCR_TX3 | TXCR_TX4 | TXCR_TX7 | TXCR_TX8 | TXCR_TX6 | TXCR_TX9,
+};
+
+/*
+ * We can support two and four channel audio.  Unfortunately
+ * six channel audio requires a non-standard channel ordering:
+ *   2 -> FL(3), FR(4)
+ *   4 -> FL(3), FR(4), SL(7), SR(8)
+ *   6 -> FL(3), FR(4), SL(7), SR(8), C(6), LFE(9) (required)
+ *        FL(3), FR(4), C(6), SL(7), SR(8), LFE(9) (actual)
+ * This requires an ALSA configuration file to correct.
+ */
+static unsigned int channel_list[] = { 2, 4, 6 };
+
+static int
+aaci_rule_channels(snd_pcm_hw_params_t *p, snd_pcm_hw_rule_t *rule)
+{
+        struct aaci *aaci = rule->private;
+        unsigned int chan_mask = 1 << 0, slots;
+
+        /*
+         * pcms[0] is the our 5.1 PCM instance.
+         */
+        slots = aaci->ac97_bus->pcms[0].r[0].slots;
+        if (slots & (1 << AC97_SLOT_PCM_SLEFT)) {
+                chan_mask |= 1 << 1;
+                if (slots & (1 << AC97_SLOT_LFE))
+                        chan_mask |= 1 << 2;
+        }
+
+        return snd_interval_list(hw_param_interval(p, rule->var),
+                                 ARRAY_SIZE(channel_list), channel_list,
+                                 chan_mask);
+}
+
+static int aaci_pcm_playback_open(snd_pcm_substream_t *substream)
+{
+        struct aaci *aaci = substream->private_data;
+        int ret;
+
+        /*
+         * Add rule describing channel dependency.
+         */
+        ret = snd_pcm_hw_rule_add(substream->runtime, 0,
+                                  SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  aaci_rule_channels, aaci,
+                                  SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+        if (ret)
+                return ret;
+
+        return aaci_pcm_open(aaci, substream, &aaci->playback);
+}
+
+static int aaci_pcm_playback_hw_params(snd_pcm_substream_t *substream,
+                                       snd_pcm_hw_params_t *params)
+{
+        struct aaci *aaci = substream->private_data;
+        struct aaci_runtime *aacirun = substream->runtime->private_data;
+        unsigned int channels = params_channels(params);
+        int ret;
+
+        WARN_ON(channels >= ARRAY_SIZE(channels_to_txmask) ||
+                !channels_to_txmask[channels]);
+
+        ret = aaci_pcm_hw_params(substream, aacirun, params);
+
+        /*
+         * Enable FIFO, compact mode, 16 bits per sample.
+         * FIXME: double rate slots?
+         */
+        if (ret >= 0) {
+                aacirun->cr = TXCR_FEN | TXCR_COMPACT | TXCR_TSZ16;
+                aacirun->cr |= channels_to_txmask[channels];
+
+                aacirun->fifosz = aaci->fifosize * 4;
+                if (aacirun->cr & TXCR_COMPACT)
+                        aacirun->fifosz >>= 1;
+        }
+        return ret;
+}
+
+static void aaci_pcm_playback_stop(struct aaci_runtime *aacirun)
+{
+        u32 ie;
+
+        ie = readl(aacirun->base + AACI_IE);
+        ie &= ~(IE_URIE|IE_TXIE);
+        writel(ie, aacirun->base + AACI_IE);
+        aacirun->cr &= ~TXCR_TXEN;
+        aaci_chan_wait_ready(aacirun);
+        writel(aacirun->cr, aacirun->base + AACI_TXCR);
+}
+
+static void aaci_pcm_playback_start(struct aaci_runtime *aacirun)
+{
+        u32 ie;
+
+        aaci_chan_wait_ready(aacirun);
+        aacirun->cr |= TXCR_TXEN;
+
+        ie = readl(aacirun->base + AACI_IE);
+        ie |= IE_URIE | IE_TXIE;
+        writel(ie, aacirun->base + AACI_IE);
+        writel(aacirun->cr, aacirun->base + AACI_TXCR);
+}
+
+static int aaci_pcm_playback_trigger(snd_pcm_substream_t *substream, int cmd)
+{
+        struct aaci *aaci = substream->private_data;
+        struct aaci_runtime *aacirun = substream->runtime->private_data;
+        unsigned long flags;
+        int ret = 0;
+
+        spin_lock_irqsave(&aaci->lock, flags);
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+                aaci_pcm_playback_start(aacirun);
+                break;
+
+        case SNDRV_PCM_TRIGGER_RESUME:
+                aaci_pcm_playback_start(aacirun);
+                break;
+
+        case SNDRV_PCM_TRIGGER_STOP:
+                aaci_pcm_playback_stop(aacirun);
+                break;
+
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                aaci_pcm_playback_stop(aacirun);
+                break;
+
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                break;
+
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                break;
+
+        default:
+                ret = -EINVAL;
+        }
+        spin_unlock_irqrestore(&aaci->lock, flags);
+
+        return ret;
+}
+
+static snd_pcm_ops_t aaci_playback_ops = {
+        .open           = aaci_pcm_playback_open,
+        .close          = aaci_pcm_close,
+        .ioctl          = snd_pcm_lib_ioctl,
+        .hw_params      = aaci_pcm_playback_hw_params,
+        .hw_free        = aaci_pcm_hw_free,
+        .prepare        = aaci_pcm_prepare,
+        .trigger        = aaci_pcm_playback_trigger,
+        .pointer        = aaci_pcm_pointer,
+        .mmap           = aaci_pcm_mmap,
+};
+
+
+
+/*
+ * Power Management.
+ */
+#ifdef CONFIG_PM
+static int aaci_do_suspend(snd_card_t *card, unsigned int state)
+{
+        struct aaci *aaci = card->private_data;
+        if (aaci->card->power_state != SNDRV_CTL_POWER_D3cold) {
+                snd_pcm_suspend_all(aaci->pcm);
+                snd_power_change_state(aaci->card, SNDRV_CTL_POWER_D3cold);
+        }
+        return 0;
+}
+
+static int aaci_do_resume(snd_card_t *card, unsigned int state)
+{
+        struct aaci *aaci = card->private_data;
+        if (aaci->card->power_state != SNDRV_CTL_POWER_D0) {
+                snd_power_change_state(aaci->card, SNDRV_CTL_POWER_D0);
+        }
+        return 0;
+}
+
+static int aaci_suspend(struct amba_device *dev, u32 state)
+{
+        snd_card_t *card = amba_get_drvdata(dev);
+        return card ? aaci_do_suspend(card) : 0;
+}
+
+static int aaci_resume(struct amba_device *dev)
+{
+        snd_card_t *card = amba_get_drvdata(dev);
+        return card ? aaci_do_resume(card) : 0;
+}
+#else
+#define aaci_do_suspend         NULL
+#define aaci_do_resume          NULL
+#define aaci_suspend            NULL
+#define aaci_resume             NULL
+#endif
+
+
+static struct ac97_pcm ac97_defs[] __devinitdata = {
+        [0] = {         /* Front PCM */
+                .exclusive = 1,
+                .r = {
+                        [0] = {
+                                .slots  = (1 << AC97_SLOT_PCM_LEFT) |
+                                          (1 << AC97_SLOT_PCM_RIGHT) |
+                                          (1 << AC97_SLOT_PCM_CENTER) |
+                                          (1 << AC97_SLOT_PCM_SLEFT) |
+                                          (1 << AC97_SLOT_PCM_SRIGHT) |
+                                          (1 << AC97_SLOT_LFE),
+                        },
+                },
+        },
+        [1] = { /* PCM in */
+                .stream = 1,
+                .exclusive = 1,
+                .r = {
+                        [0] = {
+                                .slots  = (1 << AC97_SLOT_PCM_LEFT) |
+                                          (1 << AC97_SLOT_PCM_RIGHT),
+                        },
+                },
+        },
+        [2] = { /* Mic in */
+                .stream = 1,
+                .exclusive = 1,
+                .r = {
+                        [0] = {
+                                .slots  = (1 << AC97_SLOT_MIC),
+                        },
+                },
+        }
+};
+
+static ac97_bus_ops_t aaci_bus_ops = {
+        .write  = aaci_ac97_write,
+        .read   = aaci_ac97_read,
+};
+
+static int __devinit aaci_probe_ac97(struct aaci *aaci)
+{
+        ac97_template_t ac97_template;
+        ac97_bus_t *ac97_bus;
+        ac97_t *ac97;
+        int ret;
+
+        /*
+         * Assert AACIRESET for 2us
+         */
+        writel(0, aaci->base + AACI_RESET);
+        udelay(2);
+        writel(RESET_NRST, aaci->base + AACI_RESET);
+
+        /*
+         * Give the AC'97 codec more than enough time
+         * to wake up. (42us = ~2 frames at 48kHz.)
+         */
+        udelay(42);
+
+        ret = snd_ac97_bus(aaci->card, 0, &aaci_bus_ops, aaci, &ac97_bus);
+        if (ret)
+                goto out;
+
+        ac97_bus->clock = 48000;
+        aaci->ac97_bus = ac97_bus;
+
+        memset(&ac97_template, 0, sizeof(ac97_template_t));
+        ac97_template.private_data = aaci;
+        ac97_template.num = 0;
+        ac97_template.scaps = AC97_SCAP_SKIP_MODEM;
+
+        ret = snd_ac97_mixer(ac97_bus, &ac97_template, &ac97);
+        if (ret)
+                goto out;
+
+        /*
+         * Disable AC97 PC Beep input on audio codecs.
+         */
+        if (ac97_is_audio(ac97))
+                snd_ac97_write_cache(ac97, AC97_PC_BEEP, 0x801e);
+
+        ret = snd_ac97_pcm_assign(ac97_bus, ARRAY_SIZE(ac97_defs), ac97_defs);
+        if (ret)
+                goto out;
+
+        aaci->playback.pcm = &ac97_bus->pcms[0];
+
+ out:
+        return ret;
+}
+
+static void aaci_free_card(snd_card_t *card)
+{
+        struct aaci *aaci = card->private_data;
+        if (aaci->base)
+                iounmap(aaci->base);
+}
+
+static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
+{
+        struct aaci *aaci;
+        snd_card_t *card;
+
+        card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+                            THIS_MODULE, sizeof(struct aaci));
+        if (card == NULL)
+                return ERR_PTR(-ENOMEM);
+
+        card->private_free = aaci_free_card;
+        snd_card_set_pm_callback(card, aaci_do_suspend, aaci_do_resume, NULL);
+
+        strlcpy(card->driver, DRIVER_NAME, sizeof(card->driver));
+        strlcpy(card->shortname, "ARM AC'97 Interface", sizeof(card->shortname));
+        snprintf(card->longname, sizeof(card->longname),
+                 "%s at 0x%08lx, irq %d",
+                 card->shortname, dev->res.start, dev->irq[0]);
+
+        aaci = card->private_data;
+        init_MUTEX(&aaci->ac97_sem);
+        spin_lock_init(&aaci->lock);
+        aaci->card = card;
+        aaci->dev = dev;
+
+        /* Set MAINCR to allow slot 1 and 2 data IO */
+        aaci->maincr = MAINCR_IE | MAINCR_SL1RXEN | MAINCR_SL1TXEN |
+                       MAINCR_SL2RXEN | MAINCR_SL2TXEN;
+
+        return aaci;
+}
+
+static int __devinit aaci_init_pcm(struct aaci *aaci)
+{
+        snd_pcm_t *pcm;
+        int ret;
+
+        ret = snd_pcm_new(aaci->card, "AACI AC'97", 0, 1, 0, &pcm);
+        if (ret == 0) {
+                aaci->pcm = pcm;
+                pcm->private_data = aaci;
+                pcm->info_flags = 0;
+
+                strlcpy(pcm->name, DRIVER_NAME, sizeof(pcm->name));
+
+                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &aaci_playback_ops);
+        }
+
+        return ret;
+}
+
+static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
+{
+        void *base = aaci->base + AACI_CSCH1;
+        int i;
+
+        writel(TXCR_FEN | TXCR_TSZ16 | TXCR_TXEN, base + AACI_TXCR);
+
+        for (i = 0; !(readl(base + AACI_SR) & SR_TXFF) && i < 4096; i++)
+                writel(0, aaci->base + AACI_DR1);
+
+        writel(0, base + AACI_TXCR);
+
+        /*
+         * Re-initialise the AACI after the FIFO depth test, to
+         * ensure that the FIFOs are empty.  Unfortunately, merely
+         * disabling the channel doesn't clear the FIFO.
+         */
+        writel(aaci->maincr & ~MAINCR_IE, aaci->base + AACI_MAINCR);
+        writel(aaci->maincr, aaci->base + AACI_MAINCR);
+
+        /*
+         * If we hit 4096, we failed.  Go back to the specified
+         * fifo depth.
+         */
+        if (i == 4096)
+                i = 8;
+
+        return i;
+}
+
+static int __devinit aaci_probe(struct amba_device *dev, void *id)
+{
+        struct aaci *aaci;
+        int ret, i;
+
+        ret = amba_request_regions(dev, NULL);
+        if (ret)
+                return ret;
+
+        aaci = aaci_init_card(dev);
+        if (IS_ERR(aaci)) {
+                ret = PTR_ERR(aaci);
+                goto out;
+        }
+
+        aaci->base = ioremap(dev->res.start, SZ_4K);
+        if (!aaci->base) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        /*
+         * Playback uses AACI channel 0
+         */
+        aaci->playback.base = aaci->base + AACI_CSCH1;
+        aaci->playback.fifo = aaci->base + AACI_DR1;
+
+        for (i = 0; i < 4; i++) {
+                void *base = aaci->base + i * 0x14;
+
+                writel(0, base + AACI_IE);
+                writel(0, base + AACI_TXCR);
+                writel(0, base + AACI_RXCR);
+        }
+
+        writel(0x1fff, aaci->base + AACI_INTCLR);
+        writel(aaci->maincr, aaci->base + AACI_MAINCR);
+
+        /*
+         * Size the FIFOs.
+         */
+        aaci->fifosize = aaci_size_fifo(aaci);
+
+        ret = aaci_probe_ac97(aaci);
+        if (ret)
+                goto out;
+
+        ret = aaci_init_pcm(aaci);
+        if (ret)
+                goto out;
+
+        ret = snd_card_register(aaci->card);
+        if (ret == 0) {
+                dev_info(&dev->dev, "%s, fifo %d\n", aaci->card->longname,
+                        aaci->fifosize);
+                amba_set_drvdata(dev, aaci->card);
+                return ret;
+        }
+
+ out:
+        if (aaci)
+                snd_card_free(aaci->card);
+        amba_release_regions(dev);
+        return ret;
+}
+
+static int __devexit aaci_remove(struct amba_device *dev)
+{
+        snd_card_t *card = amba_get_drvdata(dev);
+
+        amba_set_drvdata(dev, NULL);
+
+        if (card) {
+                struct aaci *aaci = card->private_data;
+                writel(0, aaci->base + AACI_MAINCR);
+
+                snd_card_free(card);
+                amba_release_regions(dev);
+        }
+
+        return 0;
+}
+
+static struct amba_id aaci_ids[] = {
+        {
+                .id     = 0x00041041,
+                .mask   = 0x000fffff,
+        },
+        { 0, 0 },
+};
+
+static struct amba_driver aaci_driver = {
+        .drv            = {
+                .name   = DRIVER_NAME,
+        },
+        .probe          = aaci_probe,
+        .remove         = __devexit_p(aaci_remove),
+        .suspend        = aaci_suspend,
+        .resume         = aaci_resume,
+        .id_table       = aaci_ids,
+};
+
+static int __init aaci_init(void)
+{
+        return amba_driver_register(&aaci_driver);
+}
+
+static void __exit aaci_exit(void)
+{
+        amba_driver_unregister(&aaci_driver);
+}
+
+module_init(aaci_init);
+module_exit(aaci_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ARM PrimeCell PL041 Advanced Audio CODEC Interface driver");
diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
new file mode 100644
index 000000000000..d752e6426894
--- /dev/null
+++ b/sound/arm/aaci.h
@@ -0,0 +1,246 @@
+/*
+ *  linux/sound/arm/aaci.c - ARM PrimeCell AACI PL041 driver
+ *
+ *  Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef AACI_H
+#define AACI_H
+
+/*
+ * Control and status register offsets
+ *  P39.
+ */
+#define AACI_CSCH1      0x000
+#define AACI_CSCH2      0x014
+#define AACI_CSCH3      0x028
+#define AACI_CSCH4      0x03c
+
+#define AACI_RXCR       0x000   /* 29 bits Control Rx FIFO */
+#define AACI_TXCR       0x004   /* 17 bits Control Tx FIFO */
+#define AACI_SR         0x008   /* 12 bits Status */
+#define AACI_ISR        0x00c   /* 7 bits  Int Status */
+#define AACI_IE         0x010   /* 7 bits  Int Enable */
+
+/*
+ * Other registers
+ */
+#define AACI_SL1RX      0x050
+#define AACI_SL1TX      0x054
+#define AACI_SL2RX      0x058
+#define AACI_SL2TX      0x05c
+#define AACI_SL12RX     0x060
+#define AACI_SL12TX     0x064
+#define AACI_SLFR       0x068   /* slot flags */
+#define AACI_SLISTAT    0x06c   /* slot interrupt status */
+#define AACI_SLIEN      0x070   /* slot interrupt enable */
+#define AACI_INTCLR     0x074   /* interrupt clear */
+#define AACI_MAINCR     0x078   /* main control */
+#define AACI_RESET      0x07c   /* reset control */
+#define AACI_SYNC       0x080   /* sync control */
+#define AACI_ALLINTS    0x084   /* all fifo interrupt status */
+#define AACI_MAINFR     0x088   /* main flag register */
+#define AACI_DR1        0x090   /* data read/written fifo 1 */
+#define AACI_DR2        0x0b0   /* data read/written fifo 2 */
+#define AACI_DR3        0x0d0   /* data read/written fifo 3 */
+#define AACI_DR4        0x0f0   /* data read/written fifo 4 */
+
+/*
+ * transmit fifo control register. P48
+ */
+#define TXCR_FEN        (1 << 16)       /* fifo enable */
+#define TXCR_COMPACT    (1 << 15)       /* compact mode */
+#define TXCR_TSZ16      (0 << 13)       /* 16 bits */
+#define TXCR_TSZ18      (1 << 13)       /* 18 bits */
+#define TXCR_TSZ20      (2 << 13)       /* 20 bits */
+#define TXCR_TSZ12      (3 << 13)       /* 12 bits */
+#define TXCR_TX12       (1 << 12)       /* transmits slot 12 */
+#define TXCR_TX11       (1 << 11)       /* transmits slot 12 */
+#define TXCR_TX10       (1 << 10)       /* transmits slot 12 */
+#define TXCR_TX9        (1 << 9)        /* transmits slot 12 */
+#define TXCR_TX8        (1 << 8)        /* transmits slot 12 */
+#define TXCR_TX7        (1 << 7)        /* transmits slot 12 */
+#define TXCR_TX6        (1 << 6)        /* transmits slot 12 */
+#define TXCR_TX5        (1 << 5)        /* transmits slot 12 */
+#define TXCR_TX4        (1 << 4)        /* transmits slot 12 */
+#define TXCR_TX3        (1 << 3)        /* transmits slot 12 */
+#define TXCR_TX2        (1 << 2)        /* transmits slot 12 */
+#define TXCR_TX1        (1 << 1)        /* transmits slot 12 */
+#define TXCR_TXEN       (1 << 0)        /* transmit enable */
+
+/*
+ * status register bits. P49
+ */
+#define SR_RXTOFE       (1 << 11)       /* rx timeout fifo empty */
+#define SR_TXTO         (1 << 10)       /* rx timeout fifo nonempty */
+#define SR_TXU          (1 << 9)        /* tx underrun */
+#define SR_RXO          (1 << 8)        /* rx overrun */
+#define SR_TXB          (1 << 7)        /* tx busy */
+#define SR_RXB          (1 << 6)        /* rx busy */
+#define SR_TXFF         (1 << 5)        /* tx fifo full */
+#define SR_RXFF         (1 << 4)        /* rx fifo full */
+#define SR_TXHE         (1 << 3)        /* tx fifo half empty */
+#define SR_RXHF         (1 << 2)        /* rx fifo half full */
+#define SR_TXFE         (1 << 1)        /* tx fifo empty */
+#define SR_RXFE         (1 << 0)        /* rx fifo empty */
+
+/*
+ * interrupt status register bits.
+ */
+#define ISR_RXTOFEINTR  (1 << 6)        /* rx fifo empty */
+#define ISR_URINTR      (1 << 5)        /* tx underflow */
+#define ISR_ORINTR      (1 << 4)        /* rx overflow */
+#define ISR_RXINTR      (1 << 3)        /* rx fifo */
+#define ISR_TXINTR      (1 << 2)        /* tx fifo intr */
+#define ISR_RXTOINTR    (1 << 1)        /* tx timeout */
+#define ISR_TXCINTR     (1 << 0)        /* tx complete */
+
+/*
+ * interrupt enable register bits.
+ */
+#define IE_RXTOIE       (1 << 6)
+#define IE_URIE         (1 << 5)
+#define IE_ORIE         (1 << 4)
+#define IE_RXIE         (1 << 3)
+#define IE_TXIE         (1 << 2)
+#define IE_RXTIE        (1 << 1)
+#define IE_TXCIE        (1 << 0)
+
+/*
+ * interrupt status. P51
+ */
+#define ISR_RXTOFE      (1 << 6)        /* rx timeout fifo empty */
+#define ISR_UR          (1 << 5)        /* tx fifo underrun */
+#define ISR_OR          (1 << 4)        /* rx fifo overrun */
+#define ISR_RX          (1 << 3)        /* rx interrupt status */
+#define ISR_TX          (1 << 2)        /* tx interrupt status */
+#define ISR_RXTO        (1 << 1)        /* rx timeout */
+#define ISR_TXC         (1 << 0)        /* tx complete */
+
+/*
+ * interrupt enable. P52
+ */
+#define IE_RXTOFE       (1 << 6)        /* rx timeout fifo empty */
+#define IE_UR           (1 << 5)        /* tx fifo underrun */
+#define IE_OR           (1 << 4)        /* rx fifo overrun */
+#define IE_RX           (1 << 3)        /* rx interrupt status */
+#define IE_TX           (1 << 2)        /* tx interrupt status */
+#define IE_RXTO         (1 << 1)        /* rx timeout */
+#define IE_TXC          (1 << 0)        /* tx complete */
+
+/*
+ * slot flag register bits. P56
+ */
+#define SLFR_RWIS       (1 << 13)       /* raw wake-up interrupt status */
+#define SLFR_RGPIOINTR  (1 << 12)       /* raw gpio interrupt */
+#define SLFR_12TXE      (1 << 11)       /* slot 12 tx empty */
+#define SLFR_12RXV      (1 << 10)       /* slot 12 rx valid */
+#define SLFR_2TXE       (1 << 9)        /* slot 2 tx empty */
+#define SLFR_2RXV       (1 << 8)        /* slot 2 rx valid */
+#define SLFR_1TXE       (1 << 7)        /* slot 1 tx empty */
+#define SLFR_1RXV       (1 << 6)        /* slot 1 rx valid */
+#define SLFR_12TXB      (1 << 5)        /* slot 12 tx busy */
+#define SLFR_12RXB      (1 << 4)        /* slot 12 rx busy */
+#define SLFR_2TXB       (1 << 3)        /* slot 2 tx busy */
+#define SLFR_2RXB       (1 << 2)        /* slot 2 rx busy */
+#define SLFR_1TXB       (1 << 1)        /* slot 1 tx busy */
+#define SLFR_1RXB       (1 << 0)        /* slot 1 rx busy */
+
+/*
+ * Interrupt clear register.
+ */
+#define ICLR_RXTOFEC4   (1 << 12)
+#define ICLR_RXTOFEC3   (1 << 11)
+#define ICLR_RXTOFEC2   (1 << 10)
+#define ICLR_RXTOFEC1   (1 << 9)
+#define ICLR_TXUEC4     (1 << 8)
+#define ICLR_TXUEC3     (1 << 7)
+#define ICLR_TXUEC2     (1 << 6)
+#define ICLR_TXUEC1     (1 << 5)
+#define ICLR_RXOEC4     (1 << 4)
+#define ICLR_RXOEC3     (1 << 3)
+#define ICLR_RXOEC2     (1 << 2)
+#define ICLR_RXOEC1     (1 << 1)
+#define ICLR_WISC       (1 << 0)
+
+/*
+ * Main control register bits. P62
+ */
+#define MAINCR_SCRA(x)  ((x) << 10)     /* secondary codec reg access */
+#define MAINCR_DMAEN    (1 << 9)        /* dma enable */
+#define MAINCR_SL12TXEN (1 << 8)        /* slot 12 transmit enable */
+#define MAINCR_SL12RXEN (1 << 7)        /* slot 12 receive enable */
+#define MAINCR_SL2TXEN  (1 << 6)        /* slot 2 transmit enable */
+#define MAINCR_SL2RXEN  (1 << 5)        /* slot 2 receive enable */
+#define MAINCR_SL1TXEN  (1 << 4)        /* slot 1 transmit enable */
+#define MAINCR_SL1RXEN  (1 << 3)        /* slot 1 receive enable */
+#define MAINCR_LPM      (1 << 2)        /* low power mode */
+#define MAINCR_LOOPBK   (1 << 1)        /* loopback */
+#define MAINCR_IE       (1 << 0)        /* aaci interface enable */
+
+/*
+ * Reset register bits. P65
+ */
+#define RESET_NRST      (1 << 0)
+
+/*
+ * Sync register bits. P65
+ */
+#define SYNC_FORCE      (1 << 0)
+
+/*
+ * Main flag register bits. P66
+ */
+#define MAINFR_TXB      (1 << 1)        /* transmit busy */
+#define MAINFR_RXB      (1 << 0)        /* receive busy */
+
+
+
+struct aaci_runtime {
+        void                    *base;
+        void                    *fifo;
+
+        struct ac97_pcm         *pcm;
+        int                     pcm_open;
+
+        u32                     cr;
+        snd_pcm_substream_t     *substream;
+
+        /*
+         * PIO support
+         */
+        void                    *start;
+        void                    *end;
+        void                    *ptr;
+        int                     bytes;
+        unsigned int            period;
+        unsigned int            fifosz;
+};
+
+struct aaci {
+        struct amba_device      *dev;
+        snd_card_t              *card;
+        void                    *base;
+        unsigned int            fifosize;
+
+        /* AC'97 */
+        struct semaphore        ac97_sem;
+        ac97_bus_t              *ac97_bus;
+
+        u32                     maincr;
+        spinlock_t              lock;
+
+        struct aaci_runtime     playback;
+        struct aaci_runtime     capture;
+
+        snd_pcm_t               *pcm;
+};
+
+#define ACSTREAM_FRONT          0
+#define ACSTREAM_SURROUND       1
+#define ACSTREAM_LFE            2
+
+#endif
diff --git a/sound/arm/devdma.c b/sound/arm/devdma.c
new file mode 100644
index 000000000000..60826a5324b4
--- /dev/null
+++ b/sound/arm/devdma.c
@@ -0,0 +1,81 @@
+/*
+ *  linux/sound/arm/devdma.c
+ *
+ *  Copyright (C) 2003-2004 Russell King, All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *  ARM DMA shim for ALSA.
+ */
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+
+#include <sound/driver.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+
+#include "devdma.h"
+
+void devdma_hw_free(struct device *dev, snd_pcm_substream_t *substream)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        struct snd_dma_buffer *buf = runtime->dma_buffer_p;
+
+        if (runtime->dma_area == NULL)
+                return;
+
+        if (buf != &substream->dma_buffer) {
+                dma_free_coherent(buf->dev.dev, buf->bytes, buf->area, buf->addr);
+                kfree(runtime->dma_buffer_p);
+        }
+
+        snd_pcm_set_runtime_buffer(substream, NULL);
+}
+
+int devdma_hw_alloc(struct device *dev, snd_pcm_substream_t *substream, size_t size)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        struct snd_dma_buffer *buf = runtime->dma_buffer_p;
+        int ret = 0;
+
+        if (buf) {
+                if (buf->bytes >= size)
+                        goto out;
+                devdma_hw_free(dev, substream);
+        }
+
+        if (substream->dma_buffer.area != NULL && substream->dma_buffer.bytes >= size) {
+                buf = &substream->dma_buffer;
+        } else {
+                buf = kmalloc(sizeof(struct snd_dma_buffer), GFP_KERNEL);
+                if (!buf)
+                        goto nomem;
+
+                buf->dev.type = SNDRV_DMA_TYPE_DEV;
+                buf->dev.dev = dev;
+                buf->area = dma_alloc_coherent(dev, size, &buf->addr, GFP_KERNEL);
+                buf->bytes = size;
+                buf->private_data = NULL;
+
+                if (!buf->area)
+                        goto free;
+        }
+        snd_pcm_set_runtime_buffer(substream, buf);
+        ret = 1;
+ out:
+        runtime->dma_bytes = size;
+        return ret;
+
+ free:
+        kfree(buf);
+ nomem:
+        return -ENOMEM;
+}
+
+int devdma_mmap(struct device *dev, snd_pcm_substream_t *substream, struct vm_area_struct *vma)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        return dma_mmap_coherent(dev, vma, runtime->dma_area, runtime->dma_addr, runtime->dma_bytes);
+}
diff --git a/sound/arm/devdma.h b/sound/arm/devdma.h
new file mode 100644
index 000000000000..5a33b6bacc34
--- /dev/null
+++ b/sound/arm/devdma.h
@@ -0,0 +1,3 @@
+void devdma_hw_free(struct device *dev, snd_pcm_substream_t *substream);
+int devdma_hw_alloc(struct device *dev, snd_pcm_substream_t *substream, size_t size);
+int devdma_mmap(struct device *dev, snd_pcm_substream_t *substream, struct vm_area_struct *vma);
diff --git a/sound/core/control.c b/sound/core/control.c
index f4ea6bff1dd3..227f3cf02771 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -215,7 +215,7 @@ snd_kcontrol_t *snd_ctl_new(snd_kcontrol_t * control, unsigned int access)
  *
  * Returns the pointer of the newly generated instance, or NULL on failure.
  */
-snd_kcontrol_t *snd_ctl_new1(snd_kcontrol_new_t * ncontrol, void *private_data)
+snd_kcontrol_t *snd_ctl_new1(const snd_kcontrol_new_t * ncontrol, void *private_data)
 {
         snd_kcontrol_t kctl;
         unsigned int access;
@@ -1102,7 +1102,7 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg
                 }
         }
         up_read(&snd_ioctl_rwsem);
-        snd_printd("unknown ioctl = 0x%x\n", cmd);
+        snd_printdd("unknown ioctl = 0x%x\n", cmd);
         return -ENOTTY;
 }
 
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 344a83fd7c2e..dbc23e35fa06 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -28,6 +28,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <asm/uaccess.h>
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
 #include <asm/semaphore.h>
@@ -46,13 +47,6 @@ MODULE_LICENSE("GPL");
 #define SNDRV_CARDS     8
 #endif
 
-/* FIXME: so far only some PCI devices have the preallocation table */
-#ifdef CONFIG_PCI
-static int enable[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
-module_param_array(enable, bool, NULL, 0444);
-MODULE_PARM_DESC(enable, "Enable cards to allocate buffers.");
-#endif
-
 /*
  */
 
@@ -451,9 +445,13 @@ size_t snd_dma_get_reserved_buf(struct snd_dma_buffer *dmab, unsigned int id)
         list_for_each(p, &mem_list_head) {
                 mem = list_entry(p, struct snd_mem_list, list);
                 if (mem->id == id &&
-                    ! memcmp(&mem->buffer.dev, &dmab->dev, sizeof(dmab->dev))) {
+                    (mem->buffer.dev.dev == NULL || dmab->dev.dev == NULL ||
+                     ! memcmp(&mem->buffer.dev, &dmab->dev, sizeof(dmab->dev)))) {
+                        struct device *dev = dmab->dev.dev;
                         list_del(p);
                         *dmab = mem->buffer;
+                        if (dmab->dev.dev == NULL)
+                                dmab->dev.dev = dev;
                         kfree(mem);
                         up(&list_mutex);
                         return dmab->bytes;
@@ -508,91 +506,13 @@ static void free_all_reserved_pages(void)
 }
 
 
-
-/*
- * allocation of buffers for pre-defined devices
- */
-
-#ifdef CONFIG_PCI
-/* FIXME: for pci only - other bus? */
-struct prealloc_dev {
-        unsigned short vendor;
-        unsigned short device;
-        unsigned long dma_mask;
-        unsigned int size;
-        unsigned int buffers;
-};
-
-#define HAMMERFALL_BUFFER_SIZE    (16*1024*4*(26+1)+0x10000)
-
-static struct prealloc_dev prealloc_devices[] __initdata = {
-        {
-                /* hammerfall */
-                .vendor = 0x10ee,
-                .device = 0x3fc4,
-                .dma_mask = 0xffffffff,
-                .size = HAMMERFALL_BUFFER_SIZE,
-                .buffers = 2
-        },
-        {
-                /* HDSP */
-                .vendor = 0x10ee,
-                .device = 0x3fc5,
-                .dma_mask = 0xffffffff,
-                .size = HAMMERFALL_BUFFER_SIZE,
-                .buffers = 2
-        },
-        { }, /* terminator */
-};
-
-static void __init preallocate_cards(void)
-{
-        struct pci_dev *pci = NULL;
-        int card;
-
-        card = 0;
-
-        while ((pci = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci)) != NULL) {
-                struct prealloc_dev *dev;
-                unsigned int i;
-                if (card >= SNDRV_CARDS)
-                        break;
-                for (dev = prealloc_devices; dev->vendor; dev++) {
-                        if (dev->vendor == pci->vendor && dev->device == pci->device)
-                                break;
-                }
-                if (! dev->vendor)
-                        continue;
-                if (! enable[card++]) {
-                        printk(KERN_DEBUG "snd-page-alloc: skipping card %d, device %04x:%04x\n", card, pci->vendor, pci->device);
-                        continue;
-                }
-                        
-                if (pci_set_dma_mask(pci, dev->dma_mask) < 0 ||
-                    pci_set_consistent_dma_mask(pci, dev->dma_mask) < 0) {
-                        printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", dev->dma_mask, dev->vendor, dev->device);
-                        continue;
-                }
-                for (i = 0; i < dev->buffers; i++) {
-                        struct snd_dma_buffer dmab;
-                        memset(&dmab, 0, sizeof(dmab));
-                        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                                                dev->size, &dmab) < 0)
-                                printk(KERN_WARNING "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", dev->size);
-                        else
-                                snd_dma_reserve_buf(&dmab, snd_dma_pci_buf_id(pci));
-                }
-        }
-}
-#else
-#define preallocate_cards()     /* NOP */
-#endif
-
-
 #ifdef CONFIG_PROC_FS
 /*
  * proc file interface
  */
+#define SND_MEM_PROC_FILE       "driver/snd-page-alloc"
+struct proc_dir_entry *snd_mem_proc;
+
 static int snd_mem_proc_read(char *page, char **start, off_t off,
                              int count, int *eof, void *data)
 {
@@ -621,6 +541,97 @@ static int snd_mem_proc_read(char *page, char **start, off_t off,
         up(&list_mutex);
         return len;
 }
+
+/* FIXME: for pci only - other bus? */
+#ifdef CONFIG_PCI
+#define gettoken(bufp) strsep(bufp, " \t\n")
+
+static int snd_mem_proc_write(struct file *file, const char __user *buffer,
+                              unsigned long count, void *data)
+{
+        char buf[128];
+        char *token, *p;
+
+        if (count > ARRAY_SIZE(buf) - 1)
+                count = ARRAY_SIZE(buf) - 1;
+        if (copy_from_user(buf, buffer, count))
+                return -EFAULT;
+        buf[ARRAY_SIZE(buf) - 1] = '\0';
+
+        p = buf;
+        token = gettoken(&p);
+        if (! token || *token == '#')
+                return (int)count;
+        if (strcmp(token, "add") == 0) {
+                char *endp;
+                int vendor, device, size, buffers;
+                long mask;
+                int i, alloced;
+                struct pci_dev *pci;
+
+                if ((token = gettoken(&p)) == NULL ||
+                    (vendor = simple_strtol(token, NULL, 0)) <= 0 ||
+                    (token = gettoken(&p)) == NULL ||
+                    (device = simple_strtol(token, NULL, 0)) <= 0 ||
+                    (token = gettoken(&p)) == NULL ||
+                    (mask = simple_strtol(token, NULL, 0)) < 0 ||
+                    (token = gettoken(&p)) == NULL ||
+                    (size = memparse(token, &endp)) < 64*1024 ||
+                    size > 16*1024*1024 /* too big */ ||
+                    (token = gettoken(&p)) == NULL ||
+                    (buffers = simple_strtol(token, NULL, 0)) <= 0 ||
+                    buffers > 4) {
+                        printk(KERN_ERR "snd-page-alloc: invalid proc write format\n");
+                        return (int)count;
+                }
+                vendor &= 0xffff;
+                device &= 0xffff;
+
+                alloced = 0;
+                pci = NULL;
+                while ((pci = pci_find_device(vendor, device, pci)) != NULL) {
+                        if (mask > 0 && mask < 0xffffffff) {
+                                if (pci_set_dma_mask(pci, mask) < 0 ||
+                                    pci_set_consistent_dma_mask(pci, mask) < 0) {
+                                        printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", mask, vendor, device);
+                                        return (int)count;
+                                }
+                        }
+                        for (i = 0; i < buffers; i++) {
+                                struct snd_dma_buffer dmab;
+                                memset(&dmab, 0, sizeof(dmab));
+                                if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+                                                        size, &dmab) < 0) {
+                                        printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size);
+                                        return (int)count;
+                                }
+                                snd_dma_reserve_buf(&dmab, snd_dma_pci_buf_id(pci));
+                        }
+                        alloced++;
+                }
+                if (! alloced) {
+                        for (i = 0; i < buffers; i++) {
+                                struct snd_dma_buffer dmab;
+                                memset(&dmab, 0, sizeof(dmab));
+                                /* FIXME: We can allocate only in ZONE_DMA
+                                 * without a device pointer!
+                                 */
+                                if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, NULL,
+                                                        size, &dmab) < 0) {
+                                        printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size);
+                                        break;
+                                }
+                                snd_dma_reserve_buf(&dmab, (unsigned int)((vendor << 16) | device));
+                        }
+                }
+        } else if (strcmp(token, "erase") == 0)
+                /* FIXME: need for releasing each buffer chunk? */
+                free_all_reserved_pages();
+        else
+                printk(KERN_ERR "snd-page-alloc: invalid proc cmd\n");
+        return (int)count;
+}
+#endif /* CONFIG_PCI */
 #endif /* CONFIG_PROC_FS */
 
 /*
@@ -630,15 +641,21 @@ static int snd_mem_proc_read(char *page, char **start, off_t off,
 static int __init snd_mem_init(void)
 {
 #ifdef CONFIG_PROC_FS
-        create_proc_read_entry("driver/snd-page-alloc", 0, NULL, snd_mem_proc_read, NULL);
+        snd_mem_proc = create_proc_entry(SND_MEM_PROC_FILE, 0644, NULL);
+        if (snd_mem_proc) {
+                snd_mem_proc->read_proc = snd_mem_proc_read;
+#ifdef CONFIG_PCI
+                snd_mem_proc->write_proc = snd_mem_proc_write;
+#endif
+        }
 #endif
-        preallocate_cards();
         return 0;
 }
 
 static void __exit snd_mem_exit(void)
 {
-        remove_proc_entry("driver/snd-page-alloc", NULL);
+        if (snd_mem_proc)
+                remove_proc_entry(SND_MEM_PROC_FILE, NULL);
         free_all_reserved_pages();
         if (snd_allocated_pages > 0)
                 printk(KERN_ERR "snd-malloc: Memory leak?  pages not freed = %li\n", snd_allocated_pages);
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 1a805020f57a..cab30977e7c0 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -125,17 +125,26 @@ int snd_pcm_plugin_append(snd_pcm_plugin_t *plugin)
 static long snd_pcm_oss_bytes(snd_pcm_substream_t *substream, long frames)
 {
         snd_pcm_runtime_t *runtime = substream->runtime;
-        snd_pcm_uframes_t buffer_size = snd_pcm_lib_buffer_bytes(substream);
-        frames = frames_to_bytes(runtime, frames);
+        long buffer_size = snd_pcm_lib_buffer_bytes(substream);
+        long bytes = frames_to_bytes(runtime, frames);
         if (buffer_size == runtime->oss.buffer_bytes)
-                return frames;
-        return (runtime->oss.buffer_bytes * frames) / buffer_size;
+                return bytes;
+#if BITS_PER_LONG >= 64
+        return runtime->oss.buffer_bytes * bytes / buffer_size;
+#else
+        {
+                u64 bsize = (u64)runtime->oss.buffer_bytes * (u64)bytes;
+                u32 rem;
+                div64_32(&bsize, buffer_size, &rem);
+                return (long)bsize;
+        }
+#endif
 }
 
 static long snd_pcm_alsa_frames(snd_pcm_substream_t *substream, long bytes)
 {
         snd_pcm_runtime_t *runtime = substream->runtime;
-        snd_pcm_uframes_t buffer_size = snd_pcm_lib_buffer_bytes(substream);
+        long buffer_size = snd_pcm_lib_buffer_bytes(substream);
         if (buffer_size == runtime->oss.buffer_bytes)
                 return bytes_to_frames(runtime, bytes);
         return bytes_to_frames(runtime, (buffer_size * bytes) / runtime->oss.buffer_bytes);
@@ -464,7 +473,8 @@ static int snd_pcm_oss_change_params(snd_pcm_substream_t *substream)
         sw_params->tstamp_mode = SNDRV_PCM_TSTAMP_NONE;
         sw_params->period_step = 1;
         sw_params->sleep_min = 0;
-        sw_params->avail_min = 1;
+        sw_params->avail_min = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
+                1 : runtime->period_size;
         sw_params->xfer_align = 1;
         if (atomic_read(&runtime->mmap_count) ||
             (substream->oss.setup && substream->oss.setup->nosilence)) {
@@ -1527,12 +1537,15 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str
                         snd_pcm_oss_simulate_fill(substream, delay);
                 info.bytes = snd_pcm_oss_bytes(substream, runtime->status->hw_ptr) & INT_MAX;
         } else {
-                delay = snd_pcm_oss_bytes(substream, delay) + fixup;
-                info.blocks = delay / runtime->oss.period_bytes;
-                if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                delay = snd_pcm_oss_bytes(substream, delay);
+                if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                        info.blocks = (runtime->oss.buffer_bytes - delay - fixup) / runtime->oss.period_bytes;
                         info.bytes = (runtime->oss.bytes - delay) & INT_MAX;
-                else
+                } else {
+                        delay += fixup;
+                        info.blocks = delay / runtime->oss.period_bytes;
                         info.bytes = (runtime->oss.bytes + delay) & INT_MAX;
+                }
         }
         if (copy_to_user(_info, &info, sizeof(info)))
                 return -EFAULT;
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 6bb31009f0b4..6430410c6c04 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -663,10 +663,7 @@ static int snd_pcm_plug_playback_channels_mask(snd_pcm_plug_t *plug,
                 bitset_t *dstmask = bs;
                 int err;
                 bitset_one(dstmask, schannels);
-                if (plugin == NULL) {
-                        bitset_and(client_vmask, dstmask, schannels);
-                        return 0;
-                }
+
                 while (1) {
                         err = plugin->src_channels_mask(plugin, dstmask, &srcmask);
                         if (err < 0)
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 8d94325529a8..9f4c9209b271 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -451,6 +451,7 @@ static int snd_pcm_stream_proc_init(snd_pcm_str_t *pstr)
                 entry->c.text.read = snd_pcm_xrun_debug_read;
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_pcm_xrun_debug_write;
+                entry->mode |= S_IWUSR;
                 entry->private_data = pstr;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
@@ -1048,7 +1049,6 @@ EXPORT_SYMBOL(snd_pcm_release_substream);
 EXPORT_SYMBOL(snd_pcm_format_name);
   /* pcm_native.c */
 EXPORT_SYMBOL(snd_pcm_link_rwlock);
-EXPORT_SYMBOL(snd_pcm_start);
 #ifdef CONFIG_PM
 EXPORT_SYMBOL(snd_pcm_suspend);
 EXPORT_SYMBOL(snd_pcm_suspend_all);
@@ -1068,6 +1068,7 @@ EXPORT_SYMBOL(snd_pcm_format_little_endian);
 EXPORT_SYMBOL(snd_pcm_format_big_endian);
 EXPORT_SYMBOL(snd_pcm_format_width);
 EXPORT_SYMBOL(snd_pcm_format_physical_width);
+EXPORT_SYMBOL(snd_pcm_format_size);
 EXPORT_SYMBOL(snd_pcm_format_silence_64);
 EXPORT_SYMBOL(snd_pcm_format_set_silence);
 EXPORT_SYMBOL(snd_pcm_build_linear_format);
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 151fd99ca2c9..c5bfd0918cff 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1143,7 +1143,8 @@ int snd_pcm_hw_constraint_pow2(snd_pcm_runtime_t *runtime,
 #define INT_MIN ((int)((unsigned int)INT_MAX+1))
 #endif
 
-void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params, snd_pcm_hw_param_t var)
+static void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params,
+                                  snd_pcm_hw_param_t var)
 {
         if (hw_is_mask(var)) {
                 snd_mask_any(hw_param_mask(params, var));
@@ -1160,6 +1161,7 @@ void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params, snd_pcm_hw_param_t var)
         snd_BUG();
 }
 
+#if 0
 /**
  * snd_pcm_hw_param_any
  */
@@ -1169,6 +1171,7 @@ int snd_pcm_hw_param_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
         _snd_pcm_hw_param_any(params, var);
         return snd_pcm_hw_refine(pcm, params);
 }
+#endif  /*  0  */
 
 void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params)
 {
@@ -1181,6 +1184,7 @@ void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params)
         params->info = ~0U;
 }
 
+#if 0
 /**
  * snd_pcm_hw_params_any
  *
@@ -1191,6 +1195,7 @@ int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
         _snd_pcm_hw_params_any(params);
         return snd_pcm_hw_refine(pcm, params);
 }
+#endif  /*  0  */
 
 /**
  * snd_pcm_hw_param_value
@@ -1198,8 +1203,8 @@ int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
  * Return the value for field PAR if it's fixed in configuration space 
  *  defined by PARAMS. Return -EINVAL otherwise
  */
-int snd_pcm_hw_param_value(const snd_pcm_hw_params_t *params,
-                           snd_pcm_hw_param_t var, int *dir)
+static int snd_pcm_hw_param_value(const snd_pcm_hw_params_t *params,
+                                  snd_pcm_hw_param_t var, int *dir)
 {
         if (hw_is_mask(var)) {
                 const snd_mask_t *mask = hw_param_mask_c(params, var);
@@ -1296,6 +1301,7 @@ int _snd_pcm_hw_param_setinteger(snd_pcm_hw_params_t *params,
         return changed;
 }
         
+#if 0
 /**
  * snd_pcm_hw_param_setinteger
  *
@@ -1317,9 +1323,10 @@ int snd_pcm_hw_param_setinteger(snd_pcm_t *pcm,
         }
         return 0;
 }
+#endif  /*  0  */
 
-int _snd_pcm_hw_param_first(snd_pcm_hw_params_t *params,
-                            snd_pcm_hw_param_t var)
+static int _snd_pcm_hw_param_first(snd_pcm_hw_params_t *params,
+                                   snd_pcm_hw_param_t var)
 {
         int changed;
         if (hw_is_mask(var))
@@ -1345,9 +1352,9 @@ int _snd_pcm_hw_param_first(snd_pcm_hw_params_t *params,
  * values > minimum. Reduce configuration space accordingly.
  * Return the minimum.
  */
-int snd_pcm_hw_param_first(snd_pcm_t *pcm, 
-                           snd_pcm_hw_params_t *params, 
-                           snd_pcm_hw_param_t var, int *dir)
+static int snd_pcm_hw_param_first(snd_pcm_t *pcm, 
+                                  snd_pcm_hw_params_t *params, 
+                                  snd_pcm_hw_param_t var, int *dir)
 {
         int changed = _snd_pcm_hw_param_first(params, var);
         if (changed < 0)
@@ -1359,8 +1366,8 @@ int snd_pcm_hw_param_first(snd_pcm_t *pcm,
         return snd_pcm_hw_param_value(params, var, dir);
 }
 
-int _snd_pcm_hw_param_last(snd_pcm_hw_params_t *params,
-                           snd_pcm_hw_param_t var)
+static int _snd_pcm_hw_param_last(snd_pcm_hw_params_t *params,
+                                  snd_pcm_hw_param_t var)
 {
         int changed;
         if (hw_is_mask(var))
@@ -1386,9 +1393,9 @@ int _snd_pcm_hw_param_last(snd_pcm_hw_params_t *params,
  * values < maximum. Reduce configuration space accordingly.
  * Return the maximum.
  */
-int snd_pcm_hw_param_last(snd_pcm_t *pcm, 
-                          snd_pcm_hw_params_t *params,
-                          snd_pcm_hw_param_t var, int *dir)
+static int snd_pcm_hw_param_last(snd_pcm_t *pcm, 
+                                 snd_pcm_hw_params_t *params,
+                                 snd_pcm_hw_param_t var, int *dir)
 {
         int changed = _snd_pcm_hw_param_last(params, var);
         if (changed < 0)
@@ -1437,8 +1444,9 @@ int _snd_pcm_hw_param_min(snd_pcm_hw_params_t *params,
  * values < VAL. Reduce configuration space accordingly.
  * Return new minimum or -EINVAL if the configuration space is empty
  */
-int snd_pcm_hw_param_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
-                         snd_pcm_hw_param_t var, unsigned int val, int *dir)
+static int snd_pcm_hw_param_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
+                                snd_pcm_hw_param_t var, unsigned int val,
+                                int *dir)
 {
         int changed = _snd_pcm_hw_param_min(params, var, val, dir ? *dir : 0);
         if (changed < 0)
@@ -1451,8 +1459,9 @@ int snd_pcm_hw_param_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
         return snd_pcm_hw_param_value_min(params, var, dir);
 }
 
-int _snd_pcm_hw_param_max(snd_pcm_hw_params_t *params,
-                           snd_pcm_hw_param_t var, unsigned int val, int dir)
+static int _snd_pcm_hw_param_max(snd_pcm_hw_params_t *params,
+                                 snd_pcm_hw_param_t var, unsigned int val,
+                                 int dir)
 {
         int changed;
         int open = 0;
@@ -1490,8 +1499,9 @@ int _snd_pcm_hw_param_max(snd_pcm_hw_params_t *params,
  *  values >= VAL + 1. Reduce configuration space accordingly.
  *  Return new maximum or -EINVAL if the configuration space is empty
  */
-int snd_pcm_hw_param_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
-                          snd_pcm_hw_param_t var, unsigned int val, int *dir)
+static int snd_pcm_hw_param_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
+                                snd_pcm_hw_param_t var, unsigned int val,
+                                int *dir)
 {
         int changed = _snd_pcm_hw_param_max(params, var, val, dir ? *dir : 0);
         if (changed < 0)
@@ -2564,9 +2574,6 @@ snd_pcm_sframes_t snd_pcm_lib_readv(snd_pcm_substream_t *substream,
 EXPORT_SYMBOL(snd_interval_refine);
 EXPORT_SYMBOL(snd_interval_list);
 EXPORT_SYMBOL(snd_interval_ratnum);
-EXPORT_SYMBOL(snd_interval_muldivk);
-EXPORT_SYMBOL(snd_interval_mulkdiv);
-EXPORT_SYMBOL(snd_interval_div);
 EXPORT_SYMBOL(_snd_pcm_hw_params_any);
 EXPORT_SYMBOL(_snd_pcm_hw_param_min);
 EXPORT_SYMBOL(_snd_pcm_hw_param_set);
@@ -2580,7 +2587,6 @@ EXPORT_SYMBOL(snd_pcm_hw_param_last);
 EXPORT_SYMBOL(snd_pcm_hw_param_near);
 EXPORT_SYMBOL(snd_pcm_hw_param_set);
 EXPORT_SYMBOL(snd_pcm_hw_refine);
-EXPORT_SYMBOL(snd_pcm_hw_params);
 EXPORT_SYMBOL(snd_pcm_hw_constraints_init);
 EXPORT_SYMBOL(snd_pcm_hw_constraints_complete);
 EXPORT_SYMBOL(snd_pcm_hw_constraint_list);
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index f1d5f7a6ee0c..9a174fb96565 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -204,6 +204,7 @@ static int snd_pcm_lib_preallocate_pages1(snd_pcm_substream_t *substream,
                 entry->c.text.read = snd_pcm_lib_preallocate_proc_read;
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_pcm_lib_preallocate_proc_write;
+                entry->mode |= S_IWUSR;
                 entry->private_data = substream;
                 if (snd_info_register(entry) < 0) {
                         snd_info_free_entry(entry);
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index 422b8db14154..1453743e4da0 100644
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -270,22 +270,6 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format)
 }
 
 /**
- * snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian
- * @format: the format to check
- *
- * Returns 1 if the given PCM format is CPU-endian, 0 if
- * opposite, or a negative error code if endian not specified.
- */
-int snd_pcm_format_cpu_endian(snd_pcm_format_t format)
-{
-#ifdef SNDRV_LITTLE_ENDIAN
-        return snd_pcm_format_little_endian(format);
-#else
-        return snd_pcm_format_big_endian(format);
-#endif
-}
-
-/**
  * snd_pcm_format_width - return the bit-width of the format
  * @format: the format to check
  *
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index cad9bbde9986..10c2c9832649 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -337,8 +337,8 @@ out:
         return err;
 }
 
-int snd_pcm_hw_params(snd_pcm_substream_t *substream,
-                      snd_pcm_hw_params_t *params)
+static int snd_pcm_hw_params(snd_pcm_substream_t *substream,
+                             snd_pcm_hw_params_t *params)
 {
         snd_pcm_runtime_t *runtime;
         int err;
@@ -1368,43 +1368,32 @@ static int snd_pcm_drain(snd_pcm_substream_t *substream)
         if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
                 return -EBADFD;
 
-        down_read(&snd_pcm_link_rwsem);
         snd_power_lock(card);
         if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {
                 result = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile);
-                if (result < 0)
-                        goto _unlock;
+                if (result < 0) {
+                        snd_power_unlock(card);
+                        return result;
+                }
         }
 
         /* allocate temporary record for drain sync */
+        down_read(&snd_pcm_link_rwsem);
         if (snd_pcm_stream_linked(substream)) {
                 drec = kmalloc(substream->group->count * sizeof(*drec), GFP_KERNEL);
                 if (! drec) {
-                        result = -ENOMEM;
-                        goto _unlock;
+                        up_read(&snd_pcm_link_rwsem);
+                        snd_power_unlock(card);
+                        return -ENOMEM;
                 }
         } else
                 drec = &drec_tmp;
 
-        snd_pcm_stream_lock_irq(substream);
-        /* resume pause */
-        if (runtime->status->state == SNDRV_PCM_STATE_PAUSED)
-                snd_pcm_pause(substream, 0);
-
-        /* pre-start/stop - all running streams are changed to DRAINING state */
-        result = snd_pcm_action(&snd_pcm_action_drain_init, substream, 0);
-        if (result < 0)
-                goto _end;
-
-        /* check streams with PLAYBACK & DRAINING */
+        /* count only playback streams */
         num_drecs = 0;
         snd_pcm_group_for_each(pos, substream) {
                 snd_pcm_substream_t *s = snd_pcm_group_substream_entry(pos);
                 runtime = s->runtime;
-                if (runtime->status->state != SNDRV_PCM_STATE_DRAINING) {
-                        runtime->status->state = SNDRV_PCM_STATE_SETUP;
-                        continue;
-                }
                 if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                         d = &drec[num_drecs++];
                         d->substream = s;
@@ -1418,9 +1407,21 @@ static int snd_pcm_drain(snd_pcm_substream_t *substream)
                                 runtime->stop_threshold = runtime->buffer_size;
                 }
         }
-
+        up_read(&snd_pcm_link_rwsem);
         if (! num_drecs)
-                goto _end;
+                goto _error;
+
+        snd_pcm_stream_lock_irq(substream);
+        /* resume pause */
+        if (runtime->status->state == SNDRV_PCM_STATE_PAUSED)
+                snd_pcm_pause(substream, 0);
+
+        /* pre-start/stop - all running streams are changed to DRAINING state */
+        result = snd_pcm_action(&snd_pcm_action_drain_init, substream, 0);
+        if (result < 0) {
+                snd_pcm_stream_unlock_irq(substream);
+                goto _error;
+        }
 
         for (;;) {
                 long tout;
@@ -1428,6 +1429,15 @@ static int snd_pcm_drain(snd_pcm_substream_t *substream)
                         result = -ERESTARTSYS;
                         break;
                 }
+                /* all finished? */
+                for (i = 0; i < num_drecs; i++) {
+                        runtime = drec[i].substream->runtime;
+                        if (runtime->status->state == SNDRV_PCM_STATE_DRAINING)
+                                break;
+                }
+                if (i == num_drecs)
+                        break; /* yes, all drained */
+
                 set_current_state(TASK_INTERRUPTIBLE);
                 snd_pcm_stream_unlock_irq(substream);
                 snd_power_unlock(card);
@@ -1444,15 +1454,11 @@ static int snd_pcm_drain(snd_pcm_substream_t *substream)
                         }
                         break;
                 }
-                /* all finished? */
-                for (i = 0; i < num_drecs; i++) {
-                        runtime = drec[i].substream->runtime;
-                        if (runtime->status->state == SNDRV_PCM_STATE_DRAINING)
-                                break;
-                }
-                if (i == num_drecs)
-                        break;
         }
+
+        snd_pcm_stream_unlock_irq(substream);
+
+ _error:
         for (i = 0; i < num_drecs; i++) {
                 d = &drec[i];
                 runtime = d->substream->runtime;
@@ -1460,13 +1466,9 @@ static int snd_pcm_drain(snd_pcm_substream_t *substream)
                 runtime->stop_threshold = d->stop_threshold;
         }
 
- _end:
-        snd_pcm_stream_unlock_irq(substream);
         if (drec != &drec_tmp)
                 kfree(drec);
- _unlock:
         snd_power_unlock(card);
-        up_read(&snd_pcm_link_rwsem);
 
         return result;
 }
diff --git a/sound/core/seq/oss/seq_oss_synth.c b/sound/core/seq/oss/seq_oss_synth.c
index 638cc148706d..1a7736cbf3a4 100644
--- a/sound/core/seq/oss/seq_oss_synth.c
+++ b/sound/core/seq/oss/seq_oss_synth.c
@@ -325,14 +325,10 @@ snd_seq_oss_synth_cleanup(seq_oss_devinfo_t *dp)
                         }
                         snd_use_lock_free(&rec->use_lock);
                 }
-                if (info->sysex) {
-                        kfree(info->sysex);
-                        info->sysex = NULL;
-                }
-                if (info->ch) {
-                        kfree(info->ch);
-                        info->ch = NULL;
-                }
+                kfree(info->sysex);
+                info->sysex = NULL;
+                kfree(info->ch);
+                info->ch = NULL;
         }
         dp->synth_opened = 0;
         dp->max_synthdev = 0;
@@ -418,14 +414,10 @@ snd_seq_oss_synth_reset(seq_oss_devinfo_t *dp, int dev)
                                           dp->file_mode) < 0) {
                         midi_synth_dev.opened--;
                         info->opened = 0;
-                        if (info->sysex) {
-                                kfree(info->sysex);
-                                info->sysex = NULL;
-                        }
-                        if (info->ch) {
-                                kfree(info->ch);
-                                info->ch = NULL;
-                        }
+                        kfree(info->sysex);
+                        info->sysex = NULL;
+                        kfree(info->ch);
+                        info->ch = NULL;
                 }
                 return;
         }
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index e88967c5b93d..ea945a5d2a0b 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -140,10 +140,7 @@ dummy_input(snd_seq_event_t *ev, int direct, void *private_data, int atomic, int
 static void
 dummy_free(void *private_data)
 {
-        snd_seq_dummy_port_t *p;
-
-        p = private_data;
-        kfree(p);
+        kfree(private_data);
 }
 
 /*
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index 18247db45db6..57be9155eb62 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -414,6 +414,8 @@ snd_seq_midisynth_register_port(snd_seq_device_t *dev)
         if (newclient)
                 synths[card->number] = client;
         up(&register_mutex);
+        kfree(info);
+        kfree(port);
         return 0;       /* success */
 
       __nomem:
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c
index 21e569062bc3..df1e2bb39745 100644
--- a/sound/core/seq/seq_midi_event.c
+++ b/sound/core/seq/seq_midi_event.c
@@ -171,11 +171,13 @@ void snd_midi_event_reset_decode(snd_midi_event_t *dev)
         spin_unlock_irqrestore(&dev->lock, flags);
 }
 
+#if 0
 void snd_midi_event_init(snd_midi_event_t *dev)
 {
         snd_midi_event_reset_encode(dev);
         snd_midi_event_reset_decode(dev);
 }
+#endif  /*  0  */
 
 void snd_midi_event_no_status(snd_midi_event_t *dev, int on)
 {
@@ -185,6 +187,7 @@ void snd_midi_event_no_status(snd_midi_event_t *dev, int on)
 /*
  * resize buffer
  */
+#if 0
 int snd_midi_event_resize_buffer(snd_midi_event_t *dev, int bufsize)
 {
         unsigned char *new_buf, *old_buf;
@@ -204,6 +207,7 @@ int snd_midi_event_resize_buffer(snd_midi_event_t *dev, int bufsize)
         kfree(old_buf);
         return 0;
 }
+#endif  /*  0  */
 
 /*
  *  read bytes and encode to sequencer event if finished
@@ -517,8 +521,6 @@ static int extra_decode_xrpn(snd_midi_event_t *dev, unsigned char *buf, int coun
  
 EXPORT_SYMBOL(snd_midi_event_new);
 EXPORT_SYMBOL(snd_midi_event_free);
-EXPORT_SYMBOL(snd_midi_event_resize_buffer);
-EXPORT_SYMBOL(snd_midi_event_init);
 EXPORT_SYMBOL(snd_midi_event_reset_encode);
 EXPORT_SYMBOL(snd_midi_event_reset_decode);
 EXPORT_SYMBOL(snd_midi_event_no_status);
diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
index 3afc7cc0c9a7..98de2e711fde 100644
--- a/sound/core/seq/seq_queue.c
+++ b/sound/core/seq/seq_queue.c
@@ -672,7 +672,8 @@ static void queue_broadcast_event(queue_t *q, snd_seq_event_t *ev, int atomic, i
  * process a received queue-control event.
  * this function is exported for seq_sync.c.
  */
-void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int atomic, int hop)
+static void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev,
+                                        int atomic, int hop)
 {
         switch (ev->type) {
         case SNDRV_SEQ_EVENT_START:
diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h
index b1bf5519fb3b..ea3c54216ea8 100644
--- a/sound/core/seq/seq_queue.h
+++ b/sound/core/seq/seq_queue.h
@@ -111,7 +111,6 @@ int snd_seq_queue_use(int queueid, int client, int use);
 int snd_seq_queue_is_used(int queueid, int client);
 
 int snd_seq_control_queue(snd_seq_event_t *ev, int atomic, int hop);
-void snd_seq_queue_process_event(queue_t *q, snd_seq_event_t *ev, int atomic, int hop);
 
 /*
  * 64bit division - for sync stuff..
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c
index 753f1c0863cc..a7f76fc95280 100644
--- a/sound/core/seq/seq_timer.c
+++ b/sound/core/seq/seq_timer.c
@@ -36,7 +36,8 @@ extern int seq_default_timer_resolution;
 
 #define SKEW_BASE       0x10000 /* 16bit shift */
 
-void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick, int tempo, int ppq, int nticks)
+static void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick,
+                                              int tempo, int ppq, int nticks)
 {
         if (tempo < 1000000)
                 tick->resolution = (tempo * 1000) / ppq;
diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h
index 4c0872df8931..287ed68591de 100644
--- a/sound/core/seq/seq_timer.h
+++ b/sound/core/seq/seq_timer.h
@@ -64,8 +64,6 @@ extern seq_timer_t *snd_seq_timer_new(void);
 /* delete timer (destructor) */
 extern void snd_seq_timer_delete(seq_timer_t **tmr);
 
-void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick, int tempo, int ppq, int nticks);
-
 /* */
 static inline void snd_seq_timer_update_tick(seq_timer_tick_t *tick, unsigned long resolution)
 {
diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c
index 6b4e630ace54..a66484b5cf0e 100644
--- a/sound/core/seq/seq_virmidi.c
+++ b/sound/core/seq/seq_virmidi.c
@@ -110,7 +110,7 @@ static int snd_virmidi_dev_receive_event(snd_virmidi_dev_t *rdev, snd_seq_event_
  * handler of a remote port which is attached to the virmidi via
  * SNDRV_VIRMIDI_SEQ_ATTACH.
  */
-/* exported */
+#if 0
 int snd_virmidi_receive(snd_rawmidi_t *rmidi, snd_seq_event_t *ev)
 {
         snd_virmidi_dev_t *rdev;
@@ -118,6 +118,7 @@ int snd_virmidi_receive(snd_rawmidi_t *rmidi, snd_seq_event_t *ev)
         rdev = rmidi->private_data;
         return snd_virmidi_dev_receive_event(rdev, ev);
 }
+#endif  /*  0  */
 
 /*
  * event handler of virmidi port
@@ -384,7 +385,7 @@ static int snd_virmidi_dev_attach_seq(snd_virmidi_dev_t *rdev)
         info->client = client;
         info->type = KERNEL_CLIENT;
         sprintf(info->name, "%s %d-%d", rdev->rmidi->name, rdev->card->number, rdev->device);
-        snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, &info);
+        snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, info);
 
         /* create a port */
         memset(pinfo, 0, sizeof(*pinfo));
@@ -405,7 +406,7 @@ static int snd_virmidi_dev_attach_seq(snd_virmidi_dev_t *rdev)
         pcallbacks.unuse = snd_virmidi_unuse;
         pcallbacks.event_input = snd_virmidi_event_input;
         pinfo->kernel = &pcallbacks;
-        err = snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_CREATE_PORT, &pinfo);
+        err = snd_seq_kernel_client_ctl(client, SNDRV_SEQ_IOCTL_CREATE_PORT, pinfo);
         if (err < 0) {
                 snd_seq_delete_kernel_client(client);
                 rdev->client = -1;
@@ -548,4 +549,3 @@ module_init(alsa_virmidi_init)
 module_exit(alsa_virmidi_exit)
 
 EXPORT_SYMBOL(snd_virmidi_new);
-EXPORT_SYMBOL(snd_virmidi_receive);
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 33eaa5e5d284..0815fadeb3ec 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -431,7 +431,6 @@ EXPORT_SYMBOL(snd_card_pci_resume);
 EXPORT_SYMBOL(snd_device_new);
 EXPORT_SYMBOL(snd_device_register);
 EXPORT_SYMBOL(snd_device_free);
-EXPORT_SYMBOL(snd_device_free_all);
   /* isadma.c */
 #ifdef CONFIG_ISA
 EXPORT_SYMBOL(snd_dma_program);
diff --git a/sound/core/timer.c b/sound/core/timer.c
index fa762ca439be..b498e5482d77 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -69,6 +69,7 @@ typedef struct {
         struct timespec tstamp;         /* trigger tstamp */
         wait_queue_head_t qchange_sleep;
         struct fasync_struct *fasync;
+        struct semaphore tread_sem;
 } snd_timer_user_t;
 
 /* list of timers */
@@ -844,7 +845,7 @@ int snd_timer_dev_register(snd_device_t *dev)
         return 0;
 }
 
-int snd_timer_unregister(snd_timer_t *timer)
+static int snd_timer_unregister(snd_timer_t *timer)
 {
         struct list_head *p, *n;
         snd_timer_instance_t *ti;
@@ -945,11 +946,6 @@ struct snd_timer_system_private {
         unsigned long correction;
 };
 
-unsigned int snd_timer_system_resolution(void)
-{
-        return 1000000000L / HZ;
-}
-
 static void snd_timer_s_function(unsigned long data)
 {
         snd_timer_t *timer = (snd_timer_t *)data;
@@ -1208,6 +1204,7 @@ static int snd_timer_user_open(struct inode *inode, struct file *file)
                 return -ENOMEM;
         spin_lock_init(&tu->qlock);
         init_waitqueue_head(&tu->qchange_sleep);
+        init_MUTEX(&tu->tread_sem);
         tu->ticks = 1;
         tu->queue_size = 128;
         tu->queue = (snd_timer_read_t *)kmalloc(tu->queue_size * sizeof(snd_timer_read_t), GFP_KERNEL);
@@ -1454,46 +1451,51 @@ static int snd_timer_user_tselect(struct file *file, snd_timer_select_t __user *
         snd_timer_user_t *tu;
         snd_timer_select_t tselect;
         char str[32];
-        int err;
+        int err = 0;
         
         tu = file->private_data;
-        if (tu->timeri)
+        down(&tu->tread_sem);
+        if (tu->timeri) {
                 snd_timer_close(tu->timeri);
-        if (copy_from_user(&tselect, _tselect, sizeof(tselect)))
-                return -EFAULT;
+                tu->timeri = NULL;
+        }
+        if (copy_from_user(&tselect, _tselect, sizeof(tselect))) {
+                err = -EFAULT;
+                goto __err;
+        }
         sprintf(str, "application %i", current->pid);
         if (tselect.id.dev_class != SNDRV_TIMER_CLASS_SLAVE)
                 tselect.id.dev_sclass = SNDRV_TIMER_SCLASS_APPLICATION;
         if ((err = snd_timer_open(&tu->timeri, str, &tselect.id, current->pid)) < 0)
-                return err;
+                goto __err;
 
-        if (tu->queue) {
-                kfree(tu->queue);
-                tu->queue = NULL;
-        }
-        if (tu->tqueue) {
-                kfree(tu->tqueue);
-                tu->tqueue = NULL;
-        }
+        kfree(tu->queue);
+        tu->queue = NULL;
+        kfree(tu->tqueue);
+        tu->tqueue = NULL;
         if (tu->tread) {
                 tu->tqueue = (snd_timer_tread_t *)kmalloc(tu->queue_size * sizeof(snd_timer_tread_t), GFP_KERNEL);
-                if (tu->tqueue == NULL) {
-                        snd_timer_close(tu->timeri);
-                        return -ENOMEM;
-                }
+                if (tu->tqueue == NULL)
+                        err = -ENOMEM;
         } else {
                 tu->queue = (snd_timer_read_t *)kmalloc(tu->queue_size * sizeof(snd_timer_read_t), GFP_KERNEL);
-                if (tu->queue == NULL) {
-                        snd_timer_close(tu->timeri);
-                        return -ENOMEM;
-                }
+                if (tu->queue == NULL)
+                        err = -ENOMEM;
         }
         
-        tu->timeri->flags |= SNDRV_TIMER_IFLG_FAST;
-        tu->timeri->callback = tu->tread ? snd_timer_user_tinterrupt : snd_timer_user_interrupt;
-        tu->timeri->ccallback = snd_timer_user_ccallback;
-        tu->timeri->callback_data = (void *)tu;
-        return 0;
+        if (err < 0) {
+                snd_timer_close(tu->timeri);
+                tu->timeri = NULL;
+        } else {
+                tu->timeri->flags |= SNDRV_TIMER_IFLG_FAST;
+                tu->timeri->callback = tu->tread ? snd_timer_user_tinterrupt : snd_timer_user_interrupt;
+                tu->timeri->ccallback = snd_timer_user_ccallback;
+                tu->timeri->callback_data = (void *)tu;
+        }
+
+      __err:
+        up(&tu->tread_sem);
+        return err;
 }
 
 static int snd_timer_user_info(struct file *file, snd_timer_info_t __user *_info)
@@ -1669,6 +1671,23 @@ static int snd_timer_user_continue(struct file *file)
         return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
 }
 
+static int snd_timer_user_pause(struct file *file)
+{
+        int err;
+        snd_timer_user_t *tu;
+                
+        tu = file->private_data;
+        snd_assert(tu->timeri != NULL, return -ENXIO);
+        return (err = snd_timer_pause(tu->timeri)) < 0 ? err : 0;
+}
+
+enum {
+        SNDRV_TIMER_IOCTL_START_OLD = _IO('T', 0x20),
+        SNDRV_TIMER_IOCTL_STOP_OLD = _IO('T', 0x21),
+        SNDRV_TIMER_IOCTL_CONTINUE_OLD = _IO('T', 0x22),
+        SNDRV_TIMER_IOCTL_PAUSE_OLD = _IO('T', 0x23),
+};
+
 static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         snd_timer_user_t *tu;
@@ -1685,11 +1704,17 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned l
         {
                 int xarg;
                 
-                if (tu->timeri)         /* too late */
+                down(&tu->tread_sem);
+                if (tu->timeri) {       /* too late */
+                        up(&tu->tread_sem);
                         return -EBUSY;
-                if (get_user(xarg, p))
+                }
+                if (get_user(xarg, p)) {
+                        up(&tu->tread_sem);
                         return -EFAULT;
+                }
                 tu->tread = xarg ? 1 : 0;
+                up(&tu->tread_sem);
                 return 0;
         }
         case SNDRV_TIMER_IOCTL_GINFO:
@@ -1707,11 +1732,17 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned l
         case SNDRV_TIMER_IOCTL_STATUS:
                 return snd_timer_user_status(file, argp);
         case SNDRV_TIMER_IOCTL_START:
+        case SNDRV_TIMER_IOCTL_START_OLD:
                 return snd_timer_user_start(file);
         case SNDRV_TIMER_IOCTL_STOP:
+        case SNDRV_TIMER_IOCTL_STOP_OLD:
                 return snd_timer_user_stop(file);
         case SNDRV_TIMER_IOCTL_CONTINUE:
+        case SNDRV_TIMER_IOCTL_CONTINUE_OLD:
                 return snd_timer_user_continue(file);
+        case SNDRV_TIMER_IOCTL_PAUSE:
+        case SNDRV_TIMER_IOCTL_PAUSE_OLD:
+                return snd_timer_user_pause(file);
         }
         return -ENOTTY;
 }
@@ -1898,4 +1929,3 @@ EXPORT_SYMBOL(snd_timer_global_free);
 EXPORT_SYMBOL(snd_timer_global_register);
 EXPORT_SYMBOL(snd_timer_global_unregister);
 EXPORT_SYMBOL(snd_timer_interrupt);
-EXPORT_SYMBOL(snd_timer_system_resolution);
diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c
index 9fbc3957a22d..3de552dfe80f 100644
--- a/sound/core/timer_compat.c
+++ b/sound/core/timer_compat.c
@@ -106,8 +106,13 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
         case SNDRV_TIMER_IOCTL_SELECT:
         case SNDRV_TIMER_IOCTL_PARAMS:
         case SNDRV_TIMER_IOCTL_START:
+        case SNDRV_TIMER_IOCTL_START_OLD:
         case SNDRV_TIMER_IOCTL_STOP:
+        case SNDRV_TIMER_IOCTL_STOP_OLD:
         case SNDRV_TIMER_IOCTL_CONTINUE:
+        case SNDRV_TIMER_IOCTL_CONTINUE_OLD:
+        case SNDRV_TIMER_IOCTL_PAUSE:
+        case SNDRV_TIMER_IOCTL_PAUSE_OLD:
         case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
                 return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
         case SNDRV_TIMER_IOCTL_INFO32:
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 98587176b327..af381b15fe5c 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -1264,14 +1264,10 @@ static void snd_vx_pcm_free(snd_pcm_t *pcm)
 {
         vx_core_t *chip = pcm->private_data;
         chip->pcm[pcm->device] = NULL;
-        if (chip->playback_pipes) {
-                kfree(chip->playback_pipes);
-                chip->playback_pipes = NULL;
-        }
-        if (chip->capture_pipes) {
-                kfree(chip->capture_pipes);
-                chip->capture_pipes = NULL;
-        }
+        kfree(chip->playback_pipes);
+        chip->playback_pipes = NULL;
+        kfree(chip->capture_pipes);
+        chip->capture_pipes = NULL;
 }
 
 /*
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
index bb503e70b664..2da8d7f157f4 100644
--- a/sound/i2c/tea6330t.c
+++ b/sound/i2c/tea6330t.c
@@ -266,8 +266,7 @@ TEA6330T_TREBLE("Tone Control - Treble", 0)
 
 static void snd_tea6330_free(snd_i2c_device_t *device)
 {
-        tea6330t_t *tea = device->private_data;
-        kfree(tea);
+        kfree(device->private_data);
 }
                                         
 int snd_tea6330t_update_mixer(snd_card_t * card,
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 3a3228b18726..148a856a43ad 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -179,6 +179,7 @@ config SND_INTERWAVE_STB
         select SND_RAWMIDI
         select SND_CS4231_LIB
         select SND_GUS_SYNTH
+        select ISAPNP
         help
           Say Y here to include support for AMD InterWave based
           soundcards with a TEA6330T bass and treble regulator
diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 9fa7a78da6c3..563296d02894 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -83,6 +83,8 @@ struct snd_card_ad1816a {
 static struct pnp_card_device_id snd_ad1816a_pnpids[] = {
         /* Analog Devices AD1815 */
         { .id = "ADS7150", .devs = { { .id = "ADS7150" }, { .id = "ADS7151" } } },
+        /* Analog Device AD1816? */
+        { .id = "ADS7180", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },
         /* Analog Devices AD1816A - added by Kenneth Platz <kxp@atl.hp.com> */
         { .id = "ADS7181", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },
         /* Analog Devices AD1816A - Aztech/Newcom SC-16 3D */
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index e745a54e00a1..39f4eff44f5c 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -349,8 +349,7 @@ static int __devinit snd_card_cs4236_pnp(int dev, struct snd_card_cs4236 *acard,
                 pnp_init_resource_table(cfg);
                 if (mpu_port[dev] != SNDRV_AUTO_PORT)
                         pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2);
-                if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0 &&
-                    pnp_irq_valid(pdev, 0))
+                if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0)
                         pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1);
                 err = pnp_manual_config_dev(pdev, cfg, 0);
                 if (err < 0)
diff --git a/sound/isa/gus/gus_io.c b/sound/isa/gus/gus_io.c
index f0570f2bf75f..337b0e2a8a36 100644
--- a/sound/isa/gus/gus_io.c
+++ b/sound/isa/gus/gus_io.c
@@ -244,6 +244,8 @@ unsigned short snd_gf1_i_look16(snd_gus_card_t * gus, unsigned char reg)
         return res;
 }
 
+#if 0
+
 void snd_gf1_i_adlib_write(snd_gus_card_t * gus,
                            unsigned char reg,
                            unsigned char data)
@@ -265,6 +267,8 @@ void snd_gf1_i_write_addr(snd_gus_card_t * gus, unsigned char reg,
         spin_unlock_irqrestore(&gus->reg_lock, flags);
 }
 
+#endif  /*  0  */
+
 unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus,
                                  unsigned char reg, short w_16bit)
 {
@@ -329,6 +333,8 @@ unsigned char snd_gf1_peek(snd_gus_card_t * gus, unsigned int addr)
         return res;
 }
 
+#if 0
+
 void snd_gf1_pokew(snd_gus_card_t * gus, unsigned int addr, unsigned short data)
 {
         unsigned long flags;
@@ -405,9 +411,7 @@ void snd_gf1_dram_setmem(snd_gus_card_t * gus, unsigned int addr,
         spin_unlock_irqrestore(&gus->reg_lock, flags);
 }
 
-/*
-
- */
+#endif  /*  0  */
 
 void snd_gf1_select_active_voices(snd_gus_card_t * gus)
 {
@@ -469,6 +473,8 @@ void snd_gf1_print_voice_registers(snd_gus_card_t * gus)
                 printk(" -%i- GF1  pan                    = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));
 }
 
+#if 0
+
 void snd_gf1_print_global_registers(snd_gus_card_t * gus)
 {
         unsigned char global_mode = 0x00;
@@ -528,4 +534,6 @@ void snd_gf1_peek_print_block(snd_gus_card_t * gus, unsigned int addr, int count
         }
 }
 
+#endif  /*  0  */
+
 #endif
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 73f81c14f768..94bbd344be5e 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -459,7 +459,6 @@ EXPORT_SYMBOL(snd_gf1_write16);
 EXPORT_SYMBOL(snd_gf1_look16);
 EXPORT_SYMBOL(snd_gf1_i_write8);
 EXPORT_SYMBOL(snd_gf1_i_look8);
-EXPORT_SYMBOL(snd_gf1_i_write16);
 EXPORT_SYMBOL(snd_gf1_i_look16);
 EXPORT_SYMBOL(snd_gf1_dram_addr);
 EXPORT_SYMBOL(snd_gf1_write_addr);
@@ -470,8 +469,6 @@ EXPORT_SYMBOL(snd_gf1_alloc_voice);
 EXPORT_SYMBOL(snd_gf1_free_voice);
 EXPORT_SYMBOL(snd_gf1_ctrl_stop);
 EXPORT_SYMBOL(snd_gf1_stop_voice);
-EXPORT_SYMBOL(snd_gf1_start);
-EXPORT_SYMBOL(snd_gf1_stop);
   /* gus_mixer.c */
 EXPORT_SYMBOL(snd_gf1_new_mixer);
   /* gus_pcm.c */
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
index bfc2b91001d5..609838e8ef67 100644
--- a/sound/isa/gus/gus_mem.c
+++ b/sound/isa/gus/gus_mem.c
@@ -39,8 +39,8 @@ void snd_gf1_mem_lock(snd_gf1_mem_t * alloc, int xup)
         }
 }
 
-snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,
-                                        snd_gf1_mem_block_t * block)
+static snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,
+                                               snd_gf1_mem_block_t * block)
 {
         snd_gf1_mem_block_t *pblock, *nblock;
 
@@ -105,8 +105,8 @@ int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block)
         return 0;
 }
 
-snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,
-                                      unsigned int address)
+static snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,
+                                             unsigned int address)
 {
         snd_gf1_mem_block_t *block;
 
@@ -118,8 +118,8 @@ snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,
         return NULL;
 }
 
-snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,
-                                       unsigned int *share_id)
+static snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,
+                                              unsigned int *share_id)
 {
         snd_gf1_mem_block_t *block;
 
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 8995ad9c516d..b75066ab46fc 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -656,8 +656,7 @@ static snd_pcm_hardware_t snd_gf1_pcm_capture =
 
 static void snd_gf1_pcm_playback_free(snd_pcm_runtime_t *runtime)
 {
-        gus_pcm_private_t * pcmp = runtime->private_data;
-        kfree(pcmp);
+        kfree(runtime->private_data);
 }
 
 static int snd_gf1_pcm_playback_open(snd_pcm_substream_t *substream)
diff --git a/sound/isa/gus/gus_reset.c b/sound/isa/gus/gus_reset.c
index b4e66f6a10ae..ef687abc7070 100644
--- a/sound/isa/gus/gus_reset.c
+++ b/sound/isa/gus/gus_reset.c
@@ -161,7 +161,8 @@ void snd_gf1_stop_voice(snd_gus_card_t * gus, unsigned short voice)
 #endif
 }
 
-void snd_gf1_clear_voices(snd_gus_card_t * gus, unsigned short v_min, unsigned short v_max)
+static void snd_gf1_clear_voices(snd_gus_card_t * gus, unsigned short v_min,
+                                 unsigned short v_max)
 {
         unsigned long flags;
         unsigned int daddr;
diff --git a/sound/isa/gus/gus_synth.c b/sound/isa/gus/gus_synth.c
index 66552e6013a4..f51c386ee192 100644
--- a/sound/isa/gus/gus_synth.c
+++ b/sound/isa/gus/gus_synth.c
@@ -99,7 +99,8 @@ static void snd_gus_synth_free_private_instruments(snd_gus_port_t *p, int client
         snd_seq_instr_list_free_cond(p->gus->gf1.ilist, &ifree, client, 0);
 }
  
-int snd_gus_synth_event_input(snd_seq_event_t *ev, int direct, void *private_data, int atomic, int hop)
+static int snd_gus_synth_event_input(snd_seq_event_t *ev, int direct,
+                                     void *private_data, int atomic, int hop)
 {
         snd_gus_port_t * p = (snd_gus_port_t *) private_data;
         
diff --git a/sound/isa/gus/gus_tables.h b/sound/isa/gus/gus_tables.h
index ed8e9d85ad31..4adf098d3269 100644
--- a/sound/isa/gus/gus_tables.h
+++ b/sound/isa/gus/gus_tables.h
@@ -23,6 +23,8 @@
 
 #ifdef __GUS_TABLES_ALLOC__
 
+#if 0
+
 unsigned int snd_gf1_scale_table[SNDRV_GF1_SCALE_TABLE_SIZE] =
 {
       8372,      8870,      9397,      9956,     10548,     11175,
@@ -49,6 +51,8 @@ unsigned int snd_gf1_scale_table[SNDRV_GF1_SCALE_TABLE_SIZE] =
   12123977,  12844906
 };
 
+#endif  /*  0  */
+
 unsigned short snd_gf1_atten_table[SNDRV_GF1_ATTEN_TABLE_SIZE] = {
   4095 /* 0   */,1789 /* 1   */,1533 /* 2   */,1383 /* 3   */,1277 /* 4   */,
   1195 /* 5   */,1127 /* 6   */,1070 /* 7   */,1021 /* 8   */,978  /* 9   */,
diff --git a/sound/isa/gus/gus_volume.c b/sound/isa/gus/gus_volume.c
index b72bcfb28617..3d36f6c8ee6a 100644
--- a/sound/isa/gus/gus_volume.c
+++ b/sound/isa/gus/gus_volume.c
@@ -55,6 +55,8 @@ unsigned short snd_gf1_lvol_to_gvol_raw(unsigned int vol)
         return (e << 8) | m;
 }
 
+#if 0
+
 unsigned int snd_gf1_gvol_to_lvol_raw(unsigned short gf1_vol)
 {
         unsigned int rvol;
@@ -108,6 +110,8 @@ unsigned int snd_gf1_calc_ramp_rate(snd_gus_card_t * gus,
         return (range << 6) | (increment & 0x3f);
 }
 
+#endif  /*  0  */
+
 unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq16)
 {
         freq16 >>= 3;
@@ -120,6 +124,8 @@ unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq16)
         return ((freq16 << 9) + (gus->gf1.playback_freq >> 1)) / gus->gf1.playback_freq;
 }
 
+#if 0
+
 short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)
 {
         static short vibrato_table[] =
@@ -208,3 +214,5 @@ unsigned short snd_gf1_compute_freq(unsigned int freq,
         }
         return (unsigned short) fc;
 }
+
+#endif  /*  0  */
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 428efdbd70a1..6d7a00f34d82 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -274,6 +274,19 @@ config SND_HDSP
           To compile this driver as a module, choose M here: the module
           will be called snd-hdsp.
 
+config SND_HDSPM
+        tristate "RME Hammerfall DSP MADI"
+        depends on SND
+        select SND_HWDEP
+        select SND_RAWMIDI
+        select SND_PCM
+        help
+          Say Y here to include support for RME Hammerfall DSP MADI
+          soundcards.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-hdspm.
+
 config SND_TRIDENT
         tristate "Trident 4D-Wave DX/NX; SiS 7018"
         depends on SND
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 0b024ec1f709..a4b72cd2eea0 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -120,6 +120,7 @@ static const ac97_codec_id_t snd_ac97_codec_ids[] = {
 { 0x414c4770, 0xfffffff0, "ALC203",             NULL,           NULL },
 { 0x434d4941, 0xffffffff, "CMI9738",            patch_cm9738,   NULL },
 { 0x434d4961, 0xffffffff, "CMI9739",            patch_cm9739,   NULL },
+{ 0x434d4969, 0xffffffff, "CMI9780",            patch_cm9780,   NULL },
 { 0x434d4978, 0xffffffff, "CMI9761",            patch_cm9761,   NULL },
 { 0x434d4982, 0xffffffff, "CMI9761",            patch_cm9761,   NULL },
 { 0x434d4983, 0xffffffff, "CMI9761",            patch_cm9761,   NULL },
@@ -149,7 +150,7 @@ static const ac97_codec_id_t snd_ac97_codec_ids[] = {
 { 0x4e534331, 0xffffffff, "LM4549",             NULL,           NULL },
 { 0x4e534350, 0xffffffff, "LM4550",             NULL,           NULL },
 { 0x50534304, 0xffffffff, "UCB1400",            NULL,           NULL },
-{ 0x53494c20, 0xffffffe0, "Si3036,8",           NULL,           mpatch_si3036 },
+{ 0x53494c20, 0xffffffe0, "Si3036,8",           mpatch_si3036,  mpatch_si3036, AC97_MODEM_PATCH },
 { 0x54524102, 0xffffffff, "TR28022",            NULL,           NULL },
 { 0x54524106, 0xffffffff, "TR28026",            NULL,           NULL },
 { 0x54524108, 0xffffffff, "TR28028",            patch_tritech_tr28028,  NULL }, // added by xin jin [07/09/99]
@@ -462,12 +463,14 @@ int snd_ac97_get_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u
 {
         ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
         struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;
-        unsigned short val;
+        unsigned short val, bitmask;
         
+        for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
+                ;
         val = snd_ac97_read_cache(ac97, e->reg);
-        ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & (e->mask - 1);
+        ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & (bitmask - 1);
         if (e->shift_l != e->shift_r)
-                ucontrol->value.enumerated.item[1] = (val >> e->shift_r) & (e->mask - 1);
+                ucontrol->value.enumerated.item[1] = (val >> e->shift_r) & (bitmask - 1);
 
         return 0;
 }
@@ -477,17 +480,19 @@ int snd_ac97_put_enum_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * u
         ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
         struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;
         unsigned short val;
-        unsigned short mask;
+        unsigned short mask, bitmask;
         
+        for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
+                ;
         if (ucontrol->value.enumerated.item[0] > e->mask - 1)
                 return -EINVAL;
         val = ucontrol->value.enumerated.item[0] << e->shift_l;
-        mask = (e->mask - 1) << e->shift_l;
+        mask = (bitmask - 1) << e->shift_l;
         if (e->shift_l != e->shift_r) {
                 if (ucontrol->value.enumerated.item[1] > e->mask - 1)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (e->mask - 1) << e->shift_r;
+                mask |= (bitmask - 1) << e->shift_r;
         }
         return snd_ac97_update_bits(ac97, e->reg, mask, val);
 }
@@ -658,14 +663,14 @@ AC97_SINGLE("LFE Playback Switch", AC97_CENTER_LFE_MASTER, 15, 1, 1),
 AC97_SINGLE("LFE Playback Volume", AC97_CENTER_LFE_MASTER, 8, 31, 1)
 };
 
-static const snd_kcontrol_new_t snd_ac97_controls_surround[2] = {
-AC97_DOUBLE("Surround Playback Switch", AC97_SURROUND_MASTER, 15, 7, 1, 1),
-AC97_DOUBLE("Surround Playback Volume", AC97_SURROUND_MASTER, 8, 0, 31, 1),
-};
-
 static const snd_kcontrol_new_t snd_ac97_control_eapd =
 AC97_SINGLE("External Amplifier", AC97_POWERDOWN, 15, 1, 1);
 
+static const snd_kcontrol_new_t snd_ac97_controls_modem_switches[2] = {
+AC97_SINGLE("Off-hook Switch", AC97_GPIO_STATUS, 0, 1, 0),
+AC97_SINGLE("Caller ID Switch", AC97_GPIO_STATUS, 2, 1, 0)
+};
+
 /* change the existing EAPD control as inverted */
 static void set_inv_eapd(ac97_t *ac97, snd_kcontrol_t *kctl)
 {
@@ -1072,9 +1077,9 @@ static void check_volume_resolution(ac97_t *ac97, int reg, unsigned char *lo_max
                 unsigned short val;
                 snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8));
                 val = snd_ac97_read(ac97, reg);
-                if (! *lo_max && (val & cbit[i]))
+                if (! *lo_max && (val & 0x7f) == cbit[i])
                         *lo_max = max[i];
-                if (! *hi_max && (val & (cbit[i] << 8)))
+                if (! *hi_max && ((val >> 8) & 0x7f) == cbit[i])
                         *hi_max = max[i];
                 if (*lo_max && *hi_max)
                         break;
@@ -1526,13 +1531,25 @@ static int snd_ac97_mixer_build(ac97_t * ac97)
 
 static int snd_ac97_modem_build(snd_card_t * card, ac97_t * ac97)
 {
-        /* TODO */
+        int err, idx;
+
         //printk("AC97_GPIO_CFG = %x\n",snd_ac97_read(ac97,AC97_GPIO_CFG));
         snd_ac97_write(ac97, AC97_GPIO_CFG, 0xffff & ~(AC97_GPIO_LINE1_OH));
         snd_ac97_write(ac97, AC97_GPIO_POLARITY, 0xffff & ~(AC97_GPIO_LINE1_OH));
         snd_ac97_write(ac97, AC97_GPIO_STICKY, 0xffff);
         snd_ac97_write(ac97, AC97_GPIO_WAKEUP, 0x0);
         snd_ac97_write(ac97, AC97_MISC_AFE, 0x0);
+
+        /* build modem switches */
+        for (idx = 0; idx < ARRAY_SIZE(snd_ac97_controls_modem_switches); idx++)
+                if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_modem_switches[idx], ac97))) < 0)
+                        return err;
+
+        /* build chip specific controls */
+        if (ac97->build_ops->build_specific)
+                if ((err = ac97->build_ops->build_specific(ac97)) < 0)
+                        return err;
+
         return 0;
 }
 
@@ -1872,7 +1889,11 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97)
                         goto __access_ok;
         }
 
-        snd_ac97_write(ac97, AC97_RESET, 0);    /* reset to defaults */
+        /* reset to defaults */
+        if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO))
+                snd_ac97_write(ac97, AC97_RESET, 0);
+        if (!(ac97->scaps & AC97_SCAP_SKIP_MODEM))
+                snd_ac97_write(ac97, AC97_EXTENDED_MID, 0);
         if (bus->ops->wait)
                 bus->ops->wait(ac97);
         else {
@@ -1964,21 +1985,21 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97)
                 /* note: it's important to set the rate at first */
                 tmp = AC97_MEA_GPIO;
                 if (ac97->ext_mid & AC97_MEI_LINE1) {
-                        snd_ac97_write_cache(ac97, AC97_LINE1_RATE, 12000);
+                        snd_ac97_write_cache(ac97, AC97_LINE1_RATE, 8000);
                         tmp |= AC97_MEA_ADC1 | AC97_MEA_DAC1;
                 }
                 if (ac97->ext_mid & AC97_MEI_LINE2) {
-                        snd_ac97_write_cache(ac97, AC97_LINE2_RATE, 12000);
+                        snd_ac97_write_cache(ac97, AC97_LINE2_RATE, 8000);
                         tmp |= AC97_MEA_ADC2 | AC97_MEA_DAC2;
                 }
                 if (ac97->ext_mid & AC97_MEI_HANDSET) {
-                        snd_ac97_write_cache(ac97, AC97_HANDSET_RATE, 12000);
+                        snd_ac97_write_cache(ac97, AC97_HANDSET_RATE, 8000);
                         tmp |= AC97_MEA_HADC | AC97_MEA_HDAC;
                 }
-                snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0xff00 & ~(tmp << 8));
+                snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0);
                 udelay(100);
                 /* nothing should be in powerdown mode */
-                snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0xff00 & ~(tmp << 8));
+                snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0);
                 end_time = jiffies + (HZ / 10);
                 do {
                         if ((snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS) & tmp) == tmp)
@@ -2521,11 +2542,11 @@ int snd_ac97_tune_hardware(ac97_t *ac97, struct ac97_quirk *quirk, const char *o
                 return result;
         }
 
-        for (; quirk->vendor; quirk++) {
-                if (quirk->vendor != ac97->subsystem_vendor)
+        for (; quirk->subvendor; quirk++) {
+                if (quirk->subvendor != ac97->subsystem_vendor)
                         continue;
-                if ((! quirk->mask && quirk->device == ac97->subsystem_device) ||
-                    quirk->device == (quirk->mask & ac97->subsystem_device)) {
+                if ((! quirk->mask && quirk->subdevice == ac97->subsystem_device) ||
+                    quirk->subdevice == (quirk->mask & ac97->subsystem_device)) {
                         if (quirk->codec_id && quirk->codec_id != ac97->id)
                                 continue;
                         snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk->name, ac97->subsystem_vendor, ac97->subsystem_device);
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 13c34a5d8206..a15eb8522b7c 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -64,6 +64,116 @@ static int ac97_update_bits_page(ac97_t *ac97, unsigned short reg, unsigned shor
         return ret;
 }
 
+/*
+ * shared line-in/mic controls
+ */
+static int ac97_enum_text_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo,
+                               const char **texts, unsigned int nums)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = nums;
+        if (uinfo->value.enumerated.item > nums - 1)
+                uinfo->value.enumerated.item = nums - 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int ac97_surround_jack_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        static const char *texts[] = { "Shared", "Independent" };
+        return ac97_enum_text_info(kcontrol, uinfo, texts, 2);
+}
+
+static int ac97_surround_jack_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = ac97->indep_surround;
+        return 0;
+}
+
+static int ac97_surround_jack_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+        unsigned char indep = !!ucontrol->value.enumerated.item[0];
+
+        if (indep != ac97->indep_surround) {
+                ac97->indep_surround = indep;
+                if (ac97->build_ops->update_jacks)
+                        ac97->build_ops->update_jacks(ac97);
+                return 1;
+        }
+        return 0;
+}
+
+static int ac97_channel_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        static const char *texts[] = { "2ch", "4ch", "6ch" };
+        if (kcontrol->private_value)
+                return ac97_enum_text_info(kcontrol, uinfo, texts, 2); /* 4ch only */
+        return ac97_enum_text_info(kcontrol, uinfo, texts, 3);
+}
+
+static int ac97_channel_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = ac97->channel_mode;
+        return 0;
+}
+
+static int ac97_channel_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+        unsigned char mode = ucontrol->value.enumerated.item[0];
+
+        if (mode != ac97->channel_mode) {
+                ac97->channel_mode = mode;
+                if (ac97->build_ops->update_jacks)
+                        ac97->build_ops->update_jacks(ac97);
+                return 1;
+        }
+        return 0;
+}
+
+#define AC97_SURROUND_JACK_MODE_CTL \
+        { \
+                .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, \
+                .name   = "Surround Jack Mode", \
+                .info = ac97_surround_jack_mode_info, \
+                .get = ac97_surround_jack_mode_get, \
+                .put = ac97_surround_jack_mode_put, \
+        }
+#define AC97_CHANNEL_MODE_CTL \
+        { \
+                .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, \
+                .name   = "Channel Mode", \
+                .info = ac97_channel_mode_info, \
+                .get = ac97_channel_mode_get, \
+                .put = ac97_channel_mode_put, \
+        }
+#define AC97_CHANNEL_MODE_4CH_CTL \
+        { \
+                .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, \
+                .name   = "Channel Mode", \
+                .info = ac97_channel_mode_info, \
+                .get = ac97_channel_mode_get, \
+                .put = ac97_channel_mode_put, \
+                .private_value = 1, \
+        }
+
+static inline int is_shared_linein(ac97_t *ac97)
+{
+        return ! ac97->indep_surround && ac97->channel_mode >= 1;
+}
+
+static inline int is_shared_micin(ac97_t *ac97)
+{
+        return ! ac97->indep_surround && ac97->channel_mode >= 2;
+}
+
+
 /* The following snd_ac97_ymf753_... items added by David Shust (dshust@shustring.com) */
 
 /* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */
@@ -1390,6 +1500,16 @@ static int snd_ac97_ad1888_downmix_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_va
                                     AC97_AD198X_DMIX0 | AC97_AD198X_DMIX1, val);
 }
 
+static void ad1888_update_jacks(ac97_t *ac97)
+{
+        /* shared Line-In */
+        snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 12,
+                             is_shared_linein(ac97) ? 0 : 1 << 12);
+        /* shared Mic */
+        snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 11,
+                             is_shared_micin(ac97) ? 0 : 1 << 11);
+}
+
 static const snd_kcontrol_new_t snd_ac97_ad1888_controls[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1406,8 +1526,8 @@ static const snd_kcontrol_new_t snd_ac97_ad1888_controls[] = {
                 .get = snd_ac97_ad1888_downmix_get,
                 .put = snd_ac97_ad1888_downmix_put
         },
-        AC97_SINGLE("Surround Jack as Input", AC97_AD_MISC, 12, 1, 0),
-        AC97_SINGLE("Center/LFE Jack as Input", AC97_AD_MISC, 11, 1, 0),
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_CTL,
 };
 
 static int patch_ad1888_specific(ac97_t *ac97)
@@ -1422,8 +1542,9 @@ static struct snd_ac97_build_ops patch_ad1888_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1888_specific,
 #ifdef CONFIG_PM
-        .resume = ad18xx_resume
+        .resume = ad18xx_resume,
 #endif
+        .update_jacks = ad1888_update_jacks,
 };
 
 int patch_ad1888(ac97_t * ac97)
@@ -1459,8 +1580,9 @@ static struct snd_ac97_build_ops patch_ad1980_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1980_specific,
 #ifdef CONFIG_PM
-        .resume = ad18xx_resume
+        .resume = ad18xx_resume,
 #endif
+        .update_jacks = ad1888_update_jacks,
 };
 
 int patch_ad1980(ac97_t * ac97)
@@ -1471,10 +1593,21 @@ int patch_ad1980(ac97_t * ac97)
 }
 
 static const snd_kcontrol_new_t snd_ac97_ad1985_controls[] = {
-        AC97_SINGLE("Center/LFE Jack as Mic", AC97_AD_SERIAL_CFG, 9, 1, 0),
         AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
 };
 
+static void ad1985_update_jacks(ac97_t *ac97)
+{
+        /* shared Line-In */
+        snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 12,
+                             is_shared_linein(ac97) ? 0 : 1 << 12);
+        /* shared Mic */
+        snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 11,
+                             is_shared_micin(ac97) ? 0 : 1 << 11);
+        snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9,
+                             is_shared_micin(ac97) ? 0 : 1 << 9);
+}
+
 static int patch_ad1985_specific(ac97_t *ac97)
 {
         int err;
@@ -1488,8 +1621,9 @@ static struct snd_ac97_build_ops patch_ad1985_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1985_specific,
 #ifdef CONFIG_PM
-        .resume = ad18xx_resume
+        .resume = ad18xx_resume,
 #endif
+        .update_jacks = ad1985_update_jacks,
 };
 
 int patch_ad1985(ac97_t * ac97)
@@ -1521,31 +1655,25 @@ int patch_ad1985(ac97_t * ac97)
 /*
  * realtek ALC65x/850 codecs
  */
-static int snd_ac97_alc650_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        ucontrol->value.integer.value[0] = (ac97->regs[AC97_ALC650_MULTICH] >> 10) & 1;
-        return 0;
-}
-
-static int snd_ac97_alc650_mic_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
+static void alc650_update_jacks(ac97_t *ac97)
 {
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        int change, val;
-        val = !!(snd_ac97_read(ac97, AC97_ALC650_MULTICH) & (1 << 10));
-        change = (ucontrol->value.integer.value[0] != val);
-        if (change) {
-                /* disable/enable vref */
-                snd_ac97_update_bits(ac97, AC97_ALC650_CLOCK, 1 << 12,
-                                     ucontrol->value.integer.value[0] ? (1 << 12) : 0);
-                /* turn on/off center-on-mic */
-                snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 1 << 10,
-                                     ucontrol->value.integer.value[0] ? (1 << 10) : 0);
-                /* GPIO0 high for mic */
-                snd_ac97_update_bits(ac97, AC97_ALC650_GPIO_STATUS, 0x100,
-                                     ucontrol->value.integer.value[0] ? 0 : 0x100);
-        }
-        return change;
+        int shared;
+        
+        /* shared Line-In */
+        shared = is_shared_linein(ac97);
+        snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 1 << 9,
+                             shared ? (1 << 9) : 0);
+        /* update shared Mic */
+        shared = is_shared_micin(ac97);
+        /* disable/enable vref */
+        snd_ac97_update_bits(ac97, AC97_ALC650_CLOCK, 1 << 12,
+                             shared ? (1 << 12) : 0);
+        /* turn on/off center-on-mic */
+        snd_ac97_update_bits(ac97, AC97_ALC650_MULTICH, 1 << 10,
+                             shared ? (1 << 10) : 0);
+        /* GPIO0 high for mic */
+        snd_ac97_update_bits(ac97, AC97_ALC650_GPIO_STATUS, 0x100,
+                             shared ? 0 : 0x100);
 }
 
 static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = {
@@ -1558,8 +1686,8 @@ static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = {
         /* 6: Independent Master Volume Right */
         /* 7: Independent Master Volume Left */
         /* 8: reserved */
-        AC97_SINGLE("Line-In As Surround", AC97_ALC650_MULTICH, 9, 1, 0),
-        /* 10: mic, see below */
+        /* 9: Line-In/Surround share */
+        /* 10: Mic/CLFE share */
         /* 11-13: in IEC958 controls */
         AC97_SINGLE("Swap Surround Slot", AC97_ALC650_MULTICH, 14, 1, 0),
 #if 0 /* always set in patch_alc650 */
@@ -1570,14 +1698,8 @@ static const snd_kcontrol_new_t snd_ac97_controls_alc650[] = {
         AC97_SINGLE("Center/LFE DAC Switch", AC97_ALC650_LFE_DAC_VOL, 15, 1, 1),
         AC97_DOUBLE("Center/LFE DAC Volume", AC97_ALC650_LFE_DAC_VOL, 8, 0, 31, 1),
 #endif
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Mic As Center/LFE",
-                .info = snd_ac97_info_volsw,
-                .get = snd_ac97_alc650_mic_get,
-                .put = snd_ac97_alc650_mic_put,
-                .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
-        },
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_CTL,
 };
 
 static const snd_kcontrol_new_t snd_ac97_spdif_controls_alc650[] = {
@@ -1601,7 +1723,8 @@ static int patch_alc650_specific(ac97_t * ac97)
 }
 
 static struct snd_ac97_build_ops patch_alc650_ops = {
-        .build_specific = patch_alc650_specific
+        .build_specific = patch_alc650_specific,
+        .update_jacks = alc650_update_jacks
 };
 
 int patch_alc650(ac97_t * ac97)
@@ -1659,37 +1782,27 @@ int patch_alc650(ac97_t * ac97)
         return 0;
 }
 
-static int snd_ac97_alc655_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        ucontrol->value.integer.value[0] = (ac97->regs[AC97_ALC650_MULTICH] >> 10) & 1;
-        return 0;
-}
-
-static int snd_ac97_alc655_mic_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
+static void alc655_update_jacks(ac97_t *ac97)
 {
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-
+        int shared;
+        
+        /* shared Line-In */
+        shared = is_shared_linein(ac97);
+        ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 1 << 9,
+                              shared ? (1 << 9) : 0, 0);
+        /* update shared mic */
+        shared = is_shared_micin(ac97);
         /* misc control; vrefout disable */
         snd_ac97_update_bits(ac97, AC97_ALC650_CLOCK, 1 << 12,
-                             ucontrol->value.integer.value[0] ? (1 << 12) : 0);
-        return ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 1 << 10,
-                                     ucontrol->value.integer.value[0] ? (1 << 10) : 0,
-                                     0);
+                             shared ? (1 << 12) : 0);
+        ac97_update_bits_page(ac97, AC97_ALC650_MULTICH, 1 << 10,
+                              shared ? (1 << 10) : 0, 0);
 }
 
-
 static const snd_kcontrol_new_t snd_ac97_controls_alc655[] = {
         AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
-        AC97_PAGE_SINGLE("Line-In As Surround", AC97_ALC650_MULTICH, 9, 1, 0, 0),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Mic As Center/LFE",
-                .info = snd_ac97_info_volsw,
-                .get = snd_ac97_alc655_mic_get,
-                .put = snd_ac97_alc655_mic_put,
-                .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
-        },
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_CTL,
 };
 
 static int alc655_iec958_route_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
@@ -1759,7 +1872,8 @@ static int patch_alc655_specific(ac97_t * ac97)
 }
 
 static struct snd_ac97_build_ops patch_alc655_ops = {
-        .build_specific = patch_alc655_specific
+        .build_specific = patch_alc655_specific,
+        .update_jacks = alc655_update_jacks
 };
 
 int patch_alc655(ac97_t * ac97)
@@ -1798,63 +1912,33 @@ int patch_alc655(ac97_t * ac97)
 #define AC97_ALC850_JACK_SELECT 0x76
 #define AC97_ALC850_MISC1       0x7a
 
-static int ac97_alc850_surround_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        ucontrol->value.integer.value[0] = ((ac97->regs[AC97_ALC850_JACK_SELECT] >> 12) & 7) == 2;
-        return 0;
-}
-
-static int ac97_alc850_surround_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
+static void alc850_update_jacks(ac97_t *ac97)
 {
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-
+        int shared;
+        
+        /* shared Line-In */
+        shared = is_shared_linein(ac97);
         /* SURR 1kOhm (bit4), Amp (bit5) */
         snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<4)|(1<<5),
-                             ucontrol->value.integer.value[0] ? (1<<5) : (1<<4));
+                             shared ? (1<<5) : (1<<4));
         /* LINE-IN = 0, SURROUND = 2 */
-        return snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 12,
-                                    ucontrol->value.integer.value[0] ? (2<<12) : (0<<12));
-}
-
-static int ac97_alc850_mic_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        ucontrol->value.integer.value[0] = ((ac97->regs[AC97_ALC850_JACK_SELECT] >> 4) & 7) == 2;
-        return 0;
-}
-
-static int ac97_alc850_mic_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-
+        snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 12,
+                             shared ? (2<<12) : (0<<12));
+        /* update shared mic */
+        shared = is_shared_micin(ac97);
         /* Vref disable (bit12), 1kOhm (bit13) */
         snd_ac97_update_bits(ac97, AC97_ALC850_MISC1, (1<<12)|(1<<13),
-                             ucontrol->value.integer.value[0] ? (1<<12) : (1<<13));
+                             shared ? (1<<12) : (1<<13));
         /* MIC-IN = 1, CENTER-LFE = 2 */
-        return snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 4,
-                                    ucontrol->value.integer.value[0] ? (2<<4) : (1<<4));
+        snd_ac97_update_bits(ac97, AC97_ALC850_JACK_SELECT, 7 << 4,
+                             shared ? (2<<4) : (1<<4));
 }
 
 static const snd_kcontrol_new_t snd_ac97_controls_alc850[] = {
         AC97_PAGE_SINGLE("Duplicate Front", AC97_ALC650_MULTICH, 0, 1, 0, 0),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Line-In As Surround",
-                .info = snd_ac97_info_volsw,
-                .get = ac97_alc850_surround_get,
-                .put = ac97_alc850_surround_put,
-                .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Mic As Center/LFE",
-                .info = snd_ac97_info_volsw,
-                .get = ac97_alc850_mic_get,
-                .put = ac97_alc850_mic_put,
-                .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
-        },
-
+        AC97_SINGLE("Mic Front Input Switch", AC97_ALC850_JACK_SELECT, 15, 1, 1),
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_CTL,
 };
 
 static int patch_alc850_specific(ac97_t *ac97)
@@ -1871,7 +1955,8 @@ static int patch_alc850_specific(ac97_t *ac97)
 }
 
 static struct snd_ac97_build_ops patch_alc850_ops = {
-        .build_specific = patch_alc850_specific
+        .build_specific = patch_alc850_specific,
+        .update_jacks = alc850_update_jacks
 };
 
 int patch_alc850(ac97_t *ac97)
@@ -1911,9 +1996,17 @@ int patch_alc850(ac97_t *ac97)
 /*
  * C-Media CM97xx codecs
  */
+static void cm9738_update_jacks(ac97_t *ac97)
+{
+        /* shared Line-In */
+        snd_ac97_update_bits(ac97, AC97_CM9738_VENDOR_CTRL, 1 << 10,
+                             is_shared_linein(ac97) ? (1 << 10) : 0);
+}
+
 static const snd_kcontrol_new_t snd_ac97_cm9738_controls[] = {
-        AC97_SINGLE("Line-In As Surround", AC97_CM9738_VENDOR_CTRL, 10, 1, 0),
         AC97_SINGLE("Duplicate Front", AC97_CM9738_VENDOR_CTRL, 13, 1, 0),
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_4CH_CTL,
 };
 
 static int patch_cm9738_specific(ac97_t * ac97)
@@ -1922,7 +2015,8 @@ static int patch_cm9738_specific(ac97_t * ac97)
 }
 
 static struct snd_ac97_build_ops patch_cm9738_ops = {
-        .build_specific = patch_cm9738_specific
+        .build_specific = patch_cm9738_specific,
+        .update_jacks = cm9738_update_jacks
 };
 
 int patch_cm9738(ac97_t * ac97)
@@ -1986,34 +2080,19 @@ static const snd_kcontrol_new_t snd_ac97_cm9739_controls_spdif[] = {
         /* BIT 8: SPD32 - 32bit SPDIF - not supported yet */
 };
 
-static int snd_ac97_cm9739_center_mic_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        if (ac97->regs[AC97_CM9739_MULTI_CHAN] & 0x1000)
-                ucontrol->value.integer.value[0] = 1;
-        else
-                ucontrol->value.integer.value[0] = 0;
-        return 0;
-}
-
-static int snd_ac97_cm9739_center_mic_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static void cm9739_update_jacks(ac97_t *ac97)
 {
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        return snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 0x3000,
-                                    ucontrol->value.integer.value[0] ? 
-                                    0x1000 : 0x2000);
+        /* shared Line-In */
+        snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 1 << 10,
+                             is_shared_linein(ac97) ? (1 << 10) : 0);
+        /* shared Mic */
+        snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 0x3000,
+                             is_shared_micin(ac97) ? 0x1000 : 0x2000);
 }
 
 static const snd_kcontrol_new_t snd_ac97_cm9739_controls[] = {
-        AC97_SINGLE("Line-In As Surround", AC97_CM9739_MULTI_CHAN, 10, 1, 0),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Mic As Center/LFE",
-                .info = snd_ac97_info_volsw,
-                .get = snd_ac97_cm9739_center_mic_get,
-                .put = snd_ac97_cm9739_center_mic_put,
-                .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
-        },
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_CTL,
 };
 
 static int patch_cm9739_specific(ac97_t * ac97)
@@ -2028,7 +2107,8 @@ static int patch_cm9739_post_spdif(ac97_t * ac97)
 
 static struct snd_ac97_build_ops patch_cm9739_ops = {
         .build_specific = patch_cm9739_specific,
-        .build_post_spdif = patch_cm9739_post_spdif
+        .build_post_spdif = patch_cm9739_post_spdif,
+        .update_jacks = cm9739_update_jacks
 };
 
 int patch_cm9739(ac97_t * ac97)
@@ -2087,71 +2167,97 @@ int patch_cm9739(ac97_t * ac97)
 }
 
 #define AC97_CM9761_MULTI_CHAN  0x64
+#define AC97_CM9761_FUNC        0x66
 #define AC97_CM9761_SPDIF_CTRL  0x6c
 
-static int snd_ac97_cm9761_linein_rear_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        if (ac97->regs[AC97_CM9739_MULTI_CHAN] & 0x0400)
-                ucontrol->value.integer.value[0] = 1;
-        else
-                ucontrol->value.integer.value[0] = 0;
-        return 0;
-}
-
-static int snd_ac97_cm9761_linein_rear_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static void cm9761_update_jacks(ac97_t *ac97)
 {
-        ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        unsigned short vals[2][2] = {
+        unsigned short surr_vals[2][2] = {
                 { 0x0008, 0x0400 }, /* off, on */
                 { 0x0000, 0x0408 }, /* off, on (9761-82 rev.B) */
         };
-        return snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 0x0408,
-                                    vals[ac97->spec.dev_flags][!!ucontrol->value.integer.value[0]]);
+        unsigned short clfe_vals[2][2] = {
+                { 0x2000, 0x1880 }, /* off, on */
+                { 0x1000, 0x2880 }, /* off, on (9761-82 rev.B) */
+        };
+
+        /* shared Line-In */
+        snd_ac97_update_bits(ac97, AC97_CM9761_MULTI_CHAN, 0x0408,
+                             surr_vals[ac97->spec.dev_flags][is_shared_linein(ac97)]);
+        /* shared Mic */
+        snd_ac97_update_bits(ac97, AC97_CM9761_MULTI_CHAN, 0x3880,
+                             clfe_vals[ac97->spec.dev_flags][is_shared_micin(ac97)]);
+}
+
+static const snd_kcontrol_new_t snd_ac97_cm9761_controls[] = {
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_CTL,
+};
+
+static int cm9761_spdif_out_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        static char *texts[] = { "AC-Link", "ADC", "SPDIF-In" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+        if (uinfo->value.enumerated.item > 2)
+                uinfo->value.enumerated.item = 2;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
 }
 
-static int snd_ac97_cm9761_center_mic_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int cm9761_spdif_out_source_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
         ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        if (ac97->regs[AC97_CM9739_MULTI_CHAN] & 0x1000)
-                ucontrol->value.integer.value[0] = 1;
+
+        if (ac97->regs[AC97_CM9761_FUNC] & 0x1)
+                ucontrol->value.enumerated.item[0] = 2; /* SPDIF-loopback */
+        else if (ac97->regs[AC97_CM9761_SPDIF_CTRL] & 0x2)
+                ucontrol->value.enumerated.item[0] = 1; /* ADC loopback */
         else
-                ucontrol->value.integer.value[0] = 0;
-        if (ac97->spec.dev_flags) /* 9761-82 rev.B */
-                ucontrol->value.integer.value[0] = !ucontrol->value.integer.value[0];
+                ucontrol->value.enumerated.item[0] = 0; /* AC-link */
         return 0;
 }
 
-static int snd_ac97_cm9761_center_mic_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int cm9761_spdif_out_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
         ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
-        unsigned short vals[2][2] = {
-                { 0x2000, 0x1880 }, /* off, on */
-                { 0x1000, 0x2880 }, /* off, on (9761-82 rev.B) */
-        };
-        return snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 0x3880,
-                                    vals[ac97->spec.dev_flags][!!ucontrol->value.integer.value[0]]);
+
+        if (ucontrol->value.enumerated.item[0] == 2)
+                return snd_ac97_update_bits(ac97, AC97_CM9761_FUNC, 0x1, 0x1);
+        snd_ac97_update_bits(ac97, AC97_CM9761_FUNC, 0x1, 0);
+        return snd_ac97_update_bits(ac97, AC97_CM9761_SPDIF_CTRL, 0x2,
+                                    ucontrol->value.enumerated.item[0] == 1 ? 0x2 : 0);
 }
 
-static const snd_kcontrol_new_t snd_ac97_cm9761_controls[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Line-In As Surround",
-                .info = snd_ac97_info_volsw,
-                .get = snd_ac97_cm9761_linein_rear_get,
-                .put = snd_ac97_cm9761_linein_rear_put,
-                .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Mic As Center/LFE",
-                .info = snd_ac97_info_volsw,
-                .get = snd_ac97_cm9761_center_mic_get,
-                .put = snd_ac97_cm9761_center_mic_put,
-                .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
+static const char *cm9761_dac_clock[] = { "AC-Link", "SPDIF-In", "Both" };
+static const struct ac97_enum cm9761_dac_clock_enum =
+        AC97_ENUM_SINGLE(AC97_CM9761_SPDIF_CTRL, 9, 3, cm9761_dac_clock);
+
+static const snd_kcontrol_new_t snd_ac97_cm9761_controls_spdif[] = {
+        { /* BIT 1: SPDIFS */
+                .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name   = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
+                .info = cm9761_spdif_out_source_info,
+                .get = cm9761_spdif_out_source_get,
+                .put = cm9761_spdif_out_source_put,
         },
+        /* BIT 2: IG_SPIV */
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Valid Switch", AC97_CM9761_SPDIF_CTRL, 2, 1, 0),
+        /* BIT 3: SPI2F */
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9761_SPDIF_CTRL, 3, 1, 0), 
+        /* BIT 4: SPI2SDI */
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_CM9761_SPDIF_CTRL, 4, 1, 0),
+        /* BIT 9-10: DAC_CTL */
+        AC97_ENUM("DAC Clock Source", cm9761_dac_clock_enum),
 };
 
+static int patch_cm9761_post_spdif(ac97_t * ac97)
+{
+        return patch_build_controls(ac97, snd_ac97_cm9761_controls_spdif, ARRAY_SIZE(snd_ac97_cm9761_controls_spdif));
+}
+
 static int patch_cm9761_specific(ac97_t * ac97)
 {
         return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
@@ -2159,7 +2265,8 @@ static int patch_cm9761_specific(ac97_t * ac97)
 
 static struct snd_ac97_build_ops patch_cm9761_ops = {
         .build_specific = patch_cm9761_specific,
-        .build_post_spdif = patch_cm9739_post_spdif /* hope it's identical... */
+        .build_post_spdif = patch_cm9761_post_spdif,
+        .update_jacks = cm9761_update_jacks
 };
 
 int patch_cm9761(ac97_t *ac97)
@@ -2193,24 +2300,25 @@ int patch_cm9761(ac97_t *ac97)
         /* to be sure: we overwrite the ext status bits */
         snd_ac97_write_cache(ac97, AC97_EXTENDED_STATUS, 0x05c0);
         /* Don't set 0x0200 here.  This results in the silent analog output */
-        snd_ac97_write_cache(ac97, AC97_CM9761_SPDIF_CTRL, 0x0009);
+        snd_ac97_write_cache(ac97, AC97_CM9761_SPDIF_CTRL, 0x0001); /* enable spdif-in */
         ac97->rates[AC97_RATES_SPDIF] = SNDRV_PCM_RATE_48000; /* 48k only */
 
         /* set-up multi channel */
         /* bit 15: pc master beep off
-         * bit 14: ??
+         * bit 14: pin47 = EAPD/SPDIF
          * bit 13: vref ctl [= cm9739]
-         * bit 12: center/mic [= cm9739] (reverted on rev B)
-         * bit 11: ?? (mic/center/lfe) (reverted on rev B)
-         * bit 10: suddound/line [= cm9739]
-         * bit  9: mix 2 surround
-         * bit  8: ?
-         * bit  7: ?? (mic/center/lfe)
-         * bit  4: ?? (front)
-         * bit  3: ?? (line-in/rear share) (revereted with rev B)
-         * bit  2: ?? (surround)
-         * bit  1: front mic
-         * bit  0: mic boost
+         * bit 12: CLFE control (reverted on rev B)
+         * bit 11: Mic/center share (reverted on rev B)
+         * bit 10: suddound/line share
+         * bit  9: Analog-in mix -> surround
+         * bit  8: Analog-in mix -> CLFE
+         * bit  7: Mic/LFE share (mic/center/lfe)
+         * bit  5: vref select (9761A)
+         * bit  4: front control
+         * bit  3: surround control (revereted with rev B)
+         * bit  2: front mic
+         * bit  1: stereo mic
+         * bit  0: mic boost level (0=20dB, 1=30dB)
          */
 
 #if 0
@@ -2230,6 +2338,47 @@ int patch_cm9761(ac97_t *ac97)
         return 0;
 }
        
+#define AC97_CM9780_SIDE        0x60
+#define AC97_CM9780_JACK        0x62
+#define AC97_CM9780_MIXER       0x64
+#define AC97_CM9780_MULTI_CHAN  0x66
+#define AC97_CM9780_SPDIF       0x6c
+
+static const char *cm9780_ch_select[] = { "Front", "Side", "Center/LFE", "Rear" };
+static const struct ac97_enum cm9780_ch_select_enum =
+        AC97_ENUM_SINGLE(AC97_CM9780_MULTI_CHAN, 6, 4, cm9780_ch_select);
+static const snd_kcontrol_new_t cm9780_controls[] = {
+        AC97_DOUBLE("Side Playback Switch", AC97_CM9780_SIDE, 15, 7, 1, 1),
+        AC97_DOUBLE("Side Playback Volume", AC97_CM9780_SIDE, 8, 0, 31, 0),
+        AC97_ENUM("Side Playback Route", cm9780_ch_select_enum),
+};
+
+static int patch_cm9780_specific(ac97_t *ac97)
+{
+        return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
+}
+
+static struct snd_ac97_build_ops patch_cm9780_ops = {
+        .build_specific = patch_cm9780_specific,
+        .build_post_spdif = patch_cm9761_post_spdif     /* identical with CM9761 */
+};
+
+int patch_cm9780(ac97_t *ac97)
+{
+        unsigned short val;
+
+        ac97->build_ops = &patch_cm9780_ops;
+
+        /* enable spdif */
+        if (ac97->ext_id & AC97_EI_SPDIF) {
+                ac97->rates[AC97_RATES_SPDIF] = SNDRV_PCM_RATE_48000; /* 48k only */
+                val = snd_ac97_read(ac97, AC97_CM9780_SPDIF);
+                val |= 0x1; /* SPDI_EN */
+                snd_ac97_write_cache(ac97, AC97_CM9780_SPDIF, val);
+        }
+
+        return 0;
+}
 
 /*
  * VIA VT1616 codec
@@ -2263,9 +2412,21 @@ int patch_vt1616(ac97_t * ac97)
         return 0;
 }
 
+/*
+ */
+static void it2646_update_jacks(ac97_t *ac97)
+{
+        /* shared Line-In */
+        snd_ac97_update_bits(ac97, 0x76, 1 << 9,
+                             is_shared_linein(ac97) ? (1<<9) : 0);
+        /* shared Mic */
+        snd_ac97_update_bits(ac97, 0x76, 1 << 10,
+                             is_shared_micin(ac97) ? (1<<10) : 0);
+}
+
 static const snd_kcontrol_new_t snd_ac97_controls_it2646[] = {
-        AC97_SINGLE("Line-In As Surround", 0x76, 9, 1, 0),
-        AC97_SINGLE("Mic As Center/LFE", 0x76, 10, 1, 0),
+        AC97_SURROUND_JACK_MODE_CTL,
+        AC97_CHANNEL_MODE_CTL,
 };
 
 static const snd_kcontrol_new_t snd_ac97_spdif_controls_it2646[] = {
@@ -2285,7 +2446,8 @@ static int patch_it2646_specific(ac97_t * ac97)
 }
 
 static struct snd_ac97_build_ops patch_it2646_ops = {
-        .build_specific = patch_it2646_specific
+        .build_specific = patch_it2646_specific,
+        .update_jacks = it2646_update_jacks
 };
 
 int patch_it2646(ac97_t * ac97)
@@ -2297,12 +2459,29 @@ int patch_it2646(ac97_t * ac97)
         return 0;
 }
 
-/* Si3036/8 specific registers */
+/*
+ * Si3036 codec
+ */
+
 #define AC97_SI3036_CHIP_ID     0x5a
+#define AC97_SI3036_LINE_CFG    0x5c
+
+static const snd_kcontrol_new_t snd_ac97_controls_si3036[] = {
+AC97_DOUBLE("Modem Speaker Volume", 0x5c, 14, 12, 3, 1)
+};
+
+static int patch_si3036_specific(ac97_t * ac97)
+{
+        return patch_build_controls(ac97, snd_ac97_controls_si3036, ARRAY_SIZE(snd_ac97_controls_si3036));
+}
+
+static struct snd_ac97_build_ops patch_si3036_ops = {
+        .build_specific = patch_si3036_specific,
+};
 
 int mpatch_si3036(ac97_t * ac97)
 {
-        //printk("mpatch_si3036: chip id = %x\n", snd_ac97_read(ac97, 0x5a));
+        ac97->build_ops = &patch_si3036_ops;
         snd_ac97_write_cache(ac97, 0x5c, 0xf210 );
         snd_ac97_write_cache(ac97, 0x68, 0);
         return 0;
diff --git a/sound/pci/ac97/ac97_patch.h b/sound/pci/ac97/ac97_patch.h
index 6db51c96f5d0..7b7377d0f2ae 100644
--- a/sound/pci/ac97/ac97_patch.h
+++ b/sound/pci/ac97/ac97_patch.h
@@ -54,6 +54,7 @@ int patch_alc850(ac97_t * ac97);
 int patch_cm9738(ac97_t * ac97);
 int patch_cm9739(ac97_t * ac97);
 int patch_cm9761(ac97_t * ac97);
+int patch_cm9780(ac97_t * ac97);
 int patch_vt1616(ac97_t * ac97);
 int patch_it2646(ac97_t * ac97);
 int mpatch_si3036(ac97_t * ac97);
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 984d5d4ba4e1..eb5c36d31a52 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -98,6 +98,8 @@ MODULE_PARM_DESC(spdif, "Support SPDIF I/O");
 #define ALI_LEF_CHANNEL         23
 #define ALI_SURR_LEFT_CHANNEL   26
 #define ALI_SURR_RIGHT_CHANNEL  25
+#define ALI_MODEM_IN_CHANNEL    21
+#define ALI_MODEM_OUT_CHANNEL   20
 
 #define SNDRV_ALI_VOICE_TYPE_PCM        01
 #define SNDRV_ALI_VOICE_TYPE_OTH        02
@@ -122,7 +124,15 @@ MODULE_PARM_DESC(spdif, "Support SPDIF I/O");
 
 #define ALI_SCTRL               0x48
 #define   ALI_SPDIF_OUT_ENABLE          0x20
+#define   ALI_SCTRL_LINE_IN2            (1 << 9)
+#define   ALI_SCTRL_GPIO_IN2            (1 << 13)
+#define   ALI_SCTRL_LINE_OUT_EN         (1 << 20)
+#define   ALI_SCTRL_GPIO_OUT_EN         (1 << 23)
+#define   ALI_SCTRL_CODEC1_READY        (1 << 24)
+#define   ALI_SCTRL_CODEC2_READY        (1 << 25)
 #define ALI_AC97_GPIO           0x4c
+#define   ALI_AC97_GPIO_ENABLE          0x8000
+#define   ALI_AC97_GPIO_DATA_SHIFT      16
 #define ALI_SPDIF_CS            0x70
 #define ALI_SPDIF_CTRL          0x74
 #define   ALI_SPDIF_IN_FUNC_ENABLE      0x02
@@ -143,6 +153,7 @@ MODULE_PARM_DESC(spdif, "Support SPDIF I/O");
         #define TARGET_REACHED          0x00008000
         #define MIXER_OVERFLOW          0x00000800
         #define MIXER_UNDERFLOW         0x00000400
+        #define GPIO_IRQ                0x01000000
 #define ALI_SBBL_SBCL           0xc0
 #define ALI_SBCTRL_SBE2R_SBDD   0xc4
 #define ALI_STIMER              0xc8
@@ -162,6 +173,9 @@ MODULE_PARM_DESC(spdif, "Support SPDIF I/O");
 
 #define ALI_REG(codec, x) ((codec)->port + x)
 
+#define MAX_CODECS 2
+
+
 typedef struct snd_stru_ali ali_t;
 typedef struct snd_ali_stru_voice snd_ali_voice_t;
 
@@ -245,7 +259,7 @@ struct snd_stru_ali {
         struct pci_dev  *pci_m7101;
 
         snd_card_t      *card;
-        snd_pcm_t       *pcm;
+        snd_pcm_t       *pcm[MAX_CODECS];
         alidev_t        synth;
         snd_ali_channel_control_t chregs;
 
@@ -255,8 +269,10 @@ struct snd_stru_ali {
         unsigned int spurious_irq_count;
         unsigned int spurious_irq_max_delta;
 
+        unsigned int num_of_codecs;
+
         ac97_bus_t *ac97_bus;
-        ac97_t *ac97;
+        ac97_t *ac97[MAX_CODECS];
         unsigned short  ac97_ext_id;
         unsigned short  ac97_ext_status;
 
@@ -489,7 +505,12 @@ static void snd_ali_codec_write(ac97_t *ac97,
         ali_t *codec = ac97->private_data;
 
         snd_ali_printk("codec_write: reg=%xh data=%xh.\n", reg, val);
-        snd_ali_codec_poke(codec, 0, reg, val);
+        if(reg == AC97_GPIO_STATUS) {
+                outl((val << ALI_AC97_GPIO_DATA_SHIFT)|ALI_AC97_GPIO_ENABLE,
+                        ALI_REG(codec, ALI_AC97_GPIO));
+                return;
+        }
+        snd_ali_codec_poke(codec, ac97->num, reg, val);
         return ;
 }
 
@@ -499,7 +520,7 @@ static unsigned short snd_ali_codec_read(ac97_t *ac97, unsigned short reg)
         ali_t *codec = ac97->private_data;
 
         snd_ali_printk("codec_read reg=%xh.\n", reg);
-        return (snd_ali_codec_peek(codec, 0, reg));
+        return (snd_ali_codec_peek(codec, ac97->num, reg));
 }
 
 /*
@@ -1051,7 +1072,7 @@ static irqreturn_t snd_ali_card_interrupt(int irq,
 }
 
 
-static snd_ali_voice_t *snd_ali_alloc_voice(ali_t * codec, int type, int rec)
+static snd_ali_voice_t *snd_ali_alloc_voice(ali_t * codec, int type, int rec, int channel)
 {
         snd_ali_voice_t *pvoice = NULL;
         unsigned long flags;
@@ -1061,7 +1082,8 @@ static snd_ali_voice_t *snd_ali_alloc_voice(ali_t * codec, int type, int rec)
 
         spin_lock_irqsave(&codec->voice_alloc, flags);
         if (type == SNDRV_ALI_VOICE_TYPE_PCM) {
-                idx = snd_ali_find_free_channel(codec,rec);
+                idx = channel > 0 ? snd_ali_alloc_pcm_channel(codec, channel) :
+                        snd_ali_find_free_channel(codec,rec);
                 if(idx < 0) {
                         snd_printk("ali_alloc_voice: err.\n");
                         spin_unlock_irqrestore(&codec->voice_alloc, flags);
@@ -1297,7 +1319,7 @@ static int snd_ali_playback_hw_params(snd_pcm_substream_t * substream,
 
         if (params_buffer_size(hw_params)/2 != params_period_size(hw_params)) {
                 if (evoice == NULL) {
-                        evoice = snd_ali_alloc_voice(codec, SNDRV_ALI_VOICE_TYPE_PCM, 0);
+                        evoice = snd_ali_alloc_voice(codec, SNDRV_ALI_VOICE_TYPE_PCM, 0, -1);
                         if (evoice == NULL)
                                 return -ENOMEM;
                         pvoice->extra = evoice;
@@ -1328,13 +1350,13 @@ static int snd_ali_playback_hw_free(snd_pcm_substream_t * substream)
         return 0;
 }
 
-static int snd_ali_capture_hw_params(snd_pcm_substream_t * substream,
+static int snd_ali_hw_params(snd_pcm_substream_t * substream,
                                  snd_pcm_hw_params_t * hw_params)
 {
         return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
 }
 
-static int snd_ali_capture_hw_free(snd_pcm_substream_t * substream)
+static int snd_ali_hw_free(snd_pcm_substream_t * substream)
 {
         return snd_pcm_lib_free_pages(substream);
 }
@@ -1428,7 +1450,7 @@ static int snd_ali_playback_prepare(snd_pcm_substream_t * substream)
 }
 
 
-static int snd_ali_capture_prepare(snd_pcm_substream_t * substream)
+static int snd_ali_prepare(snd_pcm_substream_t * substream)
 {
         ali_t *codec = snd_pcm_substream_chip(substream);
         snd_pcm_runtime_t *runtime = substream->runtime;
@@ -1446,11 +1468,13 @@ static int snd_ali_capture_prepare(snd_pcm_substream_t * substream)
 
         spin_lock_irqsave(&codec->reg_lock, flags);
 
-        snd_ali_printk("capture_prepare...\n");
+        snd_ali_printk("ali_prepare...\n");
 
         snd_ali_enable_special_channel(codec,pvoice->number);
 
-        Delta = snd_ali_convert_rate(runtime->rate, 1);
+        Delta = (pvoice->number == ALI_MODEM_IN_CHANNEL ||
+                 pvoice->number == ALI_MODEM_OUT_CHANNEL) ? 
+                0x1000 : snd_ali_convert_rate(runtime->rate, pvoice->mode);
 
         // Prepare capture intr channel
         if (pvoice->number == ALI_SPDIF_IN_CHANNEL) {
@@ -1534,7 +1558,7 @@ static snd_pcm_uframes_t snd_ali_playback_pointer(snd_pcm_substream_t *substream
 }
 
 
-static snd_pcm_uframes_t snd_ali_capture_pointer(snd_pcm_substream_t *substream)
+static snd_pcm_uframes_t snd_ali_pointer(snd_pcm_substream_t *substream)
 {
         ali_t *codec = snd_pcm_substream_chip(substream);
         snd_pcm_runtime_t *runtime = substream->runtime;
@@ -1616,7 +1640,8 @@ static void snd_ali_pcm_free_substream(snd_pcm_runtime_t *runtime)
         }
 }
 
-static int snd_ali_playback_open(snd_pcm_substream_t * substream)
+static int snd_ali_open(snd_pcm_substream_t * substream, int rec, int channel,
+                snd_pcm_hardware_t *phw)
 {
         ali_t *codec = snd_pcm_substream_chip(substream);
         snd_pcm_runtime_t *runtime = substream->runtime;
@@ -1624,7 +1649,7 @@ static int snd_ali_playback_open(snd_pcm_substream_t * substream)
         unsigned long flags = 0;
 
         spin_lock_irqsave(&codec->reg_lock, flags);
-        pvoice = snd_ali_alloc_voice(codec, SNDRV_ALI_VOICE_TYPE_PCM, 0);
+        pvoice = snd_ali_alloc_voice(codec, SNDRV_ALI_VOICE_TYPE_PCM, rec, channel);
         if (pvoice == NULL) {
                 spin_unlock_irqrestore(&codec->reg_lock, flags);
                 return -EAGAIN;
@@ -1636,49 +1661,31 @@ static int snd_ali_playback_open(snd_pcm_substream_t * substream)
         runtime->private_data = pvoice;
         runtime->private_free = snd_ali_pcm_free_substream;
 
-        runtime->hw = snd_ali_playback;
+        runtime->hw = *phw;
         snd_pcm_set_sync(substream);
         snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 64*1024);
         return 0;
 }
 
+static int snd_ali_playback_open(snd_pcm_substream_t * substream)
+{
+        return snd_ali_open(substream, 0, -1, &snd_ali_playback);
+}
 
 static int snd_ali_capture_open(snd_pcm_substream_t * substream)
 {
-        ali_t *codec = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        snd_ali_voice_t *pvoice;
-        unsigned long flags;
-
-        spin_lock_irqsave(&codec->reg_lock, flags);
-        pvoice = snd_ali_alloc_voice(codec, SNDRV_ALI_VOICE_TYPE_PCM, 1);
-        if (pvoice == NULL) {
-                spin_unlock_irqrestore(&codec->reg_lock, flags);
-                return -EAGAIN;
-        }
-        pvoice->codec = codec;
-        spin_unlock_irqrestore(&codec->reg_lock, flags);
-
-        pvoice->substream = substream;
-        runtime->private_data = pvoice;
-        runtime->private_free = snd_ali_pcm_free_substream;
-        runtime->hw = snd_ali_capture;
-        snd_pcm_set_sync(substream);
-        snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 64*1024);
-        return 0;
+        return snd_ali_open(substream, 1, -1, &snd_ali_capture);
 }
 
-
 static int snd_ali_playback_close(snd_pcm_substream_t * substream)
 {
         return 0;
 }
 
-static int snd_ali_capture_close(snd_pcm_substream_t * substream)
+static int snd_ali_close(snd_pcm_substream_t * substream)
 {
         ali_t *codec = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        snd_ali_voice_t *pvoice = (snd_ali_voice_t *) runtime->private_data;
+        snd_ali_voice_t *pvoice = (snd_ali_voice_t *) substream->runtime->private_data;
 
         snd_ali_disable_special_channel(codec,pvoice->number);
 
@@ -1698,29 +1705,121 @@ static snd_pcm_ops_t snd_ali_playback_ops = {
 
 static snd_pcm_ops_t snd_ali_capture_ops = {
         .open =         snd_ali_capture_open,
-        .close =        snd_ali_capture_close,
+        .close =        snd_ali_close,
         .ioctl =        snd_ali_ioctl,
-        .hw_params =    snd_ali_capture_hw_params,
-        .hw_free =      snd_ali_capture_hw_free,
-        .prepare =      snd_ali_capture_prepare,
+        .hw_params =    snd_ali_hw_params,
+        .hw_free =      snd_ali_hw_free,
+        .prepare =      snd_ali_prepare,
+        .trigger =      snd_ali_trigger,
+        .pointer =      snd_ali_pointer,
+};
+
+/*
+ * Modem PCM
+ */
+
+static int snd_ali_modem_hw_params(snd_pcm_substream_t * substream,
+                                 snd_pcm_hw_params_t * hw_params)
+{
+        ali_t *chip = snd_pcm_substream_chip(substream);
+        unsigned int modem_num = chip->num_of_codecs - 1;
+        snd_ac97_write(chip->ac97[modem_num], AC97_LINE1_RATE, params_rate(hw_params));
+        snd_ac97_write(chip->ac97[modem_num], AC97_LINE1_LEVEL, 0);
+        return snd_ali_hw_params(substream, hw_params);
+}
+
+static snd_pcm_hardware_t snd_ali_modem =
+{
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 SNDRV_PCM_INFO_SYNC_START),
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_KNOT|SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_16000,
+        .rate_min =             8000,
+        .rate_max =             16000,
+        .channels_min =         1,
+        .channels_max =         1,
+        .buffer_bytes_max =     (256*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (256*1024),
+        .periods_min =          1,
+        .periods_max =          1024,
+        .fifo_size =            0,
+};
+
+static int snd_ali_modem_open(snd_pcm_substream_t * substream, int rec, int channel)
+{
+        static unsigned int rates [] = {8000,9600,12000,16000};
+        static snd_pcm_hw_constraint_list_t hw_constraint_rates = {
+                .count = ARRAY_SIZE(rates),
+                .list = rates,
+                .mask = 0,
+        };
+        int err = snd_ali_open(substream, rec, channel, &snd_ali_modem);
+        if (err)
+                return err;
+        return snd_pcm_hw_constraint_list(substream->runtime, 0,
+                        SNDRV_PCM_HW_PARAM_RATE, &hw_constraint_rates);
+}
+
+static int snd_ali_modem_playback_open(snd_pcm_substream_t * substream)
+{
+        return snd_ali_modem_open(substream, 0, ALI_MODEM_OUT_CHANNEL);
+}
+
+static int snd_ali_modem_capture_open(snd_pcm_substream_t * substream)
+{
+        return snd_ali_modem_open(substream, 1, ALI_MODEM_IN_CHANNEL);
+}
+
+static snd_pcm_ops_t snd_ali_modem_playback_ops = {
+        .open =         snd_ali_modem_playback_open,
+        .close =        snd_ali_close,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_ali_modem_hw_params,
+        .hw_free =      snd_ali_hw_free,
+        .prepare =      snd_ali_prepare,
+        .trigger =      snd_ali_trigger,
+        .pointer =      snd_ali_pointer,
+};
+
+static snd_pcm_ops_t snd_ali_modem_capture_ops = {
+        .open =         snd_ali_modem_capture_open,
+        .close =        snd_ali_close,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_ali_modem_hw_params,
+        .hw_free =      snd_ali_hw_free,
+        .prepare =      snd_ali_prepare,
         .trigger =      snd_ali_trigger,
-        .pointer =      snd_ali_capture_pointer,
+        .pointer =      snd_ali_pointer,
+};
+
+
+struct ali_pcm_description {
+        char *name;
+        unsigned int playback_num;
+        unsigned int capture_num;
+        snd_pcm_ops_t *playback_ops;
+        snd_pcm_ops_t *capture_ops;
 };
 
 
 static void snd_ali_pcm_free(snd_pcm_t *pcm)
 {
         ali_t *codec = pcm->private_data;
-        codec->pcm = NULL;
+        codec->pcm[pcm->device] = NULL;
 }
 
-static int __devinit snd_ali_pcm(ali_t * codec, int device, snd_pcm_t ** rpcm)
+
+static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_description *desc)
 {
         snd_pcm_t *pcm;
         int err;
 
-        if (rpcm) *rpcm = NULL;
-        err = snd_pcm_new(codec->card, "ALI 5451", device, ALI_CHANNELS, 1, &pcm);
+        err = snd_pcm_new(codec->card, desc->name, device,
+                          desc->playback_num, desc->capture_num, &pcm);
         if (err < 0) {
                 snd_printk("snd_ali_pcm: err called snd_pcm_new.\n");
                 return err;
@@ -1728,20 +1827,36 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, snd_pcm_t ** rpcm)
         pcm->private_data = codec;
         pcm->private_free = snd_ali_pcm_free;
         pcm->info_flags = 0;
-        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_ali_playback_ops);
-        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_ali_capture_ops);
+        if (desc->playback_ops)
+                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, desc->playback_ops);
+        if (desc->capture_ops)
+                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, desc->capture_ops);
 
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
                                               snd_dma_pci_data(codec->pci), 64*1024, 128*1024);
 
         pcm->info_flags = 0;
         pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
-        strcpy(pcm->name, "ALI 5451");
-        codec->pcm = pcm;
-        if (rpcm) *rpcm = pcm;
+        strcpy(pcm->name, desc->name);
+        codec->pcm[0] = pcm;
         return 0;
 }
 
+struct ali_pcm_description ali_pcms[] = {
+        { "ALI 5451", ALI_CHANNELS, 1, &snd_ali_playback_ops, &snd_ali_capture_ops },
+        { "ALI 5451 modem", 1, 1, &snd_ali_modem_playback_ops, &snd_ali_modem_capture_ops }
+};
+
+static int __devinit snd_ali_build_pcms(ali_t *codec)
+{
+        int i, err;
+        for(i = 0 ; i < codec->num_of_codecs && i < ARRAY_SIZE(ali_pcms) ; i++)
+                if((err = snd_ali_pcm(codec, i, &ali_pcms[i])) < 0)
+                        return err;
+        return 0;
+}
+
+
 #define ALI5451_SPDIF(xname, xindex, value) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\
 .info = snd_ali5451_spdif_info, .get = snd_ali5451_spdif_get, \
@@ -1860,14 +1975,14 @@ static void snd_ali_mixer_free_ac97_bus(ac97_bus_t *bus)
 static void snd_ali_mixer_free_ac97(ac97_t *ac97)
 {
         ali_t *codec = ac97->private_data;
-        codec->ac97 = NULL;
+        codec->ac97[ac97->num] = NULL;
 }
 
 static int __devinit snd_ali_mixer(ali_t * codec)
 {
         ac97_template_t ac97;
         unsigned int idx;
-        int err;
+        int i, err;
         static ac97_bus_ops_t ops = {
                 .write = snd_ali_codec_write,
                 .read = snd_ali_codec_read,
@@ -1880,10 +1995,16 @@ static int __devinit snd_ali_mixer(ali_t * codec)
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = codec;
         ac97.private_free = snd_ali_mixer_free_ac97;
-        if ((err = snd_ac97_mixer(codec->ac97_bus, &ac97, &codec->ac97)) < 0) {
-                snd_printk("ali mixer creating error.\n");
+
+        for ( i = 0 ; i < codec->num_of_codecs ; i++) {
+                ac97.num = i;
+                if ((err = snd_ac97_mixer(codec->ac97_bus, &ac97, &codec->ac97[i])) < 0) {
+                        snd_printk("ali mixer %d creating error.\n", i);
+                        if(i == 0)
                 return err;
         }
+        }
+
         if (codec->spdif_support) {
                 for(idx = 0; idx < ARRAY_SIZE(snd_ali5451_mixer_spdif); idx++) {
                         err=snd_ctl_add(codec->card, snd_ctl_new1(&snd_ali5451_mixer_spdif[idx], codec));
@@ -1904,8 +2025,12 @@ static int ali_suspend(snd_card_t *card, pm_message_t state)
         if (! im)
                 return 0;
 
-        snd_pcm_suspend_all(chip->pcm);
-        snd_ac97_suspend(chip->ac97);
+        for(i = 0 ; i < chip->num_of_codecs ; i++) {
+                if (chip->pcm[i])
+                        snd_pcm_suspend_all(chip->pcm[i]);
+                if(chip->ac97[i])
+                        snd_ac97_suspend(chip->ac97[i]);
+        }
 
         spin_lock_irq(&chip->reg_lock);
         
@@ -1969,7 +2094,9 @@ static int ali_resume(snd_card_t *card)
         
         spin_unlock_irq(&chip->reg_lock);
 
-        snd_ac97_resume(chip->ac97);
+        for(i = 0 ; i < chip->num_of_codecs ; i++)
+                if(chip->ac97[i])
+                        snd_ac97_resume(chip->ac97[i]);
         
         return 0;
 }
@@ -2036,11 +2163,37 @@ static int snd_ali_chip_init(ali_t *codec)
                 codec->spdif_mask = 0x00000002;
         }
 
+        codec->num_of_codecs = 1;
+
+        /* secondary codec - modem */
+        if (inl(ALI_REG(codec, ALI_SCTRL)) & ALI_SCTRL_CODEC2_READY) {
+                codec->num_of_codecs++;
+                outl(inl(ALI_REG(codec, ALI_SCTRL)) |
+                        (ALI_SCTRL_LINE_IN2|ALI_SCTRL_GPIO_IN2|ALI_SCTRL_LINE_OUT_EN),
+                        ALI_REG(codec, ALI_SCTRL));
+        }
+
         snd_ali_printk("chip initialize succeed.\n");
         return 0;
 
 }
 
+/* proc for register dump */
+static void snd_ali_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *buf)
+{
+        ali_t *codec = entry->private_data;
+        int i;
+        for(i = 0 ; i < 256 ; i+= 4)
+                snd_iprintf(buf, "%02x: %08x\n", i, inl(ALI_REG(codec, i)));
+}
+
+static void __devinit snd_ali_proc_init(ali_t *codec)
+{
+        snd_info_entry_t *entry;
+        if(!snd_card_proc_new(codec->card, "ali5451", &entry))
+                snd_info_set_text_ops(entry, codec, 1024, snd_ali_proc_read);
+}
+
 static int __devinit snd_ali_resources(ali_t *codec)
 {
         int err;
@@ -2233,11 +2386,13 @@ static int __devinit snd_ali_probe(struct pci_dev *pci,
         }
         
         snd_ali_printk("pcm building ...\n");
-        if ((err = snd_ali_pcm(codec, 0, NULL)) < 0) {
+        if ((err = snd_ali_build_pcms(codec)) < 0) {
                 snd_card_free(card);
                 return err;
         }
 
+        snd_ali_proc_init(codec);
+
         strcpy(card->driver, "ALI5451");
         strcpy(card->shortname, "ALI 5451");
         
@@ -2270,7 +2425,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_ali_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_ali_exit(void)
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index f1a5f5723ee6..ca28b229c704 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -367,7 +367,7 @@ static irqreturn_t snd_als4000_interrupt(int irq, void *dev_id, struct pt_regs *
         if ((gcr_status & 0x40) && (chip->capture_substream)) /* capturing */
                 snd_pcm_period_elapsed(chip->capture_substream);
         if ((gcr_status & 0x10) && (chip->rmidi)) /* MPU401 interrupt */
-                snd_mpu401_uart_interrupt(irq, chip->rmidi, regs);
+                snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs);
         /* release the gcr */
         outb(gcr_status, chip->alt_port + 0xe);
         
@@ -777,7 +777,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_als4000_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_als4000_exit(void)
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 6b04c0acc6f7..cafab4af5c57 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1334,8 +1334,8 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id, struct pt_regs *r
 
 static struct ac97_quirk ac97_quirks[] __devinitdata = {
         {
-                .vendor = 0x103c,
-                .device = 0x006b,
+                .subvendor = 0x103c,
+                .subdevice = 0x006b,
                 .name = "HP Pavilion ZV5030US",
                 .type = AC97_TUNE_MUTE_LED
         },
@@ -1645,7 +1645,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_atiixp_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_atiixp_exit(void)
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index fb7cecea846d..a6b4b8d589fd 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -463,6 +463,11 @@ static unsigned short snd_atiixp_ac97_read(ac97_t *ac97, unsigned short reg)
 static void snd_atiixp_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
 {
         atiixp_t *chip = ac97->private_data;
+        if (reg == AC97_GPIO_STATUS) {
+                atiixp_write(chip, MODEM_OUT_GPIO,
+                        (val << ATI_REG_MODEM_OUT_GPIO_DATA_SHIFT) | ATI_REG_MODEM_OUT_GPIO_EN);
+                return;
+        }
         snd_atiixp_codec_write(chip, ac97->num, reg, val);
 }
 
@@ -663,44 +668,33 @@ static int snd_atiixp_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
 {
         atiixp_t *chip = snd_pcm_substream_chip(substream);
         atiixp_dma_t *dma = (atiixp_dma_t *)substream->runtime->private_data;
-        unsigned int reg = 0;
-        int i;
+        int err = 0;
 
         snd_assert(dma->ops->enable_transfer && dma->ops->flush_dma, return -EINVAL);
 
-        if (cmd != SNDRV_PCM_TRIGGER_START && cmd != SNDRV_PCM_TRIGGER_STOP)
-                return -EINVAL;
-
         spin_lock(&chip->reg_lock);
-
-        /* hook off/on: via GPIO_OUT */
-        for (i = 0; i < NUM_ATI_CODECS; i++) {
-                if (chip->ac97[i]) {
-                        reg = snd_ac97_read(chip->ac97[i], AC97_GPIO_STATUS);
-                        break;
-        }
-        }
-        if(cmd == SNDRV_PCM_TRIGGER_START)
-                reg |= AC97_GPIO_LINE1_OH;
-        else
-                reg &= ~AC97_GPIO_LINE1_OH;
-        reg = (reg << ATI_REG_MODEM_OUT_GPIO_DATA_SHIFT) | ATI_REG_MODEM_OUT_GPIO_EN ;
-        atiixp_write(chip, MODEM_OUT_GPIO, reg);
-
-        if (cmd == SNDRV_PCM_TRIGGER_START) {
+        switch(cmd) {
+        case SNDRV_PCM_TRIGGER_START:
                 dma->ops->enable_transfer(chip, 1);
                 dma->running = 1;
-        } else {
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
                 dma->ops->enable_transfer(chip, 0);
                 dma->running = 0;
+                break;
+        default:
+                err = -EINVAL;
+                break;
         }
+        if (! err) {
         snd_atiixp_check_bus_busy(chip);
         if (cmd == SNDRV_PCM_TRIGGER_STOP) {
                 dma->ops->flush_dma(chip);
                 snd_atiixp_check_bus_busy(chip);
         }
+        }
         spin_unlock(&chip->reg_lock);
-        return 0;
+        return err;
 }
 
 
@@ -1332,7 +1326,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_atiixp_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_atiixp_exit(void)
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 889b4a1a51a1..f6236c63aaaa 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -375,7 +375,7 @@ static struct pci_driver driver = {
 // initialization of the module
 static int __init alsa_card_vortex_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 // clean up the module
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index b8ae534125c1..72bba7b2d983 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -1520,7 +1520,7 @@ static int __init alsa_card_azf3328_init(void)
 {
         int err;
         snd_azf3328_dbgcallenter();
-        err = pci_module_init(&driver);
+        err = pci_register_driver(&driver);
         snd_azf3328_dbgcallleave();
         return err;
 }
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 89a7ffe5e7d7..defdc5a459f0 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -918,7 +918,7 @@ static int __init alsa_card_bt87x_init(void)
 {
         if (load_all)
                 driver.id_table = snd_bt87x_default_ids;
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_bt87x_exit(void)
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index deb028851056..da09cab405a9 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.20
+ *  Version: 0.0.21
  *
  *  FEATURES currently supported:
  *    See ca0106_main.c for features.
@@ -45,6 +45,8 @@
  *    Added I2C and SPI registers. Filled in interrupt enable.
  *  0.0.20
  *    Added GPIO info for SB Live 24bit.
+ *  0.0.21
+ *   Implement support for Line-in capture on SB Live 24bit.
  *
  *
  *  This code was initally based on code from ALSA's emu10k1x.c which is:
@@ -152,7 +154,7 @@
                                                  * bit 9 0 = Mute / 1 = Analog out.
                                                  * bit 10 0 = Line-in / 1 = Mic-in.
                                                  * bit 11 0 = ? / 1 = ?
-                                                 * bit 12 0 = ? / 1 = ?
+                                                 * bit 12 0 = 48 Khz / 1 = 96 Khz Analog out on SB Live 24bit.
                                                  * bit 13 0 = ? / 1 = ?
                                                  * bit 14 0 = Mute / 1 = Analog out
                                                  * bit 15 0 = ? / 1 = ?
@@ -475,9 +477,56 @@
                                                 /* Causes interrupts based on timer intervals. */
 #define SPI                     0x7a            /* SPI: Serial Interface Register */
 #define I2C_A                   0x7b            /* I2C Address. 32 bit */
-#define I2C_0                   0x7c            /* I2C Data Port 0. 32 bit */
-#define I2C_1                   0x7d            /* I2C Data Port 1. 32 bit */
+#define I2C_D0                  0x7c            /* I2C Data Port 0. 32 bit */
+#define I2C_D1                  0x7d            /* I2C Data Port 1. 32 bit */
+//I2C values
+#define I2C_A_ADC_ADD_MASK      0x000000fe      //The address is a 7 bit address
+#define I2C_A_ADC_RW_MASK       0x00000001      //bit mask for R/W
+#define I2C_A_ADC_TRANS_MASK    0x00000010      //Bit mask for I2c address DAC value
+#define I2C_A_ADC_ABORT_MASK    0x00000020      //Bit mask for I2C transaction abort flag
+#define I2C_A_ADC_LAST_MASK     0x00000040      //Bit mask for Last word transaction
+#define I2C_A_ADC_BYTE_MASK     0x00000080      //Bit mask for Byte Mode
 
+#define I2C_A_ADC_ADD           0x00000034      //This is the Device address for ADC 
+#define I2C_A_ADC_READ          0x00000001      //To perform a read operation
+#define I2C_A_ADC_START         0x00000100      //Start I2C transaction
+#define I2C_A_ADC_ABORT         0x00000200      //I2C transaction abort
+#define I2C_A_ADC_LAST          0x00000400      //I2C last transaction
+#define I2C_A_ADC_BYTE          0x00000800      //I2C one byte mode
+
+#define I2C_D_ADC_REG_MASK      0xfe000000      //ADC address register 
+#define I2C_D_ADC_DAT_MASK      0x01ff0000      //ADC data register
+
+#define ADC_TIMEOUT             0x00000007      //ADC Timeout Clock Disable
+#define ADC_IFC_CTRL            0x0000000b      //ADC Interface Control
+#define ADC_MASTER              0x0000000c      //ADC Master Mode Control
+#define ADC_POWER               0x0000000d      //ADC PowerDown Control
+#define ADC_ATTEN_ADCL          0x0000000e      //ADC Attenuation ADCL
+#define ADC_ATTEN_ADCR          0x0000000f      //ADC Attenuation ADCR
+#define ADC_ALC_CTRL1           0x00000010      //ADC ALC Control 1
+#define ADC_ALC_CTRL2           0x00000011      //ADC ALC Control 2
+#define ADC_ALC_CTRL3           0x00000012      //ADC ALC Control 3
+#define ADC_NOISE_CTRL          0x00000013      //ADC Noise Gate Control
+#define ADC_LIMIT_CTRL          0x00000014      //ADC Limiter Control
+#define ADC_MUX                 0x00000015      //ADC Mux offset
+
+#if 0
+/* FIXME: Not tested yet. */
+#define ADC_GAIN_MASK           0x000000ff      //Mask for ADC Gain
+#define ADC_ZERODB              0x000000cf      //Value to set ADC to 0dB
+#define ADC_MUTE_MASK           0x000000c0      //Mask for ADC mute
+#define ADC_MUTE                0x000000c0      //Value to mute ADC
+#define ADC_OSR                 0x00000008      //Mask for ADC oversample rate select
+#define ADC_TIMEOUT_DISABLE     0x00000008      //Value and mask to disable Timeout clock
+#define ADC_HPF_DISABLE         0x00000100      //Value and mask to disable High pass filter
+#define ADC_TRANWIN_MASK        0x00000070      //Mask for Length of Transient Window
+#endif
+
+#define ADC_MUX_MASK            0x0000000f      //Mask for ADC Mux
+#define ADC_MUX_MIC             0x00000002      //Value to select Mic at ADC Mux
+#define ADC_MUX_LINEIN          0x00000004      //Value to select LineIn at ADC Mux
+#define ADC_MUX_PHONE           0x00000001      //Value to select TAD at ADC Mux (Not used)
+#define ADC_MUX_AUX             0x00000008      //Value to select Aux at ADC Mux
 
 #define SET_CHANNEL 0  /* Testing channel outputs 0=Front, 1=Center/LFE, 2=Unknown, 3=Rear */
 #define PCM_FRONT_CHANNEL 0
@@ -508,9 +557,18 @@ struct snd_ca0106_pcm {
         unsigned short running;
 };
 
+typedef struct {
+        u32 serial;
+        char * name;
+        int ac97;
+        int gpio_type;
+        int i2c_adc;
+} ca0106_details_t;
+
 // definition of the chip-specific record
 struct snd_ca0106 {
         snd_card_t *card;
+        ca0106_details_t *details;
         struct pci_dev *pci;
 
         unsigned long port;
@@ -531,6 +589,7 @@ struct snd_ca0106 {
         u32 spdif_bits[4];             /* s/pdif out setup */
         int spdif_enable;
         int capture_source;
+        int capture_mic_line_in;
 
         struct snd_dma_buffer buffer;
 };
@@ -547,3 +606,6 @@ void snd_ca0106_ptr_write(ca0106_t *emu,
                                    unsigned int chn, 
                                    unsigned int data);
 
+int snd_ca0106_i2c_write(ca0106_t *emu, u32 reg, u32 value);
+
+
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 82533b45bc8c..95c289284267 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.22
+ *  Version: 0.0.23
  *
  *  FEATURES currently supported:
  *    Front, Rear and Center/LFE.
@@ -77,6 +77,8 @@
  *    Add SPDIF capture using optional digital I/O module for SB Live 24bit. (Analog capture does not yet work.)
  *  0.0.22
  *    Add support for MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97. From kiksen, bug #901
+ *  0.0.23
+ *    Implement support for Line-in capture on SB Live 24bit.
  *
  *  BUGS:
  *    Some stability problems when unloading the snd-ca0106 kernel module.
@@ -136,6 +138,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
@@ -161,18 +164,32 @@ MODULE_PARM_DESC(enable, "Enable the CA0106 soundcard.");
 
 #include "ca0106.h"
 
-typedef struct {
-        u32 serial;
-        char * name;
-} ca0106_names_t;
-
-static ca0106_names_t ca0106_chip_names[] = {
-         { 0x10021102, "AudigyLS [SB0310]"} , 
-         { 0x10051102, "AudigyLS [SB0310b]"} , /* Unknown AudigyLS that also says SB0310 on it */
-         { 0x10061102, "Live! 7.1 24bit [SB0410]"} , /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
-         { 0x10071102, "Live! 7.1 24bit [SB0413]"} , /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97.  */
-         { 0x10091462, "MSI K8N Diamond MB [SB0438]"}, /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
-         { 0, "AudigyLS [Unknown]" }
+static ca0106_details_t ca0106_chip_details[] = {
+         /* AudigyLS[SB0310] */
+         { .serial = 0x10021102,
+           .name   = "AudigyLS [SB0310]",
+           .ac97   = 1 } , 
+         /* Unknown AudigyLS that also says SB0310 on it */
+         { .serial = 0x10051102,
+           .name   = "AudigyLS [SB0310b]",
+           .ac97   = 1 } ,
+         /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
+         { .serial = 0x10061102,
+           .name   = "Live! 7.1 24bit [SB0410]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+         /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97.  */
+         { .serial = 0x10071102,
+           .name   = "Live! 7.1 24bit [SB0413]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+         /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
+         { .serial = 0x10091462,
+           .name   = "MSI K8N Diamond MB [SB0438]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+         { .serial = 0,
+           .name   = "AudigyLS [Unknown]" }
 };
 
 /* hardware definition */
@@ -200,10 +217,10 @@ static snd_pcm_hardware_t snd_ca0106_capture_hw = {
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID),
-        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
-        .rates =                SNDRV_PCM_RATE_48000,
-        .rate_min =             48000,
-        .rate_max =             48000,
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
+        .rates =                SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000,
+        .rate_min =             44100,
+        .rate_max =             192000,
         .channels_min =         2,
         .channels_max =         2,
         .buffer_bytes_max =     ((65536 - 64) * 8),
@@ -246,6 +263,62 @@ void snd_ca0106_ptr_write(ca0106_t *emu,
         spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
+int snd_ca0106_i2c_write(ca0106_t *emu,
+                                u32 reg,
+                                u32 value)
+{
+        u32 tmp;
+        int timeout=0;
+        int status;
+        int retry;
+        if ((reg > 0x7f) || (value > 0x1ff))
+        {
+                snd_printk("i2c_write: invalid values.\n");
+                return -EINVAL;
+        }
+
+        tmp = reg << 25 | value << 16;
+        /* Not sure what this I2C channel controls. */
+        /* snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp); */
+
+        /* This controls the I2C connected to the WM8775 ADC Codec */
+        snd_ca0106_ptr_write(emu, I2C_D1, 0, tmp);
+
+        for(retry=0;retry<10;retry++)
+        {
+                /* Send the data to i2c */
+                tmp = snd_ca0106_ptr_read(emu, I2C_A, 0);
+                tmp = tmp & ~(I2C_A_ADC_READ|I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD_MASK);
+                tmp = tmp | (I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD);
+                snd_ca0106_ptr_write(emu, I2C_A, 0, tmp);
+
+                /* Wait till the transaction ends */
+                while(1)
+                {
+                        status = snd_ca0106_ptr_read(emu, I2C_A, 0);
+                        //snd_printk("I2C:status=0x%x\n", status);
+                        timeout++;
+                        if((status & I2C_A_ADC_START)==0)
+                                break;
+
+                        if(timeout>1000)
+                                break;
+                }
+                //Read back and see if the transaction is successful
+                if((status & I2C_A_ADC_ABORT)==0)
+                        break;
+        }
+
+        if(retry==10)
+        {
+                snd_printk("Writing to ADC failed!\n");
+                return -EINVAL;
+        }
+    
+        return 0;
+}
+
+
 static void snd_ca0106_intr_enable(ca0106_t *emu, unsigned int intrenb)
 {
         unsigned long flags;
@@ -259,11 +332,7 @@ static void snd_ca0106_intr_enable(ca0106_t *emu, unsigned int intrenb)
 
 static void snd_ca0106_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        ca0106_pcm_t *epcm = runtime->private_data;
-  
-        if (epcm) {
-                kfree(epcm);
-        }
+        kfree(runtime->private_data);
 }
 
 /* open_playback callback */
@@ -538,6 +607,61 @@ static int snd_ca0106_pcm_prepare_capture(snd_pcm_substream_t *substream)
         snd_pcm_runtime_t *runtime = substream->runtime;
         ca0106_pcm_t *epcm = runtime->private_data;
         int channel = epcm->channel_id;
+        u32 hcfg_mask = HCFG_CAPTURE_S32_LE;
+        u32 hcfg_set = 0x00000000;
+        u32 hcfg;
+        u32 over_sampling=0x2;
+        u32 reg71_mask = 0x0000c000 ; /* Global. Set ADC rate. */
+        u32 reg71_set = 0;
+        u32 reg71;
+        
+        //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1));
+        //snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base);
+        //snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
+        /* reg71 controls ADC rate. */
+        switch (runtime->rate) {
+        case 44100:
+                reg71_set = 0x00004000;
+                break;
+        case 48000:
+                reg71_set = 0; 
+                break;
+        case 96000:
+                reg71_set = 0x00008000;
+                over_sampling=0xa;
+                break;
+        case 192000:
+                reg71_set = 0x0000c000; 
+                over_sampling=0xa;
+                break;
+        default:
+                reg71_set = 0; 
+                break;
+        }
+        /* Format is a global setting */
+        /* FIXME: Only let the first channel accessed set this. */
+        switch (runtime->format) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                hcfg_set = 0;
+                break;
+        case SNDRV_PCM_FORMAT_S32_LE:
+                hcfg_set = HCFG_CAPTURE_S32_LE;
+                break;
+        default:
+                hcfg_set = 0;
+                break;
+        }
+        hcfg = inl(emu->port + HCFG) ;
+        hcfg = (hcfg & ~hcfg_mask) | hcfg_set;
+        outl(hcfg, emu->port + HCFG);
+        reg71 = snd_ca0106_ptr_read(emu, 0x71, 0);
+        reg71 = (reg71 & ~reg71_mask) | reg71_set;
+        snd_ca0106_ptr_write(emu, 0x71, 0, reg71);
+        if (emu->details->i2c_adc == 1) { /* The SB0410 and SB0413 use I2C to control ADC. */
+                snd_ca0106_i2c_write(emu, ADC_MASTER, over_sampling); /* Adjust the over sampler to better suit the capture rate. */
+        }
+
+
         //printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size,  frames_to_bytes(runtime, 1));
         snd_ca0106_ptr_write(emu, 0x13, channel, 0);
         snd_ca0106_ptr_write(emu, CAPTURE_DMA_ADDR, channel, runtime->dma_addr);
@@ -810,6 +934,7 @@ static int snd_ca0106_ac97(ca0106_t *chip)
 
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = chip;
+        ac97.scaps = AC97_SCAP_NO_SPDIF;
         return snd_ac97_mixer(pbus, &ac97, &chip->ac97);
 }
 
@@ -993,6 +1118,7 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
                                          ca0106_t **rchip)
 {
         ca0106_t *chip;
+        ca0106_details_t *c;
         int err;
         int ch;
         static snd_device_ops_t ops = {
@@ -1003,8 +1129,8 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
   
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        if (pci_set_dma_mask(pci, 0xffffffffUL) < 0 ||
-            pci_set_consistent_dma_mask(pci, 0xffffffffUL) < 0) {
+        if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
+            pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
                 printk(KERN_ERR "error to set 32bit mask DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
@@ -1054,6 +1180,15 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
         printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
                chip->revision, chip->serial);
 #endif
+        strcpy(card->driver, "CA0106");
+        strcpy(card->shortname, "CA0106");
+
+        for (c=ca0106_chip_details; c->serial; c++) {
+                if (c->serial == chip->serial) break;
+        }
+        chip->details = c;
+        sprintf(card->longname, "%s at 0x%lx irq %i",
+                c->name, chip->port, chip->irq);
 
         outl(0, chip->port + INTE);
 
@@ -1113,7 +1248,7 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
         //snd_ca0106_ptr_write(chip, SPDIF_SELECT2, 0, 0xf0f003f); /* OSS drivers set this. */
         /* Analog or Digital output */
         snd_ca0106_ptr_write(chip, SPDIF_SELECT1, 0, 0xf);
-        snd_ca0106_ptr_write(chip, SPDIF_SELECT2, 0, 0x000b0000); /* 0x0b000000 for digital, 0x000b0000 for analog, from win2000 drivers */
+        snd_ca0106_ptr_write(chip, SPDIF_SELECT2, 0, 0x000f0000); /* 0x0b000000 for digital, 0x000b0000 for analog, from win2000 drivers. Use 0x000f0000 for surround71 */
         chip->spdif_enable = 0; /* Set digital SPDIF output off */
         chip->capture_source = 3; /* Set CAPTURE_SOURCE */
         //snd_ca0106_ptr_write(chip, 0x45, 0, 0); /* Analogue out */
@@ -1138,13 +1273,11 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
         snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */
         chip->capture_source = 3; /* Set CAPTURE_SOURCE */
 
-        if ((chip->serial == 0x10061102) || 
-            (chip->serial == 0x10071102) ||
-            (chip->serial == 0x10091462)) { /* The SB0410 and SB0413 use GPIO differently. */
+        if (chip->details->gpio_type == 1) { /* The SB0410 and SB0413 use GPIO differently. */
                 /* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */
                 outl(0x0, chip->port+GPIO);
                 //outl(0x00f0e000, chip->port+GPIO); /* Analog */
-                outl(0x005f4300, chip->port+GPIO); /* Analog */
+                outl(0x005f5301, chip->port+GPIO); /* Analog */
         } else {
                 outl(0x0, chip->port+GPIO);
                 outl(0x005f03a3, chip->port+GPIO); /* Analog */
@@ -1157,6 +1290,10 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
         //outl(0x00000009, chip->port+HCFG);
         outl(HCFG_AC97 | HCFG_AUDIOENABLE, chip->port+HCFG); /* AC97 2.0, Enable outputs. */
 
+        if (chip->details->i2c_adc == 1) { /* The SB0410 and SB0413 use I2C to control ADC. */
+                snd_ca0106_i2c_write(chip, ADC_MUX, ADC_MUX_LINEIN); /* Enable Line-in capture. MIC in currently untested. */
+        }
+
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
                                   chip, &ops)) < 0) {
                 snd_ca0106_free(chip);
@@ -1172,7 +1309,6 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,
         static int dev;
         snd_card_t *card;
         ca0106_t *chip;
-        ca0106_names_t *c;
         int err;
 
         if (dev >= SNDRV_CARDS)
@@ -1207,9 +1343,7 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,
                 snd_card_free(card);
                 return err;
         }
-        if ((chip->serial != 0x10061102) && 
-            (chip->serial != 0x10071102) && 
-            (chip->serial != 0x10091462) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
+        if (chip->details->ac97 == 1) { /* The SB0410 and SB0413 do not have an AC97 chip. */
                 if ((err = snd_ca0106_ac97(chip)) < 0) {
                         snd_card_free(card);
                         return err;
@@ -1222,15 +1356,6 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,
 
         snd_ca0106_proc_init(chip);
 
-        strcpy(card->driver, "CA0106");
-        strcpy(card->shortname, "CA0106");
-
-        for (c=ca0106_chip_names; c->serial; c++) {
-                if (c->serial == chip->serial) break;
-        }
-        sprintf(card->longname, "%s at 0x%lx irq %i",
-                c->name, chip->port, chip->irq);
-
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -1267,7 +1392,7 @@ static int __init alsa_card_ca0106_init(void)
 {
         int err;
 
-        if ((err = pci_module_init(&driver)) > 0)
+        if ((err = pci_register_driver(&driver)) > 0)
                 return err;
 
         return 0;
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 97bed1b0899d..0e5e9ce0ff28 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.16
+ *  Version: 0.0.17
  *
  *  FEATURES currently supported:
  *    See ca0106_main.c for features.
@@ -37,6 +37,8 @@
  *    Separated ca0106.c into separate functional .c files.
  *  0.0.16
  *    Modified Copyright message.
+ *  0.0.17
+ *    Implement Mic and Line in Capture.
  *
  *  This code was initally based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
@@ -113,7 +115,7 @@ static int snd_ca0106_shared_spdif_put(snd_kcontrol_t * kcontrol,
                 } else {
                         /* Analog */
                         snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
-                        snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000b0000);
+                        snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);
                         snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0,
                                 snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000);
                         mask = inl(emu->port + GPIO) | 0x101;
@@ -183,6 +185,65 @@ static snd_kcontrol_new_t snd_ca0106_capture_source __devinitdata =
         .put =          snd_ca0106_capture_source_put
 };
 
+static int snd_ca0106_capture_mic_line_in_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[2] = { "Line in", "Mic in" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item > 1)
+                uinfo->value.enumerated.item = 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_ca0106_capture_mic_line_in_get(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = emu->capture_mic_line_in;
+        return 0;
+}
+
+static int snd_ca0106_capture_mic_line_in_put(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int val;
+        int change = 0;
+        u32 tmp;
+
+        val = ucontrol->value.enumerated.item[0] ;
+        change = (emu->capture_mic_line_in != val);
+        if (change) {
+                emu->capture_mic_line_in = val;
+                if (val) {
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_PHONE); /* Mute input */
+                        tmp = inl(emu->port+GPIO) & ~0x400;
+                        tmp = tmp | 0x400;
+                        outl(tmp, emu->port+GPIO);
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_MIC);
+                } else {
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_PHONE); /* Mute input */
+                        tmp = inl(emu->port+GPIO) & ~0x400;
+                        outl(tmp, emu->port+GPIO);
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_LINEIN);
+                }
+        }
+        return change;
+}
+
+static snd_kcontrol_new_t snd_ca0106_capture_mic_line_in __devinitdata =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "Mic/Line in Capture",
+        .info =         snd_ca0106_capture_mic_line_in_info,
+        .get =          snd_ca0106_capture_mic_line_in_get,
+        .put =          snd_ca0106_capture_mic_line_in_put
+};
+
 static int snd_ca0106_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
@@ -437,7 +498,7 @@ static snd_kcontrol_new_t snd_ca0106_volume_control_analog_center_lfe =
 static snd_kcontrol_new_t snd_ca0106_volume_control_analog_unknown =
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name =         "Analog Unknown Volume",
+        .name =         "Analog Side Volume",
         .info =         snd_ca0106_volume_info,
         .get =          snd_ca0106_volume_get_analog_unknown,
         .put =          snd_ca0106_volume_put_analog_unknown
@@ -620,10 +681,11 @@ int __devinit snd_ca0106_mixer(ca0106_t *emu)
                 return -ENOMEM;
         if ((err = snd_ctl_add(card, kctl)))
                 return err;
-        if ((kctl = ctl_find(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT))) != NULL) {
-                /* already defined by ac97, remove it */
-                /* FIXME: or do we need both controls? */
-                remove_ctl(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT));
+        if (emu->details->i2c_adc == 1) {
+                if ((kctl = snd_ctl_new1(&snd_ca0106_capture_mic_line_in, emu)) == NULL)
+                        return -ENOMEM;
+                if ((err = snd_ctl_add(card, kctl)))
+                        return err;
         }
         if ((kctl = snd_ctl_new1(&snd_ca0106_spdif_control, emu)) == NULL)
                 return -ENOMEM;
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c
index afb711421e47..1c9cc821d1b9 100644
--- a/sound/pci/ca0106/ca0106_proc.c
+++ b/sound/pci/ca0106/ca0106_proc.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.17
+ *  Version: 0.0.18
  *
  *  FEATURES currently supported:
  *    See ca0106_main.c for features.
@@ -39,7 +39,9 @@
  *    Modified Copyright message.
  *  0.0.17
  *    Add iec958 file in proc file system to show status of SPDIF in.
- *    
+ *  0.0.18
+ *    Implement support for Line-in capture on SB Live 24bit.
+ *
  *  This code was initally based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
@@ -95,7 +97,7 @@ static struct snd_ca0106_category_str snd_ca0106_con_category[] = {
 };
 
 
-void snd_ca0106_proc_dump_iec958( snd_info_buffer_t *buffer, u32 value)
+static void snd_ca0106_proc_dump_iec958( snd_info_buffer_t *buffer, u32 value)
 {
         int i;
         u32 status[4];
@@ -407,6 +409,20 @@ static void snd_ca0106_proc_reg_write(snd_info_entry_t *entry,
         }
 }
 
+static void snd_ca0106_proc_i2c_write(snd_info_entry_t *entry, 
+                                       snd_info_buffer_t * buffer)
+{
+        ca0106_t *emu = entry->private_data;
+        char line[64];
+        unsigned int reg, val;
+        while (!snd_info_get_line(buffer, line, sizeof(line))) {
+                if (sscanf(line, "%x %x", &reg, &val) != 2)
+                        continue;
+                if ((reg <= 0x7f) || (val <= 0x1ff)) {
+                        snd_ca0106_i2c_write(emu, reg, val);
+                }
+        }
+}
 
 int __devinit snd_ca0106_proc_init(ca0106_t * emu)
 {
@@ -418,6 +434,7 @@ int __devinit snd_ca0106_proc_init(ca0106_t * emu)
                 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read32);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_ca0106_proc_reg_write32;
+                entry->mode |= S_IWUSR;
         }
         if(! snd_card_proc_new(emu->card, "ca0106_reg16", &entry))
                 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read16);
@@ -427,6 +444,14 @@ int __devinit snd_ca0106_proc_init(ca0106_t * emu)
                 snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_reg_read1);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_ca0106_proc_reg_write;
+                entry->mode |= S_IWUSR;
+//              entry->private_data = emu;
+        }
+        if(! snd_card_proc_new(emu->card, "ca0106_i2c", &entry)) {
+                snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_i2c_write);
+                entry->c.text.write_size = 64;
+                entry->c.text.write = snd_ca0106_proc_i2c_write;
+                entry->mode |= S_IWUSR;
 //              entry->private_data = emu;
         }
         if(! snd_card_proc_new(emu->card, "ca0106_regs2", &entry)) 
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 113208fbde1b..b4503385ea69 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -519,40 +519,50 @@ inline static unsigned char snd_cmipci_read_b(cmipci_t *cm, unsigned int cmd)
 }
 
 /* bit operations for dword register */
-static void snd_cmipci_set_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
+static int snd_cmipci_set_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
 {
-        unsigned int val;
-        val = inl(cm->iobase + cmd);
+        unsigned int val, oval;
+        val = oval = inl(cm->iobase + cmd);
         val |= flag;
+        if (val == oval)
+                return 0;
         outl(val, cm->iobase + cmd);
+        return 1;
 }
 
-static void snd_cmipci_clear_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
+static int snd_cmipci_clear_bit(cmipci_t *cm, unsigned int cmd, unsigned int flag)
 {
-        unsigned int val;
-        val = inl(cm->iobase + cmd);
+        unsigned int val, oval;
+        val = oval = inl(cm->iobase + cmd);
         val &= ~flag;
+        if (val == oval)
+                return 0;
         outl(val, cm->iobase + cmd);
+        return 1;
 }
 
-#if 0 // not used
 /* bit operations for byte register */
-static void snd_cmipci_set_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
+static int snd_cmipci_set_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
 {
-        unsigned char val;
-        val = inb(cm->iobase + cmd);
+        unsigned char val, oval;
+        val = oval = inb(cm->iobase + cmd);
         val |= flag;
+        if (val == oval)
+                return 0;
         outb(val, cm->iobase + cmd);
+        return 1;
 }
 
-static void snd_cmipci_clear_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
+static int snd_cmipci_clear_bit_b(cmipci_t *cm, unsigned int cmd, unsigned char flag)
 {
-        unsigned char val;
-        val = inb(cm->iobase + cmd);
+        unsigned char val, oval;
+        val = oval = inb(cm->iobase + cmd);
         val &= ~flag;
+        if (val == oval)
+                return 0;
         outb(val, cm->iobase + cmd);
+        return 1;
 }
-#endif
 
 
 /*
@@ -2250,8 +2260,8 @@ DEFINE_SWITCH_ARG(exchange_dac, CM_REG_MISC_CTRL, CM_XCHGDAC, 0, 0, 0); /* rever
 DEFINE_SWITCH_ARG(exchange_dac, CM_REG_MISC_CTRL, CM_XCHGDAC, CM_XCHGDAC, 0, 0);
 #endif
 DEFINE_BIT_SWITCH_ARG(fourch, CM_REG_MISC_CTRL, CM_N4SPK3D, 0, 0);
-DEFINE_BIT_SWITCH_ARG(line_rear, CM_REG_MIXER1, CM_SPK4, 1, 0);
-DEFINE_BIT_SWITCH_ARG(line_bass, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS, 0, 0);
+// DEFINE_BIT_SWITCH_ARG(line_rear, CM_REG_MIXER1, CM_SPK4, 1, 0);
+// DEFINE_BIT_SWITCH_ARG(line_bass, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS, 0, 0);
 // DEFINE_BIT_SWITCH_ARG(joystick, CM_REG_FUNCTRL1, CM_JYSTK_EN, 0, 0); /* now module option */
 DEFINE_SWITCH_ARG(modem, CM_REG_MISC_CTRL, CM_FLINKON|CM_FLINKOFF, CM_FLINKON, 0, 0);
 
@@ -2300,10 +2310,114 @@ static int snd_cmipci_spdout_enable_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_v
 }
 
 
+static int snd_cmipci_line_in_mode_info(snd_kcontrol_t *kcontrol,
+                                        snd_ctl_elem_info_t *uinfo)
+{
+        cmipci_t *cm = snd_kcontrol_chip(kcontrol);
+        static char *texts[3] = { "Line-In", "Rear Output", "Bass Output" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = cm->chip_version >= 39 ? 3 : 2;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static inline unsigned int get_line_in_mode(cmipci_t *cm)
+{
+        unsigned int val;
+        if (cm->chip_version >= 39) {
+                val = snd_cmipci_read(cm, CM_REG_LEGACY_CTRL);
+                if (val & CM_LINE_AS_BASS)
+                        return 2;
+        }
+        val = snd_cmipci_read_b(cm, CM_REG_MIXER1);
+        if (val & CM_SPK4)
+                return 1;
+        return 0;
+}
+
+static int snd_cmipci_line_in_mode_get(snd_kcontrol_t *kcontrol,
+                                       snd_ctl_elem_value_t *ucontrol)
+{
+        cmipci_t *cm = snd_kcontrol_chip(kcontrol);
+
+        spin_lock_irq(&cm->reg_lock);
+        ucontrol->value.enumerated.item[0] = get_line_in_mode(cm);
+        spin_unlock_irq(&cm->reg_lock);
+        return 0;
+}
+
+static int snd_cmipci_line_in_mode_put(snd_kcontrol_t *kcontrol,
+                                       snd_ctl_elem_value_t *ucontrol)
+{
+        cmipci_t *cm = snd_kcontrol_chip(kcontrol);
+        int change;
+
+        spin_lock_irq(&cm->reg_lock);
+        if (ucontrol->value.enumerated.item[0] == 2)
+                change = snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS);
+        else
+                change = snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS);
+        if (ucontrol->value.enumerated.item[0] == 1)
+                change |= snd_cmipci_set_bit_b(cm, CM_REG_MIXER1, CM_SPK4);
+        else
+                change |= snd_cmipci_clear_bit_b(cm, CM_REG_MIXER1, CM_SPK4);
+        spin_unlock_irq(&cm->reg_lock);
+        return change;
+}
+
+static int snd_cmipci_mic_in_mode_info(snd_kcontrol_t *kcontrol,
+                                       snd_ctl_elem_info_t *uinfo)
+{
+        static char *texts[2] = { "Mic-In", "Center/LFE Output" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_cmipci_mic_in_mode_get(snd_kcontrol_t *kcontrol,
+                                      snd_ctl_elem_value_t *ucontrol)
+{
+        cmipci_t *cm = snd_kcontrol_chip(kcontrol);
+        /* same bit as spdi_phase */
+        spin_lock_irq(&cm->reg_lock);
+        ucontrol->value.enumerated.item[0] = 
+                (snd_cmipci_read_b(cm, CM_REG_MISC) & CM_SPDIF_INVERSE) ? 1 : 0;
+        spin_unlock_irq(&cm->reg_lock);
+        return 0;
+}
+
+static int snd_cmipci_mic_in_mode_put(snd_kcontrol_t *kcontrol,
+                                      snd_ctl_elem_value_t *ucontrol)
+{
+        cmipci_t *cm = snd_kcontrol_chip(kcontrol);
+        int change;
+
+        spin_lock_irq(&cm->reg_lock);
+        if (ucontrol->value.enumerated.item[0])
+                change = snd_cmipci_set_bit_b(cm, CM_REG_MISC, CM_SPDIF_INVERSE);
+        else
+                change = snd_cmipci_clear_bit_b(cm, CM_REG_MISC, CM_SPDIF_INVERSE);
+        spin_unlock_irq(&cm->reg_lock);
+        return change;
+}
+
 /* both for CM8338/8738 */
 static snd_kcontrol_new_t snd_cmipci_mixer_switches[] __devinitdata = {
         DEFINE_MIXER_SWITCH("Four Channel Mode", fourch),
-        DEFINE_MIXER_SWITCH("Line-In As Rear", line_rear),
+        {
+                .name = "Line-In Mode",
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .info = snd_cmipci_line_in_mode_info,
+                .get = snd_cmipci_line_in_mode_get,
+                .put = snd_cmipci_line_in_mode_put,
+        },
 };
 
 /* for non-multichannel chips */
@@ -2341,10 +2455,15 @@ static snd_kcontrol_new_t snd_cmipci_old_mixer_switches[] __devinitdata = {
 
 /* only for model 039 or later */
 static snd_kcontrol_new_t snd_cmipci_extra_mixer_switches[] __devinitdata = {
-        DEFINE_MIXER_SWITCH("Line-In As Bass", line_bass),
         DEFINE_MIXER_SWITCH("IEC958 In Select", spdif_in_sel2),
         DEFINE_MIXER_SWITCH("IEC958 In Phase Inverse", spdi_phase2),
-        DEFINE_MIXER_SWITCH("Mic As Center/LFE", spdi_phase), /* same bit as spdi_phase */
+        {
+                .name = "Mic-In Mode",
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .info = snd_cmipci_mic_in_mode_info,
+                .get = snd_cmipci_mic_in_mode_get,
+                .put = snd_cmipci_mic_in_mode_put,
+        }
 };
 
 /* card control switches */
@@ -2944,7 +3063,7 @@ static struct pci_driver driver = {
         
 static int __init alsa_card_cmipci_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_cmipci_exit(void)
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index d7e06b3caf97..b6e1854e9389 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -206,7 +206,10 @@ MODULE_PARM_DESC(dual_codec, "Secondary Codec ID (0 = disabled).");
 
 #define BA0_PMCS                0x0344  /* Power Management Control/Status */
 #define BA0_CWPR                0x03e0  /* Configuration Write Protect */
+
 #define BA0_EPPMC               0x03e4  /* Extended PCI Power Management Control */
+#define BA0_EPPMC_FPDN          (1<<14) /* Full Power DowN */
+
 #define BA0_GPIOR               0x03e8  /* GPIO Pin Interface Register */
 
 #define BA0_SPMC                0x03ec  /* Serial Port Power Management Control (& ASDIN2 enable) */
@@ -1461,6 +1464,11 @@ static int snd_cs4281_chip_init(cs4281_t *chip)
         int timeout;
         int retry_count = 2;
 
+        /* Having EPPMC.FPDN=1 prevent proper chip initialisation */
+        tmp = snd_cs4281_peekBA0(chip, BA0_EPPMC);
+        if (tmp & BA0_EPPMC_FPDN)
+                snd_cs4281_pokeBA0(chip, BA0_EPPMC, tmp & ~BA0_EPPMC_FPDN);
+
       __retry:
         tmp = snd_cs4281_peekBA0(chip, BA0_CFLR);
         if (tmp != BA0_CFLR_DEFAULT) {
@@ -2124,7 +2132,7 @@ static struct pci_driver driver = {
         
 static int __init alsa_card_cs4281_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_cs4281_exit(void)
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index 25d6466a867c..db212ecd792a 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -171,7 +171,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_cs46xx_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_cs46xx_exit(void)
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 5f2ffb7efa06..fd4c50c88bc9 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -1295,8 +1295,7 @@ static snd_pcm_hw_constraint_list_t hw_constraints_period_sizes = {
 
 static void snd_cs46xx_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        cs46xx_pcm_t * cpcm = runtime->private_data;
-        kfree(cpcm);
+        kfree(runtime->private_data);
 }
 
 static int _cs46xx_playback_open_channel (snd_pcm_substream_t * substream,int pcm_channel_id)
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 6446afe19d80..2085a998eaeb 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -228,7 +228,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_emu10k1_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_emu10k1_exit(void)
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index c3c96f9f2c7f..a341e758acde 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -170,7 +170,7 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                         SPCS_GENERATIONSTATUS | 0x00001200 |
                         0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
 
-        if (emu->audigy && emu->revision == 4) { /* audigy2 */
+        if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
                 /* Hacks for Alice3 to work independent of haP16V driver */
                 u32 tmp;
 
@@ -189,7 +189,7 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                 /* Enabled Phased (8-channel) P16V playback */
                 outl(0x0201, emu->port + HCFG2);
                 /* Set playback routing. */
-                snd_emu10k1_ptr_write(emu, CAPTURE_P16V_SOURCE, 0, 78e4);
+                snd_emu10k1_ptr20_write(emu, CAPTURE_P16V_SOURCE, 0, 0x78e4);
         }
         if (emu->audigy && (emu->serial == 0x10011102) ) { /* audigy2 Value */
                 /* Hacks for Alice3 to work independent of haP16V driver */
@@ -600,7 +600,7 @@ static int snd_emu10k1_free(emu10k1_t *emu)
         if (emu->port)
                 pci_release_regions(emu->pci);
         pci_disable_device(emu->pci);
-        if (emu->audigy && emu->revision == 4) /* P16V */       
+        if (emu->card_capabilities->ca0151_chip) /* P16V */     
                 snd_p16v_free(emu);
         kfree(emu);
         return 0;
@@ -612,21 +612,24 @@ static int snd_emu10k1_dev_free(snd_device_t *device)
         return snd_emu10k1_free(emu);
 }
 
-/* vendor, device, subsystem, emu10k1_chip, emu10k2_chip, ca0102_chip, ca0108_chip, ca0151_chip, spk71, spdif_bug, ac97_chip, ecard, driver, name */
-
 static emu_chip_details_t emu_chip_details[] = {
         /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
          .driver = "Audigy2", .name = "Audigy 2 Value [SB0400]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
-         .spk71 = 1} ,
+         .spk71 = 1,
+         .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0008, 
          .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
-         .ca0108_chip = 1} ,
+         .ca0108_chip = 1,
+         .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
          .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ca0151_chip = 1,
@@ -635,6 +638,7 @@ static emu_chip_details_t emu_chip_details[] = {
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
          .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ca0151_chip = 1,
@@ -643,6 +647,7 @@ static emu_chip_details_t emu_chip_details[] = {
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
          .driver = "Audigy2", .name = "Audigy 2 ZS [2001]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ca0151_chip = 1,
@@ -651,6 +656,7 @@ static emu_chip_details_t emu_chip_details[] = {
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10071102,
          .driver = "Audigy2", .name = "Audigy 2 [SB0240]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ca0151_chip = 1,
@@ -659,35 +665,165 @@ static emu_chip_details_t emu_chip_details[] = {
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
          .driver = "Audigy2", .name = "Audigy 2 EX [1005]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ca0151_chip = 1,
          .spdif_bug = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
          .driver = "Audigy2", .name = "Audigy 2 Platinum [SB0240P]", 
+         .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ca0151_chip = 1,
          .spk71 = 1,
          .spdif_bug = 1,
          .ac97_chip = 1} ,
+        {.vendor = 0x1102, .device = 0x0004, .revision = 0x04,
+         .driver = "Audigy2", .name = "Audigy 2 [Unknown]",
+         .id = "Audigy2",
+         .emu10k2_chip = 1,
+         .ca0102_chip = 1,
+         .ca0151_chip = 1,
+         .spdif_bug = 1,
+         .ac97_chip = 1} ,
+        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10020052,
+         .driver = "Audigy", .name = "Audigy 1 ES [SB0160]", 
+         .id = "Audigy",
+         .emu10k2_chip = 1,
+         .ca0102_chip = 1,
+         .spdif_bug = 1,
+         .ac97_chip = 1} ,
+        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102,
+         .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
+         .id = "Audigy",
+         .emu10k2_chip = 1,
+         .ca0102_chip = 1,
+         .ac97_chip = 1} ,
+        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102,
+         .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
+         .id = "Audigy",
+         .emu10k2_chip = 1,
+         .ca0102_chip = 1,
+         .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004,
-         .driver = "Audigy", .name = "Audigy 1 or 2 [Unknown]", 
+         .driver = "Audigy", .name = "Audigy 1 [Unknown]", 
+         .id = "Audigy",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
-         .spdif_bug = 1} ,
+         .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
          .driver = "EMU10K1", .name = "E-mu APS [4001]", 
+         .id = "APS",
          .emu10k1_chip = 1,
          .ecard = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
+         .driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
          .driver = "EMU10K1", .name = "SB Live 5.1", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
+         .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", 
+         .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
+         .driver = "EMU10K1", .name = "SBLive! [CT4620]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4670]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4780]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,
+         .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4830]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80311102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4831]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4850]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4870]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,
+         .driver = "EMU10K1", .name = "SBLive! Value [CT4871]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
+         .driver = "EMU10K1", .name = "SBLive! Value [SB0060]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,
+         .driver = "EMU10K1", .name = "SBLive! Value [SB0101]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,
+         .driver = "EMU10K1", .name = "SBLive! Value [SB0103]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,
+         .driver = "EMU10K1", .name = "SBLive! [SB0105]", 
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002,
          .driver = "EMU10K1", .name = "SB Live [Unknown]", 
+         .id = "Live",
          .emu10k1_chip = 1,
-         .ac97_chip = 1} ,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
         { } /* terminator */
 };
 
@@ -738,13 +874,15 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
         emu->revision = revision;
         pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);
         pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);
-        emu->card_type = EMU10K1_CARD_CREATIVE;
         snd_printdd("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model);
 
         for (c = emu_chip_details; c->vendor; c++) {
                 if (c->vendor == pci->vendor && c->device == pci->device) {
-                        if (c->subsystem == emu->serial) break;
-                        if (c->subsystem == 0) break;
+                        if (c->subsystem && c->subsystem != emu->serial)
+                                continue;
+                        if (c->revision && c->revision != emu->revision)
+                                continue;
+                        break;
                 }
         }
         if (c->vendor == 0) {
@@ -759,6 +897,23 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
         else
                 snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x\n", c->name, pci->vendor, pci->device, emu->serial);
         
+        if (!*card->id && c->id) {
+                int i, n = 0;
+                strlcpy(card->id, c->id, sizeof(card->id));
+                for (;;) {
+                        for (i = 0; i < snd_ecards_limit; i++) {
+                                if (snd_cards[i] && !strcmp(snd_cards[i]->id, card->id))
+                                        break;
+                        }
+                        if (i >= snd_ecards_limit)
+                                break;
+                        n++;
+                        if (n >= SNDRV_CARDS)
+                                break;
+                        snprintf(card->id, sizeof(card->id), "%s_%d", c->id, n);
+                }
+        }
+
         is_audigy = emu->audigy = c->emu10k2_chip;
 
         /* set the DMA transfer mask */
@@ -816,15 +971,6 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
 
         pci_set_master(pci);
 
-        if (c->ecard) {
-                emu->card_type = EMU10K1_CARD_EMUAPS;
-                emu->APS = 1;
-        }
-        if (! c->ac97_chip)
-                emu->no_ac97 = 1;
-        
-        emu->spk71 = c->spk71;
-        
         emu->fx8010.fxbus_mask = 0x303f;
         if (extin_mask == 0)
                 extin_mask = 0x3fcf;
@@ -833,7 +979,7 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
         emu->fx8010.extin_mask = extin_mask;
         emu->fx8010.extout_mask = extout_mask;
 
-        if (emu->APS) {
+        if (emu->card_capabilities->ecard) {
                 if ((err = snd_emu10k1_ecard_init(emu)) < 0) {
                         snd_emu10k1_free(emu);
                         return err;
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 27dfd8ddddf4..e90c5ddd1d17 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -361,10 +361,7 @@ static void snd_emu10k1x_gpio_write(emu10k1x_t *emu, unsigned int value)
 
 static void snd_emu10k1x_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        emu10k1x_pcm_t *epcm = runtime->private_data;
-  
-        if (epcm)
-                kfree(epcm);
+        kfree(runtime->private_data);
 }
 
 static void snd_emu10k1x_pcm_interrupt(emu10k1x_t *emu, emu10k1x_voice_t *voice)
@@ -1075,6 +1072,7 @@ static int __devinit snd_emu10k1x_proc_init(emu10k1x_t * emu)
                 snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1x_proc_reg_read);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_emu10k1x_proc_reg_write;
+                entry->mode |= S_IWUSR;
                 entry->private_data = emu;
         }
         
@@ -1627,7 +1625,7 @@ static int __init alsa_card_emu10k1x_init(void)
 {
         int err;
 
-        if ((err = pci_module_init(&driver)) > 0)
+        if ((err = pci_register_driver(&driver)) > 0)
                 return err;
 
         return 0;
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index b9fa2e887fee..0529fb281125 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -1077,7 +1077,7 @@ static int __devinit _snd_emu10k1_audigy_init_efx(emu10k1_t *emu)
         gpr += 2;
         
         /* PCM Side Playback (independent from stereo mix) */
-        if (emu->spk71) {
+        if (emu->card_capabilities->spk71) {
                 A_OP(icode, &ptr, iMAC0, A_GPR(playback+6), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_SIDE));
                 A_OP(icode, &ptr, iMAC0, A_GPR(playback+7), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_SIDE));
                 snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Side Playback Volume", gpr, 100);
@@ -1145,14 +1145,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
         A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);
         A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_SPDIF_CD_R);
         snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->no_ac97 ? "CD Playback Volume" : "Audigy CD Playback Volume",
+                                        emu->card_capabilities->ac97_chip ? "Audigy CD Playback Volume" : "CD Playback Volume",
                                         gpr, 0);
         gpr += 2;
         /* Audigy CD Capture Volume */
         A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_SPDIF_CD_L);
         A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_SPDIF_CD_R);
         snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->no_ac97 ? "CD Capture Volume" : "Audigy CD Capture Volume",
+                                        emu->card_capabilities->ac97_chip ? "Audigy CD Capture Volume" : "CD Capture Volume",
                                         gpr, 0);
         gpr += 2;
 
@@ -1171,14 +1171,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
         A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_LINE2_L);
         A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_LINE2_R);
         snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->no_ac97 ? "Line Playback Volume" : "Line2 Playback Volume",
+                                        emu->card_capabilities->ac97_chip ? "Line2 Playback Volume" : "Line Playback Volume",
                                         gpr, 0);
         gpr += 2;
         /* Line2 Capture Volume */
         A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_LINE2_L);
         A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_LINE2_R);
         snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->no_ac97 ? "Line Capture Volume" : "Line2 Capture Volume",
+                                        emu->card_capabilities->ac97_chip ? "Line2 Capture Volume" : "Line Capture Volume",
                                         gpr, 0);
         gpr += 2;
         
@@ -1197,14 +1197,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
         A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AUX2_L);
         A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AUX2_R);
         snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->no_ac97 ? "Aux Playback Volume" : "Aux2 Playback Volume",
+                                        emu->card_capabilities->ac97_chip ? "Aux2 Playback Volume" : "Aux Playback Volume",
                                         gpr, 0);
         gpr += 2;
         /* Aux2 Capture Volume */
         A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AUX2_L);
         A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AUX2_R);
         snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->no_ac97 ? "Aux Capture Volume" : "Aux2 Capture Volume",
+                                        emu->card_capabilities->ac97_chip ? "Aux2 Capture Volume" : "Aux Capture Volume",
                                         gpr, 0);
         gpr += 2;
         
@@ -1232,7 +1232,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
         snd_emu10k1_init_mono_control(&controls[nctl++], "LFE Playback Volume", gpr, 0);
         gpr++;
         
-        if (emu->spk71) {
+        if (emu->card_capabilities->spk71) {
                 /* Stereo Mix Side Playback */
                 A_OP(icode, &ptr, iMAC0, A_GPR(playback+6), A_GPR(playback+6), A_GPR(gpr), A_GPR(stereo_mix));
                 A_OP(icode, &ptr, iMAC0, A_GPR(playback+7), A_GPR(playback+7), A_GPR(gpr+1), A_GPR(stereo_mix+1));
@@ -1266,7 +1266,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
         A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 3), A_GPR(playback + 3), A_C_00000000, A_C_00000000); /* rear right */
         A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), A_GPR(playback + 4), A_C_00000000, A_C_00000000); /* center */
         A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), A_GPR(playback + 5), A_C_00000000, A_C_00000000); /* LFE */
-        if (emu->spk71) {
+        if (emu->card_capabilities->spk71) {
                 A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 6), A_GPR(playback + 6), A_C_00000000, A_C_00000000); /* side left */
                 A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 7), A_GPR(playback + 7), A_C_00000000, A_C_00000000); /* side right */
         }
@@ -1359,7 +1359,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
         A_PUT_STEREO_OUTPUT(A_EXTOUT_AREAR_L, A_EXTOUT_AREAR_R, playback+2 + SND_EMU10K1_PLAYBACK_CHANNELS);
         A_PUT_OUTPUT(A_EXTOUT_ACENTER, playback+4 + SND_EMU10K1_PLAYBACK_CHANNELS);
         A_PUT_OUTPUT(A_EXTOUT_ALFE, playback+5 + SND_EMU10K1_PLAYBACK_CHANNELS);
-        if (emu->spk71)
+        if (emu->card_capabilities->spk71)
                 A_PUT_STEREO_OUTPUT(A_EXTOUT_ASIDE_L, A_EXTOUT_ASIDE_R, playback+6 + SND_EMU10K1_PLAYBACK_CHANNELS);
 
         /* headphone */
@@ -1982,22 +1982,27 @@ static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu)
                 OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_MIC_CAP), GPR(capture + 2), C_00000000, C_00000000);
 
         /* EFX capture - capture the 16 EXTINS */
-        OP(icode, &ptr, iACC3, FXBUS2(14), C_00000000, C_00000000, EXTIN(0));
-        OP(icode, &ptr, iACC3, FXBUS2(15), C_00000000, C_00000000, EXTIN(1));
-        OP(icode, &ptr, iACC3, FXBUS2(0), C_00000000, C_00000000, EXTIN(2));
-        OP(icode, &ptr, iACC3, FXBUS2(3), C_00000000, C_00000000, EXTIN(3));
-        /* Dont connect anything to FXBUS2 1 and 2.  These are shared with 
-         * Center/LFE on the SBLive 5.1.  The kX driver only changes the 
-         * routing when it detects an SBLive 5.1.
-         *
-         * Since only 14 of the 16 EXTINs are used, this is not a big problem.  
-         * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture 
-         * 0 and 3, then the rest of the EXTINs to the corresponding FX capture 
-         * channel.
-         */
-        for (z = 4; z < 14; z++) {
-                OP(icode, &ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z));
+        if (emu->card_capabilities->sblive51) {
+                /* On the Live! 5.1, FXBUS2(1) and FXBUS(2) are shared with EXTOUT_ACENTER
+                 * and EXTOUT_ALFE, so we can't connect inputs to them for multitrack recording.
+                 *
+                 * Since only 14 of the 16 EXTINs are used, this is not a big problem.  
+                 * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture 
+                 * 0 and 3, then the rest of the EXTINs to the corresponding FX capture 
+                 * channel.  Multitrack recorders will still see the center/lfe output signal 
+                 * on the second and third channels.
+                 */
+                OP(icode, &ptr, iACC3, FXBUS2(14), C_00000000, C_00000000, EXTIN(0));
+                OP(icode, &ptr, iACC3, FXBUS2(15), C_00000000, C_00000000, EXTIN(1));
+                OP(icode, &ptr, iACC3, FXBUS2(0), C_00000000, C_00000000, EXTIN(2));
+                OP(icode, &ptr, iACC3, FXBUS2(3), C_00000000, C_00000000, EXTIN(3));
+                for (z = 4; z < 14; z++)
+                        OP(icode, &ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z));
+        } else {
+                for (z = 0; z < 16; z++)
+                        OP(icode, &ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z));
         }
+            
 
         if (gpr > tmp) {
                 snd_BUG();
@@ -2128,7 +2133,6 @@ static int snd_emu10k1_fx8010_info(emu10k1_t *emu, emu10k1_fx8010_info_t *info)
         int res;
 
         memset(info, 0, sizeof(info));
-        info->card = emu->card_type;
         info->internal_tram_size = emu->fx8010.itram_size;
         info->external_tram_size = emu->fx8010.etram_pages.bytes / 2;
         fxbus = fxbuses;
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 044663d31aa7..6be82c5fe138 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -68,6 +68,7 @@ static int snd_emu10k1_spdif_get_mask(snd_kcontrol_t * kcontrol,
         return 0;
 }
 
+#if 0
 static int snd_audigy_spdif_output_rate_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
         static char *texts[] = {"44100", "48000", "96000"};
@@ -152,6 +153,7 @@ static snd_kcontrol_new_t snd_audigy_spdif_output_rate =
         .get =          snd_audigy_spdif_output_rate_get,
         .put =          snd_audigy_spdif_output_rate_put
 };
+#endif
 
 static int snd_emu10k1_spdif_put(snd_kcontrol_t * kcontrol,
                                  snd_ctl_elem_value_t * ucontrol)
@@ -791,7 +793,7 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                 NULL
         };
 
-        if (!emu->no_ac97) {
+        if (emu->card_capabilities->ac97_chip) {
                 ac97_bus_t *pbus;
                 ac97_template_t ac97;
                 static ac97_bus_ops_t ops = {
@@ -833,7 +835,7 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                 for (; *c; c++)
                         remove_ctl(card, *c);
         } else {
-                if (emu->APS)
+                if (emu->card_capabilities->ecard)
                         strcpy(emu->card->mixername, "EMU APS");
                 else if (emu->audigy)
                         strcpy(emu->card->mixername, "SB Audigy");
@@ -918,7 +920,7 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                 mix->attn[0] = 0xffff;
         }
         
-        if (! emu->APS) { /* FIXME: APS has these controls? */
+        if (! emu->card_capabilities->ecard) { /* FIXME: APS has these controls? */
                 /* sb live! and audigy */
                 if ((kctl = snd_ctl_new1(&snd_emu10k1_spdif_mask_control, emu)) == NULL)
                         return -ENOMEM;
@@ -935,18 +937,20 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
                         return -ENOMEM;
                 if ((err = snd_ctl_add(card, kctl)))
                         return err;
+#if 0
                 if ((kctl = snd_ctl_new1(&snd_audigy_spdif_output_rate, emu)) == NULL)
                         return -ENOMEM;
                 if ((err = snd_ctl_add(card, kctl)))
                         return err;
-        } else if (! emu->APS) {
+#endif
+        } else if (! emu->card_capabilities->ecard) {
                 /* sb live! */
                 if ((kctl = snd_ctl_new1(&snd_emu10k1_shared_spdif, emu)) == NULL)
                         return -ENOMEM;
                 if ((err = snd_ctl_add(card, kctl)))
                         return err;
         }
-        if (emu->audigy && emu->revision == 4) { /* P16V */
+        if (emu->card_capabilities->ca0151_chip) { /* P16V */
                 if ((err = snd_p16v_mixer(emu)))
                         return err;
         }
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index d1c2a02c486b..520b99af5f55 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -262,7 +262,7 @@ static unsigned int emu10k1_select_interprom(unsigned int pitch_target)
  *
  * returns: cache invalidate size in samples
  */
-static int inline emu10k1_ccis(int stereo, int w_16)
+static inline int emu10k1_ccis(int stereo, int w_16)
 {
         if (w_16) {
                 return stereo ? 24 : 26;
@@ -991,9 +991,7 @@ static void snd_emu10k1_pcm_efx_mixer_notify(emu10k1_t *emu, int idx, int activa
 
 static void snd_emu10k1_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        emu10k1_pcm_t *epcm = runtime->private_data;
-
-        kfree(epcm);
+        kfree(runtime->private_data);
 }
 
 static int snd_emu10k1_efx_playback_close(snd_pcm_substream_t * substream)
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index d990d5eb45a8..cc22707c91fa 100644
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <sound/core.h>
 #include <sound/emu10k1.h>
+#include "p16v.h"
 
 static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
                                           snd_info_buffer_t * buffer,
@@ -44,28 +45,34 @@ static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
         unsigned int status, rate = 0;
         
         status = snd_emu10k1_ptr_read(emu, status_reg, 0);
-        if (rate_reg > 0)
-                rate = snd_emu10k1_ptr_read(emu, rate_reg, 0);
 
         snd_iprintf(buffer, "\n%s\n", title);
 
-        snd_iprintf(buffer, "Professional Mode     : %s\n", (status & SPCS_PROFESSIONAL) ? "yes" : "no");
-        snd_iprintf(buffer, "Not Audio Data        : %s\n", (status & SPCS_NOTAUDIODATA) ? "yes" : "no");
-        snd_iprintf(buffer, "Copyright             : %s\n", (status & SPCS_COPYRIGHT) ? "yes" : "no");
-        snd_iprintf(buffer, "Emphasis              : %s\n", emphasis[(status & SPCS_EMPHASISMASK) >> 3]);
-        snd_iprintf(buffer, "Mode                  : %i\n", (status & SPCS_MODEMASK) >> 6);
-        snd_iprintf(buffer, "Category Code         : 0x%x\n", (status & SPCS_CATEGORYCODEMASK) >> 8);
-        snd_iprintf(buffer, "Generation Status     : %s\n", status & SPCS_GENERATIONSTATUS ? "original" : "copy");
-        snd_iprintf(buffer, "Source Mask           : %i\n", (status & SPCS_SOURCENUMMASK) >> 16);
-        snd_iprintf(buffer, "Channel Number        : %s\n", channel[(status & SPCS_CHANNELNUMMASK) >> 20]);
-        snd_iprintf(buffer, "Sample Rate           : %iHz\n", samplerate[(status & SPCS_SAMPLERATEMASK) >> 24]);
-        snd_iprintf(buffer, "Clock Accuracy        : %s\n", clkaccy[(status & SPCS_CLKACCYMASK) >> 28]);
-
-        if (rate_reg > 0) {
-                snd_iprintf(buffer, "S/PDIF Locked         : %s\n", rate & SRCS_SPDIFLOCKED ? "on" : "off");
-                snd_iprintf(buffer, "Rate Locked           : %s\n", rate & SRCS_RATELOCKED ? "on" : "off");
-                snd_iprintf(buffer, "Estimated Sample Rate : 0x%x\n", rate & SRCS_ESTSAMPLERATE);
+        if (status != 0xffffffff) {
+                snd_iprintf(buffer, "Professional Mode     : %s\n", (status & SPCS_PROFESSIONAL) ? "yes" : "no");
+                snd_iprintf(buffer, "Not Audio Data        : %s\n", (status & SPCS_NOTAUDIODATA) ? "yes" : "no");
+                snd_iprintf(buffer, "Copyright             : %s\n", (status & SPCS_COPYRIGHT) ? "yes" : "no");
+                snd_iprintf(buffer, "Emphasis              : %s\n", emphasis[(status & SPCS_EMPHASISMASK) >> 3]);
+                snd_iprintf(buffer, "Mode                  : %i\n", (status & SPCS_MODEMASK) >> 6);
+                snd_iprintf(buffer, "Category Code         : 0x%x\n", (status & SPCS_CATEGORYCODEMASK) >> 8);
+                snd_iprintf(buffer, "Generation Status     : %s\n", status & SPCS_GENERATIONSTATUS ? "original" : "copy");
+                snd_iprintf(buffer, "Source Mask           : %i\n", (status & SPCS_SOURCENUMMASK) >> 16);
+                snd_iprintf(buffer, "Channel Number        : %s\n", channel[(status & SPCS_CHANNELNUMMASK) >> 20]);
+                snd_iprintf(buffer, "Sample Rate           : %iHz\n", samplerate[(status & SPCS_SAMPLERATEMASK) >> 24]);
+                snd_iprintf(buffer, "Clock Accuracy        : %s\n", clkaccy[(status & SPCS_CLKACCYMASK) >> 28]);
+
+                if (rate_reg > 0) {
+                        rate = snd_emu10k1_ptr_read(emu, rate_reg, 0);
+                        snd_iprintf(buffer, "S/PDIF Valid          : %s\n", rate & SRCS_SPDIFVALID ? "on" : "off");
+                        snd_iprintf(buffer, "S/PDIF Locked         : %s\n", rate & SRCS_SPDIFLOCKED ? "on" : "off");
+                        snd_iprintf(buffer, "Rate Locked           : %s\n", rate & SRCS_RATELOCKED ? "on" : "off");
+                        /* From ((Rate * 48000 ) / 262144); */
+                        snd_iprintf(buffer, "Estimated Sample Rate : %d\n", ((rate & 0xFFFFF ) * 375) >> 11); 
+                }
+        } else {
+                snd_iprintf(buffer, "No signal detected.\n");
         }
+
 }
 
 static void snd_emu10k1_proc_read(snd_info_entry_t *entry, 
@@ -182,7 +189,7 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
         
         snd_iprintf(buffer, "EMU10K1\n\n");
         snd_iprintf(buffer, "Card                  : %s\n",
-                    emu->audigy ? "Audigy" : (emu->APS ? "EMU APS" : "Creative"));
+                    emu->audigy ? "Audigy" : (emu->card_capabilities->ecard ? "EMU APS" : "Creative"));
         snd_iprintf(buffer, "Internal TRAM (words) : 0x%x\n", emu->fx8010.itram_size);
         snd_iprintf(buffer, "External TRAM (words) : 0x%x\n", (int)emu->fx8010.etram_pages.bytes / 2);
         snd_iprintf(buffer, "\n");
@@ -223,15 +230,35 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
         snd_iprintf(buffer, "\nAll FX Outputs        :\n");
         for (idx = 0; idx < (emu->audigy ? 64 : 32); idx++)
                 snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx]);
-        snd_emu10k1_proc_spdif_status(emu, buffer, "S/PDIF Output 0", SPCS0, -1);
-        snd_emu10k1_proc_spdif_status(emu, buffer, "S/PDIF Output 1", SPCS1, -1);
-        snd_emu10k1_proc_spdif_status(emu, buffer, "S/PDIF Output 2/3", SPCS2, -1);
-        snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF", CDCS, CDSRCS);
-        snd_emu10k1_proc_spdif_status(emu, buffer, "General purpose S/PDIF", GPSCS, GPSRCS);
+}
+
+static void snd_emu10k1_proc_spdif_read(snd_info_entry_t *entry, 
+                                  snd_info_buffer_t * buffer)
+{
+        emu10k1_t *emu = entry->private_data;
+        snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
+        snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
+#if 0
         val = snd_emu10k1_ptr_read(emu, ZVSRCS, 0);
         snd_iprintf(buffer, "\nZoomed Video\n");
         snd_iprintf(buffer, "Rate Locked           : %s\n", val & SRCS_RATELOCKED ? "on" : "off");
         snd_iprintf(buffer, "Estimated Sample Rate : 0x%x\n", val & SRCS_ESTSAMPLERATE);
+#endif
+}
+
+static void snd_emu10k1_proc_rates_read(snd_info_entry_t *entry, 
+                                  snd_info_buffer_t * buffer)
+{
+        static int samplerate[8] = { 44100, 48000, 96000, 192000, 4, 5, 6, 7 };
+        emu10k1_t *emu = entry->private_data;
+        unsigned int val, tmp, n;
+        val = snd_emu10k1_ptr20_read(emu, CAPTURE_RATE_STATUS, 0);
+        tmp = (val >> 16) & 0x8;
+        for (n=0;n<4;n++) {
+                tmp = val >> (16 + (n*4));
+                if (tmp & 0x8) snd_iprintf(buffer, "Channel %d: Rate=%d\n", n, samplerate[tmp & 0x7]);
+                else snd_iprintf(buffer, "Channel %d: No input\n", n);
+        }
 }
 
 static void snd_emu10k1_proc_acode_read(snd_info_entry_t *entry, 
@@ -500,32 +527,46 @@ int __devinit snd_emu10k1_proc_init(emu10k1_t * emu)
                 snd_info_set_text_ops(entry, emu, 1024, snd_emu_proc_io_reg_read);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_emu_proc_io_reg_write;
+                entry->mode |= S_IWUSR;
         }
         if (! snd_card_proc_new(emu->card, "ptr_regs00a", &entry)) {
                 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read00a);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_emu_proc_ptr_reg_write00;
+                entry->mode |= S_IWUSR;
         }
         if (! snd_card_proc_new(emu->card, "ptr_regs00b", &entry)) {
                 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read00b);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_emu_proc_ptr_reg_write00;
+                entry->mode |= S_IWUSR;
         }
         if (! snd_card_proc_new(emu->card, "ptr_regs20a", &entry)) {
                 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read20a);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_emu_proc_ptr_reg_write20;
+                entry->mode |= S_IWUSR;
         }
         if (! snd_card_proc_new(emu->card, "ptr_regs20b", &entry)) {
                 snd_info_set_text_ops(entry, emu, 65536, snd_emu_proc_ptr_reg_read20b);
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_emu_proc_ptr_reg_write20;
+                entry->mode |= S_IWUSR;
         }
 #endif
         
         if (! snd_card_proc_new(emu->card, "emu10k1", &entry))
                 snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_read);
 
+        if (emu->card_capabilities->emu10k2_chip) {
+                if (! snd_card_proc_new(emu->card, "spdif-in", &entry))
+                        snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_spdif_read);
+        }
+        if (emu->card_capabilities->ca0151_chip) {
+                if (! snd_card_proc_new(emu->card, "capture-rates", &entry))
+                        snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_rates_read);
+        }
+
         if (! snd_card_proc_new(emu->card, "voices", &entry))
                 snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_voices_read);
 
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index b81a7cafff39..cd8460d56752 100644
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -37,7 +37,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
         int handled = 0;
 
         while ((status = inl(emu->port + IPR)) != 0) {
-                // printk("irq - status = 0x%x\n", status);
+                //printk("emu10k1 irq - status = 0x%x\n", status);
                 orig_status = status;
                 handled = 1;
                 if (status & IPR_PCIERROR) {
@@ -147,9 +147,36 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                 snd_emu10k1_intr_disable(emu, INTE_FXDSPENABLE);
                         status &= ~IPR_FXDSP;
                 }
+                if (status & IPR_P16V) {
+                        while ((status2 = inl(emu->port + IPR2)) != 0) {
+                                u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
+                                emu10k1_voice_t *pvoice = &(emu->p16v_voices[0]);
+                                emu10k1_voice_t *cvoice = &(emu->p16v_capture_voice);
+
+                                //printk(KERN_INFO "status2=0x%x\n", status2);
+                                orig_status2 = status2;
+                                if(status2 & mask) {
+                                        if(pvoice->use) {
+                                                snd_pcm_period_elapsed(pvoice->epcm->substream);
+                                        } else { 
+                                                snd_printk(KERN_ERR "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n", status2, mask, pvoice, pvoice->use);
+                                        }
+                                }
+                                if(status2 & 0x110000) {
+                                        //printk(KERN_INFO "capture int found\n");
+                                        if(cvoice->use) {
+                                                //printk(KERN_INFO "capture period_elapsed\n");
+                                                snd_pcm_period_elapsed(cvoice->epcm->substream);
+                                        }
+                                }
+                                outl(orig_status2, emu->port + IPR2); /* ack all */
+                        }
+                        status &= ~IPR_P16V;
+                }
+
                 if (status) {
                         unsigned int bits;
-                        //snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 0x%08x\n", status);
+                        snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 0x%08x\n", status);
                         //make sure any interrupts we don't handle are disabled:
                         bits = INTE_FXDSPENABLE |
                                 INTE_PCIERRORENABLE |
@@ -170,20 +197,5 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 }
                 outl(orig_status, emu->port + IPR); /* ack all */
         }
-        if (emu->audigy && emu->revision == 4) { /* P16V */     
-                while ((status2 = inl(emu->port + IPR2)) != 0) {
-                        u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
-                        emu10k1_voice_t *pvoice = &(emu->p16v_voices[0]);
-                        orig_status2 = status2;
-                        if(status2 & mask) {
-                                if(pvoice->use) {
-                                        snd_pcm_period_elapsed(pvoice->epcm->substream);
-                                } else { 
-                                        snd_printk(KERN_ERR "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n", status2, mask, pvoice, pvoice->use);
-                                }
-                        }
-                        outl(orig_status2, emu->port + IPR2); /* ack all */
-                }
-        }
         return IRQ_RETVAL(handled);
 }
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index d03cb2fefc9e..98f980189892 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver p16v chips
- *  Version: 0.22
+ *  Version: 0.25
  *
  *  FEATURES currently supported:
  *    Output fixed at S32_LE, 2 channel to hw:0,0
@@ -41,7 +41,15 @@
  *    Integrated with snd-emu10k1 driver.
  *  0.22
  *    Removed #if 0 ... #endif
- *
+ *  0.23
+ *    Implement different capture rates.
+ *  0.24
+ *    Implement different capture source channels.
+ *    e.g. When HD Capture source is set to SPDIF,
+ *    setting HD Capture channel to 0 captures from CDROM digital input.
+ *    setting HD Capture channel to 1 captures from SPDIF in.
+ *  0.25
+ *    Include capture buffer sizes.
  *
  *  BUGS:
  *    Some stability problems when unloading the snd-p16v kernel module.
@@ -119,22 +127,41 @@ static snd_pcm_hardware_t snd_p16v_playback_hw = {
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID),
         .formats =              SNDRV_PCM_FMTBIT_S32_LE, /* Only supports 24-bit samples padded to 32 bits. */
-        .rates =                SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 ,
-        .rate_min =             48000,
+        .rates =                SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100, 
+        .rate_min =             44100,
         .rate_max =             192000,
         .channels_min =         8, 
         .channels_max =         8,
-        .buffer_bytes_max =     (32*1024),
+        .buffer_bytes_max =     ((65536 - 64) * 8),
         .period_bytes_min =     64,
-        .period_bytes_max =     (16*1024),
+        .period_bytes_max =     (65536 - 64),
         .periods_min =          2,
         .periods_max =          8,
         .fifo_size =            0,
 };
 
+static snd_pcm_hardware_t snd_p16v_capture_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP |
+                                 SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
+        .formats =              SNDRV_PCM_FMTBIT_S32_LE,
+        .rates =                SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100, 
+        .rate_min =             44100,
+        .rate_max =             192000,
+        .channels_min =         2,
+        .channels_max =         2,
+        .buffer_bytes_max =     (65536 - 64),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (65536 - 128) >> 1,  /* size has to be N*64 bytes */
+        .periods_min =          2,
+        .periods_max =          2,
+        .fifo_size =            0,
+};
+
 static void snd_p16v_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        snd_pcm_t *epcm = runtime->private_data;
+        emu10k1_pcm_t *epcm = runtime->private_data;
   
         if (epcm) {
                 //snd_printk("epcm free: %p\n", epcm);
@@ -178,15 +205,63 @@ static int snd_p16v_pcm_open_playback_channel(snd_pcm_substream_t *substream, in
 
         return 0;
 }
+/* open_capture callback */
+static int snd_p16v_pcm_open_capture_channel(snd_pcm_substream_t *substream, int channel_id)
+{
+        emu10k1_t *emu = snd_pcm_substream_chip(substream);
+        emu10k1_voice_t *channel = &(emu->p16v_capture_voice);
+        emu10k1_pcm_t *epcm;
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        int err;
+
+        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        //snd_printk("epcm kcalloc: %p\n", epcm);
+
+        if (epcm == NULL)
+                return -ENOMEM;
+        epcm->emu = emu;
+        epcm->substream = substream;
+        //snd_printk("epcm device=%d, channel_id=%d\n", substream->pcm->device, channel_id);
+
+        runtime->private_data = epcm;
+        runtime->private_free = snd_p16v_pcm_free_substream;
+  
+        runtime->hw = snd_p16v_capture_hw;
+
+        channel->emu = emu;
+        channel->number = channel_id;
+
+        channel->use=1;
+        //snd_printk("p16v: open channel_id=%d, channel=%p, use=0x%x\n", channel_id, channel, channel->use);
+        //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel);
+        //channel->interrupt = snd_p16v_pcm_channel_interrupt;
+        channel->epcm=epcm;
+        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+                return err;
+
+        return 0;
+}
+
 
 /* close callback */
 static int snd_p16v_pcm_close_playback(snd_pcm_substream_t *substream)
 {
         emu10k1_t *emu = snd_pcm_substream_chip(substream);
         //snd_pcm_runtime_t *runtime = substream->runtime;
-        //emu10k1_pcm_t *epcm = runtime->private_data;
-        emu->p16v_voices[substream->pcm->device - emu->p16v_device_offset].use=0;
-/* FIXME: maybe zero others */
+        //emu10k1_pcm_t *epcm = runtime->private_data;
+        emu->p16v_voices[substream->pcm->device - emu->p16v_device_offset].use=0;
+        /* FIXME: maybe zero others */
+        return 0;
+}
+
+/* close callback */
+static int snd_p16v_pcm_close_capture(snd_pcm_substream_t *substream)
+{
+        emu10k1_t *emu = snd_pcm_substream_chip(substream);
+        //snd_pcm_runtime_t *runtime = substream->runtime;
+        //emu10k1_pcm_t *epcm = runtime->private_data;
+        emu->p16v_capture_voice.use=0;
+        /* FIXME: maybe zero others */
         return 0;
 }
 
@@ -195,36 +270,55 @@ static int snd_p16v_pcm_open_playback_front(snd_pcm_substream_t *substream)
         return snd_p16v_pcm_open_playback_channel(substream, PCM_FRONT_CHANNEL);
 }
 
+static int snd_p16v_pcm_open_capture(snd_pcm_substream_t *substream)
+{
+        // Only using channel 0 for now, but the card has 2 channels.
+        return snd_p16v_pcm_open_capture_channel(substream, 0);
+}
+
 /* hw_params callback */
 static int snd_p16v_pcm_hw_params_playback(snd_pcm_substream_t *substream,
                                       snd_pcm_hw_params_t * hw_params)
 {
         int result;
-        //snd_printk("hw_params alloc: substream=%p\n", substream);
         result = snd_pcm_lib_malloc_pages(substream,
                                         params_buffer_bytes(hw_params));
-        //snd_printk("hw_params alloc: result=%d\n", result);
-        //dump_stack();
         return result;
 }
 
+/* hw_params callback */
+static int snd_p16v_pcm_hw_params_capture(snd_pcm_substream_t *substream,
+                                      snd_pcm_hw_params_t * hw_params)
+{
+        int result;
+        result = snd_pcm_lib_malloc_pages(substream,
+                                        params_buffer_bytes(hw_params));
+        return result;
+}
+
+
 /* hw_free callback */
 static int snd_p16v_pcm_hw_free_playback(snd_pcm_substream_t *substream)
 {
         int result;
-        //snd_printk("hw_params free: substream=%p\n", substream);
         result = snd_pcm_lib_free_pages(substream);
-        //snd_printk("hw_params free: result=%d\n", result);
-        //dump_stack();
         return result;
 }
 
+/* hw_free callback */
+static int snd_p16v_pcm_hw_free_capture(snd_pcm_substream_t *substream)
+{
+        int result;
+        result = snd_pcm_lib_free_pages(substream);
+        return result;
+}
+
+
 /* prepare playback callback */
 static int snd_p16v_pcm_prepare_playback(snd_pcm_substream_t *substream)
 {
         emu10k1_t *emu = snd_pcm_substream_chip(substream);
         snd_pcm_runtime_t *runtime = substream->runtime;
-        //emu10k1_pcm_t *epcm = runtime->private_data;
         int channel = substream->pcm->device - emu->p16v_device_offset;
         u32 *table_base = (u32 *)(emu->p16v_buffer.area+(8*16*channel));
         u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size);
@@ -237,23 +331,21 @@ static int snd_p16v_pcm_prepare_playback(snd_pcm_substream_t *substream)
         tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);
         switch (runtime->rate) {
         case 44100:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe000) | 0x8000); /* FIXME: This will change the capture rate as well! */
-          break;
-        case 48000:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe000) | 0x0000); /* FIXME: This will change the capture rate as well! */
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x8080);
           break;
         case 96000:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe000) | 0x4000); /* FIXME: This will change the capture rate as well! */
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x4040);
           break;
         case 192000:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe000) | 0x2000); /* FIXME: This will change the capture rate as well! */
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x2020);
           break;
+        case 48000:
         default:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, 0x0000); /* FIXME: This will change the capture rate as well! */
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x0000);
           break;
         }
         /* FIXME: Check emu->buffer.size before actually writing to it. */
-        for(i=0; i < runtime->periods; i++) {
+        for(i=0; i < runtime->periods; i++) {
                 table_base[i*2]=runtime->dma_addr+(i*period_size_bytes);
                 table_base[(i*2)+1]=period_size_bytes<<16;
         }
@@ -262,7 +354,8 @@ static int snd_p16v_pcm_prepare_playback(snd_pcm_substream_t *substream)
         snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_SIZE, channel, (runtime->periods - 1) << 19);
         snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_PTR, channel, 0);
         snd_emu10k1_ptr20_write(emu, PLAYBACK_DMA_ADDR, channel, runtime->dma_addr);
-        snd_emu10k1_ptr20_write(emu, PLAYBACK_PERIOD_SIZE, channel, frames_to_bytes(runtime, runtime->period_size)<<16); // buffer size in bytes
+        //snd_emu10k1_ptr20_write(emu, PLAYBACK_PERIOD_SIZE, channel, frames_to_bytes(runtime, runtime->period_size)<<16); // buffer size in bytes
+        snd_emu10k1_ptr20_write(emu, PLAYBACK_PERIOD_SIZE, channel, 0); // buffer size in bytes
         snd_emu10k1_ptr20_write(emu, PLAYBACK_POINTER, channel, 0);
         snd_emu10k1_ptr20_write(emu, 0x07, channel, 0x0);
         snd_emu10k1_ptr20_write(emu, 0x08, channel, 0);
@@ -270,6 +363,41 @@ static int snd_p16v_pcm_prepare_playback(snd_pcm_substream_t *substream)
         return 0;
 }
 
+/* prepare capture callback */
+static int snd_p16v_pcm_prepare_capture(snd_pcm_substream_t *substream)
+{
+        emu10k1_t *emu = snd_pcm_substream_chip(substream);
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        int channel = substream->pcm->device - emu->p16v_device_offset;
+        u32 tmp;
+        //printk("prepare capture:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size,  frames_to_bytes(runtime, 1));
+        tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);
+        switch (runtime->rate) {
+        case 44100:
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0800);
+          break;
+        case 96000:
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0400);
+          break;
+        case 192000:
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0200);
+          break;
+        case 48000:
+        default:
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0000);
+          break;
+        }
+        /* FIXME: Check emu->buffer.size before actually writing to it. */
+        snd_emu10k1_ptr20_write(emu, 0x13, channel, 0);
+        snd_emu10k1_ptr20_write(emu, CAPTURE_DMA_ADDR, channel, runtime->dma_addr);
+        snd_emu10k1_ptr20_write(emu, CAPTURE_BUFFER_SIZE, channel, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes
+        snd_emu10k1_ptr20_write(emu, CAPTURE_POINTER, channel, 0);
+        //snd_emu10k1_ptr20_write(emu, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC or Line in */
+        //snd_emu10k1_ptr20_write(emu, EXTENDED_INT_MASK, 0, snd_emu10k1_ptr20_read(emu, EXTENDED_INT_MASK, 0) | (0x110000<<channel));
+
+        return 0;
+}
+
 static void snd_p16v_intr_enable(emu10k1_t *emu, unsigned int intrenb)
 {
         unsigned long flags;
@@ -345,6 +473,36 @@ static int snd_p16v_pcm_trigger_playback(snd_pcm_substream_t *substream,
         return result;
 }
 
+/* trigger_capture callback */
+static int snd_p16v_pcm_trigger_capture(snd_pcm_substream_t *substream,
+                                   int cmd)
+{
+        emu10k1_t *emu = snd_pcm_substream_chip(substream);
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        emu10k1_pcm_t *epcm = runtime->private_data;
+        int channel = 0;
+        int result = 0;
+        u32 inte = INTE2_CAPTURE_CH_0_LOOP | INTE2_CAPTURE_CH_0_HALF_LOOP;
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+                snd_p16v_intr_enable(emu, inte);
+                snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0)|(0x100<<channel));
+                epcm->running = 1;
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+                snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0) & ~(0x100<<channel));
+                snd_p16v_intr_disable(emu, inte);
+                //snd_emu10k1_ptr20_write(emu, EXTENDED_INT_MASK, 0, snd_emu10k1_ptr20_read(emu, EXTENDED_INT_MASK, 0) & ~(0x110000<<channel));
+                epcm->running = 0;
+                break;
+        default:
+                result = -EINVAL;
+                break;
+        }
+        return result;
+}
+
 /* pointer_playback callback */
 static snd_pcm_uframes_t
 snd_p16v_pcm_pointer_playback(snd_pcm_substream_t *substream)
@@ -370,6 +528,31 @@ snd_p16v_pcm_pointer_playback(snd_pcm_substream_t *substream)
         return ptr;
 }
 
+/* pointer_capture callback */
+static snd_pcm_uframes_t
+snd_p16v_pcm_pointer_capture(snd_pcm_substream_t *substream)
+{
+        emu10k1_t *emu = snd_pcm_substream_chip(substream);
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        emu10k1_pcm_t *epcm = runtime->private_data;
+        snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;
+        int channel = 0;
+
+        if (!epcm->running)
+                return 0;
+
+        ptr1 = snd_emu10k1_ptr20_read(emu, CAPTURE_POINTER, channel);
+        ptr2 = bytes_to_frames(runtime, ptr1);
+        ptr=ptr2;
+        if (ptr >= runtime->buffer_size) {
+                ptr -= runtime->buffer_size;
+                printk("buffer capture limited!\n");
+        }
+        //printk("ptr1 = 0x%lx, ptr2=0x%lx, ptr=0x%lx, buffer_size = 0x%x, period_size = 0x%x, bits=%d, rate=%d\n", ptr1, ptr2, ptr, (int)runtime->buffer_size, (int)runtime->period_size, (int)runtime->frame_bits, (int)runtime->rate);
+
+        return ptr;
+}
+
 /* operators */
 static snd_pcm_ops_t snd_p16v_playback_front_ops = {
         .open =        snd_p16v_pcm_open_playback_front,
@@ -382,6 +565,18 @@ static snd_pcm_ops_t snd_p16v_playback_front_ops = {
         .pointer =     snd_p16v_pcm_pointer_playback,
 };
 
+static snd_pcm_ops_t snd_p16v_capture_ops = {
+        .open =        snd_p16v_pcm_open_capture,
+        .close =       snd_p16v_pcm_close_capture,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_p16v_pcm_hw_params_capture,
+        .hw_free =     snd_p16v_pcm_hw_free_capture,
+        .prepare =     snd_p16v_pcm_prepare_capture,
+        .trigger =     snd_p16v_pcm_trigger_capture,
+        .pointer =     snd_p16v_pcm_pointer_capture,
+};
+
+
 int snd_p16v_free(emu10k1_t *chip)
 {
         // release the data
@@ -405,20 +600,22 @@ int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm)
         snd_pcm_t *pcm;
         snd_pcm_substream_t *substream;
         int err;
-        int capture=0;
+        int capture=1;
   
         //snd_printk("snd_p16v_pcm called. device=%d\n", device);
         emu->p16v_device_offset = device;
         if (rpcm)
                 *rpcm = NULL;
-        //if (device == 0) capture=1; 
+
         if ((err = snd_pcm_new(emu->card, "p16v", device, 1, capture, &pcm)) < 0)
                 return err;
   
         pcm->private_data = emu;
         pcm->private_free = snd_p16v_pcm_free;
-
+        // Single playback 8 channel device.
+        // Single capture 2 channel device.
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_p16v_playback_front_ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_p16v_capture_ops);
 
         pcm->info_flags = 0;
         pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
@@ -431,7 +628,7 @@ int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm)
                 if ((err = snd_pcm_lib_preallocate_pages(substream, 
                                                          SNDRV_DMA_TYPE_DEV, 
                                                          snd_dma_pci_data(emu->pci), 
-                                                         64*1024, 64*1024)) < 0) /* FIXME: 32*1024 for sound buffer, between 32and64 for Periods table. */
+                                                         ((65536 - 64) * 8), ((65536 - 64) * 8))) < 0) 
                         return err;
                 //snd_printk("preallocate playback substream: err=%d\n", err);
         }
@@ -442,7 +639,7 @@ int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm)
                 if ((err = snd_pcm_lib_preallocate_pages(substream, 
                                                    SNDRV_DMA_TYPE_DEV, 
                                                    snd_dma_pci_data(emu->pci), 
-                                                   64*1024, 64*1024)) < 0)
+                                                   65536 - 64, 65536 - 64)) < 0)
                         return err;
                 //snd_printk("preallocate capture substream: err=%d\n", err);
         }
@@ -694,6 +891,106 @@ static snd_kcontrol_new_t snd_p16v_volume_control_spdif_rear =
         .put =          snd_p16v_volume_put_spdif_rear
 };
 
+static int snd_p16v_capture_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[8] = { "SPDIF", "I2S", "SRC48", "SRCMulti_SPDIF", "SRCMulti_I2S", "CDIF", "FX", "AC97" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 8;
+        if (uinfo->value.enumerated.item > 7)
+                uinfo->value.enumerated.item = 7;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_p16v_capture_source_get(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = emu->p16v_capture_source;
+        return 0;
+}
+
+static int snd_p16v_capture_source_put(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int val;
+        int change = 0;
+        u32 mask;
+        u32 source;
+
+        val = ucontrol->value.enumerated.item[0] ;
+        change = (emu->p16v_capture_source != val);
+        if (change) {
+                emu->p16v_capture_source = val;
+                source = (val << 28) | (val << 24) | (val << 20) | (val << 16);
+                mask = snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0) & 0xffff;
+                snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, source | mask);
+        }
+        return change;
+}
+
+static snd_kcontrol_new_t snd_p16v_capture_source __devinitdata =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD Capture source",
+        .info =         snd_p16v_capture_source_info,
+        .get =          snd_p16v_capture_source_get,
+        .put =          snd_p16v_capture_source_put
+};
+
+static int snd_p16v_capture_channel_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[4] = { "0", "1", "2", "3",  };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 4;
+        if (uinfo->value.enumerated.item > 3)
+                uinfo->value.enumerated.item = 3;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_p16v_capture_channel_get(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = emu->p16v_capture_channel;
+        return 0;
+}
+
+static int snd_p16v_capture_channel_put(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int val;
+        int change = 0;
+        u32 tmp;
+
+        val = ucontrol->value.enumerated.item[0] ;
+        change = (emu->p16v_capture_channel != val);
+        if (change) {
+                emu->p16v_capture_channel = val;
+                tmp = snd_emu10k1_ptr20_read(emu, CAPTURE_P16V_SOURCE, 0) & 0xfffc;
+                snd_emu10k1_ptr20_write(emu, CAPTURE_P16V_SOURCE, 0, tmp | val);
+        }
+        return change;
+}
+
+static snd_kcontrol_new_t snd_p16v_capture_channel __devinitdata =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD Capture channel",
+        .info =         snd_p16v_capture_channel_info,
+        .get =          snd_p16v_capture_channel_get,
+        .put =          snd_p16v_capture_channel_put
+};
+
 int snd_p16v_mixer(emu10k1_t *emu)
 {
         int err;
@@ -731,6 +1028,14 @@ int snd_p16v_mixer(emu10k1_t *emu)
                 return -ENOMEM;
         if ((err = snd_ctl_add(card, kctl)))
                 return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_capture_source, emu)) == NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_capture_channel, emu)) == NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
         return 0;
 }
 
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index f910399db5c3..4e63498a58b2 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2401,7 +2401,7 @@ static struct pci_driver driver = {
         
 static int __init alsa_card_ens137x_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_ens137x_exit(void)
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index b4ca8adf393c..b492777bc30f 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1761,7 +1761,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_es1938_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_es1938_exit(void)
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index faf63ff19c42..ea889b311390 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2559,6 +2559,7 @@ static struct ess_device_list pm_whitelist[] __devinitdata = {
         { TYPE_MAESTRO2E, 0x103c },
         { TYPE_MAESTRO2E, 0x1179 },
         { TYPE_MAESTRO2E, 0x14c0 },     /* HP omnibook 4150 */
+        { TYPE_MAESTRO2E, 0x1558 },
 };
 
 static struct ess_device_list mpu_blacklist[] __devinitdata = {
@@ -2795,7 +2796,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_es1968_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_es1968_exit(void)
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 08e7c5a296d5..ff10e637a95e 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -195,6 +195,7 @@ struct _snd_fm801 {
 
 static struct pci_device_id snd_fm801_ids[] = {
         { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, },   /* FM801 */
+        { 0x5213, 0x0510, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, },   /* Gallant Odyssey Sound 4 */
         { 0, }
 };
 
@@ -1468,7 +1469,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_fm801_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_fm801_exit(void)
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 570a59d33b41..bd8cb33c4fb4 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,5 +1,5 @@
 snd-hda-intel-objs := hda_intel.o
-snd-hda-codec-objs := hda_codec.o hda_generic.o patch_realtek.o patch_cmedia.o patch_analog.o
+snd-hda-codec-objs := hda_codec.o hda_generic.o patch_realtek.o patch_cmedia.o patch_analog.o patch_sigmatel.o
 ifdef CONFIG_PROC_FS
 snd-hda-codec-objs += hda_proc.o
 endif
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 9ed117ac0c09..e2cf02387289 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -49,8 +49,10 @@ struct hda_vendor_id {
 /* codec vendor labels */
 static struct hda_vendor_id hda_vendor_ids[] = {
         { 0x10ec, "Realtek" },
+        { 0x11d4, "Analog Devices" },
         { 0x13f6, "C-Media" },
         { 0x434d, "C-Media" },
+        { 0x8384, "SigmaTel" },
         {} /* terminator */
 };
 
@@ -508,7 +510,7 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
         /* FIXME: support for multiple AFGs? */
         codec->afg = look_for_afg_node(codec);
         if (! codec->afg) {
-                snd_printk(KERN_ERR "hda_codec: no AFG node found\n");
+                snd_printdd("hda_codec: no AFG node found\n");
                 snd_hda_codec_free(codec);
                 return -ENODEV;
         }
@@ -548,6 +550,9 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
 void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stream_tag,
                                 int channel_id, int format)
 {
+        if (! nid)
+                return;
+
         snd_printdd("hda_codec_setup_stream: NID=0x%x, stream=0x%x, channel=%d, format=0x%x\n",
                     nid, stream_tag, channel_id, format);
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CHANNEL_STREAMID,
@@ -561,9 +566,10 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stre
  * amp access functions
  */
 
-#define HDA_HASH_KEY(nid,dir,idx) (u32)((nid) + (idx) * 32 + (dir) * 64)
+/* FIXME: more better hash key? */
+#define HDA_HASH_KEY(nid,dir,idx) (u32)((nid) + ((idx) << 16) + ((dir) << 24))
 #define INFO_AMP_CAPS   (1<<0)
-#define INFO_AMP_VOL    (1<<1)
+#define INFO_AMP_VOL(ch)        (1 << (1 + (ch)))
 
 /* initialize the hash table */
 static void init_amp_hash(struct hda_codec *codec)
@@ -622,28 +628,29 @@ static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
 
 /*
  * read the current volume to info
- * if the cache exists, read from the cache.
+ * if the cache exists, read the cache value.
  */
-static void get_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
+static unsigned int get_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
                          hda_nid_t nid, int ch, int direction, int index)
 {
         u32 val, parm;
 
-        if (info->status & (INFO_AMP_VOL << ch))
-                return;
+        if (info->status & INFO_AMP_VOL(ch))
+                return info->vol[ch];
 
         parm = ch ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT;
         parm |= direction == HDA_OUTPUT ? AC_AMP_GET_OUTPUT : AC_AMP_GET_INPUT;
         parm |= index;
         val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE, parm);
         info->vol[ch] = val & 0xff;
-        info->status |= INFO_AMP_VOL << ch;
+        info->status |= INFO_AMP_VOL(ch);
+        return info->vol[ch];
 }
 
 /*
- * write the current volume in info to the h/w
+ * write the current volume in info to the h/w and update the cache
  */
-static void put_vol_mute(struct hda_codec *codec,
+static void put_vol_mute(struct hda_codec *codec, struct hda_amp_info *info,
                          hda_nid_t nid, int ch, int direction, int index, int val)
 {
         u32 parm;
@@ -653,30 +660,34 @@ static void put_vol_mute(struct hda_codec *codec,
         parm |= index << AC_AMP_SET_INDEX_SHIFT;
         parm |= val;
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, parm);
+        info->vol[ch] = val;
 }
 
 /*
- * read/write AMP value.  The volume is between 0 to 0x7f, 0x80 = mute bit.
+ * read AMP value.  The volume is between 0 to 0x7f, 0x80 = mute bit.
  */
-int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int index)
+static int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int index)
 {
         struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, index));
         if (! info)
                 return 0;
-        get_vol_mute(codec, info, nid, ch, direction, index);
-        return info->vol[ch];
+        return get_vol_mute(codec, info, nid, ch, direction, index);
 }
 
-int snd_hda_codec_amp_write(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int idx, int val)
+/*
+ * update the AMP value, mask = bit mask to set, val = the value
+ */
+static int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int idx, int mask, int val)
 {
         struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));
+
         if (! info)
                 return 0;
-        get_vol_mute(codec, info, nid, ch, direction, idx);
+        val &= mask;
+        val |= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
         if (info->vol[ch] == val && ! codec->in_resume)
                 return 0;
-        put_vol_mute(codec, nid, ch, direction, idx, val);
-        info->vol[ch] = val;
+        put_vol_mute(codec, info, nid, ch, direction, idx, val);
         return 1;
 }
 
@@ -735,21 +746,15 @@ int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
         int chs = get_amp_channels(kcontrol);
         int dir = get_amp_direction(kcontrol);
         int idx = get_amp_index(kcontrol);
-        int val;
         long *valp = ucontrol->value.integer.value;
         int change = 0;
 
-        if (chs & 1) {
-                val = *valp & 0x7f;
-                val |= snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x80;
-                change = snd_hda_codec_amp_write(codec, nid, 0, dir, idx, val);
-                valp++;
-        }
-        if (chs & 2) {
-                val = *valp & 0x7f;
-                val |= snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x80;
-                change |= snd_hda_codec_amp_write(codec, nid, 1, dir, idx, val);
-        }
+        if (chs & 1)
+                change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
+                                                  0x7f, *valp);
+        if (chs & 2)
+                change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
+                                                   0x7f, valp[1]);
         return change;
 }
 
@@ -788,21 +793,15 @@ int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
         int chs = get_amp_channels(kcontrol);
         int dir = get_amp_direction(kcontrol);
         int idx = get_amp_index(kcontrol);
-        int val;
         long *valp = ucontrol->value.integer.value;
         int change = 0;
 
-        if (chs & 1) {
-                val = snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x7f;
-                val |= *valp ? 0 : 0x80;
-                change = snd_hda_codec_amp_write(codec, nid, 0, dir, idx, val);
-                valp++;
-        }
-        if (chs & 2) {
-                val = snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x7f;
-                val |= *valp ? 0 : 0x80;
-                change = snd_hda_codec_amp_write(codec, nid, 1, dir, idx, val);
-        }
+        if (chs & 1)
+                change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
+                                                  0x80, *valp ? 0 : 0x80);
+        if (chs & 2)
+                change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
+                                                   0x80, valp[1] ? 0 : 0x80);
         return change;
 }
 
@@ -1448,10 +1447,6 @@ static int set_pcm_default_values(struct hda_codec *codec, struct hda_pcm_stream
                 snd_assert(info->nid, return -EINVAL);
                 info->ops.prepare = hda_pcm_default_prepare;
         }
-        if (info->ops.prepare == NULL) {
-                snd_assert(info->nid, return -EINVAL);
-                info->ops.prepare = hda_pcm_default_prepare;
-        }
         if (info->ops.cleanup == NULL) {
                 snd_assert(info->nid, return -EINVAL);
                 info->ops.cleanup = hda_pcm_default_cleanup;
@@ -1525,12 +1520,12 @@ int snd_hda_build_pcms(struct hda_bus *bus)
  *
  * If no entries are matching, the function returns a negative value.
  */
-int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config *tbl)
+int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl)
 {
-        struct hda_board_config *c;
+        const struct hda_board_config *c;
 
         if (codec->bus->modelname) {
-                for (c = tbl; c->modelname || c->pci_vendor; c++) {
+                for (c = tbl; c->modelname || c->pci_subvendor; c++) {
                         if (c->modelname &&
                             ! strcmp(codec->bus->modelname, c->modelname)) {
                                 snd_printd(KERN_INFO "hda_codec: model '%s' is selected\n", c->modelname);
@@ -1543,9 +1538,10 @@ int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config
                 u16 subsystem_vendor, subsystem_device;
                 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
                 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device);
-                for (c = tbl; c->modelname || c->pci_vendor; c++) {
-                        if (c->pci_vendor == subsystem_vendor &&
-                            c->pci_device == subsystem_device)
+                for (c = tbl; c->modelname || c->pci_subvendor; c++) {
+                        if (c->pci_subvendor == subsystem_vendor &&
+                            (! c->pci_subdevice /* all match */||
+                             (c->pci_subdevice == subsystem_device)))
                                 return c->config;
                 }
         }
@@ -1687,11 +1683,12 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o
                 snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format);
         /* surrounds */
         for (i = 1; i < mout->num_dacs; i++) {
-                if (i == HDA_REAR && chs == 2) /* copy front to rear */
-                        snd_hda_codec_setup_stream(codec, nids[i], stream_tag, 0, format);
-                else if (chs >= (i + 1) * 2) /* independent out */
+                if (chs >= (i + 1) * 2) /* independent out */
                         snd_hda_codec_setup_stream(codec, nids[i], stream_tag, i * 2,
                                                    format);
+                else /* copy front */
+                        snd_hda_codec_setup_stream(codec, nids[i], stream_tag, 0,
+                                                   format);
         }
         return 0;
 }
@@ -1717,6 +1714,105 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_o
         return 0;
 }
 
+/*
+ * Helper for automatic ping configuration
+ */
+/* parse all pin widgets and store the useful pin nids to cfg */
+int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg)
+{
+        hda_nid_t nid, nid_start;
+        int i, j, nodes;
+        short seq, sequences[4], assoc_line_out;
+
+        memset(cfg, 0, sizeof(*cfg));
+
+        memset(sequences, 0, sizeof(sequences));
+        assoc_line_out = 0;
+
+        nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid_start);
+        for (nid = nid_start; nid < nodes + nid_start; nid++) {
+                unsigned int wid_caps = snd_hda_param_read(codec, nid,
+                                                           AC_PAR_AUDIO_WIDGET_CAP);
+                unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                unsigned int def_conf;
+                short assoc, loc;
+
+                /* read all default configuration for pin complex */
+                if (wid_type != AC_WID_PIN)
+                        continue;
+                def_conf = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
+                        continue;
+                loc = get_defcfg_location(def_conf);
+                switch (get_defcfg_device(def_conf)) {
+                case AC_JACK_LINE_OUT:
+                case AC_JACK_SPEAKER:
+                        seq = get_defcfg_sequence(def_conf);
+                        assoc = get_defcfg_association(def_conf);
+                        if (! assoc)
+                                continue;
+                        if (! assoc_line_out)
+                                assoc_line_out = assoc;
+                        else if (assoc_line_out != assoc)
+                                continue;
+                        if (cfg->line_outs >= ARRAY_SIZE(cfg->line_out_pins))
+                                continue;
+                        cfg->line_out_pins[cfg->line_outs] = nid;
+                        sequences[cfg->line_outs] = seq;
+                        cfg->line_outs++;
+                        break;
+                case AC_JACK_HP_OUT:
+                        cfg->hp_pin = nid;
+                        break;
+                case AC_JACK_MIC_IN:
+                        if (loc == AC_JACK_LOC_FRONT)
+                                cfg->input_pins[AUTO_PIN_FRONT_MIC] = nid;
+                        else
+                                cfg->input_pins[AUTO_PIN_MIC] = nid;
+                        break;
+                case AC_JACK_LINE_IN:
+                        if (loc == AC_JACK_LOC_FRONT)
+                                cfg->input_pins[AUTO_PIN_FRONT_LINE] = nid;
+                        else
+                                cfg->input_pins[AUTO_PIN_LINE] = nid;
+                        break;
+                case AC_JACK_CD:
+                        cfg->input_pins[AUTO_PIN_CD] = nid;
+                        break;
+                case AC_JACK_AUX:
+                        cfg->input_pins[AUTO_PIN_AUX] = nid;
+                        break;
+                case AC_JACK_SPDIF_OUT:
+                        cfg->dig_out_pin = nid;
+                        break;
+                case AC_JACK_SPDIF_IN:
+                        cfg->dig_in_pin = nid;
+                        break;
+                }
+        }
+
+        /* sort by sequence */
+        for (i = 0; i < cfg->line_outs; i++)
+                for (j = i + 1; j < cfg->line_outs; j++)
+                        if (sequences[i] > sequences[j]) {
+                                seq = sequences[i];
+                                sequences[i] = sequences[j];
+                                sequences[j] = seq;
+                                nid = cfg->line_out_pins[i];
+                                cfg->line_out_pins[i] = cfg->line_out_pins[j];
+                                cfg->line_out_pins[j] = nid;
+                        }
+
+        /* Swap surround and CLFE: the association order is front/CLFE/surr/back */
+        if (cfg->line_outs >= 3) {
+                nid = cfg->line_out_pins[1];
+                cfg->line_out_pins[1] = cfg->line_out_pins[2];
+                cfg->line_out_pins[2] = nid;
+        }
+
+        return 0;
+}
+
 #ifdef CONFIG_PM
 /*
  * power management
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index c9e9dc9c7c98..59991560d492 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -75,6 +75,9 @@ enum {
 #define AC_VERB_GET_DIGI_CONVERT                0x0f0d
 #define AC_VERB_GET_VOLUME_KNOB_CONTROL         0x0f0f
 /* f10-f1a: GPIO */
+#define AC_VERB_GET_GPIO_DATA                   0x0f15
+#define AC_VERB_GET_GPIO_MASK                   0x0f16
+#define AC_VERB_GET_GPIO_DIRECTION              0x0f17
 #define AC_VERB_GET_CONFIG_DEFAULT              0x0f1c
 
 /*
@@ -97,6 +100,9 @@ enum {
 #define AC_VERB_SET_DIGI_CONVERT_1              0x70d
 #define AC_VERB_SET_DIGI_CONVERT_2              0x70e
 #define AC_VERB_SET_VOLUME_KNOB_CONTROL         0x70f
+#define AC_VERB_SET_GPIO_DATA                   0x715
+#define AC_VERB_SET_GPIO_MASK                   0x716
+#define AC_VERB_SET_GPIO_DIRECTION              0x717
 #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0      0x71c
 #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1      0x71d
 #define AC_VERB_SET_CONFIG_DEFAULT_BYTES_2      0x71e
@@ -176,16 +182,15 @@ enum {
 #define AC_PINCAP_OUT                   (1<<4)  /* output capable */
 #define AC_PINCAP_IN                    (1<<5)  /* input capable */
 #define AC_PINCAP_BALANCE               (1<<6)  /* balanced I/O capable */
-#define AC_PINCAP_VREF                  (7<<8)
+#define AC_PINCAP_VREF                  (0x37<<8)
 #define AC_PINCAP_VREF_SHIFT            8
 #define AC_PINCAP_EAPD                  (1<<16) /* EAPD capable */
-/* Vref status (used in pin cap and pin ctl) */
-#define AC_PIN_VREF_HIZ                 (1<<0)  /* Hi-Z */
-#define AC_PIN_VREF_50                  (1<<1)  /* 50% */
-#define AC_PIN_VREF_GRD                 (1<<2)  /* ground */
-#define AC_PIN_VREF_80                  (1<<4)  /* 80% */
-#define AC_PIN_VREF_100                 (1<<5)  /* 100% */
-
+/* Vref status (used in pin cap) */
+#define AC_PINCAP_VREF_HIZ              (1<<0)  /* Hi-Z */
+#define AC_PINCAP_VREF_50               (1<<1)  /* 50% */
+#define AC_PINCAP_VREF_GRD              (1<<2)  /* ground */
+#define AC_PINCAP_VREF_80               (1<<4)  /* 80% */
+#define AC_PINCAP_VREF_100              (1<<5)  /* 100% */
 
 /* Amplifier capabilities */
 #define AC_AMPCAP_OFFSET                (0x7f<<0)  /* 0dB offset */
@@ -248,6 +253,11 @@ enum {
 
 /* Pin widget control - 8bit */
 #define AC_PINCTL_VREFEN                (0x7<<0)
+#define AC_PINCTL_VREF_HIZ              0       /* Hi-Z */
+#define AC_PINCTL_VREF_50               1       /* 50% */
+#define AC_PINCTL_VREF_GRD              2       /* ground */
+#define AC_PINCTL_VREF_80               4       /* 80% */
+#define AC_PINCTL_VREF_100              5       /* 100% */
 #define AC_PINCTL_IN_EN                 (1<<5)
 #define AC_PINCTL_OUT_EN                (1<<6)
 #define AC_PINCTL_HP_EN                 (1<<7)
@@ -255,7 +265,9 @@ enum {
 /* configuration default - 32bit */
 #define AC_DEFCFG_SEQUENCE              (0xf<<0)
 #define AC_DEFCFG_DEF_ASSOC             (0xf<<4)
+#define AC_DEFCFG_ASSOC_SHIFT           4
 #define AC_DEFCFG_MISC                  (0xf<<8)
+#define AC_DEFCFG_MISC_SHIFT            8
 #define AC_DEFCFG_COLOR                 (0xf<<12)
 #define AC_DEFCFG_COLOR_SHIFT           12
 #define AC_DEFCFG_CONN_TYPE             (0xf<<16)
@@ -413,7 +425,7 @@ struct hda_bus {
 
         /* codec linked list */
         struct list_head codec_list;
-        struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS]; /* caddr -> codec */
+        struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
 
         struct semaphore cmd_mutex;
 
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 69f7b6c4cf83..2d046abb5911 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -44,7 +44,7 @@ struct hda_gnode {
         struct list_head list;
 };
 
-/* pathc-specific record */
+/* patch-specific record */
 struct hda_gspec {
         struct hda_gnode *dac_node;     /* DAC node */
         struct hda_gnode *out_pin_node; /* Output pin (Line-Out) node */
@@ -68,8 +68,8 @@ struct hda_gspec {
 /*
  * retrieve the default device type from the default config value
  */
-#define get_defcfg_type(node) (((node)->def_cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
-#define get_defcfg_location(node) (((node)->def_cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
+#define defcfg_type(node) (((node)->def_cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
+#define defcfg_location(node) (((node)->def_cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
 
 /*
  * destructor
@@ -323,7 +323,7 @@ static struct hda_gnode *parse_output_jack(struct hda_codec *codec,
                 if (! (node->pin_caps & AC_PINCAP_OUT))
                         continue;
                 if (jack_type >= 0) {
-                        if (jack_type != get_defcfg_type(node))
+                        if (jack_type != defcfg_type(node))
                                 continue;
                         if (node->wid_caps & AC_WCAP_DIGITAL)
                                 continue; /* skip SPDIF */
@@ -418,15 +418,15 @@ static int capture_source_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc
  */
 static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl)
 {
-        unsigned int location = get_defcfg_location(node);
-        switch (get_defcfg_type(node)) {
+        unsigned int location = defcfg_location(node);
+        switch (defcfg_type(node)) {
         case AC_JACK_LINE_IN:
                 if ((location & 0x0f) == AC_JACK_LOC_FRONT)
                         return "Front Line";
                 return "Line";
         case AC_JACK_CD:
                 if (pinctl)
-                        *pinctl |= AC_PIN_VREF_GRD;
+                        *pinctl |= AC_PINCTL_VREF_GRD;
                 return "CD";
         case AC_JACK_AUX:
                 if ((location & 0x0f) == AC_JACK_LOC_FRONT)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 959953ca320a..5e0cca36ed57 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -51,6 +51,7 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
 static char *model[SNDRV_CARDS];
+static int position_fix[SNDRV_CARDS];
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Intel HD audio interface.");
@@ -60,12 +61,17 @@ module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Intel HD audio interface.");
 module_param_array(model, charp, NULL, 0444);
 MODULE_PARM_DESC(model, "Use the given board model.");
+module_param_array(position_fix, int, NULL, 0444);
+MODULE_PARM_DESC(position_fix, "Fix DMA pointer (0 = FIFO size, 1 = none, 2 = POSBUF).");
 
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
                          "{Intel, ICH6M},"
                          "{Intel, ICH7},"
-                         "{Intel, ESB2}}");
+                         "{Intel, ESB2},"
+                         "{ATI, SB450},"
+                         "{VIA, VT8251},"
+                         "{VIA, VT8237A}}");
 MODULE_DESCRIPTION("Intel HDA driver");
 
 #define SFX     "hda-intel: "
@@ -150,7 +156,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 
 /* STATESTS int mask: SD2,SD1,SD0 */
 #define STATESTS_INT_MASK       0x07
-#define AZX_MAX_CODECS          3
+#define AZX_MAX_CODECS          4
 
 /* SD_CTL bits */
 #define SD_CTL_STREAM_RESET     0x01    /* stream reset bit */
@@ -183,6 +189,18 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 #define ICH6_MAX_CORB_ENTRIES   256
 #define ICH6_MAX_RIRB_ENTRIES   256
 
+/* position fix mode */
+enum {
+        POS_FIX_FIFO,
+        POS_FIX_NONE,
+        POS_FIX_POSBUF
+};
+
+/* Defines for ATI HD Audio support in SB450 south bridge */
+#define ATI_SB450_HDAUDIO_PCI_DEVICE_ID     0x437b
+#define ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR   0x42
+#define ATI_SB450_HDAUDIO_ENABLE_SNOOP      0x02
+
 
 /*
  * Use CORB/RIRB for communication from/to codecs.
@@ -191,12 +209,6 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 #define USE_CORB_RIRB
 
 /*
- * Define this if use the position buffer instead of reading SD_LPIB
- * It's not used as default since SD_LPIB seems to give more accurate position
- */
-/* #define USE_POSBUF */
-
-/*
  */
 
 typedef struct snd_azx azx_t;
@@ -271,6 +283,10 @@ struct snd_azx {
         struct snd_dma_buffer bdl;
         struct snd_dma_buffer rb;
         struct snd_dma_buffer posbuf;
+
+        /* flags */
+        int position_fix;
+        unsigned int initialized: 1;
 };
 
 /*
@@ -638,7 +654,7 @@ static void azx_stream_stop(azx_t *chip, azx_dev_t *azx_dev)
  */
 static void azx_init_chip(azx_t *chip)
 {
-        unsigned char tcsel_reg;
+        unsigned char tcsel_reg, ati_misc_cntl2;
 
         /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
          * TCSEL == Traffic Class Select Register, which sets PCI express QOS
@@ -657,11 +673,20 @@ static void azx_init_chip(azx_t *chip)
         /* initialize the codec command I/O */
         azx_init_cmd_io(chip);
 
-#ifdef USE_POSBUF
-        /* program the position buffer */
-        azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
-        azx_writel(chip, DPUBASE, upper_32bit(chip->posbuf.addr));
-#endif
+        if (chip->position_fix == POS_FIX_POSBUF) {
+                /* program the position buffer */
+                azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
+                azx_writel(chip, DPUBASE, upper_32bit(chip->posbuf.addr));
+        }
+
+        /* For ATI SB450 azalia HD audio, we need to enable snoop */
+        if (chip->pci->vendor == PCI_VENDOR_ID_ATI && 
+            chip->pci->device == ATI_SB450_HDAUDIO_PCI_DEVICE_ID) {
+                pci_read_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                                     &ati_misc_cntl2);
+                pci_write_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                                      (ati_misc_cntl2 & 0xf8) | ATI_SB450_HDAUDIO_ENABLE_SNOOP);
+        }
 }
 
 
@@ -791,11 +816,12 @@ static int azx_setup_controller(azx_t *chip, azx_dev_t *azx_dev)
         /* upper BDL address */
         azx_sd_writel(azx_dev, SD_BDLPU, upper_32bit(azx_dev->bdl_addr));
 
-#ifdef USE_POSBUF
-        /* enable the position buffer */
-        if (! (azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
-                azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE);
-#endif
+        if (chip->position_fix == POS_FIX_POSBUF) {
+                /* enable the position buffer */
+                if (! (azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
+                        azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE);
+        }
+
         /* set the interrupt enable bits in the descriptor control register */
         azx_sd_writel(azx_dev, SD_CTL, azx_sd_readl(azx_dev, SD_CTL) | SD_INT_MASK);
 
@@ -1036,16 +1062,20 @@ static int azx_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
 
 static snd_pcm_uframes_t azx_pcm_pointer(snd_pcm_substream_t *substream)
 {
+        struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
+        azx_t *chip = apcm->chip;
         azx_dev_t *azx_dev = get_azx_dev(substream);
         unsigned int pos;
 
-#ifdef USE_POSBUF
-        /* use the position buffer */
-        pos = *azx_dev->posbuf;
-#else
-        /* read LPIB */
-        pos = azx_sd_readl(azx_dev, SD_LPIB) + azx_dev->fifo_size;
-#endif
+        if (chip->position_fix == POS_FIX_POSBUF) {
+                /* use the position buffer */
+                pos = *azx_dev->posbuf;
+        } else {
+                /* read LPIB */
+                pos = azx_sd_readl(azx_dev, SD_LPIB);
+                if (chip->position_fix == POS_FIX_FIFO)
+                        pos += azx_dev->fifo_size;
+        }
         if (pos >= azx_dev->bufsize)
                 pos = 0;
         return bytes_to_frames(substream->runtime, pos);
@@ -1155,9 +1185,8 @@ static int __devinit azx_init_stream(azx_t *chip)
                 azx_dev_t *azx_dev = &chip->azx_dev[i];
                 azx_dev->bdl = (u32 *)(chip->bdl.area + off);
                 azx_dev->bdl_addr = chip->bdl.addr + off;
-#ifdef USE_POSBUF
-                azx_dev->posbuf = (volatile u32 *)(chip->posbuf.area + i * 8);
-#endif
+                if (chip->position_fix == POS_FIX_POSBUF)
+                        azx_dev->posbuf = (volatile u32 *)(chip->posbuf.area + i * 8);
                 /* offset: SDI0=0x80, SDI1=0xa0, ... SDO3=0x160 */
                 azx_dev->sd_addr = chip->remap_addr + (0x20 * i + 0x80);
                 /* int mask: SDI0=0x01, SDI1=0x02, ... SDO3=0x80 */
@@ -1207,7 +1236,7 @@ static int azx_resume(snd_card_t *card)
  */
 static int azx_free(azx_t *chip)
 {
-        if (chip->remap_addr) {
+        if (chip->initialized) {
                 int i;
 
                 for (i = 0; i < MAX_ICH6_DEV; i++)
@@ -1237,10 +1266,8 @@ static int azx_free(azx_t *chip)
                 snd_dma_free_pages(&chip->bdl);
         if (chip->rb.area)
                 snd_dma_free_pages(&chip->rb);
-#ifdef USE_POSBUF
         if (chip->posbuf.area)
                 snd_dma_free_pages(&chip->posbuf);
-#endif
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
         kfree(chip);
@@ -1256,7 +1283,8 @@ static int azx_dev_free(snd_device_t *device)
 /*
  * constructor
  */
-static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci, azx_t **rchip)
+static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci,
+                                int posfix, azx_t **rchip)
 {
         azx_t *chip;
         int err = 0;
@@ -1283,6 +1311,8 @@ static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci, azx_t **r
         chip->pci = pci;
         chip->irq = -1;
 
+        chip->position_fix = posfix;
+
         if ((err = pci_request_regions(pci, "ICH HD audio")) < 0) {
                 kfree(chip);
                 pci_disable_device(pci);
@@ -1314,14 +1344,14 @@ static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci, azx_t **r
                 snd_printk(KERN_ERR SFX "cannot allocate BDL\n");
                 goto errout;
         }
-#ifdef USE_POSBUF
-        /* allocate memory for the position buffer */
-        if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
-                                       MAX_ICH6_DEV * 8, &chip->posbuf)) < 0) {
-                snd_printk(KERN_ERR SFX "cannot allocate posbuf\n");
-                goto errout;
+        if (chip->position_fix == POS_FIX_POSBUF) {
+                /* allocate memory for the position buffer */
+                if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
+                                               MAX_ICH6_DEV * 8, &chip->posbuf)) < 0) {
+                        snd_printk(KERN_ERR SFX "cannot allocate posbuf\n");
+                        goto errout;
+                }
         }
-#endif
         /* allocate CORB/RIRB */
         if ((err = azx_alloc_cmd_io(chip)) < 0)
                 goto errout;
@@ -1332,6 +1362,8 @@ static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci, azx_t **r
         /* initialize chip */
         azx_init_chip(chip);
 
+        chip->initialized = 1;
+
         /* codec detection */
         if (! chip->codec_mask) {
                 snd_printk(KERN_ERR SFX "no codecs found!\n");
@@ -1372,7 +1404,7 @@ static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *
                 return -ENOMEM;
         }
 
-        if ((err = azx_create(card, pci, &chip)) < 0) {
+        if ((err = azx_create(card, pci, position_fix[dev], &chip)) < 0) {
                 snd_card_free(card);
                 return err;
         }
@@ -1424,6 +1456,9 @@ static struct pci_device_id azx_ids[] = {
         { 0x8086, 0x2668, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH6 */
         { 0x8086, 0x27d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICH7 */
         { 0x8086, 0x269a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ESB2 */
+        { 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ATI SB450 */
+        { 0x1106, 0x3288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* VIA VT8251/VT8237A */
+        { 0x10b9, 0x5461, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ALI 5461? */
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);
@@ -1439,7 +1474,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_azx_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_azx_exit(void)
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 7c7b849875a0..810cfd2d9bba 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -126,11 +126,11 @@ static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }
 struct hda_board_config {
         const char *modelname;
         int config;
-        unsigned short pci_vendor;
-        unsigned short pci_device;
+        unsigned short pci_subvendor;
+        unsigned short pci_subdevice;
 };
 
-int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config *tbl);
+int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl);
 int snd_hda_add_new_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew);
 
 /*
@@ -158,4 +158,35 @@ struct hda_bus_unsolicited {
         struct work_struct work;
 };
 
+/*
+ * Helper for automatic ping configuration
+ */
+
+enum {
+        AUTO_PIN_MIC,
+        AUTO_PIN_FRONT_MIC,
+        AUTO_PIN_LINE,
+        AUTO_PIN_FRONT_LINE,
+        AUTO_PIN_CD,
+        AUTO_PIN_AUX,
+        AUTO_PIN_LAST
+};
+
+struct auto_pin_cfg {
+        int line_outs;
+        hda_nid_t line_out_pins[4]; /* sorted in the order of Front/Surr/CLFE/Side */
+        hda_nid_t hp_pin;
+        hda_nid_t input_pins[AUTO_PIN_LAST];
+        hda_nid_t dig_out_pin;
+        hda_nid_t dig_in_pin;
+};
+
+#define get_defcfg_connect(cfg) ((cfg & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT)
+#define get_defcfg_association(cfg) ((cfg & AC_DEFCFG_DEF_ASSOC) >> AC_DEFCFG_ASSOC_SHIFT)
+#define get_defcfg_location(cfg) ((cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
+#define get_defcfg_sequence(cfg) (cfg & AC_DEFCFG_SEQUENCE)
+#define get_defcfg_device(cfg) ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
+
+int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg);
+
 #endif /* __SOUND_HDA_LOCAL_H */
diff --git a/sound/pci/hda/hda_patch.h b/sound/pci/hda/hda_patch.h
index cf6abce42bc9..a5de684b6944 100644
--- a/sound/pci/hda/hda_patch.h
+++ b/sound/pci/hda/hda_patch.h
@@ -8,10 +8,13 @@ extern struct hda_codec_preset snd_hda_preset_realtek[];
 extern struct hda_codec_preset snd_hda_preset_cmedia[];
 /* Analog Devices codecs */
 extern struct hda_codec_preset snd_hda_preset_analog[];
+/* SigmaTel codecs */
+extern struct hda_codec_preset snd_hda_preset_sigmatel[];
 
 static const struct hda_codec_preset *hda_preset_tables[] = {
         snd_hda_preset_realtek,
         snd_hda_preset_cmedia,
         snd_hda_preset_analog,
+        snd_hda_preset_sigmatel,
         NULL
 };
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 4d5db7faad8d..de1217bd8e68 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -68,21 +68,27 @@ static void print_amp_caps(snd_info_buffer_t *buffer,
 
 static void print_amp_vals(snd_info_buffer_t *buffer,
                            struct hda_codec *codec, hda_nid_t nid,
-                           int dir, int stereo)
+                           int dir, int stereo, int indices)
 {
         unsigned int val;
-        if (stereo) {
+        int i;
+
+        if (dir == HDA_OUTPUT)
+                dir = AC_AMP_GET_OUTPUT;
+        else
+                dir = AC_AMP_GET_INPUT;
+        for (i = 0; i < indices; i++) {
+                snd_iprintf(buffer, " [");
+                if (stereo) {
+                        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
+                                                 AC_AMP_GET_LEFT | dir | i);
+                        snd_iprintf(buffer, "0x%02x ", val);
+                }
                 val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
-                                          AC_AMP_GET_LEFT |
-                                         (dir == HDA_OUTPUT ? AC_AMP_GET_OUTPUT :
-                                          AC_AMP_GET_INPUT));
-                snd_iprintf(buffer, "0x%02x ", val);
+                                         AC_AMP_GET_RIGHT | dir | i);
+                snd_iprintf(buffer, "0x%02x]", val);
         }
-        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
-                                 AC_AMP_GET_RIGHT |
-                                 (dir == HDA_OUTPUT ? AC_AMP_GET_OUTPUT :
-                                  AC_AMP_GET_INPUT));
-        snd_iprintf(buffer, "0x%02x\n", val);
+        snd_iprintf(buffer, "\n");
 }
 
 static void print_pcm_caps(snd_info_buffer_t *buffer,
@@ -157,6 +163,7 @@ static const char *get_jack_color(u32 cfg)
 static void print_pin_caps(snd_info_buffer_t *buffer,
                            struct hda_codec *codec, hda_nid_t nid)
 {
+        static char *jack_conns[4] = { "Jack", "N/A", "Fixed", "Both" };
         static char *jack_types[16] = {
                 "Line Out", "Speaker", "HP Out", "CD",
                 "SPDIF Out", "Digital Out", "Modem Line", "Modem Hand",
@@ -176,7 +183,8 @@ static void print_pin_caps(snd_info_buffer_t *buffer,
                 snd_iprintf(buffer, " HP");
         snd_iprintf(buffer, "\n");
         caps = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
-        snd_iprintf(buffer, "  Pin Default 0x%08x: %s at %s %s\n", caps,
+        snd_iprintf(buffer, "  Pin Default 0x%08x: [%s] %s at %s %s\n", caps,
+                    jack_conns[(caps & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT],
                     jack_types[(caps & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT],
                     jack_locations[(caps >> (AC_DEFCFG_LOCATION_SHIFT + 4)) & 3],
                     get_jack_location(caps));
@@ -215,6 +223,9 @@ static void print_codec_info(snd_info_entry_t *entry, snd_info_buffer_t *buffer)
                 unsigned int wid_caps = snd_hda_param_read(codec, nid,
                                                            AC_PAR_AUDIO_WIDGET_CAP);
                 unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                int conn_len = 0; 
+                hda_nid_t conn[HDA_MAX_CONNECTIONS];
+
                 snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid,
                             get_wid_type_name(wid_type), wid_caps);
                 if (wid_caps & AC_WCAP_STEREO)
@@ -229,19 +240,23 @@ static void print_codec_info(snd_info_entry_t *entry, snd_info_buffer_t *buffer)
                         snd_iprintf(buffer, " Amp-Out");
                 snd_iprintf(buffer, "\n");
 
+                if (wid_caps & AC_WCAP_CONN_LIST)
+                        conn_len = snd_hda_get_connections(codec, nid, conn,
+                                                           HDA_MAX_CONNECTIONS);
+
                 if (wid_caps & AC_WCAP_IN_AMP) {
                         snd_iprintf(buffer, "  Amp-In caps: ");
                         print_amp_caps(buffer, codec, nid, HDA_INPUT);
                         snd_iprintf(buffer, "  Amp-In vals: ");
                         print_amp_vals(buffer, codec, nid, HDA_INPUT,
-                                       wid_caps & AC_WCAP_STEREO);
+                                       wid_caps & AC_WCAP_STEREO, conn_len);
                 }
                 if (wid_caps & AC_WCAP_OUT_AMP) {
                         snd_iprintf(buffer, "  Amp-Out caps: ");
                         print_amp_caps(buffer, codec, nid, HDA_OUTPUT);
                         snd_iprintf(buffer, "  Amp-Out vals: ");
                         print_amp_vals(buffer, codec, nid, HDA_OUTPUT,
-                                       wid_caps & AC_WCAP_STEREO);
+                                       wid_caps & AC_WCAP_STEREO, 1);
                 }
 
                 if (wid_type == AC_WID_PIN) {
@@ -265,14 +280,17 @@ static void print_codec_info(snd_info_entry_t *entry, snd_info_buffer_t *buffer)
                 }
 
                 if (wid_caps & AC_WCAP_CONN_LIST) {
-                        hda_nid_t conn[HDA_MAX_CONNECTIONS];
-                        int c, conn_len;
-                        conn_len = snd_hda_get_connections(codec, nid, conn,
-                                                           HDA_MAX_CONNECTIONS);
+                        int c, curr = -1;
+                        if (conn_len > 1 && wid_type != AC_WID_AUD_MIX)
+                                curr = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_CONNECT_SEL, 0);
                         snd_iprintf(buffer, "  Connection: %d\n", conn_len);
                         snd_iprintf(buffer, "    ");
-                        for (c = 0; c < conn_len; c++)
+                        for (c = 0; c < conn_len; c++) {
                                 snd_iprintf(buffer, " 0x%02x", conn[c]);
+                                if (c == curr)
+                                        snd_iprintf(buffer, "*");
+                        }
                         snd_iprintf(buffer, "\n");
                 }
         }
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 75d23849f71a..2fd05bb84136 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1,5 +1,5 @@
 /*
- * HD audio interface patch for AD1986A
+ * HD audio interface patch for AD1981HD, AD1983, AD1986A
  *
  * Copyright (c) 2005 Takashi Iwai <tiwai@suse.de>
  *
@@ -27,13 +27,239 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 
-struct ad1986a_spec {
+struct ad198x_spec {
         struct semaphore amp_mutex;     /* PCM volume/mute control mutex */
         struct hda_multi_out multiout;  /* playback */
+        hda_nid_t adc_nid;
+        const struct hda_input_mux *input_mux;
         unsigned int cur_mux;           /* capture source */
+        unsigned int spdif_route;
+        snd_kcontrol_new_t *mixers;
+        const struct hda_verb *init_verbs;
         struct hda_pcm pcm_rec[2];      /* PCM information */
 };
 
+/*
+ * input MUX handling (common part)
+ */
+static int ad198x_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+
+        return snd_hda_input_mux_info(spec->input_mux, uinfo);
+}
+
+static int ad198x_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+
+        ucontrol->value.enumerated.item[0] = spec->cur_mux;
+        return 0;
+}
+
+static int ad198x_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+
+        return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
+                                     spec->adc_nid, &spec->cur_mux);
+}
+
+/*
+ * initialization (common callbacks)
+ */
+static int ad198x_init(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        snd_hda_sequence_write(codec, spec->init_verbs);
+        return 0;
+}
+
+static int ad198x_build_controls(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        int err;
+
+        err = snd_hda_add_new_ctls(codec, spec->mixers);
+        if (err < 0)
+                return err;
+        if (spec->multiout.dig_out_nid)
+                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+/*
+ * Analog playback callbacks
+ */
+static int ad198x_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                    struct hda_codec *codec,
+                                    snd_pcm_substream_t *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
+}
+
+static int ad198x_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                       struct hda_codec *codec,
+                                       unsigned int stream_tag,
+                                       unsigned int format,
+                                       snd_pcm_substream_t *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
+                                                format, substream);
+}
+
+static int ad198x_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                       struct hda_codec *codec,
+                                       snd_pcm_substream_t *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
+}
+
+/*
+ * Digital out
+ */
+static int ad198x_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        snd_pcm_substream_t *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+}
+
+static int ad198x_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
+                                         struct hda_codec *codec,
+                                         snd_pcm_substream_t *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+}
+
+/*
+ * Analog capture
+ */
+static int ad198x_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                      struct hda_codec *codec,
+                                      unsigned int stream_tag,
+                                      unsigned int format,
+                                      snd_pcm_substream_t *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        snd_hda_codec_setup_stream(codec, spec->adc_nid, stream_tag, 0, format);
+        return 0;
+}
+
+static int ad198x_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                      struct hda_codec *codec,
+                                      snd_pcm_substream_t *substream)
+{
+        struct ad198x_spec *spec = codec->spec;
+        snd_hda_codec_setup_stream(codec, spec->adc_nid, 0, 0, 0);
+        return 0;
+}
+
+
+/*
+ */
+static struct hda_pcm_stream ad198x_pcm_analog_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 6,
+        .nid = 0, /* fill later */
+        .ops = {
+                .open = ad198x_playback_pcm_open,
+                .prepare = ad198x_playback_pcm_prepare,
+                .cleanup = ad198x_playback_pcm_cleanup
+        },
+};
+
+static struct hda_pcm_stream ad198x_pcm_analog_capture = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0, /* fill later */
+        .ops = {
+                .prepare = ad198x_capture_pcm_prepare,
+                .cleanup = ad198x_capture_pcm_cleanup
+        },
+};
+
+static struct hda_pcm_stream ad198x_pcm_digital_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0, /* fill later */
+        .ops = {
+                .open = ad198x_dig_playback_pcm_open,
+                .close = ad198x_dig_playback_pcm_close
+        },
+};
+
+static int ad198x_build_pcms(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
+
+        codec->num_pcms = 1;
+        codec->pcm_info = info;
+
+        info->name = "AD198x Analog";
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_analog_playback;
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->multiout.max_channels;
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
+        info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_analog_capture;
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nid;
+
+        if (spec->multiout.dig_out_nid) {
+                info++;
+                codec->num_pcms++;
+                info->name = "AD198x Digital";
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_digital_playback;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
+        }
+
+        return 0;
+}
+
+static void ad198x_free(struct hda_codec *codec)
+{
+        kfree(codec->spec);
+}
+
+#ifdef CONFIG_PM
+static int ad198x_resume(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+
+        ad198x_init(codec);
+        snd_hda_resume_ctls(codec, spec->mixers);
+        snd_hda_resume_spdif_out(codec);
+        return 0;
+}
+#endif
+
+static struct hda_codec_ops ad198x_patch_ops = {
+        .build_controls = ad198x_build_controls,
+        .build_pcms = ad198x_build_pcms,
+        .init = ad198x_init,
+        .free = ad198x_free,
+#ifdef CONFIG_PM
+        .resume = ad198x_resume,
+#endif
+};
+
+
+/*
+ * AD1986A specific
+ */
+
 #define AD1986A_SPDIF_OUT       0x02
 #define AD1986A_FRONT_DAC       0x03
 #define AD1986A_SURR_DAC        0x04
@@ -68,7 +294,7 @@ static struct hda_input_mux ad1986a_capture_source = {
 static int ad1986a_pcm_amp_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad1986a_spec *ad = codec->spec;
+        struct ad198x_spec *ad = codec->spec;
 
         down(&ad->amp_mutex);
         snd_hda_mixer_amp_volume_get(kcontrol, ucontrol);
@@ -79,7 +305,7 @@ static int ad1986a_pcm_amp_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
 static int ad1986a_pcm_amp_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad1986a_spec *ad = codec->spec;
+        struct ad198x_spec *ad = codec->spec;
         int i, change = 0;
 
         down(&ad->amp_mutex);
@@ -92,12 +318,12 @@ static int ad1986a_pcm_amp_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
         return change;
 }
 
-#define ad1986a_pcm_amp_sw_info         snd_hda_mixer_amp_volume_info
+#define ad1986a_pcm_amp_sw_info         snd_hda_mixer_amp_switch_info
 
 static int ad1986a_pcm_amp_sw_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad1986a_spec *ad = codec->spec;
+        struct ad198x_spec *ad = codec->spec;
 
         down(&ad->amp_mutex);
         snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
@@ -108,7 +334,7 @@ static int ad1986a_pcm_amp_sw_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 static int ad1986a_pcm_amp_sw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad1986a_spec *ad = codec->spec;
+        struct ad198x_spec *ad = codec->spec;
         int i, change = 0;
 
         down(&ad->amp_mutex);
@@ -122,32 +348,6 @@ static int ad1986a_pcm_amp_sw_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 /*
- * input MUX handling
- */
-static int ad1986a_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{
-        return snd_hda_input_mux_info(&ad1986a_capture_source, uinfo);
-}
-
-static int ad1986a_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad1986a_spec *spec = codec->spec;
-
-        ucontrol->value.enumerated.item[0] = spec->cur_mux;
-        return 0;
-}
-
-static int ad1986a_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad1986a_spec *spec = codec->spec;
-
-        return snd_hda_input_mux_put(codec, &ad1986a_capture_source, ucontrol,
-                                     AD1986A_ADC, &spec->cur_mux);
-}
-
-/*
  * mixers
  */
 static snd_kcontrol_new_t ad1986a_mixers[] = {
@@ -194,9 +394,9 @@ static snd_kcontrol_new_t ad1986a_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Capture Source",
-                .info = ad1986a_mux_enum_info,
-                .get = ad1986a_mux_enum_get,
-                .put = ad1986a_mux_enum_put,
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
         },
         HDA_CODEC_MUTE("Stereo Downmix Switch", 0x09, 0x0, HDA_OUTPUT),
         { } /* end */
@@ -241,183 +441,328 @@ static struct hda_verb ad1986a_init_verbs[] = {
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
         {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
         {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* HP Pin */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        /* Front, Surround, CLFE Pins */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* Mono Pin */
+        {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* Mic Pin */
+        {0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* Line, Aux, CD, Beep-In Pin */
+        {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        {0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
         { } /* end */
 };
 
 
-static int ad1986a_init(struct hda_codec *codec)
+static int patch_ad1986a(struct hda_codec *codec)
 {
-        snd_hda_sequence_write(codec, ad1986a_init_verbs);
-        return 0;
-}
+        struct ad198x_spec *spec;
 
-static int ad1986a_build_controls(struct hda_codec *codec)
-{
-        int err;
+        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        init_MUTEX(&spec->amp_mutex);
+        codec->spec = spec;
+
+        spec->multiout.max_channels = 6;
+        spec->multiout.num_dacs = ARRAY_SIZE(ad1986a_dac_nids);
+        spec->multiout.dac_nids = ad1986a_dac_nids;
+        spec->multiout.dig_out_nid = AD1986A_SPDIF_OUT;
+        spec->adc_nid = AD1986A_ADC;
+        spec->input_mux = &ad1986a_capture_source;
+        spec->mixers = ad1986a_mixers;
+        spec->init_verbs = ad1986a_init_verbs;
+
+        codec->patch_ops = ad198x_patch_ops;
 
-        err = snd_hda_add_new_ctls(codec, ad1986a_mixers);
-        if (err < 0)
-                return err;
-        err = snd_hda_create_spdif_out_ctls(codec, AD1986A_SPDIF_OUT);
-        if (err < 0)
-                return err;
         return 0;
 }
 
 /*
- * Analog playback callbacks
+ * AD1983 specific
  */
-static int ad1986a_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                     struct hda_codec *codec,
-                                     snd_pcm_substream_t *substream)
-{
-        struct ad1986a_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
-}
 
-static int ad1986a_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        unsigned int stream_tag,
-                                        unsigned int format,
-                                        snd_pcm_substream_t *substream)
-{
-        struct ad1986a_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
-                                                format, substream);
-}
+#define AD1983_SPDIF_OUT        0x02
+#define AD1983_DAC              0x03
+#define AD1983_ADC              0x04
 
-static int ad1986a_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        snd_pcm_substream_t *substream)
-{
-        struct ad1986a_spec *spec = codec->spec;
-        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
-}
+static hda_nid_t ad1983_dac_nids[1] = { AD1983_DAC };
+
+static struct hda_input_mux ad1983_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Line", 0x1 },
+                { "Mix", 0x2 },
+                { "Mix Mono", 0x3 },
+        },
+};
 
 /*
- * Digital out
+ * SPDIF playback route
  */
-static int ad1986a_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                         struct hda_codec *codec,
-                                         snd_pcm_substream_t *substream)
+static int ad1983_spdif_route_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
 {
-        struct ad1986a_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+        static char *texts[] = { "PCM", "ADC" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item > 1)
+                uinfo->value.enumerated.item = 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
 }
 
-static int ad1986a_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                          struct hda_codec *codec,
-                                          snd_pcm_substream_t *substream)
+static int ad1983_spdif_route_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
-        struct ad1986a_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
-}
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
 
-/*
- * Analog capture
- */
-static int ad1986a_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       unsigned int stream_tag,
-                                       unsigned int format,
-                                       snd_pcm_substream_t *substream)
-{
-        snd_hda_codec_setup_stream(codec, AD1986A_ADC, stream_tag, 0, format);
+        ucontrol->value.enumerated.item[0] = spec->spdif_route;
         return 0;
 }
 
-static int ad1986a_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       snd_pcm_substream_t *substream)
+static int ad1983_spdif_route_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
-        snd_hda_codec_setup_stream(codec, AD1986A_ADC, 0, 0, 0);
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct ad198x_spec *spec = codec->spec;
+
+        if (spec->spdif_route != ucontrol->value.enumerated.item[0]) {
+                spec->spdif_route = ucontrol->value.enumerated.item[0];
+                snd_hda_codec_write(codec, spec->multiout.dig_out_nid, 0,
+                                    AC_VERB_SET_CONNECT_SEL, spec->spdif_route);
+                return 1;
+        }
         return 0;
 }
 
-
-/*
- */
-static struct hda_pcm_stream ad1986a_pcm_analog_playback = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 6,
-        .nid = AD1986A_FRONT_DAC, /* NID to query formats and rates */
-        .ops = {
-                .open = ad1986a_playback_pcm_open,
-                .prepare = ad1986a_playback_pcm_prepare,
-                .cleanup = ad1986a_playback_pcm_cleanup
+static snd_kcontrol_new_t ad1983_mixers[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("PC Speaker Playback Volume", 0x10, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("PC Speaker Playback Switch", 0x10, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
         },
-};
-
-static struct hda_pcm_stream ad1986a_pcm_analog_capture = {
-        .substreams = 2,
-        .channels_min = 2,
-        .channels_max = 2,
-        .nid = AD1986A_ADC, /* NID to query formats and rates */
-        .ops = {
-                .prepare = ad1986a_capture_pcm_prepare,
-                .cleanup = ad1986a_capture_pcm_cleanup
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "IEC958 Playback Route",
+                .info = ad1983_spdif_route_info,
+                .get = ad1983_spdif_route_get,
+                .put = ad1983_spdif_route_put,
         },
+        { } /* end */
 };
 
-static struct hda_pcm_stream ad1986a_pcm_digital_playback = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 2,
-        .nid = AD1986A_SPDIF_OUT, 
-        .ops = {
-                .open = ad1986a_dig_playback_pcm_open,
-                .close = ad1986a_dig_playback_pcm_close
-        },
+static struct hda_verb ad1983_init_verbs[] = {
+        /* Front, HP, Mono; mute as default */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Beep, PCM, Mic, Line-In: mute */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Front, HP selectors; from Mix */
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x06, AC_VERB_SET_CONNECT_SEL, 0x01},
+        /* Mono selector; from Mix */
+        {0x0b, AC_VERB_SET_CONNECT_SEL, 0x03},
+        /* Mic selector; Mic */
+        {0x0c, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* Line-in selector: Line-in */
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* Mic boost: 0dB */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        /* Record selector: mic */
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x0},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* SPDIF route: PCM */
+        {0x02, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* Front Pin */
+        {0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* HP Pin */
+        {0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        /* Mono Pin */
+        {0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* Mic Pin */
+        {0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* Line Pin */
+        {0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { } /* end */
 };
 
-static int ad1986a_build_pcms(struct hda_codec *codec)
+static int patch_ad1983(struct hda_codec *codec)
 {
-        struct ad1986a_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
+        struct ad198x_spec *spec;
 
-        codec->num_pcms = 2;
-        codec->pcm_info = info;
+        spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
 
-        info->name = "AD1986A Analog";
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad1986a_pcm_analog_playback;
-        info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad1986a_pcm_analog_capture;
-        info++;
+        init_MUTEX(&spec->amp_mutex);
+        codec->spec = spec;
+
+        spec->multiout.max_channels = 2;
+        spec->multiout.num_dacs = ARRAY_SIZE(ad1983_dac_nids);
+        spec->multiout.dac_nids = ad1983_dac_nids;
+        spec->multiout.dig_out_nid = AD1983_SPDIF_OUT;
+        spec->adc_nid = AD1983_ADC;
+        spec->input_mux = &ad1983_capture_source;
+        spec->mixers = ad1983_mixers;
+        spec->init_verbs = ad1983_init_verbs;
+        spec->spdif_route = 0;
 
-        info->name = "AD1986A Digital";
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad1986a_pcm_digital_playback;
+        codec->patch_ops = ad198x_patch_ops;
 
         return 0;
 }
 
-static void ad1986a_free(struct hda_codec *codec)
-{
-        kfree(codec->spec);
-}
 
-#ifdef CONFIG_PM
-static int ad1986a_resume(struct hda_codec *codec)
-{
-        ad1986a_init(codec);
-        snd_hda_resume_ctls(codec, ad1986a_mixers);
-        snd_hda_resume_spdif_out(codec);
-        return 0;
-}
-#endif
+/*
+ * AD1981 HD specific
+ */
 
-static struct hda_codec_ops ad1986a_patch_ops = {
-        .build_controls = ad1986a_build_controls,
-        .build_pcms = ad1986a_build_pcms,
-        .init = ad1986a_init,
-        .free = ad1986a_free,
-#ifdef CONFIG_PM
-        .resume = ad1986a_resume,
-#endif
+#define AD1981_SPDIF_OUT        0x02
+#define AD1981_DAC              0x03
+#define AD1981_ADC              0x04
+
+static hda_nid_t ad1981_dac_nids[1] = { AD1981_DAC };
+
+/* 0x0c, 0x09, 0x0e, 0x0f, 0x19, 0x05, 0x18, 0x17 */
+static struct hda_input_mux ad1981_capture_source = {
+        .num_items = 7,
+        .items = {
+                { "Front Mic", 0x0 },
+                { "Line", 0x1 },
+                { "Mix", 0x2 },
+                { "Mix Mono", 0x3 },
+                { "CD", 0x4 },
+                { "Mic", 0x6 },
+                { "Aux", 0x7 },
+        },
 };
 
-static int patch_ad1986a(struct hda_codec *codec)
+static snd_kcontrol_new_t ad1981_mixers[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Aux Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Aux Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("PC Speaker Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE_MONO("PC Speaker Playback Switch", 0x0d, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
+        },
+        /* identical with AD1983 */
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "IEC958 Playback Route",
+                .info = ad1983_spdif_route_info,
+                .get = ad1983_spdif_route_get,
+                .put = ad1983_spdif_route_put,
+        },
+        { } /* end */
+};
+
+static struct hda_verb ad1981_init_verbs[] = {
+        /* Front, HP, Mono; mute as default */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Beep, PCM, Front Mic, Line, Rear Mic, Aux, CD-In: mute */
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Front, HP selectors; from Mix */
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x06, AC_VERB_SET_CONNECT_SEL, 0x01},
+        /* Mono selector; from Mix */
+        {0x0b, AC_VERB_SET_CONNECT_SEL, 0x03},
+        /* Mic Mixer; select Front Mic */
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* Mic boost: 0dB */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        /* Record selector: Front mic */
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x0},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* SPDIF route: PCM */
+        {0x02, AC_VERB_SET_CONNECT_SEL, 0x0},
+        /* Front Pin */
+        {0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* HP Pin */
+        {0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        /* Mono Pin */
+        {0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        /* Front & Rear Mic Pins */
+        {0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        /* Line Pin */
+        {0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        /* Digital Beep */
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* Line-Out as Input: disabled */
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        { } /* end */
+};
+
+static int patch_ad1981(struct hda_codec *codec)
 {
-        struct ad1986a_spec *spec;
+        struct ad198x_spec *spec;
 
         spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -426,20 +771,28 @@ static int patch_ad1986a(struct hda_codec *codec)
         init_MUTEX(&spec->amp_mutex);
         codec->spec = spec;
 
-        spec->multiout.max_channels = 6;
-        spec->multiout.num_dacs = ARRAY_SIZE(ad1986a_dac_nids);
-        spec->multiout.dac_nids = ad1986a_dac_nids;
-        spec->multiout.dig_out_nid = AD1986A_SPDIF_OUT;
+        spec->multiout.max_channels = 2;
+        spec->multiout.num_dacs = ARRAY_SIZE(ad1981_dac_nids);
+        spec->multiout.dac_nids = ad1981_dac_nids;
+        spec->multiout.dig_out_nid = AD1981_SPDIF_OUT;
+        spec->adc_nid = AD1981_ADC;
+        spec->input_mux = &ad1981_capture_source;
+        spec->mixers = ad1981_mixers;
+        spec->init_verbs = ad1981_init_verbs;
+        spec->spdif_route = 0;
 
-        codec->patch_ops = ad1986a_patch_ops;
+        codec->patch_ops = ad198x_patch_ops;
 
         return 0;
 }
 
+
 /*
  * patch entries
  */
 struct hda_codec_preset snd_hda_preset_analog[] = {
+        { .id = 0x11d41981, .name = "AD1981", .patch = patch_ad1981 },
+        { .id = 0x11d41983, .name = "AD1983", .patch = patch_ad1983 },
         { .id = 0x11d41986, .name = "AD1986A", .patch = patch_ad1986a },
         {} /* terminator */
 };
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index b7cc8e4bffb7..2d6e3e3d0a38 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -29,6 +29,7 @@
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
+#define NUM_PINS        11
 
 
 /* board config type */
@@ -38,6 +39,7 @@ enum {
         CMI_FULL,       /* back 6-jack + front-panel 2-jack */
         CMI_FULL_DIG,   /* back 6-jack + front-panel 2-jack + digital I/O */
         CMI_ALLOUT,     /* back 5-jack + front-panel 2-jack + digital out */
+        CMI_AUTO,       /* let driver guess it */
 };
 
 struct cmi_spec {
@@ -48,6 +50,8 @@ struct cmi_spec {
 
         /* playback */
         struct hda_multi_out multiout;
+        hda_nid_t dac_nids[4];          /* NID for each DAC */
+        int num_dacs;
 
         /* capture */
         hda_nid_t *adc_nids;
@@ -63,8 +67,30 @@ struct cmi_spec {
         const struct cmi_channel_mode *channel_modes;
 
         struct hda_pcm pcm_rec[2];      /* PCM information */
+
+        /* pin deafault configuration */
+        hda_nid_t pin_nid[NUM_PINS];
+        unsigned int def_conf[NUM_PINS];
+        unsigned int pin_def_confs;
+
+        /* multichannel pins */
+        hda_nid_t multich_pin[4];       /* max 8-channel */
+        struct hda_verb multi_init[9];  /* 2 verbs for each pin + terminator */
 };
 
+/* amp values */
+#define AMP_IN_MUTE(idx)        (0x7080 | ((idx)<<8))
+#define AMP_IN_UNMUTE(idx)      (0x7000 | ((idx)<<8))
+#define AMP_OUT_MUTE    0xb080
+#define AMP_OUT_UNMUTE  0xb000
+#define AMP_OUT_ZERO    0xb000
+/* pinctl values */
+#define PIN_IN          0x20
+#define PIN_VREF80      0x24
+#define PIN_VREF50      0x21
+#define PIN_OUT         0x40
+#define PIN_HP          0xc0
+
 /*
  * input MUX
  */
@@ -102,9 +128,9 @@ static int cmi_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon
 /* 3-stack / 2 channel */
 static struct hda_verb cmi9880_ch2_init[] = {
         /* set line-in PIN for input */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* set mic PIN for input, also enable vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* route front PCM (DAC1) to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
         {}
@@ -113,9 +139,9 @@ static struct hda_verb cmi9880_ch2_init[] = {
 /* 3-stack / 6 channel */
 static struct hda_verb cmi9880_ch6_init[] = {
         /* set line-in PIN for output */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* set mic PIN for output */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* route front PCM (DAC1) to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
         {}
@@ -124,9 +150,9 @@ static struct hda_verb cmi9880_ch6_init[] = {
 /* 3-stack+front / 8 channel */
 static struct hda_verb cmi9880_ch8_init[] = {
         /* set line-in PIN for output */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* set mic PIN for output */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* route rear-surround PCM (DAC4) to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x03 },
         {}
@@ -269,25 +295,27 @@ static hda_nid_t cmi9880_adc_nids[2] = {
  */
 static struct hda_verb cmi9880_basic_init[] = {
         /* port-D for line out (rear panel) */
-        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-E for HP out (front panel) */
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* route front PCM to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
         /* port-A for surround (rear panel) */
-        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-G for CLFE (rear panel) */
-        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },
         /* port-H for side (rear panel) */
-        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },
         /* port-C for line-in (rear panel) */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* port-B for mic-in (rear panel) with vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* port-F for mic-in (front panel) with vref */
-        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* CD-in */
-        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* route front mic to ADC1/2 */
         { 0x08, AC_VERB_SET_CONNECT_SEL, 0x05 },
         { 0x09, AC_VERB_SET_CONNECT_SEL, 0x05 },
@@ -296,23 +324,27 @@ static struct hda_verb cmi9880_basic_init[] = {
 
 static struct hda_verb cmi9880_allout_init[] = {
         /* port-D for line out (rear panel) */
-        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-E for HP out (front panel) */
-        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* route front PCM to HP */
         { 0x0f, AC_VERB_SET_CONNECT_SEL, 0x00 },
         /* port-A for side (rear panel) */
-        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-G for CLFE (rear panel) */
-        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x1f, AC_VERB_SET_CONNECT_SEL, 0x02 },
+        /* port-H for side (rear panel) */
+        { 0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+        { 0x20, AC_VERB_SET_CONNECT_SEL, 0x01 },
         /* port-C for surround (rear panel) */
-        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
+        { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-B for mic-in (rear panel) with vref */
-        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* port-F for mic-in (front panel) with vref */
-        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+        { 0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         /* CD-in */
-        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
+        { 0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* route front mic to ADC1/2 */
         { 0x08, AC_VERB_SET_CONNECT_SEL, 0x05 },
         { 0x09, AC_VERB_SET_CONNECT_SEL, 0x05 },
@@ -347,6 +379,81 @@ static int cmi9880_build_controls(struct hda_codec *codec)
         return 0;
 }
 
+/* fill in the multi_dac_nids table, which will decide
+   which audio widget to use for each channel */
+static int cmi9880_fill_multi_dac_nids(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
+{
+        struct cmi_spec *spec = codec->spec;
+        hda_nid_t nid;
+        int assigned[4];
+        int i, j;
+
+        /* clear the table, only one c-media dac assumed here */
+        memset(spec->dac_nids, 0, sizeof(spec->dac_nids));
+        memset(assigned, 0, sizeof(assigned));
+        /* check the pins we found */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                /* nid 0x0b~0x0e is hardwired to audio widget 0x3~0x6 */
+                if (nid >= 0x0b && nid <= 0x0e) {
+                        spec->dac_nids[i] = (nid - 0x0b) + 0x03;
+                        assigned[nid - 0x0b] = 1;
+                }
+        }
+        /* left pin can be connect to any audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                if (nid <= 0x0e)
+                        continue;
+                /* search for an empty channel */
+                for (j = 0; j < cfg->line_outs; j++) {
+                        if (! assigned[j]) {
+                                spec->dac_nids[i] = i + 0x03;
+                                assigned[j] = 1;
+                                break;
+                        }
+                }
+        }
+        spec->num_dacs = cfg->line_outs;
+        return 0;
+}
+
+/* create multi_init table, which is used for multichannel initialization */
+static int cmi9880_fill_multi_init(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
+{
+        struct cmi_spec *spec = codec->spec;
+        hda_nid_t nid;
+        int i, j, k, len;
+
+        /* clear the table, only one c-media dac assumed here */
+        memset(spec->multi_init, 0, sizeof(spec->multi_init));
+        for (j = 0, i = 0; i < cfg->line_outs; i++) {
+                hda_nid_t conn[4];
+                nid = cfg->line_out_pins[i];
+                /* set as output */
+                spec->multi_init[j].nid = nid;
+                spec->multi_init[j].verb = AC_VERB_SET_PIN_WIDGET_CONTROL;
+                spec->multi_init[j].param = PIN_OUT;
+                j++;
+                if (nid > 0x0e) {
+                        /* set connection */
+                        spec->multi_init[j].nid = nid;
+                        spec->multi_init[j].verb = AC_VERB_SET_CONNECT_SEL;
+                        spec->multi_init[j].param = 0;
+                        /* find the index in connect list */
+                        len = snd_hda_get_connections(codec, nid, conn, 4);
+                        for (k = 0; k < len; k++)
+                                if (conn[k] == spec->dac_nids[i]) {
+                                        spec->multi_init[j].param = j;
+                                        break;
+                                }
+                        j++;
+                        break;
+                }
+        }
+        return 0;
+}
+
 static int cmi9880_init(struct hda_codec *codec)
 {
         struct cmi_spec *spec = codec->spec;
@@ -354,6 +461,8 @@ static int cmi9880_init(struct hda_codec *codec)
                 snd_hda_sequence_write(codec, cmi9880_allout_init);
         else
                 snd_hda_sequence_write(codec, cmi9880_basic_init);
+        if (spec->board_config == CMI_AUTO)
+                snd_hda_sequence_write(codec, spec->multi_init);
         return 0;
 }
 
@@ -540,6 +649,7 @@ static struct hda_board_config cmi9880_cfg_tbl[] = {
         { .modelname = "full", .config = CMI_FULL },
         { .modelname = "full_dig", .config = CMI_FULL_DIG },
         { .modelname = "allout", .config = CMI_ALLOUT },
+        { .modelname = "auto", .config = CMI_AUTO },
         {} /* terminator */
 };
 
@@ -564,10 +674,14 @@ static int patch_cmi9880(struct hda_codec *codec)
         codec->spec = spec;
         spec->board_config = snd_hda_check_board_config(codec, cmi9880_cfg_tbl);
         if (spec->board_config < 0) {
-                snd_printd(KERN_INFO "hda_codec: Unknown model for CMI9880\n");
-                spec->board_config = CMI_FULL_DIG; /* try everything */
+                snd_printdd(KERN_INFO "hda_codec: Unknown model for CMI9880\n");
+                spec->board_config = CMI_AUTO; /* try everything */
         }
 
+        /* copy default DAC NIDs */
+        memcpy(spec->dac_nids, cmi9880_dac_nids, sizeof(spec->dac_nids));
+        spec->num_dacs = 4;
+
         switch (spec->board_config) {
         case CMI_MINIMAL:
         case CMI_MIN_FP:
@@ -599,10 +713,58 @@ static int patch_cmi9880(struct hda_codec *codec)
                 spec->input_mux = &cmi9880_no_line_mux;
                 spec->multiout.dig_out_nid = CMI_DIG_OUT_NID;
                 break;
+        case CMI_AUTO:
+                {
+                unsigned int port_e, port_f, port_g, port_h;
+                unsigned int port_spdifi, port_spdifo;
+                struct auto_pin_cfg cfg;
+
+                /* collect pin default configuration */
+                port_e = snd_hda_codec_read(codec, 0x0f, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                port_f = snd_hda_codec_read(codec, 0x10, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                spec->front_panel = 1;
+                if (get_defcfg_connect(port_e) == AC_JACK_PORT_NONE ||
+                    get_defcfg_connect(port_f) == AC_JACK_PORT_NONE) {
+                        port_g = snd_hda_codec_read(codec, 0x1f, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        port_h = snd_hda_codec_read(codec, 0x20, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        spec->surr_switch = 1;
+                        /* no front panel */
+                        if (get_defcfg_connect(port_g) == AC_JACK_PORT_NONE ||
+                            get_defcfg_connect(port_h) == AC_JACK_PORT_NONE) {
+                                /* no optional rear panel */
+                                spec->board_config = CMI_MINIMAL;
+                                spec->front_panel = 0;
+                                spec->num_ch_modes = 2;
+                        } else {
+                                spec->board_config = CMI_MIN_FP;
+                                spec->num_ch_modes = 3;
+                        }
+                        spec->channel_modes = cmi9880_channel_modes;
+                        spec->input_mux = &cmi9880_basic_mux;
+                        spec->multiout.max_channels = cmi9880_channel_modes[0].channels;
+                } else {
+                        spec->input_mux = &cmi9880_basic_mux;
+                        port_spdifi = snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        port_spdifo = snd_hda_codec_read(codec, 0x12, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        if (get_defcfg_connect(port_spdifo) != AC_JACK_PORT_NONE)
+                                spec->multiout.dig_out_nid = CMI_DIG_OUT_NID;
+                        if (get_defcfg_connect(port_spdifi) != AC_JACK_PORT_NONE)
+                                spec->dig_in_nid = CMI_DIG_IN_NID;
+                        spec->multiout.max_channels = 8;
+                }
+                snd_hda_parse_pin_def_config(codec, &cfg);
+                if (cfg.line_outs) {
+                        spec->multiout.max_channels = cfg.line_outs * 2;
+                        cmi9880_fill_multi_dac_nids(codec, &cfg);
+                        cmi9880_fill_multi_init(codec, &cfg);
+                } else
+                        snd_printd("patch_cmedia: cannot detect association in defcfg\n");
+                break;
+                }
         }
 
-        spec->multiout.num_dacs = 4;
-        spec->multiout.dac_nids = cmi9880_dac_nids;
+        spec->multiout.num_dacs = spec->num_dacs;
+        spec->multiout.dac_nids = spec->dac_nids;
 
         spec->adc_nids = cmi9880_adc_nids;
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 17c5062423ae..9edd558d6bd3 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -33,38 +33,73 @@
 
 /* ALC880 board config type */
 enum {
-        ALC880_MINIMAL,
         ALC880_3ST,
         ALC880_3ST_DIG,
         ALC880_5ST,
         ALC880_5ST_DIG,
         ALC880_W810,
+        ALC880_Z71V,
+        ALC880_AUTO,
+        ALC880_6ST_DIG,
+        ALC880_F1734,
+        ALC880_ASUS,
+        ALC880_ASUS_DIG,
+        ALC880_ASUS_W1V,
+        ALC880_UNIWILL_DIG,
+#ifdef CONFIG_SND_DEBUG
+        ALC880_TEST,
+#endif
+        ALC880_MODEL_LAST /* last tag */
+};
+
+/* ALC260 models */
+enum {
+        ALC260_BASIC,
+        ALC260_HP,
+        ALC260_MODEL_LAST /* last tag */
 };
 
+/* amp values */
+#define AMP_IN_MUTE(idx)        (0x7080 | ((idx)<<8))
+#define AMP_IN_UNMUTE(idx)      (0x7000 | ((idx)<<8))
+#define AMP_OUT_MUTE    0xb080
+#define AMP_OUT_UNMUTE  0xb000
+#define AMP_OUT_ZERO    0xb000
+/* pinctl values */
+#define PIN_IN          0x20
+#define PIN_VREF80      0x24
+#define PIN_VREF50      0x21
+#define PIN_OUT         0x40
+#define PIN_HP          0xc0
+
 struct alc_spec {
         /* codec parameterization */
-        unsigned int front_panel: 1;
-
-        snd_kcontrol_new_t* mixers[2];
+        snd_kcontrol_new_t *mixers[3];  /* mixer arrays */
         unsigned int num_mixers;
 
-        struct hda_verb *init_verbs;
+        const struct hda_verb *init_verbs[3];   /* initialization verbs
+                                                 * don't forget NULL termination!
+                                                 */
+        unsigned int num_init_verbs;
 
-        char* stream_name_analog;
+        char *stream_name_analog;       /* analog PCM stream */
         struct hda_pcm_stream *stream_analog_playback;
         struct hda_pcm_stream *stream_analog_capture;
 
-        char* stream_name_digital;
+        char *stream_name_digital;      /* digital PCM stream */ 
         struct hda_pcm_stream *stream_digital_playback;
         struct hda_pcm_stream *stream_digital_capture;
 
         /* playback */
-        struct hda_multi_out multiout;
+        struct hda_multi_out multiout;  /* playback set-up
+                                         * max_channels, dacs must be set
+                                         * dig_out_nid and hp_nid are optional
+                                         */
 
         /* capture */
         unsigned int num_adc_nids;
         hda_nid_t *adc_nids;
-        hda_nid_t dig_in_nid;
+        hda_nid_t dig_in_nid;           /* digital-in NID; optional */
 
         /* capture source */
         const struct hda_input_mux *input_mux;
@@ -75,61 +110,17 @@ struct alc_spec {
         int num_channel_mode;
 
         /* PCM information */
-        struct hda_pcm pcm_rec[2];
-};
-
-/* DAC/ADC assignment */
-
-static hda_nid_t alc880_dac_nids[4] = {
-        /* front, rear, clfe, rear_surr */
-        0x02, 0x05, 0x04, 0x03
-};
-
-static hda_nid_t alc880_w810_dac_nids[3] = {
-        /* front, rear/surround, clfe */
-        0x02, 0x03, 0x04
-};
-
-static hda_nid_t alc880_adc_nids[3] = {
-        /* ADC0-2 */
-        0x07, 0x08, 0x09,
-};
-
-#define ALC880_DIGOUT_NID       0x06
-#define ALC880_DIGIN_NID        0x0a
+        struct hda_pcm pcm_rec[2];      /* used in alc_build_pcms() */
 
-static hda_nid_t alc260_dac_nids[1] = {
-        /* front */
-        0x02,
-};
+        struct semaphore bind_mutex;    /* for bound controls */
 
-static hda_nid_t alc260_adc_nids[2] = {
-        /* ADC0-1 */
-        0x04, 0x05,
+        /* dynamic controls, init_verbs and input_mux */
+        struct auto_pin_cfg autocfg;
+        unsigned int num_kctl_alloc, num_kctl_used;
+        snd_kcontrol_new_t *kctl_alloc;
+        struct hda_input_mux private_imux;
 };
 
-#define ALC260_DIGOUT_NID       0x03
-#define ALC260_DIGIN_NID        0x06
-
-static struct hda_input_mux alc880_capture_source = {
-        .num_items = 4,
-        .items = {
-                { "Mic", 0x0 },
-                { "Front Mic", 0x3 },
-                { "Line", 0x2 },
-                { "CD", 0x4 },
-        },
-};
-
-static struct hda_input_mux alc260_capture_source = {
-        .num_items = 4,
-        .items = {
-                { "Mic", 0x0 },
-                { "Front Mic", 0x1 },
-                { "Line", 0x2 },
-                { "CD", 0x4 },
-        },
-};
 
 /*
  * input MUX handling
@@ -160,6 +151,7 @@ static int alc_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon
                                      spec->adc_nids[adc_idx], &spec->cur_mux[adc_idx]);
 }
 
+
 /*
  * channel mode setting
  */
@@ -168,135 +160,18 @@ struct alc_channel_mode {
         const struct hda_verb *sequence;
 };
 
-
-/*
- * channel source setting (2/6 channel selection for 3-stack)
- */
-
-/*
- * set the path ways for 2 channel output
- * need to set the codec line out and mic 1 pin widgets to inputs
- */
-static struct hda_verb alc880_threestack_ch2_init[] = {
-        /* set pin widget 1Ah (line in) for input */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* set pin widget 18h (mic1) for input, for mic also enable the vref */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
-        /* mute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
-        /* mute for Mic1 PW */
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
-        { } /* end */
-};
-
-/*
- * 6ch mode
- * need to set the codec line out and mic 1 pin widgets to outputs
- */
-static struct hda_verb alc880_threestack_ch6_init[] = {
-        /* set pin widget 1Ah (line in) for output */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* set pin widget 18h (mic1) for output */
-        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* unmute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },
-        /* unmute for Mic1 PW */
-        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },
-        /* for rear channel output using Line In 1
-         * set select widget connection (nid = 0x12) - to summer node
-         * for rear NID = 0x0f...offset 3 in connection list
-         */
-        { 0x12, AC_VERB_SET_CONNECT_SEL, 0x3 },
-        /* for Mic1 - retask for center/lfe */
-        /* set select widget connection (nid = 0x10) - to summer node for
-         * front CLFE NID = 0x0e...offset 2 in connection list
-         */
-        { 0x10, AC_VERB_SET_CONNECT_SEL, 0x2 },
-        { } /* end */
-};
-
-static struct alc_channel_mode alc880_threestack_modes[2] = {
-        { 2, alc880_threestack_ch2_init },
-        { 6, alc880_threestack_ch6_init },
-};
-
-
-/*
- * channel source setting (6/8 channel selection for 5-stack)
- */
-
-/* set the path ways for 6 channel output
- * need to set the codec line out and mic 1 pin widgets to inputs
- */
-static struct hda_verb alc880_fivestack_ch6_init[] = {
-        /* set pin widget 1Ah (line in) for input */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
-        /* mute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 },
-        { } /* end */
-};
-
-/* need to set the codec line out and mic 1 pin widgets to outputs */
-static struct hda_verb alc880_fivestack_ch8_init[] = {
-        /* set pin widget 1Ah (line in) for output */
-        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
-        /* unmute the output for Line In PW */
-        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },
-        /* output for surround channel output using Line In 1 */
-        /* set select widget connection (nid = 0x12) - to summer node
-         * for surr_rear NID = 0x0d...offset 1 in connection list
-         */
-        { 0x12, AC_VERB_SET_CONNECT_SEL, 0x1 },
-        { } /* end */
-};
-
-static struct alc_channel_mode alc880_fivestack_modes[2] = {
-        { 6, alc880_fivestack_ch6_init },
-        { 8, alc880_fivestack_ch8_init },
-};
-
-/*
- * channel source setting for W810 system
- *
- * W810 has rear IO for:
- * Front (DAC 02)
- * Surround (DAC 03)
- * Center/LFE (DAC 04)
- * Digital out (06)
- *
- * The system also has a pair of internal speakers, and a headphone jack.
- * These are both connected to Line2 on the codec, hence to DAC 02.
- * 
- * There is a variable resistor to control the speaker or headphone
- * volume. This is a hardware-only device without a software API.
- *
- * Plugging headphones in will disable the internal speakers. This is
- * implemented in hardware, not via the driver using jack sense. In
- * a similar fashion, plugging into the rear socket marked "front" will
- * disable both the speakers and headphones.
- *
- * For input, there's a microphone jack, and an "audio in" jack.
- * These may not do anything useful with this driver yet, because I
- * haven't setup any initialization verbs for these yet...
- */
-
-static struct alc_channel_mode alc880_w810_modes[1] = {
-        { 6, NULL }
-};
-
-/*
- */
 static int alc880_ch_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct alc_spec *spec = codec->spec;
+        int items = kcontrol->private_value ? (int)kcontrol->private_value : 2;
 
         snd_assert(spec->channel_mode, return -ENXIO);
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = 2;
-        if (uinfo->value.enumerated.item >= 2)
-                uinfo->value.enumerated.item = 1;
+        uinfo->value.enumerated.items = items;
+        if (uinfo->value.enumerated.item >= items)
+                uinfo->value.enumerated.item = items - 1;
         sprintf(uinfo->value.enumerated.name, "%dch",
                 spec->channel_mode[uinfo->value.enumerated.item].channels);
         return 0;
@@ -306,10 +181,16 @@ static int alc880_ch_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct alc_spec *spec = codec->spec;
+        int items = kcontrol->private_value ? (int)kcontrol->private_value : 2;
+        int i;
 
         snd_assert(spec->channel_mode, return -ENXIO);
-        ucontrol->value.enumerated.item[0] =
-                (spec->multiout.max_channels == spec->channel_mode[0].channels) ? 0 : 1;
+        for (i = 0; i < items; i++) {
+                if (spec->multiout.max_channels == spec->channel_mode[i].channels) {
+                        ucontrol->value.enumerated.item[0] = i;
+                        break;
+                }
+        }
         return 0;
 }
 
@@ -335,21 +216,149 @@ static int alc880_ch_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc
 
 
 /*
+ * bound volume controls
+ *
+ * bind multiple volumes (# indices, from 0)
+ */
+
+#define AMP_VAL_IDX_SHIFT       19
+#define AMP_VAL_IDX_MASK        (0x0f<<19)
+
+static int alc_bind_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        unsigned long pval;
+
+        down(&spec->bind_mutex);
+        pval = kcontrol->private_value;
+        kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
+        snd_hda_mixer_amp_switch_info(kcontrol, uinfo);
+        kcontrol->private_value = pval;
+        up(&spec->bind_mutex);
+        return 0;
+}
+
+static int alc_bind_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        unsigned long pval;
+
+        down(&spec->bind_mutex);
+        pval = kcontrol->private_value;
+        kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
+        snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
+        kcontrol->private_value = pval;
+        up(&spec->bind_mutex);
+        return 0;
+}
+
+static int alc_bind_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        unsigned long pval;
+        int i, indices, change = 0;
+
+        down(&spec->bind_mutex);
+        pval = kcontrol->private_value;
+        indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
+        for (i = 0; i < indices; i++) {
+                kcontrol->private_value = (pval & ~AMP_VAL_IDX_MASK) | (i << AMP_VAL_IDX_SHIFT);
+                change |= snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
+        }
+        kcontrol->private_value = pval;
+        up(&spec->bind_mutex);
+        return change;
+}
+
+#define ALC_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .info = alc_bind_switch_info, \
+          .get = alc_bind_switch_get, \
+          .put = alc_bind_switch_put, \
+          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, indices, direction) }
+
+#define ALC_BIND_MUTE(xname,nid,indices,dir) ALC_BIND_MUTE_MONO(xname,nid,3,indices,dir)
+
+
+/*
+ * ALC880 3-stack model
+ *
+ * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0e)
+ * Pin assignment: Front = 0x14, Line-In/Surr = 0x1a, Mic/CLFE = 0x18, F-Mic = 0x1b
+ *                 HP = 0x19
  */
 
-/* 3-stack mode
- * Pin assignment: Front=0x14, Line-In/Rear=0x1a, Mic/CLFE=0x18, F-Mic=0x1b
- *                 HP=0x19
+static hda_nid_t alc880_dac_nids[4] = {
+        /* front, rear, clfe, rear_surr */
+        0x02, 0x05, 0x04, 0x03
+};
+
+static hda_nid_t alc880_adc_nids[3] = {
+        /* ADC0-2 */
+        0x07, 0x08, 0x09,
+};
+
+/* The datasheet says the node 0x07 is connected from inputs,
+ * but it shows zero connection in the real implementation on some devices.
  */
-static snd_kcontrol_new_t alc880_base_mixer[] = {
+static hda_nid_t alc880_adc_nids_alt[2] = {
+        /* ADC1-2 */
+        0x08, 0x09,
+};
+
+#define ALC880_DIGOUT_NID       0x06
+#define ALC880_DIGIN_NID        0x0a
+
+static struct hda_input_mux alc880_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x3 },
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
+};
+
+/* channel source setting (2/6 channel selection for 3-stack) */
+/* 2ch mode */
+static struct hda_verb alc880_threestack_ch2_init[] = {
+        /* set line-in to input, mute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        /* set mic-in to input vref 80%, mute it */
+        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        { } /* end */
+};
+
+/* 6ch mode */
+static struct hda_verb alc880_threestack_ch6_init[] = {
+        /* set line-in to output, unmute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        /* set mic-in to output, unmute it */
+        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        { } /* end */
+};
+
+static struct alc_channel_mode alc880_threestack_modes[2] = {
+        { 2, alc880_threestack_ch2_init },
+        { 6, alc880_threestack_ch6_init },
+};
+
+static snd_kcontrol_new_t alc880_three_stack_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Surround Playback Switch", 0x1a, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Surround Playback Switch", 0x0f, 2, HDA_INPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x18, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x18, 2, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        ALC_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
@@ -360,12 +369,25 @@ static snd_kcontrol_new_t alc880_base_mixer[] = {
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
         HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
         HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc880_ch_mode_info,
+                .get = alc880_ch_mode_get,
+                .put = alc880_ch_mode_put,
+        },
+        { } /* end */
+};
+
+/* capture mixer elements */
+static snd_kcontrol_new_t alc880_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 /* The multiple "Capture Source" controls confuse alsamixer
@@ -374,65 +396,125 @@ static snd_kcontrol_new_t alc880_base_mixer[] = {
                  */
                 /* .name = "Capture Source", */
                 .name = "Input Source",
-                .count = 2,
+                .count = 3,
                 .info = alc_mux_enum_info,
                 .get = alc_mux_enum_get,
                 .put = alc_mux_enum_put,
         },
+        { } /* end */
+};
+
+/* capture mixer elements (in case NID 0x07 not available) */
+static snd_kcontrol_new_t alc880_capture_alt_mixer[] = {
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Channel Mode",
-                .info = alc880_ch_mode_info,
-                .get = alc880_ch_mode_get,
-                .put = alc880_ch_mode_put,
+                /* The multiple "Capture Source" controls confuse alsamixer
+                 * So call somewhat different..
+                 * FIXME: the controls appear in the "playback" view!
+                 */
+                /* .name = "Capture Source", */
+                .name = "Input Source",
+                .count = 2,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
         },
         { } /* end */
 };
 
-/* 5-stack mode
- * Pin assignment: Front=0x14, Rear=0x17, CLFE=0x16
- *                 Line-In/Side=0x1a, Mic=0x18, F-Mic=0x1b, HP=0x19
+
+
+/*
+ * ALC880 5-stack model
+ *
+ * DAC: Front = 0x02 (0x0c), Surr = 0x05 (0x0f), CLFE = 0x04 (0x0d), Side = 0x02 (0xd)
+ * Pin assignment: Front = 0x14, Surr = 0x17, CLFE = 0x16
+ *                 Line-In/Side = 0x1a, Mic = 0x18, F-Mic = 0x1b, HP = 0x19
  */
+
+/* additional mixers to alc880_three_stack_mixer */
 static snd_kcontrol_new_t alc880_five_stack_mixer[] = {
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT),
+        { } /* end */
+};
+
+/* channel source setting (6/8 channel selection for 5-stack) */
+/* 6ch mode */
+static struct hda_verb alc880_fivestack_ch6_init[] = {
+        /* set line-in to input, mute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        { } /* end */
+};
+
+/* 8ch mode */
+static struct hda_verb alc880_fivestack_ch8_init[] = {
+        /* set line-in to output, unmute it */
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        { } /* end */
+};
+
+static struct alc_channel_mode alc880_fivestack_modes[2] = {
+        { 6, alc880_fivestack_ch6_init },
+        { 8, alc880_fivestack_ch8_init },
+};
+
+
+/*
+ * ALC880 6-stack model
+ *
+ * DAC: Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e), Side = 0x05 (0x0f)
+ * Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, Side = 0x17,
+ *   Mic = 0x18, F-Mic = 0x19, Line = 0x1a, HP = 0x1b
+ */
+
+static hda_nid_t alc880_6st_dac_nids[4] = {
+        /* front, rear, clfe, rear_surr */
+        0x02, 0x03, 0x04, 0x05
+};      
+
+static struct hda_input_mux alc880_6stack_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x1 },
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
+};
+
+/* fixed 8-channels */
+static struct alc_channel_mode alc880_sixstack_modes[1] = {
+        { 8, NULL },
+};
+
+static snd_kcontrol_new_t alc880_six_stack_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Surround Playback Switch", 0x17, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x16, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Side Playback Switch", 0x1a, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        ALC_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x3, HDA_INPUT),
-        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
         HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x19, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 2,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
-        },
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -443,39 +525,169 @@ static snd_kcontrol_new_t alc880_five_stack_mixer[] = {
         { } /* end */
 };
 
+
+/*
+ * ALC880 W810 model
+ *
+ * W810 has rear IO for:
+ * Front (DAC 02)
+ * Surround (DAC 03)
+ * Center/LFE (DAC 04)
+ * Digital out (06)
+ *
+ * The system also has a pair of internal speakers, and a headphone jack.
+ * These are both connected to Line2 on the codec, hence to DAC 02.
+ * 
+ * There is a variable resistor to control the speaker or headphone
+ * volume. This is a hardware-only device without a software API.
+ *
+ * Plugging headphones in will disable the internal speakers. This is
+ * implemented in hardware, not via the driver using jack sense. In
+ * a similar fashion, plugging into the rear socket marked "front" will
+ * disable both the speakers and headphones.
+ *
+ * For input, there's a microphone jack, and an "audio in" jack.
+ * These may not do anything useful with this driver yet, because I
+ * haven't setup any initialization verbs for these yet...
+ */
+
+static hda_nid_t alc880_w810_dac_nids[3] = {
+        /* front, rear/surround, clfe */
+        0x02, 0x03, 0x04
+};
+
+/* fixed 6 channels */
+static struct alc_channel_mode alc880_w810_modes[1] = {
+        { 6, NULL }
+};
+
+/* Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, HP = 0x1b */
 static snd_kcontrol_new_t alc880_w810_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x16, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        ALC_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x09, 0x0, HDA_INPUT),
+        { } /* end */
+};
+
+
+/*
+ * Z710V model
+ *
+ * DAC: Front = 0x02 (0x0c), HP = 0x03 (0x0d)
+ * Pin assignment: Front = 0x14, HP = 0x15, Mic = 0x18, Mic2 = 0x19(?), Line = 0x1a
+ */
+
+static hda_nid_t alc880_z71v_dac_nids[1] = {
+        0x02
+};
+#define ALC880_Z71V_HP_DAC      0x03
+
+/* fixed 2 channels */
+static struct alc_channel_mode alc880_2_jack_modes[1] = {
+        { 2, NULL }
+};
+
+static snd_kcontrol_new_t alc880_z71v_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        { } /* end */
+};
+
+
+/* FIXME! */
+/*
+ * ALC880 F1734 model
+ *
+ * DAC: HP = 0x02 (0x0c), Front = 0x03 (0x0d)
+ * Pin assignment: HP = 0x14, Front = 0x15, Mic = 0x18
+ */
+
+static hda_nid_t alc880_f1734_dac_nids[1] = {
+        0x03
+};
+#define ALC880_F1734_HP_DAC     0x02
+
+static snd_kcontrol_new_t alc880_f1734_mixer[] = {
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Internal Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        { } /* end */
+};
+
+
+/* FIXME! */
+/*
+ * ALC880 ASUS model
+ *
+ * DAC: HP/Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e)
+ * Pin assignment: HP/Front = 0x14, Surr = 0x15, CLFE = 0x16,
+ *  Mic = 0x18, Line = 0x1a
+ */
+
+#define alc880_asus_dac_nids    alc880_w810_dac_nids    /* identical with w810 */
+#define alc880_asus_modes       alc880_threestack_modes /* 2/6 channel mode */
+
+static snd_kcontrol_new_t alc880_asus_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        ALC_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* The multiple "Capture Source" controls confuse alsamixer
-                 * So call somewhat different..
-                 * FIXME: the controls appear in the "playback" view!
-                 */
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 3,
-                .info = alc_mux_enum_info,
-                .get = alc_mux_enum_get,
-                .put = alc_mux_enum_put,
+                .name = "Channel Mode",
+                .info = alc880_ch_mode_info,
+                .get = alc880_ch_mode_get,
+                .put = alc880_ch_mode_put,
         },
         { } /* end */
 };
 
+/* FIXME! */
 /*
+ * ALC880 ASUS W1V model
+ *
+ * DAC: HP/Front = 0x02 (0x0c), Surr = 0x03 (0x0d), CLFE = 0x04 (0x0e)
+ * Pin assignment: HP/Front = 0x14, Surr = 0x15, CLFE = 0x16,
+ *  Mic = 0x18, Line = 0x1a, Line2 = 0x1b
+ */
+
+/* additional mixers to alc880_asus_mixer */
+static snd_kcontrol_new_t alc880_asus_w1v_mixer[] = {
+        HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT),
+        HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT),
+        { } /* end */
+};
+
+
+/*
+ * build control elements
  */
 static int alc_build_controls(struct hda_codec *codec)
 {
@@ -502,227 +714,297 @@ static int alc_build_controls(struct hda_codec *codec)
         return 0;
 }
 
+
 /*
  * initialize the codec volumes, etc
  */
 
-static struct hda_verb alc880_init_verbs_three_stack[] = {
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* unmute amp left and right */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to line in (default select for this ADC) */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* unmute front mixer amp left (volume = 0) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute rear mixer amp left and right (volume = 0) */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute rear mixer amp left and right (volume = 0) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-
-        /* using rear surround as the path for headphone output */
-        /* unmute rear surround mixer amp left and right (volume = 0) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* PASD 3 stack boards use the Mic 2 as the headphone output */
-        /* need to program the selector associated with the Mic 2 pin widget to
-         * surround path (index 0x01) for headphone output */
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* need to retask the Mic 2 pin widget to output */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) for mixer widget(nid=0x0B)
-         * to support the input path of analog loopback
+/*
+ * generic initialization of ADC, input mixers and output mixers
+ */
+static struct hda_verb alc880_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-2 and set the default input to mic-in
+         */
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+         * mixer widget
          * Note: PASD motherboards uses the Line In 2 as the input for front panel
          * mic (mic 2)
          */
-        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
-        /* unmute CD */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic 1 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        /* unmute Line In 2 (for PASD boards Mic 2) */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
-
-        /* Unmute input amps for the line out paths to support the output path of
-         * analog loopback
-         * the mixers on the output path has 2 inputs, one from the DAC and one
-         * from the mixer
+        /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+        /*
+         * Set up output mixers (0x0c - 0x0f)
          */
-        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* Unmute Front out path */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Surround (used as HP) out path */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute C/LFE out path */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))}, /* mute */
-        /* Unmute rear Surround out path */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        /* set vol=0 to output mixers */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* set up input amps for analog loopback */
+        /* Amp Indices: DAC = 0, mixer = 1 */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
 
         { }
 };
 
-static struct hda_verb alc880_init_verbs_five_stack[] = {
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
-        /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* unmute amp left and right */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* set connection select to line in (default select for this ADC) */
-        {0x07, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* unmute front mixer amp left and right (volume = 0) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* five rear and clfe */
-        /* unmute rear mixer amp left and right (volume = 0)  */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* unmute clfe mixer amp left and right (volume = 0) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-
-        /* using rear surround as the path for headphone output */
-        /* unmute rear surround mixer amp left and right (volume = 0) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* PASD 3 stack boards use the Mic 2 as the headphone output */
-        /* need to program the selector associated with the Mic 2 pin widget to
-         * surround path (index 0x01) for headphone output
-         */
-        {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* need to retask the Mic 2 pin widget to output */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) for mixer
-         * widget(nid=0x0B) to support the input path of analog loopback
+/*
+ * 3-stack pin configuration:
+ * front = 0x14, mic/clfe = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b
+ */
+static struct hda_verb alc880_pin_3stack_init_verbs[] = {
+        /*
+         * preset connection lists of input pins
+         * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
          */
-        /* Note: PASD motherboards uses the Line In 2 as the input for front panel mic (mic 2) */
-        /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03*/
-        /* unmute CD */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic 1 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        /* unmute Line In 2 (for PASD boards Mic 2) */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x03 << 8))},
-
-        /* Unmute input amps for the line out paths to support the output path of
-         * analog loopback
-         * the mixers on the output path has 2 inputs, one from the DAC and
-         * one from the mixer
+        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */
+
+        /*
+         * Set pin mode and muting
          */
-        /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* Unmute Front out path */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Surround (used as HP) out path */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute C/LFE out path */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))}, /* mute */
-        /* Unmute rear Surround out path */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        /* set front pin widgets 0x14 for output */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Mic1 (rear panel) pin widget for input and vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Mic2 (as headphone out) for HP output */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Line In pin widget for input */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line2 (as front mic) pin widget for input and vref at 80% */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* CD pin widget for input */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 
         { }
 };
 
-static struct hda_verb alc880_w810_init_verbs[] = {
-        /* front channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-
-        /* front channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
-
-        /* front channel selector/amp: output 0: unmuted, max volume */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-
-        /* front out pin: muted, (no volume selection)  */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-
-        /* front out pin: NOT headphone enable, out enable, vref disabled */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+/*
+ * 5-stack pin configuration:
+ * front = 0x14, surround = 0x17, clfe = 0x16, mic = 0x18, HP = 0x19,
+ * line-in/side = 0x1a, f-mic = 0x1b
+ */
+static struct hda_verb alc880_pin_5stack_init_verbs[] = {
+        /*
+         * preset connection lists of input pins
+         * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
+         */
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/side */
 
+        /*
+         * Set pin mode and muting
+         */
+        /* set pin widgets 0x14-0x17 for output */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* unmute pins for output (no gain on this amp) */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
 
-        /* surround channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
+        /* Mic1 (rear panel) pin widget for input and vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Mic2 (as headphone out) for HP output */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Line In pin widget for input */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line2 (as front mic) pin widget for input and vref at 80% */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* CD pin widget for input */
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 
-        /* surround channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
+        { }
+};
 
-        /* surround channel selector/amp: output 0: unmuted, max volume */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+/*
+ * W810 pin configuration:
+ * front = 0x14, surround = 0x15, clfe = 0x16, HP = 0x1b
+ */
+static struct hda_verb alc880_pin_w810_init_verbs[] = {
+        /* hphone/speaker input selector: front DAC */
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
 
-        /* surround out pin: muted, (no volume selection)  */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
 
-        /* surround out pin: NOT headphone enable, out enable, vref disabled */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
 
+        { }
+};
 
-        /* c/lfe channel selector/amp: input 0: DAC: unmuted, (no volume selection) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
+/*
+ * Z71V pin configuration:
+ * Speaker-out = 0x14, HP = 0x15, Mic = 0x18, Line-in = 0x1a, Mic2 = 0x1b (?)
+ */
+static struct hda_verb alc880_pin_z71v_init_verbs[] = {
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
 
-        /* c/lfe channel selector/amp: input 1: capture mix: muted, (no volume selection) */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0x7180},
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 
-        /* c/lfe channel selector/amp: output 0: unmuted, max volume */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        { }
+};
 
-        /* c/lfe out pin: muted, (no volume selection)  */
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+/*
+ * 6-stack pin configuration:
+ * front = 0x14, surr = 0x15, clfe = 0x16, side = 0x17, mic = 0x18, f-mic = 0x19,
+ * line = 0x1a, HP = 0x1b
+ */
+static struct hda_verb alc880_pin_6stack_init_verbs[] = {
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        
+        { }
+};
 
-        /* c/lfe out pin: NOT headphone enable, out enable, vref disabled */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+/* FIXME! */
+/*
+ * F1734 pin configuration:
+ * HP = 0x14, speaker-out = 0x15, mic = 0x18
+ */
+static struct hda_verb alc880_pin_f1734_init_verbs[] = {
+        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 
+        { }
+};
 
-        /* hphone/speaker input selector: front DAC */
-        {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
+/* FIXME! */
+/*
+ * ASUS pin configuration:
+ * HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a
+ */
+static struct hda_verb alc880_pin_asus_init_verbs[] = {
+        {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
+        {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
+        {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        
+        { }
+};
 
-        /* hphone/speaker out pin: muted, (no volume selection)  */
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+/* Enable GPIO mask and set output */
+static struct hda_verb alc880_gpio1_init_verbs[] = {
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+};
 
-        /* hphone/speaker out pin: NOT headphone enable, out enable, vref disabled */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+/* Enable GPIO mask and set output */
+static struct hda_verb alc880_gpio2_init_verbs[] = {
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x02},
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x02},
+};
 
 
-        { }
-};
+/*
+ */
 
 static int alc_init(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        snd_hda_sequence_write(codec, spec->init_verbs);
+        unsigned int i;
+
+        for (i = 0; i < spec->num_init_verbs; i++)
+                snd_hda_sequence_write(codec, spec->init_verbs[i]);
         return 0;
 }
 
@@ -736,9 +1018,8 @@ static int alc_resume(struct hda_codec *codec)
         int i;
 
         alc_init(codec);
-        for (i = 0; i < spec->num_mixers; i++) {
+        for (i = 0; i < spec->num_mixers; i++)
                 snd_hda_resume_ctls(codec, spec->mixers[i]);
-        }
         if (spec->multiout.dig_out_nid)
                 snd_hda_resume_spdif_out(codec);
         if (spec->dig_in_nid)
@@ -830,7 +1111,7 @@ static struct hda_pcm_stream alc880_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 8,
-        .nid = 0x02, /* NID to query formats and rates */
+        /* NID is set in alc_build_pcms */
         .ops = {
                 .open = alc880_playback_pcm_open,
                 .prepare = alc880_playback_pcm_prepare,
@@ -842,7 +1123,7 @@ static struct hda_pcm_stream alc880_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
-        .nid = 0x07, /* NID to query formats and rates */
+        /* NID is set in alc_build_pcms */
         .ops = {
                 .prepare = alc880_capture_pcm_prepare,
                 .cleanup = alc880_capture_pcm_cleanup
@@ -878,7 +1159,9 @@ static int alc_build_pcms(struct hda_codec *codec)
 
         info->name = spec->stream_name_analog;
         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
 
         info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;
         for (i = 0; i < spec->num_channel_mode; i++) {
@@ -906,7 +1189,18 @@ static int alc_build_pcms(struct hda_codec *codec)
 
 static void alc_free(struct hda_codec *codec)
 {
-        kfree(codec->spec);
+        struct alc_spec *spec = codec->spec;
+        unsigned int i;
+
+        if (! spec)
+                return;
+
+        if (spec->kctl_alloc) {
+                for (i = 0; i < spec->num_kctl_used; i++)
+                        kfree(spec->kctl_alloc[i].name);
+                kfree(spec->kctl_alloc);
+        }
+        kfree(spec);
 }
 
 /*
@@ -921,153 +1215,915 @@ static struct hda_codec_ops alc_patch_ops = {
 #endif
 };
 
+
+/*
+ * Test configuration for debugging
+ *
+ * Almost all inputs/outputs are enabled.  I/O pins can be configured via
+ * enum controls.
+ */
+#ifdef CONFIG_SND_DEBUG
+static hda_nid_t alc880_test_dac_nids[4] = {
+        0x02, 0x03, 0x04, 0x05
+};
+
+static struct hda_input_mux alc880_test_capture_source = {
+        .num_items = 5,
+        .items = {
+                { "In-1", 0x0 },
+                { "In-2", 0x1 },
+                { "In-3", 0x2 },
+                { "In-4", 0x3 },
+                { "CD", 0x4 },
+        },
+};
+
+static struct alc_channel_mode alc880_test_modes[4] = {
+        { 2, NULL },
+        { 4, NULL },
+        { 6, NULL },
+        { 8, NULL },
+};
+
+static int alc_test_pin_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        static char *texts[] = {
+                "N/A", "Line Out", "HP Out",
+                "In Hi-Z", "In 50%", "In Grd", "In 80%", "In 100%"
+        };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 8;
+        if (uinfo->value.enumerated.item >= 8)
+                uinfo->value.enumerated.item = 7;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int alc_test_pin_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        unsigned int pin_ctl, item = 0;
+
+        pin_ctl = snd_hda_codec_read(codec, nid, 0,
+                                     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        if (pin_ctl & AC_PINCTL_OUT_EN) {
+                if (pin_ctl & AC_PINCTL_HP_EN)
+                        item = 2;
+                else
+                        item = 1;
+        } else if (pin_ctl & AC_PINCTL_IN_EN) {
+                switch (pin_ctl & AC_PINCTL_VREFEN) {
+                case AC_PINCTL_VREF_HIZ: item = 3; break;
+                case AC_PINCTL_VREF_50:  item = 4; break;
+                case AC_PINCTL_VREF_GRD: item = 5; break;
+                case AC_PINCTL_VREF_80:  item = 6; break;
+                case AC_PINCTL_VREF_100: item = 7; break;
+                }
+        }
+        ucontrol->value.enumerated.item[0] = item;
+        return 0;
+}
+
+static int alc_test_pin_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        static unsigned int ctls[] = {
+                0, AC_PINCTL_OUT_EN, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_50,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_GRD,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_80,
+                AC_PINCTL_IN_EN | AC_PINCTL_VREF_100,
+        };
+        unsigned int old_ctl, new_ctl;
+
+        old_ctl = snd_hda_codec_read(codec, nid, 0,
+                                     AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        new_ctl = ctls[ucontrol->value.enumerated.item[0]];
+        if (old_ctl != new_ctl) {
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, new_ctl);
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    ucontrol->value.enumerated.item[0] >= 3 ? 0xb080 : 0xb000);
+                return 1;
+        }
+        return 0;
+}
+
+static int alc_test_pin_src_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        static char *texts[] = {
+                "Front", "Surround", "CLFE", "Side"
+        };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 4;
+        if (uinfo->value.enumerated.item >= 4)
+                uinfo->value.enumerated.item = 3;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int alc_test_pin_src_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        unsigned int sel;
+
+        sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0);
+        ucontrol->value.enumerated.item[0] = sel & 3;
+        return 0;
+}
+
+static int alc_test_pin_src_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
+        unsigned int sel;
+
+        sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0) & 3;
+        if (ucontrol->value.enumerated.item[0] != sel) {
+                sel = ucontrol->value.enumerated.item[0] & 3;
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, sel);
+                return 1;
+        }
+        return 0;
+}
+
+#define PIN_CTL_TEST(xname,nid) {                       \
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
+                        .name = xname,                 \
+                        .info = alc_test_pin_ctl_info, \
+                        .get = alc_test_pin_ctl_get,   \
+                        .put = alc_test_pin_ctl_put,   \
+                        .private_value = nid           \
+                        }
+
+#define PIN_SRC_TEST(xname,nid) {                       \
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,    \
+                        .name = xname,                 \
+                        .info = alc_test_pin_src_info, \
+                        .get = alc_test_pin_src_get,   \
+                        .put = alc_test_pin_src_put,   \
+                        .private_value = nid           \
+                        }
+
+static snd_kcontrol_new_t alc880_test_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        ALC_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        ALC_BIND_MUTE("CLFE Playback Volume", 0x0e, 2, HDA_INPUT),
+        ALC_BIND_MUTE("Side Playback Volume", 0x0f, 2, HDA_INPUT),
+        PIN_CTL_TEST("Front Pin Mode", 0x14),
+        PIN_CTL_TEST("Surround Pin Mode", 0x15),
+        PIN_CTL_TEST("CLFE Pin Mode", 0x16),
+        PIN_CTL_TEST("Side Pin Mode", 0x17),
+        PIN_CTL_TEST("In-1 Pin Mode", 0x18),
+        PIN_CTL_TEST("In-2 Pin Mode", 0x19),
+        PIN_CTL_TEST("In-3 Pin Mode", 0x1a),
+        PIN_CTL_TEST("In-4 Pin Mode", 0x1b),
+        PIN_SRC_TEST("In-1 Pin Source", 0x18),
+        PIN_SRC_TEST("In-2 Pin Source", 0x19),
+        PIN_SRC_TEST("In-3 Pin Source", 0x1a),
+        PIN_SRC_TEST("In-4 Pin Source", 0x1b),
+        HDA_CODEC_VOLUME("In-1 Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("In-1 Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("In-2 Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("In-2 Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("In-3 Playback Volume", 0x0b, 0x2, HDA_INPUT),
+        HDA_CODEC_MUTE("In-3 Playback Switch", 0x0b, 0x2, HDA_INPUT),
+        HDA_CODEC_VOLUME("In-4 Playback Volume", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_MUTE("In-4 Playback Switch", 0x0b, 0x3, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x4, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x4, HDA_INPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Source",
+                .count = 2,
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Channel Mode",
+                .info = alc880_ch_mode_info,
+                .get = alc880_ch_mode_get,
+                .put = alc880_ch_mode_put,
+        },
+        { } /* end */
+};
+
+static struct hda_verb alc880_test_init_verbs[] = {
+        /* Unmute inputs of 0x0c - 0x0f */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        /* Vol output for 0x0c-0x0f */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* Set output pins 0x14-0x17 */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* Unmute output pins 0x14-0x17 */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Set input pins 0x18-0x1c */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* Mute input pins 0x18-0x1b */
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* ADC set up */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* Analog input/passthru */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        { }
+};
+#endif
+
 /*
  */
 
 static struct hda_board_config alc880_cfg_tbl[] = {
         /* Back 3 jack, front 2 jack */
         { .modelname = "3stack", .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe200, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe201, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe202, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe203, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe204, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe205, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe206, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe207, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe208, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe209, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe20a, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe20b, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe20c, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe20d, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe20e, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe20f, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe210, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe211, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe214, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe302, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe303, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe304, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe306, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe307, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xe404, .config = ALC880_3ST },
-        { .pci_vendor = 0x8086, .pci_device = 0xa101, .config = ALC880_3ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x3031, .config = ALC880_3ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x4036, .config = ALC880_3ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x4037, .config = ALC880_3ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x4038, .config = ALC880_3ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x4040, .config = ALC880_3ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x4041, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe200, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe201, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe202, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe203, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe204, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe205, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe206, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe207, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe208, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe209, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20a, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20b, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20c, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20d, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20e, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20f, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe210, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe211, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe214, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe302, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe303, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe304, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe306, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe307, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe404, .config = ALC880_3ST },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xa101, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3031, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4036, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4037, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4038, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4040, .config = ALC880_3ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4041, .config = ALC880_3ST },
 
         /* Back 3 jack, front 2 jack (Internal add Aux-In) */
-        { .pci_vendor = 0x1025, .pci_device = 0xe310, .config = ALC880_3ST },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0xe310, .config = ALC880_3ST },
+        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81d6, .config = ALC880_3ST }, 
 
         /* Back 3 jack plus 1 SPDIF out jack, front 2 jack */
         { .modelname = "3stack-digout", .config = ALC880_3ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xe308, .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe308, .config = ALC880_3ST_DIG },
 
         /* Back 3 jack plus 1 SPDIF out jack, front 2 jack (Internal add Aux-In)*/
-        { .pci_vendor = 0x8086, .pci_device = 0xe305, .config = ALC880_3ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xd402, .config = ALC880_3ST_DIG },
-        { .pci_vendor = 0x1025, .pci_device = 0xe309, .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe305, .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd402, .config = ALC880_3ST_DIG },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0xe309, .config = ALC880_3ST_DIG },
 
         /* Back 5 jack, front 2 jack */
         { .modelname = "5stack", .config = ALC880_5ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x3033, .config = ALC880_5ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x4039, .config = ALC880_5ST },
-        { .pci_vendor = 0x107b, .pci_device = 0x3032, .config = ALC880_5ST },
-        { .pci_vendor = 0x103c, .pci_device = 0x2a09, .config = ALC880_5ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3033, .config = ALC880_5ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x4039, .config = ALC880_5ST },
+        { .pci_subvendor = 0x107b, .pci_subdevice = 0x3032, .config = ALC880_5ST },
+        { .pci_subvendor = 0x103c, .pci_subdevice = 0x2a09, .config = ALC880_5ST },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x814e, .config = ALC880_5ST },
 
         /* Back 5 jack plus 1 SPDIF out jack, front 2 jack */
         { .modelname = "5stack-digout", .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xe224, .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xe400, .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xe401, .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xe402, .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xd400, .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xd401, .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x8086, .pci_device = 0xa100, .config = ALC880_5ST_DIG },
-        { .pci_vendor = 0x1565, .pci_device = 0x8202, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe224, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe400, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe401, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xe402, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd400, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xd401, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0xa100, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x1565, .pci_subdevice = 0x8202, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa880, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x1695, .pci_subdevice = 0x400d, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x0000, .pci_subdevice = 0x8086, .config = ALC880_5ST_DIG },
 
         { .modelname = "w810", .config = ALC880_W810 },
-        { .pci_vendor = 0x161f, .pci_device = 0x203d, .config = ALC880_W810 },
+        { .pci_subvendor = 0x161f, .pci_subdevice = 0x203d, .config = ALC880_W810 },
+
+        { .modelname = "z71v", .config = ALC880_Z71V },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_Z71V },
+
+        { .modelname = "6statack-digout", .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x2668, .pci_subdevice = 0x8086, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x8086, .pci_subdevice = 0x2668, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0x1462, .pci_subdevice = 0x1150, .config = ALC880_6ST_DIG },
+        { .pci_subvendor = 0xe803, .pci_subdevice = 0x1019, .config = ALC880_6ST_DIG },
+
+        { .modelname = "asus", .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1973, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x19b3, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1113, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1993, .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10c3, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1133, .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1123, .config = ALC880_ASUS_DIG },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x1143, .config = ALC880_ASUS },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10b3, .config = ALC880_ASUS_W1V },
+
+        { .modelname = "uniwill", .config = ALC880_UNIWILL_DIG },
+        { .pci_subvendor = 0x1584, .pci_subdevice = 0x9050, .config = ALC880_UNIWILL_DIG },     
+
+        { .modelname = "F1734", .config = ALC880_F1734 },
+        { .pci_subvendor = 0x1734, .pci_subdevice = 0x107c, .config = ALC880_F1734 },
+
+#ifdef CONFIG_SND_DEBUG
+        { .modelname = "test", .config = ALC880_TEST },
+#endif
 
         {}
 };
 
+/*
+ * configuration template - to be copied to the spec instance
+ */
+struct alc_config_preset {
+        snd_kcontrol_new_t *mixers[4];
+        const struct hda_verb *init_verbs[4];
+        unsigned int num_dacs;
+        hda_nid_t *dac_nids;
+        hda_nid_t dig_out_nid;          /* optional */
+        hda_nid_t hp_nid;               /* optional */
+        unsigned int num_adc_nids;
+        hda_nid_t *adc_nids;
+        unsigned int num_channel_mode;
+        const struct alc_channel_mode *channel_mode;
+        const struct hda_input_mux *input_mux;
+};
+
+static struct alc_config_preset alc880_presets[] = {
+        [ALC880_3ST] = {
+                .mixers = { alc880_three_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+                .channel_mode = alc880_threestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_3ST_DIG] = {
+                .mixers = { alc880_three_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_3stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+                .channel_mode = alc880_threestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_5ST] = {
+                .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer},
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
+                .channel_mode = alc880_fivestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_5ST_DIG] = {
+                .mixers = { alc880_three_stack_mixer, alc880_five_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_5stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_dac_nids),
+                .dac_nids = alc880_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes),
+                .channel_mode = alc880_fivestack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_6ST_DIG] = {
+                .mixers = { alc880_six_stack_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_6stack_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_6st_dac_nids),
+                .dac_nids = alc880_6st_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_sixstack_modes),
+                .channel_mode = alc880_sixstack_modes,
+                .input_mux = &alc880_6stack_capture_source,
+        },
+        [ALC880_W810] = {
+                .mixers = { alc880_w810_base_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_w810_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_w810_dac_nids),
+                .dac_nids = alc880_w810_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_w810_modes),
+                .channel_mode = alc880_w810_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_Z71V] = {
+                .mixers = { alc880_z71v_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_z71v_init_verbs,
+                                alc880_gpio2_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_z71v_dac_nids),
+                .dac_nids = alc880_z71v_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+                .channel_mode = alc880_2_jack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_F1734] = {
+                .mixers = { alc880_f1734_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_f1734_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_f1734_dac_nids),
+                .dac_nids = alc880_f1734_dac_nids,
+                .hp_nid = 0x02,
+                .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+                .channel_mode = alc880_2_jack_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_ASUS] = {
+                .mixers = { alc880_asus_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_ASUS_DIG] = {
+                .mixers = { alc880_asus_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_ASUS_W1V] = {
+                .mixers = { alc880_asus_mixer, alc880_asus_w1v_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+        [ALC880_UNIWILL_DIG] = {
+                .mixers = { alc880_asus_mixer },
+                .init_verbs = { alc880_volume_init_verbs, alc880_pin_asus_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
+                .dac_nids = alc880_asus_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_asus_modes),
+                .channel_mode = alc880_asus_modes,
+                .input_mux = &alc880_capture_source,
+        },
+#ifdef CONFIG_SND_DEBUG
+        [ALC880_TEST] = {
+                .mixers = { alc880_test_mixer },
+                .init_verbs = { alc880_test_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc880_test_dac_nids),
+                .dac_nids = alc880_test_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_test_modes),
+                .channel_mode = alc880_test_modes,
+                .input_mux = &alc880_test_capture_source,
+        },
+#endif
+};
+
+/*
+ * Automatic parse of I/O pins from the BIOS configuration
+ */
+
+#define NUM_CONTROL_ALLOC       32
+#define NUM_VERB_ALLOC          32
+
+enum {
+        ALC_CTL_WIDGET_VOL,
+        ALC_CTL_WIDGET_MUTE,
+        ALC_CTL_BIND_MUTE,
+};
+static snd_kcontrol_new_t alc880_control_templates[] = {
+        HDA_CODEC_VOLUME(NULL, 0, 0, 0),
+        HDA_CODEC_MUTE(NULL, 0, 0, 0),
+        ALC_BIND_MUTE(NULL, 0, 0, 0),
+};
+
+/* add dynamic controls */
+static int add_control(struct alc_spec *spec, int type, const char *name, unsigned long val)
+{
+        snd_kcontrol_new_t *knew;
+
+        if (spec->num_kctl_used >= spec->num_kctl_alloc) {
+                int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC;
+
+                knew = kcalloc(num + 1, sizeof(*knew), GFP_KERNEL); /* array + terminator */
+                if (! knew)
+                        return -ENOMEM;
+                if (spec->kctl_alloc) {
+                        memcpy(knew, spec->kctl_alloc, sizeof(*knew) * spec->num_kctl_alloc);
+                        kfree(spec->kctl_alloc);
+                }
+                spec->kctl_alloc = knew;
+                spec->num_kctl_alloc = num;
+        }
+
+        knew = &spec->kctl_alloc[spec->num_kctl_used];
+        *knew = alc880_control_templates[type];
+        knew->name = snd_kmalloc_strdup(name, GFP_KERNEL);
+        if (! knew->name)
+                return -ENOMEM;
+        knew->private_value = val;
+        spec->num_kctl_used++;
+        return 0;
+}
+
+#define alc880_is_fixed_pin(nid)        ((nid) >= 0x14 && (nid) <= 0x17)
+#define alc880_fixed_pin_idx(nid)       ((nid) - 0x14)
+#define alc880_is_multi_pin(nid)        ((nid) >= 0x18)
+#define alc880_multi_pin_idx(nid)       ((nid) - 0x18)
+#define alc880_is_input_pin(nid)        ((nid) >= 0x18)
+#define alc880_input_pin_idx(nid)       ((nid) - 0x18)
+#define alc880_idx_to_dac(nid)          ((nid) + 0x02)
+#define alc880_dac_to_idx(nid)          ((nid) - 0x02)
+#define alc880_idx_to_mixer(nid)        ((nid) + 0x0c)
+#define alc880_idx_to_selector(nid)     ((nid) + 0x10)
+#define ALC880_PIN_CD_NID               0x1c
+
+/* fill in the dac_nids table from the parsed pin configuration */
+static int alc880_auto_fill_dac_nids(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        hda_nid_t nid;
+        int assigned[4];
+        int i, j;
+
+        memset(assigned, 0, sizeof(assigned));
+
+        /* check the pins hardwired to audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                if (alc880_is_fixed_pin(nid)) {
+                        int idx = alc880_fixed_pin_idx(nid);
+                        spec->multiout.dac_nids[i] = alc880_dac_to_idx(idx);
+                        assigned[idx] = 1;
+                }
+        }
+        /* left pins can be connect to any audio widget */
+        for (i = 0; i < cfg->line_outs; i++) {
+                nid = cfg->line_out_pins[i];
+                if (alc880_is_fixed_pin(nid))
+                        continue;
+                /* search for an empty channel */
+                for (j = 0; j < cfg->line_outs; j++) {
+                        if (! assigned[j]) {
+                                spec->multiout.dac_nids[i] = alc880_idx_to_dac(j);
+                                assigned[j] = 1;
+                                break;
+                        }
+                }
+        }
+        spec->multiout.num_dacs = cfg->line_outs;
+        return 0;
+}
+
+/* add playback controls from the parsed DAC table */
+static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        char name[32];
+        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+        hda_nid_t nid;
+        int i, err;
+
+        for (i = 0; i < cfg->line_outs; i++) {
+                if (! spec->multiout.dac_nids[i])
+                        continue;
+                nid = alc880_idx_to_mixer(alc880_dac_to_idx(spec->multiout.dac_nids[i]));
+                if (i == 2) {
+                        /* Center/LFE */
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Center Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(nid, 1, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "LFE Playback Volume",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Center Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 1, 2, HDA_INPUT))) < 0)
+                                return err;
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "LFE Playback Switch",
+                                               HDA_COMPOSE_AMP_VAL(nid, 2, 2, HDA_INPUT))) < 0)
+                                return err;
+                } else {
+                        sprintf(name, "%s Playback Volume", chname[i]);
+                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                                return err;
+                        sprintf(name, "%s Playback Switch", chname[i]);
+                        if ((err = add_control(spec, ALC_CTL_BIND_MUTE, name,
+                                               HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
+                                return err;
+                }
+        }
+
+        return 0;
+}
+
+/* add playback controls for HP output */
+static int alc880_auto_create_hp_ctls(struct alc_spec *spec, hda_nid_t pin)
+{
+        hda_nid_t nid;
+        int err;
+
+        if (! pin)
+                return 0;
+
+        if (alc880_is_fixed_pin(pin)) {
+                nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
+                if (! spec->multiout.dac_nids[0]) {
+                        /* use this as the primary output */
+                        spec->multiout.dac_nids[0] = nid;
+                        if (! spec->multiout.num_dacs)
+                                spec->multiout.num_dacs = 1;
+                } else 
+                        /* specify the DAC as the extra HP output */
+                        spec->multiout.hp_nid = nid;
+                /* control HP volume/switch on the output mixer amp */
+                nid = alc880_idx_to_mixer(alc880_fixed_pin_idx(pin));
+                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Headphone Playback Volume",
+                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
+                        return err;
+                if ((err = add_control(spec, ALC_CTL_BIND_MUTE, "Headphone Playback Switch",
+                                       HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0)
+                        return err;
+        } else if (alc880_is_multi_pin(pin)) {
+                /* set manual connection */
+                if (! spec->multiout.dac_nids[0]) {
+                        /* use this as the primary output */
+                        spec->multiout.dac_nids[0] = alc880_idx_to_dac(alc880_multi_pin_idx(pin));
+                        if (! spec->multiout.num_dacs)
+                                spec->multiout.num_dacs = 1;
+                }
+                /* we have only a switch on HP-out PIN */
+                if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
+                                       HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT))) < 0)
+                        return err;
+        }
+        return 0;
+}
+
+/* create input playback/capture controls for the given pin */
+static int new_analog_input(struct alc_spec *spec, hda_nid_t pin, const char *ctlname)
+{
+        char name[32];
+        int err, idx;
+
+        sprintf(name, "%s Playback Volume", ctlname);
+        idx = alc880_input_pin_idx(pin);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
+                               HDA_COMPOSE_AMP_VAL(0x0b, 3, idx, HDA_INPUT))) < 0)
+                return err;
+        sprintf(name, "%s Playback Switch", ctlname);
+        if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
+                               HDA_COMPOSE_AMP_VAL(0x0b, 3, idx, HDA_INPUT))) < 0)
+                return err;
+        return 0;
+}
+
+/* create playback/capture controls for input pins */
+static int alc880_auto_create_analog_input_ctls(struct alc_spec *spec, const struct auto_pin_cfg *cfg)
+{
+        static char *labels[AUTO_PIN_LAST] = {
+                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux"
+        };
+        struct hda_input_mux *imux = &spec->private_imux;
+        int i, err;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                if (alc880_is_input_pin(cfg->input_pins[i])) {
+                        err = new_analog_input(spec, cfg->input_pins[i], labels[i]);
+                        if (err < 0)
+                                return err;
+                        imux->items[imux->num_items].label = labels[i];
+                        imux->items[imux->num_items].index = alc880_input_pin_idx(cfg->input_pins[i]);
+                        imux->num_items++;
+                }
+        }
+        return 0;
+}
+
+static void alc880_auto_set_output_and_unmute(struct hda_codec *codec, hda_nid_t nid, int pin_type,
+                                              int dac_idx)
+{
+        /* set as output */
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
+        /* need the manual connection? */
+        if (alc880_is_multi_pin(nid)) {
+                struct alc_spec *spec = codec->spec;
+                int idx = alc880_multi_pin_idx(nid);
+                snd_hda_codec_write(codec, alc880_idx_to_selector(idx), 0,
+                                    AC_VERB_SET_CONNECT_SEL,
+                                    alc880_dac_to_idx(spec->multiout.dac_nids[dac_idx]));
+        }
+}
+
+static void alc880_auto_init_multi_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->autocfg.line_outs; i++) {
+                hda_nid_t nid = spec->autocfg.line_out_pins[i];
+                alc880_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
+        }
+}
+
+static void alc880_auto_init_hp_out(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t pin;
+
+        pin = spec->autocfg.hp_pin;
+        if (pin) /* connect to front */
+                alc880_auto_set_output_and_unmute(codec, pin, PIN_HP, 0);
+}
+
+static void alc880_auto_init_analog_input(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < AUTO_PIN_LAST; i++) {
+                hda_nid_t nid = spec->autocfg.input_pins[i];
+                if (alc880_is_input_pin(nid)) {
+                        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+                        if (nid != ALC880_PIN_CD_NID)
+                                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                                    AMP_OUT_MUTE);
+                }
+        }
+}
+
+/* parse the BIOS configuration and set up the alc_spec */
+/* return 1 if successful, 0 if the proper config is not found, or a negative error code */
+static int alc880_parse_auto_config(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err;
+
+        if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg)) < 0)
+                return err;
+        if ((err = alc880_auto_fill_dac_nids(spec, &spec->autocfg)) < 0)
+                return err;
+        if (! spec->autocfg.line_outs && ! spec->autocfg.hp_pin)
+                return 0; /* can't find valid BIOS pin config */
+        if ((err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = alc880_auto_create_hp_ctls(spec, spec->autocfg.hp_pin)) < 0 ||
+            (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+                return err;
+
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        if (spec->autocfg.dig_out_pin)
+                spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
+        if (spec->autocfg.dig_in_pin)
+                spec->dig_in_nid = ALC880_DIGIN_NID;
+
+        if (spec->kctl_alloc)
+                spec->mixers[spec->num_mixers++] = spec->kctl_alloc;
+
+        spec->init_verbs[spec->num_init_verbs++] = alc880_volume_init_verbs;
+
+        spec->input_mux = &spec->private_imux;
+
+        return 1;
+}
+
+/* init callback for auto-configuration model -- overriding the default init */
+static int alc880_auto_init(struct hda_codec *codec)
+{
+        alc_init(codec);
+        alc880_auto_init_multi_out(codec);
+        alc880_auto_init_hp_out(codec);
+        alc880_auto_init_analog_input(codec);
+        return 0;
+}
+
+/*
+ * OK, here we have finally the patch for ALC880
+ */
+
 static int patch_alc880(struct hda_codec *codec)
 {
         struct alc_spec *spec;
         int board_config;
+        int i, err;
 
         spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
+        init_MUTEX(&spec->bind_mutex);
         codec->spec = spec;
 
         board_config = snd_hda_check_board_config(codec, alc880_cfg_tbl);
-        if (board_config < 0) {
-                snd_printd(KERN_INFO "hda_codec: Unknown model for ALC880\n");
-                board_config = ALC880_MINIMAL;
+        if (board_config < 0 || board_config >= ALC880_MODEL_LAST) {
+                printk(KERN_INFO "hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...\n");
+                board_config = ALC880_AUTO;
         }
 
-        switch (board_config) {
-        case ALC880_W810:
-                spec->mixers[spec->num_mixers] = alc880_w810_base_mixer;
-                spec->num_mixers++;
-                break;
-        case ALC880_5ST:
-        case ALC880_5ST_DIG:
-                spec->mixers[spec->num_mixers] = alc880_five_stack_mixer;
-                spec->num_mixers++;
-                break;
-        default:
-                spec->mixers[spec->num_mixers] = alc880_base_mixer;
-                spec->num_mixers++;
-                break;
+        if (board_config == ALC880_AUTO) {
+                /* automatic parse from the BIOS config */
+                err = alc880_parse_auto_config(codec);
+                if (err < 0) {
+                        alc_free(codec);
+                        return err;
+                } else if (! err) {
+                        printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using 3-stack mode...\n");
+                        board_config = ALC880_3ST;
+                }
         }
 
-        switch (board_config) {
-        case ALC880_3ST_DIG:
-        case ALC880_5ST_DIG:
-        case ALC880_W810:
-                spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
-                break;
-        default:
-                break;
-        }
+        if (board_config != ALC880_AUTO) {
+                /* set up from the preset table */
+                const struct alc_config_preset *preset;
 
-        switch (board_config) {
-        case ALC880_3ST:
-        case ALC880_3ST_DIG:
-        case ALC880_5ST:
-        case ALC880_5ST_DIG:
-        case ALC880_W810:
-                spec->front_panel = 1;
-                break;
-        default:
-                break;
-        }
+                preset = &alc880_presets[board_config];
 
-        switch (board_config) {
-        case ALC880_5ST:
-        case ALC880_5ST_DIG:
-                spec->init_verbs = alc880_init_verbs_five_stack;
-                spec->channel_mode = alc880_fivestack_modes;
-                spec->num_channel_mode = ARRAY_SIZE(alc880_fivestack_modes);
-                break;
-        case ALC880_W810:
-                spec->init_verbs = alc880_w810_init_verbs;
-                spec->channel_mode = alc880_w810_modes;
-                spec->num_channel_mode = ARRAY_SIZE(alc880_w810_modes);
-                break;
-        default:
-                spec->init_verbs = alc880_init_verbs_three_stack;
-                spec->channel_mode = alc880_threestack_modes;
-                spec->num_channel_mode = ARRAY_SIZE(alc880_threestack_modes);
-                break;
+                for (i = 0; preset->mixers[i]; i++) {
+                        snd_assert(spec->num_mixers < ARRAY_SIZE(spec->mixers), break);
+                        spec->mixers[spec->num_mixers++] = preset->mixers[i];
+                }
+                for (i = 0; preset->init_verbs[i]; i++) {
+                        snd_assert(spec->num_init_verbs < ARRAY_SIZE(spec->init_verbs), break);
+                        spec->init_verbs[spec->num_init_verbs++] = preset->init_verbs[i];
+                }
+
+                spec->channel_mode = preset->channel_mode;
+                spec->num_channel_mode = preset->num_channel_mode;
+
+                spec->multiout.max_channels = spec->channel_mode[0].channels;
+
+                spec->multiout.num_dacs = preset->num_dacs;
+                spec->multiout.dac_nids = preset->dac_nids;
+                spec->multiout.dig_out_nid = preset->dig_out_nid;
+                spec->multiout.hp_nid = preset->hp_nid;
+
+                spec->input_mux = preset->input_mux;
+
+                spec->num_adc_nids = preset->num_adc_nids;
+                spec->adc_nids = preset->adc_nids;
         }
 
         spec->stream_name_analog = "ALC880 Analog";
@@ -1078,34 +2134,64 @@ static int patch_alc880(struct hda_codec *codec)
         spec->stream_digital_playback = &alc880_pcm_digital_playback;
         spec->stream_digital_capture = &alc880_pcm_digital_capture;
 
-        spec->multiout.max_channels = spec->channel_mode[0].channels;
-
-        switch (board_config) {
-        case ALC880_W810:
-                spec->multiout.num_dacs = ARRAY_SIZE(alc880_w810_dac_nids);
-                spec->multiout.dac_nids = alc880_w810_dac_nids;
-                // No dedicated headphone socket - it's shared with built-in speakers.
-                break;
-        default:
-                spec->multiout.num_dacs = ARRAY_SIZE(alc880_dac_nids);
-                spec->multiout.dac_nids = alc880_dac_nids;
-                spec->multiout.hp_nid = 0x03; /* rear-surround NID */
-                break;
+        if (! spec->adc_nids && spec->input_mux) {
+                /* check whether NID 0x07 is valid */
+                unsigned int wcap = snd_hda_param_read(codec, alc880_adc_nids[0],
+                                                       AC_PAR_AUDIO_WIDGET_CAP);
+                wcap = (wcap & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; /* get type */
+                if (wcap != AC_WID_AUD_IN) {
+                        spec->adc_nids = alc880_adc_nids_alt;
+                        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids_alt);
+                        spec->mixers[spec->num_mixers] = alc880_capture_alt_mixer;
+                        spec->num_mixers++;
+                } else {
+                        spec->adc_nids = alc880_adc_nids;
+                        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids);
+                        spec->mixers[spec->num_mixers] = alc880_capture_mixer;
+                        spec->num_mixers++;
+                }
         }
 
-        spec->input_mux = &alc880_capture_source;
-        spec->num_adc_nids = ARRAY_SIZE(alc880_adc_nids);
-        spec->adc_nids = alc880_adc_nids;
-
         codec->patch_ops = alc_patch_ops;
+        if (board_config == ALC880_AUTO)
+                codec->patch_ops.init = alc880_auto_init;
 
         return 0;
 }
 
+
 /*
  * ALC260 support
  */
 
+static hda_nid_t alc260_dac_nids[1] = {
+        /* front */
+        0x02,
+};
+
+static hda_nid_t alc260_adc_nids[1] = {
+        /* ADC0 */
+        0x04,
+};
+
+static hda_nid_t alc260_hp_adc_nids[1] = {
+        /* ADC1 */
+        0x05,
+};
+
+#define ALC260_DIGOUT_NID       0x03
+#define ALC260_DIGIN_NID        0x06
+
+static struct hda_input_mux alc260_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x1 },
+                { "Line", 0x2 },
+                { "CD", 0x4 },
+        },
+};
+
 /*
  * This is just place-holder, so there's something for alc_build_pcms to look
  * at when it calculates the maximum number of channels. ALC260 has no mixer
@@ -1116,11 +2202,9 @@ static struct alc_channel_mode alc260_modes[1] = {
         { 2, NULL },
 };
 
-snd_kcontrol_new_t alc260_base_mixer[] = {
+static snd_kcontrol_new_t alc260_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),
-        /* use LINE2 for the output */
-        /* HDA_CODEC_MUTE("Front Playback Switch", 0x0f, 0x0, HDA_OUTPUT), */
-        HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
@@ -1132,9 +2216,9 @@ snd_kcontrol_new_t alc260_base_mixer[] = {
         HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x07, 0x05, HDA_INPUT),
         HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x07, 0x05, HDA_INPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x10, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),
         HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x11, 1, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x04, 0x0, HDA_INPUT),
         {
@@ -1147,60 +2231,91 @@ snd_kcontrol_new_t alc260_base_mixer[] = {
         { } /* end */
 };
 
+static snd_kcontrol_new_t alc260_hp_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x07, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x07, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x05, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x05, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = alc_mux_enum_info,
+                .get = alc_mux_enum_get,
+                .put = alc_mux_enum_put,
+        },
+        { } /* end */
+};
+
 static struct hda_verb alc260_init_verbs[] = {
         /* Line In pin widget for input */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         /* CD pin widget for input */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         /* Mic1 (rear panel) pin widget for input and vref at 80% */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
         /* Mic2 (front panel) pin widget for input and vref at 80% */
-        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
         /* LINE-2 is used for line-out in rear */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         /* select line-out */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* LINE-OUT pin */
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         /* enable HP */
-        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         /* enable Mono */
-        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* unmute amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        /* mute capture amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* set connection select to line in (default select for this ADC) */
         {0x04, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* unmute Line-Out mixer amp left and right (volume = 0) */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* unmute HP mixer amp left and right (volume = 0) */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-        /* unmute Mono mixer amp left and right (volume = 0) */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        /* mute pin widget amp left and right (no gain on this amp) */
-        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
-        /* mute LINE-2 out */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        /* mute capture amp left and right */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        /* set connection select to line in (default select for this ADC) */
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x02},
+        /* set vol=0 Line-Out mixer amp left and right */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* unmute pin widget amp left and right (no gain on this amp) */
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* set vol=0 HP mixer amp left and right */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* unmute pin widget amp left and right (no gain on this amp) */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* set vol=0 Mono mixer amp left and right */
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        /* unmute pin widget amp left and right (no gain on this amp) */
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* unmute LINE-2 out pin */
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 & Line In 2 = 0x03 */
-        /* unmute CD */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        /* mute CD */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        /* mute Line In */
+        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        /* mute Mic */
+        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
-        /* Unmute Front out path */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Headphone out path */
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute Mono out path */
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        /* mute Front out path */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* mute Headphone out path */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* mute Mono out path */
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
         { }
 };
 
@@ -1208,30 +2323,52 @@ static struct hda_pcm_stream alc260_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
-        .nid = 0x2,
 };
 
 static struct hda_pcm_stream alc260_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
-        .nid = 0x4,
+};
+
+static struct hda_board_config alc260_cfg_tbl[] = {
+        { .modelname = "hp", .config = ALC260_HP },
+        { .pci_subvendor = 0x103c, .config = ALC260_HP },
+        {}
 };
 
 static int patch_alc260(struct hda_codec *codec)
 {
         struct alc_spec *spec;
+        int board_config;
 
         spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
                 return -ENOMEM;
 
+        init_MUTEX(&spec->bind_mutex);
         codec->spec = spec;
 
-        spec->mixers[spec->num_mixers] = alc260_base_mixer;
-        spec->num_mixers++;
+        board_config = snd_hda_check_board_config(codec, alc260_cfg_tbl);
+        if (board_config < 0 || board_config >= ALC260_MODEL_LAST) {
+                snd_printd(KERN_INFO "hda_codec: Unknown model for ALC260\n");
+                board_config = ALC260_BASIC;
+        }
+
+        switch (board_config) {
+        case ALC260_HP:
+                spec->mixers[spec->num_mixers] = alc260_hp_mixer;
+                spec->num_mixers++;
+                break;
+        default:
+                spec->mixers[spec->num_mixers] = alc260_base_mixer;
+                spec->num_mixers++;
+                break;
+        }
+
+        spec->init_verbs[0] = alc260_init_verbs;
+        spec->num_init_verbs = 1;
 
-        spec->init_verbs = alc260_init_verbs;
         spec->channel_mode = alc260_modes;
         spec->num_channel_mode = ARRAY_SIZE(alc260_modes);
 
@@ -1244,14 +2381,23 @@ static int patch_alc260(struct hda_codec *codec)
         spec->multiout.dac_nids = alc260_dac_nids;
 
         spec->input_mux = &alc260_capture_source;
-        spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
-        spec->adc_nids = alc260_adc_nids;
+        switch (board_config) {
+        case ALC260_HP:
+                spec->num_adc_nids = ARRAY_SIZE(alc260_hp_adc_nids);
+                spec->adc_nids = alc260_hp_adc_nids;
+                break;
+        default:
+                spec->num_adc_nids = ARRAY_SIZE(alc260_adc_nids);
+                spec->adc_nids = alc260_adc_nids;
+                break;
+        }
 
         codec->patch_ops = alc_patch_ops;
 
         return 0;
 }
 
+
 /*
  * ALC882 support
  *
@@ -1324,15 +2470,15 @@ static int alc882_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u
  */
 static snd_kcontrol_new_t alc882_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x16, 1, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        ALC_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Side Playback Switch", 0x17, 0x0, HDA_OUTPUT),
+        ALC_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
@@ -1364,89 +2510,80 @@ static snd_kcontrol_new_t alc882_base_mixer[] = {
 
 static struct hda_verb alc882_init_verbs[] = {
         /* Front mixer: unmute input/output amp left and right (volume = 0) */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
         /* Rear mixer */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
         /* CLFE mixer */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
         /* Side mixer */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-
-        /* Front Pin: to output mode */
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* Front Pin: mute amp left and right (no volume) */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* select Front mixer (0x0c, index 0) */
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+
+        /* Front Pin: output 0 (0x0c) */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* Rear Pin */
-        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* Rear Pin: mute amp left and right (no volume) */
-        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* select Rear mixer (0x0d, index 1) */
+        /* Rear Pin: output 1 (0x0d) */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
-        /* CLFE Pin */
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* CLFE Pin: mute amp left and right (no volume) */
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* select CLFE mixer (0x0e, index 2) */
+        /* CLFE Pin: output 2 (0x0e) */
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x16, AC_VERB_SET_CONNECT_SEL, 0x02},
-        /* Side Pin */
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* Side Pin: mute amp left and right (no volume) */
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* select Side mixer (0x0f, index 3) */
+        /* Side Pin: output 3 (0x0f) */
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x17, AC_VERB_SET_CONNECT_SEL, 0x03},
-        /* Headphone Pin */
-        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
-        /* Headphone Pin: mute amp left and right (no volume) */
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        /* select Front mixer (0x0c, index 0) */
+        /* Mic (rear) pin: input vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Front Mic pin: input vref at 80% */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line In pin: input */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line-2 In: Headphone output (output 0 - 0x0c) */
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
-        /* Mic (rear) pin widget for input and vref at 80% */
-        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Front Mic pin widget for input and vref at 80% */
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
-        /* Line In pin widget for input */
-        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
         /* CD pin widget for input */
-        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20},
+        {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 
         /* FIXME: use matrix-type input source selection */
         /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
         /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
         /* Input mixer2 */
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
         /* Input mixer3 */
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
-        /* ADC1: unmute amp left and right */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* ADC2: unmute amp left and right */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-        /* ADC3: unmute amp left and right */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, 0x7000},
-
-        /* Unmute front loopback */
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Unmute rear loopback */
-        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
-        /* Mute CLFE loopback */
-        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8))},
-        /* Unmute side loopback */
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* ADC1: mute amp left and right */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* ADC2: mute amp left and right */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* ADC3: mute amp left and right */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
 
         { }
 };
@@ -1459,6 +2596,7 @@ static int patch_alc882(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        init_MUTEX(&spec->bind_mutex);
         codec->spec = spec;
 
         spec->mixers[spec->num_mixers] = alc882_base_mixer;
@@ -1466,8 +2604,9 @@ static int patch_alc882(struct hda_codec *codec)
 
         spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
         spec->dig_in_nid = ALC880_DIGIN_NID;
-        spec->front_panel = 1;
-        spec->init_verbs = alc882_init_verbs;
+        spec->init_verbs[0] = alc882_init_verbs;
+        spec->num_init_verbs = 1;
+
         spec->channel_mode = alc882_ch_modes;
         spec->num_channel_mode = ARRAY_SIZE(alc882_ch_modes);
 
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
new file mode 100644
index 000000000000..013be2ea513a
--- /dev/null
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -0,0 +1,666 @@
+/*
+ * Universal Interface for Intel High Definition Audio Codec
+ *
+ * HD audio interface patch for SigmaTel STAC92xx
+ *
+ * Copyright (c) 2005 Embedded Alley Solutions, Inc.
+ * <matt@embeddedalley.com>
+ *
+ * Based on patch_cmedia.c and patch_realtek.c
+ * Copyright (c) 2004 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This driver is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <sound/core.h>
+#include "hda_codec.h"
+#include "hda_local.h"
+
+#undef STAC_TEST
+
+struct sigmatel_spec {
+        /* playback */
+        struct hda_multi_out multiout;
+        hda_nid_t playback_nid;
+
+        /* capture */
+        hda_nid_t *adc_nids;
+        unsigned int num_adcs;
+        hda_nid_t *mux_nids;
+        unsigned int num_muxes;
+        hda_nid_t capture_nid;
+        hda_nid_t dig_in_nid;
+
+        /* power management*/
+        hda_nid_t *pstate_nids;
+        unsigned int num_pstates;
+
+        /* pin widgets */
+        hda_nid_t *pin_nids;
+        unsigned int num_pins;
+#ifdef STAC_TEST
+        unsigned int *pin_configs;
+#endif
+
+        /* codec specific stuff */
+        struct hda_verb *init;
+        snd_kcontrol_new_t *mixer;
+
+        /* capture source */
+        struct hda_input_mux input_mux;
+        char input_labels[HDA_MAX_NUM_INPUTS][16];
+        unsigned int cur_mux[2];
+
+        /* channel mode */
+        unsigned int num_ch_modes;
+        unsigned int cur_ch_mode;
+        const struct sigmatel_channel_mode *channel_modes;
+
+        struct hda_pcm pcm_rec[1];      /* PCM information */
+};
+
+static hda_nid_t stac9200_adc_nids[1] = {
+        0x03,
+};
+
+static hda_nid_t stac9200_mux_nids[1] = {
+        0x0c,
+};
+
+static hda_nid_t stac9200_dac_nids[1] = {
+        0x02,
+};
+
+static hda_nid_t stac9200_pstate_nids[3] = {
+        0x01, 0x02, 0x03,
+};
+
+static hda_nid_t stac9200_pin_nids[8] = {
+        0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
+};
+
+static hda_nid_t stac922x_adc_nids[2] = {
+        0x06, 0x07,
+};
+
+static hda_nid_t stac922x_mux_nids[2] = {
+        0x12, 0x13,
+};
+
+static hda_nid_t stac922x_dac_nids[4] = {
+        0x02, 0x03, 0x04, 0x05,
+};
+
+static hda_nid_t stac922x_pstate_nids[8] = {
+        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x11,
+};
+
+static hda_nid_t stac922x_pin_nids[10] = {
+        0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+        0x0f, 0x10, 0x11, 0x15, 0x1b,
+};
+
+static int stac92xx_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_input_mux_info(&spec->input_mux, uinfo);
+}
+
+static int stac92xx_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+
+        ucontrol->value.enumerated.item[0] = spec->cur_mux[adc_idx];
+        return 0;
+}
+
+static int stac92xx_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+
+        return snd_hda_input_mux_put(codec, &spec->input_mux, ucontrol,
+                                     spec->mux_nids[adc_idx], &spec->cur_mux[adc_idx]);
+}
+
+static struct hda_verb stac9200_ch2_init[] = {
+        /* set dac0mux for dac converter */
+        { 0x07, 0x701, 0x00},
+        {}
+};
+
+static struct hda_verb stac922x_ch2_init[] = {
+        /* set master volume and direct control */      
+        { 0x16, 0x70f, 0xff},
+        {}
+};
+
+struct sigmatel_channel_mode {
+        unsigned int channels;
+        const struct hda_verb *sequence;
+};
+
+static snd_kcontrol_new_t stac9200_mixer[] = {
+        HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Source",
+                .count = 1,
+                .info = stac92xx_mux_enum_info,
+                .get = stac92xx_mux_enum_get,
+                .put = stac92xx_mux_enum_put,
+        },
+        HDA_CODEC_VOLUME("Capture Volume", 0x0a, 0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Input Mux Volume", 0x0c, 0, HDA_OUTPUT),
+        { } /* end */
+};
+
+static snd_kcontrol_new_t stac922x_mixer[] = {
+        HDA_CODEC_VOLUME("PCM Playback Volume", 0x2, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("PCM Playback Switch", 0x2, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Source",
+                .count = 1,
+                .info = stac92xx_mux_enum_info,
+                .get = stac92xx_mux_enum_get,
+                .put = stac92xx_mux_enum_put,
+        },
+        HDA_CODEC_VOLUME("Capture Volume", 0x17, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x17, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mux Capture Volume", 0x12, 0x0, HDA_OUTPUT),
+        { } /* end */
+};
+
+static int stac92xx_build_controls(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int err;
+
+        err = snd_hda_add_new_ctls(codec, spec->mixer);
+        if (err < 0)
+                return err;
+        if (spec->multiout.dig_out_nid) {
+                err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
+                if (err < 0)
+                        return err;
+        }
+        if (spec->dig_in_nid) {
+                err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
+                if (err < 0)
+                        return err;
+        }
+        return 0;       
+}
+
+#ifdef STAC_TEST
+static unsigned int stac9200_pin_configs[8] = {
+        0x01c47010, 0x01447010, 0x0221401f, 0x01114010,
+        0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
+};
+
+static unsigned int stac922x_pin_configs[14] = {
+        0x40000100, 0x40000100, 0x40000100, 0x01114010,
+        0x01813122, 0x40000100, 0x01447010, 0x01c47010,
+        0x40000100, 0x40000100,
+};
+
+static void stac92xx_set_config_regs(struct hda_codec *codec)
+{
+        int i;
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int pin_cfg;
+
+        for (i=0; i < spec->num_pins; i++) {
+                snd_hda_codec_write(codec, spec->pin_nids[i], 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_0,
+                                    spec->pin_configs[i] & 0x000000ff);
+                snd_hda_codec_write(codec, spec->pin_nids[i], 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_1,
+                                    (spec->pin_configs[i] & 0x0000ff00) >> 8);
+                snd_hda_codec_write(codec, spec->pin_nids[i], 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_2,
+                                    (spec->pin_configs[i] & 0x00ff0000) >> 16);
+                snd_hda_codec_write(codec, spec->pin_nids[i], 0,
+                                    AC_VERB_SET_CONFIG_DEFAULT_BYTES_3,
+                                    spec->pin_configs[i] >> 24);
+                pin_cfg = snd_hda_codec_read(codec, spec->pin_nids[i], 0,
+                                             AC_VERB_GET_CONFIG_DEFAULT,
+                                             0x00);     
+                printk("pin nid %2.2x pin config %8.8x\n", spec->pin_nids[i], pin_cfg);
+        }
+}
+#endif
+
+static int stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid, unsigned int value)
+{
+        unsigned int pin_ctl;
+
+        pin_ctl = snd_hda_codec_read(codec, nid, 0,
+                                     AC_VERB_GET_PIN_WIDGET_CONTROL,
+                                     0x00);
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                            pin_ctl | value);
+
+        return 0;
+}
+
+static int stac92xx_set_vref(struct hda_codec *codec, hda_nid_t nid)
+{
+        unsigned int vref_caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP) >> AC_PINCAP_VREF_SHIFT;
+        unsigned int vref_ctl = AC_PINCTL_VREF_HIZ;
+
+        if (vref_caps & AC_PINCAP_VREF_100)
+                vref_ctl = AC_PINCTL_VREF_100;
+        else if (vref_caps & AC_PINCAP_VREF_80)
+                vref_ctl = AC_PINCTL_VREF_80;
+        else if (vref_caps & AC_PINCAP_VREF_50)
+                vref_ctl = AC_PINCTL_VREF_50;
+        else if (vref_caps & AC_PINCAP_VREF_GRD)
+                vref_ctl = AC_PINCTL_VREF_GRD;
+
+        stac92xx_set_pinctl(codec, nid, vref_ctl);
+        
+        return 0;
+}
+
+/*
+ * retrieve the default device type from the default config value
+ */
+#define get_defcfg_type(cfg) ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
+#define get_defcfg_location(cfg) ((cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
+
+static int stac92xx_config_pin(struct hda_codec *codec, hda_nid_t nid, unsigned int pin_cfg)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        u32 location = get_defcfg_location(pin_cfg);
+        char *label;
+        const char *type = NULL;
+        int ainput = 0;
+
+        switch(get_defcfg_type(pin_cfg)) {
+                case AC_JACK_HP_OUT:
+                        /* Enable HP amp */
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_HP_EN);
+                        /* Fall through */
+                case AC_JACK_SPDIF_OUT:
+                case AC_JACK_LINE_OUT:
+                case AC_JACK_SPEAKER:
+                        /* Enable output */
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
+                        break;
+                case AC_JACK_SPDIF_IN:
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
+                        break;
+                case AC_JACK_MIC_IN:
+                        if ((location & 0x0f) == AC_JACK_LOC_FRONT)
+                                type = "Front Mic";
+                        else
+                                type = "Mic";
+                        ainput = 1;
+                        /* Set vref */
+                        stac92xx_set_vref(codec, nid);
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
+                        break;
+                case AC_JACK_CD:
+                        type = "CD";
+                        ainput = 1;
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
+                        break;
+                case AC_JACK_LINE_IN:
+                        if ((location & 0x0f) == AC_JACK_LOC_FRONT)
+                                type = "Front Line";
+                        else
+                                type = "Line";
+                        ainput = 1;
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
+                        break;
+                case AC_JACK_AUX:
+                        if ((location & 0x0f) == AC_JACK_LOC_FRONT)
+                                type = "Front Aux";
+                        else
+                                type = "Aux";
+                        ainput = 1;
+                        stac92xx_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
+                        break;
+        }
+
+        if (ainput) {
+                hda_nid_t con_lst[HDA_MAX_NUM_INPUTS];
+                int i, j, num_cons, index = -1;
+                if (!type)
+                        type = "Input";
+                label = spec->input_labels[spec->input_mux.num_items];
+                strcpy(label, type);
+                spec->input_mux.items[spec->input_mux.num_items].label = label;
+                for (i=0; i<spec->num_muxes; i++) {
+                        num_cons = snd_hda_get_connections(codec, spec->mux_nids[i], con_lst, HDA_MAX_NUM_INPUTS);
+                        for (j=0; j<num_cons; j++)
+                                if (con_lst[j] == nid) {
+                                        index = j;
+                                        break;
+                                }
+                        if (index >= 0)
+                                break;
+                }
+                spec->input_mux.items[spec->input_mux.num_items].index = index;
+                spec->input_mux.num_items++;
+        }
+
+        return 0;
+}
+
+static int stac92xx_config_pins(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int i;
+        unsigned int pin_cfg;
+
+        for (i=0; i < spec->num_pins; i++) {
+                /* Default to disabled */
+                snd_hda_codec_write(codec, spec->pin_nids[i], 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                    0x00);
+
+                pin_cfg = snd_hda_codec_read(codec, spec->pin_nids[i], 0,
+                                             AC_VERB_GET_CONFIG_DEFAULT,
+                                             0x00);
+                if (((pin_cfg & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT) == AC_JACK_PORT_NONE)
+                        continue;       /* Move on */
+
+                stac92xx_config_pin(codec, spec->pin_nids[i], pin_cfg);
+        }
+
+        return 0;
+}
+
+static int stac92xx_init(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        int i;
+
+        for (i=0; i < spec->num_pstates; i++)
+                snd_hda_codec_write(codec, spec->pstate_nids[i], 0,
+                                    AC_VERB_SET_POWER_STATE, 0x00);
+
+        mdelay(100);
+
+        snd_hda_sequence_write(codec, spec->init);
+
+#ifdef STAC_TEST
+        stac92xx_set_config_regs(codec);
+#endif
+
+        stac92xx_config_pins(codec);
+
+        return 0;
+}
+
+/*
+ * Analog playback callbacks
+ */
+static int stac92xx_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                      struct hda_codec *codec,
+                                      snd_pcm_substream_t *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
+}
+
+static int stac92xx_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                         struct hda_codec *codec,
+                                         unsigned int stream_tag,
+                                         unsigned int format,
+                                         snd_pcm_substream_t *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
+                                                format, substream);
+}
+
+static int stac92xx_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        snd_pcm_substream_t *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
+}
+
+/*
+ * Digital playback callbacks
+ */
+static int stac92xx_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                          struct hda_codec *codec,
+                                          snd_pcm_substream_t *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+}
+
+static int stac92xx_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
+                                           struct hda_codec *codec,
+                                           snd_pcm_substream_t *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+}
+
+
+/*
+ * Analog capture callbacks
+ */
+static int stac92xx_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        unsigned int stream_tag,
+                                        unsigned int format,
+                                        snd_pcm_substream_t *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number],
+                                   stream_tag, 0, format);
+        return 0;
+}
+
+static int stac92xx_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        snd_pcm_substream_t *substream)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
+        return 0;
+}
+
+static struct hda_pcm_stream stac92xx_pcm_digital_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in stac92xx_build_pcms */
+        .ops = {
+                .open = stac92xx_dig_playback_pcm_open,
+                .close = stac92xx_dig_playback_pcm_close
+        },
+};
+
+static struct hda_pcm_stream stac92xx_pcm_digital_capture = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in stac92xx_build_pcms */
+};
+
+static struct hda_pcm_stream stac92xx_pcm_analog_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x02, /* NID to query formats and rates */
+        .ops = {
+                .open = stac92xx_playback_pcm_open,
+                .prepare = stac92xx_playback_pcm_prepare,
+                .cleanup = stac92xx_playback_pcm_cleanup
+        },
+};
+
+static struct hda_pcm_stream stac92xx_pcm_analog_capture = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0x06, /* NID to query formats and rates */
+        .ops = {
+                .prepare = stac92xx_capture_pcm_prepare,
+                .cleanup = stac92xx_capture_pcm_cleanup
+        },
+};
+
+static int stac92xx_build_pcms(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
+
+        codec->num_pcms = 1;
+        codec->pcm_info = info;
+
+        info->name = "STAC92xx";
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback;
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->playback_nid;
+        info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_analog_capture;
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->capture_nid;
+
+        if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
+                codec->num_pcms++;
+                info++;
+                info->name = "STAC92xx Digital";
+                if (spec->multiout.dig_out_nid) {
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_digital_playback;
+                        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
+                }
+                if (spec->dig_in_nid) {
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_digital_capture;
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
+                }
+        }
+
+        return 0;
+}
+
+static void stac92xx_free(struct hda_codec *codec)
+{
+        kfree(codec->spec);
+}
+
+static struct hda_codec_ops stac92xx_patch_ops = {
+        .build_controls = stac92xx_build_controls,
+        .build_pcms = stac92xx_build_pcms,
+        .init = stac92xx_init,
+        .free = stac92xx_free,
+};
+
+static int patch_stac9200(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec;
+
+        spec  = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+
+        spec->multiout.max_channels = 2;
+        spec->multiout.num_dacs = 1;
+        spec->multiout.dac_nids = stac9200_dac_nids;
+        spec->multiout.dig_out_nid = 0x05;
+        spec->dig_in_nid = 0x04;
+        spec->adc_nids = stac9200_adc_nids;
+        spec->mux_nids = stac9200_mux_nids;
+        spec->num_muxes = 1;
+        spec->input_mux.num_items = 0;
+        spec->pstate_nids = stac9200_pstate_nids;
+        spec->num_pstates = 3;
+        spec->pin_nids = stac9200_pin_nids;
+#ifdef STAC_TEST
+        spec->pin_configs = stac9200_pin_configs;
+#endif
+        spec->num_pins = 8;
+        spec->init = stac9200_ch2_init;
+        spec->mixer = stac9200_mixer;
+        spec->playback_nid = 0x02;
+        spec->capture_nid = 0x03;
+
+        codec->patch_ops = stac92xx_patch_ops;
+
+        return 0;
+}
+
+static int patch_stac922x(struct hda_codec *codec)
+{
+        struct sigmatel_spec *spec;
+
+        spec  = kcalloc(1, sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+
+        spec->multiout.max_channels = 2;
+        spec->multiout.num_dacs = 4;
+        spec->multiout.dac_nids = stac922x_dac_nids;
+        spec->multiout.dig_out_nid = 0x08;
+        spec->dig_in_nid = 0x09;
+        spec->adc_nids = stac922x_adc_nids;
+        spec->mux_nids = stac922x_mux_nids;
+        spec->num_muxes = 2;
+        spec->input_mux.num_items = 0;
+        spec->pstate_nids = stac922x_pstate_nids;
+        spec->num_pstates = 8;
+        spec->pin_nids = stac922x_pin_nids;
+#ifdef STAC_TEST
+        spec->pin_configs = stac922x_pin_configs;
+#endif
+        spec->num_pins = 10;
+        spec->init = stac922x_ch2_init;
+        spec->mixer = stac922x_mixer;
+        spec->playback_nid = 0x02;
+        spec->capture_nid = 0x06;
+
+        codec->patch_ops = stac92xx_patch_ops;
+
+        return 0;
+}
+
+/*
+ * patch entries
+ */
+struct hda_codec_preset snd_hda_preset_sigmatel[] = {
+        { .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 },
+        { .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x },
+        { .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x },
+        { .id = 0x83847880, .name = "STAC9220 A2", .patch = patch_stac922x },
+        { .id = 0x83847681, .name = "STAC9220D/9223D A2", .patch = patch_stac922x },
+        { .id = 0x83847682, .name = "STAC9221 A2", .patch = patch_stac922x },
+        { .id = 0x83847683, .name = "STAC9221D A2", .patch = patch_stac922x },
+        {} /* terminator */
+};
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c
index 779951725e1e..289b0b5711e4 100644
--- a/sound/pci/ice1712/amp.c
+++ b/sound/pci/ice1712/amp.c
@@ -30,16 +30,39 @@
 #include <sound/core.h>
 
 #include "ice1712.h"
+#include "envy24ht.h"
 #include "amp.h"
 
+static void wm_put(ice1712_t *ice, int reg, unsigned short val)
+{
+        unsigned short cval;
+        cval = (reg << 9) | val;
+        snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff);
+}
 
 static int __devinit snd_vt1724_amp_init(ice1712_t *ice)
 {
+        static unsigned short wm_inits[] = {
+                WM_ATTEN_L,     0x0000, /* 0 db */
+                WM_ATTEN_R,     0x0000, /* 0 db */
+                WM_DAC_CTRL,    0x0008, /* 24bit I2S */
+                WM_INT_CTRL,    0x0001, /* 24bit I2S */ 
+        };
+
+        unsigned int i;
+
         /* only use basic functionality for now */
 
         ice->num_total_dacs = 2;        /* only PSDOUT0 is connected */
         ice->num_total_adcs = 2;
 
+        /* Chaintech AV-710 has another codecs, which need initialization */
+        /* initialize WM8728 codec */
+        if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AV710) {
+                for (i = 0; i < ARRAY_SIZE(wm_inits); i += 2)
+                        wm_put(ice, wm_inits[i], wm_inits[i+1]);
+        }
+
         return 0;
 }
 
@@ -54,6 +77,13 @@ static int __devinit snd_vt1724_amp_add_controls(ice1712_t *ice)
 /* entry point */
 struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = {
         {
+                .subvendor = VT1724_SUBDEVICE_AV710,
+                .name = "Chaintech AV-710",
+                .model = "av710",
+                .chip_init = snd_vt1724_amp_init,
+                .build_controls = snd_vt1724_amp_add_controls,
+        },
+        {
                 .subvendor = VT1724_SUBDEVICE_AUDIO2000,
                 .name = "AMP Ltd AUDIO2000",
                 .model = "amp2000",
diff --git a/sound/pci/ice1712/amp.h b/sound/pci/ice1712/amp.h
index d58d43383e83..a0fc89b48122 100644
--- a/sound/pci/ice1712/amp.h
+++ b/sound/pci/ice1712/amp.h
@@ -24,9 +24,23 @@
  *
  */      
 
-#define  AMP_AUDIO2000_DEVICE_DESC             "{AMP Ltd,AUDIO2000},"
+#define  AMP_AUDIO2000_DEVICE_DESC             "{AMP Ltd,AUDIO2000},"\
+                                               "{Chaintech,AV-710},"
 
+#if 0
 #define VT1724_SUBDEVICE_AUDIO2000      0x12142417      /* Advanced Micro Peripherals Ltd AUDIO2000 */
+#else
+#define VT1724_SUBDEVICE_AUDIO2000      0x00030003      /* a dummy ID for AMP Audio2000 */
+#endif
+#define VT1724_SUBDEVICE_AV710          0x12142417      /* AV710 - the same ID with Audio2000! */
+
+/* WM8728 on I2C for AV710 */
+#define WM_DEV          0x36
+
+#define WM_ATTEN_L      0x00
+#define WM_ATTEN_R      0x01
+#define WM_DAC_CTRL     0x02
+#define WM_INT_CTRL     0x03
 
 extern struct snd_ice1712_card_info  snd_vt1724_amp_cards[];
 
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 79fba6be3503..a2545a5b26c4 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2748,7 +2748,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_ice1712_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_ice1712_exit(void)
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index 8bb1c58c26a0..5ad4728daa7b 100644
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -373,6 +373,11 @@ struct _snd_ice1712 {
                         unsigned short master[2];
                         unsigned short vol[8];
                 } aureon;
+                /* AC97 register cache for Phase28 */
+                struct phase28_spec {
+                        unsigned short master[2];
+                        unsigned short vol[8];
+                } phase28;
                 /* Hoontech-specific setting */
                 struct hoontech_spec {
                         unsigned char boxbits[4];
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 95500f06f0c6..79b5f12e06fc 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2328,7 +2328,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_ice1724_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_ice1724_exit(void)
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c
index d1f90832443c..5bf734b04fa0 100644
--- a/sound/pci/ice1712/phase.c
+++ b/sound/pci/ice1712/phase.c
@@ -45,6 +45,47 @@
 #include "envy24ht.h"
 #include "phase.h"
 
+/* WM8770 registers */
+#define WM_DAC_ATTEN            0x00    /* DAC1-8 analog attenuation */
+#define WM_DAC_MASTER_ATTEN     0x08    /* DAC master analog attenuation */
+#define WM_DAC_DIG_ATTEN        0x09    /* DAC1-8 digital attenuation */
+#define WM_DAC_DIG_MASTER_ATTEN 0x11    /* DAC master digital attenuation */
+#define WM_PHASE_SWAP           0x12    /* DAC phase */
+#define WM_DAC_CTRL1            0x13    /* DAC control bits */
+#define WM_MUTE                 0x14    /* mute controls */
+#define WM_DAC_CTRL2            0x15    /* de-emphasis and zefo-flag */
+#define WM_INT_CTRL             0x16    /* interface control */
+#define WM_MASTER               0x17    /* master clock and mode */
+#define WM_POWERDOWN            0x18    /* power-down controls */
+#define WM_ADC_GAIN             0x19    /* ADC gain L(19)/R(1a) */
+#define WM_ADC_MUX              0x1b    /* input MUX */
+#define WM_OUT_MUX1             0x1c    /* output MUX */
+#define WM_OUT_MUX2             0x1e    /* output MUX */
+#define WM_RESET                0x1f    /* software reset */
+
+
+/*
+ * Logarithmic volume values for WM8770
+ * Computed as 20 * Log10(255 / x)
+ */
+static unsigned char wm_vol[256] = {
+        127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,
+        23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
+        17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,
+        13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11,
+        11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
+        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+        5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0
+};
+
+#define WM_VOL_MAX      (sizeof(wm_vol) - 1)
+#define WM_VOL_MUTE     0x8000
+
 static akm4xxx_t akm_phase22 __devinitdata = {
         .type = SND_AK4524,
         .num_dacs = 2,
@@ -124,6 +165,684 @@ static unsigned char phase22_eeprom[] __devinitdata = {
         0x00,   /* GPIO_STATE2 */
 };
 
+static unsigned char phase28_eeprom[] __devinitdata = {
+        0x0b,   /* SYSCONF: clock 512, spdif-in/ADC, 4DACs */
+        0x80,   /* ACLINK: I2S */
+        0xfc,   /* I2S: vol, 96k, 24bit, 192k */
+        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
+        0xff,   /* GPIO_DIR */
+        0xff,   /* GPIO_DIR1 */
+        0x5f,   /* GPIO_DIR2 */
+        0x00,   /* GPIO_MASK */
+        0x00,   /* GPIO_MASK1 */
+        0x00,   /* GPIO_MASK2 */
+        0x00,   /* GPIO_STATE */
+        0x00,   /* GPIO_STATE1 */
+        0x00,   /* GPIO_STATE2 */
+};
+
+/*
+ * write data in the SPI mode
+ */
+static void phase28_spi_write(ice1712_t *ice, unsigned int cs, unsigned int data, int bits)
+{
+        unsigned int tmp;
+        int i;
+
+        tmp = snd_ice1712_gpio_read(ice);
+
+        snd_ice1712_gpio_set_mask(ice, ~(PHASE28_WM_RW|PHASE28_SPI_MOSI|PHASE28_SPI_CLK|
+                                         PHASE28_WM_CS));
+        tmp |= PHASE28_WM_RW;
+        tmp &= ~cs;
+        snd_ice1712_gpio_write(ice, tmp);
+        udelay(1);
+
+        for (i = bits - 1; i >= 0; i--) {
+                tmp &= ~PHASE28_SPI_CLK;
+                snd_ice1712_gpio_write(ice, tmp);
+                udelay(1);
+                if (data & (1 << i))
+                        tmp |= PHASE28_SPI_MOSI;
+                else
+                        tmp &= ~PHASE28_SPI_MOSI;
+                snd_ice1712_gpio_write(ice, tmp);
+                udelay(1);
+                tmp |= PHASE28_SPI_CLK;
+                snd_ice1712_gpio_write(ice, tmp);
+                udelay(1);
+        }
+
+        tmp &= ~PHASE28_SPI_CLK;
+        tmp |= cs;
+        snd_ice1712_gpio_write(ice, tmp);
+        udelay(1);
+        tmp |= PHASE28_SPI_CLK;
+        snd_ice1712_gpio_write(ice, tmp);
+        udelay(1);
+}
+
+/*
+ * get the current register value of WM codec
+ */
+static unsigned short wm_get(ice1712_t *ice, int reg)
+{
+        reg <<= 1;
+        return ((unsigned short)ice->akm[0].images[reg] << 8) |
+                ice->akm[0].images[reg + 1];
+}
+
+/*
+ * set the register value of WM codec
+ */
+static void wm_put_nocache(ice1712_t *ice, int reg, unsigned short val)
+{
+        phase28_spi_write(ice, PHASE28_WM_CS, (reg << 9) | (val & 0x1ff), 16);
+}
+
+/*
+ * set the register value of WM codec and remember it
+ */
+static void wm_put(ice1712_t *ice, int reg, unsigned short val)
+{
+        wm_put_nocache(ice, reg, val);
+        reg <<= 1;
+        ice->akm[0].images[reg] = val >> 8;
+        ice->akm[0].images[reg + 1] = val;
+}
+
+static void wm_set_vol(ice1712_t *ice, unsigned int index, unsigned short vol, unsigned short master)
+{
+        unsigned char nvol;
+
+        if ((master & WM_VOL_MUTE) || (vol & WM_VOL_MUTE))
+                nvol = 0;
+        else
+                nvol = 127 - wm_vol[(((vol & ~WM_VOL_MUTE) * (master & ~WM_VOL_MUTE)) / 127) & WM_VOL_MAX];
+
+        wm_put(ice, index, nvol);
+        wm_put_nocache(ice, index, 0x180 | nvol);
+}
+
+/*
+ * DAC mute control
+ */
+#define wm_pcm_mute_info        phase28_mono_bool_info
+
+static int wm_pcm_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+        down(&ice->gpio_mutex);
+        ucontrol->value.integer.value[0] = (wm_get(ice, WM_MUTE) & 0x10) ? 0 : 1;
+        up(&ice->gpio_mutex);
+        return 0;
+}
+
+static int wm_pcm_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        unsigned short nval, oval;
+        int change;
+
+        snd_ice1712_save_gpio_status(ice);
+        oval = wm_get(ice, WM_MUTE);
+        nval = (oval & ~0x10) | (ucontrol->value.integer.value[0] ? 0 : 0x10);
+        if ((change = (nval != oval)))
+                wm_put(ice, WM_MUTE, nval);
+        snd_ice1712_restore_gpio_status(ice);
+
+        return change;
+}
+
+/*
+ * Master volume attenuation mixer control
+ */
+static int wm_master_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = WM_VOL_MAX;
+        return 0;
+}
+
+static int wm_master_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int i;
+        for (i=0; i<2; i++)
+                ucontrol->value.integer.value[i] = ice->spec.phase28.master[i] & ~WM_VOL_MUTE;
+        return 0;
+}
+
+static int wm_master_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int ch, change = 0;
+
+        snd_ice1712_save_gpio_status(ice);
+        for (ch = 0; ch < 2; ch++) {
+                if (ucontrol->value.integer.value[ch] != ice->spec.phase28.master[ch]) {
+                        int dac;
+                        ice->spec.phase28.master[ch] &= WM_VOL_MUTE;
+                        ice->spec.phase28.master[ch] |= ucontrol->value.integer.value[ch];
+                        for (dac = 0; dac < ice->num_total_dacs; dac += 2)
+                                wm_set_vol(ice, WM_DAC_ATTEN + dac + ch,
+                                           ice->spec.phase28.vol[dac + ch],
+                                           ice->spec.phase28.master[ch]);
+                        change = 1;
+                }
+        }
+        snd_ice1712_restore_gpio_status(ice);
+        return change;
+}
+
+static int __devinit phase28_init(ice1712_t *ice)
+{
+        static unsigned short wm_inits_phase28[] = {
+                /* These come first to reduce init pop noise */
+                0x1b, 0x044,            /* ADC Mux (AC'97 source) */
+                0x1c, 0x00B,            /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */
+                0x1d, 0x009,            /* Out Mux2 (VOUT2 = DAC, VOUT3 = DAC) */
+
+                0x18, 0x000,            /* All power-up */
+
+                0x16, 0x122,            /* I2S, normal polarity, 24bit */
+                0x17, 0x022,            /* 256fs, slave mode */
+                0x00, 0,                /* DAC1 analog mute */
+                0x01, 0,                /* DAC2 analog mute */
+                0x02, 0,                /* DAC3 analog mute */
+                0x03, 0,                /* DAC4 analog mute */
+                0x04, 0,                /* DAC5 analog mute */
+                0x05, 0,                /* DAC6 analog mute */
+                0x06, 0,                /* DAC7 analog mute */
+                0x07, 0,                /* DAC8 analog mute */
+                0x08, 0x100,            /* master analog mute */
+                0x09, 0xff,             /* DAC1 digital full */
+                0x0a, 0xff,             /* DAC2 digital full */
+                0x0b, 0xff,             /* DAC3 digital full */
+                0x0c, 0xff,             /* DAC4 digital full */
+                0x0d, 0xff,             /* DAC5 digital full */
+                0x0e, 0xff,             /* DAC6 digital full */
+                0x0f, 0xff,             /* DAC7 digital full */
+                0x10, 0xff,             /* DAC8 digital full */
+                0x11, 0x1ff,            /* master digital full */
+                0x12, 0x000,            /* phase normal */
+                0x13, 0x090,            /* unmute DAC L/R */
+                0x14, 0x000,            /* all unmute */
+                0x15, 0x000,            /* no deemphasis, no ZFLG */
+                0x19, 0x000,            /* -12dB ADC/L */
+                0x1a, 0x000,            /* -12dB ADC/R */
+                (unsigned short)-1
+        };
+
+        unsigned int tmp;
+        akm4xxx_t *ak;
+        unsigned short *p;
+        int i;
+
+        ice->num_total_dacs = 8;
+        ice->num_total_adcs = 2;
+
+        // Initialize analog chips
+        ak = ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL);
+        if (!ak)
+                return -ENOMEM;
+        ice->akm_codecs = 1;
+
+        snd_ice1712_gpio_set_dir(ice, 0x5fffff); /* fix this for the time being */
+
+        /* reset the wm codec as the SPI mode */
+        snd_ice1712_save_gpio_status(ice);
+        snd_ice1712_gpio_set_mask(ice, ~(PHASE28_WM_RESET|PHASE28_WM_CS|PHASE28_HP_SEL));
+
+        tmp = snd_ice1712_gpio_read(ice);
+        tmp &= ~PHASE28_WM_RESET;
+        snd_ice1712_gpio_write(ice, tmp);
+        udelay(1);
+        tmp |= PHASE28_WM_CS;
+        snd_ice1712_gpio_write(ice, tmp);
+        udelay(1);
+        tmp |= PHASE28_WM_RESET;
+        snd_ice1712_gpio_write(ice, tmp);
+        udelay(1);
+
+        p = wm_inits_phase28;
+        for (; *p != (unsigned short)-1; p += 2)
+                wm_put(ice, p[0], p[1]);
+
+        snd_ice1712_restore_gpio_status(ice);
+
+        ice->spec.phase28.master[0] = WM_VOL_MUTE;
+        ice->spec.phase28.master[1] = WM_VOL_MUTE;
+        for (i = 0; i < ice->num_total_dacs; i++) {
+                ice->spec.phase28.vol[i] = WM_VOL_MUTE;
+                wm_set_vol(ice, i, ice->spec.phase28.vol[i], ice->spec.phase28.master[i % 2]);
+        }
+
+        return 0;
+}
+
+/*
+ * DAC volume attenuation mixer control
+ */
+static int wm_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        int voices = kcontrol->private_value >> 8;
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = voices;
+        uinfo->value.integer.min = 0;           /* mute (-101dB) */
+        uinfo->value.integer.max = 0x7F;        /* 0dB */
+        return 0;
+}
+
+static int wm_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int i, ofs, voices;
+
+        voices = kcontrol->private_value >> 8;
+        ofs = kcontrol->private_value & 0xff;
+        for (i = 0; i < voices; i++)
+                ucontrol->value.integer.value[i] = ice->spec.phase28.vol[ofs+i] & ~WM_VOL_MUTE;
+        return 0;
+}
+
+static int wm_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int i, idx, ofs, voices;
+        int change = 0;
+
+        voices = kcontrol->private_value >> 8;
+        ofs = kcontrol->private_value & 0xff;
+        snd_ice1712_save_gpio_status(ice);
+        for (i = 0; i < voices; i++) {
+                idx  = WM_DAC_ATTEN + ofs + i;
+                if (ucontrol->value.integer.value[i] != ice->spec.phase28.vol[ofs+i]) {
+                        ice->spec.phase28.vol[ofs+i] &= WM_VOL_MUTE;
+                        ice->spec.phase28.vol[ofs+i] |= ucontrol->value.integer.value[i];
+                        wm_set_vol(ice, idx, ice->spec.phase28.vol[ofs+i],
+                                   ice->spec.phase28.master[i]);
+                        change = 1;
+                }
+        }
+        snd_ice1712_restore_gpio_status(ice);
+        return change;
+}
+
+/*
+ * WM8770 mute control
+ */
+static int wm_mute_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) {
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = kcontrol->private_value >> 8;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int wm_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int voices, ofs, i;
+
+        voices = kcontrol->private_value >> 8;
+        ofs = kcontrol->private_value & 0xFF;
+
+        for (i = 0; i < voices; i++)
+                ucontrol->value.integer.value[i] = (ice->spec.phase28.vol[ofs+i] & WM_VOL_MUTE) ? 0 : 1;
+        return 0;
+}
+
+static int wm_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, voices, ofs, i;
+
+        voices = kcontrol->private_value >> 8;
+        ofs = kcontrol->private_value & 0xFF;
+
+        snd_ice1712_save_gpio_status(ice);
+        for (i = 0; i < voices; i++) {
+                int val = (ice->spec.phase28.vol[ofs + i] & WM_VOL_MUTE) ? 0 : 1;
+                if (ucontrol->value.integer.value[i] != val) {
+                        ice->spec.phase28.vol[ofs + i] &= ~WM_VOL_MUTE;
+                        ice->spec.phase28.vol[ofs + i] |=
+                                ucontrol->value.integer.value[i] ? 0 : WM_VOL_MUTE;
+                        wm_set_vol(ice, ofs + i, ice->spec.phase28.vol[ofs + i],
+                                   ice->spec.phase28.master[i]);
+                        change = 1;
+                }
+        }
+        snd_ice1712_restore_gpio_status(ice);
+
+        return change;
+}
+
+/*
+ * WM8770 master mute control
+ */
+static int wm_master_mute_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) {
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int wm_master_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.integer.value[0] = (ice->spec.phase28.master[0] & WM_VOL_MUTE) ? 0 : 1;
+        ucontrol->value.integer.value[1] = (ice->spec.phase28.master[1] & WM_VOL_MUTE) ? 0 : 1;
+        return 0;
+}
+
+static int wm_master_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, i;
+
+        snd_ice1712_save_gpio_status(ice);
+        for (i = 0; i < 2; i++) {
+                int val = (ice->spec.phase28.master[i] & WM_VOL_MUTE) ? 0 : 1;
+                if (ucontrol->value.integer.value[i] != val) {
+                        int dac;
+                        ice->spec.phase28.master[i] &= ~WM_VOL_MUTE;
+                        ice->spec.phase28.master[i] |=
+                                ucontrol->value.integer.value[i] ? 0 : WM_VOL_MUTE;
+                        for (dac = 0; dac < ice->num_total_dacs; dac += 2)
+                                wm_set_vol(ice, WM_DAC_ATTEN + dac + i,
+                                           ice->spec.phase28.vol[dac + i],
+                                           ice->spec.phase28.master[i]);
+                        change = 1;
+                }
+        }
+        snd_ice1712_restore_gpio_status(ice);
+
+        return change;
+}
+
+/* digital master volume */
+#define PCM_0dB 0xff
+#define PCM_RES 128     /* -64dB */
+#define PCM_MIN (PCM_0dB - PCM_RES)
+static int wm_pcm_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;           /* mute (-64dB) */
+        uinfo->value.integer.max = PCM_RES;     /* 0dB */
+        return 0;
+}
+
+static int wm_pcm_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        unsigned short val;
+
+        down(&ice->gpio_mutex);
+        val = wm_get(ice, WM_DAC_DIG_MASTER_ATTEN) & 0xff;
+        val = val > PCM_MIN ? (val - PCM_MIN) : 0;
+        ucontrol->value.integer.value[0] = val;
+        up(&ice->gpio_mutex);
+        return 0;
+}
+
+static int wm_pcm_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        unsigned short ovol, nvol;
+        int change = 0;
+
+        snd_ice1712_save_gpio_status(ice);
+        nvol = ucontrol->value.integer.value[0];
+        nvol = (nvol ? (nvol + PCM_MIN) : 0) & 0xff;
+        ovol = wm_get(ice, WM_DAC_DIG_MASTER_ATTEN) & 0xff;
+        if (ovol != nvol) {
+                wm_put(ice, WM_DAC_DIG_MASTER_ATTEN, nvol); /* prelatch */
+                wm_put_nocache(ice, WM_DAC_DIG_MASTER_ATTEN, nvol | 0x100); /* update */
+                change = 1;
+        }
+        snd_ice1712_restore_gpio_status(ice);
+        return change;
+}
+
+/*
+ */
+static int phase28_mono_bool_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+/*
+ * Deemphasis
+ */
+#define phase28_deemp_info      phase28_mono_bool_info
+
+static int phase28_deemp_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = (wm_get(ice, WM_DAC_CTRL2) & 0xf) == 0xf;
+        return 0;
+}
+
+static int phase28_deemp_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int temp, temp2;
+        temp2 = temp = wm_get(ice, WM_DAC_CTRL2);
+        if (ucontrol->value.integer.value[0])
+                temp |= 0xf;
+        else
+                temp &= ~0xf;
+        if (temp != temp2) {
+                wm_put(ice, WM_DAC_CTRL2, temp);
+                return 1;
+        }
+        return 0;
+}
+
+/*
+ * ADC Oversampling
+ */
+static int phase28_oversampling_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
+{
+        static char *texts[2] = { "128x", "64x" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int phase28_oversampling_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.enumerated.item[0] = (wm_get(ice, WM_MASTER) & 0x8) == 0x8;
+        return 0;
+}
+
+static int phase28_oversampling_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        int temp, temp2;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+        temp2 = temp = wm_get(ice, WM_MASTER);
+
+        if (ucontrol->value.enumerated.item[0])
+                temp |= 0x8;
+        else
+                temp &= ~0x8;
+
+        if (temp != temp2) {
+                wm_put(ice, WM_MASTER, temp);
+                return 1;
+        }
+        return 0;
+}
+
+static snd_kcontrol_new_t phase28_dac_controls[] __devinitdata = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Switch",
+                .info = wm_master_mute_info,
+                .get = wm_master_mute_get,
+                .put = wm_master_mute_put
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Volume",
+                .info = wm_master_vol_info,
+                .get = wm_master_vol_get,
+                .put = wm_master_vol_put
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Front Playback Switch",
+                .info = wm_mute_info,
+                .get = wm_mute_get,
+                .put = wm_mute_put,
+                .private_value = (2 << 8) | 0
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Front Playback Volume",
+                .info = wm_vol_info,
+                .get = wm_vol_get,
+                .put = wm_vol_put,
+                .private_value = (2 << 8) | 0
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Rear Playback Switch",
+                .info = wm_mute_info,
+                .get = wm_mute_get,
+                .put = wm_mute_put,
+                .private_value = (2 << 8) | 2
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Rear Playback Volume",
+                .info = wm_vol_info,
+                .get = wm_vol_get,
+                .put = wm_vol_put,
+                .private_value = (2 << 8) | 2
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Center Playback Switch",
+                .info = wm_mute_info,
+                .get = wm_mute_get,
+                .put = wm_mute_put,
+                .private_value = (1 << 8) | 4
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Center Playback Volume",
+                .info = wm_vol_info,
+                .get = wm_vol_get,
+                .put = wm_vol_put,
+                .private_value = (1 << 8) | 4
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "LFE Playback Switch",
+                .info = wm_mute_info,
+                .get = wm_mute_get,
+                .put = wm_mute_put,
+                .private_value = (1 << 8) | 5
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "LFE Playback Volume",
+                .info = wm_vol_info,
+                .get = wm_vol_get,
+                .put = wm_vol_put,
+                .private_value = (1 << 8) | 5
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Side Playback Switch",
+                .info = wm_mute_info,
+                .get = wm_mute_get,
+                .put = wm_mute_put,
+                .private_value = (2 << 8) | 6
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Side Playback Volume",
+                .info = wm_vol_info,
+                .get = wm_vol_get,
+                .put = wm_vol_put,
+                .private_value = (2 << 8) | 6
+        }
+};
+
+static snd_kcontrol_new_t wm_controls[] __devinitdata = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "PCM Playback Switch",
+                .info = wm_pcm_mute_info,
+                .get = wm_pcm_mute_get,
+                .put = wm_pcm_mute_put
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "PCM Playback Volume",
+                .info = wm_pcm_vol_info,
+                .get = wm_pcm_vol_get,
+                .put = wm_pcm_vol_put
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "DAC Deemphasis Switch",
+                .info = phase28_deemp_info,
+                .get = phase28_deemp_get,
+                .put = phase28_deemp_put
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "ADC Oversampling",
+                .info = phase28_oversampling_info,
+                .get = phase28_oversampling_get,
+                .put = phase28_oversampling_put
+        }
+};
+
+static int __devinit phase28_add_controls(ice1712_t *ice)
+{
+        unsigned int i, counts;
+        int err;
+
+        counts = ARRAY_SIZE(phase28_dac_controls);
+        for (i = 0; i < counts; i++) {
+                err = snd_ctl_add(ice->card, snd_ctl_new1(&phase28_dac_controls[i], ice));
+                if (err < 0)
+                        return err;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(wm_controls); i++) {
+                err = snd_ctl_add(ice->card, snd_ctl_new1(&wm_controls[i], ice));
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
+
 struct snd_ice1712_card_info snd_vt1724_phase_cards[] __devinitdata = {
         {
                 .subvendor = VT1724_SUBDEVICE_PHASE22,
@@ -134,5 +853,14 @@ struct snd_ice1712_card_info snd_vt1724_phase_cards[] __devinitdata = {
                 .eeprom_size = sizeof(phase22_eeprom),
                 .eeprom_data = phase22_eeprom,
         },
+        {
+                .subvendor = VT1724_SUBDEVICE_PHASE28,
+                .name = "Terratec PHASE 28",
+                .model = "phase28",
+                .chip_init = phase28_init,
+                .build_controls = phase28_add_controls,
+                .eeprom_size = sizeof(phase28_eeprom),
+                .eeprom_data = phase28_eeprom,
+        },
         { } /* terminator */
 };
diff --git a/sound/pci/ice1712/phase.h b/sound/pci/ice1712/phase.h
index 6230cf16989f..13e841b55488 100644
--- a/sound/pci/ice1712/phase.h
+++ b/sound/pci/ice1712/phase.h
@@ -24,11 +24,28 @@
  *
  */      
 
-#define PHASE_DEVICE_DESC "{Terratec,Phase 22},"
+#define PHASE_DEVICE_DESC "{Terratec,Phase 22},"\
+                          "{Terratec,Phase 28},"
 
 #define VT1724_SUBDEVICE_PHASE22        0x3b155011
+#define VT1724_SUBDEVICE_PHASE28        0x3b154911
 
 /* entry point */
 extern struct snd_ice1712_card_info snd_vt1724_phase_cards[];
 
+/* PHASE28 GPIO bits */
+#define PHASE28_SPI_MISO        (1 << 21)
+#define PHASE28_WM_RESET        (1 << 20)
+#define PHASE28_SPI_CLK         (1 << 19)
+#define PHASE28_SPI_MOSI        (1 << 18)
+#define PHASE28_WM_RW           (1 << 17)
+#define PHASE28_AC97_RESET      (1 << 16)
+#define PHASE28_DIGITAL_SEL1    (1 << 15)
+#define PHASE28_HP_SEL          (1 << 14)
+#define PHASE28_WM_CS           (1 << 12)
+#define PHASE28_AC97_COMMIT     (1 << 11)
+#define PHASE28_AC97_ADDR       (1 << 10)
+#define PHASE28_AC97_DATA_LOW   (1 << 9)
+#define PHASE28_AC97_DATA_HIGH  (1 << 8)
+#define PHASE28_AC97_DATA_MASK  0xFF
 #endif /* __SOUND_PHASE */
diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c
index 3bd92627231c..ab61e383024f 100644
--- a/sound/pci/ice1712/vt1720_mobo.c
+++ b/sound/pci/ice1712/vt1720_mobo.c
@@ -110,6 +110,15 @@ struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = {
                 .eeprom_size = sizeof(k8x800_eeprom),
                 .eeprom_data = k8x800_eeprom,
         },
+        {
+                .subvendor = VT1720_SUBDEVICE_SN25P,
+                .name = "Shuttle SN25P",
+                /* identical with k8x800 */
+                .chip_init = k8x800_init,
+                .build_controls = k8x800_add_controls,
+                .eeprom_size = sizeof(k8x800_eeprom),
+                .eeprom_data = k8x800_eeprom,
+        },
         { } /* terminator */
 };
 
diff --git a/sound/pci/ice1712/vt1720_mobo.h b/sound/pci/ice1712/vt1720_mobo.h
index f949eb804cae..0b1b0ee1bea7 100644
--- a/sound/pci/ice1712/vt1720_mobo.h
+++ b/sound/pci/ice1712/vt1720_mobo.h
@@ -27,12 +27,14 @@
 #define VT1720_MOBO_DEVICE_DESC        "{Albatron,K8X800 Pro II},"\
                                        "{Chaintech,ZNF3-150},"\
                                        "{Chaintech,ZNF3-250},"\
-                                       "{Chaintech,9CJS},"
+                                       "{Chaintech,9CJS},"\
+                                       "{Shuttle,SN25P},"
 
 #define VT1720_SUBDEVICE_K8X800         0xf217052c
 #define VT1720_SUBDEVICE_ZNF3_150       0x0f2741f6
 #define VT1720_SUBDEVICE_ZNF3_250       0x0f2745f6
 #define VT1720_SUBDEVICE_9CJS           0x0f272327
+#define VT1720_SUBDEVICE_SN25P          0x97123650
 
 extern struct snd_ice1712_card_info  snd_vt1720_mobo_cards[];
 
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 8b33b12fa5dc..cc16f95f9cef 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1725,229 +1725,235 @@ static struct ac97_pcm ac97_pcm_defs[] __devinitdata = {
 
 static struct ac97_quirk ac97_quirks[] __devinitdata = {
         {
-                .vendor = 0x0e11,
-                .device = 0x008a,
+                .subvendor = 0x0e11,
+                .subdevice = 0x008a,
                 .name = "Compaq Evo W4000",     /* AD1885 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x0e11,
-                .device = 0x00b8,
+                .subvendor = 0x0e11,
+                .subdevice = 0x00b8,
                 .name = "Compaq Evo D510C",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x0e11,
-                .device = 0x0860,
+                .subvendor = 0x0e11,
+                .subdevice = 0x0860,
                 .name = "HP/Compaq nx7010",
                 .type = AC97_TUNE_MUTE_LED
         },
         {
-                .vendor = 0x1014,
-                .device = 0x1f00,
+                .subvendor = 0x1014,
+                .subdevice = 0x1f00,
                 .name = "MS-9128",
                 .type = AC97_TUNE_ALC_JACK
         },
         {
-                .vendor = 0x1028,
-                .device = 0x00d8,
+                .subvendor = 0x1028,
+                .subdevice = 0x00d8,
                 .name = "Dell Precision 530",   /* AD1885 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1028,
-                .device = 0x010d,
+                .subvendor = 0x1028,
+                .subdevice = 0x010d,
                 .name = "Dell", /* which model?  AD1885 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1028,
-                .device = 0x0126,
+                .subvendor = 0x1028,
+                .subdevice = 0x0126,
                 .name = "Dell Optiplex GX260",  /* AD1981A */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1028,
-                .device = 0x012c,
+                .subvendor = 0x1028,
+                .subdevice = 0x012c,
                 .name = "Dell Precision 650",   /* AD1981A */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1028,
-                .device = 0x012d,
+                .subvendor = 0x1028,
+                .subdevice = 0x012d,
                 .name = "Dell Precision 450",   /* AD1981B*/
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1028,
-                .device = 0x0147,
+                .subvendor = 0x1028,
+                .subdevice = 0x0147,
                 .name = "Dell", /* which model?  AD1981B*/
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1028,
-                .device = 0x0163,
+                .subvendor = 0x1028,
+                .subdevice = 0x0163,
                 .name = "Dell Unknown", /* STAC9750/51 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x103c,
-                .device = 0x006d,
+                .subvendor = 0x103c,
+                .subdevice = 0x006d,
                 .name = "HP zv5000",
                 .type = AC97_TUNE_MUTE_LED      /*AD1981B*/
         },
         {       /* FIXME: which codec? */
-                .vendor = 0x103c,
-                .device = 0x00c3,
+                .subvendor = 0x103c,
+                .subdevice = 0x00c3,
                 .name = "HP xw6000",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x103c,
-                .device = 0x088c,
+                .subvendor = 0x103c,
+                .subdevice = 0x088c,
                 .name = "HP nc8000",
                 .type = AC97_TUNE_MUTE_LED
         },
         {
-                .vendor = 0x103c,
-                .device = 0x0890,
+                .subvendor = 0x103c,
+                .subdevice = 0x0890,
                 .name = "HP nc6000",
                 .type = AC97_TUNE_MUTE_LED
         },
         {
-                .vendor = 0x103c,
-                .device = 0x129d,
+                .subvendor = 0x103c,
+                .subdevice = 0x129d,
                 .name = "HP xw8000",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x103c,
-                .device = 0x12f1,
+                .subvendor = 0x103c,
+                .subdevice = 0x12f1,
                 .name = "HP xw8200",    /* AD1981B*/
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x103c,
-                .device = 0x12f2,
+                .subvendor = 0x103c,
+                .subdevice = 0x12f2,
                 .name = "HP xw6200",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x103c,
-                .device = 0x3008,
+                .subvendor = 0x103c,
+                .subdevice = 0x3008,
                 .name = "HP xw4200",    /* AD1981B*/
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x104d,
-                .device = 0x8197,
+                .subvendor = 0x104d,
+                .subdevice = 0x8197,
                 .name = "Sony S1XP",
                 .type = AC97_TUNE_INV_EAPD
         },
         {
-                .vendor = 0x1043,
-                .device = 0x80f3,
+                .subvendor = 0x1043,
+                .subdevice = 0x80f3,
                 .name = "ASUS ICH5/AD1985",
                 .type = AC97_TUNE_AD_SHARING
         },
         {
-                .vendor = 0x10cf,
-                .device = 0x11c3,
+                .subvendor = 0x10cf,
+                .subdevice = 0x11c3,
                 .name = "Fujitsu-Siemens E4010",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x10cf,
-                .device = 0x1253,
+                .subvendor = 0x10cf,
+                .subdevice = 0x1225,
+                .name = "Fujitsu-Siemens T3010",
+                .type = AC97_TUNE_HP_ONLY
+        },
+        {
+                .subvendor = 0x10cf,
+                .subdevice = 0x1253,
                 .name = "Fujitsu S6210",        /* STAC9750/51 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x10f1,
-                .device = 0x2665,
+                .subvendor = 0x10f1,
+                .subdevice = 0x2665,
                 .name = "Fujitsu-Siemens Celsius",      /* AD1981? */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x10f1,
-                .device = 0x2885,
+                .subvendor = 0x10f1,
+                .subdevice = 0x2885,
                 .name = "AMD64 Mobo",   /* ALC650 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x110a,
-                .device = 0x0056,
+                .subvendor = 0x110a,
+                .subdevice = 0x0056,
                 .name = "Fujitsu-Siemens Scenic",       /* AD1981? */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x11d4,
-                .device = 0x5375,
+                .subvendor = 0x11d4,
+                .subdevice = 0x5375,
                 .name = "ADI AD1985 (discrete)",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1462,
-                .device = 0x5470,
+                .subvendor = 0x1462,
+                .subdevice = 0x5470,
                 .name = "MSI P4 ATX 645 Ultra",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1734,
-                .device = 0x0088,
+                .subvendor = 0x1734,
+                .subdevice = 0x0088,
                 .name = "Fujitsu-Siemens D1522",        /* AD1981 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x8086,
-                .device = 0x2000,
+                .subvendor = 0x8086,
+                .subdevice = 0x2000,
                 .mask = 0xfff0,
                 .name = "Intel ICH5/AD1985",
                 .type = AC97_TUNE_AD_SHARING
         },
         {
-                .vendor = 0x8086,
-                .device = 0x4000,
+                .subvendor = 0x8086,
+                .subdevice = 0x4000,
                 .mask = 0xfff0,
                 .name = "Intel ICH5/AD1985",
                 .type = AC97_TUNE_AD_SHARING
         },
         {
-                .vendor = 0x8086,
-                .device = 0x4856,
+                .subvendor = 0x8086,
+                .subdevice = 0x4856,
                 .name = "Intel D845WN (82801BA)",
                 .type = AC97_TUNE_SWAP_HP
         },
         {
-                .vendor = 0x8086,
-                .device = 0x4d44,
+                .subvendor = 0x8086,
+                .subdevice = 0x4d44,
                 .name = "Intel D850EMV2",       /* AD1885 */
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x8086,
-                .device = 0x4d56,
+                .subvendor = 0x8086,
+                .subdevice = 0x4d56,
                 .name = "Intel ICH/AD1885",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x8086,
-                .device = 0x6000,
+                .subvendor = 0x8086,
+                .subdevice = 0x6000,
                 .mask = 0xfff0,
                 .name = "Intel ICH5/AD1985",
                 .type = AC97_TUNE_AD_SHARING
         },
         {
-                .vendor = 0x8086,
-                .device = 0xe000,
+                .subvendor = 0x8086,
+                .subdevice = 0xe000,
                 .mask = 0xfff0,
                 .name = "Intel ICH5/AD1985",
                 .type = AC97_TUNE_AD_SHARING
         },
 #if 0 /* FIXME: this seems wrong on most boards */
         {
-                .vendor = 0x8086,
-                .device = 0xa000,
+                .subvendor = 0x8086,
+                .subdevice = 0xa000,
                 .mask = 0xfff0,
                 .name = "Intel ICH5/AD1985",
                 .type = AC97_TUNE_HP_ONLY
@@ -2849,7 +2855,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_intel8x0_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_intel8x0_exit(void)
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 67da096d659b..bb758c77d211 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -35,7 +35,6 @@
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
-#include <sound/control.h>
 #include <sound/initval.h>
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -292,60 +291,9 @@ static struct pci_device_id snd_intel8x0m_ids[] = {
 #endif
         { 0, }
 };
-static int snd_intel8x0m_switch_default_get(snd_kcontrol_t *kcontrol,
-                                            snd_ctl_elem_value_t *ucontrol);
-static int snd_intel8x0m_switch_default_put(snd_kcontrol_t *kcontrol,
-                                            snd_ctl_elem_value_t *ucontrol);
-static int snd_intel8x0m_switch_default_info(snd_kcontrol_t *kcontrol,
-                                             snd_ctl_elem_info_t *uinfo);
-
-#define PRIVATE_VALUE_INITIALIZER(r,m) (((r) & 0xffff) << 16 | ((m) & 0xffff))
-#define PRIVATE_VALUE_MASK(control) ((control)->private_value & 0xffff)
-#define PRIVATE_VALUE_REG(control) (((control)->private_value >> 16) & 0xffff)
-
-static snd_kcontrol_new_t snd_intel8x0m_mixer_switches[] __devinitdata = {
-  { .name  = "Off-hook Switch",
-    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-    .info  = snd_intel8x0m_switch_default_info,
-    .get   = snd_intel8x0m_switch_default_get,
-    .put   = snd_intel8x0m_switch_default_put,
-    .private_value = PRIVATE_VALUE_INITIALIZER(AC97_GPIO_STATUS,AC97_GPIO_LINE1_OH)
-  }
-};
 
 MODULE_DEVICE_TABLE(pci, snd_intel8x0m_ids);
 
-static int snd_intel8x0m_switch_default_info(snd_kcontrol_t *kcontrol,
-                                             snd_ctl_elem_info_t *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
-
-static int snd_intel8x0m_switch_default_get(snd_kcontrol_t *kcontrol,
-                                            snd_ctl_elem_value_t *ucontrol)
-{
-        unsigned short mask = PRIVATE_VALUE_MASK(kcontrol);
-        unsigned short reg = PRIVATE_VALUE_REG(kcontrol);
-        intel8x0_t *chip = snd_kcontrol_chip(kcontrol);
-        unsigned int status;
-        status = snd_ac97_read(chip->ac97, reg) & mask ? 1 : 0;
-        ucontrol->value.integer.value[0] = status;
-        return 0;
-}
-static int snd_intel8x0m_switch_default_put(snd_kcontrol_t *kcontrol,
-                                            snd_ctl_elem_value_t *ucontrol)
-{
-        unsigned short mask = PRIVATE_VALUE_MASK(kcontrol);
-        unsigned short reg = PRIVATE_VALUE_REG(kcontrol);
-        intel8x0_t *chip = snd_kcontrol_chip(kcontrol);
-        unsigned short new_status = ucontrol->value.integer.value[0] ? mask : ~mask;
-        return snd_ac97_update_bits(chip->ac97, reg,
-                                    mask, new_status);
-}
 /*
  *  Lowlevel I/O - busmaster
  */
@@ -500,6 +448,8 @@ static unsigned short snd_intel8x0_codec_read(ac97_t *ac97,
                         res = 0xffff;
                 }
         }
+        if (reg == AC97_GPIO_STATUS)
+                iagetword(chip, 0); /* clear semaphore */
         return res;
 }
 
@@ -698,21 +648,6 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(snd_pcm_substream_t * substrea
         return bytes_to_frames(substream->runtime, ptr);
 }
 
-static int snd_intel8x0m_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
-{
-        /* hook off/on on start/stop */
-        /* Moved this to mixer control */
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-                break;
-        case SNDRV_PCM_TRIGGER_STOP:
-                break;
-        default:
-                return -EINVAL;
-        }
-        return snd_intel8x0_pcm_trigger(substream,cmd);
-}
-
 static int snd_intel8x0m_pcm_prepare(snd_pcm_substream_t * substream)
 {
         intel8x0_t *chip = snd_pcm_substream_chip(substream);
@@ -808,7 +743,7 @@ static snd_pcm_ops_t snd_intel8x0m_playback_ops = {
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
-        .trigger =      snd_intel8x0m_pcm_trigger,
+        .trigger =      snd_intel8x0_pcm_trigger,
         .pointer =      snd_intel8x0_pcm_pointer,
 };
 
@@ -819,7 +754,7 @@ static snd_pcm_ops_t snd_intel8x0m_capture_ops = {
         .hw_params =    snd_intel8x0_hw_params,
         .hw_free =      snd_intel8x0_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
-        .trigger =      snd_intel8x0m_pcm_trigger,
+        .trigger =      snd_intel8x0_pcm_trigger,
         .pointer =      snd_intel8x0_pcm_pointer,
 };
 
@@ -947,7 +882,6 @@ static int __devinit snd_intel8x0_mixer(intel8x0_t *chip, int ac97_clock)
         ac97_t *x97;
         int err;
         unsigned int glob_sta = 0;
-        unsigned int idx;
         static ac97_bus_ops_t ops = {
                 .write = snd_intel8x0_codec_write,
                 .read = snd_intel8x0_codec_read,
@@ -983,10 +917,6 @@ static int __devinit snd_intel8x0_mixer(intel8x0_t *chip, int ac97_clock)
                 chip->ichd[ICHD_MDMIN].ac97 = x97;
                 chip->ichd[ICHD_MDMOUT].ac97 = x97;
         }
-        for (idx = 0; idx < ARRAY_SIZE(snd_intel8x0m_mixer_switches); idx++) {
-                if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_intel8x0m_mixer_switches[idx], chip))) < 0)
-                        goto __err;
-        }
 
         chip->in_ac97_init = 0;
         return 0;
@@ -1450,7 +1380,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_intel8x0m_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_intel8x0m_exit(void)
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index bb1de2008176..79d8eda54f0d 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2541,7 +2541,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_korg1212_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_korg1212_exit(void)
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 2cf33083d7cc..096f15132853 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -779,6 +779,12 @@ struct m3_quirk {
                                    (e.g. for IrDA on Dell Inspirons) */
 };
 
+struct m3_hv_quirk {
+        u16 vendor, device, subsystem_vendor, subsystem_device;
+        u32 config;             /* ALLEGRO_CONFIG hardware volume bits */
+        int is_omnibook;        /* Do HP OmniBook GPIO magic? */
+};
+
 struct m3_list {
         int curlen;
         int mem_addr;
@@ -828,6 +834,7 @@ struct snd_m3 {
 
         struct pci_dev *pci;
         struct m3_quirk *quirk;
+        struct m3_hv_quirk *hv_quirk;
 
         int dacs_active;
         int timer_users;
@@ -851,6 +858,11 @@ struct snd_m3 {
         m3_dma_t *substreams;
 
         spinlock_t reg_lock;
+        spinlock_t ac97_lock;
+
+        snd_kcontrol_t *master_switch;
+        snd_kcontrol_t *master_volume;
+        struct tasklet_struct hwvol_tq;
 
 #ifdef CONFIG_PM
         u16 *suspend_mem;
@@ -968,6 +980,71 @@ static struct m3_quirk m3_quirk_list[] = {
         { NULL }
 };
 
+/* These values came from the Windows driver. */
+static struct m3_hv_quirk m3_hv_quirk_list[] = {
+        /* Allegro chips */
+        { 0x125D, 0x1988, 0x0E11, 0x002E, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x0E11, 0x0094, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x0E11, 0xB112, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x0E11, 0xB114, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x103C, 0x0012, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x103C, 0x0018, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x103C, 0x001C, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x103C, 0x001D, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x103C, 0x001E, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x107B, 0x3350, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x10F7, 0x8338, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x10F7, 0x833C, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x10F7, 0x833D, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x10F7, 0x833E, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x10F7, 0x833F, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x13BD, 0x1018, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x13BD, 0x1019, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x13BD, 0x101A, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x14FF, 0x0F03, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x14FF, 0x0F04, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x14FF, 0x0F05, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x156D, 0xB400, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x156D, 0xB795, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x156D, 0xB797, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x156D, 0xC700, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
+        { 0x125D, 0x1988, 0x1033, 0x80F1, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x103C, 0x001A, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 }, /* HP OmniBook 6100 */
+        { 0x125D, 0x1988, 0x107B, 0x340A, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x107B, 0x3450, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x109F, 0x3134, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x109F, 0x3161, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x144D, 0x3280, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x144D, 0x3281, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x144D, 0xC002, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x144D, 0xC003, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x1509, 0x1740, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x1610, 0x0010, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x1988, 0x1042, 0x1042, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1988, 0x107B, 0x9500, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1988, 0x14FF, 0x0F06, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1988, 0x1558, 0x8586, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1988, 0x161F, 0x2011, HV_CTRL_ENABLE, 0 },
+        /* Maestro3 chips */
+        { 0x125D, 0x1998, 0x103C, 0x000E, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x103C, 0x0010, HV_CTRL_ENABLE, 1 }, /* HP OmniBook 6000 */
+        { 0x125D, 0x1998, 0x103C, 0x0011, HV_CTRL_ENABLE, 1 }, /* HP OmniBook 500 */
+        { 0x125D, 0x1998, 0x103C, 0x001B, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x104D, 0x80A6, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x104D, 0x80AA, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x107B, 0x5300, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x110A, 0x1998, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x13BD, 0x1015, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x13BD, 0x101C, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x13BD, 0x1802, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x1599, 0x0715, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x1998, 0x5643, 0x5643, HV_CTRL_ENABLE, 0 },
+        { 0x125D, 0x199A, 0x144D, 0x3260, HV_CTRL_ENABLE | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x199A, 0x144D, 0x3261, HV_CTRL_ENABLE | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x199A, 0x144D, 0xC000, HV_CTRL_ENABLE | REDUCED_DEBOUNCE, 0 },
+        { 0x125D, 0x199A, 0x144D, 0xC001, HV_CTRL_ENABLE | REDUCED_DEBOUNCE, 0 },
+        { 0 }
+};
 
 /*
  * lowlevel functions
@@ -1565,6 +1642,68 @@ static void snd_m3_update_ptr(m3_t *chip, m3_dma_t *s)
         }
 }
 
+static void snd_m3_update_hw_volume(unsigned long private_data)
+{
+        m3_t *chip = (m3_t *) private_data;
+        int x, val;
+        unsigned long flags;
+
+        /* Figure out which volume control button was pushed,
+           based on differences from the default register
+           values. */
+        x = inb(chip->iobase + SHADOW_MIX_REG_VOICE) & 0xee;
+
+        /* Reset the volume control registers. */
+        outb(0x88, chip->iobase + SHADOW_MIX_REG_VOICE);
+        outb(0x88, chip->iobase + HW_VOL_COUNTER_VOICE);
+        outb(0x88, chip->iobase + SHADOW_MIX_REG_MASTER);
+        outb(0x88, chip->iobase + HW_VOL_COUNTER_MASTER);
+
+        if (!chip->master_switch || !chip->master_volume)
+                return;
+
+        /* FIXME: we can't call snd_ac97_* functions since here is in tasklet. */
+        spin_lock_irqsave(&chip->ac97_lock, flags);
+
+        val = chip->ac97->regs[AC97_MASTER_VOL];
+        switch (x) {
+        case 0x88:
+                /* mute */
+                val ^= 0x8000;
+                chip->ac97->regs[AC97_MASTER_VOL] = val;
+                outw(val, chip->iobase + CODEC_DATA);
+                outb(AC97_MASTER_VOL, chip->iobase + CODEC_COMMAND);
+                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                               &chip->master_switch->id);
+                break;
+        case 0xaa:
+                /* volume up */
+                if ((val & 0x7f) > 0)
+                        val--;
+                if ((val & 0x7f00) > 0)
+                        val -= 0x0100;
+                chip->ac97->regs[AC97_MASTER_VOL] = val;
+                outw(val, chip->iobase + CODEC_DATA);
+                outb(AC97_MASTER_VOL, chip->iobase + CODEC_COMMAND);
+                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                               &chip->master_volume->id);
+                break;
+        case 0x66:
+                /* volume down */
+                if ((val & 0x7f) < 0x1f)
+                        val++;
+                if ((val & 0x7f00) < 0x1f00)
+                        val += 0x0100;
+                chip->ac97->regs[AC97_MASTER_VOL] = val;
+                outw(val, chip->iobase + CODEC_DATA);
+                outb(AC97_MASTER_VOL, chip->iobase + CODEC_COMMAND);
+                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                               &chip->master_volume->id);
+                break;
+        }
+        spin_unlock_irqrestore(&chip->ac97_lock, flags);
+}
+
 static irqreturn_t
 snd_m3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
@@ -1576,7 +1715,10 @@ snd_m3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
         if (status == 0xff)
                 return IRQ_NONE;
-   
+
+        if (status & HV_INT_PENDING)
+                tasklet_hi_schedule(&chip->hwvol_tq);
+
         /*
          * ack an assp int if its running
          * and has an int pending
@@ -1605,7 +1747,7 @@ snd_m3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 #endif
 
         /* ack ints */
-        snd_m3_outw(chip, HOST_INT_STATUS, status);
+        outb(status, chip->iobase + HOST_INT_STATUS);
 
         return IRQ_HANDLED;
 }
@@ -1842,24 +1984,32 @@ static unsigned short
 snd_m3_ac97_read(ac97_t *ac97, unsigned short reg)
 {
         m3_t *chip = ac97->private_data;
+        unsigned long flags;
+        unsigned short data;
 
         if (snd_m3_ac97_wait(chip))
                 return 0xffff;
+        spin_lock_irqsave(&chip->ac97_lock, flags);
         snd_m3_outb(chip, 0x80 | (reg & 0x7f), CODEC_COMMAND);
         if (snd_m3_ac97_wait(chip))
                 return 0xffff;
-        return snd_m3_inw(chip, CODEC_DATA);
+        data = snd_m3_inw(chip, CODEC_DATA);
+        spin_unlock_irqrestore(&chip->ac97_lock, flags);
+        return data;
 }
 
 static void
 snd_m3_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
 {
         m3_t *chip = ac97->private_data;
+        unsigned long flags;
 
         if (snd_m3_ac97_wait(chip))
                 return;
+        spin_lock_irqsave(&chip->ac97_lock, flags);
         snd_m3_outw(chip, val, CODEC_DATA);
         snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
+        spin_unlock_irqrestore(&chip->ac97_lock, flags);
 }
 
 
@@ -1968,6 +2118,7 @@ static int __devinit snd_m3_mixer(m3_t *chip)
 {
         ac97_bus_t *pbus;
         ac97_template_t ac97;
+        snd_ctl_elem_id_t id;
         int err;
         static ac97_bus_ops_t ops = {
                 .write = snd_m3_ac97_write,
@@ -1988,6 +2139,15 @@ static int __devinit snd_m3_mixer(m3_t *chip)
         schedule_timeout(HZ / 10);
         snd_ac97_write(chip->ac97, AC97_PCM, 0);
 
+        memset(&id, 0, sizeof(id));
+        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        strcpy(id.name, "Master Playback Switch");
+        chip->master_switch = snd_ctl_find_id(chip->card, &id);
+        memset(&id, 0, sizeof(id));
+        id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        strcpy(id.name, "Master Playback Volume");
+        chip->master_volume = snd_ctl_find_id(chip->card, &id);
+
         return 0;
 }
 
@@ -2293,6 +2453,7 @@ static int
 snd_m3_chip_init(m3_t *chip)
 {
         struct pci_dev *pcidev = chip->pci;
+        unsigned long io = chip->iobase;
         u32 n;
         u16 w;
         u8 t; /* makes as much sense as 'n', no? */
@@ -2303,8 +2464,27 @@ snd_m3_chip_init(m3_t *chip)
                DISABLE_LEGACY);
         pci_write_config_word(pcidev, PCI_LEGACY_AUDIO_CTRL, w);
 
+        if (chip->hv_quirk && chip->hv_quirk->is_omnibook) {
+                /*
+                 * Volume buttons on some HP OmniBook laptops don't work
+                 * correctly. This makes them work for the most part.
+                 *
+                 * Volume up and down buttons on the laptop side work.
+                 * Fn+cursor_up (volme up) works.
+                 * Fn+cursor_down (volume down) doesn't work.
+                 * Fn+F7 (mute) works acts as volume up.
+                 */
+                outw(~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_MASK);
+                outw(inw(io + GPIO_DIRECTION) & ~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DIRECTION);
+                outw((GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DATA);
+                outw(0xffff, io + GPIO_MASK);
+        }
         pci_read_config_dword(pcidev, PCI_ALLEGRO_CONFIG, &n);
-        n &= REDUCED_DEBOUNCE;
+        n &= ~(HV_CTRL_ENABLE | REDUCED_DEBOUNCE | HV_BUTTON_FROM_GD);
+        if (chip->hv_quirk)
+                n |= chip->hv_quirk->config;
+        /* For some reason we must always use reduced debounce. */
+        n |= REDUCED_DEBOUNCE;
         n |= PM_CTRL_ENABLE | CLK_DIV_BY_49 | USE_PCI_TIMING;
         pci_write_config_dword(pcidev, PCI_ALLEGRO_CONFIG, n);
 
@@ -2332,6 +2512,12 @@ snd_m3_chip_init(m3_t *chip)
 
         outb(RUN_ASSP, chip->iobase + ASSP_CONTROL_B); 
 
+        outb(0x00, io + HARDWARE_VOL_CTRL);
+        outb(0x88, io + SHADOW_MIX_REG_VOICE);
+        outb(0x88, io + HW_VOL_COUNTER_VOICE);
+        outb(0x88, io + SHADOW_MIX_REG_MASTER);
+        outb(0x88, io + HW_VOL_COUNTER_MASTER);
+
         return 0;
 } 
 
@@ -2341,7 +2527,7 @@ snd_m3_enable_ints(m3_t *chip)
         unsigned long io = chip->iobase;
 
         /* TODO: MPU401 not supported yet */
-        outw(ASSP_INT_ENABLE /*| MPU401_INT_ENABLE*/, io + HOST_INT_CTRL);
+        outw(ASSP_INT_ENABLE | HV_INT_ENABLE /*| MPU401_INT_ENABLE*/, io + HOST_INT_CTRL);
         outb(inb(io + ASSP_CONTROL_C) | ASSP_HOST_INT_ENABLE,
              io + ASSP_CONTROL_C);
 }
@@ -2367,7 +2553,7 @@ static int snd_m3_free(m3_t *chip)
                 kfree(chip->substreams);
         }
         if (chip->iobase) {
-                snd_m3_outw(chip, HOST_INT_CTRL, 0); /* disable ints */
+                outw(0, chip->iobase + HOST_INT_CTRL); /* disable ints */
         }
 
 #ifdef CONFIG_PM
@@ -2486,7 +2672,7 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci,
         m3_t *chip;
         int i, err;
         struct m3_quirk *quirk;
-        u16 subsystem_vendor, subsystem_device;
+        struct m3_hv_quirk *hv_quirk;
         static snd_device_ops_t ops = {
                 .dev_free =     snd_m3_dev_free,
         };
@@ -2524,18 +2710,25 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci,
         chip->pci = pci;
         chip->irq = -1;
 
-        pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
-        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
-
         for (quirk = m3_quirk_list; quirk->vendor; quirk++) {
-                if (subsystem_vendor == quirk->vendor &&
-                    subsystem_device == quirk->device) {
+                if (pci->subsystem_vendor == quirk->vendor &&
+                    pci->subsystem_device == quirk->device) {
                         printk(KERN_INFO "maestro3: enabled hack for '%s'\n", quirk->name);
                         chip->quirk = quirk;
                         break;
                 }
         }
 
+        for (hv_quirk = m3_hv_quirk_list; hv_quirk->vendor; hv_quirk++) {
+                if (pci->vendor == hv_quirk->vendor &&
+                    pci->device == hv_quirk->device &&
+                    pci->subsystem_vendor == hv_quirk->subsystem_vendor &&
+                    pci->subsystem_device == hv_quirk->subsystem_device) {
+                        chip->hv_quirk = hv_quirk;
+                        break;
+                }
+        }
+
         chip->external_amp = enable_amp;
         if (amp_gpio >= 0 && amp_gpio <= 0x0f)
                 chip->amp_gpio = amp_gpio;
@@ -2593,6 +2786,9 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci,
                 return err;
         }
 
+        spin_lock_init(&chip->ac97_lock);
+        tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);
+
         if ((err = snd_m3_mixer(chip)) < 0)
                 return err;
 
@@ -2702,7 +2898,7 @@ static struct pci_driver driver = {
         
 static int __init alsa_card_m3_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_m3_exit(void)
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 65bb0f47af2c..082c0d0f73d2 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1431,7 +1431,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_mixart_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_mixart_exit(void)
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 356fbeac6f9e..8a52091f8552 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -1645,7 +1645,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_nm256_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_nm256_exit(void)
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index b96acd5a57db..b7b554df6705 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -2031,7 +2031,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_rme32_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_rme32_exit(void)
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 8e2666841d21..10c4f45a913c 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -2437,7 +2437,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_rme96_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_rme96_exit(void)
diff --git a/sound/pci/rme9652/Makefile b/sound/pci/rme9652/Makefile
index 917374c9cd40..d2c294e136f9 100644
--- a/sound/pci/rme9652/Makefile
+++ b/sound/pci/rme9652/Makefile
@@ -5,7 +5,9 @@
 
 snd-rme9652-objs := rme9652.o
 snd-hdsp-objs := hdsp.o
+snd-hdspm-objs := hdspm.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_RME9652) += snd-rme9652.o
 obj-$(CONFIG_SND_HDSP) += snd-hdsp.o
+obj-$(CONFIG_SND_HDSPM) +=snd-hdspm.o
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 12efbf0fab54..a673cc438b91 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -559,18 +559,22 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer
 {
         dmab->dev.type = SNDRV_DMA_TYPE_DEV;
         dmab->dev.dev = snd_dma_pci_data(pci);
-        if (! snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
-                if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                                        size, dmab) < 0)
-                        return -ENOMEM;
+        if (snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
+                if (dmab->bytes >= size)
+                        return 0;
         }
+        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+                                size, dmab) < 0)
+                return -ENOMEM;
         return 0;
 }
 
 static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci)
 {
-        if (dmab->area)
+        if (dmab->area) {
+                dmab->dev.dev = NULL; /* make it anonymous */
                 snd_dma_reserve_buf(dmab, snd_dma_pci_buf_id(pci));
+        }
 }
 
 
@@ -4912,19 +4916,9 @@ static int __devinit hdsp_request_fw_loader(hdsp_t *hdsp)
                 release_firmware(fw);
                 return -EINVAL;
         }
-#ifdef SNDRV_BIG_ENDIAN
-        {
-                int i;
-                u32 *src = (u32*)fw->data;
-                for (i = 0; i < ARRAY_SIZE(hdsp->firmware_cache); i++, src++)
-                        hdsp->firmware_cache[i] = ((*src & 0x000000ff) << 16) |
-                                ((*src & 0x0000ff00) << 8)  |
-                                ((*src & 0x00ff0000) >> 8)  |
-                                ((*src & 0xff000000) >> 16);
-        }
-#else
+
         memcpy(hdsp->firmware_cache, fw->data, sizeof(hdsp->firmware_cache));
-#endif
+
         release_firmware(fw);
                 
         hdsp->state |= HDSP_FirmwareCached;
@@ -5194,7 +5188,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_hdsp_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_hdsp_exit(void)
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
new file mode 100644
index 000000000000..9e86d0eb41ce
--- /dev/null
+++ b/sound/pci/rme9652/hdspm.c
@@ -0,0 +1,3671 @@
+/*   -*- linux-c -*-
+ *
+ *   ALSA driver for RME Hammerfall DSP MADI audio interface(s)
+ *
+ *      Copyright (c) 2003 Winfried Ritsch (IEM)
+ *      code based on hdsp.c   Paul Davis
+ *                             Marcus Andersson
+ *                             Thomas Charbonnel
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/moduleparam.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/pcm.h>
+#include <sound/info.h>
+#include <sound/asoundef.h>
+#include <sound/rawmidi.h>
+#include <sound/hwdep.h>
+#include <sound/initval.h>
+
+#include <sound/hdspm.h>
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;        /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;         /* ID for this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
+
+/* Disable precise pointer at start */
+static int precise_ptr[SNDRV_CARDS];
+
+/* Send all playback to line outs */
+static int line_outs_monitor[SNDRV_CARDS];
+
+/* Enable Analog Outs on Channel 63/64 by default */
+static int enable_monitor[SNDRV_CARDS];
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for RME HDSPM interface.");
+
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for RME HDSPM interface.");
+
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable/disable specific HDSPM soundcards.");
+
+module_param_array(precise_ptr, bool, NULL, 0444);
+MODULE_PARM_DESC(precise_ptr, "Enable precise pointer, or disable.");
+
+module_param_array(line_outs_monitor, bool, NULL, 0444);
+MODULE_PARM_DESC(line_outs_monitor,
+                 "Send playback streams to analog outs by default.");
+
+module_param_array(enable_monitor, bool, NULL, 0444);
+MODULE_PARM_DESC(enable_monitor,
+                 "Enable Analog Out on Channel 63/64 by default.");
+
+MODULE_AUTHOR
+      ("Winfried Ritsch <ritsch_AT_iem.at>, Paul Davis <paul@linuxaudiosystems.com>, "
+       "Marcus Andersson, Thomas Charbonnel <thomas@undata.org>");
+MODULE_DESCRIPTION("RME HDSPM");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
+
+/* --- Write registers. --- 
+  These are defined as byte-offsets from the iobase value.  */
+
+#define HDSPM_controlRegister        64
+#define HDSPM_interruptConfirmation  96
+#define HDSPM_control2Reg            256  /* not in specs ???????? */
+#define HDSPM_midiDataOut0           352  /* just believe in old code */
+#define HDSPM_midiDataOut1           356
+
+/* DMA enable for 64 channels, only Bit 0 is relevant */
+#define HDSPM_outputEnableBase       512  /* 512-767  input  DMA */ 
+#define HDSPM_inputEnableBase        768  /* 768-1023 output DMA */
+
+/* 16 page addresses for each of the 64 channels DMA buffer in and out 
+   (each 64k=16*4k) Buffer must be 4k aligned (which is default i386 ????) */
+#define HDSPM_pageAddressBufferOut       8192
+#define HDSPM_pageAddressBufferIn        (HDSPM_pageAddressBufferOut+64*16*4)
+
+#define HDSPM_MADI_mixerBase    32768   /* 32768-65535 for 2x64x64 Fader */
+
+#define HDSPM_MATRIX_MIXER_SIZE  8192   /* = 2*64*64 * 4 Byte => 32kB */
+
+/* --- Read registers. ---
+   These are defined as byte-offsets from the iobase value */
+#define HDSPM_statusRegister    0
+#define HDSPM_statusRegister2  96
+
+#define HDSPM_midiDataIn0     360
+#define HDSPM_midiDataIn1     364
+
+/* status is data bytes in MIDI-FIFO (0-128) */
+#define HDSPM_midiStatusOut0  384       
+#define HDSPM_midiStatusOut1  388       
+#define HDSPM_midiStatusIn0   392       
+#define HDSPM_midiStatusIn1   396       
+
+
+/* the meters are regular i/o-mapped registers, but offset
+   considerably from the rest. the peak registers are reset
+   when read; the least-significant 4 bits are full-scale counters; 
+   the actual peak value is in the most-significant 24 bits.
+*/
+#define HDSPM_MADI_peakrmsbase  4096    /* 4096-8191 2x64x32Bit Meters */
+
+/* --- Control Register bits --------- */
+#define HDSPM_Start                (1<<0) /* start engine */
+
+#define HDSPM_Latency0             (1<<1) /* buffer size = 2^n */
+#define HDSPM_Latency1             (1<<2) /* where n is defined */
+#define HDSPM_Latency2             (1<<3) /* by Latency{2,1,0} */
+
+#define HDSPM_ClockModeMaster      (1<<4) /* 1=Master, 0=Slave/Autosync */
+
+#define HDSPM_AudioInterruptEnable (1<<5) /* what do you think ? */
+
+#define HDSPM_Frequency0  (1<<6)  /* 0=44.1kHz/88.2kHz 1=48kHz/96kHz */
+#define HDSPM_Frequency1  (1<<7)  /* 0=32kHz/64kHz */
+#define HDSPM_DoubleSpeed (1<<8)  /* 0=normal speed, 1=double speed */
+#define HDSPM_QuadSpeed   (1<<31) /* quad speed bit, not implemented now */
+
+#define HDSPM_TX_64ch     (1<<10) /* Output 64channel MODE=1,
+                                     56channelMODE=0 */
+
+#define HDSPM_AutoInp     (1<<11) /* Auto Input (takeover) == Safe Mode, 
+                                     0=off, 1=on  */
+
+#define HDSPM_InputSelect0 (1<<14) /* Input select 0= optical, 1=coax */
+#define HDSPM_InputSelect1 (1<<15) /* should be 0 */
+
+#define HDSPM_SyncRef0     (1<<16) /* 0=WOrd, 1=MADI */
+#define HDSPM_SyncRef1     (1<<17) /* should be 0 */
+
+#define HDSPM_clr_tms      (1<<19) /* clear track marker, do not use 
+                                      AES additional bits in
+                                      lower 5 Audiodatabits ??? */
+
+#define HDSPM_Midi0InterruptEnable (1<<22)
+#define HDSPM_Midi1InterruptEnable (1<<23)
+
+#define HDSPM_LineOut (1<<24) /* Analog Out on channel 63/64 on=1, mute=0 */
+
+
+/* --- bit helper defines */
+#define HDSPM_LatencyMask    (HDSPM_Latency0|HDSPM_Latency1|HDSPM_Latency2)
+#define HDSPM_FrequencyMask  (HDSPM_Frequency0|HDSPM_Frequency1)
+#define HDSPM_InputMask      (HDSPM_InputSelect0|HDSPM_InputSelect1)
+#define HDSPM_InputOptical   0
+#define HDSPM_InputCoaxial   (HDSPM_InputSelect0)
+#define HDSPM_SyncRefMask    (HDSPM_SyncRef0|HDSPM_SyncRef1)
+#define HDSPM_SyncRef_Word   0
+#define HDSPM_SyncRef_MADI   (HDSPM_SyncRef0)
+
+#define HDSPM_SYNC_FROM_WORD 0  /* Preferred sync reference */
+#define HDSPM_SYNC_FROM_MADI 1  /* choices - used by "pref_sync_ref" */
+
+#define HDSPM_Frequency32KHz    HDSPM_Frequency0
+#define HDSPM_Frequency44_1KHz  HDSPM_Frequency1
+#define HDSPM_Frequency48KHz   (HDSPM_Frequency1|HDSPM_Frequency0)
+#define HDSPM_Frequency64KHz   (HDSPM_DoubleSpeed|HDSPM_Frequency0)
+#define HDSPM_Frequency88_2KHz (HDSPM_DoubleSpeed|HDSPM_Frequency1)
+#define HDSPM_Frequency96KHz   (HDSPM_DoubleSpeed|HDSPM_Frequency1|HDSPM_Frequency0)
+
+/* --- for internal discrimination */
+#define HDSPM_CLOCK_SOURCE_AUTOSYNC          0  /* Sample Clock Sources */
+#define HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ    1
+#define HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ  2
+#define HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ    3
+#define HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ    4
+#define HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ  5
+#define HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ    6
+#define HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ   7
+#define HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ 8
+#define HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ   9
+
+/* Synccheck Status */
+#define HDSPM_SYNC_CHECK_NO_LOCK 0
+#define HDSPM_SYNC_CHECK_LOCK    1
+#define HDSPM_SYNC_CHECK_SYNC    2
+
+/* AutoSync References - used by "autosync_ref" control switch */
+#define HDSPM_AUTOSYNC_FROM_WORD      0
+#define HDSPM_AUTOSYNC_FROM_MADI      1
+#define HDSPM_AUTOSYNC_FROM_NONE      2
+
+/* Possible sources of MADI input */
+#define HDSPM_OPTICAL 0         /* optical   */
+#define HDSPM_COAXIAL 1         /* BNC */
+
+#define hdspm_encode_latency(x)       (((x)<<1) & HDSPM_LatencyMask)
+#define hdspm_decode_latency(x)       (((x) & HDSPM_LatencyMask)>>1)
+
+#define hdspm_encode_in(x) (((x)&0x3)<<14)
+#define hdspm_decode_in(x) (((x)>>14)&0x3)
+
+/* --- control2 register bits --- */
+#define HDSPM_TMS             (1<<0)
+#define HDSPM_TCK             (1<<1)
+#define HDSPM_TDI             (1<<2)
+#define HDSPM_JTAG            (1<<3)
+#define HDSPM_PWDN            (1<<4)
+#define HDSPM_PROGRAM         (1<<5)
+#define HDSPM_CONFIG_MODE_0   (1<<6)
+#define HDSPM_CONFIG_MODE_1   (1<<7)
+/*#define HDSPM_VERSION_BIT     (1<<8) not defined any more*/
+#define HDSPM_BIGENDIAN_MODE  (1<<9)
+#define HDSPM_RD_MULTIPLE     (1<<10)
+
+/* --- Status Register bits --- */
+#define HDSPM_audioIRQPending    (1<<0) /* IRQ is high and pending */
+#define HDSPM_RX_64ch            (1<<1) /* Input 64chan. MODE=1, 56chn. MODE=0 */
+#define HDSPM_AB_int             (1<<2) /* InputChannel Opt=0, Coax=1 (like inp0) */
+#define HDSPM_madiLock           (1<<3) /* MADI Locked =1, no=0 */
+
+#define HDSPM_BufferPositionMask 0x000FFC0 /* Bit 6..15 : h/w buffer pointer */
+                                           /* since 64byte accurate last 6 bits 
+                                              are not used */
+
+#define HDSPM_madiSync          (1<<18) /* MADI is in sync */
+#define HDSPM_DoubleSpeedStatus (1<<19) /* (input) card in double speed */
+
+#define HDSPM_madiFreq0         (1<<22) /* system freq 0=error */
+#define HDSPM_madiFreq1         (1<<23) /* 1=32, 2=44.1 3=48 */
+#define HDSPM_madiFreq2         (1<<24) /* 4=64, 5=88.2 6=96 */
+#define HDSPM_madiFreq3         (1<<25) /* 7=128, 8=176.4 9=192 */
+
+#define HDSPM_BufferID          (1<<26) /* (Double)Buffer ID toggles with Interrupt */
+#define HDSPM_midi0IRQPending   (1<<30) /* MIDI IRQ is pending  */
+#define HDSPM_midi1IRQPending   (1<<31) /* and aktiv */
+
+/* --- status bit helpers */
+#define HDSPM_madiFreqMask  (HDSPM_madiFreq0|HDSPM_madiFreq1|HDSPM_madiFreq2|HDSPM_madiFreq3)
+#define HDSPM_madiFreq32    (HDSPM_madiFreq0)
+#define HDSPM_madiFreq44_1  (HDSPM_madiFreq1)
+#define HDSPM_madiFreq48    (HDSPM_madiFreq0|HDSPM_madiFreq1)
+#define HDSPM_madiFreq64    (HDSPM_madiFreq2)
+#define HDSPM_madiFreq88_2  (HDSPM_madiFreq0|HDSPM_madiFreq2)
+#define HDSPM_madiFreq96    (HDSPM_madiFreq1|HDSPM_madiFreq2)
+#define HDSPM_madiFreq128   (HDSPM_madiFreq0|HDSPM_madiFreq1|HDSPM_madiFreq2)
+#define HDSPM_madiFreq176_4 (HDSPM_madiFreq3)
+#define HDSPM_madiFreq192   (HDSPM_madiFreq3|HDSPM_madiFreq0)
+
+/* Status2 Register bits */
+
+#define HDSPM_version0 (1<<0)   /* not realy defined but I guess */
+#define HDSPM_version1 (1<<1)   /* in former cards it was ??? */
+#define HDSPM_version2 (1<<2)
+
+#define HDSPM_wcLock (1<<3)     /* Wordclock is detected and locked */
+#define HDSPM_wcSync (1<<4)     /* Wordclock is in sync with systemclock */
+
+#define HDSPM_wc_freq0 (1<<5)   /* input freq detected via autosync  */
+#define HDSPM_wc_freq1 (1<<6)   /* 001=32, 010==44.1, 011=48, */
+#define HDSPM_wc_freq2 (1<<7)   /* 100=64, 101=88.2, 110=96, */
+/* missing Bit   for               111=128, 1000=176.4, 1001=192 */
+
+#define HDSPM_SelSyncRef0 (1<<8)        /* Sync Source in slave mode */
+#define HDSPM_SelSyncRef1 (1<<9)        /* 000=word, 001=MADI, */
+#define HDSPM_SelSyncRef2 (1<<10)       /* 111=no valid signal */
+
+#define HDSPM_wc_valid (HDSPM_wcLock|HDSPM_wcSync)
+
+#define HDSPM_wcFreqMask  (HDSPM_wc_freq0|HDSPM_wc_freq1|HDSPM_wc_freq2)
+#define HDSPM_wcFreq32    (HDSPM_wc_freq0)
+#define HDSPM_wcFreq44_1  (HDSPM_wc_freq1)
+#define HDSPM_wcFreq48    (HDSPM_wc_freq0|HDSPM_wc_freq1)
+#define HDSPM_wcFreq64    (HDSPM_wc_freq2)
+#define HDSPM_wcFreq88_2  (HDSPM_wc_freq0|HDSPM_wc_freq2)
+#define HDSPM_wcFreq96    (HDSPM_wc_freq1|HDSPM_wc_freq2)
+
+
+#define HDSPM_SelSyncRefMask       (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|HDSPM_SelSyncRef2)
+#define HDSPM_SelSyncRef_WORD      0
+#define HDSPM_SelSyncRef_MADI      (HDSPM_SelSyncRef0)
+#define HDSPM_SelSyncRef_NVALID    (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|HDSPM_SelSyncRef2)
+
+/* Mixer Values */
+#define UNITY_GAIN          32768       /* = 65536/2 */
+#define MINUS_INFINITY_GAIN 0
+
+/* PCI info */
+#ifndef PCI_VENDOR_ID_XILINX
+#define PCI_VENDOR_ID_XILINX            0x10ee
+#endif
+#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP
+#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP 0x3fc5
+#endif
+#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI
+#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI 0x3fc6
+#endif
+
+
+/* Number of channels for different Speed Modes */
+#define MADI_SS_CHANNELS       64
+#define MADI_DS_CHANNELS       32
+#define MADI_QS_CHANNELS       16
+
+/* the size of a substream (1 mono data stream) */
+#define HDSPM_CHANNEL_BUFFER_SAMPLES  (16*1024)
+#define HDSPM_CHANNEL_BUFFER_BYTES    (4*HDSPM_CHANNEL_BUFFER_SAMPLES)
+
+/* the size of the area we need to allocate for DMA transfers. the
+   size is the same regardless of the number of channels, and
+   also the latency to use. 
+   for one direction !!!
+*/
+#define HDSPM_DMA_AREA_BYTES (HDSPM_MAX_CHANNELS * HDSPM_CHANNEL_BUFFER_BYTES)
+#define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
+
+typedef struct _hdspm hdspm_t;
+typedef struct _hdspm_midi hdspm_midi_t;
+
+struct _hdspm_midi {
+        hdspm_t *hdspm;
+        int id;
+        snd_rawmidi_t *rmidi;
+        snd_rawmidi_substream_t *input;
+        snd_rawmidi_substream_t *output;
+        char istimer;           /* timer in use */
+        struct timer_list timer;
+        spinlock_t lock;
+        int pending;
+};
+
+struct _hdspm {
+        spinlock_t lock;
+        snd_pcm_substream_t *capture_substream;  /* only one playback */
+        snd_pcm_substream_t *playback_substream; /* and/or capture stream */
+
+        char *card_name;             /* for procinfo */
+        unsigned short firmware_rev; /* dont know if relevant */
+
+        int precise_ptr;        /* use precise pointers, to be tested */
+        int monitor_outs;       /* set up monitoring outs init flag */
+
+        u32 control_register;   /* cached value */
+        u32 control2_register;  /* cached value */
+
+        hdspm_midi_t midi[2];
+        struct tasklet_struct midi_tasklet;
+
+        size_t period_bytes;
+        unsigned char ss_channels;      /* channels of card in single speed */
+        unsigned char ds_channels;      /* Double Speed */
+        unsigned char qs_channels;      /* Quad Speed */
+
+        unsigned char *playback_buffer; /* suitably aligned address */
+        unsigned char *capture_buffer;  /* suitably aligned address */
+
+        pid_t capture_pid;      /* process id which uses capture */
+        pid_t playback_pid;     /* process id which uses capture */
+        int running;            /* running status */
+
+        int last_external_sample_rate;  /* samplerate mystic ... */
+        int last_internal_sample_rate;
+        int system_sample_rate;
+
+        char *channel_map;      /* channel map for DS and Quadspeed */
+
+        int dev;                /* Hardware vars... */
+        int irq;
+        unsigned long port;
+        void __iomem *iobase;
+
+        int irq_count;          /* for debug */
+
+        snd_card_t *card;       /* one card */
+        snd_pcm_t *pcm;         /* has one pcm */
+        snd_hwdep_t *hwdep;     /* and a hwdep for additional ioctl */
+        struct pci_dev *pci;    /* and an pci info */
+
+        /* Mixer vars */
+        snd_kcontrol_t *playback_mixer_ctls[HDSPM_MAX_CHANNELS];        /* fast alsa mixer */
+        snd_kcontrol_t *input_mixer_ctls[HDSPM_MAX_CHANNELS];   /* but input to much, so not used */
+        hdspm_mixer_t *mixer;   /* full mixer accessable over mixer ioctl or hwdep-device */
+
+};
+
+/* These tables map the ALSA channels 1..N to the channels that we
+   need to use in order to find the relevant channel buffer. RME
+   refer to this kind of mapping as between "the ADAT channel and
+   the DMA channel." We index it using the logical audio channel,
+   and the value is the DMA channel (i.e. channel buffer number)
+   where the data for that channel can be read/written from/to.
+*/
+
+static char channel_map_madi_ss[HDSPM_MAX_CHANNELS] = {
+   0, 1, 2, 3, 4, 5, 6, 7,
+   8, 9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55,
+   56, 57, 58, 59, 60, 61, 62, 63
+};
+
+static char channel_map_madi_ds[HDSPM_MAX_CHANNELS] = {
+  0, 2, 4, 6, 8, 10, 12, 14,
+  16, 18, 20, 22, 24, 26, 28, 30,
+  32, 34, 36, 38, 40, 42, 44, 46,
+  48, 50, 52, 54, 56, 58, 60, 62,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_madi_qs[HDSPM_MAX_CHANNELS] = {
+  0,   4,  8, 12, 16, 20, 24,  28,  
+  32, 36, 40, 44, 48, 52, 56,  60
+  -1, -1, -1, -1, -1, -1, -1, -1,  
+  -1, -1, -1, -1, -1, -1, -1, -1,  
+  -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+
+static struct pci_device_id snd_hdspm_ids[] = {
+        {
+         .vendor = PCI_VENDOR_ID_XILINX,
+         .device = PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI,
+         .subvendor = PCI_ANY_ID,
+         .subdevice = PCI_ANY_ID,
+         .class = 0,
+         .class_mask = 0,
+         .driver_data = 0},
+        {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, snd_hdspm_ids);
+
+/* prototypes */
+static int __devinit snd_hdspm_create_alsa_devices(snd_card_t * card,
+                                                   hdspm_t * hdspm);
+static int __devinit snd_hdspm_create_pcm(snd_card_t * card,
+                                          hdspm_t * hdspm);
+
+static inline void snd_hdspm_initialize_midi_flush(hdspm_t * hdspm);
+static int hdspm_update_simple_mixer_controls(hdspm_t * hdspm);
+static int hdspm_autosync_ref(hdspm_t * hdspm);
+static int snd_hdspm_set_defaults(hdspm_t * hdspm);
+static void hdspm_set_sgbuf(hdspm_t * hdspm, struct snd_sg_buf *sgbuf,
+                             unsigned int reg, int channels);
+
+/* Write/read to/from HDSPM with Adresses in Bytes
+   not words but only 32Bit writes are allowed */
+
+static inline void hdspm_write(hdspm_t * hdspm, unsigned int reg,
+                               unsigned int val)
+{
+        writel(val, hdspm->iobase + reg);
+}
+
+static inline unsigned int hdspm_read(hdspm_t * hdspm, unsigned int reg)
+{
+        return readl(hdspm->iobase + reg);
+}
+
+/* for each output channel (chan) I have an Input (in) and Playback (pb) Fader 
+   mixer is write only on hardware so we have to cache him for read 
+   each fader is a u32, but uses only the first 16 bit */
+
+static inline int hdspm_read_in_gain(hdspm_t * hdspm, unsigned int chan,
+                                     unsigned int in)
+{
+        if (chan > HDSPM_MIXER_CHANNELS || in > HDSPM_MIXER_CHANNELS)
+                return 0;
+
+        return hdspm->mixer->ch[chan].in[in];
+}
+
+static inline int hdspm_read_pb_gain(hdspm_t * hdspm, unsigned int chan,
+                                     unsigned int pb)
+{
+        if (chan > HDSPM_MIXER_CHANNELS || pb > HDSPM_MIXER_CHANNELS)
+                return 0;
+        return hdspm->mixer->ch[chan].pb[pb];
+}
+
+static inline int hdspm_write_in_gain(hdspm_t * hdspm, unsigned int chan,
+                                      unsigned int in, unsigned short data)
+{
+        if (chan >= HDSPM_MIXER_CHANNELS || in >= HDSPM_MIXER_CHANNELS)
+                return -1;
+
+        hdspm_write(hdspm,
+                    HDSPM_MADI_mixerBase +
+                    ((in + 128 * chan) * sizeof(u32)),
+                    (hdspm->mixer->ch[chan].in[in] = data & 0xFFFF));
+        return 0;
+}
+
+static inline int hdspm_write_pb_gain(hdspm_t * hdspm, unsigned int chan,
+                                      unsigned int pb, unsigned short data)
+{
+        if (chan >= HDSPM_MIXER_CHANNELS || pb >= HDSPM_MIXER_CHANNELS)
+                return -1;
+
+        hdspm_write(hdspm,
+                    HDSPM_MADI_mixerBase +
+                    ((64 + pb + 128 * chan) * sizeof(u32)),
+                    (hdspm->mixer->ch[chan].pb[pb] = data & 0xFFFF));
+        return 0;
+}
+
+
+/* enable DMA for specific channels, now available for DSP-MADI */
+static inline void snd_hdspm_enable_in(hdspm_t * hdspm, int i, int v)
+{
+        hdspm_write(hdspm, HDSPM_inputEnableBase + (4 * i), v);
+}
+
+static inline void snd_hdspm_enable_out(hdspm_t * hdspm, int i, int v)
+{
+        hdspm_write(hdspm, HDSPM_outputEnableBase + (4 * i), v);
+}
+
+/* check if same process is writing and reading */
+static inline int snd_hdspm_use_is_exclusive(hdspm_t * hdspm)
+{
+        unsigned long flags;
+        int ret = 1;
+
+        spin_lock_irqsave(&hdspm->lock, flags);
+        if ((hdspm->playback_pid != hdspm->capture_pid) &&
+            (hdspm->playback_pid >= 0) && (hdspm->capture_pid >= 0)) {
+                ret = 0;
+        }
+        spin_unlock_irqrestore(&hdspm->lock, flags);
+        return ret;
+}
+
+/* check for external sample rate */
+static inline int hdspm_external_sample_rate(hdspm_t * hdspm)
+{
+        unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+        unsigned int status = hdspm_read(hdspm, HDSPM_statusRegister);
+        unsigned int rate_bits;
+        int rate = 0;
+
+        /* if wordclock has synced freq and wordclock is valid */
+        if ((status2 & HDSPM_wcLock) != 0 &&
+            (status & HDSPM_SelSyncRef0) == 0) {
+
+                rate_bits = status2 & HDSPM_wcFreqMask;
+
+                switch (rate_bits) {
+                case HDSPM_wcFreq32:
+                        rate = 32000;
+                        break;
+                case HDSPM_wcFreq44_1:
+                        rate = 44100;
+                        break;
+                case HDSPM_wcFreq48:
+                        rate = 48000;
+                        break;
+                case HDSPM_wcFreq64:
+                        rate = 64000;
+                        break;
+                case HDSPM_wcFreq88_2:
+                        rate = 88200;
+                        break;
+                case HDSPM_wcFreq96:
+                        rate = 96000;
+                        break;
+                        /* Quadspeed Bit missing ???? */
+                default:
+                        rate = 0;
+                        break;
+                }
+        }
+
+        /* if rate detected and Syncref is Word than have it, word has priority to MADI */
+        if (rate != 0
+            && (status2 & HDSPM_SelSyncRefMask) == HDSPM_SelSyncRef_WORD)
+                return rate;
+
+        /* maby a madi input (which is taken if sel sync is madi) */
+        if (status & HDSPM_madiLock) {
+                rate_bits = status & HDSPM_madiFreqMask;
+
+                switch (rate_bits) {
+                case HDSPM_madiFreq32:
+                        rate = 32000;
+                        break;
+                case HDSPM_madiFreq44_1:
+                        rate = 44100;
+                        break;
+                case HDSPM_madiFreq48:
+                        rate = 48000;
+                        break;
+                case HDSPM_madiFreq64:
+                        rate = 64000;
+                        break;
+                case HDSPM_madiFreq88_2:
+                        rate = 88200;
+                        break;
+                case HDSPM_madiFreq96:
+                        rate = 96000;
+                        break;
+                case HDSPM_madiFreq128:
+                        rate = 128000;
+                        break;
+                case HDSPM_madiFreq176_4:
+                        rate = 176400;
+                        break;
+                case HDSPM_madiFreq192:
+                        rate = 192000;
+                        break;
+                default:
+                        rate = 0;
+                        break;
+                }
+        }
+        return rate;
+}
+
+/* Latency function */
+static inline void hdspm_compute_period_size(hdspm_t * hdspm)
+{
+        hdspm->period_bytes =
+            1 << ((hdspm_decode_latency(hdspm->control_register) + 8));
+}
+
+static snd_pcm_uframes_t hdspm_hw_pointer(hdspm_t * hdspm)
+{
+        int position;
+
+        position = hdspm_read(hdspm, HDSPM_statusRegister);
+
+        if (!hdspm->precise_ptr) {
+                return (position & HDSPM_BufferID) ? (hdspm->period_bytes /
+                                                      4) : 0;
+        }
+
+        /* hwpointer comes in bytes and is 64Bytes accurate (by docu since PCI Burst)
+           i have experimented that it is at most 64 Byte to much for playing 
+           so substraction of 64 byte should be ok for ALSA, but use it only
+           for application where you know what you do since if you come to
+           near with record pointer it can be a disaster */
+
+        position &= HDSPM_BufferPositionMask;
+        position = ((position - 64) % (2 * hdspm->period_bytes)) / 4;
+
+        return position;
+}
+
+
+static inline void hdspm_start_audio(hdspm_t * s)
+{
+        s->control_register |= (HDSPM_AudioInterruptEnable | HDSPM_Start);
+        hdspm_write(s, HDSPM_controlRegister, s->control_register);
+}
+
+static inline void hdspm_stop_audio(hdspm_t * s)
+{
+        s->control_register &= ~(HDSPM_Start | HDSPM_AudioInterruptEnable);
+        hdspm_write(s, HDSPM_controlRegister, s->control_register);
+}
+
+/* should I silence all or only opened ones ? doit all for first even is 4MB*/
+static inline void hdspm_silence_playback(hdspm_t * hdspm)
+{
+        int i;
+        int n = hdspm->period_bytes;
+        void *buf = hdspm->playback_buffer;
+
+        snd_assert(buf != NULL, return);
+
+        for (i = 0; i < HDSPM_MAX_CHANNELS; i++) {
+                memset(buf, 0, n);
+                buf += HDSPM_CHANNEL_BUFFER_BYTES;
+        }
+}
+
+static int hdspm_set_interrupt_interval(hdspm_t * s, unsigned int frames)
+{
+        int n;
+
+        spin_lock_irq(&s->lock);
+
+        frames >>= 7;
+        n = 0;
+        while (frames) {
+                n++;
+                frames >>= 1;
+        }
+        s->control_register &= ~HDSPM_LatencyMask;
+        s->control_register |= hdspm_encode_latency(n);
+
+        hdspm_write(s, HDSPM_controlRegister, s->control_register);
+
+        hdspm_compute_period_size(s);
+
+        spin_unlock_irq(&s->lock);
+
+        return 0;
+}
+
+
+/* dummy set rate lets see what happens */
+static int hdspm_set_rate(hdspm_t * hdspm, int rate, int called_internally)
+{
+        int reject_if_open = 0;
+        int current_rate;
+        int rate_bits;
+        int not_set = 0;
+
+        /* ASSUMPTION: hdspm->lock is either set, or there is no need for
+           it (e.g. during module initialization).
+         */
+
+        if (!(hdspm->control_register & HDSPM_ClockModeMaster)) {
+
+                /* SLAVE --- */ 
+                if (called_internally) {
+
+                  /* request from ctl or card initialization 
+                     just make a warning an remember setting 
+                     for future master mode switching */
+    
+                        snd_printk
+                            (KERN_WARNING "HDSPM: Warning: device is not running as a clock master.\n");
+                        not_set = 1;
+                } else {
+
+                        /* hw_param request while in AutoSync mode */
+                        int external_freq =
+                            hdspm_external_sample_rate(hdspm);
+
+                        if ((hdspm_autosync_ref(hdspm) ==
+                             HDSPM_AUTOSYNC_FROM_NONE)) {
+
+                                snd_printk(KERN_WARNING "HDSPM: Detected no Externel Sync \n");
+                                not_set = 1;
+
+                        } else if (rate != external_freq) {
+
+                                snd_printk
+                                    (KERN_WARNING "HDSPM: Warning: No AutoSync source for requested rate\n");
+                                not_set = 1;
+                        }
+                }
+        }
+
+        current_rate = hdspm->system_sample_rate;
+
+        /* Changing between Singe, Double and Quad speed is not
+           allowed if any substreams are open. This is because such a change
+           causes a shift in the location of the DMA buffers and a reduction
+           in the number of available buffers.
+
+           Note that a similar but essentially insoluble problem exists for
+           externally-driven rate changes. All we can do is to flag rate
+           changes in the read/write routines.  
+         */
+
+        switch (rate) {
+        case 32000:
+                if (current_rate > 48000) {
+                        reject_if_open = 1;
+                }
+                rate_bits = HDSPM_Frequency32KHz;
+                break;
+        case 44100:
+                if (current_rate > 48000) {
+                        reject_if_open = 1;
+                }
+                rate_bits = HDSPM_Frequency44_1KHz;
+                break;
+        case 48000:
+                if (current_rate > 48000) {
+                        reject_if_open = 1;
+                }
+                rate_bits = HDSPM_Frequency48KHz;
+                break;
+        case 64000:
+                if (current_rate <= 48000) {
+                        reject_if_open = 1;
+                }
+                rate_bits = HDSPM_Frequency64KHz;
+                break;
+        case 88200:
+                if (current_rate <= 48000) {
+                        reject_if_open = 1;
+                }
+                rate_bits = HDSPM_Frequency88_2KHz;
+                break;
+        case 96000:
+                if (current_rate <= 48000) {
+                        reject_if_open = 1;
+                }
+                rate_bits = HDSPM_Frequency96KHz;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (reject_if_open
+            && (hdspm->capture_pid >= 0 || hdspm->playback_pid >= 0)) {
+                snd_printk
+                    (KERN_ERR "HDSPM: cannot change between single- and double-speed mode (capture PID = %d, playback PID = %d)\n",
+                     hdspm->capture_pid, hdspm->playback_pid);
+                return -EBUSY;
+        }
+
+        hdspm->control_register &= ~HDSPM_FrequencyMask;
+        hdspm->control_register |= rate_bits;
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        if (rate > 64000)
+                hdspm->channel_map = channel_map_madi_qs;
+        else if (rate > 48000)
+                hdspm->channel_map = channel_map_madi_ds;
+        else 
+                hdspm->channel_map = channel_map_madi_ss;
+
+        hdspm->system_sample_rate = rate;
+
+        if (not_set != 0)
+                return -1;
+
+        return 0;
+}
+
+/* mainly for init to 0 on load */
+static void all_in_all_mixer(hdspm_t * hdspm, int sgain)
+{
+        int i, j;
+        unsigned int gain =
+            (sgain > UNITY_GAIN) ? UNITY_GAIN : (sgain < 0) ? 0 : sgain;
+
+        for (i = 0; i < HDSPM_MIXER_CHANNELS; i++)
+                for (j = 0; j < HDSPM_MIXER_CHANNELS; j++) {
+                        hdspm_write_in_gain(hdspm, i, j, gain);
+                        hdspm_write_pb_gain(hdspm, i, j, gain);
+                }
+}
+
+/*----------------------------------------------------------------------------
+   MIDI
+  ----------------------------------------------------------------------------*/
+
+static inline unsigned char snd_hdspm_midi_read_byte (hdspm_t *hdspm, int id)
+{
+        /* the hardware already does the relevant bit-mask with 0xff */
+        if (id)
+                return hdspm_read(hdspm, HDSPM_midiDataIn1);
+        else
+                return hdspm_read(hdspm, HDSPM_midiDataIn0);
+}
+
+static inline void snd_hdspm_midi_write_byte (hdspm_t *hdspm, int id, int val)
+{
+        /* the hardware already does the relevant bit-mask with 0xff */
+        if (id)
+                return hdspm_write(hdspm, HDSPM_midiDataOut1, val);
+        else
+                return hdspm_write(hdspm, HDSPM_midiDataOut0, val);
+}
+
+static inline int snd_hdspm_midi_input_available (hdspm_t *hdspm, int id)
+{
+        if (id)
+                return (hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xff);
+        else
+                return (hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xff);
+}
+
+static inline int snd_hdspm_midi_output_possible (hdspm_t *hdspm, int id)
+{
+        int fifo_bytes_used;
+
+        if (id)
+                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut1) & 0xff;
+        else
+                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xff;
+
+        if (fifo_bytes_used < 128)
+                return  128 - fifo_bytes_used;
+        else
+                return 0;
+}
+
+static inline void snd_hdspm_flush_midi_input (hdspm_t *hdspm, int id)
+{
+        while (snd_hdspm_midi_input_available (hdspm, id))
+                snd_hdspm_midi_read_byte (hdspm, id);
+}
+
+static int snd_hdspm_midi_output_write (hdspm_midi_t *hmidi)
+{
+        unsigned long flags;
+        int n_pending;
+        int to_write;
+        int i;
+        unsigned char buf[128];
+
+        /* Output is not interrupt driven */
+                
+        spin_lock_irqsave (&hmidi->lock, flags);
+        if (hmidi->output) {
+                if (!snd_rawmidi_transmit_empty (hmidi->output)) {
+                        if ((n_pending = snd_hdspm_midi_output_possible (hmidi->hdspm, hmidi->id)) > 0) {
+                                if (n_pending > (int)sizeof (buf))
+                                        n_pending = sizeof (buf);
+                                
+                                if ((to_write = snd_rawmidi_transmit (hmidi->output, buf, n_pending)) > 0) {
+                                        for (i = 0; i < to_write; ++i) 
+                                                snd_hdspm_midi_write_byte (hmidi->hdspm, hmidi->id, buf[i]);
+                                }
+                        }
+                }
+        }
+        spin_unlock_irqrestore (&hmidi->lock, flags);
+        return 0;
+}
+
+static int snd_hdspm_midi_input_read (hdspm_midi_t *hmidi)
+{
+        unsigned char buf[128]; /* this buffer is designed to match the MIDI input FIFO size */
+        unsigned long flags;
+        int n_pending;
+        int i;
+
+        spin_lock_irqsave (&hmidi->lock, flags);
+        if ((n_pending = snd_hdspm_midi_input_available (hmidi->hdspm, hmidi->id)) > 0) {
+                if (hmidi->input) {
+                        if (n_pending > (int)sizeof (buf)) {
+                                n_pending = sizeof (buf);
+                        }
+                        for (i = 0; i < n_pending; ++i) {
+                                buf[i] = snd_hdspm_midi_read_byte (hmidi->hdspm, hmidi->id);
+                        }
+                        if (n_pending) {
+                                snd_rawmidi_receive (hmidi->input, buf, n_pending);
+                        }
+                } else {
+                        /* flush the MIDI input FIFO */
+                        while (n_pending--) {
+                                snd_hdspm_midi_read_byte (hmidi->hdspm, hmidi->id);
+                        }
+                }
+        }
+        hmidi->pending = 0;
+        if (hmidi->id) {
+                hmidi->hdspm->control_register |= HDSPM_Midi1InterruptEnable;
+        } else {
+                hmidi->hdspm->control_register |= HDSPM_Midi0InterruptEnable;
+        }
+        hdspm_write(hmidi->hdspm, HDSPM_controlRegister, hmidi->hdspm->control_register);
+        spin_unlock_irqrestore (&hmidi->lock, flags);
+        return snd_hdspm_midi_output_write (hmidi);
+}
+
+static void snd_hdspm_midi_input_trigger(snd_rawmidi_substream_t * substream, int up)
+{
+        hdspm_t *hdspm;
+        hdspm_midi_t *hmidi;
+        unsigned long flags;
+        u32 ie;
+
+        hmidi = (hdspm_midi_t *) substream->rmidi->private_data;
+        hdspm = hmidi->hdspm;
+        ie = hmidi->id ? HDSPM_Midi1InterruptEnable : HDSPM_Midi0InterruptEnable;
+        spin_lock_irqsave (&hdspm->lock, flags);
+        if (up) {
+                if (!(hdspm->control_register & ie)) {
+                        snd_hdspm_flush_midi_input (hdspm, hmidi->id);
+                        hdspm->control_register |= ie;
+                }
+        } else {
+                hdspm->control_register &= ~ie;
+        }
+
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+        spin_unlock_irqrestore (&hdspm->lock, flags);
+}
+
+static void snd_hdspm_midi_output_timer(unsigned long data)
+{
+        hdspm_midi_t *hmidi = (hdspm_midi_t *) data;
+        unsigned long flags;
+        
+        snd_hdspm_midi_output_write(hmidi);
+        spin_lock_irqsave (&hmidi->lock, flags);
+
+        /* this does not bump hmidi->istimer, because the
+           kernel automatically removed the timer when it
+           expired, and we are now adding it back, thus
+           leaving istimer wherever it was set before.  
+        */
+
+        if (hmidi->istimer) {
+                hmidi->timer.expires = 1 + jiffies;
+                add_timer(&hmidi->timer);
+        }
+
+        spin_unlock_irqrestore (&hmidi->lock, flags);
+}
+
+static void snd_hdspm_midi_output_trigger(snd_rawmidi_substream_t * substream, int up)
+{
+        hdspm_midi_t *hmidi;
+        unsigned long flags;
+
+        hmidi = (hdspm_midi_t *) substream->rmidi->private_data;
+        spin_lock_irqsave (&hmidi->lock, flags);
+        if (up) {
+                if (!hmidi->istimer) {
+                        init_timer(&hmidi->timer);
+                        hmidi->timer.function = snd_hdspm_midi_output_timer;
+                        hmidi->timer.data = (unsigned long) hmidi;
+                        hmidi->timer.expires = 1 + jiffies;
+                        add_timer(&hmidi->timer);
+                        hmidi->istimer++;
+                }
+        } else {
+                if (hmidi->istimer && --hmidi->istimer <= 0) {
+                        del_timer (&hmidi->timer);
+                }
+        }
+        spin_unlock_irqrestore (&hmidi->lock, flags);
+        if (up)
+                snd_hdspm_midi_output_write(hmidi);
+}
+
+static int snd_hdspm_midi_input_open(snd_rawmidi_substream_t * substream)
+{
+        hdspm_midi_t *hmidi;
+
+        hmidi = (hdspm_midi_t *) substream->rmidi->private_data;
+        spin_lock_irq (&hmidi->lock);
+        snd_hdspm_flush_midi_input (hmidi->hdspm, hmidi->id);
+        hmidi->input = substream;
+        spin_unlock_irq (&hmidi->lock);
+
+        return 0;
+}
+
+static int snd_hdspm_midi_output_open(snd_rawmidi_substream_t * substream)
+{
+        hdspm_midi_t *hmidi;
+
+        hmidi = (hdspm_midi_t *) substream->rmidi->private_data;
+        spin_lock_irq (&hmidi->lock);
+        hmidi->output = substream;
+        spin_unlock_irq (&hmidi->lock);
+
+        return 0;
+}
+
+static int snd_hdspm_midi_input_close(snd_rawmidi_substream_t * substream)
+{
+        hdspm_midi_t *hmidi;
+
+        snd_hdspm_midi_input_trigger (substream, 0);
+
+        hmidi = (hdspm_midi_t *) substream->rmidi->private_data;
+        spin_lock_irq (&hmidi->lock);
+        hmidi->input = NULL;
+        spin_unlock_irq (&hmidi->lock);
+
+        return 0;
+}
+
+static int snd_hdspm_midi_output_close(snd_rawmidi_substream_t * substream)
+{
+        hdspm_midi_t *hmidi;
+
+        snd_hdspm_midi_output_trigger (substream, 0);
+
+        hmidi = (hdspm_midi_t *) substream->rmidi->private_data;
+        spin_lock_irq (&hmidi->lock);
+        hmidi->output = NULL;
+        spin_unlock_irq (&hmidi->lock);
+
+        return 0;
+}
+
+snd_rawmidi_ops_t snd_hdspm_midi_output =
+{
+        .open =         snd_hdspm_midi_output_open,
+        .close =        snd_hdspm_midi_output_close,
+        .trigger =      snd_hdspm_midi_output_trigger,
+};
+
+snd_rawmidi_ops_t snd_hdspm_midi_input =
+{
+        .open =         snd_hdspm_midi_input_open,
+        .close =        snd_hdspm_midi_input_close,
+        .trigger =      snd_hdspm_midi_input_trigger,
+};
+
+static int __devinit snd_hdspm_create_midi (snd_card_t *card, hdspm_t *hdspm, int id)
+{
+        int err;
+        char buf[32];
+
+        hdspm->midi[id].id = id;
+        hdspm->midi[id].rmidi = NULL;
+        hdspm->midi[id].input = NULL;
+        hdspm->midi[id].output = NULL;
+        hdspm->midi[id].hdspm = hdspm;
+        hdspm->midi[id].istimer = 0;
+        hdspm->midi[id].pending = 0;
+        spin_lock_init (&hdspm->midi[id].lock);
+
+        sprintf (buf, "%s MIDI %d", card->shortname, id+1);
+        if ((err = snd_rawmidi_new (card, buf, id, 1, 1, &hdspm->midi[id].rmidi)) < 0)
+                return err;
+
+        sprintf (hdspm->midi[id].rmidi->name, "%s MIDI %d", card->id, id+1);
+        hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
+
+        snd_rawmidi_set_ops (hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_hdspm_midi_output);
+        snd_rawmidi_set_ops (hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_hdspm_midi_input);
+
+        hdspm->midi[id].rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
+                SNDRV_RAWMIDI_INFO_INPUT |
+                SNDRV_RAWMIDI_INFO_DUPLEX;
+
+        return 0;
+}
+
+
+static void hdspm_midi_tasklet(unsigned long arg)
+{
+        hdspm_t *hdspm = (hdspm_t *)arg;
+        
+        if (hdspm->midi[0].pending)
+                snd_hdspm_midi_input_read (&hdspm->midi[0]);
+        if (hdspm->midi[1].pending)
+                snd_hdspm_midi_input_read (&hdspm->midi[1]);
+} 
+
+
+/*-----------------------------------------------------------------------------
+  Status Interface
+  ----------------------------------------------------------------------------*/
+
+/* get the system sample rate which is set */
+
+#define HDSPM_SYSTEM_SAMPLE_RATE(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
+  .info = snd_hdspm_info_system_sample_rate, \
+  .get = snd_hdspm_get_system_sample_rate \
+}
+
+static int snd_hdspm_info_system_sample_rate(snd_kcontrol_t * kcontrol,
+                                             snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        return 0;
+}
+
+static int snd_hdspm_get_system_sample_rate(snd_kcontrol_t * kcontrol,
+                                            snd_ctl_elem_value_t *
+                                            ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->system_sample_rate;
+        return 0;
+}
+
+#define HDSPM_AUTOSYNC_SAMPLE_RATE(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \
+  .name = xname, \
+  .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
+  .info = snd_hdspm_info_autosync_sample_rate, \
+  .get = snd_hdspm_get_autosync_sample_rate \
+}
+
+static int snd_hdspm_info_autosync_sample_rate(snd_kcontrol_t * kcontrol,
+                                               snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[] = { "32000", "44100", "48000",
+                "64000", "88200", "96000",
+                "128000", "176400", "192000",
+                "None"
+        };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 10;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_hdspm_get_autosync_sample_rate(snd_kcontrol_t * kcontrol,
+                                              snd_ctl_elem_value_t *
+                                              ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        switch (hdspm_external_sample_rate(hdspm)) {
+        case 32000:
+                ucontrol->value.enumerated.item[0] = 0;
+                break;
+        case 44100:
+                ucontrol->value.enumerated.item[0] = 1;
+                break;
+        case 48000:
+                ucontrol->value.enumerated.item[0] = 2;
+                break;
+        case 64000:
+                ucontrol->value.enumerated.item[0] = 3;
+                break;
+        case 88200:
+                ucontrol->value.enumerated.item[0] = 4;
+                break;
+        case 96000:
+                ucontrol->value.enumerated.item[0] = 5;
+                break;
+        case 128000:
+                ucontrol->value.enumerated.item[0] = 6;
+                break;
+        case 176400:
+                ucontrol->value.enumerated.item[0] = 7;
+                break;
+        case 192000:
+                ucontrol->value.enumerated.item[0] = 8;
+                break;
+
+        default:
+                ucontrol->value.enumerated.item[0] = 9;
+        }
+        return 0;
+}
+
+#define HDSPM_SYSTEM_CLOCK_MODE(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
+  .info = snd_hdspm_info_system_clock_mode, \
+  .get = snd_hdspm_get_system_clock_mode, \
+}
+
+
+
+static int hdspm_system_clock_mode(hdspm_t * hdspm)
+{
+        /* Always reflect the hardware info, rme is never wrong !!!! */
+
+        if (hdspm->control_register & HDSPM_ClockModeMaster)
+                return 0;
+        return 1;
+}
+
+static int snd_hdspm_info_system_clock_mode(snd_kcontrol_t * kcontrol,
+                                            snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[] = { "Master", "Slave" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_hdspm_get_system_clock_mode(snd_kcontrol_t * kcontrol,
+                                           snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] =
+            hdspm_system_clock_mode(hdspm);
+        return 0;
+}
+
+#define HDSPM_CLOCK_SOURCE(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_hdspm_info_clock_source, \
+  .get = snd_hdspm_get_clock_source, \
+  .put = snd_hdspm_put_clock_source \
+}
+
+static int hdspm_clock_source(hdspm_t * hdspm)
+{
+        if (hdspm->control_register & HDSPM_ClockModeMaster) {
+                switch (hdspm->system_sample_rate) {
+                case 32000:
+                        return 1;
+                case 44100:
+                        return 2;
+                case 48000:
+                        return 3;
+                case 64000:
+                        return 4;
+                case 88200:
+                        return 5;
+                case 96000:
+                        return 6;
+                case 128000:
+                        return 7;
+                case 176400:
+                        return 8;
+                case 192000:
+                        return 9;
+                default:
+                        return 3;
+                }
+        } else {
+                return 0;
+        }
+}
+
+static int hdspm_set_clock_source(hdspm_t * hdspm, int mode)
+{
+        int rate;
+        switch (mode) {
+
+        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
+                if (hdspm_external_sample_rate(hdspm) != 0) {
+                        hdspm->control_register &= ~HDSPM_ClockModeMaster;
+                        hdspm_write(hdspm, HDSPM_controlRegister,
+                                    hdspm->control_register);
+                        return 0;
+                }
+                return -1;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
+                rate = 32000;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
+                rate = 44100;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
+                rate = 48000;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
+                rate = 64000;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
+                rate = 88200;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
+                rate = 96000;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ:
+                rate = 128000;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ:
+                rate = 176400;
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ:
+                rate = 192000;
+                break;
+
+        default:
+                rate = 44100;
+        }
+        hdspm->control_register |= HDSPM_ClockModeMaster;
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+        hdspm_set_rate(hdspm, rate, 1);
+        return 0;
+}
+
+static int snd_hdspm_info_clock_source(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[] = { "AutoSync",
+                "Internal 32.0 kHz", "Internal 44.1 kHz",
+                    "Internal 48.0 kHz",
+                "Internal 64.0 kHz", "Internal 88.2 kHz",
+                    "Internal 96.0 kHz",
+                "Internal 128.0 kHz", "Internal 176.4 kHz",
+                    "Internal 192.0 kHz"
+        };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 10;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_clock_source(snd_kcontrol_t * kcontrol,
+                                      snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm_clock_source(hdspm);
+        return 0;
+}
+
+static int snd_hdspm_put_clock_source(snd_kcontrol_t * kcontrol,
+                                      snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+        val = ucontrol->value.enumerated.item[0];
+        if (val < 0)
+                val = 0;
+        if (val > 6)
+                val = 6;
+        spin_lock_irq(&hdspm->lock);
+        if (val != hdspm_clock_source(hdspm))
+                change = (hdspm_set_clock_source(hdspm, val) == 0) ? 1 : 0;
+        else
+                change = 0;
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+#define HDSPM_PREF_SYNC_REF(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_hdspm_info_pref_sync_ref, \
+  .get = snd_hdspm_get_pref_sync_ref, \
+  .put = snd_hdspm_put_pref_sync_ref \
+}
+
+static int hdspm_pref_sync_ref(hdspm_t * hdspm)
+{
+        /* Notice that this looks at the requested sync source,
+           not the one actually in use.
+         */
+        switch (hdspm->control_register & HDSPM_SyncRefMask) {
+        case HDSPM_SyncRef_Word:
+                return HDSPM_SYNC_FROM_WORD;
+        case HDSPM_SyncRef_MADI:
+                return HDSPM_SYNC_FROM_MADI;
+        }
+
+        return HDSPM_SYNC_FROM_WORD;
+}
+
+static int hdspm_set_pref_sync_ref(hdspm_t * hdspm, int pref)
+{
+        hdspm->control_register &= ~HDSPM_SyncRefMask;
+
+        switch (pref) {
+        case HDSPM_SYNC_FROM_MADI:
+                hdspm->control_register |= HDSPM_SyncRef_MADI;
+                break;
+        case HDSPM_SYNC_FROM_WORD:
+                hdspm->control_register |= HDSPM_SyncRef_Word;
+                break;
+        default:
+                return -1;
+        }
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+        return 0;
+}
+
+static int snd_hdspm_info_pref_sync_ref(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[] = { "Word", "MADI" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+
+        uinfo->value.enumerated.items = 2;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_hdspm_get_pref_sync_ref(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm_pref_sync_ref(hdspm);
+        return 0;
+}
+
+static int snd_hdspm_put_pref_sync_ref(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change, max;
+        unsigned int val;
+
+        max = 2;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+
+        val = ucontrol->value.enumerated.item[0] % max;
+
+        spin_lock_irq(&hdspm->lock);
+        change = (int) val != hdspm_pref_sync_ref(hdspm);
+        hdspm_set_pref_sync_ref(hdspm, val);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+#define HDSPM_AUTOSYNC_REF(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
+  .info = snd_hdspm_info_autosync_ref, \
+  .get = snd_hdspm_get_autosync_ref, \
+}
+
+static int hdspm_autosync_ref(hdspm_t * hdspm)
+{
+        /* This looks at the autosync selected sync reference */
+        unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+
+        switch (status2 & HDSPM_SelSyncRefMask) {
+
+        case HDSPM_SelSyncRef_WORD:
+                return HDSPM_AUTOSYNC_FROM_WORD;
+
+        case HDSPM_SelSyncRef_MADI:
+                return HDSPM_AUTOSYNC_FROM_MADI;
+
+        case HDSPM_SelSyncRef_NVALID:
+                return HDSPM_AUTOSYNC_FROM_NONE;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int snd_hdspm_info_autosync_ref(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[] = { "WordClock", "MADI", "None" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_hdspm_get_autosync_ref(snd_kcontrol_t * kcontrol,
+                                      snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm_pref_sync_ref(hdspm);
+        return 0;
+}
+
+#define HDSPM_LINE_OUT(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_hdspm_info_line_out, \
+  .get = snd_hdspm_get_line_out, \
+  .put = snd_hdspm_put_line_out \
+}
+
+static int hdspm_line_out(hdspm_t * hdspm)
+{
+        return (hdspm->control_register & HDSPM_LineOut) ? 1 : 0;
+}
+
+
+static int hdspm_set_line_output(hdspm_t * hdspm, int out)
+{
+        if (out)
+                hdspm->control_register |= HDSPM_LineOut;
+        else
+                hdspm->control_register &= ~HDSPM_LineOut;
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        return 0;
+}
+
+static int snd_hdspm_info_line_out(snd_kcontrol_t * kcontrol,
+                                   snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_hdspm_get_line_out(snd_kcontrol_t * kcontrol,
+                                  snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        spin_lock_irq(&hdspm->lock);
+        ucontrol->value.integer.value[0] = hdspm_line_out(hdspm);
+        spin_unlock_irq(&hdspm->lock);
+        return 0;
+}
+
+static int snd_hdspm_put_line_out(snd_kcontrol_t * kcontrol,
+                                  snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        unsigned int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+        val = ucontrol->value.integer.value[0] & 1;
+        spin_lock_irq(&hdspm->lock);
+        change = (int) val != hdspm_line_out(hdspm);
+        hdspm_set_line_output(hdspm, val);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+#define HDSPM_TX_64(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_hdspm_info_tx_64, \
+  .get = snd_hdspm_get_tx_64, \
+  .put = snd_hdspm_put_tx_64 \
+}
+
+static int hdspm_tx_64(hdspm_t * hdspm)
+{
+        return (hdspm->control_register & HDSPM_TX_64ch) ? 1 : 0;
+}
+
+static int hdspm_set_tx_64(hdspm_t * hdspm, int out)
+{
+        if (out)
+                hdspm->control_register |= HDSPM_TX_64ch;
+        else
+                hdspm->control_register &= ~HDSPM_TX_64ch;
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        return 0;
+}
+
+static int snd_hdspm_info_tx_64(snd_kcontrol_t * kcontrol,
+                                snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_hdspm_get_tx_64(snd_kcontrol_t * kcontrol,
+                               snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        spin_lock_irq(&hdspm->lock);
+        ucontrol->value.integer.value[0] = hdspm_tx_64(hdspm);
+        spin_unlock_irq(&hdspm->lock);
+        return 0;
+}
+
+static int snd_hdspm_put_tx_64(snd_kcontrol_t * kcontrol,
+                               snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        unsigned int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+        val = ucontrol->value.integer.value[0] & 1;
+        spin_lock_irq(&hdspm->lock);
+        change = (int) val != hdspm_tx_64(hdspm);
+        hdspm_set_tx_64(hdspm, val);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+#define HDSPM_C_TMS(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_hdspm_info_c_tms, \
+  .get = snd_hdspm_get_c_tms, \
+  .put = snd_hdspm_put_c_tms \
+}
+
+static int hdspm_c_tms(hdspm_t * hdspm)
+{
+        return (hdspm->control_register & HDSPM_clr_tms) ? 1 : 0;
+}
+
+static int hdspm_set_c_tms(hdspm_t * hdspm, int out)
+{
+        if (out)
+                hdspm->control_register |= HDSPM_clr_tms;
+        else
+                hdspm->control_register &= ~HDSPM_clr_tms;
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        return 0;
+}
+
+static int snd_hdspm_info_c_tms(snd_kcontrol_t * kcontrol,
+                                snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_hdspm_get_c_tms(snd_kcontrol_t * kcontrol,
+                               snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        spin_lock_irq(&hdspm->lock);
+        ucontrol->value.integer.value[0] = hdspm_c_tms(hdspm);
+        spin_unlock_irq(&hdspm->lock);
+        return 0;
+}
+
+static int snd_hdspm_put_c_tms(snd_kcontrol_t * kcontrol,
+                               snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        unsigned int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+        val = ucontrol->value.integer.value[0] & 1;
+        spin_lock_irq(&hdspm->lock);
+        change = (int) val != hdspm_c_tms(hdspm);
+        hdspm_set_c_tms(hdspm, val);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+#define HDSPM_SAFE_MODE(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_hdspm_info_safe_mode, \
+  .get = snd_hdspm_get_safe_mode, \
+  .put = snd_hdspm_put_safe_mode \
+}
+
+static int hdspm_safe_mode(hdspm_t * hdspm)
+{
+        return (hdspm->control_register & HDSPM_AutoInp) ? 1 : 0;
+}
+
+static int hdspm_set_safe_mode(hdspm_t * hdspm, int out)
+{
+        if (out)
+                hdspm->control_register |= HDSPM_AutoInp;
+        else
+                hdspm->control_register &= ~HDSPM_AutoInp;
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        return 0;
+}
+
+static int snd_hdspm_info_safe_mode(snd_kcontrol_t * kcontrol,
+                                    snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_hdspm_get_safe_mode(snd_kcontrol_t * kcontrol,
+                                   snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        spin_lock_irq(&hdspm->lock);
+        ucontrol->value.integer.value[0] = hdspm_safe_mode(hdspm);
+        spin_unlock_irq(&hdspm->lock);
+        return 0;
+}
+
+static int snd_hdspm_put_safe_mode(snd_kcontrol_t * kcontrol,
+                                   snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        unsigned int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+        val = ucontrol->value.integer.value[0] & 1;
+        spin_lock_irq(&hdspm->lock);
+        change = (int) val != hdspm_safe_mode(hdspm);
+        hdspm_set_safe_mode(hdspm, val);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+#define HDSPM_INPUT_SELECT(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_hdspm_info_input_select, \
+  .get = snd_hdspm_get_input_select, \
+  .put = snd_hdspm_put_input_select \
+}
+
+static int hdspm_input_select(hdspm_t * hdspm)
+{
+        return (hdspm->control_register & HDSPM_InputSelect0) ? 1 : 0;
+}
+
+static int hdspm_set_input_select(hdspm_t * hdspm, int out)
+{
+        if (out)
+                hdspm->control_register |= HDSPM_InputSelect0;
+        else
+                hdspm->control_register &= ~HDSPM_InputSelect0;
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        return 0;
+}
+
+static int snd_hdspm_info_input_select(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[] = { "optical", "coaxial" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_input_select(snd_kcontrol_t * kcontrol,
+                                      snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        spin_lock_irq(&hdspm->lock);
+        ucontrol->value.enumerated.item[0] = hdspm_input_select(hdspm);
+        spin_unlock_irq(&hdspm->lock);
+        return 0;
+}
+
+static int snd_hdspm_put_input_select(snd_kcontrol_t * kcontrol,
+                                      snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        unsigned int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+        val = ucontrol->value.integer.value[0] & 1;
+        spin_lock_irq(&hdspm->lock);
+        change = (int) val != hdspm_input_select(hdspm);
+        hdspm_set_input_select(hdspm, val);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+/*           Simple Mixer
+  deprecated since to much faders ???
+  MIXER interface says output (source, destination, value)
+   where source > MAX_channels are playback channels 
+   on MADICARD 
+  - playback mixer matrix: [channelout+64] [output] [value]
+  - input(thru) mixer matrix: [channelin] [output] [value]
+  (better do 2 kontrols for seperation ?)
+*/
+
+#define HDSPM_MIXER(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \
+                 SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdspm_info_mixer, \
+  .get = snd_hdspm_get_mixer, \
+  .put = snd_hdspm_put_mixer \
+}
+
+static int snd_hdspm_info_mixer(snd_kcontrol_t * kcontrol,
+                                snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 3;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 65535;
+        uinfo->value.integer.step = 1;
+        return 0;
+}
+
+static int snd_hdspm_get_mixer(snd_kcontrol_t * kcontrol,
+                               snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int source;
+        int destination;
+
+        source = ucontrol->value.integer.value[0];
+        if (source < 0)
+                source = 0;
+        else if (source >= 2 * HDSPM_MAX_CHANNELS)
+                source = 2 * HDSPM_MAX_CHANNELS - 1;
+
+        destination = ucontrol->value.integer.value[1];
+        if (destination < 0)
+                destination = 0;
+        else if (destination >= HDSPM_MAX_CHANNELS)
+                destination = HDSPM_MAX_CHANNELS - 1;
+
+        spin_lock_irq(&hdspm->lock);
+        if (source >= HDSPM_MAX_CHANNELS)
+                ucontrol->value.integer.value[2] =
+                    hdspm_read_pb_gain(hdspm, destination,
+                                       source - HDSPM_MAX_CHANNELS);
+        else
+                ucontrol->value.integer.value[2] =
+                    hdspm_read_in_gain(hdspm, destination, source);
+
+        spin_unlock_irq(&hdspm->lock);
+
+        return 0;
+}
+
+static int snd_hdspm_put_mixer(snd_kcontrol_t * kcontrol,
+                               snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        int source;
+        int destination;
+        int gain;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+
+        source = ucontrol->value.integer.value[0];
+        destination = ucontrol->value.integer.value[1];
+
+        if (source < 0 || source >= 2 * HDSPM_MAX_CHANNELS)
+                return -1;
+        if (destination < 0 || destination >= HDSPM_MAX_CHANNELS)
+                return -1;
+
+        gain = ucontrol->value.integer.value[2];
+
+        spin_lock_irq(&hdspm->lock);
+
+        if (source >= HDSPM_MAX_CHANNELS)
+                change = gain != hdspm_read_pb_gain(hdspm, destination,
+                                                    source -
+                                                    HDSPM_MAX_CHANNELS);
+        else
+                change =
+                    gain != hdspm_read_in_gain(hdspm, destination, source);
+
+        if (change) {
+                if (source >= HDSPM_MAX_CHANNELS)
+                        hdspm_write_pb_gain(hdspm, destination,
+                                            source - HDSPM_MAX_CHANNELS,
+                                            gain);
+                else
+                        hdspm_write_in_gain(hdspm, destination, source,
+                                            gain);
+        }
+        spin_unlock_irq(&hdspm->lock);
+
+        return change;
+}
+
+/* The simple mixer control(s) provide gain control for the
+   basic 1:1 mappings of playback streams to output
+   streams. 
+*/
+
+#define HDSPM_PLAYBACK_MIXER \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE | \
+                 SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdspm_info_playback_mixer, \
+  .get = snd_hdspm_get_playback_mixer, \
+  .put = snd_hdspm_put_playback_mixer \
+}
+
+static int snd_hdspm_info_playback_mixer(snd_kcontrol_t * kcontrol,
+                                         snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 65536;
+        uinfo->value.integer.step = 1;
+        return 0;
+}
+
+static int snd_hdspm_get_playback_mixer(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int channel;
+        int mapped_channel;
+
+        channel = ucontrol->id.index - 1;
+
+        snd_assert(channel >= 0
+                   || channel < HDSPM_MAX_CHANNELS, return -EINVAL);
+
+        if ((mapped_channel = hdspm->channel_map[channel]) < 0)
+                return -EINVAL;
+
+        spin_lock_irq(&hdspm->lock);
+        ucontrol->value.integer.value[0] =
+            hdspm_read_pb_gain(hdspm, mapped_channel, mapped_channel);
+        spin_unlock_irq(&hdspm->lock);
+
+        /*    snd_printdd("get pb mixer index %d, channel %d, mapped_channel %d, value %d\n",
+           ucontrol->id.index,        channel, mapped_channel,  ucontrol->value.integer.value[0]); 
+         */
+
+        return 0;
+}
+
+static int snd_hdspm_put_playback_mixer(snd_kcontrol_t * kcontrol,
+                                        snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+        int change;
+        int channel;
+        int mapped_channel;
+        int gain;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+
+        channel = ucontrol->id.index - 1;
+
+        snd_assert(channel >= 0
+                   || channel < HDSPM_MAX_CHANNELS, return -EINVAL);
+
+        if ((mapped_channel = hdspm->channel_map[channel]) < 0)
+                return -EINVAL;
+
+        gain = ucontrol->value.integer.value[0];
+
+        spin_lock_irq(&hdspm->lock);
+        change =
+            gain != hdspm_read_pb_gain(hdspm, mapped_channel,
+                                       mapped_channel);
+        if (change)
+                hdspm_write_pb_gain(hdspm, mapped_channel, mapped_channel,
+                                    gain);
+        spin_unlock_irq(&hdspm->lock);
+        return change;
+}
+
+#define HDSPM_WC_SYNC_CHECK(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdspm_info_sync_check, \
+  .get = snd_hdspm_get_wc_sync_check \
+}
+
+static int snd_hdspm_info_sync_check(snd_kcontrol_t * kcontrol,
+                                     snd_ctl_elem_info_t * uinfo)
+{
+        static char *texts[] = { "No Lock", "Lock", "Sync" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                    uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int hdspm_wc_sync_check(hdspm_t * hdspm)
+{
+        int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+        if (status2 & HDSPM_wcLock) {
+                if (status2 & HDSPM_wcSync)
+                        return 2;
+                else
+                        return 1;
+        }
+        return 0;
+}
+
+static int snd_hdspm_get_wc_sync_check(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm_wc_sync_check(hdspm);
+        return 0;
+}
+
+
+#define HDSPM_MADI_SYNC_CHECK(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
+  .name = xname, \
+  .index = xindex, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+  .info = snd_hdspm_info_sync_check, \
+  .get = snd_hdspm_get_madisync_sync_check \
+}
+
+static int hdspm_madisync_sync_check(hdspm_t * hdspm)
+{
+        int status = hdspm_read(hdspm, HDSPM_statusRegister);
+        if (status & HDSPM_madiLock) {
+                if (status & HDSPM_madiSync)
+                        return 2;
+                else
+                        return 1;
+        }
+        return 0;
+}
+
+static int snd_hdspm_get_madisync_sync_check(snd_kcontrol_t * kcontrol,
+                                             snd_ctl_elem_value_t *
+                                             ucontrol)
+{
+        hdspm_t *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] =
+            hdspm_madisync_sync_check(hdspm);
+        return 0;
+}
+
+
+
+
+static snd_kcontrol_new_t snd_hdspm_controls[] = {
+
+        HDSPM_MIXER("Mixer", 0),
+/* 'Sample Clock Source' complies with the alsa control naming scheme */
+        HDSPM_CLOCK_SOURCE("Sample Clock Source", 0),
+
+        HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
+        HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
+        HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
+        HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+/* 'External Rate' complies with the alsa control naming scheme */
+        HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
+        HDSPM_WC_SYNC_CHECK("Word Clock Lock Status", 0),
+        HDSPM_MADI_SYNC_CHECK("MADI Sync Lock Status", 0),
+        HDSPM_LINE_OUT("Line Out", 0),
+        HDSPM_TX_64("TX 64 channels mode", 0),
+        HDSPM_C_TMS("Clear Track Marker", 0),
+        HDSPM_SAFE_MODE("Safe Mode", 0),
+        HDSPM_INPUT_SELECT("Input Select", 0),
+};
+
+static snd_kcontrol_new_t snd_hdspm_playback_mixer = HDSPM_PLAYBACK_MIXER;
+
+
+static int hdspm_update_simple_mixer_controls(hdspm_t * hdspm)
+{
+        int i;
+
+        for (i = hdspm->ds_channels; i < hdspm->ss_channels; ++i) {
+                if (hdspm->system_sample_rate > 48000) {
+                        hdspm->playback_mixer_ctls[i]->vd[0].access =
+                            SNDRV_CTL_ELEM_ACCESS_INACTIVE |
+                            SNDRV_CTL_ELEM_ACCESS_READ |
+                            SNDRV_CTL_ELEM_ACCESS_VOLATILE;
+                } else {
+                        hdspm->playback_mixer_ctls[i]->vd[0].access =
+                            SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                            SNDRV_CTL_ELEM_ACCESS_VOLATILE;
+                }
+                snd_ctl_notify(hdspm->card, SNDRV_CTL_EVENT_MASK_VALUE |
+                               SNDRV_CTL_EVENT_MASK_INFO,
+                               &hdspm->playback_mixer_ctls[i]->id);
+        }
+
+        return 0;
+}
+
+
+static int snd_hdspm_create_controls(snd_card_t * card, hdspm_t * hdspm)
+{
+        unsigned int idx, limit;
+        int err;
+        snd_kcontrol_t *kctl;
+
+        /* add control list first */
+
+        for (idx = 0; idx < ARRAY_SIZE(snd_hdspm_controls); idx++) {
+                if ((err =
+                     snd_ctl_add(card, kctl =
+                                 snd_ctl_new1(&snd_hdspm_controls[idx],
+                                              hdspm))) < 0) {
+                        return err;
+                }
+        }
+
+        /* Channel playback mixer as default control 
+           Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders, thats to big for any alsamixer 
+           they are accesible via special IOCTL on hwdep
+           and the mixer 2dimensional mixer control */
+
+        snd_hdspm_playback_mixer.name = "Chn";
+        limit = HDSPM_MAX_CHANNELS;
+
+        /* The index values are one greater than the channel ID so that alsamixer
+           will display them correctly. We want to use the index for fast lookup
+           of the relevant channel, but if we use it at all, most ALSA software
+           does the wrong thing with it ...
+         */
+
+        for (idx = 0; idx < limit; ++idx) {
+                snd_hdspm_playback_mixer.index = idx + 1;
+                if ((err = snd_ctl_add(card,
+                                       kctl =
+                                       snd_ctl_new1
+                                       (&snd_hdspm_playback_mixer,
+                                        hdspm)))) {
+                        return err;
+                }
+                hdspm->playback_mixer_ctls[idx] = kctl;
+        }
+
+        return 0;
+}
+
+/*------------------------------------------------------------
+   /proc interface 
+ ------------------------------------------------------------*/
+
+static void
+snd_hdspm_proc_read(snd_info_entry_t * entry, snd_info_buffer_t * buffer)
+{
+        hdspm_t *hdspm = (hdspm_t *) entry->private_data;
+        unsigned int status;
+        unsigned int status2;
+        char *pref_sync_ref;
+        char *autosync_ref;
+        char *system_clock_mode;
+        char *clock_source;
+        char *insel;
+        char *syncref;
+        int x, x2;
+
+        status = hdspm_read(hdspm, HDSPM_statusRegister);
+        status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+
+        snd_iprintf(buffer, "%s (Card #%d) Rev.%x Status2first3bits: %x\n",
+                    hdspm->card_name, hdspm->card->number + 1,
+                    hdspm->firmware_rev,
+                    (status2 & HDSPM_version0) |
+                    (status2 & HDSPM_version1) | (status2 &
+                                                  HDSPM_version2));
+
+        snd_iprintf(buffer, "IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n",
+                    hdspm->irq, hdspm->port, (unsigned long)hdspm->iobase);
+
+        snd_iprintf(buffer, "--- System ---\n");
+
+        snd_iprintf(buffer,
+                    "IRQ Pending: Audio=%d, MIDI0=%d, MIDI1=%d, IRQcount=%d\n",
+                    status & HDSPM_audioIRQPending,
+                    (status & HDSPM_midi0IRQPending) ? 1 : 0,
+                    (status & HDSPM_midi1IRQPending) ? 1 : 0,
+                    hdspm->irq_count);
+        snd_iprintf(buffer,
+                    "HW pointer: id = %d, rawptr = %d (%d->%d) estimated= %ld (bytes)\n",
+                    ((status & HDSPM_BufferID) ? 1 : 0),
+                    (status & HDSPM_BufferPositionMask),
+                    (status & HDSPM_BufferPositionMask) % (2 *
+                                                           (int)hdspm->
+                                                           period_bytes),
+                    ((status & HDSPM_BufferPositionMask) -
+                     64) % (2 * (int)hdspm->period_bytes),
+                    (long) hdspm_hw_pointer(hdspm) * 4);
+
+        snd_iprintf(buffer,
+                    "MIDI FIFO: Out1=0x%x, Out2=0x%x, In1=0x%x, In2=0x%x \n",
+                    hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xFF,
+                    hdspm_read(hdspm, HDSPM_midiStatusOut1) & 0xFF,
+                    hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
+                    hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xFF);
+        snd_iprintf(buffer,
+                    "Register: ctrl1=0x%x, ctrl2=0x%x, status1=0x%x, status2=0x%x\n",
+                    hdspm->control_register, hdspm->control2_register,
+                    status, status2);
+
+        snd_iprintf(buffer, "--- Settings ---\n");
+
+        x = 1 << (6 +
+                  hdspm_decode_latency(hdspm->
+                                       control_register &
+                                       HDSPM_LatencyMask));
+
+        snd_iprintf(buffer,
+                    "Size (Latency): %d samples (2 periods of %lu bytes)\n",
+                    x, (unsigned long) hdspm->period_bytes);
+
+        snd_iprintf(buffer, "Line out: %s,   Precise Pointer: %s\n",
+                    (hdspm->
+                     control_register & HDSPM_LineOut) ? "on " : "off",
+                    (hdspm->precise_ptr) ? "on" : "off");
+
+        switch (hdspm->control_register & HDSPM_InputMask) {
+        case HDSPM_InputOptical:
+                insel = "Optical";
+                break;
+        case HDSPM_InputCoaxial:
+                insel = "Coaxial";
+                break;
+        default:
+                insel = "Unkown";
+        }
+
+        switch (hdspm->control_register & HDSPM_SyncRefMask) {
+        case HDSPM_SyncRef_Word:
+                syncref = "WordClock";
+                break;
+        case HDSPM_SyncRef_MADI:
+                syncref = "MADI";
+                break;
+        default:
+                syncref = "Unkown";
+        }
+        snd_iprintf(buffer, "Inputsel = %s, SyncRef = %s\n", insel,
+                    syncref);
+
+        snd_iprintf(buffer,
+                    "ClearTrackMarker = %s, Transmit in %s Channel Mode, Auto Input %s\n",
+                    (hdspm->
+                     control_register & HDSPM_clr_tms) ? "on" : "off",
+                    (hdspm->
+                     control_register & HDSPM_TX_64ch) ? "64" : "56",
+                    (hdspm->
+                     control_register & HDSPM_AutoInp) ? "on" : "off");
+
+        switch (hdspm_clock_source(hdspm)) {
+        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
+                clock_source = "AutoSync";
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
+                clock_source = "Internal 32 kHz";
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
+                clock_source = "Internal 44.1 kHz";
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
+                clock_source = "Internal 48 kHz";
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
+                clock_source = "Internal 64 kHz";
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
+                clock_source = "Internal 88.2 kHz";
+                break;
+        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
+                clock_source = "Internal 96 kHz";
+                break;
+        default:
+                clock_source = "Error";
+        }
+        snd_iprintf(buffer, "Sample Clock Source: %s\n", clock_source);
+        if (!(hdspm->control_register & HDSPM_ClockModeMaster)) {
+                system_clock_mode = "Slave";
+        } else {
+                system_clock_mode = "Master";
+        }
+        snd_iprintf(buffer, "System Clock Mode: %s\n", system_clock_mode);
+
+        switch (hdspm_pref_sync_ref(hdspm)) {
+        case HDSPM_SYNC_FROM_WORD:
+                pref_sync_ref = "Word Clock";
+                break;
+        case HDSPM_SYNC_FROM_MADI:
+                pref_sync_ref = "MADI Sync";
+                break;
+        default:
+                pref_sync_ref = "XXXX Clock";
+                break;
+        }
+        snd_iprintf(buffer, "Preferred Sync Reference: %s\n",
+                    pref_sync_ref);
+
+        snd_iprintf(buffer, "System Clock Frequency: %d\n",
+                    hdspm->system_sample_rate);
+
+
+        snd_iprintf(buffer, "--- Status:\n");
+
+        x = status & HDSPM_madiSync;
+        x2 = status2 & HDSPM_wcSync;
+
+        snd_iprintf(buffer, "Inputs MADI=%s, WordClock=%s\n",
+                    (status & HDSPM_madiLock) ? (x ? "Sync" : "Lock") :
+                    "NoLock",
+                    (status2 & HDSPM_wcLock) ? (x2 ? "Sync" : "Lock") :
+                    "NoLock");
+
+        switch (hdspm_autosync_ref(hdspm)) {
+        case HDSPM_AUTOSYNC_FROM_WORD:
+                autosync_ref = "Word Clock";
+                break;
+        case HDSPM_AUTOSYNC_FROM_MADI:
+                autosync_ref = "MADI Sync";
+                break;
+        case HDSPM_AUTOSYNC_FROM_NONE:
+                autosync_ref = "Input not valid";
+                break;
+        default:
+                autosync_ref = "---";
+                break;
+        }
+        snd_iprintf(buffer,
+                    "AutoSync: Reference= %s, Freq=%d (MADI = %d, Word = %d)\n",
+                    autosync_ref, hdspm_external_sample_rate(hdspm),
+                    (status & HDSPM_madiFreqMask) >> 22,
+                    (status2 & HDSPM_wcFreqMask) >> 5);
+
+        snd_iprintf(buffer, "Input: %s, Mode=%s\n",
+                    (status & HDSPM_AB_int) ? "Coax" : "Optical",
+                    (status & HDSPM_RX_64ch) ? "64 channels" :
+                    "56 channels");
+
+        snd_iprintf(buffer, "\n");
+}
+
+static void __devinit snd_hdspm_proc_init(hdspm_t * hdspm)
+{
+        snd_info_entry_t *entry;
+
+        if (!snd_card_proc_new(hdspm->card, "hdspm", &entry))
+                snd_info_set_text_ops(entry, hdspm, 1024,
+                                      snd_hdspm_proc_read);
+}
+
+/*------------------------------------------------------------
+   hdspm intitialize 
+ ------------------------------------------------------------*/
+
+static int snd_hdspm_set_defaults(hdspm_t * hdspm)
+{
+        unsigned int i;
+
+        /* ASSUMPTION: hdspm->lock is either held, or there is no need to
+           hold it (e.g. during module initalization).
+         */
+
+        /* set defaults:       */
+
+        hdspm->control_register = HDSPM_ClockModeMaster |       /* Master Cloack Mode on */
+            hdspm_encode_latency(7) |   /* latency maximum = 8192 samples */
+            HDSPM_InputCoaxial |        /* Input Coax not Optical */
+            HDSPM_SyncRef_MADI |        /* Madi is syncclock */
+            HDSPM_LineOut |     /* Analog output in */
+            HDSPM_TX_64ch |     /* transmit in 64ch mode */
+            HDSPM_AutoInp;      /* AutoInput chossing (takeover) */
+
+        /* ! HDSPM_Frequency0|HDSPM_Frequency1 = 44.1khz */
+        /* !  HDSPM_DoubleSpeed HDSPM_QuadSpeed = normal speed */
+        /* ! HDSPM_clr_tms = do not clear bits in track marks */
+
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+#ifdef SNDRV_BIG_ENDIAN
+        hdspm->control2_register = HDSPM_BIGENDIAN_MODE;
+#else
+        hdspm->control2_register = 0;
+#endif
+
+        hdspm_write(hdspm, HDSPM_control2Reg, hdspm->control2_register);
+        hdspm_compute_period_size(hdspm);
+
+        /* silence everything */
+
+        all_in_all_mixer(hdspm, 0 * UNITY_GAIN);
+
+        if (line_outs_monitor[hdspm->dev]) {
+
+                snd_printk(KERN_INFO "HDSPM: sending all playback streams to line outs.\n");
+
+                for (i = 0; i < HDSPM_MIXER_CHANNELS; i++) {
+                        if (hdspm_write_pb_gain(hdspm, i, i, UNITY_GAIN))
+                                return -EIO;
+                }
+        }
+
+        /* set a default rate so that the channel map is set up. */
+        hdspm->channel_map = channel_map_madi_ss;
+        hdspm_set_rate(hdspm, 44100, 1);
+
+        return 0;
+}
+
+
+/*------------------------------------------------------------
+   interupt 
+ ------------------------------------------------------------*/
+
+static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id,
+                                       struct pt_regs *regs)
+{
+        hdspm_t *hdspm = (hdspm_t *) dev_id;
+        unsigned int status;
+        int audio;
+        int midi0;
+        int midi1;
+        unsigned int midi0status;
+        unsigned int midi1status;
+        int schedule = 0;
+
+        status = hdspm_read(hdspm, HDSPM_statusRegister);
+
+        audio = status & HDSPM_audioIRQPending;
+        midi0 = status & HDSPM_midi0IRQPending;
+        midi1 = status & HDSPM_midi1IRQPending;
+
+        if (!audio && !midi0 && !midi1)
+                return IRQ_NONE;
+
+        hdspm_write(hdspm, HDSPM_interruptConfirmation, 0);
+        hdspm->irq_count++;
+
+        midi0status = hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xff;
+        midi1status = hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xff;
+
+        if (audio) {
+
+                if (hdspm->capture_substream)
+                        snd_pcm_period_elapsed(hdspm->pcm->
+                                               streams
+                                               [SNDRV_PCM_STREAM_CAPTURE].
+                                               substream);
+
+                if (hdspm->playback_substream)
+                        snd_pcm_period_elapsed(hdspm->pcm->
+                                               streams
+                                               [SNDRV_PCM_STREAM_PLAYBACK].
+                                               substream);
+        }
+
+        if (midi0 && midi0status) {
+                /* we disable interrupts for this input until processing is done */
+                hdspm->control_register &= ~HDSPM_Midi0InterruptEnable;
+                hdspm_write(hdspm, HDSPM_controlRegister,
+                            hdspm->control_register);
+                hdspm->midi[0].pending = 1;
+                schedule = 1;
+        }
+        if (midi1 && midi1status) {
+                /* we disable interrupts for this input until processing is done */
+                hdspm->control_register &= ~HDSPM_Midi1InterruptEnable;
+                hdspm_write(hdspm, HDSPM_controlRegister,
+                            hdspm->control_register);
+                hdspm->midi[1].pending = 1;
+                schedule = 1;
+        }
+        if (schedule)
+                tasklet_hi_schedule(&hdspm->midi_tasklet);
+        return IRQ_HANDLED;
+}
+
+/*------------------------------------------------------------
+   pcm interface 
+  ------------------------------------------------------------*/
+
+
+static snd_pcm_uframes_t snd_hdspm_hw_pointer(snd_pcm_substream_t *
+                                              substream)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        return hdspm_hw_pointer(hdspm);
+}
+
+static char *hdspm_channel_buffer_location(hdspm_t * hdspm,
+                                           int stream, int channel)
+{
+        int mapped_channel;
+
+        snd_assert(channel >= 0
+                   || channel < HDSPM_MAX_CHANNELS, return NULL);
+
+        if ((mapped_channel = hdspm->channel_map[channel]) < 0)
+                return NULL;
+
+        if (stream == SNDRV_PCM_STREAM_CAPTURE) {
+                return hdspm->capture_buffer +
+                    mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
+        } else {
+                return hdspm->playback_buffer +
+                    mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
+        }
+}
+
+
+/* dont know why need it ??? */
+static int snd_hdspm_playback_copy(snd_pcm_substream_t * substream,
+                                   int channel, snd_pcm_uframes_t pos,
+                                   void __user *src, snd_pcm_uframes_t count)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        char *channel_buf;
+
+        snd_assert(pos + count <= HDSPM_CHANNEL_BUFFER_BYTES / 4,
+                   return -EINVAL);
+
+        channel_buf = hdspm_channel_buffer_location(hdspm,
+                                                    substream->pstr->
+                                                    stream, channel);
+
+        snd_assert(channel_buf != NULL, return -EIO);
+
+        return copy_from_user(channel_buf + pos * 4, src, count * 4);
+}
+
+static int snd_hdspm_capture_copy(snd_pcm_substream_t * substream,
+                                  int channel, snd_pcm_uframes_t pos,
+                                  void __user *dst, snd_pcm_uframes_t count)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        char *channel_buf;
+
+        snd_assert(pos + count <= HDSPM_CHANNEL_BUFFER_BYTES / 4,
+                   return -EINVAL);
+
+        channel_buf = hdspm_channel_buffer_location(hdspm,
+                                                    substream->pstr->
+                                                    stream, channel);
+        snd_assert(channel_buf != NULL, return -EIO);
+        return copy_to_user(dst, channel_buf + pos * 4, count * 4);
+}
+
+static int snd_hdspm_hw_silence(snd_pcm_substream_t * substream,
+                                int channel, snd_pcm_uframes_t pos,
+                                snd_pcm_uframes_t count)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        char *channel_buf;
+
+        channel_buf =
+            hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
+                                          channel);
+        snd_assert(channel_buf != NULL, return -EIO);
+        memset(channel_buf + pos * 4, 0, count * 4);
+        return 0;
+}
+
+static int snd_hdspm_reset(snd_pcm_substream_t * substream)
+{
+        snd_pcm_runtime_t *runtime = substream->runtime;
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        snd_pcm_substream_t *other;
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                other = hdspm->capture_substream;
+        else
+                other = hdspm->playback_substream;
+
+        if (hdspm->running)
+                runtime->status->hw_ptr = hdspm_hw_pointer(hdspm);
+        else
+                runtime->status->hw_ptr = 0;
+        if (other) {
+                struct list_head *pos;
+                snd_pcm_substream_t *s;
+                snd_pcm_runtime_t *oruntime = other->runtime;
+                snd_pcm_group_for_each(pos, substream) {
+                        s = snd_pcm_group_substream_entry(pos);
+                        if (s == other) {
+                                oruntime->status->hw_ptr =
+                                    runtime->status->hw_ptr;
+                                break;
+                        }
+                }
+        }
+        return 0;
+}
+
+static int snd_hdspm_hw_params(snd_pcm_substream_t * substream,
+                               snd_pcm_hw_params_t * params)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        int err;
+        int i;
+        pid_t this_pid;
+        pid_t other_pid;
+        struct snd_sg_buf *sgbuf;
+
+
+        spin_lock_irq(&hdspm->lock);
+
+        if (substream->pstr->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                this_pid = hdspm->playback_pid;
+                other_pid = hdspm->capture_pid;
+        } else {
+                this_pid = hdspm->capture_pid;
+                other_pid = hdspm->playback_pid;
+        }
+
+        if ((other_pid > 0) && (this_pid != other_pid)) {
+
+                /* The other stream is open, and not by the same
+                   task as this one. Make sure that the parameters
+                   that matter are the same.
+                 */
+
+                if (params_rate(params) != hdspm->system_sample_rate) {
+                        spin_unlock_irq(&hdspm->lock);
+                        _snd_pcm_hw_param_setempty(params,
+                                                   SNDRV_PCM_HW_PARAM_RATE);
+                        return -EBUSY;
+                }
+
+                if (params_period_size(params) != hdspm->period_bytes / 4) {
+                        spin_unlock_irq(&hdspm->lock);
+                        _snd_pcm_hw_param_setempty(params,
+                                                   SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+                        return -EBUSY;
+                }
+
+        }
+        /* We're fine. */
+        spin_unlock_irq(&hdspm->lock);
+
+        /* how to make sure that the rate matches an externally-set one ?   */
+
+        spin_lock_irq(&hdspm->lock);
+        if ((err = hdspm_set_rate(hdspm, params_rate(params), 0)) < 0) {
+                spin_unlock_irq(&hdspm->lock);
+                _snd_pcm_hw_param_setempty(params,
+                                           SNDRV_PCM_HW_PARAM_RATE);
+                return err;
+        }
+        spin_unlock_irq(&hdspm->lock);
+
+        if ((err =
+             hdspm_set_interrupt_interval(hdspm,
+                                          params_period_size(params))) <
+            0) {
+                _snd_pcm_hw_param_setempty(params,
+                                           SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+                return err;
+        }
+
+        /* Memory allocation, takashi's method, dont know if we should spinlock  */
+        /* malloc all buffer even if not enabled to get sure */
+        /* malloc only needed bytes */
+        err =
+            snd_pcm_lib_malloc_pages(substream,
+                                     HDSPM_CHANNEL_BUFFER_BYTES *
+                                     params_channels(params));
+        if (err < 0)
+                return err;
+
+        sgbuf = snd_pcm_substream_sgbuf(substream);
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+
+                hdspm_set_sgbuf(hdspm, sgbuf, HDSPM_pageAddressBufferOut,
+                                params_channels(params));
+
+                for (i = 0; i < params_channels(params); ++i)
+                        snd_hdspm_enable_out(hdspm, i, 1);
+
+                hdspm->playback_buffer =
+                    (unsigned char *) substream->runtime->dma_area;
+        } else {
+                hdspm_set_sgbuf(hdspm, sgbuf, HDSPM_pageAddressBufferIn,
+                                params_channels(params));
+
+                for (i = 0; i < params_channels(params); ++i)
+                        snd_hdspm_enable_in(hdspm, i, 1);
+
+                hdspm->capture_buffer =
+                    (unsigned char *) substream->runtime->dma_area;
+        }
+        return 0;
+}
+
+static int snd_hdspm_hw_free(snd_pcm_substream_t * substream)
+{
+        int i;
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+
+                /* params_channels(params) should be enough, 
+                   but to get sure in case of error */
+                for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
+                        snd_hdspm_enable_out(hdspm, i, 0);
+
+                hdspm->playback_buffer = NULL;
+        } else {
+                for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
+                        snd_hdspm_enable_in(hdspm, i, 0);
+
+                hdspm->capture_buffer = NULL;
+
+        }
+
+        snd_pcm_lib_free_pages(substream);
+
+        return 0;
+}
+
+static int snd_hdspm_channel_info(snd_pcm_substream_t * substream,
+                                  snd_pcm_channel_info_t * info)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        int mapped_channel;
+
+        snd_assert(info->channel < HDSPM_MAX_CHANNELS, return -EINVAL);
+
+        if ((mapped_channel = hdspm->channel_map[info->channel]) < 0)
+                return -EINVAL;
+
+        info->offset = mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
+        info->first = 0;
+        info->step = 32;
+        return 0;
+}
+
+static int snd_hdspm_ioctl(snd_pcm_substream_t * substream,
+                           unsigned int cmd, void *arg)
+{
+        switch (cmd) {
+        case SNDRV_PCM_IOCTL1_RESET:
+                {
+                        return snd_hdspm_reset(substream);
+                }
+
+        case SNDRV_PCM_IOCTL1_CHANNEL_INFO:
+                {
+                        snd_pcm_channel_info_t *info = arg;
+                        return snd_hdspm_channel_info(substream, info);
+                }
+        default:
+                break;
+        }
+
+        return snd_pcm_lib_ioctl(substream, cmd, arg);
+}
+
+static int snd_hdspm_trigger(snd_pcm_substream_t * substream, int cmd)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        snd_pcm_substream_t *other;
+        int running;
+
+        spin_lock(&hdspm->lock);
+        running = hdspm->running;
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+                running |= 1 << substream->stream;
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+                running &= ~(1 << substream->stream);
+                break;
+        default:
+                snd_BUG();
+                spin_unlock(&hdspm->lock);
+                return -EINVAL;
+        }
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                other = hdspm->capture_substream;
+        else
+                other = hdspm->playback_substream;
+
+        if (other) {
+                struct list_head *pos;
+                snd_pcm_substream_t *s;
+                snd_pcm_group_for_each(pos, substream) {
+                        s = snd_pcm_group_substream_entry(pos);
+                        if (s == other) {
+                                snd_pcm_trigger_done(s, substream);
+                                if (cmd == SNDRV_PCM_TRIGGER_START)
+                                        running |= 1 << s->stream;
+                                else
+                                        running &= ~(1 << s->stream);
+                                goto _ok;
+                        }
+                }
+                if (cmd == SNDRV_PCM_TRIGGER_START) {
+                        if (!(running & (1 << SNDRV_PCM_STREAM_PLAYBACK))
+                            && substream->stream ==
+                            SNDRV_PCM_STREAM_CAPTURE)
+                                hdspm_silence_playback(hdspm);
+                } else {
+                        if (running &&
+                            substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                                hdspm_silence_playback(hdspm);
+                }
+        } else {
+                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+                        hdspm_silence_playback(hdspm);
+        }
+      _ok:
+        snd_pcm_trigger_done(substream, substream);
+        if (!hdspm->running && running)
+                hdspm_start_audio(hdspm);
+        else if (hdspm->running && !running)
+                hdspm_stop_audio(hdspm);
+        hdspm->running = running;
+        spin_unlock(&hdspm->lock);
+
+        return 0;
+}
+
+static int snd_hdspm_prepare(snd_pcm_substream_t * substream)
+{
+        return 0;
+}
+
+static unsigned int period_sizes[] =
+    { 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
+
+static snd_pcm_hardware_t snd_hdspm_playback_subinfo = {
+        .info = (SNDRV_PCM_INFO_MMAP |
+                 SNDRV_PCM_INFO_MMAP_VALID |
+                 SNDRV_PCM_INFO_NONINTERLEAVED |
+                 SNDRV_PCM_INFO_SYNC_START | SNDRV_PCM_INFO_DOUBLE),
+        .formats = SNDRV_PCM_FMTBIT_S32_LE,
+        .rates = (SNDRV_PCM_RATE_32000 |
+                  SNDRV_PCM_RATE_44100 |
+                  SNDRV_PCM_RATE_48000 |
+                  SNDRV_PCM_RATE_64000 |
+                  SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000),
+        .rate_min = 32000,
+        .rate_max = 96000,
+        .channels_min = 1,
+        .channels_max = HDSPM_MAX_CHANNELS,
+        .buffer_bytes_max =
+            HDSPM_CHANNEL_BUFFER_BYTES * HDSPM_MAX_CHANNELS,
+        .period_bytes_min = (64 * 4),
+        .period_bytes_max = (8192 * 4) * HDSPM_MAX_CHANNELS,
+        .periods_min = 2,
+        .periods_max = 2,
+        .fifo_size = 0
+};
+
+static snd_pcm_hardware_t snd_hdspm_capture_subinfo = {
+        .info = (SNDRV_PCM_INFO_MMAP |
+                 SNDRV_PCM_INFO_MMAP_VALID |
+                 SNDRV_PCM_INFO_NONINTERLEAVED |
+                 SNDRV_PCM_INFO_SYNC_START),
+        .formats = SNDRV_PCM_FMTBIT_S32_LE,
+        .rates = (SNDRV_PCM_RATE_32000 |
+                  SNDRV_PCM_RATE_44100 |
+                  SNDRV_PCM_RATE_48000 |
+                  SNDRV_PCM_RATE_64000 |
+                  SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000),
+        .rate_min = 32000,
+        .rate_max = 96000,
+        .channels_min = 1,
+        .channels_max = HDSPM_MAX_CHANNELS,
+        .buffer_bytes_max =
+            HDSPM_CHANNEL_BUFFER_BYTES * HDSPM_MAX_CHANNELS,
+        .period_bytes_min = (64 * 4),
+        .period_bytes_max = (8192 * 4) * HDSPM_MAX_CHANNELS,
+        .periods_min = 2,
+        .periods_max = 2,
+        .fifo_size = 0
+};
+
+static snd_pcm_hw_constraint_list_t hw_constraints_period_sizes = {
+        .count = ARRAY_SIZE(period_sizes),
+        .list = period_sizes,
+        .mask = 0
+};
+
+
+static int snd_hdspm_hw_rule_channels_rate(snd_pcm_hw_params_t * params,
+                                           snd_pcm_hw_rule_t * rule)
+{
+        hdspm_t *hdspm = rule->private;
+        snd_interval_t *c =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+        snd_interval_t *r =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+
+        if (r->min > 48000) {
+                snd_interval_t t = {
+                        .min = 1,
+                        .max = hdspm->ds_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        } else if (r->max < 64000) {
+                snd_interval_t t = {
+                        .min = 1,
+                        .max = hdspm->ss_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        }
+        return 0;
+}
+
+static int snd_hdspm_hw_rule_rate_channels(snd_pcm_hw_params_t * params,
+                                           snd_pcm_hw_rule_t * rule)
+{
+        hdspm_t *hdspm = rule->private;
+        snd_interval_t *c =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+        snd_interval_t *r =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+
+        if (c->min <= hdspm->ss_channels) {
+                snd_interval_t t = {
+                        .min = 32000,
+                        .max = 48000,
+                        .integer = 1,
+                };
+                return snd_interval_refine(r, &t);
+        } else if (c->max > hdspm->ss_channels) {
+                snd_interval_t t = {
+                        .min = 64000,
+                        .max = 96000,
+                        .integer = 1,
+                };
+
+                return snd_interval_refine(r, &t);
+        }
+        return 0;
+}
+
+static int snd_hdspm_playback_open(snd_pcm_substream_t * substream)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        snd_pcm_runtime_t *runtime = substream->runtime;
+
+        snd_printdd("Open device substream %d\n", substream->stream);
+
+        spin_lock_irq(&hdspm->lock);
+
+        snd_pcm_set_sync(substream);
+
+        runtime->hw = snd_hdspm_playback_subinfo;
+
+        if (hdspm->capture_substream == NULL)
+                hdspm_stop_audio(hdspm);
+
+        hdspm->playback_pid = current->pid;
+        hdspm->playback_substream = substream;
+
+        spin_unlock_irq(&hdspm->lock);
+
+        snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
+
+        snd_pcm_hw_constraint_list(runtime, 0,
+                                   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                   &hw_constraints_period_sizes);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                            snd_hdspm_hw_rule_channels_rate, hdspm,
+                            SNDRV_PCM_HW_PARAM_RATE, -1);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                            snd_hdspm_hw_rule_rate_channels, hdspm,
+                            SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+
+        return 0;
+}
+
+static int snd_hdspm_playback_release(snd_pcm_substream_t * substream)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+
+        spin_lock_irq(&hdspm->lock);
+
+        hdspm->playback_pid = -1;
+        hdspm->playback_substream = NULL;
+
+        spin_unlock_irq(&hdspm->lock);
+
+        return 0;
+}
+
+
+static int snd_hdspm_capture_open(snd_pcm_substream_t * substream)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+        snd_pcm_runtime_t *runtime = substream->runtime;
+
+        spin_lock_irq(&hdspm->lock);
+        snd_pcm_set_sync(substream);
+        runtime->hw = snd_hdspm_capture_subinfo;
+
+        if (hdspm->playback_substream == NULL)
+                hdspm_stop_audio(hdspm);
+
+        hdspm->capture_pid = current->pid;
+        hdspm->capture_substream = substream;
+
+        spin_unlock_irq(&hdspm->lock);
+
+        snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
+        snd_pcm_hw_constraint_list(runtime, 0,
+                                   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                   &hw_constraints_period_sizes);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                            snd_hdspm_hw_rule_channels_rate, hdspm,
+                            SNDRV_PCM_HW_PARAM_RATE, -1);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                            snd_hdspm_hw_rule_rate_channels, hdspm,
+                            SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+        return 0;
+}
+
+static int snd_hdspm_capture_release(snd_pcm_substream_t * substream)
+{
+        hdspm_t *hdspm = snd_pcm_substream_chip(substream);
+
+        spin_lock_irq(&hdspm->lock);
+
+        hdspm->capture_pid = -1;
+        hdspm->capture_substream = NULL;
+
+        spin_unlock_irq(&hdspm->lock);
+        return 0;
+}
+
+static int snd_hdspm_hwdep_dummy_op(snd_hwdep_t * hw, struct file *file)
+{
+        /* we have nothing to initialize but the call is required */
+        return 0;
+}
+
+
+static int snd_hdspm_hwdep_ioctl(snd_hwdep_t * hw, struct file *file,
+                                 unsigned int cmd, unsigned long arg)
+{
+        hdspm_t *hdspm = (hdspm_t *) hw->private_data;
+        struct sndrv_hdspm_mixer_ioctl mixer;
+        hdspm_config_info_t info;
+        hdspm_version_t hdspm_version;
+        struct sndrv_hdspm_peak_rms_ioctl rms;
+
+        switch (cmd) {
+
+                
+        case SNDRV_HDSPM_IOCTL_GET_PEAK_RMS:
+                if (copy_from_user(&rms, (void __user *)arg, sizeof(rms)))
+                        return -EFAULT;
+                /* maybe there is a chance to memorymap in future so dont touch just copy */
+                if(copy_to_user_fromio((void __user *)rms.peak,
+                                       hdspm->iobase+HDSPM_MADI_peakrmsbase,
+                                       sizeof(hdspm_peak_rms_t)) != 0 )
+                        return -EFAULT;
+
+                break;
+                
+
+        case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO:
+
+                spin_lock_irq(&hdspm->lock);
+                info.pref_sync_ref =
+                    (unsigned char) hdspm_pref_sync_ref(hdspm);
+                info.wordclock_sync_check =
+                    (unsigned char) hdspm_wc_sync_check(hdspm);
+
+                info.system_sample_rate = hdspm->system_sample_rate;
+                info.autosync_sample_rate =
+                    hdspm_external_sample_rate(hdspm);
+                info.system_clock_mode =
+                    (unsigned char) hdspm_system_clock_mode(hdspm);
+                info.clock_source =
+                    (unsigned char) hdspm_clock_source(hdspm);
+                info.autosync_ref =
+                    (unsigned char) hdspm_autosync_ref(hdspm);
+                info.line_out = (unsigned char) hdspm_line_out(hdspm);
+                info.passthru = 0;
+                spin_unlock_irq(&hdspm->lock);
+                if (copy_to_user((void __user *) arg, &info, sizeof(info)))
+                        return -EFAULT;
+                break;
+
+        case SNDRV_HDSPM_IOCTL_GET_VERSION:
+                hdspm_version.firmware_rev = hdspm->firmware_rev;
+                if (copy_to_user((void __user *) arg, &hdspm_version,
+                                 sizeof(hdspm_version)))
+                        return -EFAULT;
+                break;
+
+        case SNDRV_HDSPM_IOCTL_GET_MIXER:
+                if (copy_from_user(&mixer, (void __user *)arg, sizeof(mixer)))
+                        return -EFAULT;
+                if (copy_to_user
+                    ((void __user *)mixer.mixer, hdspm->mixer, sizeof(hdspm_mixer_t)))
+                        return -EFAULT;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static snd_pcm_ops_t snd_hdspm_playback_ops = {
+        .open = snd_hdspm_playback_open,
+        .close = snd_hdspm_playback_release,
+        .ioctl = snd_hdspm_ioctl,
+        .hw_params = snd_hdspm_hw_params,
+        .hw_free = snd_hdspm_hw_free,
+        .prepare = snd_hdspm_prepare,
+        .trigger = snd_hdspm_trigger,
+        .pointer = snd_hdspm_hw_pointer,
+        .copy = snd_hdspm_playback_copy,
+        .silence = snd_hdspm_hw_silence,
+        .page = snd_pcm_sgbuf_ops_page,
+};
+
+static snd_pcm_ops_t snd_hdspm_capture_ops = {
+        .open = snd_hdspm_capture_open,
+        .close = snd_hdspm_capture_release,
+        .ioctl = snd_hdspm_ioctl,
+        .hw_params = snd_hdspm_hw_params,
+        .hw_free = snd_hdspm_hw_free,
+        .prepare = snd_hdspm_prepare,
+        .trigger = snd_hdspm_trigger,
+        .pointer = snd_hdspm_hw_pointer,
+        .copy = snd_hdspm_capture_copy,
+        .page = snd_pcm_sgbuf_ops_page,
+};
+
+static int __devinit snd_hdspm_create_hwdep(snd_card_t * card,
+                                            hdspm_t * hdspm)
+{
+        snd_hwdep_t *hw;
+        int err;
+
+        if ((err = snd_hwdep_new(card, "HDSPM hwdep", 0, &hw)) < 0)
+                return err;
+
+        hdspm->hwdep = hw;
+        hw->private_data = hdspm;
+        strcpy(hw->name, "HDSPM hwdep interface");
+
+        hw->ops.open = snd_hdspm_hwdep_dummy_op;
+        hw->ops.ioctl = snd_hdspm_hwdep_ioctl;
+        hw->ops.release = snd_hdspm_hwdep_dummy_op;
+
+        return 0;
+}
+
+
+/*------------------------------------------------------------
+   memory interface 
+ ------------------------------------------------------------*/
+static int __devinit snd_hdspm_preallocate_memory(hdspm_t * hdspm)
+{
+        int err;
+        snd_pcm_t *pcm;
+        size_t wanted;
+
+        pcm = hdspm->pcm;
+
+        wanted = HDSPM_DMA_AREA_BYTES + 4096;   /* dont know why, but it works */
+
+        if ((err =
+             snd_pcm_lib_preallocate_pages_for_all(pcm,
+                                                   SNDRV_DMA_TYPE_DEV_SG,
+                                                   snd_dma_pci_data(hdspm->pci),
+                                                   wanted,
+                                                   wanted)) < 0) {
+                snd_printdd("Could not preallocate %d  Bytes\n", wanted);
+
+                return err;
+        } else
+                snd_printdd(" Preallocated %d  Bytes\n", wanted);
+
+        return 0;
+}
+
+static int snd_hdspm_memory_free(hdspm_t * hdspm)
+{
+        snd_printdd("memory_free_for_all %p\n", hdspm->pcm);
+
+        snd_pcm_lib_preallocate_free_for_all(hdspm->pcm);
+        return 0;
+}
+
+
+static void hdspm_set_sgbuf(hdspm_t * hdspm, struct snd_sg_buf *sgbuf,
+                             unsigned int reg, int channels)
+{
+        int i;
+        for (i = 0; i < (channels * 16); i++)
+                hdspm_write(hdspm, reg + 4 * i,
+                            snd_pcm_sgbuf_get_addr(sgbuf,
+                                                   (size_t) 4096 * i));
+}
+
+/* ------------- ALSA Devices ---------------------------- */
+static int __devinit snd_hdspm_create_pcm(snd_card_t * card,
+                                          hdspm_t * hdspm)
+{
+        snd_pcm_t *pcm;
+        int err;
+
+        if ((err = snd_pcm_new(card, hdspm->card_name, 0, 1, 1, &pcm)) < 0)
+                return err;
+
+        hdspm->pcm = pcm;
+        pcm->private_data = hdspm;
+        strcpy(pcm->name, hdspm->card_name);
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+                        &snd_hdspm_playback_ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+                        &snd_hdspm_capture_ops);
+
+        pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
+
+        if ((err = snd_hdspm_preallocate_memory(hdspm)) < 0)
+                return err;
+
+        return 0;
+}
+
+static inline void snd_hdspm_initialize_midi_flush(hdspm_t * hdspm)
+{
+        snd_hdspm_flush_midi_input(hdspm, 0);
+        snd_hdspm_flush_midi_input(hdspm, 1);
+}
+
+static int __devinit snd_hdspm_create_alsa_devices(snd_card_t * card,
+                                                   hdspm_t * hdspm)
+{
+        int err;
+
+        snd_printdd("Create card...\n");
+        if ((err = snd_hdspm_create_pcm(card, hdspm)) < 0)
+                return err;
+
+        if ((err = snd_hdspm_create_midi(card, hdspm, 0)) < 0)
+                return err;
+
+        if ((err = snd_hdspm_create_midi(card, hdspm, 1)) < 0)
+                return err;
+
+        if ((err = snd_hdspm_create_controls(card, hdspm)) < 0)
+                return err;
+
+        if ((err = snd_hdspm_create_hwdep(card, hdspm)) < 0)
+                return err;
+
+        snd_printdd("proc init...\n");
+        snd_hdspm_proc_init(hdspm);
+
+        hdspm->system_sample_rate = -1;
+        hdspm->last_external_sample_rate = -1;
+        hdspm->last_internal_sample_rate = -1;
+        hdspm->playback_pid = -1;
+        hdspm->capture_pid = -1;
+        hdspm->capture_substream = NULL;
+        hdspm->playback_substream = NULL;
+
+        snd_printdd("Set defaults...\n");
+        if ((err = snd_hdspm_set_defaults(hdspm)) < 0)
+                return err;
+
+        snd_printdd("Update mixer controls...\n");
+        hdspm_update_simple_mixer_controls(hdspm);
+
+        snd_printdd("Initializeing complete ???\n");
+
+        if ((err = snd_card_register(card)) < 0) {
+                snd_printk(KERN_ERR "HDSPM: error registering card\n");
+                return err;
+        }
+
+        snd_printdd("... yes now\n");
+
+        return 0;
+}
+
+static int __devinit snd_hdspm_create(snd_card_t * card, hdspm_t * hdspm,
+                                      int precise_ptr, int enable_monitor)
+{
+        struct pci_dev *pci = hdspm->pci;
+        int err;
+        int i;
+
+        unsigned long io_extent;
+
+        hdspm->irq = -1;
+        hdspm->irq_count = 0;
+
+        hdspm->midi[0].rmidi = NULL;
+        hdspm->midi[1].rmidi = NULL;
+        hdspm->midi[0].input = NULL;
+        hdspm->midi[1].input = NULL;
+        hdspm->midi[0].output = NULL;
+        hdspm->midi[1].output = NULL;
+        spin_lock_init(&hdspm->midi[0].lock);
+        spin_lock_init(&hdspm->midi[1].lock);
+        hdspm->iobase = NULL;
+        hdspm->control_register = 0;
+        hdspm->control2_register = 0;
+
+        hdspm->playback_buffer = NULL;
+        hdspm->capture_buffer = NULL;
+
+        for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
+                hdspm->playback_mixer_ctls[i] = NULL;
+        hdspm->mixer = NULL;
+
+        hdspm->card = card;
+
+        spin_lock_init(&hdspm->lock);
+
+        tasklet_init(&hdspm->midi_tasklet,
+                     hdspm_midi_tasklet, (unsigned long) hdspm);
+
+        pci_read_config_word(hdspm->pci,
+                             PCI_CLASS_REVISION, &hdspm->firmware_rev);
+
+        strcpy(card->driver, "HDSPM");
+        strcpy(card->mixername, "Xilinx FPGA");
+        hdspm->card_name = "RME HDSPM MADI";
+
+        if ((err = pci_enable_device(pci)) < 0)
+                return err;
+
+        pci_set_master(hdspm->pci);
+
+        if ((err = pci_request_regions(pci, "hdspm")) < 0)
+                return err;
+
+        hdspm->port = pci_resource_start(pci, 0);
+        io_extent = pci_resource_len(pci, 0);
+
+        snd_printdd("grabbed memory region 0x%lx-0x%lx\n",
+                   hdspm->port, hdspm->port + io_extent - 1);
+
+
+        if ((hdspm->iobase = ioremap_nocache(hdspm->port, io_extent)) == NULL) {
+                snd_printk(KERN_ERR "HDSPM: unable to remap region 0x%lx-0x%lx\n",
+                           hdspm->port, hdspm->port + io_extent - 1);
+                return -EBUSY;
+        }
+        snd_printdd("remapped region (0x%lx) 0x%lx-0x%lx\n",
+                   (unsigned long)hdspm->iobase, hdspm->port,
+                   hdspm->port + io_extent - 1);
+
+        if (request_irq(pci->irq, snd_hdspm_interrupt,
+                        SA_INTERRUPT | SA_SHIRQ, "hdspm",
+                        (void *) hdspm)) {
+                snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
+                return -EBUSY;
+        }
+
+        snd_printdd("use IRQ %d\n", pci->irq);
+
+        hdspm->irq = pci->irq;
+        hdspm->precise_ptr = precise_ptr;
+
+        hdspm->monitor_outs = enable_monitor;
+
+        snd_printdd("kmalloc Mixer memory of %d Bytes\n",
+                   sizeof(hdspm_mixer_t));
+        if ((hdspm->mixer =
+             (hdspm_mixer_t *) kmalloc(sizeof(hdspm_mixer_t), GFP_KERNEL))
+            == NULL) {
+                snd_printk(KERN_ERR "HDSPM: unable to kmalloc Mixer memory of %d Bytes\n",
+                           (int)sizeof(hdspm_mixer_t));
+                return err;
+        }
+
+        hdspm->ss_channels = MADI_SS_CHANNELS;
+        hdspm->ds_channels = MADI_DS_CHANNELS;
+        hdspm->qs_channels = MADI_QS_CHANNELS;
+
+        snd_printdd("create alsa devices.\n");
+        if ((err = snd_hdspm_create_alsa_devices(card, hdspm)) < 0)
+                return err;
+
+        snd_hdspm_initialize_midi_flush(hdspm);
+
+        return 0;
+}
+
+static int snd_hdspm_free(hdspm_t * hdspm)
+{
+
+        if (hdspm->port) {
+
+                /* stop th audio, and cancel all interrupts */
+                hdspm->control_register &=
+                    ~(HDSPM_Start | HDSPM_AudioInterruptEnable
+                      | HDSPM_Midi0InterruptEnable |
+                      HDSPM_Midi1InterruptEnable);
+                hdspm_write(hdspm, HDSPM_controlRegister,
+                            hdspm->control_register);
+        }
+
+        if (hdspm->irq >= 0)
+                free_irq(hdspm->irq, (void *) hdspm);
+
+
+        if (hdspm->mixer)
+                kfree(hdspm->mixer);
+
+        if (hdspm->iobase)
+                iounmap(hdspm->iobase);
+
+        snd_hdspm_memory_free(hdspm);
+
+        if (hdspm->port)
+                pci_release_regions(hdspm->pci);
+
+        pci_disable_device(hdspm->pci);
+        return 0;
+}
+
+static void snd_hdspm_card_free(snd_card_t * card)
+{
+        hdspm_t *hdspm = (hdspm_t *) card->private_data;
+
+        if (hdspm)
+                snd_hdspm_free(hdspm);
+}
+
+static int __devinit snd_hdspm_probe(struct pci_dev *pci,
+                                     const struct pci_device_id *pci_id)
+{
+        static int dev;
+        hdspm_t *hdspm;
+        snd_card_t *card;
+        int err;
+
+        if (dev >= SNDRV_CARDS)
+                return -ENODEV;
+        if (!enable[dev]) {
+                dev++;
+                return -ENOENT;
+        }
+
+        if (!(card = snd_card_new(index[dev], id[dev],
+                                  THIS_MODULE, sizeof(hdspm_t))))
+                return -ENOMEM;
+
+        hdspm = (hdspm_t *) card->private_data;
+        card->private_free = snd_hdspm_card_free;
+        hdspm->dev = dev;
+        hdspm->pci = pci;
+
+        if ((err =
+             snd_hdspm_create(card, hdspm, precise_ptr[dev],
+                              enable_monitor[dev])) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+
+        strcpy(card->shortname, "HDSPM MADI");
+        sprintf(card->longname, "%s at 0x%lx, irq %d", hdspm->card_name,
+                hdspm->port, hdspm->irq);
+
+        if ((err = snd_card_register(card)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+
+        pci_set_drvdata(pci, card);
+
+        dev++;
+        return 0;
+}
+
+static void __devexit snd_hdspm_remove(struct pci_dev *pci)
+{
+        snd_card_free(pci_get_drvdata(pci));
+        pci_set_drvdata(pci, NULL);
+}
+
+static struct pci_driver driver = {
+        .name = "RME Hammerfall DSP MADI",
+        .id_table = snd_hdspm_ids,
+        .probe = snd_hdspm_probe,
+        .remove = __devexit_p(snd_hdspm_remove),
+};
+
+
+static int __init alsa_card_hdspm_init(void)
+{
+        return pci_register_driver(&driver);
+}
+
+static void __exit alsa_card_hdspm_exit(void)
+{
+        pci_unregister_driver(&driver);
+}
+
+module_init(alsa_card_hdspm_init)
+module_exit(alsa_card_hdspm_exit)
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 69cd81eaa111..f3037402d58f 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -303,18 +303,22 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer
 {
         dmab->dev.type = SNDRV_DMA_TYPE_DEV;
         dmab->dev.dev = snd_dma_pci_data(pci);
-        if (! snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
-                if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                                        size, dmab) < 0)
-                        return -ENOMEM;
+        if (snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) {
+                if (dmab->bytes >= size)
+                        return 0;
         }
+        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+                                size, dmab) < 0)
+                return -ENOMEM;
         return 0;
 }
 
 static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci)
 {
-        if (dmab->area)
+        if (dmab->area) {
+                dmab->dev.dev = NULL; /* make it anonymous */
                 snd_dma_reserve_buf(dmab, snd_dma_pci_buf_id(pci));
+        }
 }
 
 
@@ -2664,7 +2668,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_hammerfall_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_hammerfall_exit(void)
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index cfd2c5fd6ddf..60ecb2bdb65e 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1522,7 +1522,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_sonicvibes_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_sonicvibes_exit(void)
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index ad58e08d66e2..940d531575c0 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -143,7 +143,8 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                         return err;
                 }
         }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
+        if (trident->device != TRIDENT_DEVICE_ID_SI7018 &&
+            (err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
                                        trident->midi_port, 1,
                                        trident->irq, 0, &trident->rmidi)) < 0) {
                 snd_card_free(card);
@@ -184,7 +185,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_trident_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_trident_exit(void)
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 9b4d74d49f98..42c48f0ce8e8 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -101,7 +101,7 @@ MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
 module_param_array(ac97_quirk, charp, NULL, 0444);
 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
 module_param_array(dxs_support, int, NULL, 0444);
-MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA)");
+MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)");
 
 
 /* pci ids */
@@ -302,6 +302,7 @@ DEFINE_VIA_REGSET(CAPTURE_8233, 0x60);
 #define VIA_DXS_DISABLE 2
 #define VIA_DXS_48K     3
 #define VIA_DXS_NO_VRA  4
+#define VIA_DXS_SRC     5
 
 
 /*
@@ -380,6 +381,7 @@ struct _snd_via82xx {
         struct via_rate_lock rates[2]; /* playback and capture */
         unsigned int dxs_fixed: 1;      /* DXS channel accepts only 48kHz */
         unsigned int no_vra: 1;         /* no need to set VRA on DXS channels */
+        unsigned int dxs_src: 1;        /* use full SRC capabilities of DXS */
         unsigned int spdif_on: 1;       /* only spdif rates work to external DACs */
 
         snd_pcm_t *pcms[2];
@@ -489,10 +491,8 @@ static int clean_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
                 snd_dma_free_pages(&dev->table);
                 dev->table.area = NULL;
         }
-        if (dev->idx_table) {
-                kfree(dev->idx_table);
-                dev->idx_table = NULL;
-        }
+        kfree(dev->idx_table);
+        dev->idx_table = NULL;
         return 0;
 }
 
@@ -924,15 +924,17 @@ static int snd_via8233_playback_prepare(snd_pcm_substream_t *substream)
         via82xx_t *chip = snd_pcm_substream_chip(substream);
         viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
         snd_pcm_runtime_t *runtime = substream->runtime;
+        int ac97_rate = chip->dxs_src ? 48000 : runtime->rate;
         int rate_changed;
         u32 rbits;
 
-        if ((rate_changed = via_lock_rate(&chip->rates[0], runtime->rate)) < 0)
+        if ((rate_changed = via_lock_rate(&chip->rates[0], ac97_rate)) < 0)
                 return rate_changed;
         if (rate_changed) {
                 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE,
                                   chip->no_vra ? 48000 : runtime->rate);
-                snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate);
+                snd_ac97_set_rate(chip->ac97, AC97_SPDIF,
+                                  chip->no_vra ? 48000 : runtime->rate);
         }
         if (runtime->rate == 48000)
                 rbits = 0xfffff;
@@ -1074,6 +1076,12 @@ static int snd_via82xx_pcm_open(via82xx_t *chip, viadev_t *viadev, snd_pcm_subst
                 /* fixed DXS playback rate */
                 runtime->hw.rates = SNDRV_PCM_RATE_48000;
                 runtime->hw.rate_min = runtime->hw.rate_max = 48000;
+        } else if (chip->dxs_src && viadev->reg_offset < 0x40) {
+                /* use full SRC capabilities of DXS */
+                runtime->hw.rates = (SNDRV_PCM_RATE_CONTINUOUS |
+                                     SNDRV_PCM_RATE_8000_48000);
+                runtime->hw.rate_min = 8000;
+                runtime->hw.rate_max = 48000;
         } else if (! ratep->rate) {
                 int idx = viadev->direction ? AC97_RATES_ADC : AC97_RATES_FRONT_DAC;
                 runtime->hw.rates = chip->ac97->rates[idx];
@@ -1550,51 +1558,51 @@ static void snd_via82xx_mixer_free_ac97(ac97_t *ac97)
 
 static struct ac97_quirk ac97_quirks[] = {
         {
-                .vendor = 0x1106,
-                .device = 0x4161,
+                .subvendor = 0x1106,
+                .subdevice = 0x4161,
                 .codec_id = 0x56494161, /* VT1612A */
                 .name = "Soltek SL-75DRV5",
                 .type = AC97_TUNE_NONE
         },
         {       /* FIXME: which codec? */
-                .vendor = 0x1106,
-                .device = 0x4161,
+                .subvendor = 0x1106,
+                .subdevice = 0x4161,
                 .name = "ASRock K7VT2",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1019,
-                .device = 0x0a81,
+                .subvendor = 0x1019,
+                .subdevice = 0x0a81,
                 .name = "ECS K7VTA3",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1019,
-                .device = 0x0a85,
+                .subvendor = 0x1019,
+                .subdevice = 0x0a85,
                 .name = "ECS L7VMM2",
                 .type = AC97_TUNE_HP_ONLY
         },
         {
-                .vendor = 0x1849,
-                .device = 0x3059,
+                .subvendor = 0x1849,
+                .subdevice = 0x3059,
                 .name = "ASRock K7VM2",
                 .type = AC97_TUNE_HP_ONLY       /* VT1616 */
         },
         {
-                .vendor = 0x14cd,
-                .device = 0x7002,
+                .subvendor = 0x14cd,
+                .subdevice = 0x7002,
                 .name = "Unknown",
                 .type = AC97_TUNE_ALC_JACK
         },
         {
-                .vendor = 0x1071,
-                .device = 0x8590,
+                .subvendor = 0x1071,
+                .subdevice = 0x8590,
                 .name = "Mitac Mobo",
                 .type = AC97_TUNE_ALC_JACK
         },
         {
-                .vendor = 0x161f,
-                .device = 0x202b,
+                .subvendor = 0x161f,
+                .subdevice = 0x202b,
                 .name = "Arima Notebook",
                 .type = AC97_TUNE_HP_ONLY,
         },
@@ -2132,8 +2140,8 @@ static struct via823x_info via823x_cards[] __devinitdata = {
  * auto detection of DXS channel supports.
  */
 struct dxs_whitelist {
-        unsigned short vendor;
-        unsigned short device; 
+        unsigned short subvendor;
+        unsigned short subdevice; 
         unsigned short mask; 
         short action;   /* new dxs_support value */
 };
@@ -2141,38 +2149,44 @@ struct dxs_whitelist {
 static int __devinit check_dxs_list(struct pci_dev *pci)
 {
         static struct dxs_whitelist whitelist[] = {
-                { .vendor = 0x1005, .device = 0x4710, .action = VIA_DXS_ENABLE }, /* Avance Logic Mobo */
-                { .vendor = 0x1019, .device = 0x0996, .action = VIA_DXS_48K },
-                { .vendor = 0x1019, .device = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */
-                { .vendor = 0x1019, .device = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */
-                { .vendor = 0x1025, .device = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */
-                { .vendor = 0x1043, .device = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
-                { .vendor = 0x1043, .device = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */
-                { .vendor = 0x1043, .device = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/ 
-                { .vendor = 0x1071, .device = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
-                { .vendor = 0x10cf, .device = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */
-                { .vendor = 0x1106, .device = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */
-                { .vendor = 0x1106, .device = 0x4552, .action = VIA_DXS_NO_VRA }, /* QDI Kudoz 7X/600-6AL */
-                { .vendor = 0x1106, .device = 0xaa01, .action = VIA_DXS_NO_VRA }, /* EPIA MII */
-                { .vendor = 0x1297, .device = 0xa232, .action = VIA_DXS_ENABLE }, /* Shuttle ?? */
-                { .vendor = 0x1297, .device = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */
-                { .vendor = 0x1458, .device = 0xa002, .action = VIA_DXS_ENABLE }, /* Gigabyte GA-7VAXP */
-                { .vendor = 0x1462, .device = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */
-                { .vendor = 0x1462, .device = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */
-                { .vendor = 0x1462, .device = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */
-                { .vendor = 0x1462, .device = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */
-                { .vendor = 0x147b, .device = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */
-                { .vendor = 0x147b, .device = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */
-                { .vendor = 0x147b, .device = 0x1413, .action = VIA_DXS_ENABLE }, /* ABIT KV8 Pro */
-                { .vendor = 0x147b, .device = 0x1415, .action = VIA_DXS_NO_VRA }, /* Abit AV8 */
-                { .vendor = 0x14ff, .device = 0x0403, .action = VIA_DXS_ENABLE }, /* Twinhead mobo */
-                { .vendor = 0x1584, .device = 0x8120, .action = VIA_DXS_ENABLE }, /* Gericom/Targa/Vobis/Uniwill laptop */
-                { .vendor = 0x1584, .device = 0x8123, .action = VIA_DXS_NO_VRA }, /* Uniwill (Targa Visionary XP-210) */
-                { .vendor = 0x161f, .device = 0x202b, .action = VIA_DXS_NO_VRA }, /* Amira Note book */
-                { .vendor = 0x161f, .device = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */
-                { .vendor = 0x1631, .device = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */
-                { .vendor = 0x1695, .device = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */
-                { .vendor = 0x1849, .device = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */
+                { .subvendor = 0x1005, .subdevice = 0x4710, .action = VIA_DXS_ENABLE }, /* Avance Logic Mobo */
+                { .subvendor = 0x1019, .subdevice = 0x0996, .action = VIA_DXS_48K },
+                { .subvendor = 0x1019, .subdevice = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */
+                { .subvendor = 0x1019, .subdevice = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */
+                { .subvendor = 0x1025, .subdevice = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */
+                { .subvendor = 0x1043, .subdevice = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
+                { .subvendor = 0x1043, .subdevice = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */
+                { .subvendor = 0x1043, .subdevice = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/ 
+                { .subvendor = 0x1043, .subdevice = 0x812a, .action = VIA_DXS_SRC    }, /* ASUS A8V Deluxe */ 
+                { .subvendor = 0x1071, .subdevice = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
+                { .subvendor = 0x1071, .subdevice = 0x8399, .action = VIA_DXS_NO_VRA }, /* Umax AB 595T (VIA K8N800A - VT8237) */
+                { .subvendor = 0x10cf, .subdevice = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */
+                { .subvendor = 0x1106, .subdevice = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */
+                { .subvendor = 0x1106, .subdevice = 0x4552, .action = VIA_DXS_NO_VRA }, /* QDI Kudoz 7X/600-6AL */
+                { .subvendor = 0x1106, .subdevice = 0xaa01, .action = VIA_DXS_NO_VRA }, /* EPIA MII */
+                { .subvendor = 0x1106, .subdevice = 0xc001, .action = VIA_DXS_SRC }, /* Insight P4-ITX */
+                { .subvendor = 0x1297, .subdevice = 0xa232, .action = VIA_DXS_ENABLE }, /* Shuttle ?? */
+                { .subvendor = 0x1297, .subdevice = 0xc160, .action = VIA_DXS_ENABLE }, /* Shuttle SK41G */
+                { .subvendor = 0x1458, .subdevice = 0xa002, .action = VIA_DXS_ENABLE }, /* Gigabyte GA-7VAXP */
+                { .subvendor = 0x1462, .subdevice = 0x0080, .action = VIA_DXS_SRC }, /* MSI K8T Neo-FIS2R */
+                { .subvendor = 0x1462, .subdevice = 0x3800, .action = VIA_DXS_ENABLE }, /* MSI KT266 */
+                { .subvendor = 0x1462, .subdevice = 0x5901, .action = VIA_DXS_NO_VRA }, /* MSI KT6 Delta-SR */
+                { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */
+                { .subvendor = 0x1462, .subdevice = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */
+                { .subvendor = 0x147b, .subdevice = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */
+                { .subvendor = 0x147b, .subdevice = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */
+                { .subvendor = 0x147b, .subdevice = 0x1413, .action = VIA_DXS_ENABLE }, /* ABIT KV8 Pro */
+                { .subvendor = 0x147b, .subdevice = 0x1415, .action = VIA_DXS_NO_VRA }, /* Abit AV8 */
+                { .subvendor = 0x14ff, .subdevice = 0x0403, .action = VIA_DXS_ENABLE }, /* Twinhead mobo */
+                { .subvendor = 0x14ff, .subdevice = 0x0408, .action = VIA_DXS_NO_VRA }, /* Twinhead mobo */
+                { .subvendor = 0x1584, .subdevice = 0x8120, .action = VIA_DXS_ENABLE }, /* Gericom/Targa/Vobis/Uniwill laptop */
+                { .subvendor = 0x1584, .subdevice = 0x8123, .action = VIA_DXS_NO_VRA }, /* Uniwill (Targa Visionary XP-210) */
+                { .subvendor = 0x161f, .subdevice = 0x202b, .action = VIA_DXS_NO_VRA }, /* Amira Note book */
+                { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */
+                { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */
+                { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */
+                { .subvendor = 0x1849, .subdevice = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */
+                { .subvendor = 0x1919, .subdevice = 0x200a, .action = VIA_DXS_NO_VRA }, /* Soltek SL-K8Tpro-939 */
                 { } /* terminator */
         };
         struct dxs_whitelist *w;
@@ -2182,14 +2196,14 @@ static int __devinit check_dxs_list(struct pci_dev *pci)
         pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
         pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
 
-        for (w = whitelist; w->vendor; w++) {
-                if (w->vendor != subsystem_vendor)
+        for (w = whitelist; w->subvendor; w++) {
+                if (w->subvendor != subsystem_vendor)
                         continue;
                 if (w->mask) {
-                        if ((w->mask & subsystem_device) == w->device)
+                        if ((w->mask & subsystem_device) == w->subdevice)
                                 return w->action;
                 } else {
-                        if (subsystem_device == w->device)
+                        if (subsystem_device == w->subdevice)
                                 return w->action;
                 }
         }
@@ -2198,8 +2212,9 @@ static int __devinit check_dxs_list(struct pci_dev *pci)
          * not detected, try 48k rate only to be sure.
          */
         printk(KERN_INFO "via82xx: Assuming DXS channels with 48k fixed sample rate.\n");
-        printk(KERN_INFO "         Please try dxs_support=1 or dxs_support=4 option\n");
+        printk(KERN_INFO "         Please try dxs_support=5 option\n");
         printk(KERN_INFO "         and report if it works on your machine.\n");
+        printk(KERN_INFO "         For more details, read ALSA-Configuration.txt.\n");
         return VIA_DXS_48K;
 };
 
@@ -2288,6 +2303,10 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                                 chip->dxs_fixed = 1;
                         else if (dxs_support[dev] == VIA_DXS_NO_VRA)
                                 chip->no_vra = 1;
+                        else if (dxs_support[dev] == VIA_DXS_SRC) {
+                                chip->no_vra = 1;
+                                chip->dxs_src = 1;
+                        }
                 }
                 if ((err = snd_via8233_init_misc(chip, dev)) < 0)
                         goto __error;
@@ -2334,7 +2353,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_via82xx_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_via82xx_exit(void)
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index ea5c6f640159..5896d289f9ac 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -352,10 +352,8 @@ static int clean_via_table(viadev_t *dev, snd_pcm_substream_t *substream,
                 snd_dma_free_pages(&dev->table);
                 dev->table.area = NULL;
         }
-        if (dev->idx_table) {
-                kfree(dev->idx_table);
-                dev->idx_table = NULL;
-        }
+        kfree(dev->idx_table);
+        dev->idx_table = NULL;
         return 0;
 }
 
@@ -420,7 +418,10 @@ static void snd_via82xx_codec_write(ac97_t *ac97,
 {
         via82xx_t *chip = ac97->private_data;
         unsigned int xval;
-        
+        if(reg == AC97_GPIO_STATUS) {
+                outl(val, VIAREG(chip, GPI_STATUS));
+                return;
+        }       
         xval = !ac97->num ? VIA_REG_AC97_CODEC_ID_PRIMARY : VIA_REG_AC97_CODEC_ID_SECONDARY;
         xval <<= VIA_REG_AC97_CODEC_ID_SHIFT;
         xval |= reg << VIA_REG_AC97_CMD_SHIFT;
@@ -544,25 +545,6 @@ static int snd_via82xx_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
         return 0;
 }
 
-static int snd_via82xx_modem_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
-{
-        via82xx_t *chip = snd_pcm_substream_chip(substream);
-        unsigned int val = 0;
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-                val = snd_ac97_read(chip->ac97, AC97_GPIO_STATUS);
-                outl(val|AC97_GPIO_LINE1_OH, VIAREG(chip, GPI_STATUS));
-                break;
-        case SNDRV_PCM_TRIGGER_STOP:
-                val = snd_ac97_read(chip->ac97, AC97_GPIO_STATUS);
-                outl(val&~AC97_GPIO_LINE1_OH, VIAREG(chip, GPI_STATUS));
-                break;
-        default:
-                break;
-        }
-        return snd_via82xx_pcm_trigger(substream, cmd);
-}
-
 /*
  * pointer callbacks
  */
@@ -806,7 +788,7 @@ static snd_pcm_ops_t snd_via686_playback_ops = {
         .hw_params =    snd_via82xx_hw_params,
         .hw_free =      snd_via82xx_hw_free,
         .prepare =      snd_via82xx_pcm_prepare,
-        .trigger =      snd_via82xx_modem_pcm_trigger,
+        .trigger =      snd_via82xx_pcm_trigger,
         .pointer =      snd_via686_pcm_pointer,
         .page =         snd_pcm_sgbuf_ops_page,
 };
@@ -819,7 +801,7 @@ static snd_pcm_ops_t snd_via686_capture_ops = {
         .hw_params =    snd_via82xx_hw_params,
         .hw_free =      snd_via82xx_hw_free,
         .prepare =      snd_via82xx_pcm_prepare,
-        .trigger =      snd_via82xx_modem_pcm_trigger,
+        .trigger =      snd_via82xx_pcm_trigger,
         .pointer =      snd_via686_pcm_pointer,
         .page =         snd_pcm_sgbuf_ops_page,
 };
@@ -938,7 +920,7 @@ static void __devinit snd_via82xx_proc_init(via82xx_t *chip)
  *
  */
 
-static int __devinit snd_via82xx_chip_init(via82xx_t *chip)
+static int snd_via82xx_chip_init(via82xx_t *chip)
 {
         unsigned int val;
         int max_count;
@@ -1233,7 +1215,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_via82xx_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_via82xx_exit(void)
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 4ffbb25658a5..dca6bd2c7580 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -260,7 +260,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_vx222_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_vx222_exit(void)
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 9f3ef22df08d..5b5b624b47d0 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -360,7 +360,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_ymfpci_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_ymfpci_exit(void)
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 05f1629760bc..2ae79610ecb5 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -829,9 +829,7 @@ static snd_pcm_hardware_t snd_ymfpci_capture =
 
 static void snd_ymfpci_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-        ymfpci_pcm_t *ypcm = runtime->private_data;
-        
-        kfree(ypcm);
+        kfree(runtime->private_data);
 }
 
 static int snd_ymfpci_playback_open_1(snd_pcm_substream_t * substream)
@@ -1421,17 +1419,15 @@ static snd_kcontrol_new_t snd_ymfpci_drec_source __devinitdata = {
 
 static int snd_ymfpci_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-        unsigned int mask = 1;
-
         switch (kcontrol->private_value) {
         case YDSXGR_SPDIFOUTCTRL: break;
         case YDSXGR_SPDIFINCTRL: break;
         default: return -EINVAL;
         }
-        uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
         uinfo->count = 1;
         uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = mask;
+        uinfo->value.integer.max = 1;
         return 0;
 }
 
@@ -1439,7 +1435,7 @@ static int snd_ymfpci_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 {
         ymfpci_t *chip = snd_kcontrol_chip(kcontrol);
         int reg = kcontrol->private_value;
-        unsigned int shift = 0, mask = 1, invert = 0;
+        unsigned int shift = 0, mask = 1;
         
         switch (kcontrol->private_value) {
         case YDSXGR_SPDIFOUTCTRL: break;
@@ -1447,8 +1443,6 @@ static int snd_ymfpci_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
         default: return -EINVAL;
         }
         ucontrol->value.integer.value[0] = (snd_ymfpci_readl(chip, reg) >> shift) & mask;
-        if (invert)
-                ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
         return 0;
 }
 
@@ -1456,7 +1450,7 @@ static int snd_ymfpci_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 {
         ymfpci_t *chip = snd_kcontrol_chip(kcontrol);
         int reg = kcontrol->private_value;
-        unsigned int shift = 0, mask = 1, invert = 0;
+        unsigned int shift = 0, mask = 1;
         int change;
         unsigned int val, oval;
         
@@ -1466,8 +1460,6 @@ static int snd_ymfpci_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
         default: return -EINVAL;
         }
         val = (ucontrol->value.integer.value[0] & mask);
-        if (invert)
-                val = mask - val;
         val <<= shift;
         spin_lock_irq(&chip->reg_lock);
         oval = snd_ymfpci_readl(chip, reg);
@@ -1487,14 +1479,13 @@ static int snd_ymfpci_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 static int snd_ymfpci_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
         unsigned int reg = kcontrol->private_value;
-        unsigned int mask = 16383;
 
         if (reg < 0x80 || reg >= 0xc0)
                 return -EINVAL;
-        uinfo->type = mask == 1 ? SNDRV_CTL_ELEM_TYPE_BOOLEAN : SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 2;
         uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = mask;
+        uinfo->value.integer.max = 16383;
         return 0;
 }
 
@@ -1502,7 +1493,7 @@ static int snd_ymfpci_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 {
         ymfpci_t *chip = snd_kcontrol_chip(kcontrol);
         unsigned int reg = kcontrol->private_value;
-        unsigned int shift_left = 0, shift_right = 16, mask = 16383, invert = 0;
+        unsigned int shift_left = 0, shift_right = 16, mask = 16383;
         unsigned int val;
         
         if (reg < 0x80 || reg >= 0xc0)
@@ -1512,10 +1503,6 @@ static int snd_ymfpci_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
         spin_unlock_irq(&chip->reg_lock);
         ucontrol->value.integer.value[0] = (val >> shift_left) & mask;
         ucontrol->value.integer.value[1] = (val >> shift_right) & mask;
-        if (invert) {
-                ucontrol->value.integer.value[0] = mask - ucontrol->value.integer.value[0];
-                ucontrol->value.integer.value[1] = mask - ucontrol->value.integer.value[1];
-        }
         return 0;
 }
 
@@ -1523,7 +1510,7 @@ static int snd_ymfpci_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
 {
         ymfpci_t *chip = snd_kcontrol_chip(kcontrol);
         unsigned int reg = kcontrol->private_value;
-        unsigned int shift_left = 0, shift_right = 16, mask = 16383, invert = 0;
+        unsigned int shift_left = 0, shift_right = 16, mask = 16383;
         int change;
         unsigned int val1, val2, oval;
         
@@ -1531,10 +1518,6 @@ static int snd_ymfpci_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
                 return -EINVAL;
         val1 = ucontrol->value.integer.value[0] & mask;
         val2 = ucontrol->value.integer.value[1] & mask;
-        if (invert) {
-                val1 = mask - val1;
-                val2 = mask - val2;
-        }
         val1 <<= shift_left;
         val2 <<= shift_right;
         spin_lock_irq(&chip->reg_lock);
diff --git a/sound/pcmcia/vx/vx_entry.c b/sound/pcmcia/vx/vx_entry.c
index 53d8172c52ae..332bbca3dfc4 100644
--- a/sound/pcmcia/vx/vx_entry.c
+++ b/sound/pcmcia/vx/vx_entry.c
@@ -68,8 +68,7 @@ static int snd_vxpocket_free(vx_core_t *chip)
         if (hw)
                 hw->card_list[vxp->index] = NULL;
         chip->card = NULL;
-        if (chip->dev)
-                kfree(chip->dev);
+        kfree(chip->dev);
 
         snd_vx_free_firmware(chip);
         kfree(chip);
diff --git a/sound/synth/emux/emux_effect.c b/sound/synth/emux/emux_effect.c
index ec3fc1ba7fca..4764940f11a0 100644
--- a/sound/synth/emux/emux_effect.c
+++ b/sound/synth/emux/emux_effect.c
@@ -291,10 +291,8 @@ snd_emux_create_effect(snd_emux_port_t *p)
 void
 snd_emux_delete_effect(snd_emux_port_t *p)
 {
-        if (p->effect) {
-                kfree(p->effect);
-                p->effect = NULL;
-        }
+        kfree(p->effect);
+        p->effect = NULL;
 }
 
 void
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 9329e992c841..f05d02f5b69f 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -6,6 +6,7 @@ menu "USB devices"
 config SND_USB_AUDIO
         tristate "USB Audio/MIDI driver"
         depends on SND && USB
+        select SND_HWDEP
         select SND_RAWMIDI
         select SND_PCM
         help
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index aae66144d411..a75695045f29 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -98,7 +98,7 @@ MODULE_PARM_DESC(async_unlink, "Use async unlink mode.");
 #define MAX_PACKS       10
 #define MAX_PACKS_HS    (MAX_PACKS * 8) /* in high speed mode */
 #define MAX_URBS        5       /* max. 20ms long packets */
-#define SYNC_URBS       2       /* always two urbs for sync */
+#define SYNC_URBS       4       /* always four urbs for sync */
 #define MIN_PACKS_URB   1       /* minimum 1 packet per urb */
 
 typedef struct snd_usb_substream snd_usb_substream_t;
@@ -177,7 +177,7 @@ struct snd_usb_substream {
         unsigned int nurbs;                     /* # urbs */
         snd_urb_ctx_t dataurb[MAX_URBS];        /* data urb table */
         snd_urb_ctx_t syncurb[SYNC_URBS];       /* sync urb table */
-        char syncbuf[SYNC_URBS * MAX_PACKS * 4]; /* sync buffer; it's so small - let's get static */
+        char syncbuf[SYNC_URBS * 4];    /* sync buffer; it's so small - let's get static */
         char *tmpbuf;                   /* temporary buffer for playback */
 
         u64 formats;                    /* format bitmasks (all or'ed) */
@@ -251,17 +251,13 @@ static int prepare_capture_sync_urb(snd_usb_substream_t *subs,
 {
         unsigned char *cp = urb->transfer_buffer;
         snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
-        int i, offs;
 
-        urb->number_of_packets = ctx->packets;
         urb->dev = ctx->subs->dev; /* we need to set this at each time */
-        for (i = offs = 0; i < urb->number_of_packets; i++, offs += 4, cp += 4) {
-                urb->iso_frame_desc[i].length = 3;
-                urb->iso_frame_desc[i].offset = offs;
-                cp[0] = subs->freqn >> 2;
-                cp[1] = subs->freqn >> 10;
-                cp[2] = subs->freqn >> 18;
-        }
+        urb->iso_frame_desc[0].length = 3;
+        urb->iso_frame_desc[0].offset = 0;
+        cp[0] = subs->freqn >> 2;
+        cp[1] = subs->freqn >> 10;
+        cp[2] = subs->freqn >> 18;
         return 0;
 }
 
@@ -277,18 +273,14 @@ static int prepare_capture_sync_urb_hs(snd_usb_substream_t *subs,
 {
         unsigned char *cp = urb->transfer_buffer;
         snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
-        int i, offs;
 
-        urb->number_of_packets = ctx->packets;
         urb->dev = ctx->subs->dev; /* we need to set this at each time */
-        for (i = offs = 0; i < urb->number_of_packets; i++, offs += 4, cp += 4) {
-                urb->iso_frame_desc[i].length = 4;
-                urb->iso_frame_desc[i].offset = offs;
-                cp[0] = subs->freqn;
-                cp[1] = subs->freqn >> 8;
-                cp[2] = subs->freqn >> 16;
-                cp[3] = subs->freqn >> 24;
-        }
+        urb->iso_frame_desc[0].length = 4;
+        urb->iso_frame_desc[0].offset = 0;
+        cp[0] = subs->freqn;
+        cp[1] = subs->freqn >> 8;
+        cp[2] = subs->freqn >> 16;
+        cp[3] = subs->freqn >> 24;
         return 0;
 }
 
@@ -418,15 +410,11 @@ static int prepare_playback_sync_urb(snd_usb_substream_t *subs,
                                      snd_pcm_runtime_t *runtime,
                                      struct urb *urb)
 {
-        int i, offs;
         snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
 
-        urb->number_of_packets = ctx->packets;
         urb->dev = ctx->subs->dev; /* we need to set this at each time */
-        for (i = offs = 0; i < urb->number_of_packets; i++, offs += 4) {
-                urb->iso_frame_desc[i].length = 3;
-                urb->iso_frame_desc[i].offset = offs;
-        }
+        urb->iso_frame_desc[0].length = 3;
+        urb->iso_frame_desc[0].offset = 0;
         return 0;
 }
 
@@ -440,15 +428,11 @@ static int prepare_playback_sync_urb_hs(snd_usb_substream_t *subs,
                                         snd_pcm_runtime_t *runtime,
                                         struct urb *urb)
 {
-        int i, offs;
         snd_urb_ctx_t *ctx = (snd_urb_ctx_t *)urb->context;
 
-        urb->number_of_packets = ctx->packets;
         urb->dev = ctx->subs->dev; /* we need to set this at each time */
-        for (i = offs = 0; i < urb->number_of_packets; i++, offs += 4) {
-                urb->iso_frame_desc[i].length = 4;
-                urb->iso_frame_desc[i].offset = offs;
-        }
+        urb->iso_frame_desc[0].length = 4;
+        urb->iso_frame_desc[0].offset = 0;
         return 0;
 }
 
@@ -462,31 +446,17 @@ static int retire_playback_sync_urb(snd_usb_substream_t *subs,
                                     snd_pcm_runtime_t *runtime,
                                     struct urb *urb)
 {
-        int i;
-        unsigned int f, found;
-        unsigned char *cp = urb->transfer_buffer;
+        unsigned int f;
         unsigned long flags;
 
-        found = 0;
-        for (i = 0; i < urb->number_of_packets; i++, cp += 4) {
-                if (urb->iso_frame_desc[i].status ||
-                    urb->iso_frame_desc[i].actual_length < 3)
-                        continue;
-                f = combine_triple(cp) << 2;
-#if 0
-                if (f < subs->freqn - (subs->freqn>>3) || f > subs->freqmax) {
-                        snd_printd(KERN_WARNING "requested frequency %d (%u,%03uHz) out of range (current nominal %d (%u,%03uHz))\n",
-                                   f, f >> 14, (f & ((1 << 14) - 1) * 1000) / ((1 << 14) - 1),
-                                   subs->freqn, subs->freqn >> 14, (subs->freqn & ((1 << 14) - 1) * 1000) / ((1 << 14) - 1));
-                        continue;
+        if (urb->iso_frame_desc[0].status == 0 &&
+            urb->iso_frame_desc[0].actual_length == 3) {
+                f = combine_triple((u8*)urb->transfer_buffer) << 2;
+                if (f >= subs->freqn - subs->freqn / 8 && f <= subs->freqmax) {
+                        spin_lock_irqsave(&subs->lock, flags);
+                        subs->freqm = f;
+                        spin_unlock_irqrestore(&subs->lock, flags);
                 }
-#endif
-                found = f;
-        }
-        if (found) {
-                spin_lock_irqsave(&subs->lock, flags);
-                subs->freqm = found;
-                spin_unlock_irqrestore(&subs->lock, flags);
         }
 
         return 0;
@@ -502,22 +472,17 @@ static int retire_playback_sync_urb_hs(snd_usb_substream_t *subs,
                                        snd_pcm_runtime_t *runtime,
                                        struct urb *urb)
 {
-        int i;
-        unsigned int found;
-        unsigned char *cp = urb->transfer_buffer;
+        unsigned int f;
         unsigned long flags;
 
-        found = 0;
-        for (i = 0; i < urb->number_of_packets; i++, cp += 4) {
-                if (urb->iso_frame_desc[i].status ||
-                    urb->iso_frame_desc[i].actual_length < 4)
-                        continue;
-                found = combine_quad(cp) & 0x0fffffff;
-        }
-        if (found) {
-                spin_lock_irqsave(&subs->lock, flags);
-                subs->freqm = found;
-                spin_unlock_irqrestore(&subs->lock, flags);
+        if (urb->iso_frame_desc[0].status == 0 &&
+            urb->iso_frame_desc[0].actual_length == 4) {
+                f = combine_quad((u8*)urb->transfer_buffer) & 0x0fffffff;
+                if (f >= subs->freqn - subs->freqn / 8 && f <= subs->freqmax) {
+                        spin_lock_irqsave(&subs->lock, flags);
+                        subs->freqm = f;
+                        spin_unlock_irqrestore(&subs->lock, flags);
+                }
         }
 
         return 0;
@@ -600,6 +565,8 @@ static int prepare_playback_urb(snd_usb_substream_t *subs,
                 /* set the buffer pointer */
                 urb->transfer_buffer = runtime->dma_area + subs->hwptr * stride;
                 subs->hwptr += offs;
+                if (subs->hwptr == runtime->buffer_size)
+                        subs->hwptr = 0;
         }
         spin_unlock_irqrestore(&subs->lock, flags);
         urb->transfer_buffer_length = offs * stride;
@@ -892,10 +859,8 @@ static void release_urb_ctx(snd_urb_ctx_t *u)
                 usb_free_urb(u->urb);
                 u->urb = NULL;
         }
-        if (u->buf) {
-                kfree(u->buf);
-                u->buf = NULL;
-        }
+        kfree(u->buf);
+        u->buf = NULL;
 }
 
 /*
@@ -913,10 +878,8 @@ static void release_substream_urbs(snd_usb_substream_t *subs, int force)
                 release_urb_ctx(&subs->dataurb[i]);
         for (i = 0; i < SYNC_URBS; i++)
                 release_urb_ctx(&subs->syncurb[i]);
-        if (subs->tmpbuf) {
-                kfree(subs->tmpbuf);
-                subs->tmpbuf = NULL;
-        }
+        kfree(subs->tmpbuf);
+        subs->tmpbuf = NULL;
         subs->nurbs = 0;
 }
 
@@ -1039,22 +1002,19 @@ static int init_substream_urbs(snd_usb_substream_t *subs, unsigned int period_by
                         snd_urb_ctx_t *u = &subs->syncurb[i];
                         u->index = i;
                         u->subs = subs;
-                        u->packets = nrpacks;
-                        u->urb = usb_alloc_urb(u->packets, GFP_KERNEL);
+                        u->packets = 1;
+                        u->urb = usb_alloc_urb(1, GFP_KERNEL);
                         if (! u->urb) {
                                 release_substream_urbs(subs, 0);
                                 return -ENOMEM;
                         }
-                        u->urb->transfer_buffer = subs->syncbuf + i * nrpacks * 4;
-                        u->urb->transfer_buffer_length = nrpacks * 4;
+                        u->urb->transfer_buffer = subs->syncbuf + i * 4;
+                        u->urb->transfer_buffer_length = 4;
                         u->urb->dev = subs->dev;
                         u->urb->pipe = subs->syncpipe;
                         u->urb->transfer_flags = URB_ISO_ASAP;
-                        u->urb->number_of_packets = u->packets;
-                        if (snd_usb_get_speed(subs->dev) == USB_SPEED_HIGH)
-                                u->urb->interval = 8;
-                        else
-                                u->urb->interval = 1;
+                        u->urb->number_of_packets = 1;
+                        u->urb->interval = 1 << subs->syncinterval;
                         u->urb->context = u;
                         u->urb->complete = snd_usb_complete_callback(snd_complete_sync_urb);
                 }
@@ -1272,7 +1232,17 @@ static int set_format(snd_usb_substream_t *subs, struct audioformat *fmt)
                         subs->syncpipe = usb_rcvisocpipe(dev, ep);
                 else
                         subs->syncpipe = usb_sndisocpipe(dev, ep);
-                subs->syncinterval = get_endpoint(alts, 1)->bRefresh;
+                if (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
+                    get_endpoint(alts, 1)->bRefresh >= 1 &&
+                    get_endpoint(alts, 1)->bRefresh <= 9)
+                        subs->syncinterval = get_endpoint(alts, 1)->bRefresh;
+                else if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
+                        subs->syncinterval = 1;
+                else if (get_endpoint(alts, 1)->bInterval >= 1 &&
+                         get_endpoint(alts, 1)->bInterval <= 16)
+                        subs->syncinterval = get_endpoint(alts, 1)->bInterval - 1;
+                else
+                        subs->syncinterval = 3;
         }
 
         /* always fill max packet size */
@@ -1990,10 +1960,11 @@ static void proc_dump_substream_status(snd_usb_substream_t *subs, snd_info_buffe
                         snd_iprintf(buffer, "%d ", subs->dataurb[i].packets);
                 snd_iprintf(buffer, "]\n");
                 snd_iprintf(buffer, "    Packet Size = %d\n", subs->curpacksize);
-                snd_iprintf(buffer, "    Momentary freq = %u Hz\n",
+                snd_iprintf(buffer, "    Momentary freq = %u Hz (%#x.%04x)\n",
                             snd_usb_get_speed(subs->dev) == USB_SPEED_FULL
                             ? get_full_speed_hz(subs->freqm)
-                            : get_high_speed_hz(subs->freqm));
+                            : get_high_speed_hz(subs->freqm),
+                            subs->freqm >> 16, subs->freqm & 0xffff);
         } else {
                 snd_iprintf(buffer, "  Status: Stop\n");
         }
@@ -2183,17 +2154,15 @@ static int add_audio_endpoint(snd_usb_audio_t *chip, int stream, struct audiofor
 /*
  * check if the device uses big-endian samples
  */
-static int is_big_endian_format(struct usb_device *dev, struct audioformat *fp)
+static int is_big_endian_format(snd_usb_audio_t *chip, struct audioformat *fp)
 {
-        /* M-Audio */
-        if (le16_to_cpu(dev->descriptor.idVendor) == 0x0763) {
-                /* Quattro: captured data only */
-                if (le16_to_cpu(dev->descriptor.idProduct) == 0x2001 &&
-                    fp->endpoint & USB_DIR_IN)
-                        return 1;
-                /* Audiophile USB */
-                if (le16_to_cpu(dev->descriptor.idProduct) == 0x2003)
+        switch (chip->usb_id) {
+        case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */
+                if (fp->endpoint & USB_DIR_IN)
                         return 1;
+                break;
+        case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */
+                return 1;
         }
         return 0;
 }
@@ -2207,7 +2176,7 @@ static int is_big_endian_format(struct usb_device *dev, struct audioformat *fp)
  * @format: the format tag (wFormatTag)
  * @fmt: the format type descriptor
  */
-static int parse_audio_format_i_type(struct usb_device *dev, struct audioformat *fp,
+static int parse_audio_format_i_type(snd_usb_audio_t *chip, struct audioformat *fp,
                                      int format, unsigned char *fmt)
 {
         int pcm_format;
@@ -2220,12 +2189,12 @@ static int parse_audio_format_i_type(struct usb_device *dev, struct audioformat
         switch (format) {
         case 0: /* some devices don't define this correctly... */
                 snd_printdd(KERN_INFO "%d:%u:%d : format type 0 is detected, processed as PCM\n",
-                            dev->devnum, fp->iface, fp->altsetting);
+                            chip->dev->devnum, fp->iface, fp->altsetting);
                 /* fall-through */
         case USB_AUDIO_FORMAT_PCM:
                 if (sample_width > sample_bytes * 8) {
                         snd_printk(KERN_INFO "%d:%u:%d : sample bitwidth %d in over sample bytes %d\n",
-                                   dev->devnum, fp->iface, fp->altsetting,
+                                   chip->dev->devnum, fp->iface, fp->altsetting,
                                    sample_width, sample_bytes);
                 }
                 /* check the format byte size */
@@ -2234,13 +2203,13 @@ static int parse_audio_format_i_type(struct usb_device *dev, struct audioformat
                         pcm_format = SNDRV_PCM_FORMAT_S8;
                         break;
                 case 2:
-                        if (is_big_endian_format(dev, fp))
+                        if (is_big_endian_format(chip, fp))
                                 pcm_format = SNDRV_PCM_FORMAT_S16_BE; /* grrr, big endian!! */
                         else
                                 pcm_format = SNDRV_PCM_FORMAT_S16_LE;
                         break;
                 case 3:
-                        if (is_big_endian_format(dev, fp))
+                        if (is_big_endian_format(chip, fp))
                                 pcm_format = SNDRV_PCM_FORMAT_S24_3BE; /* grrr, big endian!! */
                         else
                                 pcm_format = SNDRV_PCM_FORMAT_S24_3LE;
@@ -2250,14 +2219,14 @@ static int parse_audio_format_i_type(struct usb_device *dev, struct audioformat
                         break;
                 default:
                         snd_printk(KERN_INFO "%d:%u:%d : unsupported sample bitwidth %d in %d bytes\n",
-                                   dev->devnum, fp->iface, fp->altsetting, sample_width, sample_bytes);
+                                   chip->dev->devnum, fp->iface,
+                                   fp->altsetting, sample_width, sample_bytes);
                         break;
                 }
                 break;
         case USB_AUDIO_FORMAT_PCM8:
                 /* Dallas DS4201 workaround */
-                if (le16_to_cpu(dev->descriptor.idVendor) == 0x04fa &&
-                    le16_to_cpu(dev->descriptor.idProduct) == 0x4201)
+                if (chip->usb_id == USB_ID(0x04fa, 0x4201))
                         pcm_format = SNDRV_PCM_FORMAT_S8;
                 else
                         pcm_format = SNDRV_PCM_FORMAT_U8;
@@ -2273,7 +2242,7 @@ static int parse_audio_format_i_type(struct usb_device *dev, struct audioformat
                 break;
         default:
                 snd_printk(KERN_INFO "%d:%u:%d : unsupported format type %d\n",
-                           dev->devnum, fp->iface, fp->altsetting, format);
+                           chip->dev->devnum, fp->iface, fp->altsetting, format);
                 break;
         }
         return pcm_format;
@@ -2290,13 +2259,13 @@ static int parse_audio_format_i_type(struct usb_device *dev, struct audioformat
  * @offset: the start offset of descriptor pointing the rate type
  *          (7 for type I and II, 8 for type II)
  */
-static int parse_audio_format_rates(struct usb_device *dev, struct audioformat *fp,
+static int parse_audio_format_rates(snd_usb_audio_t *chip, struct audioformat *fp,
                                     unsigned char *fmt, int offset)
 {
         int nr_rates = fmt[offset];
         if (fmt[0] < offset + 1 + 3 * (nr_rates ? nr_rates : 2)) {
                 snd_printk(KERN_ERR "%d:%u:%d : invalid FORMAT_TYPE desc\n",
-                                   dev->devnum, fp->iface, fp->altsetting);
+                                   chip->dev->devnum, fp->iface, fp->altsetting);
                 return -1;
         }
 
@@ -2343,7 +2312,7 @@ static int parse_audio_format_rates(struct usb_device *dev, struct audioformat *
 /*
  * parse the format type I and III descriptors
  */
-static int parse_audio_format_i(struct usb_device *dev, struct audioformat *fp,
+static int parse_audio_format_i(snd_usb_audio_t *chip, struct audioformat *fp,
                                 int format, unsigned char *fmt)
 {
         int pcm_format;
@@ -2355,7 +2324,7 @@ static int parse_audio_format_i(struct usb_device *dev, struct audioformat *fp,
                  */
                 pcm_format = SNDRV_PCM_FORMAT_S16_LE;
         } else {
-                pcm_format = parse_audio_format_i_type(dev, fp, format, fmt);
+                pcm_format = parse_audio_format_i_type(chip, fp, format, fmt);
                 if (pcm_format < 0)
                         return -1;
         }
@@ -2363,16 +2332,16 @@ static int parse_audio_format_i(struct usb_device *dev, struct audioformat *fp,
         fp->channels = fmt[4];
         if (fp->channels < 1) {
                 snd_printk(KERN_ERR "%d:%u:%d : invalid channels %d\n",
-                           dev->devnum, fp->iface, fp->altsetting, fp->channels);
+                           chip->dev->devnum, fp->iface, fp->altsetting, fp->channels);
                 return -1;
         }
-        return parse_audio_format_rates(dev, fp, fmt, 7);
+        return parse_audio_format_rates(chip, fp, fmt, 7);
 }
 
 /*
  * prase the format type II descriptor
  */
-static int parse_audio_format_ii(struct usb_device *dev, struct audioformat *fp,
+static int parse_audio_format_ii(snd_usb_audio_t *chip, struct audioformat *fp,
                                  int format, unsigned char *fmt)
 {
         int brate, framesize;
@@ -2387,7 +2356,7 @@ static int parse_audio_format_ii(struct usb_device *dev, struct audioformat *fp,
                 break;
         default:
                 snd_printd(KERN_INFO "%d:%u:%d : unknown format tag 0x%x is detected.  processed as MPEG.\n",
-                           dev->devnum, fp->iface, fp->altsetting, format);
+                           chip->dev->devnum, fp->iface, fp->altsetting, format);
                 fp->format = SNDRV_PCM_FORMAT_MPEG;
                 break;
         }
@@ -2396,10 +2365,10 @@ static int parse_audio_format_ii(struct usb_device *dev, struct audioformat *fp,
         framesize = combine_word(&fmt[6]); /* fmt[6,7]: wSamplesPerFrame */
         snd_printd(KERN_INFO "found format II with max.bitrate = %d, frame size=%d\n", brate, framesize);
         fp->frame_size = framesize;
-        return parse_audio_format_rates(dev, fp, fmt, 8); /* fmt[8..] sample rates */
+        return parse_audio_format_rates(chip, fp, fmt, 8); /* fmt[8..] sample rates */
 }
 
-static int parse_audio_format(struct usb_device *dev, struct audioformat *fp,
+static int parse_audio_format(snd_usb_audio_t *chip, struct audioformat *fp,
                               int format, unsigned char *fmt, int stream)
 {
         int err;
@@ -2407,29 +2376,30 @@ static int parse_audio_format(struct usb_device *dev, struct audioformat *fp,
         switch (fmt[3]) {
         case USB_FORMAT_TYPE_I:
         case USB_FORMAT_TYPE_III:
-                err = parse_audio_format_i(dev, fp, format, fmt);
+                err = parse_audio_format_i(chip, fp, format, fmt);
                 break;
         case USB_FORMAT_TYPE_II:
-                err = parse_audio_format_ii(dev, fp, format, fmt);
+                err = parse_audio_format_ii(chip, fp, format, fmt);
                 break;
         default:
                 snd_printd(KERN_INFO "%d:%u:%d : format type %d is not supported yet\n",
-                           dev->devnum, fp->iface, fp->altsetting, fmt[3]);
+                           chip->dev->devnum, fp->iface, fp->altsetting, fmt[3]);
                 return -1;
         }
         fp->fmt_type = fmt[3];
         if (err < 0)
                 return err;
 #if 1
-        /* FIXME: temporary hack for extigy */
+        /* FIXME: temporary hack for extigy/audigy 2 nx */
         /* extigy apparently supports sample rates other than 48k
          * but not in ordinary way.  so we enable only 48k atm.
          */
-        if (le16_to_cpu(dev->descriptor.idVendor) == 0x041e && 
-            le16_to_cpu(dev->descriptor.idProduct) == 0x3000) {
+        if (chip->usb_id == USB_ID(0x041e, 0x3000) ||
+            chip->usb_id == USB_ID(0x041e, 0x3020)) {
                 if (fmt[3] == USB_FORMAT_TYPE_I &&
                     stream == SNDRV_PCM_STREAM_PLAYBACK &&
-                    fp->rates != SNDRV_PCM_RATE_48000)
+                    fp->rates != SNDRV_PCM_RATE_48000 &&
+                    fp->rates != SNDRV_PCM_RATE_96000)
                         return -1; /* use 48k only */
         }
 #endif
@@ -2528,40 +2498,35 @@ static int parse_audio_endpoints(snd_usb_audio_t *chip, int iface_no)
 
                 /* some quirks for attributes here */
 
-                /* workaround for AudioTrak Optoplay */
-                if (le16_to_cpu(dev->descriptor.idVendor) == 0x0a92 &&
-                    le16_to_cpu(dev->descriptor.idProduct) == 0x0053) {
+                switch (chip->usb_id) {
+                case USB_ID(0x0a92, 0x0053): /* AudioTrak Optoplay */
                         /* Optoplay sets the sample rate attribute although
                          * it seems not supporting it in fact.
                          */
                         fp->attributes &= ~EP_CS_ATTR_SAMPLE_RATE;
-                }
-
-                /* workaround for M-Audio Audiophile USB */
-                if (le16_to_cpu(dev->descriptor.idVendor) == 0x0763 &&
-                    le16_to_cpu(dev->descriptor.idProduct) == 0x2003) {
+                        break;
+                case USB_ID(0x041e, 0x3020): /* Creative SB Audigy 2 NX */
+                case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */
                         /* doesn't set the sample rate attribute, but supports it */
                         fp->attributes |= EP_CS_ATTR_SAMPLE_RATE;
-                }
-
+                        break;
+                case USB_ID(0x047f, 0x0ca1): /* plantronics headset */
+                case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is
+                                                an older model 77d:223) */
                 /*
                  * plantronics headset and Griffin iMic have set adaptive-in
                  * although it's really not...
                  */
-                if ((le16_to_cpu(dev->descriptor.idVendor) == 0x047f &&
-                     le16_to_cpu(dev->descriptor.idProduct) == 0x0ca1) ||
-                    /* Griffin iMic (note that there is an older model 77d:223) */
-                    (le16_to_cpu(dev->descriptor.idVendor) == 0x077d &&
-                     le16_to_cpu(dev->descriptor.idProduct) == 0x07af)) {
                         fp->ep_attr &= ~EP_ATTR_MASK;
                         if (stream == SNDRV_PCM_STREAM_PLAYBACK)
                                 fp->ep_attr |= EP_ATTR_ADAPTIVE;
                         else
                                 fp->ep_attr |= EP_ATTR_SYNC;
+                        break;
                 }
 
                 /* ok, let's parse further... */
-                if (parse_audio_format(dev, fp, format, fmt, stream) < 0) {
+                if (parse_audio_format(chip, fp, format, fmt, stream) < 0) {
                         kfree(fp->rate_table);
                         kfree(fp);
                         continue;
@@ -2587,7 +2552,7 @@ static int parse_audio_endpoints(snd_usb_audio_t *chip, int iface_no)
  * disconnect streams
  * called from snd_usb_audio_disconnect()
  */
-static void snd_usb_stream_disconnect(struct list_head *head, struct usb_driver *driver)
+static void snd_usb_stream_disconnect(struct list_head *head)
 {
         int idx;
         snd_usb_stream_t *as;
@@ -2796,7 +2761,7 @@ static int create_ua700_ua25_quirk(snd_usb_audio_t *chip,
                         .type = QUIRK_MIDI_FIXED_ENDPOINT,
                         .data = &ua25_ep
                 };
-                if (le16_to_cpu(chip->dev->descriptor.idProduct) == 0x002b)
+                if (chip->usb_id == USB_ID(0x0582, 0x002b))
                         return snd_usb_create_midi_interface(chip, iface,
                                                              &ua700_quirk);
                 else
@@ -2959,6 +2924,25 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
         return 0;
 }
 
+static int snd_usb_audigy2nx_boot_quirk(struct usb_device *dev)
+{
+#if 0
+        /* TODO: enable this when high speed synchronization actually works */
+        u8 buf = 1;
+
+        snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), 0x2a,
+                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER,
+                        0, 0, &buf, 1, 1000);
+        if (buf == 0) {
+                snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), 0x29,
+                                USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
+                                1, 2000, NULL, 0, 1000);
+                return -ENODEV;
+        }
+#endif
+        return 0;
+}
+
 
 /*
  * audio-interface quirks
@@ -3015,8 +2999,8 @@ static void proc_audio_usbid_read(snd_info_entry_t *entry, snd_info_buffer_t *bu
         snd_usb_audio_t *chip = entry->private_data;
         if (! chip->shutdown)
                 snd_iprintf(buffer, "%04x:%04x\n", 
-                            le16_to_cpu(chip->dev->descriptor.idVendor),
-                            le16_to_cpu(chip->dev->descriptor.idProduct));
+                            USB_ID_VENDOR(chip->usb_id),
+                            USB_ID_PRODUCT(chip->usb_id));
 }
 
 static void snd_usb_audio_create_proc(snd_usb_audio_t *chip)
@@ -3086,8 +3070,11 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
         chip->index = idx;
         chip->dev = dev;
         chip->card = card;
+        chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
+                              le16_to_cpu(dev->descriptor.idProduct));
         INIT_LIST_HEAD(&chip->pcm_list);
         INIT_LIST_HEAD(&chip->midi_list);
+        INIT_LIST_HEAD(&chip->mixer_list);
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
                 snd_usb_audio_free(chip);
@@ -3097,8 +3084,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
 
         strcpy(card->driver, "USB-Audio");
         sprintf(component, "USB%04x:%04x",
-                le16_to_cpu(dev->descriptor.idVendor),
-                le16_to_cpu(dev->descriptor.idProduct));
+                USB_ID_VENDOR(chip->usb_id), USB_ID_PRODUCT(chip->usb_id));
         snd_component_add(card, component);
 
         /* retrieve the device string as shortname */
@@ -3110,8 +3096,8 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                                card->shortname, sizeof(card->shortname)) <= 0) {
                         /* no name available from anywhere, so use ID */
                         sprintf(card->shortname, "USB Device %#04x:%#04x",
-                                le16_to_cpu(dev->descriptor.idVendor),
-                                le16_to_cpu(dev->descriptor.idProduct));
+                                USB_ID_VENDOR(chip->usb_id),
+                                USB_ID_PRODUCT(chip->usb_id));
                 }
         }
 
@@ -3142,8 +3128,6 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
 
         snd_usb_audio_create_proc(chip);
 
-        snd_card_set_dev(card, &dev->dev);
-
         *rchip = chip;
         return 0;
 }
@@ -3169,21 +3153,28 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
         snd_usb_audio_t *chip;
         struct usb_host_interface *alts;
         int ifnum;
+        u32 id;
 
         alts = &intf->altsetting[0];
         ifnum = get_iface_desc(alts)->bInterfaceNumber;
+        id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
+                    le16_to_cpu(dev->descriptor.idProduct));
 
         if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum)
                 goto __err_val;
 
         /* SB Extigy needs special boot-up sequence */
         /* if more models come, this will go to the quirk list. */
-        if (le16_to_cpu(dev->descriptor.idVendor) == 0x041e && 
-            le16_to_cpu(dev->descriptor.idProduct) == 0x3000) {
+        if (id == USB_ID(0x041e, 0x3000)) {
                 if (snd_usb_extigy_boot_quirk(dev, intf) < 0)
                         goto __err_val;
                 config = dev->actconfig;
         }
+        /* SB Audigy 2 NX needs its own boot-up magic, too */
+        if (id == USB_ID(0x041e, 0x3020)) {
+                if (snd_usb_audigy2nx_boot_quirk(dev) < 0)
+                        goto __err_val;
+        }
 
         /*
          * found a config.  now register to ALSA
@@ -3213,11 +3204,12 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
                 }
                 for (i = 0; i < SNDRV_CARDS; i++)
                         if (enable[i] && ! usb_chip[i] &&
-                            (vid[i] == -1 || vid[i] == le16_to_cpu(dev->descriptor.idVendor)) &&
-                            (pid[i] == -1 || pid[i] == le16_to_cpu(dev->descriptor.idProduct))) {
+                            (vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) &&
+                            (pid[i] == -1 || pid[i] == USB_ID_PRODUCT(id))) {
                                 if (snd_usb_audio_create(dev, i, quirk, &chip) < 0) {
                                         goto __error;
                                 }
+                                snd_card_set_dev(chip->card, &intf->dev);
                                 break;
                         }
                 if (! chip) {
@@ -3281,11 +3273,15 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr)
                 snd_card_disconnect(card);
                 /* release the pcm resources */
                 list_for_each(p, &chip->pcm_list) {
-                        snd_usb_stream_disconnect(p, &usb_audio_driver);
+                        snd_usb_stream_disconnect(p);
                 }
                 /* release the midi resources */
                 list_for_each(p, &chip->midi_list) {
-                        snd_usbmidi_disconnect(p, &usb_audio_driver);
+                        snd_usbmidi_disconnect(p);
+                }
+                /* release mixer resources */
+                list_for_each(p, &chip->mixer_list) {
+                        snd_usb_mixer_disconnect(p);
                 }
                 usb_chip[chip->index] = NULL;
                 up(&register_mutex);
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index eecbf19fcb6f..aedb42aaa749 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -118,6 +118,11 @@
 /* maximum number of endpoints per interface */
 #define MIDI_MAX_ENDPOINTS 2
 
+/* handling of USB vendor/product ID pairs as 32-bit numbers */
+#define USB_ID(vendor, product) (((vendor) << 16) | (product))
+#define USB_ID_VENDOR(id) ((id) >> 16)
+#define USB_ID_PRODUCT(id) ((u16)(id))
+
 /*
  */
 
@@ -127,6 +132,7 @@ struct snd_usb_audio {
         int index;
         struct usb_device *dev;
         snd_card_t *card;
+        u32 usb_id;
         int shutdown;
         int num_interfaces;
 
@@ -136,7 +142,7 @@ struct snd_usb_audio {
         struct list_head midi_list;     /* list of midi interfaces */
         int next_midi_device;
 
-        unsigned int ignore_ctl_error;  /* for mixer */
+        struct list_head mixer_list;    /* list of mixer interfaces */
 };
 
 /*
@@ -219,11 +225,12 @@ void *snd_usb_find_csint_desc(void *descstart, int desclen, void *after, u8 dsub
 int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, void *data, __u16 size, int timeout);
 
 int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif);
+void snd_usb_mixer_disconnect(struct list_head *p);
 
 int snd_usb_create_midi_interface(snd_usb_audio_t *chip, struct usb_interface *iface, const snd_usb_audio_quirk_t *quirk);
 void snd_usbmidi_input_stop(struct list_head* p);
 void snd_usbmidi_input_start(struct list_head* p);
-void snd_usbmidi_disconnect(struct list_head *p, struct usb_driver *driver);
+void snd_usbmidi_disconnect(struct list_head *p);
 
 /*
  * retrieve usb_interface descriptor from the host interface
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 5d32857ff955..bee70068dce0 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -912,7 +912,7 @@ static void snd_usbmidi_free(snd_usb_midi_t* umidi)
 /*
  * Unlinks all URBs (must be done before the usb_device is deleted).
  */
-void snd_usbmidi_disconnect(struct list_head* p, struct usb_driver *driver)
+void snd_usbmidi_disconnect(struct list_head* p)
 {
         snd_usb_midi_t* umidi;
         int i;
@@ -955,88 +955,87 @@ static snd_rawmidi_substream_t* snd_usbmidi_find_substream(snd_usb_midi_t* umidi
  * such as internal control or synthesizer ports.
  */
 static struct {
-        __u16 vendor;
-        __u16 product;
+        u32 id;
         int port;
         const char *name_format;
 } snd_usbmidi_port_names[] = {
         /* Roland UA-100 */
-        {0x0582, 0x0000, 2, "%s Control"},
+        { USB_ID(0x0582, 0x0000), 2, "%s Control" },
         /* Roland SC-8850 */
-        {0x0582, 0x0003, 0, "%s Part A"},
-        {0x0582, 0x0003, 1, "%s Part B"},
-        {0x0582, 0x0003, 2, "%s Part C"},
-        {0x0582, 0x0003, 3, "%s Part D"},
-        {0x0582, 0x0003, 4, "%s MIDI 1"},
-        {0x0582, 0x0003, 5, "%s MIDI 2"},
+        { USB_ID(0x0582, 0x0003), 0, "%s Part A" },
+        { USB_ID(0x0582, 0x0003), 1, "%s Part B" },
+        { USB_ID(0x0582, 0x0003), 2, "%s Part C" },
+        { USB_ID(0x0582, 0x0003), 3, "%s Part D" },
+        { USB_ID(0x0582, 0x0003), 4, "%s MIDI 1" },
+        { USB_ID(0x0582, 0x0003), 5, "%s MIDI 2" },
         /* Roland U-8 */
-        {0x0582, 0x0004, 0, "%s MIDI"},
-        {0x0582, 0x0004, 1, "%s Control"},
+        { USB_ID(0x0582, 0x0004), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x0004), 1, "%s Control" },
         /* Roland SC-8820 */
-        {0x0582, 0x0007, 0, "%s Part A"},
-        {0x0582, 0x0007, 1, "%s Part B"},
-        {0x0582, 0x0007, 2, "%s MIDI"},
+        { USB_ID(0x0582, 0x0007), 0, "%s Part A" },
+        { USB_ID(0x0582, 0x0007), 1, "%s Part B" },
+        { USB_ID(0x0582, 0x0007), 2, "%s MIDI" },
         /* Roland SK-500 */
-        {0x0582, 0x000b, 0, "%s Part A"},
-        {0x0582, 0x000b, 1, "%s Part B"},
-        {0x0582, 0x000b, 2, "%s MIDI"},
+        { USB_ID(0x0582, 0x000b), 0, "%s Part A" },
+        { USB_ID(0x0582, 0x000b), 1, "%s Part B" },
+        { USB_ID(0x0582, 0x000b), 2, "%s MIDI" },
         /* Roland SC-D70 */
-        {0x0582, 0x000c, 0, "%s Part A"},
-        {0x0582, 0x000c, 1, "%s Part B"},
-        {0x0582, 0x000c, 2, "%s MIDI"},
+        { USB_ID(0x0582, 0x000c), 0, "%s Part A" },
+        { USB_ID(0x0582, 0x000c), 1, "%s Part B" },
+        { USB_ID(0x0582, 0x000c), 2, "%s MIDI" },
         /* Edirol UM-880 */
-        {0x0582, 0x0014, 8, "%s Control"},
+        { USB_ID(0x0582, 0x0014), 8, "%s Control" },
         /* Edirol SD-90 */
-        {0x0582, 0x0016, 0, "%s Part A"},
-        {0x0582, 0x0016, 1, "%s Part B"},
-        {0x0582, 0x0016, 2, "%s MIDI 1"},
-        {0x0582, 0x0016, 3, "%s MIDI 2"},
+        { USB_ID(0x0582, 0x0016), 0, "%s Part A" },
+        { USB_ID(0x0582, 0x0016), 1, "%s Part B" },
+        { USB_ID(0x0582, 0x0016), 2, "%s MIDI 1" },
+        { USB_ID(0x0582, 0x0016), 3, "%s MIDI 2" },
         /* Edirol UM-550 */
-        {0x0582, 0x0023, 5, "%s Control"},
+        { USB_ID(0x0582, 0x0023), 5, "%s Control" },
         /* Edirol SD-20 */
-        {0x0582, 0x0027, 0, "%s Part A"},
-        {0x0582, 0x0027, 1, "%s Part B"},
-        {0x0582, 0x0027, 2, "%s MIDI"},
+        { USB_ID(0x0582, 0x0027), 0, "%s Part A" },
+        { USB_ID(0x0582, 0x0027), 1, "%s Part B" },
+        { USB_ID(0x0582, 0x0027), 2, "%s MIDI" },
         /* Edirol SD-80 */
-        {0x0582, 0x0029, 0, "%s Part A"},
-        {0x0582, 0x0029, 1, "%s Part B"},
-        {0x0582, 0x0029, 2, "%s MIDI 1"},
-        {0x0582, 0x0029, 3, "%s MIDI 2"},
+        { USB_ID(0x0582, 0x0029), 0, "%s Part A" },
+        { USB_ID(0x0582, 0x0029), 1, "%s Part B" },
+        { USB_ID(0x0582, 0x0029), 2, "%s MIDI 1" },
+        { USB_ID(0x0582, 0x0029), 3, "%s MIDI 2" },
         /* Edirol UA-700 */
-        {0x0582, 0x002b, 0, "%s MIDI"},
-        {0x0582, 0x002b, 1, "%s Control"},
+        { USB_ID(0x0582, 0x002b), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x002b), 1, "%s Control" },
         /* Roland VariOS */
-        {0x0582, 0x002f, 0, "%s MIDI"},
-        {0x0582, 0x002f, 1, "%s External MIDI"},
-        {0x0582, 0x002f, 2, "%s Sync"},
+        { USB_ID(0x0582, 0x002f), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x002f), 1, "%s External MIDI" },
+        { USB_ID(0x0582, 0x002f), 2, "%s Sync" },
         /* Edirol PCR */
-        {0x0582, 0x0033, 0, "%s MIDI"},
-        {0x0582, 0x0033, 1, "%s 1"},
-        {0x0582, 0x0033, 2, "%s 2"},
+        { USB_ID(0x0582, 0x0033), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x0033), 1, "%s 1" },
+        { USB_ID(0x0582, 0x0033), 2, "%s 2" },
         /* BOSS GS-10 */
-        {0x0582, 0x003b, 0, "%s MIDI"},
-        {0x0582, 0x003b, 1, "%s Control"},
+        { USB_ID(0x0582, 0x003b), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x003b), 1, "%s Control" },
         /* Edirol UA-1000 */
-        {0x0582, 0x0044, 0, "%s MIDI"},
-        {0x0582, 0x0044, 1, "%s Control"},
+        { USB_ID(0x0582, 0x0044), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x0044), 1, "%s Control" },
         /* Edirol UR-80 */
-        {0x0582, 0x0048, 0, "%s MIDI"},
-        {0x0582, 0x0048, 1, "%s 1"},
-        {0x0582, 0x0048, 2, "%s 2"},
+        { USB_ID(0x0582, 0x0048), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x0048), 1, "%s 1" },
+        { USB_ID(0x0582, 0x0048), 2, "%s 2" },
         /* Edirol PCR-A */
-        {0x0582, 0x004d, 0, "%s MIDI"},
-        {0x0582, 0x004d, 1, "%s 1"},
-        {0x0582, 0x004d, 2, "%s 2"},
+        { USB_ID(0x0582, 0x004d), 0, "%s MIDI" },
+        { USB_ID(0x0582, 0x004d), 1, "%s 1" },
+        { USB_ID(0x0582, 0x004d), 2, "%s 2" },
         /* M-Audio MidiSport 8x8 */
-        {0x0763, 0x1031, 8, "%s Control"},
-        {0x0763, 0x1033, 8, "%s Control"},
+        { USB_ID(0x0763, 0x1031), 8, "%s Control" },
+        { USB_ID(0x0763, 0x1033), 8, "%s Control" },
         /* MOTU Fastlane */
-        {0x07fd, 0x0001, 0, "%s MIDI A"},
-        {0x07fd, 0x0001, 1, "%s MIDI B"},
+        { USB_ID(0x07fd, 0x0001), 0, "%s MIDI A" },
+        { USB_ID(0x07fd, 0x0001), 1, "%s MIDI B" },
         /* Emagic Unitor8/AMT8/MT4 */
-        {0x086a, 0x0001, 8, "%s Broadcast"},
-        {0x086a, 0x0002, 8, "%s Broadcast"},
-        {0x086a, 0x0003, 4, "%s Broadcast"},
+        { USB_ID(0x086a, 0x0001), 8, "%s Broadcast" },
+        { USB_ID(0x086a, 0x0002), 8, "%s Broadcast" },
+        { USB_ID(0x086a, 0x0003), 4, "%s Broadcast" },
 };
 
 static void snd_usbmidi_init_substream(snd_usb_midi_t* umidi,
@@ -1044,7 +1043,6 @@ static void snd_usbmidi_init_substream(snd_usb_midi_t* umidi,
                                        snd_rawmidi_substream_t** rsubstream)
 {
         int i;
-        __u16 vendor, product;
         const char *name_format;
 
         snd_rawmidi_substream_t* substream = snd_usbmidi_find_substream(umidi, stream, number);
@@ -1055,11 +1053,8 @@ static void snd_usbmidi_init_substream(snd_usb_midi_t* umidi,
 
         /* TODO: read port name from jack descriptor */
         name_format = "%s MIDI %d";
-        vendor = le16_to_cpu(umidi->chip->dev->descriptor.idVendor);
-        product = le16_to_cpu(umidi->chip->dev->descriptor.idProduct);
         for (i = 0; i < ARRAY_SIZE(snd_usbmidi_port_names); ++i) {
-                if (snd_usbmidi_port_names[i].vendor == vendor &&
-                    snd_usbmidi_port_names[i].product == product &&
+                if (snd_usbmidi_port_names[i].id == umidi->chip->usb_id &&
                     snd_usbmidi_port_names[i].port == number) {
                         name_format = snd_usbmidi_port_names[i].name_format;
                         break;
@@ -1226,9 +1221,12 @@ static int snd_usbmidi_detect_endpoints(snd_usb_midi_t* umidi,
         struct usb_endpoint_descriptor* epd;
         int i, out_eps = 0, in_eps = 0;
 
-        if (le16_to_cpu(umidi->chip->dev->descriptor.idVendor) == 0x0582)
+        if (USB_ID_VENDOR(umidi->chip->usb_id) == 0x0582)
                 snd_usbmidi_switch_roland_altsetting(umidi);
 
+        if (endpoint[0].out_ep || endpoint[0].in_ep)
+                return 0;       
+
         intf = umidi->iface;
         if (!intf || intf->num_altsetting < 1)
                 return -ENOENT;
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 5f1906915aa6..e73c1c9d3e73 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -35,10 +35,11 @@
 #include <linux/usb.h>
 #include <sound/core.h>
 #include <sound/control.h>
+#include <sound/hwdep.h>
+#include <sound/info.h>
 
 #include "usbaudio.h"
 
-
 /*
  */
 
@@ -50,6 +51,31 @@ typedef struct usb_audio_term usb_audio_term_t;
 typedef struct usb_mixer_elem_info usb_mixer_elem_info_t;
 
 
+struct usb_mixer_interface {
+        snd_usb_audio_t *chip;
+        unsigned int ctrlif;
+        struct list_head list;
+        unsigned int ignore_ctl_error;
+        struct urb *urb;
+        usb_mixer_elem_info_t **id_elems; /* array[256], indexed by unit id */
+
+        /* Sound Blaster remote control stuff */
+        enum {
+                RC_NONE,
+                RC_EXTIGY,
+                RC_AUDIGY2NX,
+        } rc_type;
+        unsigned long rc_hwdep_open;
+        u32 rc_code;
+        wait_queue_head_t rc_waitq;
+        struct urb *rc_urb;
+        struct usb_ctrlrequest *rc_setup_packet;
+        u8 rc_buffer[6];
+
+        u8 audigy2nx_leds[3];
+};
+
+
 struct usb_audio_term {
         int id;
         int type;
@@ -62,26 +88,26 @@ struct usbmix_name_map;
 
 struct usb_mixer_build {
         snd_usb_audio_t *chip;
+        struct usb_mixer_interface *mixer;
         unsigned char *buffer;
         unsigned int buflen;
-        unsigned int ctrlif;
-        unsigned short vendor;
-        unsigned short product;
-        DECLARE_BITMAP(unitbitmap, 32*32);
+        DECLARE_BITMAP(unitbitmap, 256);
         usb_audio_term_t oterm;
         const struct usbmix_name_map *map;
+        const struct usbmix_selector_map *selector_map;
 };
 
 struct usb_mixer_elem_info {
-        snd_usb_audio_t *chip;
-        unsigned int ctrlif;
+        struct usb_mixer_interface *mixer;
+        usb_mixer_elem_info_t *next_id_elem; /* list of controls with same id */
+        snd_ctl_elem_id_t *elem_id;
         unsigned int id;
         unsigned int control;   /* CS or ICN (high byte) */
         unsigned int cmask; /* channel mask bitmap: 0 = master */
         int channels;
         int val_type;
         int min, max, res;
-        unsigned int initialized: 1;
+        u8 initialized;
 };
 
 
@@ -187,6 +213,21 @@ static int check_ignored_ctl(mixer_build_t *state, int unitid, int control)
         return 0;
 }
 
+/* get the mapped selector source name */
+static int check_mapped_selector_name(mixer_build_t *state, int unitid,
+                                      int index, char *buf, int buflen)
+{
+        const struct usbmix_selector_map *p;
+
+        if (! state->selector_map)
+                return 0;
+        for (p = state->selector_map; p->id; p++) {
+                if (p->id == unitid && index < p->count)
+                        return strlcpy(buf, p->names[index], buflen);
+        }
+        return 0;
+}
+
 /*
  * find an audio control unit with the given unit id
  */
@@ -301,16 +342,18 @@ static int get_ctl_value(usb_mixer_elem_info_t *cval, int request, int validx, i
         int timeout = 10;
 
         while (timeout-- > 0) {
-                if (snd_usb_ctl_msg(cval->chip->dev, usb_rcvctrlpipe(cval->chip->dev, 0),
+                if (snd_usb_ctl_msg(cval->mixer->chip->dev,
+                                    usb_rcvctrlpipe(cval->mixer->chip->dev, 0),
                                     request,
                                     USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
-                                    validx, cval->ctrlif | (cval->id << 8),
+                                    validx, cval->mixer->ctrlif | (cval->id << 8),
                                     buf, val_len, 100) >= 0) {
                         *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len));
                         return 0;
                 }
         }
-        snd_printdd(KERN_ERR "cannot get ctl value: req = 0x%x, wValue = 0x%x, wIndex = 0x%x, type = %d\n", request, validx, cval->ctrlif | (cval->id << 8), cval->val_type);
+        snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
+                    request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type);
         return -EINVAL;
 }
 
@@ -339,13 +382,15 @@ static int set_ctl_value(usb_mixer_elem_info_t *cval, int request, int validx, i
         buf[0] = value_set & 0xff;
         buf[1] = (value_set >> 8) & 0xff;
         while (timeout -- > 0)
-                if (snd_usb_ctl_msg(cval->chip->dev, usb_sndctrlpipe(cval->chip->dev, 0),
+                if (snd_usb_ctl_msg(cval->mixer->chip->dev,
+                                    usb_sndctrlpipe(cval->mixer->chip->dev, 0),
                                     request,
                                     USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
-                                    validx, cval->ctrlif | (cval->id << 8),
+                                    validx, cval->mixer->ctrlif | (cval->id << 8),
                                     buf, val_len, 100) >= 0)
                         return 0;
-        snd_printdd(KERN_ERR "cannot set ctl value: req = 0x%x, wValue = 0x%x, wIndex = 0x%x, type = %d, data = 0x%x/0x%x\n", request, validx, cval->ctrlif | (cval->id << 8), cval->val_type, buf[0], buf[1]);
+        snd_printdd(KERN_ERR "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n",
+                    request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type, buf[0], buf[1]);
         return -EINVAL;
 }
 
@@ -385,16 +430,22 @@ static int check_matrix_bitmap(unsigned char *bmap, int ich, int och, int num_ou
  * if failed, give up and free the control instance.
  */
 
-static int add_control_to_empty(snd_card_t *card, snd_kcontrol_t *kctl)
+static int add_control_to_empty(mixer_build_t *state, snd_kcontrol_t *kctl)
 {
+        usb_mixer_elem_info_t *cval = kctl->private_data;
         int err;
-        while (snd_ctl_find_id(card, &kctl->id))
+
+        while (snd_ctl_find_id(state->chip->card, &kctl->id))
                 kctl->id.index++;
-        if ((err = snd_ctl_add(card, kctl)) < 0) {
+        if ((err = snd_ctl_add(state->chip->card, kctl)) < 0) {
                 snd_printd(KERN_ERR "cannot add control (err = %d)\n", err);
                 snd_ctl_free_one(kctl);
+                return err;
         }
-        return err;
+        cval->elem_id = &kctl->id;
+        cval->next_id_elem = state->mixer->id_elems[cval->id];
+        state->mixer->id_elems[cval->id] = cval;
+        return 0;
 }
 
 
@@ -572,10 +623,8 @@ static struct usb_feature_control_info audio_feature_info[] = {
 /* private_free callback */
 static void usb_mixer_elem_free(snd_kcontrol_t *kctl)
 {
-        if (kctl->private_data) {
-                kfree(kctl->private_data);
-                kctl->private_data = NULL;
-        }
+        kfree(kctl->private_data);
+        kctl->private_data = NULL;
 }
 
 
@@ -608,7 +657,8 @@ static int get_min_max(usb_mixer_elem_info_t *cval, int default_min)
                 }
                 if (get_ctl_value(cval, GET_MAX, (cval->control << 8) | minchn, &cval->max) < 0 ||
                     get_ctl_value(cval, GET_MIN, (cval->control << 8) | minchn, &cval->min) < 0) {
-                        snd_printd(KERN_ERR "%d:%d: cannot get min/max values for control %d (id %d)\n", cval->id, cval->ctrlif, cval->control, cval->id);
+                        snd_printd(KERN_ERR "%d:%d: cannot get min/max values for control %d (id %d)\n",
+                                   cval->id, cval->mixer->ctrlif, cval->control, cval->id);
                         return -EINVAL;
                 }
                 if (get_ctl_value(cval, GET_RES, (cval->control << 8) | minchn, &cval->res) < 0) {
@@ -668,7 +718,7 @@ static int mixer_ctl_feature_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
                         if (cval->cmask & (1 << c)) {
                                 err = get_cur_mix_value(cval, c + 1, &val);
                                 if (err < 0) {
-                                        if (cval->chip->ignore_ctl_error) {
+                                        if (cval->mixer->ignore_ctl_error) {
                                                 ucontrol->value.integer.value[0] = cval->min;
                                                 return 0;
                                         }
@@ -684,7 +734,7 @@ static int mixer_ctl_feature_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
                 /* master channel */
                 err = get_cur_mix_value(cval, 0, &val);
                 if (err < 0) {
-                        if (cval->chip->ignore_ctl_error) {
+                        if (cval->mixer->ignore_ctl_error) {
                                 ucontrol->value.integer.value[0] = cval->min;
                                 return 0;
                         }
@@ -710,7 +760,7 @@ static int mixer_ctl_feature_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
                         if (cval->cmask & (1 << c)) {
                                 err = get_cur_mix_value(cval, c + 1, &oval);
                                 if (err < 0) {
-                                        if (cval->chip->ignore_ctl_error)
+                                        if (cval->mixer->ignore_ctl_error)
                                                 return 0;
                                         return err;
                                 }
@@ -727,7 +777,7 @@ static int mixer_ctl_feature_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
         } else {
                 /* master channel */
                 err = get_cur_mix_value(cval, 0, &oval);
-                if (err < 0 && cval->chip->ignore_ctl_error)
+                if (err < 0 && cval->mixer->ignore_ctl_error)
                         return 0;
                 if (err < 0)
                         return err;
@@ -779,8 +829,7 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
                 snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                 return;
         }
-        cval->chip = state->chip;
-        cval->ctrlif = state->ctrlif;
+        cval->mixer = state->mixer;
         cval->id = unitid;
         cval->control = control;
         cval->cmask = ctl_mask;
@@ -855,16 +904,21 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
         /* note that detection between firmware 2.1.1.7 (N101) and later 2.1.1.21 */
         /* is not very clear from datasheets */
         /* I hope that the min value is -15360 for newer firmware --jk */
-        if (((state->vendor == 0x471 && (state->product == 0x104 || state->product == 0x105 || state->product == 0x101)) ||
-             (state->vendor == 0x672 && state->product == 0x1041)) && !strcmp(kctl->id.name, "PCM Playback Volume") &&
-             cval->min == -15616) {
-                snd_printk("USB Audio: using volume control quirk for the UDA1321/N101 chip\n");
-                cval->max = -256;
+        switch (state->chip->usb_id) {
+        case USB_ID(0x0471, 0x0101):
+        case USB_ID(0x0471, 0x0104):
+        case USB_ID(0x0471, 0x0105):
+        case USB_ID(0x0672, 0x1041):
+                if (!strcmp(kctl->id.name, "PCM Playback Volume") &&
+                    cval->min == -15616) {
+                        snd_printk("using volume control quirk for the UDA1321/N101 chip\n");
+                        cval->max = -256;
+                }
         }
 
         snd_printdd(KERN_INFO "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",
                     cval->id, kctl->id.name, cval->channels, cval->min, cval->max, cval->res);
-        add_control_to_empty(state->chip->card, kctl);
+        add_control_to_empty(state, kctl);
 }
 
 
@@ -947,8 +1001,7 @@ static void build_mixer_unit_ctl(mixer_build_t *state, unsigned char *desc,
         if (! cval)
                 return;
 
-        cval->chip = state->chip;
-        cval->ctrlif = state->ctrlif;
+        cval->mixer = state->mixer;
         cval->id = unitid;
         cval->control = in_ch + 1; /* based on 1 */
         cval->val_type = USB_MIXER_S16;
@@ -979,7 +1032,7 @@ static void build_mixer_unit_ctl(mixer_build_t *state, unsigned char *desc,
 
         snd_printdd(KERN_INFO "[%d] MU [%s] ch = %d, val = %d/%d\n",
                     cval->id, kctl->id.name, cval->channels, cval->min, cval->max);
-        add_control_to_empty(state->chip->card, kctl);
+        add_control_to_empty(state, kctl);
 }
 
 
@@ -1042,7 +1095,7 @@ static int mixer_ctl_procunit_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
         int err, val;
 
         err = get_cur_ctl_value(cval, cval->control << 8, &val);
-        if (err < 0 && cval->chip->ignore_ctl_error) {
+        if (err < 0 && cval->mixer->ignore_ctl_error) {
                 ucontrol->value.integer.value[0] = cval->min;
                 return 0;
         }
@@ -1061,7 +1114,7 @@ static int mixer_ctl_procunit_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 
         err = get_cur_ctl_value(cval, cval->control << 8, &oval);
         if (err < 0) {
-                if (cval->chip->ignore_ctl_error)
+                if (cval->mixer->ignore_ctl_error)
                         return 0;
                 return err;
         }
@@ -1179,9 +1232,6 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
         }
 
         type = combine_word(&dsc[4]);
-        if (! type)
-                return 0; /* undefined? */
-
         for (info = list; info && info->type; info++)
                 if (info->type == type)
                         break;
@@ -1199,8 +1249,7 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
                         snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                         return -ENOMEM;
                 }
-                cval->chip = state->chip;
-                cval->ctrlif = state->ctrlif;
+                cval->mixer = state->mixer;
                 cval->id = unitid;
                 cval->control = valinfo->control;
                 cval->val_type = valinfo->val_type;
@@ -1241,7 +1290,7 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
 
                 snd_printdd(KERN_INFO "[%d] PU [%s] ch = %d, val = %d/%d\n",
                             cval->id, kctl->id.name, cval->channels, cval->min, cval->max);
-                if ((err = add_control_to_empty(state->chip->card, kctl)) < 0)
+                if ((err = add_control_to_empty(state, kctl)) < 0)
                         return err;
         }
         return 0;
@@ -1289,7 +1338,7 @@ static int mixer_ctl_selector_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 
         err = get_cur_ctl_value(cval, 0, &val);
         if (err < 0) {
-                if (cval->chip->ignore_ctl_error) {
+                if (cval->mixer->ignore_ctl_error) {
                         ucontrol->value.enumerated.item[0] = 0;
                         return 0;
                 }
@@ -1308,7 +1357,7 @@ static int mixer_ctl_selector_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 
         err = get_cur_ctl_value(cval, 0, &oval);
         if (err < 0) {
-                if (cval->chip->ignore_ctl_error)
+                if (cval->mixer->ignore_ctl_error)
                         return 0;
                 return err;
         }
@@ -1386,8 +1435,7 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
                 snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                 return -ENOMEM;
         }
-        cval->chip = state->chip;
-        cval->ctrlif = state->ctrlif;
+        cval->mixer = state->mixer;
         cval->id = unitid;
         cval->val_type = USB_MIXER_U8;
         cval->channels = 1;
@@ -1415,7 +1463,9 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
                         kfree(cval);
                         return -ENOMEM;
                 }
-                if (check_input_term(state, desc[5 + i], &iterm) >= 0)
+                len = check_mapped_selector_name(state, unitid, i, namelist[i],
+                                                 MAX_ITEM_NAME_LEN);
+                if (! len && check_input_term(state, desc[5 + i], &iterm) >= 0)
                         len = get_term_name(state, &iterm, namelist[i], MAX_ITEM_NAME_LEN, 0);
                 if (! len)
                         sprintf(namelist[i], "Input %d", i);
@@ -1450,7 +1500,7 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
 
         snd_printdd(KERN_INFO "[%d] SU [%s] items = %d\n",
                     cval->id, kctl->id.name, num_ins);
-        if ((err = add_control_to_empty(state->chip->card, kctl)) < 0)
+        if ((err = add_control_to_empty(state, kctl)) < 0)
                 return err;
 
         return 0;
@@ -1493,41 +1543,55 @@ static int parse_audio_unit(mixer_build_t *state, int unitid)
         }
 }
 
+static void snd_usb_mixer_free(struct usb_mixer_interface *mixer)
+{
+        kfree(mixer->id_elems);
+        if (mixer->urb) {
+                kfree(mixer->urb->transfer_buffer);
+                usb_free_urb(mixer->urb);
+        }
+        if (mixer->rc_urb)
+                usb_free_urb(mixer->rc_urb);
+        kfree(mixer->rc_setup_packet);
+        kfree(mixer);
+}
+
+static int snd_usb_mixer_dev_free(snd_device_t *device)
+{
+        struct usb_mixer_interface *mixer = device->device_data;
+        snd_usb_mixer_free(mixer);
+        return 0;
+}
+
 /*
  * create mixer controls
  *
  * walk through all OUTPUT_TERMINAL descriptors to search for mixers
  */
-int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
+static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
 {
         unsigned char *desc;
         mixer_build_t state;
         int err;
         const struct usbmix_ctl_map *map;
-        struct usb_device_descriptor *dev = &chip->dev->descriptor;
-        struct usb_host_interface *hostif = &usb_ifnum_to_if(chip->dev, ctrlif)->altsetting[0];
-
-        strcpy(chip->card->mixername, "USB Mixer");
+        struct usb_host_interface *hostif;
 
+        hostif = &usb_ifnum_to_if(mixer->chip->dev, mixer->ctrlif)->altsetting[0];
         memset(&state, 0, sizeof(state));
-        state.chip = chip;
+        state.chip = mixer->chip;
+        state.mixer = mixer;
         state.buffer = hostif->extra;
         state.buflen = hostif->extralen;
-        state.ctrlif = ctrlif;
-        state.vendor = le16_to_cpu(dev->idVendor);
-        state.product = le16_to_cpu(dev->idProduct);
 
         /* check the mapping table */
-        for (map = usbmix_ctl_maps; map->vendor; map++) {
-                if (map->vendor == state.vendor && map->product == state.product) {
+        for (map = usbmix_ctl_maps; map->id; map++) {
+                if (map->id == state.chip->usb_id) {
                         state.map = map->map;
-                        chip->ignore_ctl_error = map->ignore_ctl_error;
+                        state.selector_map = map->selector_map;
+                        mixer->ignore_ctl_error = map->ignore_ctl_error;
                         break;
                 }
         }
-#ifdef IGNORE_CTL_ERROR
-        chip->ignore_ctl_error = 1;
-#endif
 
         desc = NULL;
         while ((desc = snd_usb_find_csint_desc(hostif->extra, hostif->extralen, desc, OUTPUT_TERMINAL)) != NULL) {
@@ -1543,3 +1607,393 @@ int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
         }
         return 0;
 }
+
+static void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer,
+                                    int unitid)
+{
+        usb_mixer_elem_info_t *info;
+
+        for (info = mixer->id_elems[unitid]; info; info = info->next_id_elem)
+                snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                               info->elem_id);
+}
+
+static void snd_usb_mixer_memory_change(struct usb_mixer_interface *mixer,
+                                        int unitid)
+{
+        if (mixer->rc_type == RC_NONE)
+                return;
+        /* unit ids specific to Extigy/Audigy 2 NX: */
+        switch (unitid) {
+        case 0: /* remote control */
+                mixer->rc_urb->dev = mixer->chip->dev;
+                usb_submit_urb(mixer->rc_urb, GFP_ATOMIC);
+                break;
+        case 4: /* digital in jack */
+        case 7: /* line in jacks */
+        case 19: /* speaker out jacks */
+        case 20: /* headphones out jack */
+                break;
+        default:
+                snd_printd(KERN_DEBUG "memory change in unknown unit %d\n", unitid);
+                break;
+        }
+}
+
+static void snd_usb_mixer_status_complete(struct urb *urb, struct pt_regs *regs)
+{
+        struct usb_mixer_interface *mixer = urb->context;
+
+        if (urb->status == 0) {
+                u8 *buf = urb->transfer_buffer;
+                int i;
+
+                for (i = urb->actual_length; i >= 2; buf += 2, i -= 2) {
+                        snd_printd(KERN_DEBUG "status interrupt: %02x %02x\n",
+                                   buf[0], buf[1]);
+                        /* ignore any notifications not from the control interface */
+                        if ((buf[0] & 0x0f) != 0)
+                                continue;
+                        if (!(buf[0] & 0x40))
+                                snd_usb_mixer_notify_id(mixer, buf[1]);
+                        else
+                                snd_usb_mixer_memory_change(mixer, buf[1]);
+                }
+        }
+        if (urb->status != -ENOENT && urb->status != -ECONNRESET) {
+                urb->dev = mixer->chip->dev;
+                usb_submit_urb(urb, GFP_ATOMIC);
+        }
+}
+
+/* create the handler for the optional status interrupt endpoint */
+static int snd_usb_mixer_status_create(struct usb_mixer_interface *mixer)
+{
+        struct usb_host_interface *hostif;
+        struct usb_endpoint_descriptor *ep;
+        void *transfer_buffer;
+        int buffer_length;
+        unsigned int epnum;
+
+        hostif = &usb_ifnum_to_if(mixer->chip->dev, mixer->ctrlif)->altsetting[0];
+        /* we need one interrupt input endpoint */
+        if (get_iface_desc(hostif)->bNumEndpoints < 1)
+                return 0;
+        ep = get_endpoint(hostif, 0);
+        if ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) != USB_DIR_IN ||
+            (ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT)
+                return 0;
+
+        epnum = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+        buffer_length = le16_to_cpu(ep->wMaxPacketSize);
+        transfer_buffer = kmalloc(buffer_length, GFP_KERNEL);
+        if (!transfer_buffer)
+                return -ENOMEM;
+        mixer->urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!mixer->urb) {
+                kfree(transfer_buffer);
+                return -ENOMEM;
+        }
+        usb_fill_int_urb(mixer->urb, mixer->chip->dev,
+                         usb_rcvintpipe(mixer->chip->dev, epnum),
+                         transfer_buffer, buffer_length,
+                         snd_usb_mixer_status_complete, mixer, ep->bInterval);
+        usb_submit_urb(mixer->urb, GFP_KERNEL);
+        return 0;
+}
+
+static void snd_usb_soundblaster_remote_complete(struct urb *urb,
+                                                 struct pt_regs *regs)
+{
+        struct usb_mixer_interface *mixer = urb->context;
+        /*
+         * format of remote control data:
+         * Extigy:      xx 00
+         * Audigy 2 NX: 06 80 xx 00 00 00
+         */
+        int offset = mixer->rc_type == RC_EXTIGY ? 0 : 2;
+        u32 code;
+
+        if (urb->status < 0 || urb->actual_length <= offset)
+                return;
+        code = mixer->rc_buffer[offset];
+        /* the Mute button actually changes the mixer control */
+        if (code == 13)
+                snd_usb_mixer_notify_id(mixer, 18);
+        mixer->rc_code = code;
+        wmb();
+        wake_up(&mixer->rc_waitq);
+}
+
+static int snd_usb_sbrc_hwdep_open(snd_hwdep_t *hw, struct file *file)
+{
+        struct usb_mixer_interface *mixer = hw->private_data;
+
+        if (test_and_set_bit(0, &mixer->rc_hwdep_open))
+                return -EBUSY;
+        return 0;
+}
+
+static int snd_usb_sbrc_hwdep_release(snd_hwdep_t *hw, struct file *file)
+{
+        struct usb_mixer_interface *mixer = hw->private_data;
+
+        clear_bit(0, &mixer->rc_hwdep_open);
+        smp_mb__after_clear_bit();
+        return 0;
+}
+
+static long snd_usb_sbrc_hwdep_read(snd_hwdep_t *hw, char __user *buf,
+                                     long count, loff_t *offset)
+{
+        struct usb_mixer_interface *mixer = hw->private_data;
+        int err;
+        u32 rc_code;
+
+        if (count != 1 && count != 4)
+                return -EINVAL;
+        err = wait_event_interruptible(mixer->rc_waitq,
+                                       (rc_code = xchg(&mixer->rc_code, 0)) != 0);
+        if (err == 0) {
+                if (count == 1)
+                        err = put_user(rc_code, buf);
+                else
+                        err = put_user(rc_code, (u32 __user *)buf);
+        }
+        return err < 0 ? err : count;
+}
+
+static unsigned int snd_usb_sbrc_hwdep_poll(snd_hwdep_t *hw, struct file *file,
+                                            poll_table *wait)
+{
+        struct usb_mixer_interface *mixer = hw->private_data;
+
+        poll_wait(file, &mixer->rc_waitq, wait);
+        return mixer->rc_code ? POLLIN | POLLRDNORM : 0;
+}
+
+static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
+{
+        snd_hwdep_t *hwdep;
+        int err, len;
+
+        switch (mixer->chip->usb_id) {
+        case USB_ID(0x041e, 0x3000):
+                mixer->rc_type = RC_EXTIGY;
+                len = 2;
+                break;
+        case USB_ID(0x041e, 0x3020):
+                mixer->rc_type = RC_AUDIGY2NX;
+                len = 6;
+                break;
+        default:
+                return 0;
+        }
+
+        init_waitqueue_head(&mixer->rc_waitq);
+        err = snd_hwdep_new(mixer->chip->card, "SB remote control", 0, &hwdep);
+        if (err < 0)
+                return err;
+        snprintf(hwdep->name, sizeof(hwdep->name),
+                 "%s remote control", mixer->chip->card->shortname);
+        hwdep->iface = SNDRV_HWDEP_IFACE_SB_RC;
+        hwdep->private_data = mixer;
+        hwdep->ops.read = snd_usb_sbrc_hwdep_read;
+        hwdep->ops.open = snd_usb_sbrc_hwdep_open;
+        hwdep->ops.release = snd_usb_sbrc_hwdep_release;
+        hwdep->ops.poll = snd_usb_sbrc_hwdep_poll;
+
+        mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!mixer->rc_urb)
+                return -ENOMEM;
+        mixer->rc_setup_packet = kmalloc(sizeof(*mixer->rc_setup_packet), GFP_KERNEL);
+        if (!mixer->rc_setup_packet) {
+                usb_free_urb(mixer->rc_urb);
+                mixer->rc_urb = NULL;
+                return -ENOMEM;
+        }
+        mixer->rc_setup_packet->bRequestType =
+                USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
+        mixer->rc_setup_packet->bRequest = GET_MEM;
+        mixer->rc_setup_packet->wValue = cpu_to_le16(0);
+        mixer->rc_setup_packet->wIndex = cpu_to_le16(0);
+        mixer->rc_setup_packet->wLength = cpu_to_le16(len);
+        usb_fill_control_urb(mixer->rc_urb, mixer->chip->dev,
+                             usb_rcvctrlpipe(mixer->chip->dev, 0),
+                             (u8*)mixer->rc_setup_packet, mixer->rc_buffer, len,
+                             snd_usb_soundblaster_remote_complete, mixer);
+        return 0;
+}
+
+static int snd_audigy2nx_led_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_audigy2nx_led_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+        int index = kcontrol->private_value;
+
+        ucontrol->value.integer.value[0] = mixer->audigy2nx_leds[index];
+        return 0;
+}
+
+static int snd_audigy2nx_led_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+        int index = kcontrol->private_value;
+        int value = ucontrol->value.integer.value[0];
+        int err, changed;
+
+        if (value > 1)
+                return -EINVAL;
+        changed = value != mixer->audigy2nx_leds[index];
+        err = snd_usb_ctl_msg(mixer->chip->dev,
+                              usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
+                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
+                              value, index + 2, NULL, 0, 100);
+        if (err < 0)
+                return err;
+        mixer->audigy2nx_leds[index] = value;
+        return changed;
+}
+
+static snd_kcontrol_new_t snd_audigy2nx_controls[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "CMSS LED Switch",
+                .info = snd_audigy2nx_led_info,
+                .get = snd_audigy2nx_led_get,
+                .put = snd_audigy2nx_led_put,
+                .private_value = 0,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Power LED Switch",
+                .info = snd_audigy2nx_led_info,
+                .get = snd_audigy2nx_led_get,
+                .put = snd_audigy2nx_led_put,
+                .private_value = 1,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Dolby Digital LED Switch",
+                .info = snd_audigy2nx_led_info,
+                .get = snd_audigy2nx_led_get,
+                .put = snd_audigy2nx_led_put,
+                .private_value = 2,
+        },
+};
+
+static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer)
+{
+        int i, err;
+
+        for (i = 0; i < ARRAY_SIZE(snd_audigy2nx_controls); ++i) {
+                err = snd_ctl_add(mixer->chip->card,
+                                  snd_ctl_new1(&snd_audigy2nx_controls[i], mixer));
+                if (err < 0)
+                        return err;
+        }
+        mixer->audigy2nx_leds[1] = 1; /* Power LED is on by default */
+        return 0;
+}
+
+static void snd_audigy2nx_proc_read(snd_info_entry_t *entry,
+                                    snd_info_buffer_t *buffer)
+{
+        static const struct {
+                int unitid;
+                const char *name;
+        } jacks[] = {
+                {4,  "dig in "},
+                {7,  "line in"},
+                {19, "spk out"},
+                {20, "hph out"},
+        };
+        struct usb_mixer_interface *mixer = entry->private_data;
+        int i, err;
+        u8 buf[3];
+
+        snd_iprintf(buffer, "%s jacks\n\n", mixer->chip->card->shortname);
+        for (i = 0; i < ARRAY_SIZE(jacks); ++i) {
+                snd_iprintf(buffer, "%s: ", jacks[i].name);
+                err = snd_usb_ctl_msg(mixer->chip->dev,
+                                      usb_rcvctrlpipe(mixer->chip->dev, 0),
+                                      GET_MEM, USB_DIR_IN | USB_TYPE_CLASS |
+                                      USB_RECIP_INTERFACE, 0,
+                                      jacks[i].unitid << 8, buf, 3, 100);
+                if (err == 3 && buf[0] == 3)
+                        snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]);
+                else
+                        snd_iprintf(buffer, "?\n");
+        }
+}
+
+int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
+{
+        static snd_device_ops_t dev_ops = {
+                .dev_free = snd_usb_mixer_dev_free
+        };
+        struct usb_mixer_interface *mixer;
+        int err;
+
+        strcpy(chip->card->mixername, "USB Mixer");
+
+        mixer = kcalloc(1, sizeof(*mixer), GFP_KERNEL);
+        if (!mixer)
+                return -ENOMEM;
+        mixer->chip = chip;
+        mixer->ctrlif = ctrlif;
+#ifdef IGNORE_CTL_ERROR
+        mixer->ignore_ctl_error = 1;
+#endif
+        mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL);
+        if (!mixer->id_elems) {
+                kfree(mixer);
+                return -ENOMEM;
+        }
+
+        if ((err = snd_usb_mixer_controls(mixer)) < 0 ||
+            (err = snd_usb_mixer_status_create(mixer)) < 0)
+                goto _error;
+
+        if ((err = snd_usb_soundblaster_remote_init(mixer)) < 0)
+                goto _error;
+
+        if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020)) {
+                snd_info_entry_t *entry;
+
+                if ((err = snd_audigy2nx_controls_create(mixer)) < 0)
+                        goto _error;
+                if (!snd_card_proc_new(chip->card, "audigy2nx", &entry))
+                        snd_info_set_text_ops(entry, mixer, 1024,
+                                              snd_audigy2nx_proc_read);
+        }
+
+        err = snd_device_new(chip->card, SNDRV_DEV_LOWLEVEL, mixer, &dev_ops);
+        if (err < 0)
+                goto _error;
+        list_add(&mixer->list, &chip->mixer_list);
+        return 0;
+
+_error:
+        snd_usb_mixer_free(mixer);
+        return err;
+}
+
+void snd_usb_mixer_disconnect(struct list_head *p)
+{
+        struct usb_mixer_interface *mixer;
+        
+        mixer = list_entry(p, struct usb_mixer_interface, list);
+        if (mixer->urb)
+                usb_kill_urb(mixer->urb);
+        if (mixer->rc_urb)
+                usb_kill_urb(mixer->rc_urb);
+}
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c
index c69b4b0875f8..f05500b05ec0 100644
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/usbmixer_maps.c
@@ -26,10 +26,16 @@ struct usbmix_name_map {
         int control;
 };
 
+struct usbmix_selector_map {
+        int id;
+        int count;
+        const char **names;
+};
+
 struct usbmix_ctl_map {
-        int vendor;
-        int product;
+        u32 id;
         const struct usbmix_name_map *map;
+        const struct usbmix_selector_map *selector_map;
         int ignore_ctl_error;
 };
 
@@ -91,6 +97,96 @@ static struct usbmix_name_map extigy_map[] = {
         { 0 } /* terminator */
 };
 
+/* Sound Blaster MP3+ controls mapping
+ * The default mixer channels have totally misleading names,
+ * e.g. no Master and fake PCM volume
+ *                      Pavel Mihaylov <bin@bash.info>
+ */
+static struct usbmix_name_map mp3plus_map[] = {
+        /* 1: IT pcm */
+        /* 2: IT mic */
+        /* 3: IT line */
+        /* 4: IT digital in */
+        /* 5: OT digital out */
+        /* 6: OT speaker */
+        /* 7: OT pcm capture */
+        { 8, "Capture Input Source" }, /* FU, default PCM Capture Source */
+                /* (Mic, Input 1 = Line input, Input 2 = Optical input) */
+        { 9, "Master Playback" }, /* FU, default Speaker 1 */
+        /* { 10, "Mic Capture", 1 }, */ /* FU, Mic Capture */
+        /* { 10, "Mic Capture", 2 }, */ /* FU, Mic Capture */
+        { 10, "Mic Boost", 7 }, /* FU, default Auto Gain Input */
+        { 11, "Line Capture" }, /* FU, default PCM Capture */
+        { 12, "Digital In Playback" }, /* FU, default PCM 1 */
+        /* { 13, "Mic Playback" }, */ /* FU, default Mic Playback */
+        { 14, "Line Playback" }, /* FU, default Speaker */
+        /* 15: MU */
+        { 0 } /* terminator */
+};
+
+/* Topology of SB Audigy 2 NX
+
+          +----------------------------->EU[27]--+
+          |                                      v
+          | +----------------------------------->SU[29]---->FU[22]-->Dig_OUT[24]
+          | |                                    ^
+USB_IN[1]-+------------+              +->EU[17]->+->FU[11]-+
+            |          v              |          v         |
+Dig_IN[4]---+->FU[6]-->MU[16]->FU[18]-+->EU[21]->SU[31]----->FU[30]->Hph_OUT[20]
+            |          ^              |                    |
+Lin_IN[7]-+--->FU[8]---+              +->EU[23]->FU[28]------------->Spk_OUT[19]
+          | |                                              v
+          +--->FU[12]------------------------------------->SU[14]--->USB_OUT[15]
+            |                                              ^
+            +->FU[13]--------------------------------------+
+*/
+static struct usbmix_name_map audigy2nx_map[] = {
+        /* 1: IT pcm playback */
+        /* 4: IT digital in */
+        { 6, "Digital In Playback" }, /* FU */
+        /* 7: IT line in */
+        { 8, "Line Playback" }, /* FU */
+        { 11, "What-U-Hear Capture" }, /* FU */
+        { 12, "Line Capture" }, /* FU */
+        { 13, "Digital In Capture" }, /* FU */
+        { 14, "Capture Source" }, /* SU */
+        /* 15: OT pcm capture */
+        /* 16: MU w/o controls */
+        { 17, NULL }, /* DISABLED: EU (for what?) */
+        { 18, "Master Playback" }, /* FU */
+        /* 19: OT speaker */
+        /* 20: OT headphone */
+        { 21, NULL }, /* DISABLED: EU (for what?) */
+        { 22, "Digital Out Playback" }, /* FU */
+        { 23, NULL }, /* DISABLED: EU (for what?) */
+        /* 24: OT digital out */
+        { 27, NULL }, /* DISABLED: EU (for what?) */
+        { 28, "Speaker Playback" }, /* FU */
+        { 29, "Digital Out Source" }, /* SU */
+        { 30, "Headphone Playback" }, /* FU */
+        { 31, "Headphone Source" }, /* SU */
+        { 0 } /* terminator */
+};
+
+static struct usbmix_selector_map audigy2nx_selectors[] = {
+        {
+                .id = 14, /* Capture Source */
+                .count = 3,
+                .names = (const char*[]) {"Line", "Digital In", "What-U-Hear"}
+        },
+        {
+                .id = 29, /* Digital Out Source */
+                .count = 3,
+                .names = (const char*[]) {"Front", "PCM", "Digital In"}
+        },
+        {
+                .id = 31, /* Headphone Source */
+                .count = 2,
+                .names = (const char*[]) {"Front", "Side"}
+        },
+        { 0 } /* terminator */
+};
+
 /* LineX FM Transmitter entry - needed to bypass controls bug */
 static struct usbmix_name_map linex_map[] = {
         /* 1: IT pcm */
@@ -127,9 +223,29 @@ static struct usbmix_name_map justlink_map[] = {
  */
 
 static struct usbmix_ctl_map usbmix_ctl_maps[] = {
-        { 0x41e, 0x3000, extigy_map, 1 },
-        { 0x8bb, 0x2702, linex_map, 1 },
-        { 0xc45, 0x1158, justlink_map, 0 },
+        {
+                .id = USB_ID(0x041e, 0x3000),
+                .map = extigy_map,
+                .ignore_ctl_error = 1,
+        },
+        {
+                .id = USB_ID(0x041e, 0x3010),
+                .map = mp3plus_map,
+        },
+        {
+                .id = USB_ID(0x041e, 0x3020),
+                .map = audigy2nx_map,
+                .selector_map = audigy2nx_selectors,
+        },
+        {
+                .id = USB_ID(0x08bb, 0x2702),
+                .map = linex_map,
+                .ignore_ctl_error = 1,
+        },
+        {
+                .id = USB_ID(0x0c45, 0x1158),
+                .map = justlink_map,
+        },
         { 0 } /* terminator */
 };
 
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 88bbd944d4be..f5135641b3e2 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -203,11 +203,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "EDIROL",
                 .product_name = "UM-4",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x000f,
-                        .in_cables  = 0x000f
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x000f,
+                                        .in_cables  = 0x000f
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -216,11 +233,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "Roland",
                 .product_name = "SC-8850",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x003f,
-                        .in_cables  = 0x003f
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x003f,
+                                        .in_cables  = 0x003f
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -229,11 +263,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "Roland",
                 .product_name = "U-8",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0005,
-                        .in_cables  = 0x0005
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x0005,
+                                        .in_cables  = 0x0005
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -242,11 +293,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "EDIROL",
                 .product_name = "UM-2",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0003,
-                        .in_cables  = 0x0003
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x0003,
+                                        .in_cables  = 0x0003
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -255,11 +323,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "Roland",
                 .product_name = "SC-8820",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0013,
-                        .in_cables  = 0x0013
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x0013,
+                                        .in_cables  = 0x0013
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -268,11 +353,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "Roland",
                 .product_name = "PC-300",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0001,
-                        .in_cables  = 0x0001
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x0001,
+                                        .in_cables  = 0x0001
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -281,11 +383,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "EDIROL",
                 .product_name = "UM-1",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0001,
-                        .in_cables  = 0x0001
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x0001,
+                                        .in_cables  = 0x0001
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -294,11 +413,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "Roland",
                 .product_name = "SK-500",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0013,
-                        .in_cables  = 0x0013
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x0013,
+                                        .in_cables  = 0x0013
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -421,11 +557,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "EDIROL",
                 .product_name = "SD-90",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x000f,
-                        .in_cables  = 0x000f
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x000f,
+                                        .in_cables  = 0x000f
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -434,11 +587,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "Roland",
                 .product_name = "MMP-2",
-                .ifnum = 2,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0001,
-                        .in_cables  = 0x0001
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const snd_usb_midi_endpoint_info_t) {
+                                        .out_cables = 0x0001,
+                                        .in_cables  = 0x0001
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
@@ -609,15 +779,33 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 {
+        /*
+         * This quirk is for the "Advanced Driver" mode.  If off, the GS-10
+         * has ID 0x003c and is standard compliant, but has only 16-bit PCM
+         * and no MIDI.
+         */
         USB_DEVICE_VENDOR_SPEC(0x0582, 0x003b),
         .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
                 .vendor_name = "BOSS",
                 .product_name = "GS-10",
-                .ifnum = 3,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const snd_usb_midi_endpoint_info_t) {
-                        .out_cables = 0x0003,
-                        .in_cables  = 0x0003
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = & (const snd_usb_audio_quirk_t[]) {
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 3,
+                                .type = QUIRK_MIDI_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = -1
+                        }
                 }
         }
 },
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 89ee8b732013..e6e6da159671 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -442,7 +442,7 @@ static void usX2Y_usb_disconnect(struct usb_device* device, void* ptr)
                 snd_card_disconnect((snd_card_t*)ptr);
                 /* release the midi resources */
                 list_for_each(p, &usX2Y->chip.midi_list) {
-                        snd_usbmidi_disconnect(p, &snd_usX2Y_usb_driver);
+                        snd_usbmidi_disconnect(p);
                 }
                 if (usX2Y->us428ctls_sharedmem) 
                         wake_up(&usX2Y->us428ctls_wait_queue_head);
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 4c292e090069..62dfd28b3b07 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -401,10 +401,8 @@ static void usX2Y_urbs_release(snd_usX2Y_substream_t *subs)
         for (i = 0; i < NRURBS; i++)
                 usX2Y_urb_release(subs->urb + i, subs != subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]);
 
-        if (subs->tmpbuf) {
-                kfree(subs->tmpbuf);
-                subs->tmpbuf = NULL;
-        }
+        kfree(subs->tmpbuf);
+        subs->tmpbuf = NULL;
 }
 /*
  * initialize a substream's urbs