configurations: yosemite5: add RAA and SNI source mb configurations

Add initial configuration files for the RAA and SNI sources on the
Yosemite5 motherboard.

This change also renames the original Yosemite5 motherboard
configuration file for consistency, ensuring that the EM loads
the correct configuration based on the FRU programmed on the
motherboard.

Change-Id: Ia3a75f5b6c988a1d0bac99c97e0b3462bb260f35
Signed-off-by: Kevin Tung <kevin.tung.openbmc@gmail.com>
diff --git a/configurations/meson.build b/configurations/meson.build
index 6b37aab..f3e591c 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -213,7 +213,9 @@
     'meta/yv5/yosemite5_1kw_paddle_board.json',
     'meta/yv5/yosemite5_cxl_board.json',
     'meta/yv5/yosemite5_e1s_expansion_board.json',
-    'meta/yv5/yosemite5_mb.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',
     'meta/yv5/yosemite5_medusa_board.json',
     'meta/yv5/yosemite5_scm.json',
     'micron/micron_7450.json',
diff --git a/configurations/meta/yv5/yosemite5_mb.json b/configurations/meta/yv5/yosemite5_mb_vr_mps_pvdd18vr_mps_adc_tic_i3chub_rtt.json
similarity index 97%
copy from configurations/meta/yv5/yosemite5_mb.json
copy to configurations/meta/yv5/yosemite5_mb_vr_mps_pvdd18vr_mps_adc_tic_i3chub_rtt.json
index bd04593..0f8d613 100644
--- a/configurations/meta/yv5/yosemite5_mb.json
+++ b/configurations/meta/yv5/yosemite5_mb_vr_mps_pvdd18vr_mps_adc_tic_i3chub_rtt.json
@@ -4,29 +4,12 @@
             "Address": "0x4b",
             "Bus": 11,
             "Labels": [
-                "in0",
                 "in1"
             ],
             "Name": "MB_ADC0",
             "Thresholds": [
                 {
                     "Direction": "less than",
-                    "Hysteresis": 0.0228,
-                    "Label": "in0",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 1.14
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.0252,
-                    "Label": "in0",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.26
-                },
-                {
-                    "Direction": "less than",
                     "Hysteresis": 0.019,
                     "Label": "in1",
                     "Name": "lower critical",
@@ -43,7 +26,6 @@
                 }
             ],
             "Type": "ADS7830",
-            "in0_Name": "MB_ADC_P1V2_STBY_VOLT_V",
             "in1_Name": "MB_ADC_P1V0_STBY_VOLT_V"
         },
         {
@@ -570,7 +552,7 @@
             "Type": "LatticeLCMXO3D_9400Firmware"
         },
         {
-            "Address": "0x4f",
+            "Address": "0x47",
             "Bus": 11,
             "Labels": [
                 "vout1",
@@ -863,7 +845,7 @@
             "Type": "MP2X6XXFirmware"
         },
         {
-            "Address": "0x4f",
+            "Address": "0x47",
             "Bus": 11,
             "FirmwareInfo": {
                 "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP2869A_pvddcr_cpu0",
@@ -897,7 +879,7 @@
         },
         {
             "Address": "0x6a",
-            "Bus": 10,
+            "Bus": 5,
             "Name": "MB_E1S1_TEMP_C",
             "PowerState": "On",
             "Thresholds": [
@@ -1555,7 +1537,11 @@
         }
     ],
     "Name": "Yosemite5 MB",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Motherboard', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Motherboard', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+        "AND",
+        "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'VR-MPS PVDD18VR-MPS ADC-TIC I3CHUB-RTT'})"
+    ],
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/yv5/yosemite5_mb.json b/configurations/meta/yv5/yosemite5_mb_vr_rtt_pvdd18vr_mps_adc_tic_i3chub_rtt.json
similarity index 97%
copy from configurations/meta/yv5/yosemite5_mb.json
copy to configurations/meta/yv5/yosemite5_mb_vr_rtt_pvdd18vr_mps_adc_tic_i3chub_rtt.json
index bd04593..6a4426a 100644
--- a/configurations/meta/yv5/yosemite5_mb.json
+++ b/configurations/meta/yv5/yosemite5_mb_vr_rtt_pvdd18vr_mps_adc_tic_i3chub_rtt.json
@@ -4,29 +4,12 @@
             "Address": "0x4b",
             "Bus": 11,
             "Labels": [
-                "in0",
                 "in1"
             ],
             "Name": "MB_ADC0",
             "Thresholds": [
                 {
                     "Direction": "less than",
-                    "Hysteresis": 0.0228,
-                    "Label": "in0",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 1.14
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.0252,
-                    "Label": "in0",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.26
-                },
-                {
-                    "Direction": "less than",
                     "Hysteresis": 0.019,
                     "Label": "in1",
                     "Name": "lower critical",
@@ -43,7 +26,6 @@
                 }
             ],
             "Type": "ADS7830",
-            "in0_Name": "MB_ADC_P1V2_STBY_VOLT_V",
             "in1_Name": "MB_ADC_P1V0_STBY_VOLT_V"
         },
         {
@@ -570,7 +552,53 @@
             "Type": "LatticeLCMXO3D_9400Firmware"
         },
         {
-            "Address": "0x4f",
+            "Address": "0x6a",
+            "Bus": 13,
+            "Name": "MB_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": 5,
+            "Name": "MB_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": "0x60",
             "Bus": 11,
             "Labels": [
                 "vout1",
@@ -666,7 +694,7 @@
                     "Value": 125.0
                 }
             ],
