configurations: yosemite4: Revise the descriptor part of sensor name
Revise the descriptor part of sensor name to comply naming rule.
Change-Id: I8715e49ef19270089728936a16667163ed522f99
Signed-off-by: Lora Lin <lora.lin.wiwynn@gmail.com>
diff --git a/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json b/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json
index cc3a73b..32f1a4d 100644
--- a/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json
+++ b/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json
@@ -8,7 +8,7 @@
"iout1",
"pout1"
],
- "Name": "SPIDER_INA233_12V_STBY",
+ "Name": "SPIDER_PMON_12V_STBY",
"Thresholds": [
{
"Direction": "greater than",
@@ -96,9 +96,9 @@
}
],
"Type": "INA233",
- "iout1_Name": "SPIDER_INA233_12V_STBY_CURR_A",
- "pout1_Name": "SPIDER_INA233_12V_STBY_PWR_W",
- "vout1_Name": "SPIDER_INA233_12V_STBY_VOLT_V"
+ "iout1_Name": "SPIDER_PMON_12V_STBY_CURR_A",
+ "pout1_Name": "SPIDER_PMON_12V_STBY_PWR_W",
+ "vout1_Name": "SPIDER_PMON_12V_STBY_VOLT_V"
},
{
"Address": "0x41",
@@ -108,7 +108,7 @@
"iout1",
"pout1"
],
- "Name": "SPIDER_INA233_12V_NIC0",
+ "Name": "SPIDER_PMON_NIC0_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -196,9 +196,9 @@
}
],
"Type": "INA233",
- "iout1_Name": "SPIDER_INA233_12V_NIC0_CURR_A",
- "pout1_Name": "SPIDER_INA233_12V_NIC0_PWR_W",
- "vout1_Name": "SPIDER_INA233_12V_NIC0_VOLT_V"
+ "iout1_Name": "SPIDER_PMON_NIC0_12V_CURR_A",
+ "pout1_Name": "SPIDER_PMON_NIC0_12V_PWR_W",
+ "vout1_Name": "SPIDER_PMON_NIC0_12V_VOLT_V"
},
{
"Address": "0x42",
@@ -208,7 +208,7 @@
"iout1",
"pout1"
],
- "Name": "SPIDER_INA233_12V_NIC1",
+ "Name": "SPIDER_PMON_NIC1_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -296,9 +296,9 @@
}
],
"Type": "INA233",
- "iout1_Name": "SPIDER_INA233_12V_NIC1_CURR_A",
- "pout1_Name": "SPIDER_INA233_12V_NIC1_PWR_W",
- "vout1_Name": "SPIDER_INA233_12V_NIC1_VOLT_V"
+ "iout1_Name": "SPIDER_PMON_NIC1_12V_CURR_A",
+ "pout1_Name": "SPIDER_PMON_NIC1_12V_PWR_W",
+ "vout1_Name": "SPIDER_PMON_NIC1_12V_VOLT_V"
},
{
"Address": "0x43",
@@ -308,7 +308,7 @@
"iout1",
"pout1"
],
- "Name": "SPIDER_INA233_12V_NIC2",
+ "Name": "SPIDER_PMON_NIC2_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -396,9 +396,9 @@
}
],
"Type": "INA233",
- "iout1_Name": "SPIDER_INA233_12V_NIC2_CURR_A",
- "pout1_Name": "SPIDER_INA233_12V_NIC2_PWR_W",
- "vout1_Name": "SPIDER_INA233_12V_NIC2_VOLT_V"
+ "iout1_Name": "SPIDER_PMON_NIC2_12V_CURR_A",
+ "pout1_Name": "SPIDER_PMON_NIC2_12V_PWR_W",
+ "vout1_Name": "SPIDER_PMON_NIC2_12V_VOLT_V"
},
{
"Address": "0x44",
@@ -408,7 +408,7 @@
"iout1",
"pout1"
],
- "Name": "SPIDER_INA233_12V_NIC3",
+ "Name": "SPIDER_PMON_NIC3_12V",
"Thresholds": [
{
"Direction": "greater than",
@@ -496,9 +496,9 @@
}
],
"Type": "INA233",
- "iout1_Name": "SPIDER_INA233_12V_NIC3_CURR_A",
- "pout1_Name": "SPIDER_INA233_12V_NIC3_PWR_W",
- "vout1_Name": "SPIDER_INA233_12V_NIC3_VOLT_V"
+ "iout1_Name": "SPIDER_PMON_NIC3_12V_CURR_A",
+ "pout1_Name": "SPIDER_PMON_NIC3_12V_PWR_W",
+ "vout1_Name": "SPIDER_PMON_NIC3_12V_VOLT_V"
},
{
"Address": "0x35",
@@ -681,13 +681,13 @@
}
],
"Type": "MAX11617",
- "in_voltage0_Name": "SPIDER_ADC_12V_NIC0_VOLT_V",
+ "in_voltage0_Name": "SPIDER_ADC_NIC0_12V_VOLT_V",
"in_voltage0_Scale": 224.7192,
- "in_voltage1_Name": "SPIDER_ADC_3V3_NIC0_VOLT_V",
+ "in_voltage1_Name": "SPIDER_ADC_NIC0_3V3_VOLT_V",
"in_voltage1_Scale": 821.3552,
- "in_voltage2_Name": "SPIDER_ADC_12V_NIC1_VOLT_V",
+ "in_voltage2_Name": "SPIDER_ADC_NIC1_12V_VOLT_V",
"in_voltage2_Scale": 224.7192,
- "in_voltage3_Name": "SPIDER_ADC_3V3_NIC1_VOLT_V",
+ "in_voltage3_Name": "SPIDER_ADC_NIC1_3V3_VOLT_V",
"in_voltage3_Scale": 821.3552
},
{
@@ -957,15 +957,15 @@
}
],
"Type": "MAX11617",
- "in_voltage0_Name": "SPIDER_ADC_12V_NIC2_VOLT_V",
+ "in_voltage0_Name": "SPIDER_ADC_NIC2_12V_VOLT_V",
"in_voltage0_Scale": 224.7192,
- "in_voltage1_Name": "SPIDER_ADC_3V3_NIC2_VOLT_V",
+ "in_voltage1_Name": "SPIDER_ADC_NIC2_3V3_VOLT_V",
"in_voltage1_Scale": 821.3552,
- "in_voltage2_Name": "SPIDER_ADC_12V_NIC3_VOLT_V",
+ "in_voltage2_Name": "SPIDER_ADC_NIC3_12V_VOLT_V",
"in_voltage2_Scale": 224.7192,
- "in_voltage3_Name": "SPIDER_ADC_3V3_NIC3_VOLT_V",
+ "in_voltage3_Name": "SPIDER_ADC_NIC3_3V3_VOLT_V",
"in_voltage3_Scale": 821.3552,
- "in_voltage8_Name": "SPIDER_ADC_12V_MEDUSA_AUX_VOLT_V",
+ "in_voltage8_Name": "SPIDER_ADC_MEDUSA_12V_AUX_VOLT_V",
"in_voltage8_Scale": 224.7192,
"in_voltage9_Name": "SPIDER_ADC_3V3_AUX_VOLT_V",
"in_voltage9_Scale": 821.3552
@@ -973,8 +973,8 @@
{
"Class": "temp",
"Inputs": [
- "SPIDER_0_TEMP_C",
- "SPIDER_1_TEMP_C"
+ "SPIDER0_TEMP_C",
+ "SPIDER1_TEMP_C"
],
"Name": "Stepwise_SPIDER_TEMP",
"NegativeHysteresis": 0,
@@ -993,7 +993,7 @@
{
"Address": "0x4e",
"Bus": 14,
- "Name": "SPIDER_0_TEMP_C",
+ "Name": "SPIDER0_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1013,7 +1013,7 @@
{
"Address": "0x4f",
"Bus": 14,
- "Name": "SPIDER_1_TEMP_C",
+ "Name": "SPIDER1_TEMP_C",
"Thresholds": [
{
"Direction": "greater than",