commit 696d1d3438499f974390c2c9c77fe4879509d9d1
author Matt Spinler <spinler@us.ibm.com> Fri Oct 04 14:47:42 2019 -0500
committer Brad Bishop <radsquirrel@gmail.com> Tue Oct 15 01:47:47 2019 +0000
tree 1ab299f00e28680b62a1b208e9c923efad5b6187
parent 6e733b66f460ffc03d27c81139ed318bc8c8583e

meta-ibm: Fix OCC hwmon paths for the 5.3 kernel

The 5.3 kernel adds an 'fsi-master' directory in front of the fsi0 and
fsi1 directories in the OCC device tree paths.  Update the OCC hwmon
file paths accordingly as those are based on that path.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I369da05538c5f940ed361d1da1f421176f5d75d8

meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 4d60a74..4af367a 100644
--- a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -71,9 +71,9 @@
 
 OCCS = " \
         00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
-        00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
+        00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
         "
-OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
+OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf"
 OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
 
 ENVS = "obmc/hwmon/{0}"