configurations: yosemite5: add E1.S expansion board 2nd source config
Add configuration for the 2nd source of the E1.S expansion board.
The original E1.S expansion board configuration file is renamed and
split into two files for different E1.S board sources.
Change-Id: I9850d024b4704955e38acb3c4098f4b9f9e4ffaf
Signed-off-by: Kevin Tung <kevin.tung.openbmc@gmail.com>
diff --git a/configurations/meson.build b/configurations/meson.build
index 43cd1f6..d86fa43 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -225,7 +225,8 @@
'meta/yv5/yosemite5_1kw_paddle_board.json',
'meta/yv5/yosemite5_cxl_board_vr_mps_tchip_stm.json',
'meta/yv5/yosemite5_cxl_board_vr_raa_tchip_tic.json',
- 'meta/yv5/yosemite5_e1s_expansion_board.json',
+ 'meta/yv5/yosemite5_e1s_expansion_board_adc_qns_pmon_sgy.json',
+ 'meta/yv5/yosemite5_e1s_expansion_board_adc_tic_pmon_tic.json',
'meta/yv5/yosemite5_mb_vr_mps_pvdd18vr_mps_adc_tic_i3chub_rtt.json',
'meta/yv5/yosemite5_mb_vr_rtt_pvdd18vr_mps_adc_tic_i3chub_rtt.json',
'meta/yv5/yosemite5_mb_vr_sni_pvdd18vr_sni_adc_tic_i3chub_rtt.json',
diff --git a/configurations/meta/yv5/yosemite5_e1s_expansion_board.json b/configurations/meta/yv5/yosemite5_e1s_expansion_board_adc_qns_pmon_sgy.json
similarity index 91%
copy from configurations/meta/yv5/yosemite5_e1s_expansion_board.json
copy to configurations/meta/yv5/yosemite5_e1s_expansion_board_adc_qns_pmon_sgy.json
index 6930f8b..3a9f472 100644
--- a/configurations/meta/yv5/yosemite5_e1s_expansion_board.json
+++ b/configurations/meta/yv5/yosemite5_e1s_expansion_board_adc_qns_pmon_sgy.json
@@ -175,12 +175,58 @@
"Type": "EEPROM"
},
{
+ "Address": "0x6a",
+ "Bus": 20,
+ "Name": "E1S_EB_E1S0_TEMP_C",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5.0
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 1.4,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 70.0
+ }
+ ],
+ "Type": "NVME1000"
+ },
+ {
+ "Address": "0x6a",
+ "Bus": 21,
+ "Name": "E1S_EB_E1S1_TEMP_C",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5.0
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 1.4,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 70.0
+ }
+ ],
+ "Type": "NVME1000"
+ },
+ {
"Address": "0x40",
"Bus": 10,
"Labels": [
- "iout1",
- "vin",
- "pout1"
+ "in_voltage1",
+ "in_power2",
+ "in_current3"
],
"Name": "E1S_EB_PMON_E1S1",
"PowerState": "On",
@@ -234,18 +280,21 @@
"Value": 20.6
}
],
- "Type": "INA233",
- "iout1_Name": "E1S_EB_PMON_E1S1_P12V_CURR_A",
- "pout1_Name": "E1S_EB_PMON_E1S1_P12V_PWR_W",
- "vin_Name": "E1S_EB_PMON_E1S1_P12V_VOLT_V"
+ "Type": "RTQ6056",
+ "in_current3_Name": "E1S_EB_PMON_E1S1_P12V_CURR_A",
+ "in_current3_Scale": 2500,
+ "in_power2_Name": "E1S_EB_PMON_E1S1_P12V_PWR_W",
+ "in_power2_Scale": 100,
+ "in_voltage1_Name": "E1S_EB_PMON_E1S1_P12V_VOLT_V",
+ "in_voltage1_Scale": 800
},
{
"Address": "0x45",
"Bus": 10,
"Labels": [
- "iout1",
- "vin",
- "pout1"
+ "in_voltage1",
+ "in_power2",
+ "in_current3"
],
"Name": "E1S_EB_PMON_E1S0",
"PowerState": "On",
@@ -299,56 +348,13 @@
"Value": 20.6
}
],
- "Type": "INA233",
- "iout1_Name": "E1S_EB_PMON_E1S0_P12V_CURR_A",
- "pout1_Name": "E1S_EB_PMON_E1S0_P12V_PWR_W",
- "vin_Name": "E1S_EB_PMON_E1S0_P12V_VOLT_V"
- },
- {
- "Address": "0x6a",
- "Bus": 20,
- "Name": "E1S_EB_E1S0_TEMP_C",
- "PowerState": "On",
- "Thresholds": [
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5.0
- },
- {
- "Direction": "greater than",
- "Hysteresis": 1.4,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 70.0
- }
- ],
- "Type": "NVME1000"
- },
- {
- "Address": "0x6a",
- "Bus": 21,
- "Name": "E1S_EB_E1S1_TEMP_C",
- "PowerState": "On",
- "Thresholds": [
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5.0
- },
- {
- "Direction": "greater than",
- "Hysteresis": 1.4,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 70.0
- }
- ],
- "Type": "NVME1000"
+ "Type": "RTQ6056",
+ "in_current3_Name": "E1S_EB_PMON_E1S0_P12V_CURR_A",
+ "in_current3_Scale": 2500,
+ "in_power2_Name": "E1S_EB_PMON_E1S0_P12V_PWR_W",
+ "in_power2_Scale": 100,
+ "in_voltage1_Name": "E1S_EB_PMON_E1S0_P12V_VOLT_V",
+ "in_voltage1_Scale": 800
},
{
"Address": "0x49",
@@ -374,7 +380,11 @@
}
],
"Name": "Yosemite5 E1S Expansion Board",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'E1.S Expansion Board'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'E1.S Expansion Board', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'ADC-ONS PMON-SGY'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/yv5/yosemite5_e1s_expansion_board.json b/configurations/meta/yv5/yosemite5_e1s_expansion_board_adc_tic_pmon_tic.json
similarity index 97%
rename from configurations/meta/yv5/yosemite5_e1s_expansion_board.json
rename to configurations/meta/yv5/yosemite5_e1s_expansion_board_adc_tic_pmon_tic.json
index 6930f8b..4609dd6 100644
--- a/configurations/meta/yv5/yosemite5_e1s_expansion_board.json
+++ b/configurations/meta/yv5/yosemite5_e1s_expansion_board_adc_tic_pmon_tic.json
@@ -374,7 +374,11 @@
}
],
"Name": "Yosemite5 E1S Expansion Board",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'E1.S Expansion Board'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'E1.S Expansion Board', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'ADC-TIC PMON-TIC'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",