ibm: Drop hwmon support for water cooled wspoon
There is an upcoming systemd change that doesn't handle what was being
done, which was to delay starting phosphor-hwmon from udev until the
chassis cooling type was on D-Bus.
This commit removes this method and goes down to a single hwmon config
file that only supports the air cooled system, which has 2 more fan
rotors than the water cooled one does.
This change also applies to the similar systems witherspoon-tacoma and
swift.
Resolves openbmc/phosphor-hwmon/#19.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ic4ed46a5bf310fb1fef8704dcafc0376c441f8c4
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service
index 2679077..5e555a2 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service
@@ -1,7 +1,7 @@
[Unit]
Description=Phosphor Fan Control Daemon
-Requires=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service
-After=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service
+Requires=xyz.openbmc_project.Hwmon@-ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service
+After=xyz.openbmc_project.Hwmon@-ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service
[Service]
Restart=on-failure