driver for adm1030 i2c temp + fan controller

4 files changed, 207 insertions, 5 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index d538aa6d005..3bbe6c4b1cc 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.319 2005/11/15 23:20:33 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.320 2005/11/15 23:25:24 deraadt Exp $
 
-MAN=	aac.4 ac97.4 acphy.4 adc.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 ahd.4 \
-	aic.4 amdpm.4 ami.4 amphy.4 an.4 aps.4 aria.4 art.4 ast.4 atalk.4 \
-	atapiscsi.4 ath.4 atu.4 atw.4 audio.4 aue.4 auich.4 autri.4 \
+MAN=	aac.4 ac97.4 acphy.4 adc.4 addcom.4 admtmp.4 adv.4 aha.4 ahb.4 ahc.4 \
+	ahd.4 aic.4 amdpm.4 ami.4 amphy.4 an.4 aps.4 aria.4 art.4 ast.4 \
+	atalk.4 atapiscsi.4 ath.4 atu.4 atw.4 audio.4 aue.4 auich.4 autri.4 \
 	auixp.4 auvia.4 awi.4 axe.4 az.4 bce.4 bge.4 bha.4 bio.4 bktr.4 \
 	bmtphy.4 boca.4 bpf.4 brgphy.4 bridge.4 cac.4 cardbus.4 \
 	carp.4 ccd.4 cd.4 cdce.4 ch.4 ciphy.4 ciss.4 \
