mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-21 19:51:45 +00:00
bugfixes:
* read dynamic VCCP error status for IN7 & IN8 (if we're in that mode) * unmask #VRDHOT and dynamic VCCP (if we're in that mode) error events * move 'start monitoring' command to the end of the inits git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2734 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
14856e37e8
commit
c9b412f57c
2 files changed
+27
-5
No files matched your search
+23
-5
@@ -846,7 +846,18 @@ static void lm93_in(struct i2c_client *client, int operation, int ctl_name,
|
|||||||
static unsigned LM93_ALARMS_FROM_REG(struct block1_t b1)
|
static unsigned LM93_ALARMS_FROM_REG(struct block1_t b1)
|
||||||
{
|
{
|
||||||
unsigned result;
|
unsigned result;
|
||||||
result = b1.host_status_2;
|
result = b1.host_status_2 & 0x3f;
|
||||||
|
|
||||||
|
if (vccp_limit_type[0])
|
||||||
|
result |= (b1.host_status_1 & 0x10) << 2;
|
||||||
|
else
|
||||||
|
result |= b1.host_status_2 & 0x40;
|
||||||
|
|
||||||
|
if (vccp_limit_type[1])
|
||||||
|
result |= (b1.host_status_1 & 0x20) << 2;
|
||||||
|
else
|
||||||
|
result |= b1.host_status_2 & 0x80;
|
||||||
|
|
||||||
result |= b1.host_status_3 << 8;
|
result |= b1.host_status_3 << 8;
|
||||||
result |= (b1.fan_status & 0x0f) << 16;
|
result |= (b1.fan_status & 0x0f) << 16;
|
||||||
result |= (b1.p1_prochot_status & 0x80) << 13;
|
result |= (b1.p1_prochot_status & 0x80) << 13;
|
||||||
@@ -2128,10 +2139,6 @@ static void lm93_init_client(struct i2c_client *client)
|
|||||||
lm93_write_byte(client, LM93_REG_GPI_VID_CTL,
|
lm93_write_byte(client, LM93_REG_GPI_VID_CTL,
|
||||||
reg | (vid_agtl ? 0x03 : 0x00));
|
reg | (vid_agtl ? 0x03 : 0x00));
|
||||||
|
|
||||||
/* start monitoring */
|
|
||||||
reg = lm93_read_byte(client, LM93_REG_CONFIG);
|
|
||||||
lm93_write_byte(client, LM93_REG_CONFIG, reg | 0x01);
|
|
||||||
|
|
||||||
if (init) {
|
if (init) {
|
||||||
/* enable #ALERT pin */
|
/* enable #ALERT pin */
|
||||||
reg = lm93_read_byte(client, LM93_REG_CONFIG);
|
reg = lm93_read_byte(client, LM93_REG_CONFIG);
|
||||||
@@ -2143,8 +2150,19 @@ static void lm93_init_client(struct i2c_client *client)
|
|||||||
|
|
||||||
/* set sleep state to S0 */
|
/* set sleep state to S0 */
|
||||||
lm93_write_byte(client, LM93_REG_SLEEP_CONTROL, 0);
|
lm93_write_byte(client, LM93_REG_SLEEP_CONTROL, 0);
|
||||||
|
|
||||||
|
/* unmask #VRDHOT and dynamic VCCP (if nec) error events */
|
||||||
|
reg = lm93_read_byte(client, LM93_REG_MISC_ERR_MASK);
|
||||||
|
reg &= ~0x03;
|
||||||
|
reg &= ~(vccp_limit_type[0] ? 0x10 : 0);
|
||||||
|
reg &= ~(vccp_limit_type[1] ? 0x20 : 0);
|
||||||
|
lm93_write_byte(client, LM93_REG_MISC_ERR_MASK, reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* start monitoring */
|
||||||
|
reg = lm93_read_byte(client, LM93_REG_CONFIG);
|
||||||
|
lm93_write_byte(client, LM93_REG_CONFIG, reg | 0x01);
|
||||||
|
|
||||||
/* spin until ready */
|
/* spin until ready */
|
||||||
for (i=0; i<20; i++) {
|
for (i=0; i<20; i++) {
|
||||||
mdelay(10);
|
mdelay(10);
|
||||||
|
|||||||
@@ -101,6 +101,10 @@
|
|||||||
#define LM93_REG_GPI_VID_CTL 0xbe
|
#define LM93_REG_GPI_VID_CTL 0xbe
|
||||||
#define LM93_REG_SF_TACH_TO_PWM 0xe0
|
#define LM93_REG_SF_TACH_TO_PWM 0xe0
|
||||||
|
|
||||||
|
/* error masks */
|
||||||
|
#define LM93_REG_GPI_ERR_MASK 0xec
|
||||||
|
#define LM93_REG_MISC_ERR_MASK 0xed
|
||||||
|
|
||||||
/* LM93 REGISTER VALUES */
|
/* LM93 REGISTER VALUES */
|
||||||
#define LM93_MFR_ID 0x73
|
#define LM93_MFR_ID 0x73
|
||||||
#define LM93_MFR_ID_PROTOTYPE 0x72
|
#define LM93_MFR_ID_PROTOTYPE 0x72
|
||||||
|
|||||||
Reference in new issue
Block a user