Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

torvalds · Jul 12, 2005 · 22a4427 · 22a4427
2 parents 9f02d6b + ede7fbd
commit 22a4427
Show file tree

Hide file tree

Showing 87 changed files with 565 additions and 523 deletions.
diff --git a/Documentation/i2c/chips/adm1021 → Documentation/hwmon/adm1021 b/Documentation/i2c/chips/adm1021 → Documentation/hwmon/adm1021
diff --git a/Documentation/i2c/chips/adm1025 → Documentation/hwmon/adm1025 b/Documentation/i2c/chips/adm1025 → Documentation/hwmon/adm1025
diff --git a/Documentation/i2c/chips/adm1026 → Documentation/hwmon/adm1026 b/Documentation/i2c/chips/adm1026 → Documentation/hwmon/adm1026
diff --git a/Documentation/i2c/chips/adm1031 → Documentation/hwmon/adm1031 b/Documentation/i2c/chips/adm1031 → Documentation/hwmon/adm1031
diff --git a/Documentation/i2c/chips/adm9240 → Documentation/hwmon/adm9240 b/Documentation/i2c/chips/adm9240 → Documentation/hwmon/adm9240
diff --git a/Documentation/i2c/chips/asb100 → Documentation/hwmon/asb100 b/Documentation/i2c/chips/asb100 → Documentation/hwmon/asb100
diff --git a/Documentation/i2c/chips/ds1621 → Documentation/hwmon/ds1621 b/Documentation/i2c/chips/ds1621 → Documentation/hwmon/ds1621
diff --git a/Documentation/i2c/chips/fscher → Documentation/hwmon/fscher b/Documentation/i2c/chips/fscher → Documentation/hwmon/fscher
diff --git a/Documentation/i2c/chips/gl518sm → Documentation/hwmon/gl518sm b/Documentation/i2c/chips/gl518sm → Documentation/hwmon/gl518sm
diff --git a/Documentation/i2c/chips/it87 → Documentation/hwmon/it87 b/Documentation/i2c/chips/it87 → Documentation/hwmon/it87
diff --git a/Documentation/i2c/chips/lm63 → Documentation/hwmon/lm63 b/Documentation/i2c/chips/lm63 → Documentation/hwmon/lm63
diff --git a/Documentation/i2c/chips/lm75 → Documentation/hwmon/lm75 b/Documentation/i2c/chips/lm75 → Documentation/hwmon/lm75
diff --git a/Documentation/i2c/chips/lm77 → Documentation/hwmon/lm77 b/Documentation/i2c/chips/lm77 → Documentation/hwmon/lm77
diff --git a/Documentation/i2c/chips/lm78 → Documentation/hwmon/lm78 b/Documentation/i2c/chips/lm78 → Documentation/hwmon/lm78
diff --git a/Documentation/i2c/chips/lm80 → Documentation/hwmon/lm80 b/Documentation/i2c/chips/lm80 → Documentation/hwmon/lm80
diff --git a/Documentation/i2c/chips/lm83 → Documentation/hwmon/lm83 b/Documentation/i2c/chips/lm83 → Documentation/hwmon/lm83
diff --git a/Documentation/i2c/chips/lm85 → Documentation/hwmon/lm85 b/Documentation/i2c/chips/lm85 → Documentation/hwmon/lm85
diff --git a/Documentation/i2c/chips/lm87 → Documentation/hwmon/lm87 b/Documentation/i2c/chips/lm87 → Documentation/hwmon/lm87
diff --git a/Documentation/i2c/chips/lm90 → Documentation/hwmon/lm90 b/Documentation/i2c/chips/lm90 → Documentation/hwmon/lm90
diff --git a/Documentation/i2c/chips/lm92 → Documentation/hwmon/lm92 b/Documentation/i2c/chips/lm92 → Documentation/hwmon/lm92
diff --git a/Documentation/i2c/chips/max1619 → Documentation/hwmon/max1619 b/Documentation/i2c/chips/max1619 → Documentation/hwmon/max1619
diff --git a/Documentation/i2c/chips/pc87360 → Documentation/hwmon/pc87360 b/Documentation/i2c/chips/pc87360 → Documentation/hwmon/pc87360
diff --git a/Documentation/i2c/chips/sis5595 → Documentation/hwmon/sis5595 b/Documentation/i2c/chips/sis5595 → Documentation/hwmon/sis5595
diff --git a/Documentation/i2c/chips/smsc47b397 → Documentation/hwmon/smsc47b397 b/Documentation/i2c/chips/smsc47b397 → Documentation/hwmon/smsc47b397
diff --git a/Documentation/i2c/chips/smsc47m1 → Documentation/hwmon/smsc47m1 b/Documentation/i2c/chips/smsc47m1 → Documentation/hwmon/smsc47m1
diff --git a/Documentation/i2c/sysfs-interface → Documentation/hwmon/sysfs-interface b/Documentation/i2c/sysfs-interface → Documentation/hwmon/sysfs-interface
diff --git a/Documentation/i2c/userspace-tools → Documentation/hwmon/userspace-tools b/Documentation/i2c/userspace-tools → Documentation/hwmon/userspace-tools
diff --git a/Documentation/i2c/chips/via686a → Documentation/hwmon/via686a b/Documentation/i2c/chips/via686a → Documentation/hwmon/via686a
diff --git a/Documentation/i2c/chips/w83627hf → Documentation/hwmon/w83627hf b/Documentation/i2c/chips/w83627hf → Documentation/hwmon/w83627hf
diff --git a/Documentation/i2c/chips/w83781d → Documentation/hwmon/w83781d b/Documentation/i2c/chips/w83781d → Documentation/hwmon/w83781d
diff --git a/Documentation/i2c/chips/w83l785ts → Documentation/hwmon/w83l785ts b/Documentation/i2c/chips/w83l785ts → Documentation/hwmon/w83l785ts
diff --git a/Documentation/i2c/chips/max6875 b/Documentation/i2c/chips/max6875
@@ -2,10 +2,10 @@ Kernel driver max6875
 =====================
 
 Supported chips:
