Hwmon for Taco

hwmon/ad7414.c new file +1 -0

+module_exit(ad7414_exit);

hwmon/taco-dtm.c new file +12 -0

@@ -0,0 +1,78 @@
+/*
+ *  drivers/hwmon/taco-dtm.c
+ *
+ *  Overview: On the Taco, the fpga controls the fan. This provides
+ *  the temperature to the fpga.
+ *
+ *  Copyright (c) 2008 PIKA Technologies
+ *    Sean MacLennan <[email protected]>
+ *
+ *  This program is free software; you can redistribute	 it and/or modify it
+ *  under  the terms of	 the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the	License, or (at your

Quoted 17 lines

hwmon/ad7414.c new file +1 -0

+module_exit(ad7414_exit);

hwmon/taco-dtm.c new file +12 -0

@@ -0,0 +1,78 @@
+/*
+ *  drivers/hwmon/taco-dtm.c
+ *
+ *  Overview: On the Taco, the fpga controls the fan. This provides
+ *  the temperature to the fpga.
+ *
+ *  Copyright (c) 2008 PIKA Technologies
+ *    Sean MacLennan <[email protected]>
+ *
+ *  This program is free software; you can redistribute	 it and/or modify it
+ *  under  the terms of	 the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the	License, or (at your

hwmon/taco-dtm.c line 22

Quoted 10 lines

hwmon/taco-dtm.c new file +10 -0

+ *  option) any later version.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kthread.h>
+#include <linux/io.h>
+
+
+#define TACO_FPGA_BASE 0x80000000

That should be in the device-tree...

Cheers,
Ben.

That should be in the device-tree...

Cheers,
Ben.

drivers/hwmon/Kconfig +10 -0

index a0445be..1f89186 100644
@@ -57,6 +57,16 @@ config SENSORS_ABITUGURU3
       This driver can also be built as a module.  If so, the module
       will be called abituguru3.
 
+config SENSORS_AD7414
+    tristate "Analog Devices AD7414"
+    depends on I2C && EXPERIMENTAL
+    help
+      If you say yes here you get support for the Analog Devices
+      AD7414 temperature monitoring chip.
+
+      This driver can also be built as a module. If so, the module
+      will be called ad7414.
+
 config SENSORS_AD7418
     tristate "Analog Devices AD7416, AD7417 and AD7418"
     depends on I2C && EXPERIMENTAL

hwmon/pika-dtm.c 2008-01-08 01:23:32.000000000 -0500 renamed from dev/null 2005-11-20 22:22:37.000000000 -0500 +10 -0

@@ -0,0 +1,87 @@
+/*
+ *  drivers/hwmon/pika-dtm.c
+ *
+ *  Overview: On the Warp, the fpga controls the fan. This provides
+ *  the temperature to the fpga.
+ *
+ *  Copyright (c) 2008 PIKA Technologies
+ *    Sean MacLennan <[email protected]>
+ *
+ *  This program is free software; you can redistribute     it and/or

modify it
+ * under the terms of the GNU General Public License as
published by the
+ * Free Software Foundation; either version 2 of the License, or
(at your
+ * option) any later version.

hwmon/pika-dtm.c 2008-01-08 01:23:32.000000000 -0500 renamed from dev/null 2005-11-20 22:22:37.000000000 -0500 +13 -0

+        out_be32(dtm_fpga, temp);
+
+        set_current_state(TASK_INTERRUPTIBLE);
+        schedule_timeout(HZ);
+    }
+
+    return 0;
+}
+
+
+int __init pika_dtm_init(void)
+{
+    struct device_node *np;

hwmon/pika-dtm.c 2008-01-08 01:23:32.000000000 -0500 renamed from dev/null 2005-11-20 22:22:37.000000000 -0500 +30 -0

+    if(of_address_to_resource(np, 0, &res) ||
+       (dtm_fpga = ioremap(res.start + 0x20, 4)) == NULL) {
+        printk(KERN_ERR __FILE__ ": Unable to map FPGA\n");
+        return -ENOENT;
+    }
+
+    dtm_thread = kthread_run(pika_dtm_thread, NULL, "pika-dtm");
+
+    if(IS_ERR(dtm_thread)) {
+        iounmap(dtm_fpga);
+        printk(KERN_ERR __FILE__ ": Unable to start PIKA DTM thread\n");
+        return PTR_ERR(dtm_thread);
+    }
+
+    return 0;
+}
+module_init(pika_dtm_init);
+
+
+void __exit pika_dtm_exit(void)
+{
+    kthread_stop(dtm_thread);
+    iounmap(dtm_fpga);
+}
+module_exit(pika_dtm_exit);
+
+
+MODULE_DESCRIPTION("PIKA DTM driver");
+MODULE_AUTHOR("Sean MacLennan");
+MODULE_LICENSE("GPL");

hwmon/ad7414.c 2008-01-05 20:36:06.000000000 -0500 renamed from dev/null 2005-11-20 22:22:37.000000000 -0500 +7 -0

@@ -0,0 +1,296 @@
+/*
+ * An hwmon driver for the Analog Devices AD7414
+ *
+ * Copyright 2006 Stefan Roese <[email protected]>, DENX Software Engineering
+ *
+ * Based on ad7418.c
+ * Copyright 2006 Tower Technologies, Alessandro Zummo

<[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */

