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
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 b64f393..7ad2c1a 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 67829c5..6c474c5 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 43384d5..5b40719 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"
]
},
{
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
index 17cbda6..6d459a4 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
@@ -5,3 +5,7 @@
LABEL_curr1="ps0_output_current"
LABEL_power1="ps0_input_power"
+
+LABEL_temp1="ps0_temp0"
+LABEL_temp2="ps0_temp1"
+LABEL_temp3="ps0_temp2"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
index feaabdb..7773d70 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
@@ -5,3 +5,7 @@
LABEL_curr1="ps1_output_current"
LABEL_power1="ps1_input_power"
+
+LABEL_temp1="ps1_temp0"
+LABEL_temp2="ps1_temp1"
+LABEL_temp3="ps1_temp2"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf
index c9e6b64..d9ae392 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf
@@ -5,3 +5,7 @@
LABEL_curr1="ps2_output_current"
LABEL_power1="ps2_input_power"
+
+LABEL_temp1="ps2_temp0"
+LABEL_temp2="ps2_temp1"
+LABEL_temp3="ps2_temp2"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf
index 019b0a3..9198bbb 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf
@@ -5,3 +5,7 @@
LABEL_curr1="ps3_output_current"
LABEL_power1="ps3_input_power"
+
+LABEL_temp1="ps3_temp0"
+LABEL_temp2="ps3_temp1"
+LABEL_temp3="ps3_temp2"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf
index c9e6b64..d9ae392 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf
@@ -5,3 +5,7 @@
LABEL_curr1="ps2_output_current"
LABEL_power1="ps2_input_power"
+
+LABEL_temp1="ps2_temp0"
+LABEL_temp2="ps2_temp1"
+LABEL_temp3="ps2_temp2"