diff --git a/kernel/chips/lm75.c b/kernel/chips/lm75.c index f5ebdb78..0fc8d0a8 100644 --- a/kernel/chips/lm75.c +++ b/kernel/chips/lm75.c @@ -49,10 +49,6 @@ SENSORS_INSMOD_1(lm75); #define TEMP_FROM_REG(val) ((((val & 0x7fff) >> 7) * 5) | ((val & 0x8000)?-256:0)) #define TEMP_TO_REG(val) (SENSORS_LIMIT((val<0?(0x200+((val)/5))<<7:(((val) + 2) / 5) << 7),0,0xffff)) -/* Initial values */ -#define LM75_INIT_TEMP_OS 600 -#define LM75_INIT_TEMP_HYST 500 - /* Each client has this additional data */ struct lm75_data { int sysctl_id; @@ -259,10 +255,6 @@ static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value) static void lm75_init_client(struct i2c_client *client) { /* Initialize the LM75 chip */ - lm75_write_value(client, LM75_REG_TEMP_OS, - TEMP_TO_REG(LM75_INIT_TEMP_OS)); - lm75_write_value(client, LM75_REG_TEMP_HYST, - TEMP_TO_REG(LM75_INIT_TEMP_HYST)); lm75_write_value(client, LM75_REG_CONF, 0); } diff --git a/kernel/chips/lm78.c b/kernel/chips/lm78.c index 943e0a31..1dc69bbd 100644 --- a/kernel/chips/lm78.c +++ b/kernel/chips/lm78.c @@ -102,54 +102,6 @@ static inline u8 FAN_TO_REG(long rpm, int div) #define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1) #define DIV_FROM_REG(val) (1 << (val)) -/* Initial limits. To keep them sane, we use the 'standard' translation as - specified in the LM78 sheet. Use the config file to set better limits. */ -#define LM78_INIT_IN_0 (vid==350?280:vid) -#define LM78_INIT_IN_1 (vid==350?280:vid) -#define LM78_INIT_IN_2 330 -#define LM78_INIT_IN_3 (((500) * 100)/168) -#define LM78_INIT_IN_4 (((1200) * 10)/38) -#define LM78_INIT_IN_5 (((-1200) * -604)/2100) -#define LM78_INIT_IN_6 (((-500) * -604)/909) - -#define LM78_INIT_IN_PERCENTAGE 10 - -#define LM78_INIT_IN_MIN_0 \ - (LM78_INIT_IN_0 - LM78_INIT_IN_0 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MAX_0 \ - (LM78_INIT_IN_0 + LM78_INIT_IN_0 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MIN_1 \ - (LM78_INIT_IN_1 - LM78_INIT_IN_1 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MAX_1 \ - (LM78_INIT_IN_1 + LM78_INIT_IN_1 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MIN_2 \ - (LM78_INIT_IN_2 - LM78_INIT_IN_2 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MAX_2 \ - (LM78_INIT_IN_2 + LM78_INIT_IN_2 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MIN_3 \ - (LM78_INIT_IN_3 - LM78_INIT_IN_3 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MAX_3 \ - (LM78_INIT_IN_3 + LM78_INIT_IN_3 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MIN_4 \ - (LM78_INIT_IN_4 - LM78_INIT_IN_4 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MAX_4 \ - (LM78_INIT_IN_4 + LM78_INIT_IN_4 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MIN_5 \ - (LM78_INIT_IN_5 - LM78_INIT_IN_5 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MAX_5 \ - (LM78_INIT_IN_5 + LM78_INIT_IN_5 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MIN_6 \ - (LM78_INIT_IN_6 - LM78_INIT_IN_6 * LM78_INIT_IN_PERCENTAGE / 100) -#define LM78_INIT_IN_MAX_6 \ - (LM78_INIT_IN_6 + LM78_INIT_IN_6 * LM78_INIT_IN_PERCENTAGE / 100) - -#define LM78_INIT_FAN_MIN_1 3000 -#define LM78_INIT_FAN_MIN_2 3000 -#define LM78_INIT_FAN_MIN_3 3000 - -#define LM78_INIT_TEMP_OVER 600 -#define LM78_INIT_TEMP_HYST 500 - /* There are some complications in a module like this. First off, LM78 chips may be both present on the SMBus and the ISA bus, and we have to handle those cases separately at some places. Second, there might be several @@ -545,45 +497,6 @@ static void lm78_init_client(struct i2c_client *client) vid |= 0x10; vid = VID_FROM_REG(vid); - lm78_write_value(client, LM78_REG_IN_MIN(0), - IN_TO_REG(LM78_INIT_IN_MIN_0)); - lm78_write_value(client, LM78_REG_IN_MAX(0), - IN_TO_REG(LM78_INIT_IN_MAX_0)); - lm78_write_value(client, LM78_REG_IN_MIN(1), - IN_TO_REG(LM78_INIT_IN_MIN_1)); - lm78_write_value(client, LM78_REG_IN_MAX(1), - IN_TO_REG(LM78_INIT_IN_MAX_1)); - lm78_write_value(client, LM78_REG_IN_MIN(2), - IN_TO_REG(LM78_INIT_IN_MIN_2)); - lm78_write_value(client, LM78_REG_IN_MAX(2), - IN_TO_REG(LM78_INIT_IN_MAX_2)); - lm78_write_value(client, LM78_REG_IN_MIN(3), - IN_TO_REG(LM78_INIT_IN_MIN_3)); - lm78_write_value(client, LM78_REG_IN_MAX(3), - IN_TO_REG(LM78_INIT_IN_MAX_3)); - lm78_write_value(client, LM78_REG_IN_MIN(4), - IN_TO_REG(LM78_INIT_IN_MIN_4)); - lm78_write_value(client, LM78_REG_IN_MAX(4), - IN_TO_REG(LM78_INIT_IN_MAX_4)); - lm78_write_value(client, LM78_REG_IN_MIN(5), - IN_TO_REG(LM78_INIT_IN_MIN_5)); - lm78_write_value(client, LM78_REG_IN_MAX(5), - IN_TO_REG(LM78_INIT_IN_MAX_5)); - lm78_write_value(client, LM78_REG_IN_MIN(6), - IN_TO_REG(LM78_INIT_IN_MIN_6)); - lm78_write_value(client, LM78_REG_IN_MAX(6), - IN_TO_REG(LM78_INIT_IN_MAX_6)); - lm78_write_value(client, LM78_REG_FAN_MIN(1), - FAN_TO_REG(LM78_INIT_FAN_MIN_1, 2)); - lm78_write_value(client, LM78_REG_FAN_MIN(2), - FAN_TO_REG(LM78_INIT_FAN_MIN_2, 2)); - lm78_write_value(client, LM78_REG_FAN_MIN(3), - FAN_TO_REG(LM78_INIT_FAN_MIN_3, 2)); - lm78_write_value(client, LM78_REG_TEMP_OVER, - TEMP_TO_REG(LM78_INIT_TEMP_OVER)); - lm78_write_value(client, LM78_REG_TEMP_HYST, - TEMP_TO_REG(LM78_INIT_TEMP_HYST)); - /* Start monitoring */ lm78_write_value(client, LM78_REG_CONFIG, (lm78_read_value(client, LM78_REG_CONFIG) & 0xf7) diff --git a/kernel/chips/lm80.c b/kernel/chips/lm80.c index 605cb9a5..6d29c06f 100644 --- a/kernel/chips/lm80.c +++ b/kernel/chips/lm80.c @@ -114,55 +114,6 @@ static inline long TEMP_FROM_REG(u16 temp) #define DIV_FROM_REG(val) (1 << (val)) #define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1) -/* Initial limits */ -#define LM80_INIT_IN_0 190 -#define LM80_INIT_IN_1 190 -#define LM80_INIT_IN_2 190 -#define LM80_INIT_IN_3 190 -#define LM80_INIT_IN_4 190 -#define LM80_INIT_IN_5 190 -#define LM80_INIT_IN_6 190 - -#define LM80_INIT_IN_PERCENTAGE 10 - -#define LM80_INIT_IN_MIN_0 \ - (LM80_INIT_IN_0 - LM80_INIT_IN_0 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MAX_0 \ - (LM80_INIT_IN_0 + LM80_INIT_IN_0 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MIN_1 \ - (LM80_INIT_IN_1 - LM80_INIT_IN_1 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MAX_1 \ - (LM80_INIT_IN_1 + LM80_INIT_IN_1 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MIN_2 \ - (LM80_INIT_IN_2 - LM80_INIT_IN_2 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MAX_2 \ - (LM80_INIT_IN_2 + LM80_INIT_IN_2 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MIN_3 \ - (LM80_INIT_IN_3 - LM80_INIT_IN_3 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MAX_3 \ - (LM80_INIT_IN_3 + LM80_INIT_IN_3 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MIN_4 \ - (LM80_INIT_IN_4 - LM80_INIT_IN_4 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MAX_4 \ - (LM80_INIT_IN_4 + LM80_INIT_IN_4 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MIN_5 \ - (LM80_INIT_IN_5 - LM80_INIT_IN_5 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MAX_5 \ - (LM80_INIT_IN_5 + LM80_INIT_IN_5 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MIN_6 \ - (LM80_INIT_IN_6 - LM80_INIT_IN_6 * LM80_INIT_IN_PERCENTAGE / 100) -#define LM80_INIT_IN_MAX_6 \ - (LM80_INIT_IN_6 + LM80_INIT_IN_6 * LM80_INIT_IN_PERCENTAGE / 100) - -#define LM80_INIT_FAN_MIN_1 3000 -#define LM80_INIT_FAN_MIN_2 3000 - -#define LM80_INIT_TEMP_OS_MAX 600 -#define LM80_INIT_TEMP_OS_HYST 500 -#define LM80_INIT_TEMP_HOT_MAX 700 -#define LM80_INIT_TEMP_HOT_HYST 600 - - /* For each registered LM80, we need to keep some data in memory. That data is pointed to by lm80_list[NR]->data. The structure itself is dynamically allocated, at the same time when a new lm80 client is @@ -433,47 +384,6 @@ static void lm80_init_client(struct i2c_client *client) /* Set 11-bit temperature resolution */ lm80_write_value(client, LM80_REG_RES, 0x08); - lm80_write_value(client, LM80_REG_IN_MIN(0), - IN_TO_REG(LM80_INIT_IN_MIN_0, 0)); - lm80_write_value(client, LM80_REG_IN_MAX(0), - IN_TO_REG(LM80_INIT_IN_MAX_0, 0)); - lm80_write_value(client, LM80_REG_IN_MIN(1), - IN_TO_REG(LM80_INIT_IN_MIN_1, 1)); - lm80_write_value(client, LM80_REG_IN_MAX(1), - IN_TO_REG(LM80_INIT_IN_MAX_1, 1)); - lm80_write_value(client, LM80_REG_IN_MIN(2), - IN_TO_REG(LM80_INIT_IN_MIN_2, 2)); - lm80_write_value(client, LM80_REG_IN_MAX(2), - IN_TO_REG(LM80_INIT_IN_MAX_2, 2)); - lm80_write_value(client, LM80_REG_IN_MIN(3), - IN_TO_REG(LM80_INIT_IN_MIN_3, 3)); - lm80_write_value(client, LM80_REG_IN_MAX(3), - IN_TO_REG(LM80_INIT_IN_MAX_3, 3)); - lm80_write_value(client, LM80_REG_IN_MIN(4), - IN_TO_REG(LM80_INIT_IN_MIN_4, 4)); - lm80_write_value(client, LM80_REG_IN_MAX(4), - IN_TO_REG(LM80_INIT_IN_MAX_4, 4)); - lm80_write_value(client, LM80_REG_IN_MIN(5), - IN_TO_REG(LM80_INIT_IN_MIN_5, 5)); - lm80_write_value(client, LM80_REG_IN_MAX(5), - IN_TO_REG(LM80_INIT_IN_MAX_5, 5)); - lm80_write_value(client, LM80_REG_IN_MIN(6), - IN_TO_REG(LM80_INIT_IN_MIN_6, 6)); - lm80_write_value(client, LM80_REG_IN_MAX(6), - IN_TO_REG(LM80_INIT_IN_MAX_6, 6)); - lm80_write_value(client, LM80_REG_FAN1_MIN, - FAN_TO_REG(LM80_INIT_FAN_MIN_1, 2)); - lm80_write_value(client, LM80_REG_FAN2_MIN, - FAN_TO_REG(LM80_INIT_FAN_MIN_2, 2)); - lm80_write_value(client, LM80_REG_TEMP_HOT_MAX, - TEMP_LIMIT_TO_REG(LM80_INIT_TEMP_OS_MAX)); - lm80_write_value(client, LM80_REG_TEMP_HOT_HYST, - TEMP_LIMIT_TO_REG(LM80_INIT_TEMP_OS_HYST)); - lm80_write_value(client, LM80_REG_TEMP_OS_MAX, - TEMP_LIMIT_TO_REG(LM80_INIT_TEMP_OS_MAX)); - lm80_write_value(client, LM80_REG_TEMP_OS_HYST, - TEMP_LIMIT_TO_REG(LM80_INIT_TEMP_OS_HYST)); - /* Start monitoring */ lm80_write_value(client, LM80_REG_CONFIG, 0x01); } diff --git a/kernel/chips/lm83.c b/kernel/chips/lm83.c index 0a00738e..d8061bc0 100644 --- a/kernel/chips/lm83.c +++ b/kernel/chips/lm83.c @@ -86,9 +86,6 @@ SENSORS_INSMOD_1(lm83); #define TEMP_FROM_REG(val) (val > 127 ? val-256 : val) #define TEMP_TO_REG(val) (val < 0 ? val+256 : val) -#define LM83_INIT_HIGH 100 -#define LM83_INIT_CRIT 120 - static const u8 LM83_REG_R_TEMP[] = { LM83_REG_R_LOCAL_TEMP, LM83_REG_R_REMOTE1_TEMP, @@ -378,13 +375,7 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, unsigned static void lm83_init_client(struct i2c_client *client) { - int nr; - for (nr = 0; nr < 4; nr++) - i2c_smbus_write_byte_data(client, LM83_REG_W_HIGH[nr], - TEMP_TO_REG(LM83_INIT_HIGH)); - i2c_smbus_write_byte_data(client, LM83_REG_W_TCRIT, - TEMP_TO_REG(LM83_INIT_CRIT)); } static int lm83_detach_client(struct i2c_client *client) diff --git a/kernel/chips/lm87.c b/kernel/chips/lm87.c index b177a710..fa41ee57 100644 --- a/kernel/chips/lm87.c +++ b/kernel/chips/lm87.c @@ -196,13 +196,6 @@ static inline u8 FAN_TO_REG(long rpm, int div) #define DIV_FROM_REG(val) (1 << (val)) #define DIV_TO_REG(val) ((val)==1?0:((val)==8?3:((val)==4?2:1))) -#define LM87_INIT_FAN_MIN 3000 - -#define LM87_INIT_EXT_TEMP_MAX 600 -#define LM87_INIT_EXT_TEMP_MIN 100 -#define LM87_INIT_INT_TEMP_MAX 600 -#define LM87_INIT_INT_TEMP_MIN 100 - /* For each registered LM87, we need to keep some data in memory. That data is pointed to by LM87_list[NR]->data. The structure itself is dynamically allocated, at the same time when a new LM87 client is @@ -528,8 +521,6 @@ static int lm87_write_value(struct i2c_client *client, u8 reg, u8 value) static void lm87_init_client(struct i2c_client *client) { struct lm87_data *data = client->data; - int vid; - u8 v; /* Reset all except Watchdog values and last conversion values This sets fan-divs to 2, among others. This makes most other @@ -575,54 +566,7 @@ static void lm87_init_client(struct i2c_client *client) #endif ); - /* Set IN (voltage) initial limits to sane values +/- 5% */ - lm87_write_value(client, LM87_REG_IN_MIN(0),182); - lm87_write_value(client, LM87_REG_IN_MAX(0),202); - lm87_write_value(client, LM87_REG_IN_MIN(2),182); - lm87_write_value(client, LM87_REG_IN_MAX(2),202); - lm87_write_value(client, LM87_REG_IN_MIN(3),182); - lm87_write_value(client, LM87_REG_IN_MAX(3),202); - lm87_write_value(client, LM87_REG_IN_MIN(4),182); - lm87_write_value(client, LM87_REG_IN_MAX(4),202); - - /* Set CPU core voltage limits relative to vid readings +/- 5% */ - v = (lm87_read_value(client, LM87_REG_VID_FAN_DIV) & 0x0f) - | ((lm87_read_value(client, LM87_REG_VID4) & 0x01) - << 4 ); data->vrm = DEFAULT_VRM; - vid = vid_from_reg(v, data->vrm); - - v = vid * 95 * 192 / 270000; - lm87_write_value(client, LM87_REG_IN_MIN(1), v); - lm87_write_value(client, LM87_REG_IN_MIN(5), v); - v = vid * 105 * 192 / 270000; - lm87_write_value(client, LM87_REG_IN_MAX(1), v); - lm87_write_value(client, LM87_REG_IN_MAX(5), v); - - /* Set Temp initial limits to sane values */ - lm87_write_value(client, LM87_REG_EXT_TEMP_1_HIGH, - TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MAX)); - lm87_write_value(client, LM87_REG_EXT_TEMP_1_LOW, - TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MIN)); -#ifdef LM87_EXT2 - lm87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_HIGH, - TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MAX)); - lm87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_LOW, - TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MIN)); -#endif - lm87_write_value(client, LM87_REG_INT_TEMP_HIGH, - TEMP_LIMIT_TO_REG(LM87_INIT_INT_TEMP_MAX)); - lm87_write_value(client, LM87_REG_INT_TEMP_LOW, - TEMP_LIMIT_TO_REG(LM87_INIT_INT_TEMP_MIN)); - -#ifndef LM87_AIN1 - lm87_write_value(client, LM87_REG_FAN1_AIN1_LIMIT, - FAN_TO_REG(LM87_INIT_FAN_MIN, 2)); -#endif -#ifndef LM87_AIN2 - lm87_write_value(client, LM87_REG_FAN2_AIN2_LIMIT, - FAN_TO_REG(LM87_INIT_FAN_MIN, 2)); -#endif /* Start monitoring */ lm87_write_value(client, LM87_REG_CONFIG, 0x01); diff --git a/kernel/chips/lm90.c b/kernel/chips/lm90.c index eab96d5d..4eeb509b 100644 --- a/kernel/chips/lm90.c +++ b/kernel/chips/lm90.c @@ -113,11 +113,6 @@ SENSORS_INSMOD_2(lm90, adm1032); 0x10000 : 0)) & 0xFFE0) #define HYST_TO_REG(val) (val < 0 ? 0 : val > 31 ? 31 : val) -#define LM90_INIT_LOW 5 /* degrees */ -#define LM90_INIT_HIGH 70 -#define LM90_INIT_CRIT 85 -#define LM90_INIT_HYST 10 - /* * Functions declaration */ @@ -417,29 +412,6 @@ static void lm90_init_client(struct i2c_client *client) { u8 config; - /* - * Set limits. - */ - - i2c_smbus_write_byte_data(client, LM90_REG_W_LOCAL_HIGH, - TEMP1_TO_REG(LM90_INIT_HIGH)); - i2c_smbus_write_byte_data(client, LM90_REG_W_LOCAL_LOW, - TEMP1_TO_REG(LM90_INIT_LOW)); - i2c_smbus_write_byte_data(client, LM90_REG_W_LOCAL_CRIT, - TEMP1_TO_REG(LM90_INIT_CRIT)); - i2c_smbus_write_byte_data(client, LM90_REG_W_REMOTE_HIGHH, - TEMP1_TO_REG(LM90_INIT_HIGH)); - i2c_smbus_write_byte_data(client, LM90_REG_W_REMOTE_HIGHL, - 0); - i2c_smbus_write_byte_data(client, LM90_REG_W_REMOTE_LOWH, - TEMP1_TO_REG(LM90_INIT_LOW)); - i2c_smbus_write_byte_data(client, LM90_REG_W_REMOTE_LOWL, - 0); - i2c_smbus_write_byte_data(client, LM90_REG_W_REMOTE_CRIT, - TEMP1_TO_REG(LM90_INIT_CRIT)); - i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST, - HYST_TO_REG(LM90_INIT_HYST)); - /* * Starts the conversions. */