3 files changed, 6 insertions, 28 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
deleted file mode 100644
index 61d8516bc..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# For each AVSBus attached rail go back to using VOUT_COMMAND (PMBus voltage)
-# instead of AVSBus and do *not* update VOUT_COMMAND with last voltage sent via
-# AVSBus. This should be run after power-down. This is platform specific
-# settings  that must be updated/removed if not Swift.
-
-i2cset -y 9 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 9 0x70 0x01 0x80 b    # VDD 0
-i2cset -y 9 0x71 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 9 0x71 0x01 0x80 b    # VCS 0
-i2cset -y 9 0x71 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 9 0x71 0x01 0x80 b    # VDN 0
-i2cset -y 10 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 10 0x70 0x01 0x80 b    # VDD 1
-i2cset -y 10 0x71 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 10 0x71 0x01 0x80 b    # VCS 1
-i2cset -y 10 0x71 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 10 0x71 0x01 0x80 b    # VDN 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh
index d3840910a..7ff607a4b 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh
@@ -6,20 +6,15 @@
 # updated/removed if not Swift.
 
 i2cset -y 9 0x70 0x00 0x00 b    # VDD 0  - PAGE set
-i2cset -y 9 0x70 0x21 0xE6 0x00 i    # VDD 0  - Set default HW boot voltage to 0.9V
 i2cset -y 9 0x70 0x01 0xB0 b    # VDD 0
 i2cset -y 9 0x71 0x00 0x01 b    # VCS 0  - PAGE set
-i2cset -y 9 0x71 0x21 0x00 0x01 i    # VCS 0  - Set default HW boot voltage to 1.0V
 i2cset -y 9 0x71 0x01 0xB0 b    # VCS 0
 i2cset -y 9 0x71 0x00 0x00 b    # VDN 0  - PAGE set
-i2cset -y 9 0x71 0x21 0xCD 0x00 i    # VDN 0  - Set default HW boot voltage to 0.8V
 i2cset -y 9 0x71 0x01 0xB0 b    # VDN 0
+
 i2cset -y 10 0x70 0x00 0x00 b    # VDD 1  - PAGE set
-i2cset -y 10 0x70 0x21 0xE6 0x00 i    # VDD 1  - Set default HW boot voltage to 0.9V
 i2cset -y 10 0x70 0x01 0xB0 b    # VDD 1
 i2cset -y 10 0x71 0x00 0x01 b    # VCS 1  - PAGE set
-i2cset -y 10 0x71 0x21 0x00 0x01 i    # VCS 1  - Set default HW boot voltage to 1.0V
 i2cset -y 10 0x71 0x01 0xB0 b    # VCS 1
 i2cset -y 10 0x71 0x00 0x00 b    # VDN 1  - PAGE set
-i2cset -y 10 0x71 0x21 0xCD 0x00 i   # VDN 1  - Set default HW boot voltage to 0.8V
 i2cset -y 10 0x71 0x01 0xB0 b    # VDN 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service
index fbab180ce..45776aa71 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service
@@ -1,12 +1,13 @@
 [Unit]
-Description=Disable the AVS bus on the VRMs
-Before=vrm-control@%i.service
+Description=Enable the AVS bus on VRMs
+Wants=op-power-start@%i.service
+Before=op-power-start@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
-ExecStart=/usr/bin/env avsbus-disable.sh
-SyslogIdentifier=avsbus-disable.sh
+ExecStart={bindir}/avsbus-enable.sh
+SyslogIdentifier=avsbus-enable.sh
 Type=oneshot
 RemainAfterExit=yes