[PATCH skeleton v6 20/20] Revert "Add I2C-6 lm75 outlet temperature sensor"
OpenBMC Patches
openbmc-patches at stwcx.xyz
Fri Apr 15 17:01:57 AEST 2016
From: Ken Lai <ken1029 at gmail.com>
This reverts commit 0428fb4215889eaa151f63b4e904bdc61551295f.
---
bin/Barreleye.py | 5 -----
objects/hwmons_barreleye.c | 15 +++++++--------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 86a5a97..ffe515d 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -633,11 +633,6 @@ HWMON_CONFIG = {
'in14_input' : { 'object_path' : 'voltage/P1V35_CPU1_BUF3','poll_interval' : 10000,'scale' : 1,'units' : '' },
}
},
- '6-0048' : {
- 'names' : {
- 'temp1_input' : { 'object_path' : 'temperature/outlet','poll_interval' : 5000,'scale' : 1000,'units' : 'C' },
- }
- },
'3-0050' : {
'names' : {
'caps_curr_powercap' : { 'object_path' : 'powercap/curr_cap','poll_interval' : 10000,'scale' : 1,'units' : 'W' },
diff --git a/objects/hwmons_barreleye.c b/objects/hwmons_barreleye.c
index 9cc555b..5acde7c 100644
--- a/objects/hwmons_barreleye.c
+++ b/objects/hwmons_barreleye.c
@@ -20,19 +20,18 @@ typedef struct {
int fd;
} HWMON;
-#define NUM_HWMONS 8
+#define NUM_HWMONS 7
// TODO: Don't hardcode
//Hardcoded for barreleye
HWMON hwmons[NUM_HWMONS] = {
(HWMON){"/sys/class/hwmon/hwmon0/temp1_input","temperature/ambient",3000,"C",1000},
- (HWMON){"/sys/class/hwmon/hwmon1/temp1_input","temperature/outlet",5000,"C",1000},
- (HWMON){"/sys/class/hwmon/hwmon2/pwm1","speed/fan0",30000,"",1},
- (HWMON){"/sys/class/hwmon/hwmon2/pwm2","speed/fan1",30000,"",1},
- (HWMON){"/sys/class/hwmon/hwmon2/pwm3","speed/fan2",30000,"",1},
- (HWMON){"/sys/class/hwmon/hwmon3/pwm1","speed/fan3",30000,"",1},
- (HWMON){"/sys/class/hwmon/hwmon3/pwm2","speed/fan4",30000,"",1},
- (HWMON){"/sys/class/hwmon/hwmon3/pwm3","speed/fan5",30000,"",1},
+ (HWMON){"/sys/class/hwmon/hwmon1/pwm1","speed/fan0",30000,"",1},
+ (HWMON){"/sys/class/hwmon/hwmon1/pwm2","speed/fan1",30000,"",1},
+ (HWMON){"/sys/class/hwmon/hwmon1/pwm3","speed/fan2",30000,"",1},
+ (HWMON){"/sys/class/hwmon/hwmon2/pwm1","speed/fan3",30000,"",1},
+ (HWMON){"/sys/class/hwmon/hwmon2/pwm2","speed/fan4",30000,"",1},
+ (HWMON){"/sys/class/hwmon/hwmon2/pwm3","speed/fan5",30000,"",1},
};
bool is_hwmon_valid(HWMON* hwmon)
{
--
2.7.1
More information about the openbmc
mailing list