configurations: minerva_fanboard: support 2nd fan board
Add configuration of minerva 2nd source fan board.
Change-Id: I903338081b0d75fb83b81c78683125ee1683e5cd
Signed-off-by: Yang Chen <yang.chen@quantatw.com>
diff --git a/configurations/meson.build b/configurations/meson.build
index 0a8904c..62b0975 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -84,7 +84,8 @@
'meta/minerva_cmm_bsm.json',
'meta/minerva_cmm_hsc_infineon.json',
'meta/minerva_cmm_scm.json',
- 'meta/minerva_fanboard.json',
+ 'meta/minerva_fanboard_adc_silergy.json',
+ 'meta/minerva_fanboard_adc_ti.json',
'meta/minerva_pdb.json',
'meta/minerva_pdb_hsc_xdp.json',
'meta/minerva_pttv.json',
diff --git a/configurations/meta/minerva_fanboard.json b/configurations/meta/minerva_fanboard_adc_silergy.json
similarity index 93%
copy from configurations/meta/minerva_fanboard.json
copy to configurations/meta/minerva_fanboard_adc_silergy.json
index eb131ac..8f849a4 100644
--- a/configurations/meta/minerva_fanboard.json
+++ b/configurations/meta/minerva_fanboard_adc_silergy.json
@@ -293,7 +293,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x41",
@@ -331,7 +332,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x44",
@@ -369,7 +371,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x45",
@@ -407,7 +410,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x49",
@@ -444,13 +448,21 @@
],
"Name": "Minerva Fan Board $bus - 15",
"Probe": [
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 16})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_INFO_AM4': 'pwr-silergy'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 17})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_INFO_AM4': 'pwr-silergy'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 18})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_INFO_AM4': 'pwr-silergy'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 19})"
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_INFO_AM4': 'pwr-silergy'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -759,7 +771,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x41",
@@ -797,7 +810,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x44",
@@ -835,7 +849,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x45",
@@ -873,7 +888,8 @@
],
"Type": "INA238",
"curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
- "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V",
+ "in1_Scale": 833.3333
},
{
"Address": "0x49",
@@ -910,9 +926,13 @@
],
"Name": "Minerva Fan Board $bus - 15",
"Probe": [
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 20})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_INFO_AM4': 'pwr-silergy'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 21})"
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_INFO_AM4': 'pwr-silergy'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_PART_NUMBER': '3XF0MFB0030'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_PART_NUMBER': '3XF0MFB0030'})"
],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
diff --git a/configurations/meta/minerva_fanboard.json b/configurations/meta/minerva_fanboard_adc_ti.json
similarity index 94%
rename from configurations/meta/minerva_fanboard.json
rename to configurations/meta/minerva_fanboard_adc_ti.json
index eb131ac..9ada19d 100644
--- a/configurations/meta/minerva_fanboard.json
+++ b/configurations/meta/minerva_fanboard_adc_ti.json
@@ -444,13 +444,21 @@
],
"Name": "Minerva Fan Board $bus - 15",
"Probe": [
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 16})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_INFO_AM4': 'pwr-ti'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 17})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_INFO_AM4': 'pwr-ti'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 18})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_INFO_AM4': 'pwr-ti'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 19})"
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_INFO_AM4': 'pwr-ti'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 16, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 17, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 18, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 19, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -910,9 +918,13 @@
],
"Name": "Minerva Fan Board $bus - 15",
"Probe": [
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 20})",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_INFO_AM4': 'pwr-ti'})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 21})"
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_INFO_AM4': 'pwr-ti'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 20, 'BOARD_PART_NUMBER': '3XF0MFB0010'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'PRODUCT_MANUFACTURER': 'Quanta', 'BUS': 21, 'BOARD_PART_NUMBER': '3XF0MFB0010'})"
],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {