commit 69fca2e8c2549eb4e40417343603f9ce24eba38d
author John Wang <wangzqbj@inspur.com> Fri Jun 14 11:38:32 2019 +0800
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Jun 20 09:19:52 2019 -0400
tree 594e5dd1030cba4947a34ef7ad281b2f4916005c
parent fef8abbc78154abbd86ab9f0704e65ccb422f4de

fp5280g2: Add occ sensors

Tested: booted a fp5280g2,manually binded the OCC driver when OCC activated,
        and saw core-temp,dimm-temp and power sensors via REST API.

(From meta-inspur rev: f24af46e265e6541f26fb88c650e5ef681e51898)

Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: I5b99d406159b080a2d6be53f23250ef356e8bfe2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend

diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index a2aeb2c..ed2bf19 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -15,5 +15,14 @@
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 ITEMS += "iio-hwmon.conf iio-hwmon-battery.conf"
 
+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 \
+       "
+
+OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf"
+OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
+
 ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"