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"
                     ]
                 },
                 {