summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-witherspoon/recipes-phosphor/sensors
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2020-04-22 21:06:02 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-04-27 19:52:12 +0300
commite161514219e0dc8a957dabbb8529fb9fcac4e115 (patch)
tree5de46006517d690f5793eec41281d60611228ecd /meta-ibm/meta-witherspoon/recipes-phosphor/sensors
parenta3f54c8b8cbd50bc86efdc52cfb7d348d8c19d21 (diff)
downloadopenbmc-e161514219e0dc8a957dabbb8529fb9fcac4e115.tar.xz
meta-ibm: move all meta-witherspoon metadata
The metadata common to all IBM systems is confusingly split between meta-ibm and meta-witherspoon. Move everything to meta-ibm. The meta-ibm README is re-written to more accurately reflect the scope of the layer. Allow the configuration samples (bblayers.conf.sample, local.conf.sample) to be sourced from either meta-ibm or meta-witherspoon until such a time that any workflows and tooling have had the opportunity to move to meta-ibm. (From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442) Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors')
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules1
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service9
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf11
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf11
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf25
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf307
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf280
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf9
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf2
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf3
-rwxr-xr-xmeta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh26
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf9
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf9
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf47
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf47
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf436
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf366
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf6
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf6
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf17
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf13
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf6
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf6
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf17
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf13
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf23
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf65
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf5
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf338
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf268
-rw-r--r--meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend111
76 files changed, 0 insertions, 3281 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules
deleted file mode 100644
index fd63e0549..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="hwmon", ACTION=="add", ENV{OF_NAME}=="max31785", PROGRAM="/bin/systemd-escape -p '%E{OF_FULLNAME}'", RUN="/bin/systemctl start max31785-hwmon-helper@%c.service"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules
deleted file mode 100644
index 548b219e7..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBSYSTEM=="hwmon", ACTION=="add", ENV{OF_NAME}!="max31785", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}"
-SUBSYSTEM=="hwmon", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service
deleted file mode 100644
index c7ed6f113..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=MAX31785 hwmon helper
-Wants=phosphor-cooling-type@0.service
-After=phosphor-cooling-type@0.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/env start_max31785_hwmon.sh %i
-SyslogIdentifier=max31785-hwmon-helper
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf
deleted file mode 100644
index 80ff06f9f..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_in1="ps1_input_voltage"
-WARNHI_in1="264000"
-WARNLO_in1="200000"
-CRITHI_in1="265000"
-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="2300000000"
-WARNLO_power1="0"
-CRITHI_power1="2500000000"
-CRITLO_power1="0" \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf
deleted file mode 100644
index db56c888d..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_in1="ps0_input_voltage"
-WARNHI_in1="264000"
-WARNLO_in1="200000"
-CRITHI_in1="265000"
-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="2300000000"
-WARNLO_power1="0"
-CRITHI_power1="2500000000"
-CRITLO_power1="0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
deleted file mode 100644
index 3c25a4a01..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-LABEL_temp1 = "p0_vdd_temp"
-WARNHI_temp1 = "100000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "105000"
-CRITLO_temp1 = "0"
-
-LABEL_temp2 = "p0_vcs_temp"
-WARNHI_temp2 = "100000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "105000"
-CRITLO_temp2 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf
deleted file mode 100644
index 7f1f4d871..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "p0_vdn_temp"
-WARNHI_temp1 = "100000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "105000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
deleted file mode 100644
index 5f0985d7c..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-LABEL_temp1 = "p1_vdd_temp"
-WARNHI_temp1 = "100000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "105000"
-CRITLO_temp1 = "0"
-
-LABEL_temp2 = "p1_vcs_temp"
-WARNHI_temp2 = "100000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "105000"
-CRITLO_temp2 = "0" \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf
deleted file mode 100644
index 438372837..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "p1_vdn_temp"
-WARNHI_temp1 = "100000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "105000"
-CRITLO_temp1 = "0" \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf
deleted file mode 100644
index 939b3c1e5..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp2 = "ambient_temp"
-WARNHI_temp2 = "38000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "40000"
-CRITLO_temp2 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf
deleted file mode 100644
index 4f89e7f34..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_temp1 = "p1_pcie_temp"
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf
deleted file mode 100644
index 959c66f9d..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_temp1 = "p0_pcie_temp"
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf
deleted file mode 100644
index 82f065818..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_temp1 = "M2_riser_temp"
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
deleted file mode 100644
index 066ebf6c2..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-LABEL_fan1 = "fan0_0"
-LABEL_fan2 = "fan0_1"
-LABEL_fan3 = "fan1_0"
-LABEL_fan4 = "fan1_1"
-LABEL_fan5 = "fan2_0"
-LABEL_fan6 = "fan2_1"
-LABEL_fan7 = "fan3_0"
-LABEL_fan8 = "fan3_1"
-LABEL_fan9 = "fan4_0"
-LABEL_fan10 = "fan4_1"
-LABEL_fan11 = "fan5_0"
-LABEL_fan12 = "fan5_1"
-
-PWM_TARGET_fan1 = "1"
-PWM_TARGET_fan2 = "1"
-PWM_TARGET_fan3 = "2"
-PWM_TARGET_fan4 = "2"
-PWM_TARGET_fan5 = "3"
-PWM_TARGET_fan6 = "3"
-PWM_TARGET_fan7 = "4"
-PWM_TARGET_fan8 = "4"
-PWM_TARGET_fan9 = "5"
-PWM_TARGET_fan10 = "5"
-PWM_TARGET_fan11 = "6"
-PWM_TARGET_fan12 = "6"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
deleted file mode 100644
index d6d2416ea..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ /dev/null
@@ -1,307 +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_temp39 = "label"
-MODE_temp40 = "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"
-
-LABEL_temp17 = "p0_core0_temp"
-WARNHI_temp17 = "85000"
-WARNLO_temp17 = "0"
-CRITHI_temp17 = "90000"
-CRITLO_temp17 = "0"
-
-LABEL_temp20 = "p0_core1_temp"
-WARNHI_temp20 = "85000"
-WARNLO_temp20 = "0"
-CRITHI_temp20 = "90000"
-CRITLO_temp20 = "0"
-
-LABEL_temp23 = "p0_core2_temp"
-WARNHI_temp23 = "85000"
-WARNLO_temp23 = "0"
-CRITHI_temp23 = "90000"
-CRITLO_temp23 = "0"
-
-LABEL_temp26 = "p0_core3_temp"
-WARNHI_temp26 = "85000"
-WARNLO_temp26 = "0"
-CRITHI_temp26 = "90000"
-CRITLO_temp26 = "0"
-
-LABEL_temp29 = "p0_core4_temp"
-WARNHI_temp29 = "85000"
-WARNLO_temp29 = "0"
-CRITHI_temp29 = "90000"
-CRITLO_temp29 = "0"
-
-LABEL_temp32 = "p0_core5_temp"
-WARNHI_temp32 = "85000"
-WARNLO_temp32 = "0"
-CRITHI_temp32 = "90000"
-CRITLO_temp32 = "0"
-
-LABEL_temp35 = "p0_core6_temp"
-WARNHI_temp35 = "85000"
-WARNLO_temp35 = "0"
-CRITHI_temp35 = "90000"
-CRITLO_temp35 = "0"
-
-LABEL_temp38 = "p0_core7_temp"
-WARNHI_temp38 = "85000"
-WARNLO_temp38 = "0"
-CRITHI_temp38 = "90000"
-CRITLO_temp38 = "0"
-
-LABEL_temp41 = "p0_core8_temp"
-WARNHI_temp41 = "85000"
-WARNLO_temp41 = "0"
-CRITHI_temp41 = "90000"
-CRITLO_temp41 = "0"
-
-LABEL_temp44 = "p0_core9_temp"
-WARNHI_temp44 = "85000"
-WARNLO_temp44 = "0"
-CRITHI_temp44 = "90000"
-CRITLO_temp44 = "0"
-
-LABEL_temp47 = "p0_core10_temp"
-WARNHI_temp47 = "85000"
-WARNLO_temp47 = "0"
-CRITHI_temp47 = "90000"
-CRITLO_temp47 = "0"
-
-LABEL_temp50 = "p0_core11_temp"
-WARNHI_temp50 = "85000"
-WARNLO_temp50 = "0"
-CRITHI_temp50 = "90000"
-CRITLO_temp50 = "0"
-
-LABEL_temp53 = "p0_core12_temp"
-WARNHI_temp53 = "85000"
-WARNLO_temp53 = "0"
-CRITHI_temp53 = "90000"
-CRITLO_temp53 = "0"
-
-LABEL_temp56 = "p0_core13_temp"
-WARNHI_temp56 = "85000"
-WARNLO_temp56 = "0"
-CRITHI_temp56 = "90000"
-CRITLO_temp56 = "0"
-
-LABEL_temp59 = "p0_core14_temp"
-WARNHI_temp59 = "85000"
-WARNLO_temp59 = "0"
-CRITHI_temp59 = "90000"
-CRITLO_temp59 = "0"
-
-LABEL_temp62 = "p0_core15_temp"
-WARNHI_temp62 = "85000"
-WARNLO_temp62 = "0"
-CRITHI_temp62 = "90000"
-CRITLO_temp62 = "0"
-
-LABEL_temp65 = "p0_core16_temp"
-WARNHI_temp65 = "85000"
-WARNLO_temp65 = "0"
-CRITHI_temp65 = "90000"
-CRITLO_temp65 = "0"
-
-LABEL_temp68 = "p0_core17_temp"
-WARNHI_temp68 = "85000"
-WARNLO_temp68 = "0"
-CRITHI_temp68 = "90000"
-CRITLO_temp68 = "0"
-
-LABEL_temp71 = "p0_core18_temp"
-WARNHI_temp71 = "85000"
-WARNLO_temp71 = "0"
-CRITHI_temp71 = "90000"
-CRITLO_temp71 = "0"
-
-LABEL_temp74 = "p0_core19_temp"
-WARNHI_temp74 = "85000"
-WARNLO_temp74 = "0"
-CRITHI_temp74 = "90000"
-CRITLO_temp74 = "0"
-
-LABEL_temp77 = "p0_core20_temp"
-WARNHI_temp77 = "85000"
-WARNLO_temp77 = "0"
-CRITHI_temp77 = "90000"
-CRITLO_temp77 = "0"
-
-LABEL_temp80 = "p0_core21_temp"
-WARNHI_temp80 = "85000"
-WARNLO_temp80 = "0"
-CRITHI_temp80 = "90000"
-CRITLO_temp80 = "0"
-
-LABEL_temp83 = "p0_core22_temp"
-WARNHI_temp83 = "85000"
-WARNLO_temp83 = "0"
-CRITHI_temp83 = "90000"
-CRITLO_temp83 = "0"
-
-LABEL_temp86 = "p0_core23_temp"
-WARNHI_temp86 = "85000"
-WARNLO_temp86 = "0"
-CRITHI_temp86 = "90000"
-CRITLO_temp86 = "0"
-
-LABEL_temp165 = "dimm0_temp"
-WARNHI_temp165 = "85000"
-WARNLO_temp165 = "0"
-CRITHI_temp165 = "95000"
-CRITLO_temp165 = "0"
-
-LABEL_temp167 = "dimm1_temp"
-WARNHI_temp167 = "85000"
-WARNLO_temp167 = "0"
-CRITHI_temp167 = "95000"
-CRITLO_temp167 = "0"
-
-LABEL_temp169 = "dimm2_temp"
-WARNHI_temp169 = "85000"
-WARNLO_temp169 = "0"
-CRITHI_temp169 = "95000"
-CRITLO_temp169 = "0"
-
-LABEL_temp171 = "dimm3_temp"
-WARNHI_temp171 = "85000"
-WARNLO_temp171 = "0"
-CRITHI_temp171 = "95000"
-CRITLO_temp171 = "0"
-
-LABEL_temp173 = "dimm4_temp"
-WARNHI_temp173 = "85000"
-WARNLO_temp173 = "0"
-CRITHI_temp173 = "95000"
-CRITLO_temp173 = "0"
-
-LABEL_temp175 = "dimm5_temp"
-WARNHI_temp175 = "85000"
-WARNLO_temp175 = "0"
-CRITHI_temp175 = "95000"
-CRITLO_temp175 = "0"
-
-LABEL_temp177 = "dimm6_temp"
-WARNHI_temp177 = "85000"
-WARNLO_temp177 = "0"
-CRITHI_temp177 = "95000"
-CRITLO_temp177 = "0"
-
-LABEL_temp179 = "dimm7_temp"
-WARNHI_temp179 = "85000"
-WARNLO_temp179 = "0"
-CRITHI_temp179 = "95000"
-CRITLO_temp179 = "0"
-
-LABEL_temp197 = "dimm16_temp"
-WARNHI_temp197 = "85000"
-WARNLO_temp197 = "0"
-CRITHI_temp197 = "95000"
-CRITLO_temp197 = "0"
-
-LABEL_temp199 = "dimm17_temp"
-WARNHI_temp199 = "85000"
-WARNLO_temp199 = "0"
-CRITHI_temp199 = "95000"
-CRITLO_temp199 = "0"
-
-LABEL_temp201 = "dimm18_temp"
-WARNHI_temp201 = "85000"
-WARNLO_temp201 = "0"
-CRITHI_temp201 = "95000"
-CRITLO_temp201 = "0"
-
-LABEL_temp203 = "dimm19_temp"
-WARNHI_temp203 = "85000"
-WARNLO_temp203 = "0"
-CRITHI_temp203 = "95000"
-CRITLO_temp203 = "0"
-
-LABEL_temp205 = "dimm20_temp"
-WARNHI_temp205 = "85000"
-WARNLO_temp205 = "0"
-CRITHI_temp205 = "95000"
-CRITLO_temp205 = "0"
-
-LABEL_temp207 = "dimm21_temp"
-WARNHI_temp207 = "85000"
-WARNLO_temp207 = "0"
-CRITHI_temp207 = "95000"
-CRITLO_temp207 = "0"
-
-LABEL_temp209 = "dimm22_temp"
-WARNHI_temp209 = "85000"
-WARNLO_temp209 = "0"
-CRITHI_temp209 = "95000"
-CRITLO_temp209 = "0"
-
-LABEL_temp211 = "dimm23_temp"
-WARNHI_temp211 = "85000"
-WARNLO_temp211 = "0"
-CRITHI_temp211 = "95000"
-CRITLO_temp211 = "0"
-
-LABEL_power0_14_2 = "io_b_power"
-LABEL_power0_13_3 = "io_a_power"
-LABEL_power0_2_4 = "p1_mem_power"
-LABEL_power0_6_5 = "p1_vdd_power"
-LABEL_power0_1_6 = "p0_mem_power"
-LABEL_power0_5_7 = "p0_vdd_power"
-LABEL_power0_16_8 = "fans_power"
-LABEL_power0_19_9 = "storage_b_power"
-LABEL_power0_18_10 = "storage_a_power"
-LABEL_powersystem = "total_power"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
deleted file mode 100644
index ba53cd95d..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ /dev/null
@@ -1,280 +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_temp39 = "label"
-MODE_temp40 = "label"
-LABEL_temp91 = "p1_core0_temp"
-WARNHI_temp91 = "85000"
-WARNLO_temp91 = "0"
-CRITHI_temp91 = "90000"
-CRITLO_temp91 = "0"
-
-LABEL_temp94 = "p1_core1_temp"
-WARNHI_temp94 = "85000"
-WARNLO_temp94 = "0"
-CRITHI_temp94 = "90000"
-CRITLO_temp94 = "0"
-
-LABEL_temp97 = "p1_core2_temp"
-WARNHI_temp97 = "85000"
-WARNLO_temp97 = "0"
-CRITHI_temp97 = "90000"
-CRITLO_temp97 = "0"
-
-LABEL_temp100 = "p1_core3_temp"
-WARNHI_temp100 = "85000"
-WARNLO_temp100 = "0"
-CRITHI_temp100 = "90000"
-CRITLO_temp100 = "0"
-
-LABEL_temp103 = "p1_core4_temp"
-WARNHI_temp103 = "85000"
-WARNLO_temp103 = "0"
-CRITHI_temp103 = "90000"
-CRITLO_temp103 = "0"
-
-LABEL_temp106 = "p1_core5_temp"
-WARNHI_temp106 = "85000"
-WARNLO_temp106 = "0"
-CRITHI_temp106 = "90000"
-CRITLO_temp106 = "0"
-
-LABEL_temp109 = "p1_core6_temp"
-WARNHI_temp109 = "85000"
-WARNLO_temp109 = "0"
-CRITHI_temp109 = "90000"
-CRITLO_temp109 = "0"
-
-LABEL_temp112 = "p1_core7_temp"
-WARNHI_temp112 = "85000"
-WARNLO_temp112 = "0"
-CRITHI_temp112 = "90000"
-CRITLO_temp112 = "0"
-
-LABEL_temp115 = "p1_core8_temp"
-WARNHI_temp115 = "85000"
-WARNLO_temp115 = "0"
-CRITHI_temp115 = "90000"
-CRITLO_temp115 = "0"
-
-LABEL_temp118 = "p1_core9_temp"
-WARNHI_temp118 = "85000"
-WARNLO_temp118 = "0"
-CRITHI_temp118 = "90000"
-CRITLO_temp118 = "0"
-
-LABEL_temp121 = "p1_core10_temp"
-WARNHI_temp121 = "85000"
-WARNLO_temp121 = "0"
-CRITHI_temp121 = "90000"
-CRITLO_temp121 = "0"
-
-LABEL_temp124 = "p1_core11_temp"
-WARNHI_temp124 = "85000"
-WARNLO_temp124 = "0"
-CRITHI_temp124 = "90000"
-CRITLO_temp124 = "0"
-
-LABEL_temp127 = "p1_core12_temp"
-WARNHI_temp127 = "85000"
-WARNLO_temp127 = "0"
-CRITHI_temp127 = "90000"
-CRITLO_temp127 = "0"
-
-LABEL_temp130 = "p1_core13_temp"
-WARNHI_temp130 = "85000"
-WARNLO_temp130 = "0"
-CRITHI_temp130 = "90000"
-CRITLO_temp130 = "0"
-
-LABEL_temp133 = "p1_core14_temp"
-WARNHI_temp133 = "85000"
-WARNLO_temp133 = "0"
-CRITHI_temp133 = "90000"
-CRITLO_temp133 = "0"
-
-LABEL_temp136 = "p1_core15_temp"
-WARNHI_temp136 = "85000"
-WARNLO_temp136 = "0"
-CRITHI_temp136 = "90000"
-CRITLO_temp136 = "0"
-
-LABEL_temp139 = "p1_core16_temp"
-WARNHI_temp139 = "85000"
-WARNLO_temp139 = "0"
-CRITHI_temp139 = "90000"
-CRITLO_temp139 = "0"
-
-LABEL_temp142 = "p1_core17_temp"
-WARNHI_temp142 = "85000"
-WARNLO_temp142 = "0"
-CRITHI_temp142 = "90000"
-CRITLO_temp142 = "0"
-
-LABEL_temp145 = "p1_core18_temp"
-WARNHI_temp145 = "85000"
-WARNLO_temp145 = "0"
-CRITHI_temp145 = "90000"
-CRITLO_temp145 = "0"
-
-LABEL_temp148 = "p1_core19_temp"
-WARNHI_temp148 = "85000"
-WARNLO_temp148 = "0"
-CRITHI_temp148 = "90000"
-CRITLO_temp148 = "0"
-
-LABEL_temp151 = "p1_core20_temp"
-WARNHI_temp151 = "85000"
-WARNLO_temp151 = "0"
-CRITHI_temp151 = "90000"
-CRITLO_temp151 = "0"
-
-LABEL_temp154 = "p1_core21_temp"
-WARNHI_temp154 = "85000"
-WARNLO_temp154 = "0"
-CRITHI_temp154 = "90000"
-CRITLO_temp154 = "0"
-
-LABEL_temp157 = "p1_core22_temp"
-WARNHI_temp157 = "85000"
-WARNLO_temp157 = "0"
-CRITHI_temp157 = "90000"
-CRITLO_temp157 = "0"
-
-LABEL_temp160 = "p1_core23_temp"
-WARNHI_temp160 = "85000"
-WARNLO_temp160 = "0"
-CRITHI_temp160 = "90000"
-CRITLO_temp160 = "0"
-
-LABEL_temp181 = "dimm8_temp"
-WARNHI_temp181 = "85000"
-WARNLO_temp181 = "0"
-CRITHI_temp181 = "95000"
-CRITLO_temp181 = "0"
-
-LABEL_temp183 = "dimm9_temp"
-WARNHI_temp183 = "85000"
-WARNLO_temp183 = "0"
-CRITHI_temp183 = "95000"
-CRITLO_temp183 = "0"
-
-LABEL_temp185 = "dimm10_temp"
-WARNHI_temp185 = "85000"
-WARNLO_temp185 = "0"
-CRITHI_temp185 = "95000"
-CRITLO_temp185 = "0"
-
-LABEL_temp187 = "dimm11_temp"
-WARNHI_temp187 = "85000"
-WARNLO_temp187 = "0"
-CRITHI_temp187 = "95000"
-CRITLO_temp187 = "0"
-
-LABEL_temp189 = "dimm12_temp"
-WARNHI_temp189 = "85000"
-WARNLO_temp189 = "0"
-CRITHI_temp189 = "95000"
-CRITLO_temp189 = "0"
-
-LABEL_temp191 = "dimm13_temp"
-WARNHI_temp191 = "85000"
-WARNLO_temp191 = "0"
-CRITHI_temp191 = "95000"
-CRITLO_temp191 = "0"
-
-LABEL_temp193 = "dimm14_temp"
-WARNHI_temp193 = "85000"
-WARNLO_temp193 = "0"
-CRITHI_temp193 = "95000"
-CRITLO_temp193 = "0"
-
-LABEL_temp195 = "dimm15_temp"
-WARNHI_temp195 = "85000"
-WARNLO_temp195 = "0"
-CRITHI_temp195 = "95000"
-CRITLO_temp195 = "0"
-
-LABEL_temp213 = "dimm24_temp"
-WARNHI_temp213 = "85000"
-WARNLO_temp213 = "0"
-CRITHI_temp213 = "95000"
-CRITLO_temp213 = "0"
-
-LABEL_temp215 = "dimm25_temp"
-WARNHI_temp215 = "85000"
-WARNLO_temp215 = "0"
-CRITHI_temp215 = "95000"
-CRITLO_temp215 = "0"
-
-LABEL_temp217 = "dimm26_temp"
-WARNHI_temp217 = "85000"
-WARNLO_temp217 = "0"
-CRITHI_temp217 = "95000"
-CRITLO_temp217 = "0"
-
-LABEL_temp219 = "dimm27_temp"
-WARNHI_temp219 = "85000"
-WARNLO_temp219 = "0"
-CRITHI_temp219 = "95000"
-CRITLO_temp219 = "0"
-
-LABEL_temp221 = "dimm28_temp"
-WARNHI_temp221 = "85000"
-WARNLO_temp221 = "0"
-CRITHI_temp221 = "95000"
-CRITLO_temp221 = "0"
-
-LABEL_temp223 = "dimm29_temp"
-WARNHI_temp223 = "85000"
-WARNLO_temp223 = "0"
-CRITHI_temp223 = "95000"
-CRITLO_temp223 = "0"
-
-LABEL_temp225 = "dimm30_temp"
-WARNHI_temp225 = "85000"
-WARNLO_temp225 = "0"
-CRITHI_temp225 = "95000"
-CRITLO_temp225 = "0"
-
-LABEL_temp227 = "dimm31_temp"
-WARNHI_temp227 = "85000"
-WARNLO_temp227 = "0"
-CRITHI_temp227 = "95000"
-CRITLO_temp227 = "0"
-
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf
deleted file mode 100644
index 81d3aa519..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=12V
-GAIN_in1=7.5 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf
deleted file mode 100644
index d7e4a92e8..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=3V
-GAIN_in1=3 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf
deleted file mode 100644
index b9ea49ef0..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=5V
-GAIN_in1=3 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf
deleted file mode 100644
index 6f7341cd5..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LABEL_in1=vbat
-GAIN_in1=2.368
-
-# GPIOR3 needs to be pulled high for battery voltage reading
-GPIOCHIP_in1=0
-GPIO_in1=139
-
-# Read it every day so it does not impact battery life
-INTERVAL=86400000000 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf
deleted file mode 100644
index 4b8261f40..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vcs0
-GAIN_in1=1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf
deleted file mode 100644
index 02732c677..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vcs1
-GAIN_in1=1 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf
deleted file mode 100644
index f91914057..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vdd0
-GAIN_in1=1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf
deleted file mode 100644
index fe188856b..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vdd1
-GAIN_in1=1 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf
deleted file mode 100644
index 3a11fd246..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vddra
-GAIN_in1=1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf
deleted file mode 100644
index e9811cb1e..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vddrb
-GAIN_in1=1 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf
deleted file mode 100644
index 1753d93a5..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vddrc
-GAIN_in1=1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf
deleted file mode 100644
index 8fbfcd330..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vddrd
-GAIN_in1=1 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf
deleted file mode 100644
index afe6fcead..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vdn0
-GAIN_in1=1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf
deleted file mode 100644
index 5141b2969..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vdn1
-GAIN_in1=1 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf
deleted file mode 100644
index bf8e352e5..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vio0
-GAIN_in1=1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf
deleted file mode 100644
index d81958530..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LABEL_in1=vio1
-GAIN_in1=1 \ No newline at end of file
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf
deleted file mode 100644
index 409a75f0b..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-BUS=3
-PATHS="/system/chassis/motherboard/fan0 /system/chassis/motherboard/fan1 /system/chassis/motherboard/fan2 /system/chassis/motherboard/fan3"
-REVISION=0x3040
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
deleted file mode 100755
index 5eff17450..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Copy in the correct MAX31785 phosphor-hwmon config file to use based on the
-# WaterCooled property, and then start the hwmon service.
-
-# $1: The escaped OF_FULLNAME udev attribute for the MAX31785
-
-base="/etc/default/obmc/hwmon/"$(systemd-escape -u "$1")
-target=$base".conf"
-
-service=$(mapper get-service /xyz/openbmc_project/inventory/system/chassis)
-
-if [ $(busctl get-property $service \
- /xyz/openbmc_project/inventory/system/chassis \
- xyz.openbmc_project.Inventory.Decorator.CoolingType \
- WaterCooled | grep true | wc -l) != 0 ];
-then
- source=$base'_water.conf'
-else
- source=$base'_air.conf'
-fi
-
-cp $source $target
-
-instance='-'$1
-systemctl start xyz.openbmc_project.Hwmon@$instance.service
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
deleted file mode 100644
index 0b97ed559..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LABEL_fan1 = "fan0_0"
-
-LABEL_fan2 = "fan1_0"
-
-LABEL_fan3 = "fan2_0"
-
-LABEL_fan4 = "fan3_0"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
deleted file mode 100644
index 0b97ed559..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LABEL_fan1 = "fan0_0"
-
-LABEL_fan2 = "fan1_0"
-
-LABEL_fan3 = "fan2_0"
-
-LABEL_fan4 = "fan3_0"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf
deleted file mode 100644
index 2fadbdec0..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.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/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf
deleted file mode 100644
index e463b517c..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.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/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf
deleted file mode 100644
index d685863f8..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "ambient1"
-WARNHI_temp1 = "25000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "35000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf
deleted file mode 100644
index c8a729067..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "ambient2"
-WARNHI_temp1 = "25000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "35000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf
deleted file mode 100644
index ef2b46d53..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "ambient0"
-WARNHI_temp1 = "25000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "35000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf
deleted file mode 100644
index 7d2f2ef2a..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-qLABEL_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"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf
deleted file mode 100644
index ca7793722..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/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_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"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf
deleted file mode 100644
index 7b6b356a4..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_temp1 = "p0_vio_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curr2 = "p0_vio_current"
-WARNLO_curr2 = "0"
-CRITLO_curr2 = "0"
-WARNHI_curr2 = "80000"
-CRITHI_curr2 = "110000"
-
-LABEL_in2 = "p0_vio_voltage"
-WARNLO_in2 = "0"
-CRITLO_in2 = "0"
-WARNHI_in2 = "1100"
-CRITHI_in2 = "1300"
-
-LABEL_power2 = "p0_vio_power"
-WARNLO_power2 = "0"
-CRITLO_power2 = "0"
-WARNHI_power2 = "88000000"
-CRITHI_power2 = "121000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf
deleted file mode 100644
index 5e0c63d34..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf
+++ /dev/null
@@ -1,23 +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"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf
deleted file mode 100644
index 836eef63b..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/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_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"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf
deleted file mode 100644
index 213f64845..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-LABEL_temp1 = "p1_vio_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curr2 = "p1_vio_current"
-WARNLO_curr2 = "0"
-CRITLO_curr2 = "0"
-WARNHI_curr2 = "80000"
-CRITHI_curr2 = "110000"
-
-LABEL_in2 = "p1_vio_voltage"
-WARNLO_in2 = "0"
-CRITLO_in2 = "0"
-WARNHI_in2 = "1100"
-CRITHI_in2 = "1300"
-
-LABEL_power2 = "p1_vio_power"
-WARNLO_power2 = "0"
-CRITLO_power2 = "0"
-WARNHI_power2 = "88000000"
-CRITHI_power2 = "121000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf
deleted file mode 100644
index a96bb93a8..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "pcie0_1"
-WARNHI_temp1 = "60000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "70000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf
deleted file mode 100644
index 188898b36..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LABEL_temp1 = "pcie2_3"
-WARNHI_temp1 = "60000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "70000"
-CRITLO_temp1 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
deleted file mode 100644
index 5582e9dbf..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ /dev/null
@@ -1,436 +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_temp39 = "label"
-MODE_temp40 = "label"
-MODE_temp41 = "label"
-MODE_temp42 = "label"
-MODE_temp43 = "label"
-MODE_temp44 = "label"
-MODE_temp45 = "label"
-MODE_temp46 = "label"
-MODE_temp47 = "label"
-MODE_temp48 = "label"
-MODE_temp49 = "label"
-MODE_temp50 = "label"
-MODE_temp51 = "label"
-MODE_temp52 = "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_temp0"
-WARNHI_temp165 = "78000"
-WARNLO_temp165 = "0"
-CRITHI_temp165 = "83000"
-CRITLO_temp165 = "0"
-
-LABEL_temp166 = "dimm0_temp1"
-WARNHI_temp166 = "78000"
-WARNLO_temp166 = "0"
-CRITHI_temp166 = "83000"
-CRITLO_temp166 = "0"
-
-LABEL_temp168 = "dimm1_temp0"
-WARNHI_temp168 = "78000"
-WARNLO_temp168 = "0"
-CRITHI_temp168 = "83000"
-CRITLO_temp168 = "0"
-
-LABEL_temp169 = "dimm1_temp1"
-WARNHI_temp169 = "78000"
-WARNLO_temp169 = "0"
-CRITHI_temp169 = "83000"
-CRITLO_temp169 = "0"
-
-LABEL_temp171 = "dimm2_temp0"
-WARNHI_temp171 = "78000"
-WARNLO_temp171 = "0"
-CRITHI_temp171 = "83000"
-CRITLO_temp171 = "0"
-
-LABEL_temp172 = "dimm2_temp1"
-WARNHI_temp172 = "78000"
-WARNLO_temp172 = "0"
-CRITHI_temp172 = "83000"
-CRITLO_temp172 = "0"
-
-LABEL_temp174 = "dimm3_temp0"
-WARNHI_temp174 = "78000"
-WARNLO_temp174 = "0"
-CRITHI_temp174 = "83000"
-CRITLO_temp174 = "0"
-
-LABEL_temp175 = "dimm3_temp1"
-WARNHI_temp175 = "78000"
-WARNLO_temp175 = "0"
-CRITHI_temp175 = "83000"
-CRITLO_temp175 = "0"
-
-LABEL_temp177 = "dimm4_temp0"
-WARNHI_temp177 = "78000"
-WARNLO_temp177 = "0"
-CRITHI_temp177 = "83000"
-CRITLO_temp177 = "0"
-
-LABEL_temp178 = "dimm4_temp1"
-WARNHI_temp178 = "78000"
-WARNLO_temp178 = "0"
-CRITHI_temp178 = "83000"
-CRITLO_temp178 = "0"
-
-LABEL_temp180 = "dimm5_temp0"
-WARNHI_temp180 = "78000"
-WARNLO_temp180 = "0"
-CRITHI_temp180 = "83000"
-CRITLO_temp180 = "0"
-
-LABEL_temp181 = "dimm5_temp1"
-WARNHI_temp181 = "78000"
-WARNLO_temp181 = "0"
-CRITHI_temp181 = "83000"
-CRITLO_temp181 = "0"
-
-LABEL_temp183 = "dimm6_temp0"
-WARNHI_temp183 = "78000"
-WARNLO_temp183 = "0"
-CRITHI_temp183 = "83000"
-CRITLO_temp183 = "0"
-
-LABEL_temp184 = "dimm6_temp1"
-WARNHI_temp184 = "78000"
-WARNLO_temp184 = "0"
-CRITHI_temp184 = "83000"
-CRITLO_temp184 = "0"
-
-LABEL_temp186 = "dimm7_temp0"
-WARNHI_temp186 = "78000"
-WARNLO_temp186 = "0"
-CRITHI_temp186 = "83000"
-CRITLO_temp186 = "0"
-
-LABEL_temp187 = "dimm7_temp1"
-WARNHI_temp187 = "78000"
-WARNLO_temp187 = "0"
-CRITHI_temp187 = "83000"
-CRITLO_temp187 = "0"
-
-LABEL_temp189 = "dimm8_temp0"
-WARNHI_temp189 = "78000"
-WARNLO_temp189 = "0"
-CRITHI_temp189 = "83000"
-CRITLO_temp189 = "0"
-
-LABEL_temp190 = "dimm8_temp1"
-WARNHI_temp190 = "78000"
-WARNLO_temp190 = "0"
-CRITHI_temp190 = "83000"
-CRITLO_temp190 = "0"
-
-LABEL_temp192 = "dimm9_temp0"
-WARNHI_temp192 = "78000"
-WARNLO_temp192 = "0"
-CRITHI_temp192 = "83000"
-CRITLO_temp192 = "0"
-
-LABEL_temp193 = "dimm9_temp1"
-WARNHI_temp193 = "78000"
-WARNLO_temp193 = "0"
-CRITHI_temp193 = "83000"
-CRITLO_temp193 = "0"
-
-LABEL_temp195 = "dimm10_temp0"
-WARNHI_temp195 = "78000"
-WARNLO_temp195 = "0"
-CRITHI_temp195 = "83000"
-CRITLO_temp195 = "0"
-
-LABEL_temp196 = "dimm10_temp1"
-WARNHI_temp196 = "78000"
-WARNLO_temp196 = "0"
-CRITHI_temp196 = "83000"
-CRITLO_temp196 = "0"
-
-LABEL_temp198 = "dimm11_temp0"
-WARNHI_temp198 = "78000"
-WARNLO_temp198 = "0"
-CRITHI_temp198 = "83000"
-CRITLO_temp198 = "0"
-
-LABEL_temp199 = "dimm11_temp1"
-WARNHI_temp199 = "78000"
-WARNLO_temp199 = "0"
-CRITHI_temp199 = "83000"
-CRITLO_temp199 = "0"
-
-LABEL_temp237 = "gpu0_core_temp"
-WARNHI_temp237 = "76000"
-WARNLO_temp237 = "0"
-CRITHI_temp237 = "81000"
-CRITLO_temp237 = "0"
-
-LABEL_temp238 = "gpu0_mem_temp"
-WARNHI_temp238 = "78000"
-WARNLO_temp238 = "0"
-CRITHI_temp238 = "83000"
-CRITLO_temp238 = "0"
-
-LABEL_temp240 = "gpu1_core_temp"
-WARNHI_temp240 = "76000"
-WARNLO_temp240 = "0"
-CRITHI_temp240 = "81000"
-CRITLO_temp240 = "0"
-
-LABEL_temp241 = "gpu1_mem_temp"
-WARNHI_temp241 = "78000"
-WARNLO_temp241 = "0"
-CRITHI_temp241 = "83000"
-CRITLO_temp241 = "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/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
deleted file mode 100644
index 1cc4afb71..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ /dev/null
@@ -1,366 +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_temp39 = "label"
-MODE_temp40 = "label"
-MODE_temp41 = "label"
-MODE_temp42 = "label"
-MODE_temp43 = "label"
-MODE_temp44 = "label"
-MODE_temp45 = "label"
-MODE_temp46 = "label"
-MODE_temp47 = "label"
-MODE_temp48 = "label"
-MODE_temp49 = "label"
-MODE_temp50 = "label"
-MODE_temp51 = "label"
-MODE_temp52 = "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_temp201 = "dimm12_temp0"
-WARNHI_temp201 = "78000"
-WARNLO_temp201 = "0"
-CRITHI_temp201 = "83000"
-CRITLO_temp201 = "0"
-
-LABEL_temp202 = "dimm12_temp1"
-WARNHI_temp202 = "78000"
-WARNLO_temp202 = "0"
-CRITHI_temp202 = "83000"
-CRITLO_temp202 = "0"
-
-LABEL_temp204 = "dimm13_temp0"
-WARNHI_temp204 = "78000"
-WARNLO_temp204 = "0"
-CRITHI_temp204 = "83000"
-CRITLO_temp204 = "0"
-
-LABEL_temp205 = "dimm13_temp1"
-WARNHI_temp205 = "78000"
-WARNLO_temp205 = "0"
-CRITHI_temp205 = "83000"
-CRITLO_temp205 = "0"
-
-LABEL_temp207 = "dimm14_temp0"
-WARNHI_temp207 = "78000"
-WARNLO_temp207 = "0"
-CRITHI_temp207 = "83000"
-CRITLO_temp207 = "0"
-
-LABEL_temp208 = "dimm14_temp1"
-WARNHI_temp208 = "78000"
-WARNLO_temp208 = "0"
-CRITHI_temp208 = "83000"
-CRITLO_temp208 = "0"
-
-LABEL_temp210 = "dimm15_temp0"
-WARNHI_temp210 = "78000"
-WARNLO_temp210 = "0"
-CRITHI_temp210 = "83000"
-CRITLO_temp210 = "0"
-
-LABEL_temp211 = "dimm15_temp1"
-WARNHI_temp211 = "78000"
-WARNLO_temp211 = "0"
-CRITHI_temp211 = "83000"
-CRITLO_temp211 = "0"
-
-LABEL_temp213 = "dimm16_temp0"
-WARNHI_temp213 = "78000"
-WARNLO_temp213 = "0"
-CRITHI_temp213 = "83000"
-CRITLO_temp213 = "0"
-
-LABEL_temp214 = "dimm16_temp1"
-WARNHI_temp214 = "78000"
-WARNLO_temp214 = "0"
-CRITHI_temp214 = "83000"
-CRITLO_temp214 = "0"
-
-LABEL_temp216 = "dimm17_temp0"
-WARNHI_temp216 = "78000"
-WARNLO_temp216 = "0"
-CRITHI_temp216 = "83000"
-CRITLO_temp216 = "0"
-
-LABEL_temp217 = "dimm17_temp1"
-WARNHI_temp217 = "78000"
-WARNLO_temp217 = "0"
-CRITHI_temp217 = "83000"
-CRITLO_temp217 = "0"
-
-LABEL_temp219 = "dimm18_temp0"
-WARNHI_temp219 = "78000"
-WARNLO_temp219 = "0"
-CRITHI_temp219 = "83000"
-CRITLO_temp219 = "0"
-
-LABEL_temp220 = "dimm18_temp1"
-WARNHI_temp220 = "78000"
-WARNLO_temp220 = "0"
-CRITHI_temp220 = "83000"
-CRITLO_temp220 = "0"
-
-LABEL_temp222 = "dimm19_temp0"
-WARNHI_temp222 = "78000"
-WARNLO_temp222 = "0"
-CRITHI_temp222 = "83000"
-CRITLO_temp222 = "0"
-
-LABEL_temp223 = "dimm19_temp1"
-WARNHI_temp223 = "78000"
-WARNLO_temp223 = "0"
-CRITHI_temp223 = "83000"
-CRITLO_temp223 = "0"
-
-LABEL_temp225 = "dimm20_temp0"
-WARNHI_temp225 = "78000"
-WARNLO_temp225 = "0"
-CRITHI_temp225 = "83000"
-CRITLO_temp225 = "0"
-
-LABEL_temp226 = "dimm20_temp1"
-WARNHI_temp226 = "78000"
-WARNLO_temp226 = "0"
-CRITHI_temp226 = "83000"
-CRITLO_temp226 = "0"
-
-LABEL_temp228 = "dimm21_temp0"
-WARNHI_temp228 = "78000"
-WARNLO_temp228 = "0"
-CRITHI_temp228 = "83000"
-CRITLO_temp228 = "0"
-
-LABEL_temp229 = "dimm21_temp1"
-WARNHI_temp229 = "78000"
-WARNLO_temp229 = "0"
-CRITHI_temp229 = "83000"
-CRITLO_temp229 = "0"
-
-LABEL_temp231 = "dimm22_temp0"
-WARNHI_temp231 = "78000"
-WARNLO_temp231 = "0"
-CRITHI_temp231 = "83000"
-CRITLO_temp231 = "0"
-
-LABEL_temp232 = "dimm22_temp1"
-WARNHI_temp232 = "78000"
-WARNLO_temp232 = "0"
-CRITHI_temp232 = "83000"
-CRITLO_temp232 = "0"
-
-LABEL_temp234 = "dimm23_temp0"
-WARNHI_temp234 = "78000"
-WARNLO_temp234 = "0"
-CRITHI_temp234 = "83000"
-CRITLO_temp234 = "0"
-
-LABEL_temp235 = "dimm23_temp1"
-WARNHI_temp235 = "78000"
-WARNLO_temp235 = "0"
-CRITHI_temp235 = "83000"
-CRITLO_temp235 = "0"
-
-LABEL_temp243 = "gpu2_core_temp"
-WARNHI_temp243 = "76000"
-WARNLO_temp243 = "0"
-CRITHI_temp243 = "81000"
-CRITLO_temp243 = "0"
-
-LABEL_temp244 = "gpu2_mem_temp"
-WARNHI_temp244 = "78000"
-WARNLO_temp244 = "0"
-CRITHI_temp244 = "83000"
-CRITLO_temp244 = "0"
-
-LABEL_temp246 = "gpu3_core_temp"
-WARNHI_temp246 = "76000"
-WARNLO_temp246 = "0"
-CRITHI_temp246 = "81000"
-CRITLO_temp246 = "0"
-
-LABEL_temp247 = "gpu3_mem_temp"
-WARNHI_temp247 = "78000"
-WARNLO_temp247 = "0"
-CRITHI_temp247 = "83000"
-CRITLO_temp247 = "0"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf
deleted file mode 100644
index cdf8b4726..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/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/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf
deleted file mode 100644
index cdf8b4726..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/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/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf
deleted file mode 100644
index d3df21599..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-LABEL_fan1 = "fan0_0"
-
-LABEL_fan2 = "fan1_0"
-
-LABEL_fan3 = "fan2_0"
-
-LABEL_fan4 = "fan3_0"
-
-LABEL_fan5 = "fan0_1"
-
-LABEL_fan6 = "fan1_1"
-
-LABEL_fan7 = "fan2_1"
-
-LABEL_fan8 = "fan3_1"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf
deleted file mode 100644
index c96bfa76b..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL_fan1 = "fan0_0"
-
-LABEL_fan3 = "fan2_0"
-
-LABEL_fan4 = "fan3_0"
-
-LABEL_fan5 = "fan0_1"
-
-LABEL_fan7 = "fan2_1"
-
-LABEL_fan8 = "fan3_1"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
deleted file mode 100644
index e463b517c..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/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/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
deleted file mode 100644
index 2fadbdec0..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/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/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf
deleted file mode 100644
index c5344aeb6..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#4-0070
-#VDD then VCS
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p0_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p0_vdd_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "320000"
-CRITHI_curriout1 = "360000"
-
-LABEL_invout1 = "p0_vdd_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1150"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p0_vdd_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "270000000"
-CRITHI_powerpout1 = "290000000"
-
-LABEL_temp2 = "p0_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p0_vcs_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "20000"
-CRITHI_curriout2 = "25000"
-
-LABEL_invout2 = "p0_vcs_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1150"
-CRITHI_invout2 = "1300"
-
-LABEL_powerpout2 = "p0_vcs_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "20000000"
-CRITHI_powerpout2 = "25000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf
deleted file mode 100644
index 23746aa11..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#4-0071
-#VDN then VDDR
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p0_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p0_vdn_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "80000"
-CRITHI_curriout1 = "110000"
-
-LABEL_invout1 = "p0_vdn_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1100"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p0_vdn_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "88000000"
-CRITHI_powerpout1 = "121000000"
-
-LABEL_temp2 = "p0_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p0_vddr_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "115000"
-CRITHI_curriout2 = "130000"
-
-LABEL_invout2 = "p0_vddr_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1280"
-CRITHI_invout2 = "1350"
-
-LABEL_powerpout2 = "p0_vddr_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "139150000"
-CRITHI_powerpout2 = "159900000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf
deleted file mode 100644
index e7d8aaf23..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#5-0070
-#VDD then VCS
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p1_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p1_vdd_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "320000"
-CRITHI_curriout1 = "360000"
-
-LABEL_invout1 = "p1_vdd_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1150"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p1_vdd_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "270000000"
-CRITHI_powerpout1 = "290000000"
-
-LABEL_temp2 = "p1_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p1_vcs_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "20000"
-CRITHI_curriout2 = "25000"
-
-LABEL_invout2 = "p1_vcs_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1150"
-CRITHI_invout2 = "1300"
-
-LABEL_powerpout2 = "p1_vcs_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "20000000"
-CRITHI_powerpout2 = "25000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf
deleted file mode 100644
index 30ec05dbb..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#5-0071
-#VDN then VDDR
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p1_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p1_vdn_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "80000"
-CRITHI_curriout1 = "110000"
-
-LABEL_invout1 = "p1_vdn_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1100"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p1_vdn_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "88000000"
-CRITHI_powerpout1 = "121000000"
-
-LABEL_temp2 = "p1_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p1_vddr_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "115000"
-CRITHI_curriout2 = "130000"
-
-LABEL_invout2 = "p1_vddr_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1280"
-CRITHI_invout2 = "1350"
-
-LABEL_powerpout2 = "p1_vddr_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "139150000"
-CRITHI_powerpout2 = "159900000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf
deleted file mode 100644
index 3af092867..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/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/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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/witherspoon/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/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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/witherspoon/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/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
deleted file mode 100644
index d3df21599..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-LABEL_fan1 = "fan0_0"
-
-LABEL_fan2 = "fan1_0"
-
-LABEL_fan3 = "fan2_0"
-
-LABEL_fan4 = "fan3_0"
-
-LABEL_fan5 = "fan0_1"
-
-LABEL_fan6 = "fan1_1"
-
-LABEL_fan7 = "fan2_1"
-
-LABEL_fan8 = "fan3_1"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
deleted file mode 100644
index c96bfa76b..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-LABEL_fan1 = "fan0_0"
-
-LABEL_fan3 = "fan2_0"
-
-LABEL_fan4 = "fan3_0"
-
-LABEL_fan5 = "fan0_1"
-
-LABEL_fan7 = "fan2_1"
-
-LABEL_fan8 = "fan3_1"
-
-TARGET_MODE = "RPM"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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/witherspoon/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/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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/witherspoon/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/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
deleted file mode 100644
index c5344aeb6..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#4-0070
-#VDD then VCS
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p0_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p0_vdd_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "320000"
-CRITHI_curriout1 = "360000"
-
-LABEL_invout1 = "p0_vdd_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1150"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p0_vdd_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "270000000"
-CRITHI_powerpout1 = "290000000"
-
-LABEL_temp2 = "p0_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p0_vcs_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "20000"
-CRITHI_curriout2 = "25000"
-
-LABEL_invout2 = "p0_vcs_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1150"
-CRITHI_invout2 = "1300"
-
-LABEL_powerpout2 = "p0_vcs_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "20000000"
-CRITHI_powerpout2 = "25000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf
deleted file mode 100644
index 23746aa11..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#4-0071
-#VDN then VDDR
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p0_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p0_vdn_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "80000"
-CRITHI_curriout1 = "110000"
-
-LABEL_invout1 = "p0_vdn_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1100"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p0_vdn_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "88000000"
-CRITHI_powerpout1 = "121000000"
-
-LABEL_temp2 = "p0_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p0_vddr_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "115000"
-CRITHI_curriout2 = "130000"
-
-LABEL_invout2 = "p0_vddr_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1280"
-CRITHI_invout2 = "1350"
-
-LABEL_powerpout2 = "p0_vddr_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "139150000"
-CRITHI_powerpout2 = "159900000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
deleted file mode 100644
index e7d8aaf23..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#5-0070
-#VDD then VCS
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p1_vdd_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p1_vdd_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "320000"
-CRITHI_curriout1 = "360000"
-
-LABEL_invout1 = "p1_vdd_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1150"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p1_vdd_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "270000000"
-CRITHI_powerpout1 = "290000000"
-
-LABEL_temp2 = "p1_vcs_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p1_vcs_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "20000"
-CRITHI_curriout2 = "25000"
-
-LABEL_invout2 = "p1_vcs_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1150"
-CRITHI_invout2 = "1300"
-
-LABEL_powerpout2 = "p1_vcs_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "20000000"
-CRITHI_powerpout2 = "25000000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf
deleted file mode 100644
index 30ec05dbb..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-#5-0071
-#VDN then VDDR
-
-MODE_in1 = "label"
-MODE_in2 = "label"
-MODE_in3 = "label"
-MODE_in4 = "label"
-
-MODE_curr1 = "label"
-MODE_curr2 = "label"
-MODE_curr3 = "label"
-MODE_curr4 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-
-LABEL_temp1 = "p1_vdn_temp"
-WARNHI_temp1 = "80000"
-WARNLO_temp1 = "0"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "0"
-
-LABEL_curriout1 = "p1_vdn_current"
-WARNLO_curriout1 = "0"
-CRITLO_curriout1 = "0"
-WARNHI_curriout1 = "80000"
-CRITHI_curriout1 = "110000"
-
-LABEL_invout1 = "p1_vdn_voltage"
-WARNLO_invout1 = "0"
-CRITLO_invout1 = "0"
-WARNHI_invout1 = "1100"
-CRITHI_invout1 = "1300"
-
-LABEL_powerpout1 = "p1_vdn_power"
-WARNLO_powerpout1 = "0"
-CRITLO_powerpout1 = "0"
-WARNHI_powerpout1 = "88000000"
-CRITHI_powerpout1 = "121000000"
-
-LABEL_temp2 = "p1_vddr_temp"
-WARNHI_temp2 = "80000"
-WARNLO_temp2 = "0"
-CRITHI_temp2 = "85000"
-CRITLO_temp2 = "0"
-
-LABEL_curriout2 = "p1_vddr_current"
-WARNLO_curriout2 = "0"
-CRITLO_curriout2 = "0"
-WARNHI_curriout2 = "115000"
-CRITHI_curriout2 = "130000"
-
-LABEL_invout2 = "p1_vddr_voltage"
-WARNLO_invout2 = "0"
-CRITLO_invout2 = "0"
-WARNHI_invout2 = "1280"
-CRITHI_invout2 = "1350"
-
-LABEL_powerpout2 = "p1_vddr_power"
-WARNLO_powerpout2 = "0"
-CRITLO_powerpout2 = "0"
-WARNHI_powerpout2 = "139150000"
-CRITHI_powerpout2 = "159900000"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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/witherspoon/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/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/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/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/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/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/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/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/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"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
deleted file mode 100644
index 36029dd72..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ /dev/null
@@ -1,111 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-EXTRA_OECONF_append_mihawk = " --enable-negative-errno-on-fail"
-
-SRC_URI_append_ibm-ac-server = " \
- file://70-hwmon.rules \
- file://70-max31785-hwmon.rules \
- file://start_max31785_hwmon.sh \
- "
-
-CHIPS_witherspoon = " \
- bus@1e78a000/i2c-bus@100/max31785@52_air \
- bus@1e78a000/i2c-bus@100/max31785@52_water \
- bus@1e78a000/i2c-bus@100/power-supply@68 \
- bus@1e78a000/i2c-bus@100/power-supply@69 \
- bus@1e78a000/i2c-bus@100/bmp280@77 \
- bus@1e78a000/i2c-bus@100/dps310@76 \
- bus@1e78a000/i2c-bus@140/ir35221@70 \
- bus@1e78a000/i2c-bus@140/ir35221@71 \
- bus@1e78a000/i2c-bus@180/ir35221@70 \
- bus@1e78a000/i2c-bus@180/ir35221@71 \
- bus@1e78a000/i2c-bus@380/tmp275@4a \
- "
-CHIPS_swift = " \
- bus@1e78a000/i2c-bus@100/max31785@52_air \
- bus@1e78a000/i2c-bus@100/max31785@52_water \
- bus@1e78a000/i2c-bus@100/power-supply@68 \
- bus@1e78a000/i2c-bus@100/power-supply@69 \
- bus@1e78a000/i2c-bus@440/tmp275@4a \
- bus@1e78a000/i2c-bus@440/tmp275@48 \
- bus@1e78a000/i2c-bus@300/tmp275@48 \
- bus@1e78a000/i2c-bus@300/dps310@76 \
- bus@1e78a000/i2c-bus@300/si7021a20@20 \
- bus@1e78a000/i2c-bus@380/ir35219@70 \
- bus@1e78a000/i2c-bus@380/ir35221@71 \
- bus@1e78a000/i2c-bus@380/ir35221@72 \
- bus@1e78a000/i2c-bus@3c0/ir35219@70 \
- bus@1e78a000/i2c-bus@3c0/ir35221@71 \
- bus@1e78a000/i2c-bus@3c0/ir35221@72 \
- "
-CHIPS_mihawk = " \
- bus@1e78a000/i2c-bus@100/power-supply@58 \
- bus@1e78a000/i2c-bus@100/power-supply@5b \
- bus@1e78a000/i2c-bus@140/ir35221@70 \
- bus@1e78a000/i2c-bus@140/ir35221@72 \
- bus@1e78a000/i2c-bus@180/ir35221@70 \
- bus@1e78a000/i2c-bus@180/ir35221@72 \
- bus@1e78a000/i2c-bus@400/tmp275@48 \
- bus@1e78a000/i2c-bus@400/tmp275@49 \
- pwm-tacho-controller@1e786000 \
- bus@1e78a000/i2c-bus@400/emc1403@4c \
- bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \
- "
-
-CHIPS_witherspoon-tacoma = " \
- bus@1e78a000/i2c-bus@200/max31785@52_air \
- bus@1e78a000/i2c-bus@200/max31785@52_water \
- bus@1e78a000/i2c-bus@200/power-supply@68 \
- bus@1e78a000/i2c-bus@200/power-supply@69 \
- bus@1e78a000/i2c-bus@200/bmp280@77 \
- bus@1e78a000/i2c-bus@200/dps310@76 \
- bus@1e78a000/i2c-bus@280/ir35221@70 \
- bus@1e78a000/i2c-bus@280/ir35221@71 \
- bus@1e78a000/i2c-bus@300/ir35221@70 \
- bus@1e78a000/i2c-bus@300/ir35221@71 \
- bus@1e78a000/i2c-bus@500/tmp275@4a \
- "
-ITEMSFMT = "ahb/apb/{0}.conf"
-ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
-ITEMS_append_mihawk += " iio-hwmon-vdd0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vdd1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vcs0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vcs1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vdn0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vdn1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vio0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vio1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddra.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddrb.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddrc.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddrd.conf"
-ITEMS_append_mihawk += " iio-hwmon-12v.conf"
-ITEMS_append_mihawk += " iio-hwmon-5v.conf"
-ITEMS_append_mihawk += " iio-hwmon-3v.conf"
-ITEMS_append_mihawk += " iio-hwmon-battery.conf"
-
-OCCS = " \
- 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
- 00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
- "
-OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf"
-OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
-
-ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
-
-SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
-SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
-
-SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service"
-
-do_install_append_ibm-ac-server() {
- install -d ${D}/${base_libdir}/udev/rules.d/
- install ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
-
- install -d ${D}${bindir}
- install -m 0755 ${WORKDIR}/start_max31785_hwmon.sh ${D}${bindir}
-}