wspoon: Add machine overrides to hwmon devices

In preparation for additional systems under hte witherspoon layer, add
machine overrides to the hwmon devices and service configurations. This
allows additional machines' phosphor-hwmon configurations to be placed
in this layer.

Tested:
    Witherspoon phosphor-hwmon image still contains all device configs &
    services to be installed.

(From meta-ibm rev: 84b1f2e70034311853f4e417b9a29687a512cc97)

Change-Id: I28685d71bb99cd23b8a0acc34bfd117dbdef8926
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

14 files changed, 0 insertions, 915 deletions

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/wspoon.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf
index 409a75f0b..409a75f0b 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/wspoon.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf
deleted file mode 100644
index cdf8b4726..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL_temp1 = "ambient"
-WARNHI_temp1 = "25000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "35000"
-CRITLO_temp1 = "0"
-OFFSET_temp1 = "-2000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf
deleted file mode 100644
index cdf8b4726..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL_temp1 = "ambient"
-WARNHI_temp1 = "25000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "35000"
-CRITLO_temp1 = "0"
-OFFSET_temp1 = "-2000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
deleted file mode 100644
index 0aafc9b14..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-LABEL_fan1 = "fan0_0"
-CRITLO_fan1 = "2974"
-CRITHI_fan1 = "12076"
-
-LABEL_fan2 = "fan1_0"
-CRITLO_fan2 = "2974"
-CRITHI_fan2 = "12076"
-
-LABEL_fan3 = "fan2_0"
-CRITLO_fan3 = "2974"
-CRITHI_fan3 = "12076"
-
-LABEL_fan4 = "fan3_0"
-CRITLO_fan4 = "2974"
-CRITHI_fan4 = "12076"
-
-LABEL_fan5 = "fan0_1"
-CRITLO_fan5 = "2974"
-CRITHI_fan5 = "12076"
-
-LABEL_fan6 = "fan1_1"
-CRITLO_fan6 = "2974"
-CRITHI_fan6 = "12076"
-
-LABEL_fan7 = "fan2_1"
-CRITLO_fan7 = "2974"
-CRITHI_fan7 = "12076"
-
-LABEL_fan8 = "fan3_1"
-CRITLO_fan8 = "2974"
-CRITHI_fan8 = "12076"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
deleted file mode 100644
index 5c0efe420..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-LABEL_fan1 = "fan0_0"
-CRITLO_fan1 = "2549"
-CRITHI_fan1 = "12076"
-
-LABEL_fan3 = "fan2_0"
-CRITLO_fan3 = "2549"
-CRITHI_fan3 = "12076"
-
-LABEL_fan4 = "fan3_0"
-CRITLO_fan4 = "2549"
-CRITHI_fan4 = "12076"
-
-LABEL_fan5 = "fan0_1"
-CRITLO_fan5 = "2549"
-CRITHI_fan5 = "12076"
-
-LABEL_fan7 = "fan2_1"
-CRITLO_fan7 = "2549"
-CRITHI_fan7 = "12076"
-
-LABEL_fan8 = "fan3_1"
-CRITLO_fan8 = "2549"
-CRITHI_fan8 = "12076"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf
deleted file mode 100644
index e463b517c..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_in1="ps1_input_voltage"
-WARNHI_in1="290000"
-WARNLO_in1="200000"
-CRITHI_in1="300000"
-CRITLO_in1="180000"
-
-LABEL_in2="ps1_output_voltage"
-WARNHI_in2="12700"
-WARNLO_in2="0"
-CRITHI_in2="13000"
-CRITLO_in2="0"
-
-LABEL_curr1="ps1_output_current"
-WARNHI_curr1="170000"
-WARNLO_curr1="0"
-CRITHI_curr1="180000"
-CRITLO_curr1="0"
-
-LABEL_power1="ps1_input_power"
-WARNHI_power1="2350000000"
-WARNLO_power1="0"
-CRITHI_power1="2500000000"
-CRITLO_power1="0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf
deleted file mode 100644
index 2fadbdec0..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_in1="ps0_input_voltage"
-WARNHI_in1="290000"
-WARNLO_in1="200000"
-CRITHI_in1="300000"
-CRITLO_in1="180000"
-
-LABEL_in2="ps0_output_voltage"
-WARNHI_in2="12700"
-WARNLO_in2="0"
-CRITHI_in2="13000"
-CRITLO_in2="0"
-
-LABEL_curr1="ps0_output_current"
-WARNHI_curr1="170000"
-WARNLO_curr1="0"
-CRITHI_curr1="180000"
-CRITLO_curr1="0"
-
-LABEL_power1="ps0_input_power"
-WARNHI_power1="2350000000"
-WARNLO_power1="0"
-CRITHI_power1="2500000000"
-CRITLO_power1="0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
deleted file mode 100644
index 9ae1f1ef1..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_temp1 = "p0_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curr2 = "p0_vdd_current"
-WARNLO_curr2 = "0"
-CRITLO_curr2 = "0"
-WARNHI_curr2 = "320000"
-CRITHI_curr2 = "360000"
-
-LABEL_in2 = "p0_vdd_voltage"
-WARNLO_in2 = "0"
-CRITLO_in2 = "0"
-WARNHI_in2 = "1150"
-CRITHI_in2 = "1300"
-
-LABEL_power2 = "p0_vdd_power"
-WARNLO_power2 = "0"
-CRITLO_power2 = "0"
-WARNHI_power2 = "270000000"
-CRITHI_power2 = "290000000"
-
-LABEL_temp2 = "p0_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curr3 = "p0_vcs_current"
-WARNLO_curr3 = "0"
-CRITLO_curr3 = "0"
-WARNHI_curr3 = "20000"
-CRITHI_curr3 = "25000"
-
-LABEL_in3 = "p0_vcs_voltage"
-WARNLO_in3 = "0"
-CRITLO_in3 = "0"
-WARNHI_in3 = "1150"
-CRITHI_in3 = "1300"
-
-LABEL_power3 = "p0_vcs_power"
-WARNLO_power3 = "0"
-CRITLO_power3 = "0"
-WARNHI_power3 = "20000000"
-CRITHI_power3 = "25000000"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf
deleted file mode 100644
index 723a68d66..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_temp1 = "p0_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curr2 = "p0_vdn_current"
-WARNLO_curr2 = "0"
-CRITLO_curr2 = "0"
-WARNHI_curr2 = "80000"
-CRITHI_curr2 = "110000"
-
-LABEL_in2 = "p0_vdn_voltage"
-WARNLO_in2 = "0"
-CRITLO_in2 = "0"
-WARNHI_in2 = "1100"
-CRITHI_in2 = "1300"
-
-LABEL_power2 = "p0_vdn_power"
-WARNLO_power2 = "0"
-CRITLO_power2 = "0"
-WARNHI_power2 = "88000000"
-CRITHI_power2 = "121000000"
-
-LABEL_temp2 = "p0_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curr3 = "p0_vddr_current"
-WARNLO_curr3 = "0"
-CRITLO_curr3 = "0"
-WARNHI_curr3 = "115000"
-CRITHI_curr3 = "130000"
-
-LABEL_in3 = "p0_vddr_voltage"
-WARNLO_in3 = "0"
-CRITLO_in3 = "0"
-WARNHI_in3 = "1280"
-CRITHI_in3 = "1350"
-
-LABEL_power3 = "p0_vddr_power"
-WARNLO_power3 = "0"
-CRITLO_power3 = "0"
-WARNHI_power3 = "139150000"
-CRITHI_power3 = "159900000"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
deleted file mode 100644
index 1fa7b5a5c..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_temp1 = "p1_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curr2 = "p1_vdd_current"
-WARNLO_curr2 = "0"
-CRITLO_curr2 = "0"
-WARNHI_curr2 = "320000"
-CRITHI_curr2 = "360000"
-
-LABEL_in2 = "p1_vdd_voltage"
-WARNLO_in2 = "0"
-CRITLO_in2 = "0"
-WARNHI_in2 = "1150"
-CRITHI_in2 = "1300"
-
-LABEL_power2 = "p1_vdd_power"
-WARNLO_power2 = "0"
-CRITLO_power2 = "0"
-WARNHI_power2 = "270000000"
-CRITHI_power2 = "290000000"
-
-LABEL_temp2 = "p1_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curr3 = "p1_vcs_current"
-WARNLO_curr3 = "0"
-CRITLO_curr3 = "0"
-WARNHI_curr3 = "20000"
-CRITHI_curr3 = "25000"
-
-LABEL_in3 = "p1_vcs_voltage"
-WARNLO_in3 = "0"
-CRITLO_in3 = "0"
-WARNHI_in3 = "1150"
-CRITHI_in3 = "1300"
-
-LABEL_power3 = "p1_vcs_power"
-WARNLO_power3 = "0"
-CRITLO_power3 = "0"
-WARNHI_power3 = "20000000"
-CRITHI_power3 = "25000000"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf
deleted file mode 100644
index d4e9326b2..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-LABEL_temp1 = "p1_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curr2 = "p1_vdn_current"
-WARNLO_curr2 = "0"
-CRITLO_curr2 = "0"
-WARNHI_curr2 = "80000"
-CRITHI_curr2 = "110000"
-
-LABEL_in2 = "p1_vdn_voltage"
-WARNLO_in2 = "0"
-CRITLO_in2 = "0"
-WARNHI_in2 = "1100"
-CRITHI_in2 = "1300"
-
-LABEL_power2 = "p1_vdn_power"
-WARNLO_power2 = "0"
-CRITLO_power2 = "0"
-WARNHI_power2 = "88000000"
-CRITHI_power2 = "121000000"
-
-LABEL_temp2 = "p1_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curr3 = "p1_vddr_current"
-WARNLO_curr3 = "0"
-CRITLO_curr3 = "0"
-WARNHI_curr3 = "115000"
-CRITHI_curr3 = "130000"
-
-LABEL_in3 = "p1_vddr_voltage"
-WARNLO_in3 = "0"
-CRITLO_in3 = "0"
-WARNHI_in3 = "1280"
-CRITHI_in3 = "1350"
-
-LABEL_power3 = "p1_vddr_power"
-WARNLO_power3 = "0"
-CRITLO_power3 = "0"
-WARNHI_power3 = "139150000"
-CRITHI_power3 = "159900000"
\ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf
deleted file mode 100644
index 3af092867..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "pcie"
-WARNHI_temp1 = "60000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "70000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
deleted file mode 100644
index c5fa56f65..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ /dev/null
@@ -1,338 +0,0 @@
-MODE_temp1 = "label"
-MODE_temp2 = "label"
-MODE_temp3 = "label"
-MODE_temp4 = "label"
-MODE_temp5 = "label"
-MODE_temp6 = "label"
-MODE_temp7 = "label"
-MODE_temp8 = "label"
-MODE_temp9 = "label"
-MODE_temp10 = "label"
-MODE_temp11 = "label"
-MODE_temp12 = "label"
-MODE_temp13 = "label"
-MODE_temp14 = "label"
-MODE_temp15 = "label"
-MODE_temp16 = "label"
-MODE_temp17 = "label"
-MODE_temp18 = "label"
-MODE_temp19 = "label"
-MODE_temp20 = "label"
-MODE_temp21 = "label"
-MODE_temp22 = "label"
-MODE_temp23 = "label"
-MODE_temp24 = "label"
-MODE_temp25 = "label"
-MODE_temp26 = "label"
-MODE_temp27 = "label"
-MODE_temp28 = "label"
-MODE_temp29 = "label"
-MODE_temp30 = "label"
-MODE_temp31 = "label"
-MODE_temp32 = "label"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-MODE_power5 = "label"
-MODE_power6 = "label"
-MODE_power7 = "label"
-MODE_power8 = "label"
-MODE_power9 = "label"
-MODE_power10 = "label"
-MODE_power11 = "label"
-MODE_power12 = "label"
-MODE_power13 = "label"
-MODE_power14 = "label"
-MODE_power15 = "label"
-
-REMOVERCS = "11"
-
-LABEL_temp17 = "p0_core0_temp"
-WARNHI_temp17 = "78000"
-WARNLO_temp17 = "0"
-CRITHI_temp17 = "83000"
-CRITLO_temp17 = "0"
-
-LABEL_temp20 = "p0_core1_temp"
-WARNHI_temp20 = "78000"
-WARNLO_temp20 = "0"
-CRITHI_temp20 = "83000"
-CRITLO_temp20 = "0"
-
-LABEL_temp23 = "p0_core2_temp"
-WARNHI_temp23 = "78000"
-WARNLO_temp23 = "0"
-CRITHI_temp23 = "83000"
-CRITLO_temp23 = "0"
-
-LABEL_temp26 = "p0_core3_temp"
-WARNHI_temp26 = "78000"
-WARNLO_temp26 = "0"
-CRITHI_temp26 = "83000"
-CRITLO_temp26 = "0"
-
-LABEL_temp29 = "p0_core4_temp"
-WARNHI_temp29 = "78000"
-WARNLO_temp29 = "0"
-CRITHI_temp29 = "83000"
-CRITLO_temp29 = "0"
-
-LABEL_temp32 = "p0_core5_temp"
-WARNHI_temp32 = "78000"
-WARNLO_temp32 = "0"
-CRITHI_temp32 = "83000"
-CRITLO_temp32 = "0"
-
-LABEL_temp35 = "p0_core6_temp"
-WARNHI_temp35 = "78000"
-WARNLO_temp35 = "0"
-CRITHI_temp35 = "83000"
-CRITLO_temp35 = "0"
-
-LABEL_temp38 = "p0_core7_temp"
-WARNHI_temp38 = "78000"
-WARNLO_temp38 = "0"
-CRITHI_temp38 = "83000"
-CRITLO_temp38 = "0"
-
-LABEL_temp41 = "p0_core8_temp"
-WARNHI_temp41 = "78000"
-WARNLO_temp41 = "0"
-CRITHI_temp41 = "83000"
-CRITLO_temp41 = "0"
-
-LABEL_temp44 = "p0_core9_temp"
-WARNHI_temp44 = "78000"
-WARNLO_temp44 = "0"
-CRITHI_temp44 = "83000"
-CRITLO_temp44 = "0"
-
-LABEL_temp47 = "p0_core10_temp"
-WARNHI_temp47 = "78000"
-WARNLO_temp47 = "0"
-CRITHI_temp47 = "83000"
-CRITLO_temp47 = "0"
-
-LABEL_temp50 = "p0_core11_temp"
-WARNHI_temp50 = "78000"
-WARNLO_temp50 = "0"
-CRITHI_temp50 = "83000"
-CRITLO_temp50 = "0"
-
-LABEL_temp53 = "p0_core12_temp"
-WARNHI_temp53 = "78000"
-WARNLO_temp53 = "0"
-CRITHI_temp53 = "83000"
-CRITLO_temp53 = "0"
-
-LABEL_temp56 = "p0_core13_temp"
-WARNHI_temp56 = "78000"
-WARNLO_temp56 = "0"
-CRITHI_temp56 = "83000"
-CRITLO_temp56 = "0"
-
-LABEL_temp59 = "p0_core14_temp"
-WARNHI_temp59 = "78000"
-WARNLO_temp59 = "0"
-CRITHI_temp59 = "83000"
-CRITLO_temp59 = "0"
-
-LABEL_temp62 = "p0_core15_temp"
-WARNHI_temp62 = "78000"
-WARNLO_temp62 = "0"
-CRITHI_temp62 = "83000"
-CRITLO_temp62 = "0"
-
-LABEL_temp65 = "p0_core16_temp"
-WARNHI_temp65 = "78000"
-WARNLO_temp65 = "0"
-CRITHI_temp65 = "83000"
-CRITLO_temp65 = "0"
-
-LABEL_temp68 = "p0_core17_temp"
-WARNHI_temp68 = "78000"
-WARNLO_temp68 = "0"
-CRITHI_temp68 = "83000"
-CRITLO_temp68 = "0"
-
-LABEL_temp71 = "p0_core18_temp"
-WARNHI_temp71 = "78000"
-WARNLO_temp71 = "0"
-CRITHI_temp71 = "83000"
-CRITLO_temp71 = "0"
-
-LABEL_temp74 = "p0_core19_temp"
-WARNHI_temp74 = "78000"
-WARNLO_temp74 = "0"
-CRITHI_temp74 = "83000"
-CRITLO_temp74 = "0"
-
-LABEL_temp77 = "p0_core20_temp"
-WARNHI_temp77 = "78000"
-WARNLO_temp77 = "0"
-CRITHI_temp77 = "83000"
-CRITLO_temp77 = "0"
-
-LABEL_temp80 = "p0_core21_temp"
-WARNHI_temp80 = "78000"
-WARNLO_temp80 = "0"
-CRITHI_temp80 = "83000"
-CRITLO_temp80 = "0"
-
-LABEL_temp83 = "p0_core22_temp"
-WARNHI_temp83 = "78000"
-WARNLO_temp83 = "0"
-CRITHI_temp83 = "83000"
-CRITLO_temp83 = "0"
-
-LABEL_temp86 = "p0_core23_temp"
-WARNHI_temp86 = "78000"
-WARNLO_temp86 = "0"
-CRITHI_temp86 = "83000"
-CRITLO_temp86 = "0"
-
-LABEL_temp165 = "dimm0_temp"
-WARNHI_temp165 = "78000"
-WARNLO_temp165 = "0"
-CRITHI_temp165 = "83000"
-CRITLO_temp165 = "0"
-
-LABEL_temp167 = "dimm1_temp"
-WARNHI_temp167 = "78000"
-WARNLO_temp167 = "0"
-CRITHI_temp167 = "83000"
-CRITLO_temp167 = "0"
-
-LABEL_temp169 = "dimm2_temp"
-WARNHI_temp169 = "78000"
-WARNLO_temp169 = "0"
-CRITHI_temp169 = "83000"
-CRITLO_temp169 = "0"
-
-LABEL_temp171 = "dimm3_temp"
-WARNHI_temp171 = "78000"
-WARNLO_temp171 = "0"
-CRITHI_temp171 = "83000"
-CRITLO_temp171 = "0"
-
-LABEL_temp173 = "dimm4_temp"
-WARNHI_temp173 = "78000"
-WARNLO_temp173 = "0"
-CRITHI_temp173 = "83000"
-CRITLO_temp173 = "0"
-
-LABEL_temp175 = "dimm5_temp"
-WARNHI_temp175 = "78000"
-WARNLO_temp175 = "0"
-CRITHI_temp175 = "83000"
-CRITLO_temp175 = "0"
-
-LABEL_temp177 = "dimm6_temp"
-WARNHI_temp177 = "78000"
-WARNLO_temp177 = "0"
-CRITHI_temp177 = "83000"
-CRITLO_temp177 = "0"
-
-LABEL_temp179 = "dimm7_temp"
-WARNHI_temp179 = "78000"
-WARNLO_temp179 = "0"
-CRITHI_temp179 = "83000"
-CRITLO_temp179 = "0"
-
-LABEL_temp198 = "gpu0_core_temp"
-WARNHI_temp198 = "76000"
-WARNLO_temp198 = "0"
-CRITHI_temp198 = "81000"
-CRITLO_temp198 = "0"
-
-LABEL_temp199 = "gpu0_mem_temp"
-WARNHI_temp199 = "78000"
-WARNLO_temp199 = "0"
-CRITHI_temp199 = "83000"
-CRITLO_temp199 = "0"
-
-LABEL_temp201 = "gpu1_core_temp"
-WARNHI_temp201 = "76000"
-WARNLO_temp201 = "0"
-CRITHI_temp201 = "81000"
-CRITLO_temp201 = "0"
-
-LABEL_temp202 = "gpu1_mem_temp"
-WARNHI_temp202 = "78000"
-WARNLO_temp202 = "0"
-CRITHI_temp202 = "83000"
-CRITLO_temp202 = "0"
-
-LABEL_temp204 = "gpu2_core_temp"
-WARNHI_temp204 = "76000"
-WARNLO_temp204 = "0"
-CRITHI_temp204 = "81000"
-CRITLO_temp204 = "0"
-
-LABEL_temp205 = "gpu2_mem_temp"
-WARNHI_temp205 = "78000"
-WARNLO_temp205 = "0"
-CRITHI_temp205 = "83000"
-CRITLO_temp205 = "0"
-
-LABEL_power0_22_0 = "total_power"
-WARNHI_power0_22_0 = "3050000000"
-WARNLO_power0_22_0 = "0"
-CRITHI_power0_22_0 = "3100000000"
-CRITLO_power0_22_0 = "0"
-
-LABEL_power0_5_2 = "p0_power"
-WARNHI_power0_5_2 = "250000000"
-WARNLO_power0_5_2 = "0"
-CRITHI_power0_5_2 = "300000000"
-CRITLO_power0_5_2 = "0"
-
-LABEL_power0_6_3 = "p1_power"
-WARNHI_power0_6_3 = "250000000"
-WARNLO_power0_6_3 = "0"
-CRITHI_power0_6_3 = "300000000"
-CRITLO_power0_6_3 = "0"
-
-LABEL_power0_9_4 = "p0_io_power"
-WARNHI_power0_9_4 = "80000000"
-WARNLO_power0_9_4 = "0"
-CRITHI_power0_9_4 = "100000000"
-CRITLO_power0_9_4 = "0"
-
-LABEL_power0_10_5 = "p1_io_power"
-WARNHI_power0_10_5 = "80000000"
-WARNLO_power0_10_5 = "0"
-CRITHI_power0_10_5 = "100000000"
-CRITLO_power0_10_5 = "0"
-
-LABEL_power0_1_6 = "p0_mem_power"
-WARNHI_power0_1_6 = "250000000"
-WARNLO_power0_1_6 = "0"
-CRITHI_power0_1_6 = "300000000"
-CRITLO_power0_1_6 = "0"
-
-LABEL_power0_2_7 = "p1_mem_power"
-WARNHI_power0_2_7 = "250000000"
-WARNLO_power0_2_7 = "0"
-CRITHI_power0_2_7 = "300000000"
-CRITLO_power0_2_7 = "0"
-
-LABEL_power0_18_14 = "fan_disk_power"
-WARNHI_power0_18_14 = "375000000"
-WARNLO_power0_18_14 = "0"
-CRITHI_power0_18_14 = "400000000"
-CRITLO_power0_18_14 = "0"
-
-LABEL_power0_13_15 = "io_power"
-WARNHI_power0_13_15 = "128000000"
-WARNLO_power0_13_15 = "0"
-CRITHI_power0_13_15 = "150000000"
-CRITLO_power0_13_15 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
deleted file mode 100644
index 55b72fc2a..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ /dev/null
@@ -1,268 +0,0 @@
-MODE_temp1 = "label"
-MODE_temp2 = "label"
-MODE_temp3 = "label"
-MODE_temp4 = "label"
-MODE_temp5 = "label"
-MODE_temp6 = "label"
-MODE_temp7 = "label"
-MODE_temp8 = "label"
-MODE_temp9 = "label"
-MODE_temp10 = "label"
-MODE_temp11 = "label"
-MODE_temp12 = "label"
-MODE_temp13 = "label"
-MODE_temp14 = "label"
-MODE_temp15 = "label"
-MODE_temp16 = "label"
-MODE_temp17 = "label"
-MODE_temp18 = "label"
-MODE_temp19 = "label"
-MODE_temp20 = "label"
-MODE_temp21 = "label"
-MODE_temp22 = "label"
-MODE_temp23 = "label"
-MODE_temp24 = "label"
-MODE_temp25 = "label"
-MODE_temp26 = "label"
-MODE_temp27 = "label"
-MODE_temp28 = "label"
-MODE_temp29 = "label"
-MODE_temp30 = "label"
-MODE_temp31 = "label"
-MODE_temp32 = "label"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-
-REMOVERCS = "11"
-
-LABEL_temp91 = "p1_core0_temp"
-WARNHI_temp91 = "78000"
-WARNLO_temp91 = "0"
-CRITHI_temp91 = "83000"
-CRITLO_temp91 = "0"
-
-LABEL_temp94 = "p1_core1_temp"
-WARNHI_temp94 = "78000"
-WARNLO_temp94 = "0"
-CRITHI_temp94 = "83000"
-CRITLO_temp94 = "0"
-
-LABEL_temp97 = "p1_core2_temp"
-WARNHI_temp97 = "78000"
-WARNLO_temp97 = "0"
-CRITHI_temp97 = "83000"
-CRITLO_temp97 = "0"
-
-LABEL_temp100 = "p1_core3_temp"
-WARNHI_temp100 = "78000"
-WARNLO_temp100 = "0"
-CRITHI_temp100 = "83000"
-CRITLO_temp100 = "0"
-
-LABEL_temp103 = "p1_core4_temp"
-WARNHI_temp103 = "78000"
-WARNLO_temp103 = "0"
-CRITHI_temp103 = "83000"
-CRITLO_temp103 = "0"
-
-LABEL_temp106 = "p1_core5_temp"
-WARNHI_temp106 = "78000"
-WARNLO_temp106 = "0"
-CRITHI_temp106 = "83000"
-CRITLO_temp106 = "0"
-
-LABEL_temp109 = "p1_core6_temp"
-WARNHI_temp109 = "78000"
-WARNLO_temp109 = "0"
-CRITHI_temp109 = "83000"
-CRITLO_temp109 = "0"
-
-LABEL_temp112 = "p1_core7_temp"
-WARNHI_temp112 = "78000"
-WARNLO_temp112 = "0"
-CRITHI_temp112 = "83000"
-CRITLO_temp112 = "0"
-
-LABEL_temp115 = "p1_core8_temp"
-WARNHI_temp115 = "78000"
-WARNLO_temp115 = "0"
-CRITHI_temp115 = "83000"
-CRITLO_temp115 = "0"
-
-LABEL_temp118 = "p1_core9_temp"
-WARNHI_temp118 = "78000"
-WARNLO_temp118 = "0"
-CRITHI_temp118 = "83000"
-CRITLO_temp118 = "0"
-
-LABEL_temp121 = "p1_core10_temp"
-WARNHI_temp121 = "78000"
-WARNLO_temp121 = "0"
-CRITHI_temp121 = "83000"
-CRITLO_temp121 = "0"
-
-LABEL_temp124 = "p1_core11_temp"
-WARNHI_temp124 = "78000"
-WARNLO_temp124 = "0"
-CRITHI_temp124 = "83000"
-CRITLO_temp124 = "0"
-
-LABEL_temp127 = "p1_core12_temp"
-WARNHI_temp127 = "78000"
-WARNLO_temp127 = "0"
-CRITHI_temp127 = "83000"
-CRITLO_temp127 = "0"
-
-LABEL_temp130 = "p1_core13_temp"
-WARNHI_temp130 = "78000"
-WARNLO_temp130 = "0"
-CRITHI_temp130 = "83000"
-CRITLO_temp130 = "0"
-
-LABEL_temp133 = "p1_core14_temp"
-WARNHI_temp133 = "78000"
-WARNLO_temp133 = "0"
-CRITHI_temp133 = "83000"
-CRITLO_temp133 = "0"
-
-LABEL_temp136 = "p1_core15_temp"
-WARNHI_temp136 = "78000"
-WARNLO_temp136 = "0"
-CRITHI_temp136 = "83000"
-CRITLO_temp136 = "0"
-
-LABEL_temp139 = "p1_core16_temp"
-WARNHI_temp139 = "78000"
-WARNLO_temp139 = "0"
-CRITHI_temp139 = "83000"
-CRITLO_temp139 = "0"
-
-LABEL_temp142 = "p1_core17_temp"
-WARNHI_temp142 = "78000"
-WARNLO_temp142 = "0"
-CRITHI_temp142 = "83000"
-CRITLO_temp142 = "0"
-
-LABEL_temp145 = "p1_core18_temp"
-WARNHI_temp145 = "78000"
-WARNLO_temp145 = "0"
-CRITHI_temp145 = "83000"
-CRITLO_temp145 = "0"
-
-LABEL_temp148 = "p1_core19_temp"
-WARNHI_temp148 = "78000"
-WARNLO_temp148 = "0"
-CRITHI_temp148 = "83000"
-CRITLO_temp148 = "0"
-
-LABEL_temp151 = "p1_core20_temp"
-WARNHI_temp151 = "78000"
-WARNLO_temp151 = "0"
-CRITHI_temp151 = "83000"
-CRITLO_temp151 = "0"
-
-LABEL_temp154 = "p1_core21_temp"
-WARNHI_temp154 = "78000"
-WARNLO_temp154 = "0"
-CRITHI_temp154 = "83000"
-CRITLO_temp154 = "0"
-
-LABEL_temp157 = "p1_core22_temp"
-WARNHI_temp157 = "78000"
-WARNLO_temp157 = "0"
-CRITHI_temp157 = "83000"
-CRITLO_temp157 = "0"
-
-LABEL_temp160 = "p1_core23_temp"
-WARNHI_temp160 = "78000"
-WARNLO_temp160 = "0"
-CRITHI_temp160 = "83000"
-CRITLO_temp160 = "0"
-
-LABEL_temp181 = "dimm8_temp"
-WARNHI_temp181 = "78000"
-WARNLO_temp181 = "0"
-CRITHI_temp181 = "83000"
-CRITLO_temp181 = "0"
-
-LABEL_temp183 = "dimm9_temp"
-WARNHI_temp183 = "78000"
-WARNLO_temp183 = "0"
-CRITHI_temp183 = "83000"
-CRITLO_temp183 = "0"
-
-LABEL_temp185 = "dimm10_temp"
-WARNHI_temp185 = "78000"
-WARNLO_temp185 = "0"
-CRITHI_temp185 = "83000"
-CRITLO_temp185 = "0"
-
-LABEL_temp187 = "dimm11_temp"
-WARNHI_temp187 = "78000"
-WARNLO_temp187 = "0"
-CRITHI_temp187 = "83000"
-CRITLO_temp187 = "0"
-
-LABEL_temp189 = "dimm12_temp"
-WARNHI_temp189 = "78000"
-WARNLO_temp189 = "0"
-CRITHI_temp189 = "83000"
-CRITLO_temp189 = "0"
-
-LABEL_temp191 = "dimm13_temp"
-WARNHI_temp191 = "78000"
-WARNLO_temp191 = "0"
-CRITHI_temp191 = "83000"
-CRITLO_temp191 = "0"
-
-LABEL_temp193 = "dimm14_temp"
-WARNHI_temp193 = "78000"
-WARNLO_temp193 = "0"
-CRITHI_temp193 = "83000"
-CRITLO_temp193 = "0"
-
-LABEL_temp195 = "dimm15_temp"
-WARNHI_temp195 = "78000"
-WARNLO_temp195 = "0"
-CRITHI_temp195 = "83000"
-CRITLO_temp195 = "0"
-
-LABEL_temp207 = "gpu3_core_temp"
-WARNHI_temp207 = "76000"
-WARNLO_temp207 = "0"
-CRITHI_temp207 = "81000"
-CRITLO_temp207 = "0"
-
-LABEL_temp208 = "gpu3_mem_temp"
-WARNHI_temp208 = "78000"
-WARNLO_temp208 = "0"
-CRITHI_temp208 = "83000"
-CRITLO_temp208 = "0"
-
-LABEL_temp210 = "gpu4_core_temp"
-WARNHI_temp210 = "76000"
-WARNLO_temp210 = "0"
-CRITHI_temp210 = "81000"
-CRITLO_temp210 = "0"
-
-LABEL_temp211 = "gpu4_mem_temp"
-WARNHI_temp211 = "78000"
-WARNLO_temp211 = "0"
-CRITHI_temp211 = "83000"
-CRITLO_temp211 = "0"
-
-LABEL_temp213 = "gpu5_core_temp"
-WARNHI_temp213 = "76000"
-WARNLO_temp213 = "0"
-CRITHI_temp213 = "81000"
-CRITLO_temp213 = "0"
-
-LABEL_temp214 = "gpu5_mem_temp"
-WARNHI_temp214 = "78000"
-WARNLO_temp214 = "0"
-CRITHI_temp214 = "83000"
-CRITLO_temp214 = "0"