diff --git a/share/man/man4/admtmp.4 b/share/man/man4/admtmp.4
new file mode 100644
index 00000000000..5845b727b98
--- /dev/null
+++ b/share/man/man4/admtmp.4
@@ -0,0 +1,45 @@
+.\"	$OpenBSD: admtmp.4,v 1.1 2005/11/15 23:25:24 deraadt Exp $
+.\"
+.\" Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd May 16, 2004
+.Dt ADMTMP 4
+.Os
+.Sh NAME
+.Nm admtmp
+.Nd Analog Devices ADM1030 temperature sensor
+.Sh SYNOPSIS
+.Cd "admtmp* at maciic?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the Analog Devices ADM1030
+temperature sensor.
+The device possesses internal and external temperature sensors,
+plus a fan RPM monitor.
+These values are made available through the
+.Xr sysctl 8
+interface.
+.Sh SEE ALSO
+.Xr iic 4 ,
+.Xr intro 4 ,
+.Xr sensorsd 8 ,
+.Xr sysctl 8
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Theo de Raadt Aq deraadt@openbsd.org .
diff --git a/sys/dev/i2c/adm1030.c b/sys/dev/i2c/adm1030.c
new file mode 100644
index 00000000000..a5116ee9a7e
--- /dev/null
+++ b/sys/dev/i2c/adm1030.c
@@ -0,0 +1,152 @@
+/*	$OpenBSD: adm1030.c,v 1.1 2005/11/15 23:25:24 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 2005 Theo de Raadt
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/sensors.h>
+
+#include <dev/i2c/i2cvar.h>
+
+/* Maxim 6690 registers */
+#define ADM1030_INT_TEMP	0x0a
+#define ADM1030_EXT_TEMP	0x0b
+#define ADM1030_FAN		0x08
+#define ADM1030_FANC		0x20
+#define  ADM1024_FANC_VAL(x)	(x >> 6)
+
+/* Sensors */
+#define ADMTMP_INT		0
+#define ADMTMP_EXT		1
+#define ADMTMP_FAN		2
+#define ADMTMP_NUM_SENSORS	3
+
+struct admtmp_softc {
+	struct device	sc_dev;
+	i2c_tag_t	sc_tag;
+	i2c_addr_t	sc_addr;
+	int		sc_fanmul;
+
+	struct sensor	sc_sensor[ADMTMP_NUM_SENSORS];
+};
+
+int	admtmp_match(struct device *, void *, void *);
+void	admtmp_attach(struct device *, struct device *, void *);
+void	admtmp_refresh(void *);
+
+struct cfattach admtmp_ca = {
+	sizeof(struct admtmp_softc), admtmp_match, admtmp_attach
+};
+
+struct cfdriver admtmp_cd = {
+	NULL, "admtmp", DV_DULL
+};
+
+int
+admtmp_match(struct device *parent, void *match, void *aux)
+{
+	struct i2c_attach_args *ia = aux;
+
+	if (ia->ia_compat) {
+		if (strcmp(ia->ia_compat, "adm1030") == 0)
+			return (1);
+		return (0);
+	}
+	return (1);
+}
+
+void
+admtmp_attach(struct device *parent, struct device *self, void *aux)
+{
+	struct admtmp_softc *sc = (struct admtmp_softc *)self;
+	struct i2c_attach_args *ia = aux;
+	u_int8_t cmd, data;
+	int i;
+
+	sc->sc_tag = ia->ia_tag;
+	sc->sc_addr = ia->ia_addr;
+
+	cmd = ADM1030_FANC;
+	if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
+	    sc->sc_addr, &cmd, sizeof cmd, &data, sizeof data, 0)) {
+		printf(", unable to read fan setting\n");
+		return;
+	}
+
+	sc->sc_fanmul = 11250/8 * (1 << ADM1024_FANC_VAL(data)) * 60;
+
+	/* Initialize sensor data. */
+	for (i = 0; i < ADMTMP_NUM_SENSORS; i++)
+		strlcpy(sc->sc_sensor[i].device, sc->sc_dev.dv_xname,
+		    sizeof(sc->sc_sensor[i].device));
+
+	sc->sc_sensor[ADMTMP_INT].type = SENSOR_TEMP;
+	strlcpy(sc->sc_sensor[ADMTMP_INT].desc, "Internal",
+	    sizeof(sc->sc_sensor[ADMTMP_INT].desc));
+
+	sc->sc_sensor[ADMTMP_EXT].type = SENSOR_TEMP;
+	strlcpy(sc->sc_sensor[ADMTMP_EXT].desc, "External",
+	    sizeof(sc->sc_sensor[ADMTMP_EXT].desc));
+
+	sc->sc_sensor[ADMTMP_FAN].type = SENSOR_FANRPM;
+	strlcpy(sc->sc_sensor[ADMTMP_FAN].desc, "Fan",
+	    sizeof(sc->sc_sensor[ADMTMP_FAN].desc));
+
+	if (sensor_task_register(sc, admtmp_refresh, 5)) {
+		printf(", unable to register update task\n");
+		return;
+	}
+
+	for (i = 0; i < ADMTMP_NUM_SENSORS; i++)
+		SENSOR_ADD(&sc->sc_sensor[i]);
+
+	printf("\n");
+}
+
+void
+admtmp_refresh(void *arg)
+{
+	struct admtmp_softc *sc = arg;
+	u_int8_t cmd, data;
+
+	iic_acquire_bus(sc->sc_tag, 0);
+
+	cmd = ADM1030_INT_TEMP;
+	if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
+	    sc->sc_addr, &cmd, sizeof cmd, &data, sizeof data, 0) == 0)
+		sc->sc_sensor[ADMTMP_INT].value = 273150000 + 1000000 * data;
+
+	cmd = ADM1030_EXT_TEMP;
+	if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
+	    sc->sc_addr, &cmd, sizeof cmd, &data, sizeof data, 0) == 0)
+		sc->sc_sensor[ADMTMP_EXT].value = 273150000 + 1000000 * data;
+
+	cmd = ADM1030_FAN;
+	if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
+	    sc->sc_addr, &cmd, sizeof cmd, &data, sizeof data, 0) == 0) {
+		if (data == 0)
+			sc->sc_sensor[ADMTMP_FAN].flags |= SENSOR_FINVALID;
+		else {
+			sc->sc_sensor[ADMTMP_FAN].value =
+			    sc->sc_fanmul / (2 * (int)data);
+			sc->sc_sensor[ADMTMP_FAN].flags &= ~SENSOR_FINVALID;
+		}
+	}
+
+	iic_release_bus(sc->sc_tag, 0);
+}
diff --git a/sys/dev/i2c/files.i2c b/sys/dev/i2c/files.i2c
index 6b4e0bfcdff..6ddf7853197 100644
--- a/sys/dev/i2c/files.i2c
+++ b/sys/dev/i2c/files.i2c
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i2c,v 1.10 2005/11/15 22:23:20 kettenis Exp $
+# $OpenBSD: files.i2c,v 1.11 2005/11/15 23:25:24 deraadt Exp $
 #	$NetBSD: files.i2c,v 1.3 2003/10/20 16:24:10 briggs Exp $
 
 define	i2c {[addr = -1], [size = -1]}
@@ -38,3 +38,8 @@ file	dev/i2c/ad741x.c			adc
 device	tsl
 attach	tsl at i2c
 file	dev/i2c/tsl2560.c			tsl
+
+# ADM1030
+device	admtmp
+attach	admtmp at i2c
+file	dev/i2c/adm1030.c			admtmp