| commit | 73efe3da935c0397361ac1c78dcf7615cdc0f0fb | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Mon Jul 10 20:49:00 2017 -0400 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Thu Jul 13 19:13:13 2017 +0000 |
| tree | 5d56c0715404c0b1fa10003e7ba2bbfb132bcd86 | |
| parent | d69337ec77bef9fc7ffc6810c34ead95a930d03c [diff] |
wspoon: Inhibit phosphor-hwmon-config-mrw Use a hardcoded hwmon config file for the Witherspoon max31785 chip. Hopefully somewhat temporary workaround of missing tags in the Witherspoon MRW. Change-Id: Ibf03b6c566d600b34b52a0288e1c511b9ff07e4e Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index 9685e60..69381da 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -14,3 +14,6 @@ PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" PHOSPHOR_MRW_REV = "3a7d05c38c449d9bcd73544a941c0b41121e8e94" + +# Inhibit phosphor-hwmon-config-mrw +VIRTUAL-RUNTIME_phosphor-hwmon-config = ""
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 212859b..8aef1f1 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
@@ -3,6 +3,7 @@ WSPOON_CHIPS = " \ i2c@1e78a000/i2c-bus@100/bmp280@77 \ i2c@1e78a000/i2c-bus@100/dps310@76 \ + i2c@1e78a000/i2c-bus@100/max31785@52 \ i2c@1e78a000/i2c-bus@140/ir35221@70 \ i2c@1e78a000/i2c-bus@140/ir35221@71 \ i2c@1e78a000/i2c-bus@180/ir35221@70 \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf new file mode 100644 index 0000000..1e8698c --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52.conf
@@ -0,0 +1,4 @@ +LABEL_fan1 = "fan0" +LABEL_fan2 = "fan1" +LABEL_fan3 = "fan2" +LABEL_fan4 = "fan3"