-            "Type": "MP2869",
+            "Type": "RAA228228",
             "iout1_Name": "MB_VR_CPU_CPU0_CURR_A",
             "iout2_Name": "MB_VR_CPU_MEM_S3_CURR_A",
             "pout1_Name": "MB_VR_CPU_CPU0_PWR_W",
@@ -677,7 +705,7 @@
             "vout2_Name": "MB_VR_CPU_MEM_S3_VOLT_V"
         },
         {
-            "Address": "0x4e",
+            "Address": "0x62",
             "Bus": 11,
             "Labels": [
                 "vout1",
@@ -729,14 +757,14 @@
                     "Value": 125.0
                 }
             ],
-            "Type": "MP29612",
+            "Type": "RAA228228",
             "iout1_Name": "MB_VR_CPU_CPU1_CURR_A",
             "pout1_Name": "MB_VR_CPU_CPU1_PWR_W",
             "temp1_Name": "MB_VR_CPU_CPU1_TEMP_C",
             "vout1_Name": "MB_VR_CPU_CPU1_VOLT_V"
         },
         {
-            "Address": "0x4d",
+            "Address": "0x64",
             "Bus": 11,
             "Labels": [
                 "vout1",
@@ -832,7 +860,7 @@
                     "Value": 125.0
                 }
             ],
-            "Type": "MP29612",
+            "Type": "RAA228228",
             "iout1_Name": "MB_VR_CPU_SOC_CURR_A",
             "iout2_Name": "MB_VR_CPU_PVDDIO_CURR_A",
             "pout1_Name": "MB_VR_CPU_SOC_PWR_W",
@@ -843,80 +871,34 @@
             "vout2_Name": "MB_VR_CPU_PVDDIO_VOLT_V"
         },
         {
-            "Address": "0x4d",
+            "Address": "0x64",
             "Bus": 11,
             "FirmwareInfo": {
-                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP29612A_pvddcr_soc",
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA229640_pvddcr_soc",
                 "VendorIANA": 40981
             },
             "Name": "Yosemite5_MB_VR_SOC",
-            "Type": "MP2X6XXFirmware"
+            "Type": "RAA22XGen3p5Firmware"
         },
         {
-            "Address": "0x4e",
+            "Address": "0x62",
             "Bus": 11,
             "FirmwareInfo": {
-                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP29612A_pvddcr_cpu1",
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA229640_pvddcr_cpu1",
                 "VendorIANA": 40981
             },
             "Name": "Yosemite5_MB_VR_CPU1",
-            "Type": "MP2X6XXFirmware"
+            "Type": "RAA22XGen3p5Firmware"
         },
         {
-            "Address": "0x4f",
+            "Address": "0x60",
             "Bus": 11,
             "FirmwareInfo": {
-                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP2869A_pvddcr_cpu0",
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA229639_pvddcr_cpu0",
                 "VendorIANA": 40981
             },
             "Name": "Yosemite5_MB_VR_CPU0",
-            "Type": "MP2X6XXFirmware"
-        },
-        {
-            "Address": "0x6a",
-            "Bus": 13,
-            "Name": "MB_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": 10,
-            "Name": "MB_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": "RAA22XGen3p5Firmware"
         },
         {
             "Address": "0x3c",
@@ -1555,7 +1537,11 @@
         }
     ],
     "Name": "Yosemite5 MB",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Motherboard', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Motherboard', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+        "AND",
