configurations: catalina_pdb: remove thermal sensors from PDB P12V nodes
The secondary source P12V power monitor chip (ISL28022) does not support
temperature sensing. To maintain sensor consistency between the main and
2md source PDB boards, temperature sensors are removed from the PDB P12V
nodes listed below.
- PDB_P12V_NIC0
- PDB_P12V_NIC1
- PDB_P12V_SCM
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Change-Id: Ie2724e8c1a7c51a63827974ce541556ce8c3998a
diff --git a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json
index 9d10714..7b6c431 100644
--- a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json
+++ b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json
@@ -556,8 +556,7 @@
"Labels": [
"in1",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_NIC0",
"Thresholds": [
@@ -576,22 +575,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.56
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "INA238",
@@ -601,8 +584,7 @@
"in1_Name": "PDB_P12V_NIC0_VOLT_V",
"power1_Name": "PDB_P12V_NIC0_PWR_W",
"power1_Offset": 0.0022,
- "power1_Scale": 58031.56917363,
- "temp1_Name": "PDB_P12V_NIC0_TEMP_C"
+ "power1_Scale": 58031.56917363
},
{
"Address": "0x42",
@@ -610,8 +592,7 @@
"Labels": [
"in1",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_NIC1",
"Thresholds": [
@@ -630,22 +611,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.56
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "INA238",
@@ -655,8 +620,7 @@
"in1_Name": "PDB_P12V_NIC1_VOLT_V",
"power1_Name": "PDB_P12V_NIC1_PWR_W",
"power1_Offset": 0.0032,
- "power1_Scale": 54077.438892494,
- "temp1_Name": "PDB_P12V_NIC1_TEMP_C"
+ "power1_Scale": 54077.438892494
},
{
"Address": "0x44",
@@ -664,8 +628,7 @@
"Labels": [
"in1",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_SCM",
"Thresholds": [
@@ -684,22 +647,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "INA238",
@@ -709,8 +656,7 @@
"in1_Name": "PDB_P12V_SCM_VOLT_V",
"power1_Name": "PDB_P12V_SCM_PWR_W",
"power1_Offset": -0.0102,
- "power1_Scale": 50875.050875051,
- "temp1_Name": "PDB_P12V_SCM_TEMP_C"
+ "power1_Scale": 50875.050875051
},
{
"Address": "0x43",
diff --git a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
index ad3ea53..54d24ff 100644
--- a/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
+++ b/configurations/meta/catalina_pdb_hsc_ltc_fsc_max_vr_raa_gndsen_ina_p12vsen_ina_p12vfan_mps.json
@@ -556,8 +556,7 @@
"Labels": [
"in1",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_NIC0",
"Thresholds": [
@@ -576,22 +575,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.56
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "INA238",
@@ -601,8 +584,7 @@
"in1_Name": "PDB_P12V_NIC0_VOLT_V",
"power1_Name": "PDB_P12V_NIC0_PWR_W",
"power1_Offset": 0.0022,
- "power1_Scale": 58031.56917363,
- "temp1_Name": "PDB_P12V_NIC0_TEMP_C"
+ "power1_Scale": 58031.56917363
},
{
"Address": "0x42",
@@ -610,8 +592,7 @@
"Labels": [
"in1",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_NIC1",
"Thresholds": [
@@ -630,22 +611,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.56
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "INA238",
@@ -655,8 +620,7 @@
"in1_Name": "PDB_P12V_NIC1_VOLT_V",
"power1_Name": "PDB_P12V_NIC1_PWR_W",
"power1_Offset": 0.0032,
- "power1_Scale": 54077.438892494,
- "temp1_Name": "PDB_P12V_NIC1_TEMP_C"
+ "power1_Scale": 54077.438892494
},
{
"Address": "0x44",
@@ -664,8 +628,7 @@
"Labels": [
"in1",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_SCM",
"Thresholds": [
@@ -684,22 +647,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "INA238",
@@ -709,8 +656,7 @@
"in1_Name": "PDB_P12V_SCM_VOLT_V",
"power1_Name": "PDB_P12V_SCM_PWR_W",
"power1_Offset": -0.0102,
- "power1_Scale": 50875.050875051,
- "temp1_Name": "PDB_P12V_SCM_TEMP_C"
+ "power1_Scale": 50875.050875051
},
{
"Address": "0x43",
diff --git a/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json b/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
index 05ee102..d8221b0 100644
--- a/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
+++ b/configurations/meta/catalina_pdb_hsc_xdp_fsc_nct_vr_raa_gndsen_max_p12vsen_isl_p12vfan_rtt.json
@@ -556,8 +556,7 @@
"Labels": [
"in0",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_NIC0",
"Thresholds": [
@@ -576,22 +575,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.56
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "ISL28022",
@@ -601,8 +584,7 @@
"in0_Name": "PDB_P12V_NIC0_VOLT_V",
"power1_Name": "PDB_P12V_NIC0_PWR_W",
"power1_Offset": -0.5614,
- "power1_Scale": 58958.787807323,
- "temp1_Name": "PDB_P12V_NIC0_TEMP_C"
+ "power1_Scale": 58958.787807323
},
{
"Address": "0x42",
@@ -610,8 +592,7 @@
"Labels": [
"in0",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_NIC1",
"Thresholds": [
@@ -630,22 +611,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.56
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "ISL28022",
@@ -655,8 +620,7 @@
"in0_Name": "PDB_P12V_NIC1_VOLT_V",
"power1_Name": "PDB_P12V_NIC1_PWR_W",
"power1_Offset": -0.4173,
- "power1_Scale": 54878.718033147,
- "temp1_Name": "PDB_P12V_NIC1_TEMP_C"
+ "power1_Scale": 54878.718033147
},
{
"Address": "0x44",
@@ -664,8 +628,7 @@
"Labels": [
"in0",
"curr1",
- "power1",
- "temp1"
+ "power1"
],
"Name": "PDB_P12V_SCM",
"Thresholds": [
@@ -684,22 +647,6 @@
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.2,
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 110
- },
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Label": "temp1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5
}
],
"Type": "ISL28022",
@@ -709,8 +656,7 @@
"in0_Name": "PDB_P12V_SCM_VOLT_V",
"power1_Name": "PDB_P12V_SCM_PWR_W",
"power1_Offset": 1.9474,
- "power1_Scale": 52358.762238861,
- "temp1_Name": "PDB_P12V_SCM_TEMP_C"
+ "power1_Scale": 52358.762238861
},
{
"Address": "0x43",