Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/i2c Add missing register definitions.



details:   https://anonhg.NetBSD.org/src/rev/e9766316f986
branches:  trunk
changeset: 342826:e9766316f986
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sun Jan 10 10:20:08 2016 +0000

description:
Add missing register definitions.
Handle LM87 external temperature 2 input, and Vcc input scaling (5V or 3.3V).

diffstat:

 sys/dev/i2c/lm87.c |  139 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 106 insertions(+), 33 deletions(-)

diffs (247 lines):

diff -r ecdaafaf39d0 -r e9766316f986 sys/dev/i2c/lm87.c
--- a/sys/dev/i2c/lm87.c        Sun Jan 10 09:04:32 2016 +0000
+++ b/sys/dev/i2c/lm87.c        Sun Jan 10 10:20:08 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lm87.c,v 1.5 2015/09/27 13:02:21 phx Exp $     */
+/*     $NetBSD: lm87.c,v 1.6 2016/01/10 10:20:08 jdc Exp $     */
 /*     $OpenBSD: lm87.c,v 1.20 2008/11/10 05:19:48 cnst Exp $  */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.5 2015/09/27 13:02:21 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.6 2016/01/10 10:20:08 jdc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -28,25 +28,66 @@
 #include <dev/i2c/i2cvar.h>
 
 /* LM87 registers */
-#define LM87_2_5V      0x20
-#define LM87_VCCP1     0x21
-#define LM87_VCC       0x22
-#define LM87_5V                0x23
-#define LM87_12V       0x24
-#define LM87_VCCP2     0x25
-#define LM87_EXT_TEMP  0x26
-#define LM87_INT_TEMP  0x27
-#define LM87_FAN1      0x28
-#define LM87_FAN2      0x29
-#define LM87_COMPANY_ID        0x3e
-#define LM87_REVISION  0x3f
-#define LM87_CONFIG1   0x40
+#define LM87_INT_HHIGH_L       0x13    /* Hardware int high limit (lockable) */
+#define LM87_EXT_HHIGH_L       0x14    /* Hardware ext high limit (lockable) */
+#define LM87_TEST              0x15
+#define LM87_CHANNEL           0x16    /* Dual purpose pin and scaling */
+#define LM87_INT_HHIGH         0x17    /* Hardware int temp high limit */
+#define LM87_EXT_HHIGH         0x18    /* Hardware ext temp high limit */
+#define LM87_DAC_DATA          0x19    /* DAC output scaling */
+#define LM87_AIN1_LOW          0x1a    /* Analog in 1 low limit */
+#define LM87_AIN2_LOW          0x1b    /* Analog in 2 low limit */
+#define LM87_2_5V              0x20    /* +2.5V or ext temp 2 reading */
+#define LM87_VCCP1             0x21    /* Vccp1 reading */
+#define LM87_VCC               0x22    /* +Vcc reading */
+#define LM87_5V                        0x23    /* +5V reading */
+#define LM87_12V               0x24    /* +12V reading */
+#define LM87_VCCP2             0x25    /* Vccp2 reading */
+#define LM87_EXT_TEMP          0x26    /* External tempurature 1 reading */
+#define LM87_INT_TEMP          0x27    /* Internal temperature reading */
+#define LM87_FAN1              0x28    /* Fan1 or AIN1 reading */
+#define LM87_FAN2              0x29    /* Fan2 or AIN2 reading */
+#define LM87_2_5V_HIGH         0x2b    /* +2.5V or ext temp 2 high limit */
+#define LM87_2_5V_LOW          0x2c    /* +2.5V or ext temp 2 low limit */
+#define LM87_VCCP1_HIGH                0x2d    /* Vccp1 high limit */
+#define LM87_VCCP1_LOW         0x2e    /* Vccp1 low limit */
+#define LM87_VCC_HIGH          0x2f    /* +3.3V (Vcc) high limit */
+#define LM87_VCC_LOW           0x30    /* +3.3V (Vcc) low limit */
+#define LM87_5V_HIGH           0x31    /* +5V high limit */
+#define LM87_5V_LOW            0x32    /* +5V low limit */
+#define LM87_12V_HIGH          0x33    /* +12V high limit */
+#define LM87_12V_LOW           0x34    /* +12V low limit */
+#define LM87_VCCP2_HIGH                0x35    /* Vccp2 high limit */
+#define LM87_VCCP2_LOW         0x36    /* Vccp2 low limit */
+#define LM87_EXT_HIGH          0x37    /* External tempurature 1 high limit */
+#define LM87_EXT_LOW           0x38    /* External tempurature low limit */
+#define LM87_INT_HIGH          0x39    /* Internal tempurature 1 high limit */
+#define LM87_INT_LOW           0x3a    /* Internal tempurature low limit */
+#define LM87_FAN1_HIGH         0x3b    /* Fan 1 count or AIN1 high limit */
+#define LM87_FAN2_HIGH         0x3c    /* Fan 2 count or AIN2 high limit */
+#define LM87_COMPANY_ID                0x3e    /* Company ID */
+#define LM87_REVISION          0x3f    /* Revision */
+#define LM87_CONFIG1           0x40    /* Configuration 1 */
+#define LM87_INT_STAT1         0x41    /* Interrupt status 1 */
+#define LM87_INT_STAT2         0x42    /* Interrupt status 2 */
+#define LM87_INT_MASK1         0x43    /* Interrupt mask 1 */
+#define LM87_INT_MASK2         0x44    /* Interrupt mask 2 */
+#define LM87_CI_CLEAR          0x46    /* Chassis intrusion */
+#define LM87_FANDIV            0x47    /* Fan divisor + VID 0-3 */
+#define LM87_VID4              0x48    /* VID4 */
+#define LM87_CONFIG2           0x4a    /* Configuration 2 */
+#define LM87_INT_MIRR1         0x4c    /* Interrupt status 1 mirror */
+#define LM87_INT_MIRR2         0x4d    /* Interrupt status 2 mirror */
+#define LM87_ALERT             0x80    /* SMB Alert enable */
+
+/* Register contents */
 #define  LM87_CONFIG1_START    0x01
 #define  LM87_CONFIG1_INTCLR   0x08
