Changeset 3787

Timestamp:

05/30/03 03:46:08 (10 years ago)

Author:

mds

Message:

Manual reverse merge from HEAD (2.5) to lk2-4 branch in preparation

for release of lk2-4 branch

Location:

i2c/branches/lk2-4

Files:

• CHANGES (modified) (1 diff)
• doc/i2c-pport (modified) (1 diff)
• doc/smbus-protocol (modified) (1 diff)
• kernel/i2c-id.h (modified) (8 diffs)
• kernel/i2c-proc.c (modified) (3 diffs)

i2c/branches/lk2-4/CHANGES

@@ -18 +18 @@
 -----------------------------------------------------------------------------
 
-2.7.1 (2003????)
+2.8.0 (2003????)
   drivers (several): make spinlock_t's static
   i2c-algo-biths.[ch]: Rewrite of i2c-algo-bit with improved bus timing and
            error handling. This is not a drop-in replacement for i2c-algo-bit.
            Interface subject to change.
-  i2c-id.h: ID for i2c-algo-biths, W83627HF
+  i2c-id.h: add IDs for i2c-algo-biths, W83627HF, LM85, nForce2, OMAHA, GUIDE,
+            MPC107, IXP2000, IXP425, IOP3XX, UDA1342
+  i2c-proc.c: Fix ignore and probe tests
   i2c.h: Add fields for detailed delivery report in i2c_msg.
 

i2c/branches/lk2-4/doc/i2c-pport

@@ -1 @@
-Primitive parallel port is driver for i2c bus, which exploits 
+Parallel Port Adapters
+----------------------
+If you are installing parallel port adapters it means you are probably messing 
+around with wires and IC's and the like. If you have purchased a card that 
+provides an external i2c/smbus this will require combined algorithm and 
+adapter code in a single module.
+If you are doing it yourself by using the parallel port there 
+are basically 2 options.
+
+1) Using the parallel port and using the i2c-pport adapter module and the 
+i2c-algo-bit algorithm module together to enable you to wire up your parallel 
+port to act as an i2c/smbus. This provides a bus that will enable most 
+sensors to work but doesn't support the entire i2c/smbus capability.
+
+2) Using the parallel port to interface to a Philips PCF8584 parallel to i2c 
+adapter chip. You will need to build a bit of a circuit to do this. This 
+configuration needs the i2c-pcf-epp adapter module and the i2c-algo-pcf 
+algorithm module. This support almost all of the i2c/smbus capabilities.
+
+
+i2c-pport Documentation
+-----------------------
+This is a primitive parallel port driver for the i2c bus, which exploits 
 features of modern bidirectional parallel ports. 
 

i2c/branches/lk2-4/doc/smbus-protocol

@@ -144 +144 @@
 
 S Addr Wr [A] Comm [A] Count [A] Data [A] ...
-                             S Addr Rd [A] [Count] A [Data] ... A P
+                             S Addr Rd [A] [Count] A [Data] ... NA P
 
 

i2c/branches/lk2-4/kernel/i2c-id.h

@@ -99 +99 @@
 #define I2C_DRIVERID_24LC32A    51      /* Microchip 24LC32A 32k EEPROM */
 #define I2C_DRIVERID_STM41T00   52      /* real time clock              */
+#define I2C_DRIVERID_UDA1342    53      /* UDA1342 audio codec          */
 
 
@@ -151 +152 @@
 #define I2C_DRIVERID_FS451 1037
 #define I2C_DRIVERID_W83627HF 1038
+#define I2C_DRIVERID_LM85 1039
 
 /*
@@ -172 +174 @@
 #define I2C_ALGO_IPMI   0x0b0000        /* IPMI dummy adapter */
 #define I2C_ALGO_IPMB   0x0c0000        /* IPMB adapter */
+#define I2C_ALGO_MPC107 0x0d0000
 #define I2C_ALGO_EC     0x100000        /* ACPI embedded controller     */
 
@@ -177 +180 @@
 #define I2C_ALGO_OCP    0x120000        /* IBM or otherwise On-chip I2C algorithm */
 #define I2C_ALGO_BITHS  0x130000        /* enhanced bit style adapters  */
+#define I2C_ALGO_OCP_IOP3XX  0x140000   /* XSCALE IOP3XX On-chip I2C alg */
 
 #define I2C_ALGO_EXP    0x800000        /* experimental                 */
@@ -210 +214 @@
 #define I2C_HW_B_TSUNA  0x12    /* DEC Tsunami chipset                  */
 #define I2C_HW_B_FRODO  0x13    /* 2d3D, Inc. SA-1110 Development Board */
+#define I2C_HW_B_OMAHA  0x14    /* Omaha I2C interface (ARM)            */
+#define I2C_HW_B_GUIDE  0x15    /* Guide bit-basher                     */
+#define I2C_HW_B_IXP2000 0x16   /* GPIO on IXP2000 systems              */
+#define I2C_HW_B_IXP425 0x17    /* GPIO on IXP425 systems               */
 
 /* --- PCF 8584 based algorithms                                        */
@@ -231 +239 @@
 #define I2C_HW_OCP 0x00 /* IBM on-chip I2C adapter      */
 
+/* --- XSCALE on-chip adapters                          */
+#define I2C_HW_IOP321 0x00
 
 /* --- SMBus only adapters                                              */
@@ -245 +255 @@
 #define I2C_HW_SMBUS_AMD8111    0x0a
 #define I2C_HW_SMBUS_SCX200     0x0b
+#define I2C_HW_SMBUS_NFORCE2    0x0c
 
 /* --- ISA pseudo-adapter                                               */
@@ -255 +266 @@
 #define I2C_HW_IPMB 0x00
 
+/* --- MCP107 adapter */
+#define I2C_HW_MPC107 0x00
+
 #endif /* LINUX_I2C_ID_H */

i2c/branches/lk2-4/kernel/i2c-proc.c

@@ -657 +657 @@
                              ((address_data->
                                ignore_range[i] ==
-                               SENSORS_ANY_I2C_BUS) & !is_isa))
+                               SENSORS_ANY_I2C_BUS) && !is_isa))
                             && (addr >= address_data->ignore_range[i + 1])
                             && (addr <= address_data->ignore_range[i + 2])) {
@@ -746 +746 @@
                         if (((adapter_id == address_data->probe[i]) ||
                              ((address_data->
-                               probe[i] == SENSORS_ANY_I2C_BUS) & !is_isa))
+                               probe[i] == SENSORS_ANY_I2C_BUS) && !is_isa))
                             && (addr == address_data->probe[i + 1])) {
 #ifdef DEBUG
@@ -763 +763 @@
                              ||
                              ((address_data->probe_range[i] ==
-                               SENSORS_ANY_I2C_BUS) & !is_isa))
+                               SENSORS_ANY_I2C_BUS) && !is_isa))
                             && (addr >= address_data->probe_range[i + 1])
                             && (addr <= address_data->probe_range[i + 2])) {