Changeset 1318

Timestamp:

02/11/02 00:15:12 (7 years ago)

Author:

mds

Message:

(mds)
From: Aurelien Jarno <aurelien@aurel32.net>

Hello,

I have to use the pcf8574 chip with my I2C interface, however, the pcf8574
drivers in lm-sensors is a bit basic. It supposes the pin P1 is used as an
input and the others pin as outputs.

Attached is a patch which corrects that, providing to files in /proc
interface, one for writting, the other for reading. It also modifies a bit
the driver to support the pcf8574a (it is a pcf8574 with a different address
range), and add a documentation file in doc/chips.

The patch also includes some cosmetic changes in the pcf8591 driver I wrote
previously, that is to say it modify the chip name in some places I had
forgotten to change when I made a copy/paste from another driver.

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/pcf8574 (added)
• lm-sensors/trunk/kernel/chips/pcf8574.c (modified) (12 diffs)
• lm-sensors/trunk/kernel/chips/pcf8591.c (modified) (2 diffs)
• lm-sensors/trunk/kernel/include/sensors.h (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -19 +19 @@
-
-2.6.3 (2002????)
+  Chip modules (most): Allow THIS_MODULE definition for kernels 2.2.18+
-  File doc/chips/it87: add more temp_type help
-  File sensors.conf.eg: Un-ignore it87 in8, temp3, fan3;
@@ -35 +36 @@
-  Module i2c-i810: Add support for 810E
-  Module i2c-piix4: Check for uninitialized base address
+  Module i2c-sis5595: Blacklist 735
-  Module i2c-viapro: Check for uninitialized base address
-  Module gl518sm: Standardize /proc entries in0-3
-  Module lm87: Fix in0, in1, in5 initial limits; ain[1,2] -> in[6,7];
-               fan -> fan1; fix temp2 limit writes
+  Module pcf8574: Add support for PCF8574A; /proc interface changed
-  Module pcf8591: new
+  Module sis5595: Blacklist 735
-  Module w83781d: Add W83697HF support; allow force_subclients parameter
-                  for Tyan 2460

lm-sensors/trunk/doc/chips/SUMMARY

@@ -163 +163 @@
-        Matrix Orbital LCD displays
-
-
+ & pcf8574a
-        Simple eight-bit parallel I/O
-

lm-sensors/trunk/kernel/chips/pcf8574.c

@@ -62 +62 @@
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { SENSORS_I2C_END };
-
+0x38, 0x3f, 
-static unsigned int normal_isa[] = { SENSORS_ISA_END };
-static unsigned int normal_isa_range[] = { SENSORS_ISA_END };
-
-/* Insmod parameters */
-1(pcf8574
+2(pcf8574, pcf8574a
-
-/* The PCF8574 registers */
@@ -74 +74 @@
-
-/* Initial values */
-0         /* Both off
+255       /* All outputs on (input mode)
-
-/* Each client has this additional data */
@@ -84 +84 @@
-        unsigned long last_updated;     /* In jiffies */
-
-status;             
+read, write;                
-};
-
@@ -107 +107 @@
-static void pcf8574_inc_use(struct i2c_client *client);
-static void pcf8574_dec_use(struct i2c_client *client);
-
+
+
+
-                                       int ctl_name, int *nrels_mag, long *results);
-static void pcf8574_update_client(struct i2c_client *client);
-
+
-
-/* This is the driver that will be inserted */
@@ -130 +132 @@
-   when a new copy is allocated. */
-static ctl_table pcf8574_dir_table_template[] = {
-
-
+
+
+
+
-        {0}
-};
@@ -191 +195 @@
-           impossible to detect! Stupid chip. */
-
-
-
-
+
+
+
+
+
+
+
+
-
-        if (kind == pcf8574) {
-                type_name = "pcf8574";
-                client_name = "PCF8574 chip";
+        } else
+        if (kind == pcf8574a) {
+                type_name = "pcf8574a";
+                client_name = "PCF8574A chip";
-        } else {
-#ifdef DEBUG
@@ -226 +239 @@
-        data->sysctl_id = i;
-
+        /* Initialize the PCF8574 chip */
+        pcf8574_init_client(new_client);
-        return 0;
-
@@ -282 +297 @@
-}
-
+/* Called when we have found a new PCF8574. */
+void pcf8574_init_client(struct i2c_client *client)
+{
+        struct pcf8574_data *data = client->data;
+        data->write = PCF8574_INIT;
+        i2c_smbus_write_byte(client, data->write);
+}
+
-
-void pcf8574_update_client(struct i2c_client *client)
@@ -296 +319 @@
-#endif
-
-status
+read
-                data->last_updated = jiffies;
-                data->valid = 1;
@@ -305 +328 @@
-
-
-status
+read
-                    int ctl_name, int *nrels_mag, long *results)
-{
-        u8      tmpstatus; 
-
-        struct pcf8574_data *data = client->data;
-        if (operation == SENSORS_PROC_REAL_INFO)
@@ -315 +336 @@
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                pcf8574_update_client(client);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
->
-status = (data->status & 2) |
-status
+
+write =
+write
-                }
-        }
-}
+
-
-int __init sensors_pcf8574_init(void)
@@ -367 +397 @@
-
-MODULE_AUTHOR
- and Dan Eaton <dan.eaton@rocketlogix.com
+>, Dan Eaton <dan.eaton@rocketlogix.com> and Aurelien Jarno <aurelien@aurel32.net
-MODULE_DESCRIPTION("PCF8574 driver");
-

lm-sensors/trunk/kernel/chips/pcf8591.c

@@ -201 +201 @@
-        if (i2c_is_isa_adapter(adapter)) {
-                printk
-74.o: pcf8574
+91.o: pcf8591
-                return 0;
-        }
@@ -225 +225 @@
-        new_client->flags = 0;
-
-74
+91
-           impossible to detect! Stupid chip. */
-

lm-sensors/trunk/kernel/include/sensors.h

@@ -432 +432 @@
-#define LM87_ALARM_TEMP3_FAULT 0x08000
-
-
+
+
-
-#define MTP008_SYSCTL_IN0       1000    /* Volts * 100 */