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/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
index a4f17e9..ba4e368 100644
--- a/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
+++ b/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Witherspoon Power Supply %I Monitor
-Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service
-After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service
+Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
+After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service
 Wants=mapper-wait@-org-openbmc-control-power0.service
 After=mapper-wait@-org-openbmc-control-power0.service
 ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf