Author: pluto Date: Sun Jul 31 12:57:14 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- via epia sensors support.
---- Files affected:
SOURCES:
linux-2.6-vt1211-sensor.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vt1211-sensor.patch
diff -u /dev/null SOURCES/linux-2.6-vt1211-sensor.patch:1.1.2.1
--- /dev/null Sun Jul 31 14:57:14 2005
+++ SOURCES/linux-2.6-vt1211-sensor.patch Sun Jul 31 14:57:09 2005
@@ -0,0 +1,1222 @@
+diff -rNu linux-2.6.11.org/drivers/i2c/chips/Kconfig
linux-2.6.11/drivers/i2c/chips/Kconfig
+--- linux-2.6.11.org/drivers/i2c/chips/Kconfig 2005-03-02 08:38:10.000000000
+0100
++++ linux-2.6.11/drivers/i2c/chips/Kconfig 2005-03-06 12:39:21.883534592
+0100
+@@ -276,6 +276,18 @@
+ This driver can also be built as a module. If so, the module
+ will be called via686a.
+
++config SENSORS_VT1211
++ tristate "Via VT1211 SuperIO and HW monitoring chip"
++ depends on I2C && EXPERIMENTAL
++ select I2C_SENSOR
++ help
++ If you say yes here you get read-only access to all the sensors
++ accessible via the VT1211 HW monitoring chip (temperature, fan speed,
++ voltage etc.)
++
++ This driver can also be built as a module. If so, the module
++ will be called vt1211.
++
+ config SENSORS_W83781D
+ tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
+ depends on I2C && EXPERIMENTAL
+diff -rNu linux-2.6.11.org/drivers/i2c/chips/Makefile
linux-2.6.11/drivers/i2c/chips/Makefile
+--- linux-2.6.11.org/drivers/i2c/chips/Makefile 2005-03-02
08:38:34.000000000 +0100
++++ linux-2.6.11/drivers/i2c/chips/Makefile 2005-03-06 12:39:21.884534436
+0100
+@@ -33,6 +33,7 @@
+ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
+ obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
+ obj-$(CONFIG_SENSORS_VIA686A) += via686a.o
++obj-$(CONFIG_SENSORS_VT1211) += vt1211.o
+ obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o
+ obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
+
+diff -rNu linux-2.6.11.org/drivers/i2c/chips/vt1211.c
linux-2.6.11/drivers/i2c/chips/vt1211.c
+--- linux-2.6.11.org/drivers/i2c/chips/vt1211.c 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.11/drivers/i2c/chips/vt1211.c 2005-03-06 12:39:21.886534123
+0100
+@@ -0,0 +1,1185 @@
++/*
++ vt1211.c - Part of lm_sensors, Linux kernel modules
++ for hardware monitoring
++
++ Copyright (c) 2002 Mark D. Studebaker <[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.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++
++
++ Adapted to Linux 2.6 kernel by Lars Ekman <[EMAIL PROTECTED]>
++
++ Updates:
++ Sun Sep 26 09:14:36 CEST 2004 -
++ Register conversion optional (disabled by default)
++ Tue Oct 5 17:17:01 CEST 2004 -
++ Corrected faulty return value in "show_temp_hyst()".
++*/
++
++/* Supports VIA VT1211 Super I/O sensors via ISA (LPC) accesses only. */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/i2c-sensor.h>
++#include <linux/i2c-vid.h>
++#include <asm/io.h>
++
++/*
++ My first version of this port converted register values to usable
++ units (milli-volt, milli-degree). This was due to a
++ missinterpretation of the "Documentation/i2c/sysfs-interface" by me
++ (L Ekman). The conversion of registers are now optional. It is kept
++ for compatibility but and should not be used. Defining the
++ DO_CONVERT macro re-enables the register conversions
++
++#define DO_CONVERT
++ */
++
++/*
++ Even if the register values are not converted to uasable units in
++ the driver, the values should still be multiplied with some
++ factor. This factor seems to be 10 for 2.4 versions and 1000 now for
++ 2.6. The multiplier for "in" values (voltages) was commented out in
++ the 2.4 version, and I don't know the correct setting for 2.6 yet.
++ Since there is still some confusion around this I made
++ easy-to-change macros for the factors.
++ */
++#define TEMP3_MULTIPLIER 1000
++#define TEMP_MULTIPLIER 1000
++#define IN_MULTIPLIER 10 /* Or what? */
++
++/*
++ If ALL_SENSORS is defined code (and /sys files) for all sensors in
++ the original vt1211.c are included. If ALL_SENSORS is un-defined only
++ the ones which seems to be "known" in the example "/etc/sensors.conf"
++ are included.
++
++#define ALL_SENSORS
++*/
++
++static int force_addr = 0;
++MODULE_PARM(force_addr, "i");
++MODULE_PARM_DESC(force_addr,
++ "Initialize the base address of the sensors");
++
++static unsigned short normal_i2c[] = { I2C_CLIENT_END };
++static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
++static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
++static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
++
++SENSORS_INSMOD_1(vt1211);
++
++/* modified from kernel/include/traps.c */
++#define REG 0x2e /* The register to read/write */
++#define DEV 0x07 /* Register: Logical device select */
++#define VAL 0x2f /* The value to read/write */
++#define PME 0x0b /* The device with the hardware monitor */
++#define DEVID 0x20 /* Register: Device ID */
++
++static inline void
++superio_outb(int reg, int val)
++{
++ outb(reg, REG);
++ outb(val, VAL);
++}
++
++static inline int
++superio_inb(int reg)
++{
++ outb(reg, REG);
++ return inb(VAL);
++}
++
++static inline void
++superio_select(void)
++{
++ outb(DEV, REG);
++ outb(PME, VAL);
++}
++
++static inline void
++superio_enter(void)
++{
++ outb(0x87, REG);
++ outb(0x87, REG);
++}
++
++static inline void
++superio_exit(void)
++{
++ outb(0xAA, REG);
++}
++
++
++#define VT1211_DEVID 0x3c
++#define VT1211_ACT_REG 0x30
++#define VT1211_BASE_REG 0x60
++#define VT1211_EXTENT 0x80
++
++/* pwm numbered 1-2 */
++#define VT1211_REG_PWM(nr) (0x5f + (nr))
++#define VT1211_REG_PWM_CTL 0x51
++
++/* The VT1211 registers */
++/* We define the sensors as follows. Somewhat convoluted to minimize
++ changes from via686a.
++ Sensor Voltage Mode Temp Mode
++ -------- ------------ ---------
++ Reading 1 temp3
++ Reading 3 temp1 not in vt1211
++ UCH1/Reading2 in0 temp2
++ UCH2 in1 temp4
++ UCH3 in2 temp5
++ UCH4 in3 temp6
++ UCH5 in4 temp7
++ 3.3V in5
++ -12V in6 not in vt1211
++*/
++
++/* ins numbered 0-6 */
++#define VT1211_REG_IN_MAX(nr) ((nr)==0 ? 0x3d : 0x29 + ((nr) * 2))
++#define VT1211_REG_IN_MIN(nr) ((nr)==0 ? 0x3e : 0x2a + ((nr) * 2))
++#define VT1211_REG_IN(nr) (0x21 + (nr))
++
++/* fans numbered 1-2 */
++#define VT1211_REG_FAN_MIN(nr) (0x3a + (nr))
++#define VT1211_REG_FAN(nr) (0x28 + (nr))
++
++static const u8 regtemp[] = { 0x20, 0x21, 0x1f, 0x22, 0x23, 0x24, 0x25 };
++static const u8 regover[] = { 0x39, 0x3d, 0x1d, 0x2b, 0x2d, 0x2f, 0x31 };
++static const u8 reghyst[] = { 0x3a, 0x3e, 0x1e, 0x2c, 0x2e, 0x30, 0x32 };
++
++/* temps numbered 1-7 */
++#define VT1211_REG_TEMP(nr) (regtemp[(nr) - 1])
++#define VT1211_REG_TEMP_OVER(nr) (regover[(nr) - 1])
++#define VT1211_REG_TEMP_HYST(nr) (reghyst[(nr) - 1])
++#define VT1211_REG_TEMP_LOW3 0x4b /* bits 7-6 */
++#define VT1211_REG_TEMP_LOW2 0x49 /* bits 5-4 */
++#define VT1211_REG_TEMP_LOW47 0x4d
++
++#define VT1211_REG_CONFIG 0x40
++#define VT1211_REG_ALARM1 0x41
++#define VT1211_REG_ALARM2 0x42
++#define VT1211_REG_VID 0x45
++#define VT1211_REG_FANDIV 0x47
++#define VT1211_REG_UCH_CONFIG 0x4a
++#define VT1211_REG_TEMP1_CONFIG 0x4b
++#define VT1211_REG_TEMP2_CONFIG 0x4c
++
++/* temps 1-7; voltages 0-6 */
++#define ISTEMP(i, ch_config) ((i) == 1 ? 1 : \
++ (i) == 3 ? 1 : \
++ (i) == 2 ? ((ch_config) >> 2) & 0x01 : \
++ ((ch_config) >> ((i)-1)) & 0x01)
++#define ISVOLT(i, ch_config) ((i) > 4 ? 1 : !(((ch_config) >> ((i)+2)) &
0x01))
++
++#define DIV_FROM_REG(val) (1 << (val))
++#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
++#define PWM_FROM_REG(val) (val)
++#define PWM_TO_REG(val) SENSORS_LIMIT((val), 0, 255)
++
++
++#ifndef DO_CONVERT
++/*
++ These macros does NOT try to convert the register values to
++ milli-degree Celsius.
++ */
++#define TEMP3_FROM_REG(val) ((val)*TEMP3_MULTIPLIER)
++#define TEMP3_FROM_REG10(val) (((val)*TEMP3_MULTIPLIER)/4)
++#define TEMP3_TO_REG(val) (SENSORS_LIMIT(((val)<0? \
++ (((val)-(TEMP3_MULTIPLIER/2))/TEMP3_MULTIPLIER):\
++ ((val)+(TEMP3_MULTIPLIER/2))/TEMP3_MULTIPLIER),0,255))
++#define TEMP_FROM_REG(val) ((val)*TEMP_MULTIPLIER)
++#define TEMP_FROM_REG10(val) (((val)*TEMP_MULTIPLIER)/4)
++#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0? \
++ (((val)-(TEMP_MULTIPLIER/2))/TEMP_MULTIPLIER):\
++ ((val)+(TEMP_MULTIPLIER/2))/TEMP_MULTIPLIER),0,255))
++#else
++/*
++ These macros tries to convert the register values to milli-degree
++ Celsius. This does not work for all boards, so it should generally
++ be avoided.
++
++
++ "temp3" is the the CPU temp.
++ From the example "etc/sensors.conf" for vt1211;
++
++ compute temp3 (@ - 65) / 0.9686, (@ * 0.9686) + 65
++
++ The 10 bits seems to be fixed point 8.2 bit. Which gives this
++ formula for "temp3" (val in millidegree Celcius);
++
++ val = 1000 * (reg - (65*4)) / 4 / 0.9686 =>
++ val = 258 * (reg - 260)
++
++ or for 8 bit registers;
++
++ val = 1032 * (reg - 65)
++
++ (BTW: 67596 = 65.5 * 1032)
++ */
++#define TEMP3_FROM_REG10(val) (258 * ((int)val - 260))
++#define TEMP3_FROM_REG(val) (1032 * ((int)val - 65))
++#define TEMP3_TO_REG(val) (SENSORS_LIMIT(((val + 67596) / 1032),0,255))
++
++/*
++ Others temeratures than "temp3" are thermistor values.
++ This should be a FP computation including a ln(x) operation
++ which is be implemented as a lookup table (see "via686a.c").
++
++ Here is the formula from "/etc/sensors.conf" ('`' is the ln(x));
++
++ (1 / (((1 / 3435) * (` ((253 - @) / (@ - 43)))) + (1 / 298.15))) - 273.15
++
++ Based on this a table is computed. The values are in 1/100 degrees
++ Celsius. Values <44 and >253 gives invalid values in the ln(x).
++
++ The "via686a.c" seems much more sophisticated and scientific. I
++ don't know why. This is just a table from the formula above. Here
++ is the computation loop;
++
++ for (i = 44; i < 253; i++) {
++ double reg = (double)i;
++ double temp;
++ int itemp;
++ temp = 1 / (
++ ((1.0/3435.0) * log((253.0 - reg)/(reg-43.0)))
++ + (1.0 / 298.15)
++ ) - 273.15;
++ itemp = temp*100;
++ table[i] = itemp;
++ }
++
++*/
++short int const reg2temp[256] = {
++ /* 0*/ -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999,
++ /* 10*/ -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999,
++ /* 20*/ -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999,
++ /* 30*/ -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999, -9999,
++ /* 40*/ -9999, -9999, -9999, -9999, -6945, -6065, -5512, -5100, -4767, -4487,
++ /* 50*/ -4243, -4026, -3831, -3652, -3488, -3334, -3191, -3056, -2929, -2807,
++ /* 60*/ -2692, -2581, -2475, -2373, -2275, -2180, -2088, -1999, -1912, -1828,
++ /* 70*/ -1746, -1666, -1588, -1512, -1438, -1365, -1293, -1223, -1154, -1086,
++ /* 80*/ -1020, -954, -890, -826, -764, -702, -641, -581, -521, -462,
++ /* 90*/ -404, -347, -290, -234, -178, -123, -68, -13, 39, 93,
++ /*100*/ 146, 199, 251, 303, 355, 406, 457, 508, 558, 609,
++ /*110*/ 659, 708, 758, 808, 857, 906, 955, 1004, 1052, 1101,
++ /*120*/ 1149, 1197, 1246, 1294, 1342, 1390, 1438, 1486, 1534, 1582,
++ /*130*/ 1630, 1677, 1725, 1773, 1821, 1869, 1917, 1965, 2013, 2061,
++ /*140*/ 2110, 2158, 2206, 2255, 2304, 2352, 2401, 2450, 2499, 2549,
++ /*150*/ 2598, 2648, 2698, 2748, 2799, 2849, 2900, 2951, 3002, 3054,
++ /*160*/ 3106, 3158, 3210, 3263, 3316, 3370, 3423, 3478, 3532, 3587,
++ /*170*/ 3642, 3698, 3754, 3811, 3868, 3926, 3984, 4043, 4102, 4162,
++ /*180*/ 4223, 4284, 4346, 4408, 4471, 4535, 4600, 4665, 4731, 4798,
++ /*190*/ 4866, 4935, 5005, 5076, 5147, 5220, 5294, 5369, 5446, 5523,
++ /*200*/ 5602, 5683, 5764, 5848, 5932, 6019, 6107, 6197, 6289, 6383,
++ /*210*/ 6479, 6578, 6679, 6782, 6888, 6996, 7108, 7223, 7341, 7463,
++ /*220*/ 7588, 7718, 7852, 7990, 8134, 8283, 8438, 8600, 8768, 8944,
++ /*230*/ 9128, 9322, 9526, 9740, 9968, 10209, 10467, 10742, 11038, 11358,
++ /*240*/ 11706, 12087, 12508, 12976, 13505, 14109, 14812, 15651, 16681, 18004,
++ /*250*/ 19824, 22636, 28279, 30000, 30000, 30000
++};
++#define TEMP_FROM_REG(val) (reg2temp[val]*10)
++static int TEMP_FROM_REG10(u16 val)
++{
++ u16 eightBits = val >> 2;
++ u16 twoBits = val & 3;
++ int base, diff;
++
++ /* no interpolation for these */
++ if (twoBits == 0 || eightBits < 44 || eightBits > 251)
++ return TEMP_FROM_REG(eightBits);
++
++ /* do some linear interpolation */
++ base = TEMP_FROM_REG(eightBits);
++ diff = TEMP_FROM_REG(eightBits+1) - base;
++ return base + ((twoBits * diff) >> 2);
++}
++static u8 TEMP_TO_REG(int val)
++{
++ /* Yes, this is a linear search but this is only used when
++ * writing tempX_max or tempX_max_hyst, which should be a rare
++ * operation. So I don't care ... */
++
++ unsigned int i = 43;
++ val /= 10;
++ while (i < 254 && val > reg2temp[i]) i++;
++ return i;
++}
++#endif /*DO_CONVERT*/
++
++
++
++/********* FAN RPM CONVERT ********/
++/* But this chip saturates back at 0, not at 255 like all the other chips.
++ So, 0 means 0 RPM */
++static inline u8 FAN_TO_REG(long rpm, int div)
++{
++ if (rpm == 0)
++ return 0;
++ rpm = SENSORS_LIMIT(rpm, 1, 1000000);
++ return SENSORS_LIMIT((1310720 + rpm * div / 2) / (rpm * div), 1, 255);
++}
++
++#define MIN_TO_REG(a,b) FAN_TO_REG(a,b)
++#define FAN_FROM_REG(val,div) ((val)==0?0:(val)==255?0:1310720/((val)*(div)))
++
++
++
++struct vt1211_data {
++ struct i2c_client client;
++ struct semaphore lock;
++ enum chips type;
++
++ struct semaphore update_lock;
++ char valid; /* !=0 if following fields are valid */
++ unsigned long last_updated; /* In jiffies */
++
++ u8 in[7]; /* Register value */
++ u8 in_max[7]; /* Register value */
++ u8 in_min[7]; /* Register value */
++ u16 temp[7]; /* Register value 10 bit */
++ u8 temp_over[7]; /* Register value */
++ u8 temp_hyst[7]; /* Register value */
++ u8 fan[2]; /* Register value */
++ u8 fan_min[2]; /* Register value */
++ u8 fan_div[2]; /* Register encoding, shifted right */
++ u16 alarms; /* Register encoding */
++ u8 pwm[2]; /* Register value */
++ u8 pwm_ctl; /* Register value */
++ u8 vid; /* Register encoding */
++ u8 vrm;
++ u8 uch_config;
++};
++
++static int vt1211_attach_adapter(struct i2c_adapter *adapter);
++static int vt1211_detach_client(struct i2c_client *client);
++static struct vt1211_data *vt1211_update_device(struct device *dev);
++
++static struct i2c_driver vt1211_driver = {
++ .owner = THIS_MODULE,
++ .name = "vt1211",
++ .id = I2C_DRIVERID_VT1211,
++ .flags = I2C_DF_NOTIFY,
++ .attach_adapter = vt1211_attach_adapter,
++ .detach_client = vt1211_detach_client,
++};
++
++static inline int vt_rdval(struct i2c_client *client, u8 reg)
++{
++ return (inb_p(client->addr + reg));
++}
++
++static inline void vt1211_write_value(
++ struct i2c_client *client, u8 reg, u8 value)
++{
++ outb_p(value, client->addr + reg);
++}
++
++static void vt1211_init_client(struct i2c_client *client)
++{
++ struct vt1211_data *data = i2c_get_clientdata(client);
++
++ data->vrm = DEFAULT_VRM;
++ /* set "default" interrupt mode for alarms, which isn't the default */
++ vt1211_write_value(client, VT1211_REG_TEMP1_CONFIG, 0);
++ vt1211_write_value(client, VT1211_REG_TEMP2_CONFIG, 0);
++
++ /* Default configuration; temp2, temp4, in2-in6 */
++ data->uch_config = (data->uch_config & 0x83)|(12 & 0x7c);
++ vt1211_write_value(client, VT1211_REG_UCH_CONFIG, data->uch_config);
++}
++
++#ifndef DO_CONVERT
++#define IN_FROM_REG(val,n) ((val)*IN_MULTIPLIER)
++#define IN_TO_REG(val,n) (SENSORS_LIMIT( \
++ (((val)+(IN_MULTIPLIER/2))/IN_MULTIPLIER),0,255))
++#else
++
++/* ----------------------------------------------------------------------
++ Voltage translation;
++
++ This is according to the example /etc/sensors.conf;
++
++ compute in2 ((@ * 100) - 3) / (0.5952 * 95.8), (@ * 0.5952 * 0.958) + .03
++ compute in3 ((@ * 100) - 3) / (0.4167 * 95.8), (@ * 0.4167 * 0.958) + .03
++ compute in4 ((@ * 100) - 3) / (0.1754 * 95.8), (@ * 0.1754 * 0.958) + .03
++ compute in5 ((@ * 100) - 3) / (0.6296 * 95.8), (@ * 0.6296 * 0.958) + .03
++
++ in2 is labled "VCore1" and should have K = 1.0 (fault in sensors.conf?)
++
++ The unit should be millivolt not 1/100's of volts. And to get
++ better precision in the integer calculations we multiply divisor
++ and dividend(?) with 8192.
++
++ Example;
++
++ in2_input = 1000*reg - 30 / (0.5952 * 95.8) =
++ 8192 * (1000*reg - 30) / 8192 * (0.5952 * 95.8) =
++ (8192000*reg - 245760) / 467109
++
++ No overflow because; (8192000*255) < 2^31
++
++ I got these results (EPIA-CL 6000 Mini-ITX);
++
++ lm_sensors BIOS
++ 1.241 1.189 (VCore)
++ 4.758 4.983
++ 12.436 12.196
++ 3.331 3.260
++
++*/
++static int nconstant(int nr)
++{
++ switch (nr) {
++ case 2: return 784794; /* VCore: 8192 * (1.0 * 95.8) */
++ case 3: return 327023; /* 5.0V: 8192 * (0.4167 * 95.8) */
++ case 4: return 137653; /* 12V: 8192 * (0.1754 * 95.8) */
++ case 5: return 494105; /* 3.3V: 8192 * (0.6296 * 95.8) */
++ default:;
++ }
++ return 784794; /* (K = 1.0) */
++}
++
++static int IN_FROM_REG(u8 reg, int nr)
++{
++ return ((int)reg*8192000 - 245760) / nconstant(nr);
++}
++
++static u8 IN_TO_REG(int val, int nr)
++{
++ int reg = (val * nconstant(nr) + 245760) / 8192000;
++ return (SENSORS_LIMIT(reg,0,255));
++}
++#endif
++
++/* ----------------------------------------------------------------------
++ Temerature file definitions;
++*/
++
++static ssize_t show_temp(struct device *dev, char *buf, int nr)
++{
++ struct vt1211_data *data = vt1211_update_device(dev);
++ if (nr == 2) {
++ return sprintf(buf, "%d\n", TEMP3_FROM_REG10(data->temp[nr]));
++ }
++ return sprintf(buf, "%d\n", TEMP_FROM_REG10(data->temp[nr]));
++}
++static ssize_t show_temp_over(struct device *dev, char *buf, int nr)
++{
++ struct vt1211_data *data = vt1211_update_device(dev);
++ if (nr == 2) {
++ return sprintf(buf, "%d\n",
++ TEMP3_FROM_REG(data->temp_over[nr]));
++ }
++ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over[nr]));
++}
++
++static ssize_t set_temp_over(
++ struct device *dev, const char *buf, size_t count, int nr)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct vt1211_data *data = i2c_get_clientdata(client);
++ long val = simple_strtol(buf, NULL, 10);
++ if (nr == 2) {
++ data->temp_over[nr] = TEMP3_TO_REG(val);
++ } else {
++ data->temp_over[nr] = TEMP_TO_REG(val);
++ }
++ vt1211_write_value(client,
++ VT1211_REG_TEMP_OVER(nr + 1),
++ data->temp_over[nr]);
++ return count;
++}
++
++static ssize_t show_temp_hyst(struct device *dev, char *buf, int nr)
++{
++ struct vt1211_data *data = vt1211_update_device(dev);
++ if (nr == 2) {
++ return sprintf(buf, "%d\n",
++ TEMP3_FROM_REG(data->temp_hyst[nr]));
++ }
++ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst[nr]));
++}
++
++static ssize_t set_temp_hyst(
++ struct device *dev, const char *buf, size_t count, int nr)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct vt1211_data *data = i2c_get_clientdata(client);
++ long val = simple_strtol(buf, NULL, 10);
++ if (nr == 2) {
++ data->temp_hyst[nr] = TEMP3_TO_REG(val);
++ } else {
++ data->temp_hyst[nr] = TEMP_TO_REG(val);
++ }
++ vt1211_write_value(client,
++ VT1211_REG_TEMP_HYST(nr + 1),
++ data->temp_hyst[nr]);
++ return count;
++}
++
++#define show_temp_offset(offset) \
++static ssize_t show_temp_##offset (struct device *dev, char *buf) \
++{ \
++ return show_temp(dev, buf, 0x##offset -1); \
++} \
++static ssize_t show_temp_over_##offset (struct device *dev, char *buf)\
++{ \
++ return show_temp_over(dev, buf, 0x##offset -1); \
++} \
++static ssize_t set_temp_over_##offset (
\
++ struct device *dev, const char *buf, size_t count) \
++{ \
++ return set_temp_over(dev, buf, count, 0x##offset - 1); \
++} \
++static ssize_t show_temp_hyst_##offset (struct device *dev, char *buf)
\
++{ \
++ return show_temp_hyst(dev, buf, 0x##offset -1); \
++} \
<<Diff was trimmed, longer than 597 lines>>
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
