configurations: yosemite4: refactor fan board probe combination
1.This two files are exact same except 'Probe' section,
merging into one file.
yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json
yosemite4_fanboard_fsc_max_adc_ti_led_ons_efuse_mps.json
2. add more combination which can use same config file
3.led nxp and led onsemi use same led driver now,
it no need to separate it in userspace,
we will write BOARD_PRODUCT_NAME without led info in future,
also probe this type board.
```
root@bmc:~# busctl tree xyz.openbmc_project.FruDevice
└─ /xyz
└─ /xyz/openbmc_project
└─ /xyz/openbmc_project/FruDevice
├─ /xyz/openbmc_project/FruDevice/Fan_Board_FSC_MAX_ADC_TI_EFUSE_MAX
├─ /xyz/openbmc_project/FruDevice/Fan_Board_FSC_MAX_ADC_TI_LED_ONS_EFUSE_MAX
......
root@bmc:~# busctl tree xyz.openbmc_project.EntityManager
└─ /xyz
└─ /xyz/openbmc_project
├─ /xyz/openbmc_project/EntityManager
└─ /xyz/openbmc_project/inventory
└─ /xyz/openbmc_project/inventory/system
├─ /xyz/openbmc_project/inventory/system/board
......
│ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_ADC
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN0_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN0_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN1_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN1_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN4_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN4_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN5_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN5_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN8_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN8_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN9_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/FANBOARD0_FAN9_TACH_OUTLET_SPEED_RPM
│ │ └─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_0/Fan_Board_0_FRU
│ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_ADC
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN10_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN10_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN11_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN11_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN2_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN2_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN3_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN3_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN6_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN6_TACH_OUTLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN7_TACH_INLET_SPEED_RPM
│ │ ├─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/FANBOARD1_FAN7_TACH_OUTLET_SPEED_RPM
│ │ └─ /xyz/openbmc_project/inventory/system/board/Yosemite_4_Fan_Board_1/Fan_Board_1_FRU
```
Change-Id: I14a7ee20e6519eb529f46c4a42dc3002fed63789
Signed-off-by: Allen Wang <Allen_Wang@quantatw.com>
diff --git a/configurations/meson.build b/configurations/meson.build
index b574cc5..385f0a5 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -108,11 +108,10 @@
'meta/yosemite4.json',
'meta/yosemite4_chassis.json',
'meta/yosemite4_cpu.json',
- 'meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json',
- 'meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json',
- 'meta/yosemite4_fanboard_fsc_max_adc_ti_led_ons_efuse_mps.json',
- 'meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json',
- 'meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json',
+ 'meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_max.json',
+ 'meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_mps.json',
+ 'meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_max.json',
+ 'meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_mps.json',
'meta/yosemite4_floatingfalls.json',
'meta/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json',
'meta/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json',
diff --git a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json b/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json
deleted file mode 100644
index 00b3647..0000000
--- a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json
+++ /dev/null
@@ -1,778 +0,0 @@
-{
- "Exposes": [
- {
- "Address": "0x1f",
- "Bus": "$bus",
- "Labels": [
- "in0",
- "in1",
- "in2",
- "in3",
- "in4",
- "in5",
- "in6",
- "in7"
- ],
- "Name": "FANBOARD$bus % 30 ADC",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in0",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in0",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in0",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in2",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in2",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in2",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in3",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in3",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in3",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in4",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in4",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in4",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in5",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in5",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in5",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 60
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 53.28
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 52.8
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 43.2
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 42.72
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "lower non recoverable",
- "Severity": 4,
- "Value": 40
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 3.83
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 3.432
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 3.399
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 3.201
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 3.168
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "lower non recoverable",
- "Severity": 4,
- "Value": 2.64
- }
- ],
- "Type": "ADC128D818",
- "in0_Max": 2.5,
- "in0_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 8 48V_CURR_A",
- "in0_Scale": 300,
- "in1_Max": 2.5,
- "in1_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 4 48V_CURR_A",
- "in1_Scale": 300,
- "in2_Max": 2.5,
- "in2_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 0 48V_CURR_A",
- "in2_Scale": 300,
- "in3_Max": 2.5,
- "in3_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 9 48V_CURR_A",
- "in3_Scale": 300,
- "in4_Max": 2.5,
- "in4_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 5 48V_CURR_A",
- "in4_Scale": 300,
- "in5_Max": 2.5,
- "in5_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 1 48V_CURR_A",
- "in5_Scale": 300,
- "in6_Name": "FANBOARD$bus % 30 ADC_48V_AUX_VOLT_V",
- "in6_Scale": 31.9458,
- "in7_Name": "FANBOARD$bus % 30 ADC_3V3_STBY_VOLT_V",
- "in7_Scale": 500
- },
- {
- "Address": "$address",
- "Bus": "$bus",
- "Name": "Fan Board $bus % 30 FRU",
- "Type": "EEPROM"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT",
- "Tachs": [
- 3
- ]
- },
- "Index": 3,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT",
- "Tachs": [
- 10
- ]
- },
- "Index": 10,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT",
- "Tachs": [
- 3
- ]
- },
- "Index": 3,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT",
- "Tachs": [
- 10
- ]
- },
- "Index": 10,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT",
- "Tachs": [
- 2
- ]
- },
- "Index": 2,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT",
- "Tachs": [
- 9
- ]
- },
- "Index": 9,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT",
- "Tachs": [
- 2
- ]
- },
- "Index": 2,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT",
- "Tachs": [
- 9
- ]
- },
- "Index": 9,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT",
- "Tachs": [
- 0
- ]
- },
- "Index": 0,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT",
- "Tachs": [
- 1
- ]
- },
- "Index": 1,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT",
- "Tachs": [
- 0
- ]
- },
- "Index": 0,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT",
- "Tachs": [
- 1
- ]
- },
- "Index": 1,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- }
- ],
- "Name": "Yosemite 4 Fan Board $bus % 30",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-NXP EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
- "Type": "Board",
- "xyz.openbmc_project.Inventory.Decorator.Asset": {
- "BuildDate": "$BOARD_MANUFACTURE_DATE",
- "Manufacturer": "$BOARD_MANUFACTURER",
- "Model": "$BOARD_PRODUCT_NAME",
- "PartNumber": "$BOARD_PART_NUMBER",
- "SerialNumber": "$BOARD_SERIAL_NUMBER",
- "SparePartNumber": "$BOARD_INFO_AM1"
- },
- "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
- "AssetTag": "$PRODUCT_ASSET_TAG"
- },
- "xyz.openbmc_project.Inventory.Decorator.Revision": {
- "Version": "$PRODUCT_VERSION"
- },
- "xyz.openbmc_project.Inventory.Decorator.Slot": {
- "SlotNumber": "$bus % 30"
- }
-}
diff --git a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json b/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_max.json
similarity index 97%
copy from configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json
copy to configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_max.json
index 3983b11..464d09a 100644
--- a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json
+++ b/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_max.json
@@ -756,7 +756,13 @@
}
],
"Name": "Yosemite 4 Fan Board $bus % 30",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-NXP EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-NXP EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-ONS EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json b/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_mps.json
similarity index 97%
rename from configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json
rename to configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_mps.json
index 3983b11..deca8b5 100644
--- a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json
+++ b/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_mps.json
@@ -259,22 +259,22 @@
"Type": "ADC128D818",
"in0_Max": 2.5,
"in0_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 8 48V_CURR_A",
- "in0_Scale": 240,
+ "in0_Scale": 300,
"in1_Max": 2.5,
"in1_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 4 48V_CURR_A",
- "in1_Scale": 240,
+ "in1_Scale": 300,
"in2_Max": 2.5,
"in2_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 0 48V_CURR_A",
- "in2_Scale": 240,
+ "in2_Scale": 300,
"in3_Max": 2.5,
"in3_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 9 48V_CURR_A",
- "in3_Scale": 240,
+ "in3_Scale": 300,
"in4_Max": 2.5,
"in4_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 5 48V_CURR_A",
- "in4_Scale": 240,
+ "in4_Scale": 300,
"in5_Max": 2.5,
"in5_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 1 48V_CURR_A",
- "in5_Scale": 240,
+ "in5_Scale": 300,
"in6_Name": "FANBOARD$bus % 30 ADC_48V_AUX_VOLT_V",
"in6_Scale": 31.9458,
"in7_Name": "FANBOARD$bus % 30 ADC_3V3_STBY_VOLT_V",
@@ -756,7 +756,13 @@
}
],
"Name": "Yosemite 4 Fan Board $bus % 30",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-NXP EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-NXP EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-ONS EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_ons_efuse_mps.json b/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_ons_efuse_mps.json
deleted file mode 100644
index 41e1a52..0000000
--- a/configurations/meta/yosemite4_fanboard_fsc_max_adc_ti_led_ons_efuse_mps.json
+++ /dev/null
@@ -1,778 +0,0 @@
-{
- "Exposes": [
- {
- "Address": "0x1f",
- "Bus": "$bus",
- "Labels": [
- "in0",
- "in1",
- "in2",
- "in3",
- "in4",
- "in5",
- "in6",
- "in7"
- ],
- "Name": "FANBOARD$bus % 30 ADC",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in0",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in0",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in0",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in1",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in2",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in2",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in2",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in3",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in3",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in3",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in4",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in4",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in4",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in5",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 6
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in5",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.156
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in5",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.058
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 60
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 53.28
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 52.8
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 43.2
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 42.72
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in6",
- "Name": "lower non recoverable",
- "Severity": 4,
- "Value": 40
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "upper non recoverable",
- "Severity": 4,
- "Value": 3.83
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 3.432
- },
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 3.399
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 3.201
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 3.168
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Label": "in7",
- "Name": "lower non recoverable",
- "Severity": 4,
- "Value": 2.64
- }
- ],
- "Type": "ADC128D818",
- "in0_Max": 2.5,
- "in0_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 8 48V_CURR_A",
- "in0_Scale": 300,
- "in1_Max": 2.5,
- "in1_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 4 48V_CURR_A",
- "in1_Scale": 300,
- "in2_Max": 2.5,
- "in2_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 0 48V_CURR_A",
- "in2_Scale": 300,
- "in3_Max": 2.5,
- "in3_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 9 48V_CURR_A",
- "in3_Scale": 300,
- "in4_Max": 2.5,
- "in4_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 5 48V_CURR_A",
- "in4_Scale": 300,
- "in5_Max": 2.5,
- "in5_Name": "FANBOARD$bus % 30 ADC_FAN$bus % 30 * 2 + 1 48V_CURR_A",
- "in5_Scale": 300,
- "in6_Name": "FANBOARD$bus % 30 ADC_48V_AUX_VOLT_V",
- "in6_Scale": 31.9458,
- "in7_Name": "FANBOARD$bus % 30 ADC_3V3_STBY_VOLT_V",
- "in7_Scale": 500
- },
- {
- "Address": "$address",
- "Bus": "$bus",
- "Name": "Fan Board $bus % 30 FRU",
- "Type": "EEPROM"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT",
- "Tachs": [
- 3
- ]
- },
- "Index": 3,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_PCT",
- "Tachs": [
- 10
- ]
- },
- "Index": 10,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT",
- "Tachs": [
- 3
- ]
- },
- "Index": 3,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM",
- "Pwm": 2,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_PCT",
- "Tachs": [
- 10
- ]
- },
- "Index": 10,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT",
- "Tachs": [
- 2
- ]
- },
- "Index": 2,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_PCT",
- "Tachs": [
- 9
- ]
- },
- "Index": 9,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT",
- "Tachs": [
- 2
- ]
- },
- "Index": 2,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM",
- "Pwm": 1,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_PCT",
- "Tachs": [
- 9
- ]
- },
- "Index": 9,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT",
- "Tachs": [
- 0
- ]
- },
- "Index": 0,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x20",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_PCT",
- "Tachs": [
- 1
- ]
- },
- "Index": 1,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT",
- "Tachs": [
- 0
- ]
- },
- "Index": 0,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_INLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 18960
- },
- {
- "Direction": "greater than",
- "Hysteresis": 691,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 13825
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x2f",
- "Bus": "$bus",
- "Connector": {
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM",
- "Pwm": 0,
- "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_PCT",
- "Tachs": [
- 1
- ]
- },
- "Index": 1,
- "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OUTLET_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Hysteresis": 0,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 19200
- },
- {
- "Direction": "greater than",
- "Hysteresis": 620,
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 12400
- },
- {
- "Direction": "less than",
- "Hysteresis": 0,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 800
- }
- ],
- "Type": "I2CFan"
- }
- ],
- "Name": "Yosemite 4 Fan Board $bus % 30",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-MAX ADC-TI LED-ONS EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
- "Type": "Board",
- "xyz.openbmc_project.Inventory.Decorator.Asset": {
- "BuildDate": "$BOARD_MANUFACTURE_DATE",
- "Manufacturer": "$BOARD_MANUFACTURER",
- "Model": "$BOARD_PRODUCT_NAME",
- "PartNumber": "$BOARD_PART_NUMBER",
- "SerialNumber": "$BOARD_SERIAL_NUMBER",
- "SparePartNumber": "$BOARD_INFO_AM1"
- },
- "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
- "AssetTag": "$PRODUCT_ASSET_TAG"
- },
- "xyz.openbmc_project.Inventory.Decorator.Revision": {
- "Version": "$PRODUCT_VERSION"
- },
- "xyz.openbmc_project.Inventory.Decorator.Slot": {
- "SlotNumber": "$bus % 30"
- }
-}
diff --git a/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json b/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_max.json
similarity index 97%
rename from configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json
rename to configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_max.json
index b197a6e..f039f23 100644
--- a/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json
+++ b/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_max.json
@@ -756,7 +756,13 @@
}
],
"Name": "Yosemite 4 Fan Board $bus % 30",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX LED-ONS EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX LED-ONS EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX LED-NXP EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX EFUSE-MAX', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json b/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_mps.json
similarity index 97%
rename from configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json
rename to configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_mps.json
index 47aff18..e90a04f 100644
--- a/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json
+++ b/configurations/meta/yosemite4_fanboard_fsc_nct_adc_max_led_nxp_ons_efuse_mps.json
@@ -756,7 +756,13 @@
}
],
"Name": "Yosemite 4 Fan Board $bus % 30",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX LED-ONS EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX LED-ONS EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX LED-NXP EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Fan Board FSC-NCT ADC-MAX EFUSE-MPS', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",