---

yaml --- r: 84555 b: refs/heads/master c: 7e5c1e8 h: refs/heads/master i: 84553: a5363db 84551: 2b47b89 v: v3
git-mirror · Feb 8, 2008 · 4871180 · 4871180
1 parent a8b4a2d
commit 4871180
Show file tree

Hide file tree

Showing 234 changed files with 15,038 additions and 12,844 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7511ec8115487ccea2ce93bf58d5e5cd2c1c0a3
+refs/heads/master: 7e5c1e830b2310359a4cfbbf89895dde4abd996a
diff --git a/trunk/Documentation/DocBook/scsi.tmpl b/trunk/Documentation/DocBook/scsi.tmpl
@@ -12,7 +12,7 @@
         <surname>Bottomley</surname>
         <affiliation>
           <address>
-            <email>James.Bottomley@hansenpartnership.com</email>
+            <email>James.Bottomley@steeleye.com</email>
           </address>
         </affiliation>
       </author>

diff --git a/trunk/Documentation/hwmon/ads7828 b/trunk/Documentation/hwmon/ads7828
diff --git a/trunk/Documentation/hwmon/it87 b/trunk/Documentation/hwmon/it87
@@ -30,7 +30,7 @@ Supported chips:
     Datasheet: No longer be available
 
 Authors:
-    Christophe Gauthron
+    Christophe Gauthron <chrisg@0-in.com>
     Jean Delvare <khali@linux-fr.org>
 
 

diff --git a/trunk/Documentation/hwmon/lm78 b/trunk/Documentation/hwmon/lm78
@@ -4,12 +4,12 @@ Kernel driver lm78
 Supported chips:
   * National Semiconductor LM78 / LM78-J
     Prefix: 'lm78'
-    Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
+    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 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
+    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)
     Datasheet: Publicly available at the National Semiconductor website
                http://www.national.com/
 

diff --git a/trunk/Documentation/hwmon/lm87 b/trunk/Documentation/hwmon/lm87
@@ -4,12 +4,8 @@ Kernel driver lm87
 Supported chips:
   * National Semiconductor LM87
     Prefix: 'lm87'
-    Addresses scanned: I2C 0x2c - 0x2e
+    Addresses scanned: I2C 0x2c - 0x2f
     Datasheet: http://www.national.com/pf/LM/LM87.html
-  * Analog Devices ADM1024
-    Prefix: 'adm1024'
-    Addresses scanned: I2C 0x2c - 0x2e
-    Datasheet: http://www.analog.com/en/prod/0,2877,ADM1024,00.html
 
 Authors:
         Frodo Looijaard <frodol@dds.nl>,
@@ -23,12 +19,11 @@ Authors:
 Description
 -----------
 
-This driver implements support for the National Semiconductor LM87
-and the Analog Devices ADM1024.
+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. The ADM1024 is fully compatible.
+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

diff --git a/trunk/Documentation/hwmon/userspace-tools b/trunk/Documentation/hwmon/userspace-tools
@@ -14,7 +14,7 @@ Lm-sensors
 
 Core set of utilities that will allow you to obtain health information,
 setup monitoring limits etc. You can get them on their homepage
-http://www.lm-sensors.org/ or as a package from your Linux distribution.
+http://www.lm-sensors.nu/ or as a package from your Linux distribution.
 
 If from website:
 Get lm-sensors from project web site. Please note, you need only userspace

diff --git a/trunk/Documentation/hwmon/w83627ehf b/trunk/Documentation/hwmon/w83627ehf
@@ -23,9 +23,8 @@ W83627DHG super I/O chips. We will refer to them collectively as Winbond chips.
 
 The chips implement three temperature sensors, five fan rotation
 speed sensors, ten analog voltage sensors (only nine for the 627DHG), one
-VID (6 pins for the 627EHF/EHG, 8 pins for the 627DHG), alarms with beep
-warnings (control unimplemented), and some automatic fan regulation
-strategies (plus manual fan control mode).
+VID (6 pins), alarms with beep warnings (control unimplemented), and
+some automatic fan regulation strategies (plus manual fan control mode).
 
 Temperatures are measured in degrees Celsius and measurement resolution is 1
 degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when

diff --git a/trunk/Documentation/hwmon/w83627hf b/trunk/Documentation/hwmon/w83627hf
@@ -73,4 +73,5 @@ doesn't help, you may just ignore the bogus VID reading with no harm done.
 
 For further information on this driver see the w83781d driver documentation.
 
-[1] http://www.lm-sensors.org/browser/lm-sensors/trunk/doc/vid
+[1] http://www2.lm-sensors.nu/~lm78/cvs/browse.cgi/lm_sensors2/doc/vid
+
diff --git a/trunk/Documentation/hwmon/w83781d b/trunk/Documentation/hwmon/w83781d
@@ -4,16 +4,20 @@ Kernel driver w83781d
 Supported chips:
   * Winbond W83781D
     Prefix: 'w83781d'
-    Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
+    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 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
+    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
@@ -46,18 +50,20 @@ force_subclients=bus,caddr,saddr,saddr
 Description
 -----------
 
-This driver implements support for the Winbond W83781D, W83782D, W83783S
-chips, and the Asus AS99127F chips. We will refer to them collectively as
-W8378* chips.
+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
 
