diff options
| author | Andrew Geissler <andrewg@us.ibm.com> | 2017-06-13 11:38:57 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-16 10:53:44 +0000 |
| commit | 9e69e24372d1434231b972d4ffb0ba7e8d6c837a (patch) | |
| tree | cd84ce7ff6c9141ef2184ed6dbe51396ad4158c0 /meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon | |
| parent | 97c6018e9108e8ace952dace80d7ad45ff5f936a (diff) | |
| download | talos-openbmc-9e69e24372d1434231b972d4ffb0ba7e8d6c837a.tar.gz talos-openbmc-9e69e24372d1434231b972d4ffb0ba7e8d6c837a.zip | |
Adjust occ hwmon conf file to match with sysfs
The occ has some special characteristics, in this case
its sysfs path ends with occ-hwmon@<instance> in order
to support the other layers of drivers (i.e. occ fifo).
The hwmon conf file needs to match with the sysfs path
so aligning it with this change.
Change-Id: Id582ac6f2184d04841456d56f0e6bcab07027e4d
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon')
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend | 6 | ||||
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2.conf (renamed from meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf) | 0 | ||||
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1/occ-hwmon@1.conf (renamed from meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend index 6ee00c0e1..212859b02 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend @@ -12,10 +12,10 @@ WSPOON_ITEMSFMT = "ahb/apb/{0}.conf" WSPOON_ITEMS = "${@compose_list(d, 'WSPOON_ITEMSFMT', 'WSPOON_CHIPS')}" WSPOON_OCCS = " \ - cfam@0,0/sbefifo@2400/occ@1 \ - cfam@0,0/sbefifo@82400/occ@2 \ + sbefifo@2400/occ@1/occ-hwmon@1 \ + hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2 \ " -WSPOON_OCCSFMT = "base/gpio-fsi/{0}.conf" +WSPOON_OCCSFMT = "gpio-fsi/cfam@0,0/{0}.conf" WSPOON_OCCITEMS = "${@compose_list(d, 'WSPOON_OCCSFMT', 'WSPOON_OCCS')}" ENVS = "obmc/hwmon/{0}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2.conf index 03b424ae3..03b424ae3 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2.conf diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1/occ-hwmon@1.conf index 5b55e3c5e..5b55e3c5e 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1/occ-hwmon@1.conf |