hwmon/ad7414.c 2008-01-05 20:36:06.000000000 -0500 renamed from dev/null 2005-11-20 22:22:37.000000000 -0500 +44 -0

+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+
+
+#define DRV_VERSION "0.2"
+
+/* straight from the datasheet */
+#define AD7414_TEMP_MIN (-55000)
+#define AD7414_TEMP_MAX 125000
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x48, 0x4a, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD;
+
+/* AD7414 registers */
+#define AD7414_REG_TEMP        0x00
+#define AD7414_REG_CONF        0x01
+#define AD7414_REG_T_HIGH    0x02
+#define AD7414_REG_T_LOW    0x03
+
+struct ad7414_data {
+    struct i2c_client    client;
+    struct device    *dev;
+    struct mutex        lock;
+    char            valid;        /* !=0 if following fields are valid */
+    unsigned long        last_updated;    /* In jiffies */
+    u16            temp_input;    /* Register values */
+    u8            temp_max;
+    u8            temp_min;
+    u8            temp_alert;
+    u8            temp_max_flag;
+    u8            temp_min_flag;
+};
+
+static int ad7414_attach_adapter(struct i2c_adapter *adapter);
+static int ad7414_detect(struct i2c_adapter *adapter, int address, int

kind);

hwmon/ad7414.c 2008-01-05 20:36:06.000000000 -0500 renamed from dev/null 2005-11-20 22:22:37.000000000 -0500 +34 -0

+static int ad7414_detach_client(struct i2c_client *client);
+
+static struct i2c_driver ad7414_driver = {
+    .driver = {
+        .name    = "ad7414",
+    },
+    .attach_adapter    = ad7414_attach_adapter,
+    .detach_client    = ad7414_detach_client,
+};
+
+/*
+ * TEMP: 0.001C/bit (-55C to +125C)
+ * REG: (0.5C/bit, two's complement) << 7
+ */
+static inline int AD7414_TEMP_FROM_REG(u16 reg)
+{
+    /* use integer division instead of equivalent right shift to
+     * guarantee arithmetic shift and preserve the sign
+     */
+    return ((s16)reg / 128) * 500;
+}
+
+/* All registers are word-sized, except for the configuration registers.
+ * AD7414 uses a high-byte first convention, which is exactly opposite to
+ * the usual practice.
+ */
+static int ad7414_read(struct i2c_client *client, u8 reg)
+{
+    if (reg == AD7414_REG_TEMP)
+        return swab16(i2c_smbus_read_word_data(client, reg));
+    else
+        return i2c_smbus_read_byte_data(client, reg);
+}
+

hwmon/ad7414.c 2008-01-05 20:36:06.000000000 -0500 renamed from dev/null 2005-11-20 22:22:37.000000000 -0500 +20 -0

+}
+
+static struct ad7414_data *ad7414_update_device(struct device *dev)
+{
+    struct i2c_client *client = to_i2c_client(dev);
+    struct ad7414_data *data = i2c_get_clientdata(client);
+
+    mutex_lock(&data->lock);
+
+    if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+        || !data->valid) {
+        dev_dbg(&client->dev, "starting ad7414 update\n");
+
+        data->temp_input = ad7414_read(client, AD7414_REG_TEMP);
+        data->temp_alert = (data->temp_input >> 5) & 0x01;
+        data->temp_max_flag = (data->temp_input >> 4) & 0x01;
+        data->temp_min_flag = (data->temp_input >> 3) & 0x01;
+        data->temp_max = ad7414_read(client, AD7414_REG_T_HIGH);
+        data->temp_min = ad7414_read(client, AD7414_REG_T_LOW);
+

This is *very* board specific and not very complex a driver. It should probably live with the platform code somewhere in arch/powerpc/platforms. You can use the machine_device_initcall() hook to kick off the thread.

Ok, here is the ad7414 only. taco-dtm is no more!

On Tue, 08 Jan 2008 13:30:00 -0500

Quoted 1 line · Sean MacLennan

Ok, here is the ad7414 only. taco-dtm is no more!

Cool. Couple more things.

1) This should go through the hwmon maintainer. Send it to him. (CC'ing this list is of course fine.)

2) You always need the Signed-off-by: for each patch you send

3) If you didn't author the code (this seems to come from Stefan), then you need the Signed-off-by from the original author.

You're getting there :) These are all "newbie" type mistakes so keep plugging away.

Quoted 1 line · On Tue, 08 Jan 2008 13:30:00 -0500 Sean MacLennan <[email protected]>…

Ok, here is the ad7414 only. taco-dtm is no more!

Cool. Couple more things.

1) This should go through the hwmon maintainer. Send it to him. (CC'ing this list is of course fine.)

2) You always need the Signed-off-by: for each patch you send

3) If you didn't author the code (this seems to come from Stefan), then you need the Signed-off-by from the original author.

You're getting there :) These are all "newbie" type mistakes so keep plugging away.

josh

Yes, it's common sense and politeness to keep Signed-off-by lines intact (and the order of these lines), but it's not strict requirement. "Based on the patch from ..." is the equivalent of this politeness.