-  * Maxim max6874, max6875
-    Prefixes: 'max6875'
+  * Maxim MAX6874, MAX6875
+    Prefix: 'max6875'
     Addresses scanned: 0x50, 0x52
-    Datasheets:
+    Datasheet:
         http://pdfserv.maxim-ic.com/en/ds/MAX6874-MAX6875.pdf
 
 Author: Ben Gardner <[email protected]>
@@ -23,14 +23,26 @@ Module Parameters
 Description
 -----------
 
-The MAXIM max6875 is a EEPROM-programmable power-supply sequencer/supervisor.
+The Maxim MAX6875 is an 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
+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.
 
+The Maxim MAX6874 is a similar, mostly compatible device, with more intputs
+and outputs:
+
+             vin     gpi    vout
+MAX6874        6       4       8
+MAX6875        4       3       5
+
+MAX6874 chips can have four different addresses (as opposed to only two for
+the MAX6875). The additional addresses (0x54 and 0x56) are not probed by
+this driver by default, but the probe module parameter can be used if
+needed.
+
 See the datasheet for details on how to program the EEPROM.
 
 

diff --git a/Documentation/i2c/dev-interface b/Documentation/i2c/dev-interface
@@ -14,9 +14,12 @@ C example
 =========
 
 So let's say you want to access an i2c adapter from a C program. The
-first thing to do is `#include <linux/i2c.h>" and "#include <linux/i2c-dev.h>. 
-Yes, I know, you should never include kernel header files, but until glibc 
-knows about i2c, there is not much choice.
+first thing to do is "#include <linux/i2c-dev.h>". Please note that
+there are two files named "i2c-dev.h" out there, one is distributed
+with the Linux kernel and is meant to be included from kernel
+driver code, the other one is distributed with lm_sensors and is
+meant to be included from user-space programs. You obviously want
+the second one here.
 
 Now, you have to decide which adapter you want to access. You should
 inspect /sys/class/i2c-dev/ to decide this. Adapter numbers are assigned
@@ -78,7 +81,7 @@ Full interface description
 ==========================
 
 The following IOCTLs are defined and fully supported 
-(see also i2c-dev.h and i2c.h):
+(see also i2c-dev.h):
 
 ioctl(file,I2C_SLAVE,long addr)
   Change slave address. The address is passed in the 7 lower bits of the
@@ -97,10 +100,10 @@ ioctl(file,I2C_PEC,long select)
 ioctl(file,I2C_FUNCS,unsigned long *funcs)
   Gets the adapter functionality and puts it in *funcs.
 
-ioctl(file,I2C_RDWR,struct i2c_ioctl_rdwr_data *msgset)
+ioctl(file,I2C_RDWR,struct i2c_rdwr_ioctl_data *msgset)
 
   Do combined read/write transaction without stop in between.
-  The argument is a pointer to a struct i2c_ioctl_rdwr_data {
+  The argument is a pointer to a struct i2c_rdwr_ioctl_data {
 
       struct i2c_msg *msgs;  /* ptr to array of simple messages */
       int nmsgs;             /* number of messages to exchange */

diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
@@ -27,7 +27,6 @@ address.
 static struct i2c_driver foo_driver = {
 	.owner		= THIS_MODULE,
 	.name		= "Foo version 2.3 driver",
-	.id		= I2C_DRIVERID_FOO, /* from i2c-id.h, optional */
 	.flags		= I2C_DF_NOTIFY,
 	.attach_adapter	= &foo_attach_adapter,
 	.detach_client	= &foo_detach_client,
@@ -37,12 +36,6 @@ static struct i2c_driver foo_driver = {
 The name can be chosen freely, and may be upto 40 characters long. Please
 use something descriptive here.
 
-If used, the id should be a unique ID. The range 0xf000 to 0xffff is
-reserved for local use, and you can use one of those until you start
-distributing the driver, at which time you should contact the i2c authors
-to get your own ID(s). Note that most of the time you don't need an ID
-at all so you can just omit it.
-
 Don't worry about the flags field; just put I2C_DF_NOTIFY into it. This
 means that your driver will be notified when new adapters are found.
 This is almost always what you want.

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -746,6 +746,8 @@ source "drivers/char/Kconfig"
 
 source "drivers/i2c/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 #source "drivers/l3/Kconfig"
 
 source "drivers/misc/Kconfig"

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
@@ -181,6 +181,8 @@ source "drivers/serial/Kconfig"
 
 source "drivers/i2c/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "drivers/usb/Kconfig"
 
 endmenu

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
@@ -649,6 +649,8 @@ source "drivers/input/Kconfig"
 
 source "drivers/i2c/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "fs/Kconfig"
 
 source "drivers/media/Kconfig"

diff --git a/drivers/Kconfig b/drivers/Kconfig
@@ -44,6 +44,8 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/w1/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "drivers/misc/Kconfig"
 
 source "drivers/media/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_INPUT)		+= input/
 obj-$(CONFIG_I2O)		+= message/
 obj-$(CONFIG_I2C)		+= i2c/
 obj-$(CONFIG_W1)		+= w1/
+obj-$(CONFIG_HWMON)		+= hwmon/
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/