commit addb1466f22c9d8435ad4cfebbf01106314dee74
author Brad Bishop <bradleyb@fuzziesquirrel.com> Sat Apr 20 09:59:37 2019 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Sat Apr 20 09:59:53 2019 -0400
tree ada183c317421099791077749f1ec4c87d838d98
parent 839c37546efc859282e3d1302639a5e1cffeea3c

subtree updates

meta-aspeed: c8d791ede6..35a494ecb3:
  Andrew Jeffery (1):
        linux-aspeed: OCC, ISL68137, ASPEED spi-nor updates

meta-ingrasys: 67bcaf389f..71846afdc6:
  Patrick Venture (5):
        meta-ingrasys: zaius: hwmon: udc90160 specify informative names
        meta-ingrasys: zaius: enable isl68137 and ir38064
        meta-ingrasys: zaius: phosphor-hwmon: add vrm nodes
        meta-ingrasys: zaius: phosphor-hwmon: add power-brick nodes
        meta-ingrasys: zaius: update ipmi sensor inventory

  Robert Lippert (3):
        meta-ingrasys: zaius: remove reflock fixup recipe
        meta-ingrasys: zaius: avsbus-control: use linux driver instead of raw I2C commands
        meta-ingrasys: zaius: no longer need to set VDN VOUT_MAX during host boot

Change-Id: I5dbcfae6f937e0f01e5fca4c1f686be0e82b7ee1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml

diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml
index d6a43e4..a7f1a73 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml
@@ -177,6 +177,295 @@
             deassert: false
             type: bool
 
+0x72: &voltage
+  sensorType: 0x02
+  path: /xyz/openbmc_project/sensors/voltage/vr0_p1v2_03_vout
+  sensorReadingType: 0x01
+  multiplierM: 8
+  offsetB: 0
+  bExp: 0
+  unit: xyz.openbmc_project.Sensor.Value.Unit.Volts
+  scale: -3
+  rExp: -3
+  serviceInterface: org.freedesktop.DBus.Properties
+  readingType: readingData
+  interfaces:
+    xyz.openbmc_project.Sensor.Value:
+      Value:
+        Offsets:
+          0xFF:
+            type: int64_t
+0x73: &current
+  sensorType: 0x03
+  path: /xyz/openbmc_project/sensors/current/vr0_p1v2_03_iout
+  sensorReadingType: 0x01
+  multiplierM: 200
+  offsetB: 0
+  bExp: 0
+  unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
+  scale: -3
+  rExp: -3
+  serviceInterface: org.freedesktop.DBus.Properties
+  readingType: readingData
+  interfaces:
+    xyz.openbmc_project.Sensor.Value:
+      Value:
+        Offsets:
+          0xFF:
+            type: int64_t
+0x74: &power
+  sensorType: 0x08
+  path: /xyz/openbmc_project/sensors/power/vr0_p1v2_03_pout
+  sensorReadingType: 0x01
+  multiplierM: 100
+  offsetB: 0
+  bExp: 0
+  unit: xyz.openbmc_project.Sensor.Value.Unit.Watts
+  scale: -6
+  rExp: -2
+  serviceInterface: org.freedesktop.DBus.Properties
+  readingType: readingData
+  interfaces:
+    xyz.openbmc_project.Sensor.Value:
+      Value:
+        Offsets:
+          0xFF:
+            type: int64_t
+0x75: &temperature
+  sensorType: 0x01
+  path: /xyz/openbmc_project/sensors/temperature/vr0_p1v2_03
+  sensorReadingType: 0x01
+  multiplierM: 235
+  offsetB: 0
+  bExp: 0
+  unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+  scale: -3
+  rExp: -3
+  serviceInterface: org.freedesktop.DBus.Properties
+  readingType: readingData
+  interfaces:
+    xyz.openbmc_project.Sensor.Value:
+      Value:
+        Offsets:
+          0xFF:
+            type: int64_t
+0x76:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr0_p1v2_47_vout
+0x77:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr0_p1v2_47_iout
+0x78:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr0_p1v2_47_pout
+0x79:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr0_p1v2_47
+0x7a:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr0_vio_vout
+0x7b:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr0_vio_iout
+0x7c:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr0_vio_pout
+0x7d:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr0_vio
+0x7e:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr0_vdd_vout
+0x7f:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr0_vdd_iout
+0x80:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr0_vdd_pout
+0x81:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr0_vdd
+0x82:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr0_vcs_vout
+0x83:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr0_vcs_iout
+0x84:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr0_vcs_pout
+0x85:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr0_vdncvs
+0x86:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr0_vdn_vout
+0x87:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr0_vdn_iout
+0x88:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr0_vdn_pout
+0x89:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr1_p1v2_03_vout
+0x8a:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr1_p1v2_03_iout
+0x8b:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr1_p1v2_03_pout
+0x8c:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr1_p1v2_03
+0x8d:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr1_p1v2_47_vout
+0x8e:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr1_p1v2_47_iout
+0x8f:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr1_p1v2_47_pout
+0x90:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr1_p1v2_47
+0x91:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr1_vio_vout
+0x92:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr1_vio_iout
+0x93:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr1_vio_pout
+0x94:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr1_vio
+0x95:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr1_vdd_vout
+0x96:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr1_vdd_iout
+0x97:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr1_vdd_pout
+0x98:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr1_vdd
+0x99:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr1_vcs_vout
+0x9a:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr1_vcs_iout
+0x9b:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr1_vcs_pout
+0x9c:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/vr1_vdncvs
+0x9d:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/vr1_vdn_vout
+0x9e:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/vr1_vdn_iout
+0x9f:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/vr1_vdn_pout
+0xA0:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/p12v
+  multiplierM: 51
+  offsetB: 0
+  bExp: 0
+0xA1:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/p5v
+  multiplierM: 21
+  offsetB: 0
+  bExp: 0
+0xA2:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/p3v3
+  multiplierM: 14
+  offsetB: 0
+  bExp: 0
+0xA3:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/p1v8
+  multiplierM: 9
+  offsetB: 0
+  bExp: 0
+0xA4:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/p1v05
+  multiplierM: 6
+  offsetB: 0
+  bExp: 0
+0xA5:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/p1v0_sata
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xA6:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu0_vdn
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xA7:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu1_vdn
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xA8:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/p1v5
+  multiplierM: 7
+  offsetB: 0
+  bExp: 0
+0xA9:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu0_vio
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xAA:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu1_vio
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xAB:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu0_vdd
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xAC:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu1_vdd
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xAD:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu0_vcs
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+0xAE:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/cpu1_vcs
+  multiplierM: 5
+  offsetB: 0
+  bExp: 0
+
 0xB0: &fan_tach
   sensorType: 0x04
   path: /xyz/openbmc_project/sensors/fan_tach/fan0
@@ -204,8 +493,32 @@
 0xB3:
   <<: *fan_tach
   path: /xyz/openbmc_project/sensors/fan_tach/fan3
+0xB4:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/brick_p12v_vin
+  multiplierM: 393
+  offsetB: 0
+  bExp: 0
+0xB5:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/brick_p12v_vout
+  multiplierM: 212
+  offsetB: 0
+  bExp: 0
+0xB6:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/brick_p12v_iout
+  multiplierM: 393
+  offsetB: 0
+  bExp: 0
+0xB7:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/brick_p12v
+  multiplierM: 235
+  offsetB: 0
+  bExp: 0
 
-0xC0: &temperature
+0xC0:
   sensorType: 0x01
   path: /xyz/openbmc_project/sensors/temperature/w1_inlet
   sensorReadingType: 0x01
@@ -259,7 +572,7 @@
   <<: *fanpwm
   path: /xyz/openbmc_project/sensors/fan_tach/fan3
 
-0xD0: &voltage
+0xD0:
   sensorType: 0x02
   path: /xyz/openbmc_project/sensors/voltage/p5v_aux
   sensorReadingType: 0x01
@@ -367,4 +680,34 @@
   multiplierM: 15
   offsetB: 0
   bExp: 0
-
+0xE1:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/hotswap_vin
+  multiplierM: 393
+  offsetB: 0
+  bExp: 0
+0xE2:
+  <<: *current
+  path: /xyz/openbmc_project/sensors/current/hotswap_iin
+  multiplierM: 200
+  offsetB: 0
+  bExp: 0
+0xE3:
+  <<: *voltage
+  path: /xyz/openbmc_project/sensors/voltage/hotswap_vout
+  multiplierM: 393
+  offsetB: 0
+  bExp: 0
+0xE4:
+  <<: *power
+  path: /xyz/openbmc_project/sensors/power/hotswap_power
+  multiplierM: 80
+  offsetB: 0
+  bExp: 0
+  rExp: -1
+0xE5:
+  <<: *temperature
+  path: /xyz/openbmc_project/sensors/temperature/hotswap_temp
+  multiplierM: 511
+  offsetB: 20
+  bExp: 3