configurations: yosemite4: Adjust PWR ina233
Description
Adjust the settings of the PWR ina233 sensor and move the threshold
to the virtual sensor.
Motivation
When binding drivers using the entity-manager, the specific driver
properties originally set in the DTS need to be replaced with the
Scale property in the entity-manager to properly adjust the sensor
readings.
Test Plan:
Confirmed by EE that the hardware values are consistent with the
software values.
Change-Id: Id1a384a922ed17d0dc78602821017937223a21b0
Signed-off-by: Andy Hsu <andy.hsu.wiwynn@gmail.com>
diff --git a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_ti.json b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_ti.json
index 3d2cdcb..a35057b 100644
--- a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_ti.json
+++ b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_max_pwr_ti.json
@@ -109,7 +109,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_12V_STBY_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_12V_STBY_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_12V_STBY_VOLT_V"
},
{
@@ -125,30 +127,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -221,7 +199,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC0_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC0_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC0_12V_VOLT_V"
},
{
@@ -237,30 +217,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -333,7 +289,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC1_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC1_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC1_12V_VOLT_V"
},
{
@@ -349,30 +307,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -445,7 +379,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC2_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC2_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC2_12V_VOLT_V"
},
{
@@ -461,30 +397,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -557,7 +469,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC3_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC3_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC3_12V_VOLT_V"
},
{
diff --git a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_ti.json b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_ti.json
index 0e0e824..cfd37da 100644
--- a/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_ti.json
+++ b/configurations/meta/yv4/spiderboard/yosemite4_spiderboard_adc_ti_pwr_ti.json
@@ -649,7 +649,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_12V_STBY_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_12V_STBY_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_12V_STBY_VOLT_V"
},
{
@@ -665,30 +667,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -761,7 +739,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC0_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC0_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC0_12V_VOLT_V"
},
{
@@ -777,30 +757,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -873,7 +829,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC1_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC1_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC1_12V_VOLT_V"
},
{
@@ -889,30 +847,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -985,7 +919,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC2_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC2_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC2_12V_VOLT_V"
},
{
@@ -1001,30 +937,6 @@
{
"Direction": "greater than",
"Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 5.4
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 4.51
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 4.305
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
"Label": "pout1",
"Name": "upper non recoverable",
"Severity": 4,
@@ -1097,7 +1009,9 @@
],
"Type": "INA233",
"iout1_Name": "SPIDER_PMON_NIC3_12V_CURR_A",
+ "iout1_Scale": 2500,
"pout1_Name": "SPIDER_PMON_NIC3_12V_PWR_W",
+ "pout1_Scale": 2500000,
"vout1_Name": "SPIDER_PMON_NIC3_12V_VOLT_V"
},
{