hwmon: (lm63) LM64 has a dedicated pin for tachometer

On the LM64, the tachometer function has a dedicated pin and fan speed
monitoring is always enabled.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>

diff --git a/Documentation/hwmon/lm63 b/Documentation/hwmon/lm63
index 8202825cd0950300bc3ee3d7609693f9962663aa..df3e1ae42f39bd75477fae84d82480f0e2dad0d3 100644 (file)
--- a/Documentation/hwmon/lm63
+++ b/Documentation/hwmon/lm63
@@ -54,7 +54,10 @@ value for measuring the speed of the fan. It can measure fan speeds down to
 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.
+is left to the BIOS, and the driver will blindly trust it. Only the original
+LM63 suffers from this limitation, the LM64 and LM96163 have separate pins
+for fan monitoring and alert out. On the LM64, monitoring is always enabled;
+on the LM96163 it can be disabled.
 
 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

diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 75e3a15c2f6136fbeb6eb887ef298fd96fff665f..0c4fff0a00a4acb76248f70984af2844f99842e3 100644 (file)
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -796,6 +796,9 @@ static void lm63_init_client(struct i2c_client *client)
                i2c_smbus_write_byte_data(client, LM63_REG_CONFIG1,
                                          data->config);
        }
+       /* Tachometer is always enabled on LM64 */
+       if (data->kind == lm64)
+               data->config |= 0x04;
 
        /* We may need pwm1_freq before ever updating the client data */
        data->pwm1_freq = i2c_smbus_read_byte_data(client, LM63_REG_PWM_FREQ);
@@ -836,9 +839,10 @@ static void lm63_init_client(struct i2c_client *client)
        }
 
        /* Show some debug info about the LM63 configuration */
-       dev_dbg(&client->dev, "Alert/tach pin configured for %s\n",
-               (data->config & 0x04) ? "tachometer input" :
-               "alert output");
+       if (data->kind == lm63)
+               dev_dbg(&client->dev, "Alert/tach pin configured for %s\n",
+                       (data->config & 0x04) ? "tachometer input" :
+                       "alert output");
        dev_dbg(&client->dev, "PWM clock %s kHz, output frequency %u Hz\n",
                (data->config_fan & 0x08) ? "1.4" : "360",
                ((data->config_fan & 0x08) ? 700 : 180000) / data->pwm1_freq);