+        "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'VR-RTT PVDD18VR-MPS ADC-TIC I3CHUB-RTT'})"
+    ],
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/yv5/yosemite5_mb.json b/configurations/meta/yv5/yosemite5_mb_vr_sni_pvdd18vr_sni_adc_tic_i3chub_rtt.json
similarity index 97%
rename from configurations/meta/yv5/yosemite5_mb.json
rename to configurations/meta/yv5/yosemite5_mb_vr_sni_pvdd18vr_sni_adc_tic_i3chub_rtt.json
index bd04593..e0ec40a 100644
--- a/configurations/meta/yv5/yosemite5_mb.json
+++ b/configurations/meta/yv5/yosemite5_mb_vr_sni_pvdd18vr_sni_adc_tic_i3chub_rtt.json
@@ -4,29 +4,12 @@
             "Address": "0x4b",
             "Bus": 11,
             "Labels": [
-                "in0",
                 "in1"
             ],
             "Name": "MB_ADC0",
             "Thresholds": [
                 {
                     "Direction": "less than",
-                    "Hysteresis": 0.0228,
-                    "Label": "in0",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 1.14
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.0252,
-                    "Label": "in0",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.26
-                },
-                {
-                    "Direction": "less than",
                     "Hysteresis": 0.019,
                     "Label": "in1",
                     "Name": "lower critical",
@@ -43,7 +26,6 @@
                 }
             ],
             "Type": "ADS7830",
-            "in0_Name": "MB_ADC_P1V2_STBY_VOLT_V",
             "in1_Name": "MB_ADC_P1V0_STBY_VOLT_V"
         },
         {
@@ -570,309 +552,6 @@
             "Type": "LatticeLCMXO3D_9400Firmware"
         },
         {
-            "Address": "0x4f",
-            "Bus": 11,
-            "Labels": [
-                "vout1",
-                "iout1",
-                "pout1",
-                "temp1",
-                "vout2",
-                "iout2",
-                "pout2",
-                "temp2"
-            ],
-            "Name": "MB_VR_CPU_CPU0_MEM_S3",
-            "PowerState": "On",
-            "Thresholds": [
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.0054,
-                    "Label": "vout1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0.27
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.034,
-                    "Label": "vout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.7
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 8.47,
-                    "Label": "iout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 423.5
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 12.705,
-                    "Label": "pout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 635.25
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 2.5,
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 125.0
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.0168,
-                    "Label": "vout2",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0.84
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.027,
-                    "Label": "vout2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.35
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 5.5,
-                    "Label": "iout2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 275.0
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 7.15,
-                    "Label": "pout2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 357.5
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 2.5,
-                    "Label": "temp2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 125.0
-                }
-            ],
-            "Type": "MP2869",
-            "iout1_Name": "MB_VR_CPU_CPU0_CURR_A",
-            "iout2_Name": "MB_VR_CPU_MEM_S3_CURR_A",
-            "pout1_Name": "MB_VR_CPU_CPU0_PWR_W",
-            "pout2_Name": "MB_VR_CPU_MEM_S3_PWR_W",
-            "temp1_Name": "MB_VR_CPU_CPU0_TEMP_C",
-            "temp2_Name": "MB_VR_CPU_MEM_S3_TEMP_C",
-            "vout1_Name": "MB_VR_CPU_CPU0_VOLT_V",
-            "vout2_Name": "MB_VR_CPU_MEM_S3_VOLT_V"
-        },
-        {
-            "Address": "0x4e",
-            "Bus": 11,
-            "Labels": [
-                "vout1",
-                "iout1",
-                "pout1",
-                "temp1"
-            ],
-            "Name": "MB_VR_CPU_CPU1",
-            "PowerState": "On",
-            "Thresholds": [
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.0054,
-                    "Label": "vout1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0.27
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.034,
-                    "Label": "vout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.7
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 8.47,
-                    "Label": "iout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 423.5
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 12.705,
-                    "Label": "pout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 635.25
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 2.5,
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 125.0
-                }
-            ],
-            "Type": "MP29612",
-            "iout1_Name": "MB_VR_CPU_CPU1_CURR_A",
-            "pout1_Name": "MB_VR_CPU_CPU1_PWR_W",
-            "temp1_Name": "MB_VR_CPU_CPU1_TEMP_C",
-            "vout1_Name": "MB_VR_CPU_CPU1_VOLT_V"
-        },
-        {
-            "Address": "0x4d",
-            "Bus": 11,
-            "Labels": [
-                "vout1",
-                "iout1",
-                "pout1",
-                "temp1",
-                "vout2",
-                "iout2",
-                "pout2",
-                "temp2"
-            ],
-            "Name": "MB_VR_CPU_SOC_PVDDIO",
-            "PowerState": "On",
-            "Thresholds": [
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.0122,
-                    "Label": "vout1",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0.61
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.0264,
-                    "Label": "vout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.32
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 6.82,
-                    "Label": "iout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 341.0
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 8.184,
-                    "Label": "pout1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 409.2
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 2.5,
-                    "Label": "temp1",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 125.0
-                },
-                {
-                    "Direction": "less than",
-                    "Hysteresis": 0.0173,
-                    "Label": "vout2",
-                    "Name": "lower critical",
-                    "Severity": 1,
-                    "Value": 0.865
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 0.0255,
-                    "Label": "vout2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 1.275
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.056,
-                    "Label": "iout2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 52.8
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 1.3728,
-                    "Label": "pout2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 68.64
-                },
-                {
-                    "Direction": "greater than",
-                    "Hysteresis": 2.5,
-                    "Label": "temp2",
-                    "Name": "upper critical",
-                    "Severity": 1,
-                    "Value": 125.0
-                }
-            ],
-            "Type": "MP29612",
-            "iout1_Name": "MB_VR_CPU_SOC_CURR_A",
-            "iout2_Name": "MB_VR_CPU_PVDDIO_CURR_A",
-            "pout1_Name": "MB_VR_CPU_SOC_PWR_W",
-            "pout2_Name": "MB_VR_CPU_PVDDIO_PWR_W",
-            "temp1_Name": "MB_VR_CPU_SOC_TEMP_C",
-            "temp2_Name": "MB_VR_CPU_PVDDIO_TEMP_C",
-            "vout1_Name": "MB_VR_CPU_SOC_VOLT_V",
-            "vout2_Name": "MB_VR_CPU_PVDDIO_VOLT_V"
-        },
-        {
-            "Address": "0x4d",
-            "Bus": 11,
-            "FirmwareInfo": {
-                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP29612A_pvddcr_soc",
-                "VendorIANA": 40981
-            },
-            "Name": "Yosemite5_MB_VR_SOC",
-            "Type": "MP2X6XXFirmware"
-        },
-        {
-            "Address": "0x4e",
-            "Bus": 11,
-            "FirmwareInfo": {
-                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP29612A_pvddcr_cpu1",
-                "VendorIANA": 40981
-            },
-            "Name": "Yosemite5_MB_VR_CPU1",
-            "Type": "MP2X6XXFirmware"
-        },
-        {
-            "Address": "0x4f",
-            "Bus": 11,
-            "FirmwareInfo": {
-                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.MP2869A_pvddcr_cpu0",
-                "VendorIANA": 40981
-            },
-            "Name": "Yosemite5_MB_VR_CPU0",
-            "Type": "MP2X6XXFirmware"
-        },
-        {
             "Address": "0x6a",
             "Bus": 13,
             "Name": "MB_E1S0_TEMP_C",
@@ -897,7 +576,7 @@
         },
         {
             "Address": "0x6a",
-            "Bus": 10,
+            "Bus": 5,
             "Name": "MB_E1S1_TEMP_C",
             "PowerState": "On",
             "Thresholds": [
@@ -1552,10 +1231,317 @@
             "SPIControllerIndex": 1,
             "SPIDeviceIndex": 0,
             "Type": "SPIFlash"
+        },
+        {
+            "Address": "0x4f",
+            "Bus": 11,
+            "Labels": [
+                "vout1",
+                "iout1",
+                "pout1",
+                "temp1",
+                "vout2",
+                "iout2",
+                "pout2",
+                "temp2"
+            ],
+            "Name": "MB_VR_CPU_CPU0_MEM_S3",
+            "PowerState": "On",
+            "Thresholds": [
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.0054,
+                    "Label": "vout1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0.27
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 0.034,
+                    "Label": "vout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 1.7
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 8.47,
+                    "Label": "iout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 423.5
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 12.705,
+                    "Label": "pout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 635.25
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 2.5,
+                    "Label": "temp1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 125.0
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.0168,
+                    "Label": "vout2",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0.84
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 0.027,
+                    "Label": "vout2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 1.35
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 5.5,
+                    "Label": "iout2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 275.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 7.15,
+                    "Label": "pout2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 357.5
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 2.5,
+                    "Label": "temp2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 125.0
+                }
+            ],
+            "Type": "XDPE152C4",
+            "iout1_Name": "MB_VR_CPU_CPU0_CURR_A",
+            "iout2_Name": "MB_VR_CPU_MEM_S3_CURR_A",
+            "pout1_Name": "MB_VR_CPU_CPU0_PWR_W",
+            "pout2_Name": "MB_VR_CPU_MEM_S3_PWR_W",
+            "temp1_Name": "MB_VR_CPU_CPU0_TEMP_C",
+            "temp2_Name": "MB_VR_CPU_MEM_S3_TEMP_C",
+            "vout1_Name": "MB_VR_CPU_CPU0_VOLT_V",
+            "vout2_Name": "MB_VR_CPU_MEM_S3_VOLT_V"
+        },
+        {
+            "Address": "0x4e",
+            "Bus": 11,
+            "Labels": [
+                "vout1",
+                "iout1",
+                "pout1",
+                "temp1"
+            ],
+            "Name": "MB_VR_CPU_CPU1",
+            "PowerState": "On",
+            "Thresholds": [
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.0054,
+                    "Label": "vout1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0.27
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 0.034,
+                    "Label": "vout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 1.7
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 8.47,
+                    "Label": "iout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 423.5
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 12.705,
+                    "Label": "pout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 635.25
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 2.5,
+                    "Label": "temp1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 125.0
+                }
+            ],
+            "Type": "XDPE152C4",
+            "iout1_Name": "MB_VR_CPU_CPU1_CURR_A",
+            "pout1_Name": "MB_VR_CPU_CPU1_PWR_W",
+            "temp1_Name": "MB_VR_CPU_CPU1_TEMP_C",
+            "vout1_Name": "MB_VR_CPU_CPU1_VOLT_V"
+        },
+        {
+            "Address": "0x4d",
+            "Bus": 11,
+            "Labels": [
+                "vout1",
+                "iout1",
+                "pout1",
+                "temp1",
+                "vout2",
+                "iout2",
+                "pout2",
+                "temp2"
+            ],
+            "Name": "MB_VR_CPU_SOC_PVDDIO",
+            "PowerState": "On",
+            "Thresholds": [
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.0122,
+                    "Label": "vout1",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0.61
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 0.0264,
+                    "Label": "vout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 1.32
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 6.82,
+                    "Label": "iout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 341.0
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 8.184,
+                    "Label": "pout1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 409.2
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 2.5,
+                    "Label": "temp1",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 125.0
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 0.0173,
+                    "Label": "vout2",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0.865
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 0.0255,
+                    "Label": "vout2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 1.275
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.056,
+                    "Label": "iout2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 52.8
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 1.3728,
+                    "Label": "pout2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 68.64
+                },
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 2.5,
+                    "Label": "temp2",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 125.0
+                }
+            ],
+            "Type": "XDPE152C4",
+            "iout1_Name": "MB_VR_CPU_SOC_CURR_A",
+            "iout2_Name": "MB_VR_CPU_PVDDIO_CURR_A",
+            "pout1_Name": "MB_VR_CPU_SOC_PWR_W",
+            "pout2_Name": "MB_VR_CPU_PVDDIO_PWR_W",
+            "temp1_Name": "MB_VR_CPU_SOC_TEMP_C",
+            "temp2_Name": "MB_VR_CPU_PVDDIO_TEMP_C",
+            "vout1_Name": "MB_VR_CPU_SOC_VOLT_V",
+            "vout2_Name": "MB_VR_CPU_PVDDIO_VOLT_V"
+        },
+        {
+            "Address": "0x4d",
+            "Bus": 11,
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.XDPE192C3E_pvddcr_soc",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_MB_VR_SOC",
+            "Type": "XDPE1X2XXFirmware"
+        },
+        {
+            "Address": "0x4e",
+            "Bus": 11,
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.XDPE192C3E_pvddcr_cpu1",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_MB_VR_CPU1",
+            "Type": "XDPE1X2XXFirmware"
+        },
+        {
+            "Address": "0x4f",
+            "Bus": 11,
+            "FirmwareInfo": {
+                "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.XDPE1D2G3B_pvddcr_cpu0",
+                "VendorIANA": 40981
+            },
+            "Name": "Yosemite5_MB_VR_CPU0",
+            "Type": "XDPE1X2XXFirmware"
         }
     ],
     "Name": "Yosemite5 MB",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Motherboard', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Motherboard', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+        "AND",
+        "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'VR-SNI PVDD18VR-SNI ADC-TIC I3CHUB-RTT'})"
+    ],
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "BuildDate": "$BOARD_MANUFACTURE_DATE",