-#define LM87_CHANNEL   0x16
+
 #define  LM87_CHANNEL_AIN1     0x01
 #define  LM87_CHANNEL_AIN2     0x02
-#define LM87_FANDIV    0x47
+#define  LM87_CHANNEL_TEMP2    0x04
+#define  LM87_CHANNEL_VCC5     0x08
 
 struct lmenv_id {
        u_int8_t id, family;
@@ -80,6 +121,7 @@
 
        int     sc_fan1_div, sc_fan2_div;
        int     sc_family;
+       int     sc_channel;
 
        struct sysmon_envsys *sc_sme;
        envsys_data_t sc_sensor[LMENV_NUM_SENSORS];
@@ -151,7 +193,7 @@
 {
        struct lmenv_softc *sc = device_private(self);
        struct i2c_attach_args *ia = aux;
-       u_int8_t cmd, data, data2, channel;
+       u_int8_t cmd, data, data2;
        int i;
 
        sc->sc_tag = ia->ia_tag;
@@ -193,14 +235,14 @@
        if (sc->sc_family == 87) {
                cmd = LM87_CHANNEL;
                if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
-                   sc->sc_addr, &cmd, sizeof cmd, &channel,
-                   sizeof channel, 0)) {
+                   sc->sc_addr, &cmd, sizeof cmd, &sc->sc_channel,
+                   sizeof sc->sc_channel, 0)) {
                        iic_release_bus(sc->sc_tag, 0);
                        printf(", cannot read Channel register\n");
                        return;
                }
        } else
-               channel = 0;
+               sc->sc_channel = 0;
 
        cmd = LM87_CONFIG1;
        if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
@@ -254,16 +296,24 @@
            sizeof(sc->sc_sensor[LMENV_12V].desc));
 
        sc->sc_sensor[LMENV_VCCP2].state = ENVSYS_SINVALID;
-       sc->sc_sensor[LMENV_VCCP2].units = ENVSYS_SVOLTS_DC;
-       strlcpy(sc->sc_sensor[LMENV_VCCP2].desc, "Vccp2",
-           sizeof(sc->sc_sensor[LMENV_VCCP2].desc));
+       if (sc->sc_channel & LM87_CHANNEL_TEMP2) {
+               sc->sc_sensor[LMENV_INT_TEMP].units = ENVSYS_STEMP;
+               strlcpy(sc->sc_sensor[LMENV_VCCP2].desc, "External 2",
+                   sizeof(sc->sc_sensor[LMENV_VCCP2].desc));
+       } else {
+               sc->sc_sensor[LMENV_VCCP2].units = ENVSYS_SVOLTS_DC;
+               strlcpy(sc->sc_sensor[LMENV_VCCP2].desc, "Vccp2",
+                   sizeof(sc->sc_sensor[LMENV_VCCP2].desc));
+       }
 
        sc->sc_sensor[LMENV_EXT_TEMP].state = ENVSYS_SINVALID;
        sc->sc_sensor[LMENV_EXT_TEMP].units = ENVSYS_STEMP;
