diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-07-10 23:49:41 -0400 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-07-18 20:11:19 +0000 |
commit | 0ff28deecd80589aec55cfeaad45e74424707853 (patch) | |
tree | 41cdfca66a58dd2912f7ec5f04ff0929827e774e /meta-openbmc-machines/meta-openpower | |
parent | 2ad7ce334819f2f2d1e8bd06b160126b41591d07 (diff) | |
download | talos-openbmc-0ff28deecd80589aec55cfeaad45e74424707853.tar.gz talos-openbmc-0ff28deecd80589aec55cfeaad45e74424707853.zip |
wspoon: Add secondary fan rotor sensors
Create DBus objects for these additional sensors
and update application configuration to consume them.
Resolves: openbmc/openbmc#1188
Change-Id: If0c75ba9a2cae7811694379649756e1310e9a25a
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
3 files changed, 16 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml index 8c7bbb85d..dc5680dee 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml @@ -5,6 +5,8 @@ sensors: - name: fan0_0 has_target: true + - name: fan0_1 + has_target: false - inventory: /system/chassis/motherboard/fan1 allowed_out_of_range_time: 20 @@ -13,6 +15,8 @@ sensors: - name: fan1_0 has_target: true + - name: fan1_1 + has_target: false - inventory: /system/chassis/motherboard/fan2 allowed_out_of_range_time: 20 @@ -21,6 +25,8 @@ sensors: - name: fan2_0 has_target: true + - name: fan2_1 + has_target: false - inventory: /system/chassis/motherboard/fan3 allowed_out_of_range_time: 20 @@ -29,3 +35,5 @@ sensors: - name: fan3_0 has_target: true + - name: fan3_1 + has_target: false diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml index e4922f392..c95f6c334 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml @@ -4,18 +4,22 @@ Description: Sensors: - fan2_0 + - fan2_1 - PrettyName: fan0 Inventory: /system/chassis/motherboard/fan0 Description: Sensors: - fan0_0 + - fan0_1 - PrettyName: fan1 Inventory: /system/chassis/motherboard/fan1 Description: Sensors: - fan1_0 + - fan1_1 - PrettyName: fan3 Inventory: /system/chassis/motherboard/fan3 Description: Sensors: - fan3_0 + - fan3_1 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 index 8a4b89818..ef3a5eb53 100644 --- 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 @@ -2,3 +2,7 @@ LABEL_fan1 = "fan0_0" LABEL_fan2 = "fan1_0" LABEL_fan3 = "fan2_0" LABEL_fan4 = "fan3_0" +LABEL_fan7 = "fan0_1" +LABEL_fan8 = "fan1_1" +LABEL_fan9 = "fan2_1" +LABEL_fan10 = "fan3_1" |