configuration: harma: add fan table
1. Add fan table in the config files so that the fan table
could be created dynamically according to the FRU devices.
harma_mb.json, harma_mb_vr_infineon.json
2. Change fan naming from 0-based to 1-based.
harma_fanboard.json
Change-Id: Id3852b2d546cbf02d6f0515a343aab4f4f228a74
Signed-off-by: Daniel Hsu <Daniel-Hsu@quantatw.com>
diff --git a/configurations/meta/harma_fanboard.json b/configurations/meta/harma_fanboard.json
index 249dcbb..522ff93 100644
--- a/configurations/meta/harma_fanboard.json
+++ b/configurations/meta/harma_fanboard.json
@@ -5,15 +5,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN0_TACH_IL",
+ "Name": "FAN_BP1_FAN1_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
0
]
},
"Index": 0,
- "Name": "FAN_BP0_FAN0_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN1_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -21,15 +21,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN0_TACH_OL",
+ "Name": "FAN_BP1_FAN1_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
1
]
},
"Index": 1,
- "Name": "FAN_BP0_FAN0_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN1_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -37,15 +37,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN1_TACH_IL",
+ "Name": "FAN_BP1_FAN2_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
2
]
},
"Index": 2,
- "Name": "FAN_BP0_FAN1_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN2_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -53,15 +53,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN1_TACH_OL",
+ "Name": "FAN_BP1_FAN2_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
3
]
},
"Index": 3,
- "Name": "FAN_BP0_FAN1_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN2_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -69,15 +69,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN2_TACH_IL",
+ "Name": "FAN_BP1_FAN3_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
4
]
},
"Index": 4,
- "Name": "FAN_BP0_FAN2_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN3_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -85,15 +85,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN2_TACH_OL",
+ "Name": "FAN_BP1_FAN3_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
5
]
},
"Index": 5,
- "Name": "FAN_BP0_FAN2_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN3_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -101,15 +101,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN3_TACH_IL",
+ "Name": "FAN_BP1_FAN4_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
6
]
},
"Index": 6,
- "Name": "FAN_BP0_FAN3_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN4_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -117,15 +117,15 @@
"Address": "0x5e",
"Bus": 2,
"Connector": {
- "Name": "FAN_BP0_FAN3_TACH_OL",
+ "Name": "FAN_BP1_FAN4_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP0_FAN_PWM",
+ "PwmName": "FAN_BP1_FAN_PWM",
"Tachs": [
7
]
},
"Index": 7,
- "Name": "FAN_BP0_FAN3_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP1_FAN4_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -136,10 +136,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP0_FAN0",
+ "Name": "FAN_BP1_FAN1",
"Type": "INA238",
- "curr1_Name": "FAN_BP0_FAN0_CURR_A",
- "in1_Name": "FAN_BP0_FAN0_VOLT_V"
+ "curr1_Name": "FAN_BP1_FAN1_CURR_A",
+ "in1_Name": "FAN_BP1_FAN1_VOLT_V"
},
{
"Address": "0x41",
@@ -148,10 +148,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP0_FAN1",
+ "Name": "FAN_BP1_FAN2",
"Type": "INA238",
- "curr1_Name": "FAN_BP0_FAN1_CURR_A",
- "in1_Name": "FAN_BP0_FAN1_VOLT_V"
+ "curr1_Name": "FAN_BP1_FAN2_CURR_A",
+ "in1_Name": "FAN_BP1_FAN2_VOLT_V"
},
{
"Address": "0x44",
@@ -160,10 +160,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP0_FAN2",
+ "Name": "FAN_BP1_FAN3",
"Type": "INA238",
- "curr1_Name": "FAN_BP0_FAN2_CURR_A",
- "in1_Name": "FAN_BP0_FAN2_VOLT_V"
+ "curr1_Name": "FAN_BP1_FAN3_CURR_A",
+ "in1_Name": "FAN_BP1_FAN3_VOLT_V"
},
{
"Address": "0x45",
@@ -172,10 +172,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP0_FAN3",
+ "Name": "FAN_BP1_FAN4",
"Type": "INA238",
- "curr1_Name": "FAN_BP0_FAN3_CURR_A",
- "in1_Name": "FAN_BP0_FAN3_VOLT_V"
+ "curr1_Name": "FAN_BP1_FAN4_CURR_A",
+ "in1_Name": "FAN_BP1_FAN4_VOLT_V"
},
{
"Address": "0x4B",
@@ -194,15 +194,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN0_TACH_IL",
+ "Name": "FAN_BP2_FAN1_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
0
]
},
"Index": 0,
- "Name": "FAN_BP1_FAN0_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN1_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -210,15 +210,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN0_TACH_OL",
+ "Name": "FAN_BP2_FAN1_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
1
]
},
"Index": 1,
- "Name": "FAN_BP1_FAN0_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN1_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -226,15 +226,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN1_TACH_IL",
+ "Name": "FAN_BP2_FAN2_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
2
]
},
"Index": 2,
- "Name": "FAN_BP1_FAN1_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN2_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -242,15 +242,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN1_TACH_OL",
+ "Name": "FAN_BP2_FAN2_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
3
]
},
"Index": 3,
- "Name": "FAN_BP1_FAN1_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN2_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -258,15 +258,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN2_TACH_IL",
+ "Name": "FAN_BP2_FAN3_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
4
]
},
"Index": 4,
- "Name": "FAN_BP1_FAN2_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN3_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -274,15 +274,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN2_TACH_OL",
+ "Name": "FAN_BP2_FAN3_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
5
]
},
"Index": 5,
- "Name": "FAN_BP1_FAN2_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN3_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -290,15 +290,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN3_TACH_IL",
+ "Name": "FAN_BP2_FAN4_TACH_IL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
6
]
},
"Index": 6,
- "Name": "FAN_BP1_FAN3_TACH_IL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN4_TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -306,15 +306,15 @@
"Address": "0x5e",
"Bus": 0,
"Connector": {
- "Name": "FAN_BP1_FAN3_TACH_OL",
+ "Name": "FAN_BP2_FAN4_TACH_OL",
"Pwm": 2,
- "PwmName": "FAN_BP1_FAN_PWM",
+ "PwmName": "FAN_BP2_FAN_PWM",
"Tachs": [
7
]
},
"Index": 7,
- "Name": "FAN_BP1_FAN3_TACH_OL_SPEED_RPM",
+ "Name": "FAN_BP2_FAN4_TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Type": "I2CFan"
},
@@ -325,10 +325,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP1_FAN0",
+ "Name": "FAN_BP2_FAN1",
"Type": "INA238",
- "curr1_Name": "FAN_BP1_FAN0_CURR_A",
- "in1_Name": "FAN_BP1_FAN0_VOLT_V"
+ "curr1_Name": "FAN_BP2_FAN1_CURR_A",
+ "in1_Name": "FAN_BP2_FAN1_VOLT_V"
},
{
"Address": "0x41",
@@ -337,10 +337,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP1_FAN1",
+ "Name": "FAN_BP2_FAN2",
"Type": "INA238",
- "curr1_Name": "FAN_BP1_FAN1_CURR_A",
- "in1_Name": "FAN_BP1_FAN1_VOLT_V"
+ "curr1_Name": "FAN_BP2_FAN2_CURR_A",
+ "in1_Name": "FAN_BP2_FAN2_VOLT_V"
},
{
"Address": "0x44",
@@ -349,10 +349,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP1_FAN2",
+ "Name": "FAN_BP2_FAN3",
"Type": "INA238",
- "curr1_Name": "FAN_BP1_FAN2_CURR_A",
- "in1_Name": "FAN_BP1_FAN2_VOLT_V"
+ "curr1_Name": "FAN_BP2_FAN3_CURR_A",
+ "in1_Name": "FAN_BP2_FAN3_VOLT_V"
},
{
"Address": "0x45",
@@ -361,10 +361,10 @@
"in1",
"curr1"
],
- "Name": "FAN_BP1_FAN3",
+ "Name": "FAN_BP2_FAN4",
"Type": "INA238",
- "curr1_Name": "FAN_BP1_FAN3_CURR_A",
- "in1_Name": "FAN_BP1_FAN3_VOLT_V"
+ "curr1_Name": "FAN_BP2_FAN4_CURR_A",
+ "in1_Name": "FAN_BP2_FAN4_VOLT_V"
},
{
"Address": "0x4B",