meta-ibm: Modify ipmi config

We think fan is a necessary sensor in ipmi sensor list.

Tested: Use ipmitool sdr to check it.

(From meta-ibm rev: 5bdc8591ac5e6ce708fdc0788806cb89452c3b14)

Change-Id: I87acef1dcfe11bc532eac5412375133b56f40320
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

1 files changed, 56 insertions, 56 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 71b79b73bb..1cf747856e 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
@@ -126,134 +126,134 @@
     unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
 238:
     bExp: 0
-    entityID: 10
-    entityInstance: 1
+    entityID: 29
+    entityInstance: 2
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
                 Offsets:
                     255:
                         type: int64_t
-    multiplierM: 2
+    multiplierM: 100
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/storage_a_power
+    path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
     rExp: 0
     readingType: readingData
-    scale: -6
+    scale: 0
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 8
+    sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
 239:
     bExp: 0
-    entityID: 10
-    entityInstance: 2
+    entityID: 29
+    entityInstance: 4
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
                 Offsets:
                     255:
                         type: int64_t
-    multiplierM: 2
+    multiplierM: 100
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/storage_b_power
+    path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
     rExp: 0
     readingType: readingData
-    scale: -6
+    scale: 0
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 8
+    sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
 240:
     bExp: 0
-    entityID: 10
-    entityInstance: 3
+    entityID: 29
+    entityInstance: 6
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
                 Offsets:
                     255:
                         type: int64_t
-    multiplierM: 2
+    multiplierM: 100
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/p0_vdd_power
+    path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
     rExp: 0
     readingType: readingData
-    scale: -6
+    scale: 0
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 8
+    sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
 241:
     bExp: 0
-    entityID: 10
-    entityInstance: 4
+    entityID: 29
+    entityInstance: 8
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
                 Offsets:
                     255:
                         type: int64_t
-    multiplierM: 2
+    multiplierM: 100
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/p1_vdd_power
+    path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
     rExp: 0
     readingType: readingData
-    scale: -6
+    scale: 0
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 8
+    sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
 242:
     bExp: 0
-    entityID: 10
-    entityInstance: 5
+    entityID: 29
+    entityInstance: 10
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
                 Offsets:
                     255:
                         type: int64_t
-    multiplierM: 2
+    multiplierM: 100
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/p0_mem_power
+    path: /xyz/openbmc_project/sensors/fan_tach/fan4_1
     rExp: 0
     readingType: readingData
-    scale: -6
+    scale: 0
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 8
+    sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
 243:
     bExp: 0
-    entityID: 10
-    entityInstance: 6
+    entityID: 29
+    entityInstance: 12
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
                 Offsets:
                     255:
                         type: int64_t
-    multiplierM: 2
+    multiplierM: 100
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/p1_mem_power
+    path: /xyz/openbmc_project/sensors/fan_tach/fan5_1
     rExp: 0
     readingType: readingData
-    scale: -6
+    scale: 0
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 8
+    sensorType: 4
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
 244:
     bExp: 0
     entityID: 10
-    entityInstance: 7
+    entityInstance: 3
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
@@ -262,7 +262,7 @@
                         type: int64_t
     multiplierM: 2
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/ps0_input_power
+    path: /xyz/openbmc_project/sensors/power/p0_vdd_power
     rExp: 0
     readingType: readingData
     scale: -6
@@ -274,7 +274,7 @@
 245:
     bExp: 0
     entityID: 10
-    entityInstance: 8
+    entityInstance: 4
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
@@ -283,7 +283,7 @@
                         type: int64_t
     multiplierM: 2
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/power/ps1_input_power
+    path: /xyz/openbmc_project/sensors/power/p1_vdd_power
     rExp: 0
     readingType: readingData
     scale: -6
@@ -295,7 +295,7 @@
 246:
     bExp: 0
     entityID: 10
-    entityInstance: 9
+    entityInstance: 7
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
@@ -304,19 +304,19 @@
                         type: int64_t
     multiplierM: 2
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage
+    path: /xyz/openbmc_project/sensors/power/ps0_input_power
     rExp: 0
     readingType: readingData
-    scale: -3
+    scale: -6
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 2
+    sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
 247:
     bExp: 0
     entityID: 10
-    entityInstance: 10
+    entityInstance: 8
     interfaces:
         xyz.openbmc_project.Sensor.Value:
             Value:
@@ -325,15 +325,15 @@
                         type: int64_t
     multiplierM: 2
     offsetB: 0
-    path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage
+    path: /xyz/openbmc_project/sensors/power/ps1_input_power
     rExp: 0
     readingType: readingData
-    scale: -3
+    scale: -6
     sensorNamePattern: nameLeaf
     sensorReadingType: 1
-    sensorType: 2
+    sensorType: 8
     serviceInterface: org.freedesktop.DBus.Properties
-    unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
+    unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
 248:
     bExp: 0
     entityID: 10