| commit | f8952bbe10a484b62ed98a9cc780cbf5b53ba303 | [log] [tgz] |
|---|---|---|
| author | Matt Spinler <spinler@us.ibm.com> | Fri Feb 09 15:04:46 2018 -0600 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Wed Feb 21 03:40:22 2018 +0000 |
| tree | 6ed1d618c01f8e0bd503c676d8c9bc4e3b694765 | |
| parent | 4a671fefeedbb68b1e3238d4f357adca535d2cc4 [diff] |
Update power supply inventory path to match MRW I2C device access failures can lead to the correct FRU callouts only when the inventory path of the FRU matches in the inventory and the MRW, as a build time script parses the MRW to map device paths to inventory items. In the MRW it is not possible to hang a FRU off the chassis like the BMC currently has it, so adding the motherboard into the BMC inventory paths to match the MRW ones. With this change, device access failures by phosphor-hwmon-readd and witherspoon-psu-monitor will now lead to the proper inventory object callouts. Resolves openbmc/openbmc#2924 Change-Id: I7d76d1879ead48c95ec28c7536ae404f1fc9856d Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf index f2ba6a3..285a8f7 100644 --- a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
@@ -1,4 +1,4 @@ -INVENTORY=/system/chassis/powersupply0 +INVENTORY=/system/chassis/motherboard/powersupply0 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=104 NAME=powersupply0
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf index 98c4db3..56e16c5 100644 --- a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
@@ -1,4 +1,4 @@ -INVENTORY=/system/chassis/powersupply1 +INVENTORY=/system/chassis/motherboard/powersupply1 DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=127 NAME=powersupply1