diff options
| author | Brandon Wyman <bjwyman@gmail.com> | 2022-02-22 23:44:27 +0300 |
|---|---|---|
| committer | Andrew Geissler <andrew@geissonator.com> | 2022-03-17 21:03:39 +0300 |
| commit | 7eb569c9b994c3c0ab2c9faeb33a0d2528d9e117 (patch) | |
| tree | 0f68c9a7c0d313442fe82cd993cba831e7877857 /meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager | |
| parent | a8a764a53c9e3b3ba6ef724b37ba3c18ab96f1e6 (diff) | |
| download | openbmc-7eb569c9b994c3c0ab2c9faeb33a0d2528d9e117.tar.xz | |
sensors:p10bmc:Add power-supply temperature
Add the power supply temperature readings to the hwmon configuration and
the Rainier and Everest assocation files.
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Change-Id: I00e7fde4a58da553b9374733b22b8608d0c9da41
Diffstat (limited to 'meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager')
3 files changed, 70 insertions, 10 deletions
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index b64f393df3..7ad2c1a350 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json @@ -208,18 +208,30 @@ "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", "/xyz/openbmc_project/sensors/current/ps0_output_current", "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps0_temp0", + "/xyz/openbmc_project/sensors/temperature/ps0_temp1", + "/xyz/openbmc_project/sensors/temperature/ps0_temp2", "/xyz/openbmc_project/sensors/power/ps1_input_power", "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", "/xyz/openbmc_project/sensors/current/ps1_output_current", "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps1_temp0", + "/xyz/openbmc_project/sensors/temperature/ps1_temp1", + "/xyz/openbmc_project/sensors/temperature/ps1_temp2", "/xyz/openbmc_project/sensors/power/ps2_input_power", "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage", "/xyz/openbmc_project/sensors/current/ps2_output_current", "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps2_temp0", + "/xyz/openbmc_project/sensors/temperature/ps2_temp1", + "/xyz/openbmc_project/sensors/temperature/ps2_temp2", "/xyz/openbmc_project/sensors/power/ps3_input_power", "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage", "/xyz/openbmc_project/sensors/current/ps3_output_current", "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps3_temp0", + "/xyz/openbmc_project/sensors/temperature/ps3_temp1", + "/xyz/openbmc_project/sensors/temperature/ps3_temp2", "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan0_1", @@ -327,7 +339,10 @@ "/xyz/openbmc_project/sensors/power/ps0_input_power", "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", "/xyz/openbmc_project/sensors/current/ps0_output_current", - "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps0_temp0", + "/xyz/openbmc_project/sensors/temperature/ps0_temp1", + "/xyz/openbmc_project/sensors/temperature/ps0_temp2" ] }, { @@ -380,7 +395,10 @@ "/xyz/openbmc_project/sensors/power/ps1_input_power", "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", "/xyz/openbmc_project/sensors/current/ps1_output_current", - "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps1_temp0", + "/xyz/openbmc_project/sensors/temperature/ps1_temp1", + "/xyz/openbmc_project/sensors/temperature/ps1_temp2" ] }, { @@ -433,7 +451,10 @@ "/xyz/openbmc_project/sensors/power/ps2_input_power", "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage", "/xyz/openbmc_project/sensors/current/ps2_output_current", - "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps2_temp0", + "/xyz/openbmc_project/sensors/temperature/ps2_temp1", + "/xyz/openbmc_project/sensors/temperature/ps2_temp2" ] }, { @@ -486,7 +507,10 @@ "/xyz/openbmc_project/sensors/power/ps3_input_power", "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage", "/xyz/openbmc_project/sensors/current/ps3_output_current", - "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps3_temp0", + "/xyz/openbmc_project/sensors/temperature/ps3_temp1", + "/xyz/openbmc_project/sensors/temperature/ps3_temp2" ] }, { diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json index 67829c5969..6c474c52b7 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json @@ -289,10 +289,16 @@ "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", "/xyz/openbmc_project/sensors/current/ps0_output_current", "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps0_temp0", + "/xyz/openbmc_project/sensors/temperature/ps0_temp1", + "/xyz/openbmc_project/sensors/temperature/ps0_temp2", "/xyz/openbmc_project/sensors/power/ps1_input_power", "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", "/xyz/openbmc_project/sensors/current/ps1_output_current", "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps1_temp0", + "/xyz/openbmc_project/sensors/temperature/ps1_temp1", + "/xyz/openbmc_project/sensors/temperature/ps1_temp2", "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan0_1", @@ -362,7 +368,10 @@ "/xyz/openbmc_project/sensors/power/ps0_input_power", "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", "/xyz/openbmc_project/sensors/current/ps0_output_current", - "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps0_temp0", + "/xyz/openbmc_project/sensors/temperature/ps0_temp1", + "/xyz/openbmc_project/sensors/temperature/ps0_temp2" ] }, { @@ -415,7 +424,10 @@ "/xyz/openbmc_project/sensors/power/ps1_input_power", "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", "/xyz/openbmc_project/sensors/current/ps1_output_current", - "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps1_temp0", + "/xyz/openbmc_project/sensors/temperature/ps1_temp1", + "/xyz/openbmc_project/sensors/temperature/ps1_temp2" ] }, { diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json index 43384d54e9..5b407197ae 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json @@ -283,18 +283,30 @@ "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", "/xyz/openbmc_project/sensors/current/ps0_output_current", "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps0_temp0", + "/xyz/openbmc_project/sensors/temperature/ps0_temp1", + "/xyz/openbmc_project/sensors/temperature/ps0_temp2", "/xyz/openbmc_project/sensors/power/ps1_input_power", "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", "/xyz/openbmc_project/sensors/current/ps1_output_current", "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps1_temp0", + "/xyz/openbmc_project/sensors/temperature/ps1_temp1", + "/xyz/openbmc_project/sensors/temperature/ps1_temp2", "/xyz/openbmc_project/sensors/power/ps2_input_power", "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage", "/xyz/openbmc_project/sensors/current/ps2_output_current", "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps2_temp0", + "/xyz/openbmc_project/sensors/temperature/ps2_temp1", + "/xyz/openbmc_project/sensors/temperature/ps2_temp2", "/xyz/openbmc_project/sensors/power/ps3_input_power", "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage", "/xyz/openbmc_project/sensors/current/ps3_output_current", "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps3_temp0", + "/xyz/openbmc_project/sensors/temperature/ps3_temp1", + "/xyz/openbmc_project/sensors/temperature/ps3_temp2", "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan1_0", @@ -358,7 +370,10 @@ "/xyz/openbmc_project/sensors/power/ps0_input_power", "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", "/xyz/openbmc_project/sensors/current/ps0_output_current", - "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps0_temp0", + "/xyz/openbmc_project/sensors/temperature/ps0_temp1", + "/xyz/openbmc_project/sensors/temperature/ps0_temp2" ] }, { @@ -411,7 +426,10 @@ "/xyz/openbmc_project/sensors/power/ps1_input_power", "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", "/xyz/openbmc_project/sensors/current/ps1_output_current", - "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps1_temp0", + "/xyz/openbmc_project/sensors/temperature/ps1_temp1", + "/xyz/openbmc_project/sensors/temperature/ps1_temp2" ] }, { @@ -464,7 +482,10 @@ "/xyz/openbmc_project/sensors/power/ps2_input_power", "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage", "/xyz/openbmc_project/sensors/current/ps2_output_current", - "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps2_temp0", + "/xyz/openbmc_project/sensors/temperature/ps2_temp1", + "/xyz/openbmc_project/sensors/temperature/ps2_temp2" ] }, { @@ -517,7 +538,10 @@ "/xyz/openbmc_project/sensors/power/ps3_input_power", "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage", "/xyz/openbmc_project/sensors/current/ps3_output_current", - "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage" + "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage", + "/xyz/openbmc_project/sensors/temperature/ps3_temp0", + "/xyz/openbmc_project/sensors/temperature/ps3_temp1", + "/xyz/openbmc_project/sensors/temperature/ps3_temp2" ] }, { |