@@ -137,9 +143,9 @@ Individual alarm and beep bits:
 0x000400: in6
 0x000800: fan3
 0x001000: chassis
-0x002000: temp3 (W83782D only)
-0x010000: in7 (W83782D only)
-0x020000: in8 (W83782D only)
+0x002000: temp3 (W83782D and W83627HF only)
+0x010000: in7 (W83782D and W83627HF only)
+0x020000: in8 (W83782D and W83627HF only)
 
 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

diff --git a/trunk/Documentation/hwmon/w83l786ng b/trunk/Documentation/hwmon/w83l786ng
diff --git a/trunk/Documentation/i2c/busses/i2c-piix4 b/trunk/Documentation/i2c/busses/i2c-piix4
@@ -95,4 +95,4 @@ of all affected systems, so the only safe solution was to prevent access to
 the SMBus on all IBM systems (detected using DMI data.)
 
 For additional information, read:
-http://www.lm-sensors.org/browser/lm-sensors/trunk/README.thinkpad
+http://www2.lm-sensors.nu/~lm78/cvs/lm_sensors2/README.thinkpad
diff --git a/trunk/Documentation/scsi/ChangeLog.arcmsr b/trunk/Documentation/scsi/ChangeLog.arcmsr
@@ -68,45 +68,4 @@
 **						2. modify the arcmsr_pci_slot_reset function
 **						3. modify the arcmsr_pci_ers_disconnect_forepart function
 **						4. modify the arcmsr_pci_ers_need_reset_forepart function
-** 1.20.00.15   09/27/2007	 Erich Chen & Nick Cheng
-**						1. add arcmsr_enable_eoi_mode() on adapter Type B
-** 						2. add readl(reg->iop2drv_doorbell_reg) in arcmsr_handle_hbb_isr()
-**						in case of the doorbell interrupt clearance is cached
-** 1.20.00.15   10/01/2007	 Erich Chen & Nick Cheng
-**						1. modify acb->devstate[i][j]
-**						as ARECA_RAID_GOOD instead of
-**						ARECA_RAID_GONE in arcmsr_alloc_ccb_pool
-** 1.20.00.15   11/06/2007       Erich Chen & Nick Cheng
-**						1. add conditional declaration for
-** 						arcmsr_pci_error_detected() and
-**						arcmsr_pci_slot_reset
-** 1.20.00.15	11/23/2007       Erich Chen & Nick Cheng
-**						1.check if the sg list member number
-**						exceeds arcmsr default limit in arcmsr_build_ccb()
-**						2.change the returned value type of arcmsr_build_ccb()
-**						from "void" to "int"
-**						3.add the conditional check if arcmsr_build_ccb()
-**						returns FAILED
-** 1.20.00.15	12/04/2007	 Erich Chen & Nick Cheng
-**						1. modify arcmsr_drain_donequeue() to ignore unknown
-**						command and let kernel process command timeout.
-**						This could handle IO request violating max. segments
-**						while Linux XFS over DM-CRYPT.
-**						Thanks to Milan Broz's comments <mbroz@redhat.com>
-** 1.20.00.15	12/24/2007	 Erich Chen & Nick Cheng
-**						1.fix the portability problems
-**						2.fix type B where we should _not_ iounmap() acb->pmu;
-**						it's not ioremapped.
-**						3.add return -ENOMEM if ioremap() fails
-**						4.transfer IS_SG64_ADDR w/ cpu_to_le32()
-**						in arcmsr_build_ccb
-**						5. modify acb->devstate[i][j] as ARECA_RAID_GONE instead of
-**						ARECA_RAID_GOOD in arcmsr_alloc_ccb_pool()
-**						6.fix arcmsr_cdb->Context as (unsigned long)arcmsr_cdb
-**						7.add the checking state of
-**						(outbound_intstatus & ARCMSR_MU_OUTBOUND_HANDLE_INT) == 0
-**						in arcmsr_handle_hba_isr
-**						8.replace pci_alloc_consistent()/pci_free_consistent() with kmalloc()/kfree() in arcmsr_iop_message_xfer()
-**						9. fix the release of dma memory for type B in arcmsr_free_ccb_pool()
-**						10.fix the arcmsr_polling_hbb_ccbdone()
 **************************************************************************
diff --git a/trunk/Documentation/scsi/scsi_mid_low_api.txt b/trunk/Documentation/scsi/scsi_mid_low_api.txt
@@ -1407,7 +1407,7 @@ Credits
 =======
 The following people have contributed to this document:
         Mike Anderson <andmike at us dot ibm dot com>
-        James Bottomley <James dot Bottomley at hansenpartnership dot com>
+        James Bottomley <James dot Bottomley at steeleye dot com> 
         Patrick Mansfield <patmans at us dot ibm dot com> 
         Christoph Hellwig <hch at infradead dot org>
         Doug Ledford <dledford at redhat dot com>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,4 +73,5 @@ doesn't help, you may just ignore the bogus VID reading with no harm done.

		For further information on this driver see the w83781d driver documentation.

		[1] http://www.lm-sensors.org/browser/lm-sensors/trunk/doc/vid
		[1] http://www2.lm-sensors.nu/~lm78/cvs/browse.cgi/lm_sensors2/doc/vid