From 3ded63d40c63666ebb8d549a93bff87e130914ca Mon Sep 17 00:00:00 2001
From: Ben_Pai <ben_pai@wistron.com>
Date: Thu, 12 Sep 2019 10:58:00 +0800
Subject: meta-ibm: Add mihawk total power sensor

Get total power from occ.

(From meta-ibm rev: 5f74841d980f274383dd0bf1c16b1c3df18142e2)

Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Change-Id: I97bf6b2229890dca1a0bda421b85b10392c2a814
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../mihawk/acx22-ipmi-hwmon-sensors.yaml           | 25 ++++++++++++++++++++--
 .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf  |  1 +
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml
index 03b9700dc..71b79b73b 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml
@@ -419,6 +419,27 @@
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
 252:
+    bExp: 0
+    entityID: 10
+    entityInstance: 15
+    interfaces:
+        xyz.openbmc_project.Sensor.Value:
+            Value:
+                Offsets:
+                    255:
+                        type: int64_t
+    multiplierM: 20
+    offsetB: 0
+    path: /xyz/openbmc_project/sensors/power/total_power
+    rExp: 0
+    readingType: readingData
+    scale: -6
+    sensorNamePattern: nameLeaf
+    sensorReadingType: 1
+    sensorType: 8
+    serviceInterface: org.freedesktop.DBus.Properties
+    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+253:
     bExp: 0
     entityID: 35
     entityInstance: 1
@@ -439,7 +460,7 @@
     sensorType: 1
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-253:
+254:
     bExp: 0
     entityID: 35
     entityInstance: 2
@@ -460,7 +481,7 @@
     sensorType: 1
     serviceInterface: org.freedesktop.DBus.Properties
     unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
-254:
+255:
     bExp: 0
     entityID: 64
     entityInstance: 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index f47b49a82..5b347c10c 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
@@ -288,3 +288,4 @@ LABEL_power8 = "fans_power"
 LABEL_power9 = "storage_b_power"
 LABEL_power10 = "storage_a_power"
 LABEL_power11 = "gpu0_power"
+LABEL_power14 = "total_power"
-- 
cgit v1.2.3