meta-ingrasys: zaius: avsbus-control: use linux driver instead of raw I2C commands
Switches the AVS bus workaround script to use the newly exposed
linux driver accessors to poke the device instead of raw
i2cget/i2cset commands.
This allows both the machine to boot and the hwmon driver to be loaded
at the same time, yay!
Change-Id: I514e220dbb05b63b10e0011eeed61402529485a4
Signed-off-by: Robert Lippert <rlippert@google.com>
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh b/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh
index 45e6066..d960ba7 100755
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh
@@ -12,29 +12,14 @@
vcs_i2c_addr_page="0x64:0x00"
addrs_pages="$vdd_i2c_addr_page $vdn_i2c_addr_page $vcs_i2c_addr_page"
-# Usage: vrm_set_page <bus> <i2c_address> <page>
-vrm_set_page()
-{
- i2cset -y $1 $2 0x00 $3 b
-}
+i2c_path="/sys/bus/i2c/devices/"
# Usage: vrm_avs_enable <bus> <i2c_address> <page>
# Initializes the AVSBus VOUT setpoint to the value in PMBus VOUT_COMMAND
-# Sets OPERATION PMBUS register to
-# - Enable/Disable: On
-# - VOUT Source: AVSBus Target Rail Voltage
-# - AVSBus Copy: VOUT_COMMAND remains unchanged
-# Writes to VOUT setpoint over AVSBus will persist after the VRM is switched to
-# PMBus control. Switching back to AVSBus control restores this persisted
-# setpoint rather than re-initializing to PMBus VOUT_COMMAND. This behavior is
-# known to Intersil and writing VOUT_COMMAND over PMBus is the only workaround.
vrm_avs_enable()
{
- vrm_set_page "$@"
echo Enabling AVSBus on bus $1 VRM @$2 rail $3...
- local vout_command=`i2cget -y $1 $2 0x21 w`
- i2cset -y $1 $2 0x21 $vout_command w
- i2cset -y $1 $2 0x01 0xb0 b
+ echo 1 > $(echo ${i2c_path}/$1-$(printf "%04x" $2)/hwmon/hwmon*/avs$(printf "%d" $3)_enable)
}
# Usage: vrm_avs_disable <bus> <i2c_address> <page>
@@ -44,28 +29,16 @@
# - AVSBus Copy: VOUT_COMMAND remains unchanged
vrm_avs_disable()
{
- vrm_set_page "$@"
echo Disabling AVSBus on bus $1 VRM @$2 rail $3...
- i2cset -y $1 $2 0x01 0x80 b
+ echo 0 > $(echo ${i2c_path}/$1-$(printf "%04x" $2)/hwmon/hwmon*/avs$(printf "%d" $3)_enable)
}
# Usage: vrm_vout_max_1v1 <bus> <i2c_address> <page>
# Sets VOUT_MAX to 1.1V
vrm_vout_max_1v1()
{
- vrm_set_page "$@"
echo Setting VOUT_MAX=[1.1V] on bus $1 VRM @$2 rail $3...
- i2cset -y $1 $2 0x24 0x44c w
-}
-
-# Usage: vrm_print <bus> <i2c_address> <page>
-vrm_print()
-{
- vrm_set_page "$@"
- local operation=`i2cget -y $1 $2 0x01 b`
- local vout=`i2cget -y $1 $2 0x8b w`
- local iout=`i2cget -y $1 $2 0x8c w`
- echo VRM on bus $1 @$2 rail $3: OPERATION=$operation VOUT=$vout IOUT=$iout
+ echo 1100 > ${i2c_path}/$1-$(printf "%04x" $2)/vout$(printf "%d" $3)_max
}
# Usage: for_each_rail <command>
@@ -92,7 +65,6 @@
addrs_pages="$vdn_i2c_addr_page"
for_each_rail vrm_vout_max_1v1
else
- for_each_rail vrm_print
echo "\"$0 <enable|disable>\" to control whether VRMs use AVSBus"
echo "\"$0 <vdn_max>\" to set VDN rails VOUT_MAX to 1.1V"
fi