Remove fan-default-speeds service
This was just a temporary service that bypassed hwmon and
programmed the fan controller chip directly. Now that the real
fan control is going in, this can be removed.
Change-Id: I0b9e85d89ca097faabccb1744862a58a0776be72
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb b/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb
deleted file mode 100644
index fe45e74..0000000
--- a/meta-witherspoon/recipes-phosphor/fans/fan-default-speed.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Set Witherspoon fan default speeds"
-DESCRIPTION = "Sets all fans to a single speed"
-PR = "r1"
-
-inherit allarch
-inherit obmc-phosphor-license
-inherit obmc-phosphor-systemd
-
-RDEPENDS_${PN} += "i2c-tools"
-
-S = "${WORKDIR}"
-SRC_URI += "file://set_fan_speeds.sh"
-
-TMPL = "fan-default-speed@.service"
-INSTFMT = "fan-default-speed@{0}.service"
-TGTFMT = "obmc-host-start@{0}.target"
-FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
-
-SYSTEMD_SERVICE_${PN} += "${TMPL}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}"
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${WORKDIR}/set_fan_speeds.sh ${D}${bindir}/set_fan_speeds.sh
-}
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/fan-default-speed@.service b/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/fan-default-speed@.service
deleted file mode 100644
index 5e38cec..0000000
--- a/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/fan-default-speed@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Set fans to a default speed
-
-Wants=obmc-power-on@%i.target
-After=obmc-power-on@%i.target
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-host-stop@%i.target
-
-[Service]
-ExecStart={bindir}/set_fan_speeds.sh 8000
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=obmc-host-start@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.sh b/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.sh
deleted file mode 100755
index 82e931a..0000000
--- a/meta-witherspoon/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-if [ -e $1 ]
-then
- RPM=8000
-else
- RPM=$1
-fi
-
-path="/sys/bus/i2c/drivers/max31785"
-if [ -e $path ]
-then
- echo 3-0052 > $path/unbind
-fi
-
-for fan in `seq 0 3`; do
- i2cset -y 3 0x52 0x00 $fan b
- i2cset -y 3 0x52 0x3A 0xD0 b
- i2cset -y 3 0x52 0xD1 0x00 0x00 i
- i2cset -y 3 0x52 0xD9 0x00 b
- i2cset -y 3 0x52 0xF1 0x40 0xF3 i
- i2cset -y 3 0x52 0xF5 0x00 0x00 i
- i2cset -y 3 0x52 0xF6 0x00 0x00 i
- i2cset -y 3 0x52 0x3B $RPM w
-done
-if [ -e $path ]
-
-then
- echo 3-0052 > $path/bind
-fi
diff --git a/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
index b7eeb89..aa57bbf 100644
--- a/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1 +1 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " fan-default-speed mboxd"
+OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd"