meta-quanta: gbs: adjust VR/Hotswap sensors threshold and M value

1. adjust VR/Hotswap sensors threshold:
   hotswap_iout current
   vddcr_cpu_out voltage
   vddcr_cpu_in current
   vddcr_soc_out voltage
   vddio_abcd/efgh_out voltage

2. adjust M value in sensors.yaml:
   hotswap_iout current
   vddcr_cpu_in current

(From meta-quanta rev: 2297095f43ad8bdff5bdfc2031acfa878ae4250b)

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: I46310ec035c8294ee7147bc2d6f4b8e3b14e2828
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

6 files changed, 20 insertions, 20 deletions

diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
index 929a566a2..746956e55 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
+++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
@@ -295,7 +295,7 @@
   sensorType: 0x03
   path: /xyz/openbmc_project/sensors/current/vddcr_cpu_in
   sensorReadingType: 0x01
-  multiplierM: 86
+  multiplierM: 110
   rExp: -3
   unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes
   mutability: Mutability::Read
@@ -513,7 +513,7 @@
   entityID: 0x0E
   entityInstance: 0x02
   path: /xyz/openbmc_project/sensors/current/hotswap_iout
-  multiplierM: 216
+  multiplierM: 333
   rExp: -3
 
 0x70:
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf
index 41a53c052..e0378a04c 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf
@@ -15,12 +15,12 @@ MINVALUE_in2 = "0"
 MAXVALUE_in2 = "66"
 
 LABEL_curr1= "hotswap_iout"
-CRITHI_curr1= "40000"
+CRITHI_curr1= "60000"
 CRITLO_curr1= "0"
-WARNHI_curr1= "40000"
+WARNHI_curr1= "60000"
 WARNLO_curr1= "0"
 MINVALUE_curr1 = "0"
-MAXVALUE_curr1 = "55"
+MAXVALUE_curr1 = "85"
 # READ_Iout is direct value*0.98
 GAIN_curr1 = "0.98"
 
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf
index 79397b06c..02500d86b 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf
@@ -10,21 +10,21 @@ GAIN_in1 = "10.0"
 PWRONMON_in1 = "ON"
 
 LABEL_in2 = "vddcr_cpu_out"
-CRITHI_in2 = "1300"
-CRITLO_in2 = "400"
-WARNHI_in2 = "1300"
-WARNLO_in2 = "400"
+CRITHI_in2 = "1450"
+CRITLO_in2 = "350"
+WARNHI_in2 = "1450"
+WARNLO_in2 = "350"
 MINVALUE_in2 = "0"
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"
 
 LABEL_curr1 = "vddcr_cpu_in"
-CRITHI_curr1 = "21250"
+CRITHI_curr1 = "27000"
 CRITLO_curr1 = "-4000"
-WARNHI_curr1 = "21250"
+WARNHI_curr1 = "27000"
 WARNLO_curr1 = "-4000"
 MINVALUE_curr1 = "0"
-MAXVALUE_curr1 = "22"
+MAXVALUE_curr1 = "28"
 PWRONMON_curr1 = "ON"
 
 LABEL_curr2 = "vddcr_cpu_out"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf
index f21c32a24..988eb73da 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf
@@ -10,10 +10,10 @@ GAIN_in1 = "10.0"
 PWRONMON_in1 = "ON"
 
 LABEL_in2 = "vddcr_soc_out"
-CRITHI_in2 = "1300"
-CRITLO_in2 = "500"
-WARNHI_in2 = "1300"
-WARNLO_in2 = "500"
+CRITHI_in2 = "1200"
+CRITLO_in2 = "620"
+WARNHI_in2 = "1200"
+WARNLO_in2 = "620"
 MINVALUE_in2 = "0"
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
index 9cd9a129b..c3f12ec6d 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
@@ -11,9 +11,9 @@ PWRONMON_in1 = "ON"
 
 LABEL_in2 = "vddio_efgh_out"
 CRITHI_in2 = "1320"
-CRITLO_in2 = "800"
+CRITLO_in2 = "1100"
 WARNHI_in2 = "1320"
-WARNLO_in2 = "800"
+WARNLO_in2 = "1100"
 MINVALUE_in2 = "0"
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
index 762af173b..6817a7948 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
@@ -11,9 +11,9 @@ PWRONMON_in1 = "ON"
 
 LABEL_in2 = "vddio_abcd_out"
 CRITHI_in2 = "1320"
-CRITLO_in2 = "800"
+CRITLO_in2 = "1100"
 WARNHI_in2 = "1320"
-WARNLO_in2 = "800"
+WARNLO_in2 = "1100"
 MINVALUE_in2 = "0"
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"