-       strlcpy(sc->sc_sensor[LMENV_EXT_TEMP].desc, "External",
-           sizeof(sc->sc_sensor[LMENV_EXT_TEMP].desc));
-       if (sc->sc_family == 81)
-               sc->sc_sensor[LMENV_EXT_TEMP].state = ENVSYS_SINVALID;
+       if (sc->sc_channel & LM87_CHANNEL_TEMP2)
+               strlcpy(sc->sc_sensor[LMENV_EXT_TEMP].desc, "External 1",
+                   sizeof(sc->sc_sensor[LMENV_EXT_TEMP].desc));
+       else
+               strlcpy(sc->sc_sensor[LMENV_EXT_TEMP].desc, "External",
+                   sizeof(sc->sc_sensor[LMENV_EXT_TEMP].desc));
 
        sc->sc_sensor[LMENV_INT_TEMP].state = ENVSYS_SINVALID;
        sc->sc_sensor[LMENV_INT_TEMP].units = ENVSYS_STEMP;
@@ -271,7 +321,7 @@
            sizeof(sc->sc_sensor[LMENV_INT_TEMP].desc));
 
        sc->sc_sensor[LMENV_FAN1].state = ENVSYS_SINVALID;
-       if (channel & LM87_CHANNEL_AIN1) {
+       if (sc->sc_channel & LM87_CHANNEL_AIN1) {
                sc->sc_sensor[LMENV_FAN1].units = ENVSYS_SVOLTS_DC;
                strlcpy(sc->sc_sensor[LMENV_FAN1].desc, "AIN1",
                    sizeof(sc->sc_sensor[LMENV_FAN1].desc));
@@ -282,7 +332,7 @@
        }
 
        sc->sc_sensor[LMENV_FAN2].state = ENVSYS_SINVALID;
-       if (channel & LM87_CHANNEL_AIN2) {
+       if (sc->sc_channel & LM87_CHANNEL_AIN2) {
                sc->sc_sensor[LMENV_FAN2].units = ENVSYS_SVOLTS_DC;
                strlcpy(sc->sc_sensor[LMENV_FAN2].desc, "AIN2",
                    sizeof(sc->sc_sensor[LMENV_FAN2].desc));
@@ -330,6 +380,11 @@
 
        switch (edata->sensor) {
        case LMENV_2_5V:
+               /* If monitoring external temperature 2, this isn't monitored */
+               if (sc->sc_channel & LM87_CHANNEL_TEMP2) {
+                       edata->state = ENVSYS_SINVALID;
+                       break;
+               }
                edata->value_cur = 2500000 * data / 192;
                edata->state = ENVSYS_SVALID;
                break;
@@ -342,12 +397,28 @@
                edata->state = ENVSYS_SVALID;
                break;
        case LMENV_VCCP1:
+               edata->value_cur = 2700000 * data / 192;
+               edata->state = ENVSYS_SVALID;
+               break;
        case LMENV_VCCP2:
+               /* Might be external temperature 2 */
+               if (sc->sc_channel & LM87_CHANNEL_TEMP2) {
+                       if (data == 0x80)
+                               edata->state = ENVSYS_SINVALID;
+                       else {
+                               edata->value_cur =
+                                   (int8_t)data * 1000000 + 273150000;
+                               edata->state = ENVSYS_SVALID;
+                       }
+                       break;
+               }
                edata->value_cur = 2700000 * data / 192;
                edata->state = ENVSYS_SVALID;
                break;
        case LMENV_VCC:
-               edata->value_cur = 3300000 * data / 192;
+               /* Voltage scale selectable (5V or 3.3V) */
+               edata->value_cur =
+                   (LM87_CHANNEL_VCC5 ? 5000000 : 3300000) * data / 192;
                edata->state = ENVSYS_SVALID;
                break;
        case LMENV_EXT_TEMP:
@@ -365,7 +436,8 @@
                }
                break;
        case LMENV_FAN1:
-               if (edata->units == ENVSYS_SVOLTS_DC) {
+               /* Might be analogue input 1 */
+               if (sc->sc_channel & LM87_CHANNEL_AIN1) {
                        edata->value_cur = 1870000 * data / 192;
                        edata->state = ENVSYS_SVALID;
                        break;
@@ -383,7 +455,8 @@
                }
                break;
        case LMENV_FAN2:
-               if (edata->units == ENVSYS_SVOLTS_DC) {
+               /* Might be analogue input 2 */
+               if (sc->sc_channel & LM87_CHANNEL_AIN2) {
                        edata->value_cur = 1870000 * data / 192;
                        edata->state = ENVSYS_SVALID;
                        break;



Home | Main Index | Thread Index | Old Index