From e7419b243a373de4ee042f7d4f45f66de787240d Mon Sep 17 00:00:00 2001 From: Sascha Laue Date: Wed, 30 Apr 2008 15:16:35 +0200 Subject: lwmon5: fix manual merge error in POST Signed-off-by: Sascha Laue --- post/board/lwmon5/sysmon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'post') diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index 793f670e246..23cb70926bb 100644 --- a/post/board/lwmon5/sysmon.c +++ b/post/board/lwmon5/sysmon.c @@ -132,7 +132,7 @@ static sysmon_table_t sysmon_table[] = { "+ 5 V", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, 0, 0xFFFF, 0xFFFF, + 100, 1000, -0x8000, 0x7FFF, 0xFFFF, VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, REG_VOLTAGE_5V, @@ -140,7 +140,7 @@ static sysmon_table_t sysmon_table[] = { "+ 5 V standby", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, 0, 0xFFFF, 0xFFFF, + 100, 1000, -0x8000, 0x7FFF, 0xFFFF, VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, REG_VOLTAGE_5V_STANDBY, -- cgit v1.2.3 From 58b575e575c25fdf8c88141e145db201f3092149 Mon Sep 17 00:00:00 2001 From: Sascha Laue Date: Wed, 30 Apr 2008 15:23:38 +0200 Subject: lwmon5: fix offset error in sysmon0 POST Signed-off-by: Sascha Laue Signed-off-by: Wolfgang Denk --- post/board/lwmon5/sysmon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'post') diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index 23cb70926bb..e9c9624907e 100644 --- a/post/board/lwmon5/sysmon.c +++ b/post/board/lwmon5/sysmon.c @@ -133,16 +133,16 @@ static sysmon_table_t sysmon_table[] = { "+ 5 V", "V", &sysmon_dspic, NULL, NULL, 100, 1000, -0x8000, 0x7FFF, 0xFFFF, - VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, - VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, + 0x8000 + VOLTAGE_5V_MIN, 0x8000 + VOLTAGE_5V_MAX, 0, + 0x8000 + VOLTAGE_5V_MIN, 0x8000 + VOLTAGE_5V_MAX, 0, REG_VOLTAGE_5V, }, { "+ 5 V standby", "V", &sysmon_dspic, NULL, NULL, 100, 1000, -0x8000, 0x7FFF, 0xFFFF, - VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, - VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, + 0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0, + 0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0, REG_VOLTAGE_5V_STANDBY, }, }; -- cgit v1.2.3