[Mellanox] Update platform files for SN4800 (#8540)

- Why I did it
Update platform data files for SN4800 to support chassis management

- How I did it
Update pcie.yml
Update sensors.conf
Update platform.json

- How to verify it
Run platform test suite in sonic-mgmt

device/mellanox/x86_64-mlnx_msn4800-r0/pcie.yaml

@@ -1,111 +1,191 @@
 - bus: '00'
   dev: '00'
   fn: '0'
-  id: 3e10
+  id: 3ec4
-  name: 'Host bridge : Intel Corporation Device (rev 07)' 
+  name: 'Host bridge: Intel Corporation 8th Gen Core Processor Host Bridge/DRAM Registers
+    (rev 07)'
 - bus: '00'
   dev: '01'
   fn: '0'
-  id: 1901
+  id: '1901'
-  name: 'PCI bridge : Intel Corporation Skylake PCIe Controller (x16) (rev 07) 
+  name: 'PCI bridge: Intel Corporation Skylake PCIe Controller (x16) (rev 07)'
-    (prog-if 00 [Normal decode])'
 - bus: '00'
-  dev: '08'
+  dev: 08
   fn: '0'
-  id: 1911
+  id: '1911'
-  name: 'System peripheral : Intel Corporation Skylake Gaussian Mixture Model'
+  name: 'System peripheral: Intel Corporation Skylake Gaussian Mixture Model'
 - bus: '00'
   dev: '12'
   fn: '0'
   id: a379
-  name: 'Signal processing controller : Intel Corporation Device (rev 10)'
+  name: 'Signal processing controller: Intel Corporation Cannon Lake PCH Thermal Controller
+    (rev 10)'
 - bus: '00'
   dev: '14'
   fn: '0'
   id: a36d
-  name: 'USB controller : Intel Corporation Device (rev 10) (prog-if 30 [XHCI])'
+  name: 'USB controller: Intel Corporation Cannon Lake PCH USB 3.1 xHCI Host Controller
+    (rev 10)'
 - bus: '00'
   dev: '14'
   fn: '2'
   id: a36f
-  name: 'RAM memory : Intel Corporation Device (rev 10)'
+  name: 'RAM memory: Intel Corporation Cannon Lake PCH Shared SRAM (rev 10)'
 - bus: '00'
   dev: '15'
   fn: '0'
   id: a368
-  name: 'Serial bus controller : Intel Corporation Device (rev 10)'
+  name: 'Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH Serial IO
+    I2C Controller (rev 10)'
 - bus: '00'
   dev: '16'
   fn: '0'
   id: a360
-  name: 'Communication controller : Intel Corporation Device (rev 10)'
+  name: 'Communication controller: Intel Corporation Cannon Lake PCH HECI Controller
+    (rev 10)'
 - bus: '00'
   dev: '17'
   fn: '0'
   id: a353
-  name: 'SATA controller : Intel Corporation Device (rev 10) (prog-if 01 [AHCI 1.0])'
+  name: 'SATA controller: Intel Corporation Cannon Lake Mobile PCH SATA AHCI Controller
+    (rev 10)'
 - bus: '00'
-  dev: '1b'
+  dev: 1b
   fn: '0'
   id: a340
-  name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
+  name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
+    f0)'
 - bus: '00'
-  dev: '1b'
+  dev: 1b
   fn: '2'
   id: a342
-  name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
+  name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
+    f0)'
 - bus: '00'
-  dev: '1b'
+  dev: 1b
   fn: '4'
   id: a32c
-  name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
+  name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
+    f0)'
 - bus: '00'
-  dev: '1c'
+  dev: 1c
   fn: '0'
   id: a33d
-  name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
+  name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
+    f0)'
 - bus: '00'
-  dev: '1c'
+  dev: 1c
   fn: '6'
   id: a33e
-  name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
+  name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
+    f0)'
 - bus: '00'
-  dev: '1c'
+  dev: 1c
   fn: '7'
   id: a33f
-  name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
+  name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
+    f0)'
 - bus: '00'
-  dev: '1d'
+  dev: 1d
   fn: '0'
   id: a334
-  name: 'PCI bridge : Intel Corporation Device (rev f0) (prog-if 00 [Normal decode])'
+  name: 'PCI bridge: Intel Corporation Cannon Lake PCH PCI Express Root Port (rev
+    f0)'
 - bus: '00'
-  dev: '1e'
+  dev: 1e
   fn: '0'
   id: a328
-  name: 'Communication controller : Intel Corporation Device (rev 10)'
+  name: 'Communication controller: Intel Corporation Cannon Lake PCH Serial IO UART
+    Host Controller (rev 10)'
 - bus: '00'
-  dev: '1f'
+  dev: 1f
   fn: '0'
   id: a30e
-  name: 'ISA bridge : Intel Corporation Device (rev 10)'
+  name: 'ISA bridge: Intel Corporation Cannon Lake LPC Controller (rev 10)'
 - bus: '00'
-  dev: '1f'
+  dev: 1f
   fn: '4'
   id: a323
-  name: 'SMBus : Intel Corporation Device (rev 10)'
+  name: 'SMBus: Intel Corporation Cannon Lake PCH SMBus Controller (rev 10)'
 - bus: '00'
-  dev: '1f'
+  dev: 1f
   fn: '5'
   id: a324
-  name: 'Serial bus controller : Intel Corporation Device (rev 10)'
+  name: 'Serial bus controller [0c80]: Intel Corporation Cannon Lake PCH SPI Controller
+    (rev 10)'
 - bus: '00'
-  dev: '1f'
+  dev: 1f
   fn: '6'
   id: 15bb
-  name: 'Ethernet controller : Intel Corporation Device (rev 10)'
+  name: 'Ethernet controller: Intel Corporation Ethernet Connection (7) I219-LM (rev
+    10)'
 - bus: '01'
   dev: '00'
   fn: '0'
-  id: cf6c
+  id: cf70
-  name: 'Ethernet controller : Mellanox Technologies Device'
+  name: 'Ethernet controller: Mellanox Technologies Spectrum-3'
+- bus: '03'
+  dev: '00'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '04'
+  dev: '00'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '04'
+  dev: '02'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '05'
+  dev: '00'
+  fn: '0'
+  id: 101b
+  name: 'Ethernet controller: Mellanox Technologies MT28908 Family [ConnectX-6]'
+- bus: '06'
+  dev: '00'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: '00'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: '02'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: '04'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: '06'
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: 08
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: 0a
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: 0c
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'
+- bus: '07'
+  dev: 0e
+  fn: '0'
+  id: '1976'
+  name: 'PCI bridge: Mellanox Technologies MT28908 Family [ConnectX-6 PCIe Bridge]'

device/mellanox/x86_64-mlnx_msn4800-r0/platform.json

@@ -19,6 +19,9 @@
             },
             {
                 "name": "CPLD3"
+            },
+            {
+                "name": "CPLD4"
             }
         ],
         "fans": [],
@@ -28,9 +31,6 @@
                 "fans": [
                     {
                         "name": "fan1"
-                    },
-                    {
-                        "name": "fan2"
                     }
                 ]
             },
@@ -38,10 +38,7 @@
                 "name": "drawer2",
                 "fans": [
                     {
-                        "name": "fan3"
+                        "name": "fan2"
-                    },
-                    {
-                        "name": "fan4"
                     }
                 ]
             },
@@ -49,10 +46,7 @@
                 "name": "drawer3",
                 "fans": [
                     {
-                        "name": "fan5"
+                        "name": "fan3"
-                    },
-                    {
-                        "name": "fan6"
                     }
                 ]
             },
@@ -60,10 +54,23 @@
                 "name": "drawer4",
                 "fans": [
                     {
-                        "name": "fan7"
+                        "name": "fan4"
-                    },
+                    }
+                ]
+            },
+            {
+                "name": "drawer5",
+                "fans": [
                     {
-                        "name": "fan8"
+                        "name": "fan5"
+                    }
+                ]
+            },
+            {
+                "name": "drawer6",
+                "fans": [
+                    {
+                        "name": "fan6"
                     }
                 ]
             }
@@ -73,7 +80,7 @@
                 "name": "PSU 1",
                 "fans": [
                     {
-                        "name": "psu_1_fan_1"
+                        "name": "psu1_fan1"
                     }
                 ],
                 "thermals": [
@@ -86,12 +93,38 @@
                 "name": "PSU 2",
                 "fans": [
                     {
-                        "name": "PSU-2 Temp"
+                        "name": "psu2_fan1"
                     }
                 ],
                 "thermals": [
                     {
-                        "name": "xSFP module 1 Temp"
+                        "name": "PSU-2 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 3",
+                "fans": [
+                    {
+                        "name": "psu3_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-3 Temp"
+                    }
+                ]
+            },
+            {
+                "name": "PSU 4",
+                "fans": [
+                    {
+                        "name": "psu4_fan1"
+                    }
+                ],
+                "thermals": [
+                    {
+                        "name": "PSU-4 Temp"
                     }
                 ]
             }
@@ -112,6 +145,18 @@
             {
                 "name": "CPU Core 1 Temp"
             },
+            {
+                "name": "CPU Core 2 Temp"
+            },
+            {
+                "name": "CPU Core 3 Temp"
+            },
+            {
+                "name": "CPU Core 4 Temp"
+            },
+            {
+                "name": "CPU Core 5 Temp"
+            },
             {
                 "name": "CPU Pack Temp"
             }

device/mellanox/x86_64-mlnx_msn4800-r0/platform_wait

@@ -1 +0,0 @@
-../x86_64-mlnx_msn2700-r0/platform_wait

device/mellanox/x86_64-mlnx_msn4800-r0/platform_wait

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+declare -r EXIT_SUCCESS="0"
+exit "${EXIT_SUCCESS}"

device/mellanox/x86_64-mlnx_msn4800-r0/sensors.conf

@@ -1,12 +1,53 @@
 ################################################################################
-# Copyright (c) 2021 Mellanox Technologies
+# Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Platform specific sensors config for SN4800
 ################################################################################
 
+# Line card power manager devices (bus is variable)
+bus "i2c-59" "i2c-34-mux (chan_id 4)"
+    chip "mp2975-i2c-59-62"
+        label in1 "Linecard PMIC-1 PSU 12V Rail (in)"
+        label in2 "Linecard PMIC-1 AGB VCORE Rail(out1)"
+        label in3 "Linecard PMIC-1 AGB 1.2V Rail(out2)"
+        ignore in4
+        label temp1 "Linecard PMIC-1 AGB VCORE_1.2V Ambient Temp 1"
+        ignore temp2
+        label power1 "Linecard PMIC-1 12V AGB VCORE_1.2V Rail Pwr (in)"
+        label power2 "Linecard PMIC-1 AGB VCORE Rail Pwr (out)"
+        label power3 "Linecard PMIC-1 AGB 1.2V Rail Pwr (out)"
+        ignore power4
+        label curr1 "Linecard PMIC-1 12V AGB VCORE_1.2V Rail Curr (in)"
+        label curr2 "Linecard PMIC-1 AGB VCORE Rail Curr (out)"
+        label curr3 "Linecard PMIC-1 AGB 1.2V Rail Curr (out)"
+        ignore curr4
+    chip "mp2975-i2c-59-64"
+        label in1 "Linecard PMIC-2 PSU 12V Rail (in)"
+        label in2 "Linecard PMIC-2 PORTS 3.3V Rail(out1)"
+        label in3 "Linecard PMIC-2 AGB 1.8V Rail(out2)"
+        ignore in4
+        label temp1 "Linecard PMIC-2 PORTS_3.3V_AGB_1.8V Ambient Temp 1"
+        ignore temp2
+        label power1 "Linecard PMIC-2 12V PORTS_3.3V_AGB_1.8V Rail Pwr (in)"
+        label power2 "Linecard PMIC-2 PORTS 3.3V Rail Pwr (out)"
+        label power3 "Linecard PMIC-2 AGB 1.8V Rail Pwr (out)"
+        ignore power4
+        label curr1 "Linecard PMIC-2 12V PORTS_3.3V_AGB_1.8V Rail Curr (in)"
+        label curr2 "Linecard PMIC-2 PORTS 3.3V Rail Curr (out)"
+        label curr3 "Linecard PMIC-2 AGB 1.8V Rail Curr (out)"
+        ignore curr4
+
+# Memory sensors
+bus "i2c-0" "SMBus I801 adapter at efa0"
+    chip "jc42-i2c-0-1c"
+        label temp1 "Ambient SODIMM Temp"
+
+    chip "jc42-i2c-0-1a"
+        label temp1 "Ambient SODIMM Temp"
+
 # Temperature sensors
-bus "i2c-2" "i2c-1-mux (chan_id 1)"
+bus "i2c-3" "i2c-1-mux (chan_id 1)"
-    chip "mlxsw-i2c-*-48"
+    chip "mlxsw-i2c-*-37"
         label temp1 "Ambient ASIC Temp"
 
 bus "i2c-7" "i2c-1-mux (chan_id 6)"
@@ -15,121 +56,117 @@ bus "i2c-7" "i2c-1-mux (chan_id 6)"
     chip "tmp102-i2c-*-4a"
         label temp1 "Ambient Port Side Temp (air exhaust)"
 
-bus "i2c-15" "i2c-1-mux (chan_id 6)"
+bus "i2c-14" "i2c-1-mux (chan_id 12)"
-    chip "tmp102-i2c-15-49"
+    chip "tmp421-i2c-*-1f"
-        label temp1 "Ambient COMEX Temp"
+        ignore temp1
+        label temp2 "Ambient PCIe switch Temp"
 
 # Power controllers
-bus "i2c-5" "i2c-1-mux (chan_id 4)"
+bus "i2c-5" "i2c-1-mux (chan_id 3)"
-    chip "mp2975-i2c-*-62"
+    chip "mp2975-i2c-5-62"
-        label in1      "PMIC-1 PSU 12V Rail (in1)"
+        label in1 "PMIC-1 PSU 12V Rail (in)"
-        label in2      "PMIC-1 OSFP PORTS_P01_P08 Rail (out1)"
+        label in2 "PMIC-1 ASIC VCORE_MAIN Rail (out)"
-        compute in2 (2)*@, @/(2)
-        label in3      "PMIC-1 OSFP PORTS_P09_P16 Rail (out2)"
-        compute in3 (2)*@, @/(2)
-        label temp1    "PMIC-1 OSFP PORTS_P01_P08 Temp 1"
-        label temp2    "PMIC-1 OSFP PORTS_P09_P16 Temp 2"
-        label power1   "PMIC-1 12V OSFP PORT_P01_P16 (in)"
-        label power2   "PMIC-1 OSFP P01_P08 Rail Pwr (out1)"
-        label power3   "PMIC-1 OSFP P09_P16 Rail Pwr (out2)"
-        label curr1    "PMIC-1 12V OSFP P01_P08 Rail Curr (in1)"
-        label curr2    "PMIC-1 OSFP P01_P8 Rail Curr (out1)"
-        label curr3    "PMIC-1 OSFP P09_P16 Rail Curr (out2)"
-        
-    chip "mp2975-i2c-*-64"
-        label in1      "PMIC-2 PSU 12V Rail (in1)"
-        label in2      "PMIC-2 OSFP PORTS_P17_P24 Rail (out1)"
-        compute in2 (2)*@, @/(2)
-        label in3      "PMIC-2 OSFP PORTS_P25_P32 Rail (out2)"
-        compute in3 (2)*@, @/(2)
-        label temp1    "PMIC-2 OSFP PORTS_P17_P24 Temp 1"
-        label temp2    "PMIC-2 OSFP PORTS_P25_P32 Temp 2"
-        label power1   "PMIC-2 12V OSFP PORT_P17_P32 (in)"
-        label power2   "PMIC-2 OSFP P17_P24 Rail Pwr (out1)"
-        label power3   "PMIC-2 OSFP P25_P32 Rail Pwr (out2)"
-        label curr1    "PMIC-2 12V OSFP P17_P24 Rail Curr (in1)"
-        label curr2    "PMIC-2 OSFP P17_P24 Rail Curr (out1)"
-        label curr3    "PMIC-2 OSFP P25_P32 Rail Curr (out2)"
-
-    chip "mp2888-i2c-*-66"
-        label in1      "PMIC-3 PSU 12V Rail (in1)"
-        label in2      "PMIC-3 ASIC VCORE_MAIN Rail (out1)"
         ignore in3
-        ignore in4
+        ignore in4 
-        label temp1    "PMIC-3 ASIC VCORE_MAIN Temp 1"
+        label temp1 "PMIC-1 ASIC VCORE_MAIN Temp 1"
         ignore temp2 
-        label power1   "PMIC-3 12V ASIC VCORE_MAIN Rail Pwr (in)"
+        label power1 "PMIC-1 12V ASIC VCORE_MAIN Rail Pwr (in)"
-        label power2   "PMIC-3 ASIC VCORE_MAIN Rail Pwr (out1)"
+        label power2 "PMIC-1 ASIC VCORE_MAIN Rail Pwr (out)"
-        ignore power3
+        ignore power3 
         ignore power4
-        label curr1    "PMIC-3 12V ASIC VCORE_MAIN Rail Curr (in1)"
+        label curr1 "PMIC-1 12V ASIC VCORE_MAIN Rail Curr (in)"
-        label curr2    "PMIC-3 ASIC VCORE_MAIN Rail Curr (out1)"
+        label curr2 "PMIC-1 ASIC VCORE_MAIN Rail Curr (out)"
-        ignore curr3
+        ignore curr3 
-        ignore curr4
+        ignore curr4 
-
+    chip "mp2975-i2c-5-64"
-    chip "mp2975-i2c-*-68"
+        label in1 "PMIC-2 PSU 12V Rail (in)"
-        label in1      "PMIC-4 PSU 12V Rail (in)"
+        label in2 "PMIC-2 ASIC 1.8V_MAIN Rail (out1)"
-        label in2      "PMIC-4 HVDD 1.2V EAST Rail (out1)"
+        label in3 "PMIC-2 ASIC 1.2V_T0_3 Rail (out2)"
-        label in3      "PMIC-4 DVDD 0.9V EAST Rail (out2)"
-        label temp1    "PMIC-4 HVDD 1.2V EAST Rail Temp"
-        label power1   "PMIC-4 12V HVDD_1.2V DVDD_0.9V EAST (in)"
-        label power2   "PMIC-4 HVDD 1.2V EAST Rail Pwr (out1)"
-        label power3   "PMIC-4 DVDD 0.9V EAST Rail Pwr (out2)"
-        label curr1    "PMIC-4 12V HVDD 1.2V EAST Rail Curr (in)"
-        label curr2    "PMIC-4 HVDD 1.2V EAST Rail Curr (out1)"
-        label curr3    "PMIC-4 DVDD 0.9V EAST Rail Curr (out2)"
-        
-    chip "mp2975-i2c-*-6c"
-        label in1      "PMIC-5 PSU 12V Rail (in)"
-        label in2      "PMIC-5 HVDD 1.2V WEST Rail (out1)"
-        label in3      "PMIC-5 DVDD 0.9V WEST Rail (out2)"
-        label temp1    "PMIC-5 HVDD 1.2V WEST Rail Temp"
-        label power1   "PMIC-5 12V HVDD_1.2V DVDD_0.9V WEST (in)"
-        label power2   "PMIC-5 HVDD 1.2V WEST Rail Pwr (out1)"
-        label power3   "PMIC-5 DVDD 0.9V WEST Rail Pwr (out2)"
-        label curr1    "PMIC-5 12V HVDD 1.2V WEST Rail Curr (in)"
-        label curr2    "PMIC-5 HVDD 1.2V WEST Rail Curr (out1)"
-        label curr3    "PMIC-5 DVDD 0.9V WEST Rail Curr (out2)"
-
-bus "i2c-15" "i2c-1-mux (chan_id 6)"
-    chip "tps53679-i2c-*-58"
-        label in1 "PMIC-8 PSU 12V Rail (in1)"
-        label in2 "PMIC-8 PSU 12V Rail (in2)"
-        label in3 "PMIC-8 COMEX 1.8V Rail (out)"
-        label in4 "PMIC-8 COMEX 1.05V Rail (out)"
-        label temp1 "PMIC-8 Temp 1"
-        label temp2 "PMIC-8 Temp 2"
-        label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out)"
-        label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out)"
-        label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out)"
-        label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out)"
-    chip "tps53679-i2c-*-61"
-        label in1 "PMIC-9 PSU 12V Rail (in1)"
-        label in2 "PMIC-9 PSU 12V Rail (in2)"
-        label in3 "PMIC-9 COMEX 1.2V Rail (out)"
         ignore in4
-        label temp1 "PMIC-9 Temp 1"
+        label temp1 "PMIC-2 ASIC 1.8V_MAIN_1.2V_T0_3 Temp 1"
-        label temp2 "PMIC-9 Temp 2"
+        ignore temp2
-        label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
+        label power1 "PMIC-2 12V ASIC 1.8V_MAIN_1.2V_T0_3 Rail Pwr (in)"
-        ignore power2 
+        label power2 "PMIC-2 ASIC 1.8V_MAIN Rail Pwr (out)"
-        label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)"
+        label power3 "PMIC-2 ASIC 1.2V_T0_3 Rail Pwr (out)"
-        ignore curr2 
+        ignore power4
+        label curr1 "PMIC-2 12V ASIC 1.8V_MAIN_1.2V_T0_3 Rail Curr (in)"
+        label curr2 "PMIC-2 ASIC 1.8V_MAIN Rail Curr (out1)"
+        label curr3 "PMIC-2 ASIC 1.2V_T0_3 Rail Curr (out2)"
+        ignore curr4
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-3 PSU 12V Rail (in)"
+        label in2 "PMIC-3 ASIC VCORE_T0_3 Rail (out1)"
+        label in3 "PMIC-3 ASIC 1.8V_T0_3 Rail (out2)"
+        ignore in4
+        label temp1 "PMIC-3 ASIC VCORE_1.8V_T0_3 Temp 1"
+        ignore temp2
+        label power1 "PMIC-3 12V ASIC VCORE_1.8V_T0_3 Rail Pwr (in)"
+        label power2 "PMIC-3 ASIC VCORE_T0_3 Rail Pwr (out)"
+        label power3 "PMIC-3 ASIC 1.8V_T0_3 Rail Pwr (out)"
+        ignore power4
+        label curr1 "PMIC-3 12V ASIC VCORE_1.8V_T0_3 Rail Curr (in)"
+        label curr2 "PMIC-3 ASIC VCORE_T0_3 Rail Curr (out1)"
+        label curr3 "PMIC-3 ASIC 1.8V_T0_3 Rail Curr (out2)"
+        ignore curr4
+    chip "mp2975-i2c-*-68"
+        label in1 "PMIC-4 PSU 12V Rail (in)"
+        label in2 "PMIC-4 ASIC VCORE_T4_7 Rail (out1)"
+        label in3 "PMIC-4 ASIC 1.8V_T4_7 Rail (out2)"
+        ignore in4
+        label temp1 "PMIC-4 ASIC VCORE_1.8V_T4_7 Temp 1"
+        ignore temp2
+        label power1 "PMIC-4 12V ASIC VCORE_1.8V_T4_7 Rail Pwr (in)"
+        label power2 "PMIC-4 ASIC VCORE_T4_7 Rail Pwr (out)"
+        label power3 "PMIC-3 ASIC 1.8V_T4_7 Rail Pwr (out)"
+        ignore power4
+        label curr1 "PMIC-4 12V ASIC VCORE_1.8V_T4_7 Rail Curr (in)"
+        label curr2 "PMIC-4 ASIC VCORE_T4_7 Rail Curr (out1)"
+        label curr3 "PMIC-4 ASIC 1.8V_T4_7 Rail Curr (out2)"
+        ignore curr4
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-5 PSU 12V Rail (in)"
+        label in2 "PMIC-5 ASIC 1.2V_MAIN Rail (out1)"
+        label in3 "PMIC-5 ASIC 1.2V_T4_7 Rail (out2)"
+        ignore in4
+        label temp1 "PMIC-5 ASIC 1.2V_MAIN_1.2V_T4_7 Temp 1"
+        ignore temp2
+        label power1 "PMIC-5 12V ASIC 1.2V_MAIN_1.2V_T4_7 Rail Pwr (in)"
+        label power2 "PMIC-5 ASIC 1.2V_MAIN Rail Pwr (out)"
+        label power3 "PMIC-5 1.2V_T4_7 Rail Pwr (out)"
+        ignore power4
+        label curr1 "PMIC-5 12V ASIC 1.2V_MAIN_1.2V_T4_7 Rail Curr (in)"
+        label curr2 "PMIC-5 ASIC 1.2V_MAIN Rail Curr (out1)"
+        label curr3 "PMIC-5 ASIC 1.2V_T4_7 Rail Curr (out2)"
+        ignore curr4
+        ignore curr4
+bus "i2c-56" "i2c-1-mux (chan_id 6)"
+    chip "mp2975-i2c-*-6b"
+        label in1 "PMIC-6 PSU 12V Rail (in1)"
+        label in2 "PMIC-6 PSU 12V Rail (in2)"
+        label in3 "PMIC-6 COMEX 1.8V Rail (out1)"
+        label in4 "PMIC-6 COMEX 1.05V Rail (out2)"
+        label temp1 "PMIC-6 Temp 1"
+        label temp2 "PMIC-6 Temp 2"
+        label power1 "PMIC-6 COMEX 1.8V Rail Pwr (out1)"
+        label power2 "PMIC-6 COMEX 1.05V Rail Pwr (out2)"
+        label curr1 "PMIC-6 COMEX 1.8V Rail Curr (out1)"
+        label curr2 "PMIC-6 COMEX 1.05V Rail Curr (out2)"
 
 # Power supplies
 bus "i2c-4" "i2c-1-mux (chan_id 3)"
-    chip "dps460-i2c-*-58"
-        label in1 "PSU-1(L) 220V Rail (in)"
-        ignore in2
-        label in3 "PSU-1(L) 12V Rail (out)"
-        label fan1 "PSU-1(L) Fan 1"
-        label temp1 "PSU-1(L) Temp 1"
-        label temp2 "PSU-1(L) Temp 2"
-        label temp3 "PSU-1(L) Temp 3"
-        label power1 "PSU-1(L) 220V Rail Pwr (in)"
-        label power2 "PSU-1(L) 12V Rail Pwr (out)"
-        label curr1 "PSU-1(L) 220V Rail Curr (in)"
-        label curr2 "PSU-1(L) 12V Rail Curr (out)"
     chip "dps460-i2c-*-59"
+        label in1 "PSU-1(R) 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1(R) 12V Rail (out)"
+        label fan1 "PSU-1(R) Fan 1"
+        label temp1 "PSU-1(R) Temp 1"
+        label temp2 "PSU-1(R) Temp 2"
+        label temp3 "PSU-1(R) Temp 3"
+        label power1 "PSU-1(R) 220V Rail Pwr (in)"
+        label power2 "PSU-1(R) 12V Rail Pwr (out)"
+        label curr1 "PSU-1(R) 220V Rail Curr (in)"
+        label curr2 "PSU-1(R) 12V Rail Curr (out)"
+    chip "dps460-i2c-*-58"
         label in1 "PSU-2(R) 220V Rail (in)"
         ignore in2
         label in3 "PSU-2(R) 12V Rail (out)"
@@ -141,49 +178,47 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
         label power2 "PSU-2(R) 12V Rail Pwr (out)"
         label curr1 "PSU-2(R) 220V Rail Curr (in)"
         label curr2 "PSU-2(R) 12V Rail Curr (out)"
-
+    chip "dps460-i2c-*-5b"
-    chip "d1u54p_w_2000_12-i2c-*-58"
+        label in1 "PSU-3(L) 220V Rail (in)"
-        label in1 "PSU-1(L) 220V Rail (in)"
         ignore in2
-        label in3 "PSU-1(L) 12V Rail (out)"
+        label in3 "PSU-3(L) 12V Rail (out)"
-        label fan1 "PSU-1(L) Fan 1"
+        label fan1 "PSU-3(L) Fan 1"
-        label temp1 "PSU-1(L) Temp 1"
+        label temp1 "PSU-3(L) Temp 1"
-        label temp2 "PSU-1(L) Temp 2"
+        label temp2 "PSU-3(L) Temp 2"
-        label temp3 "PSU-1(L) Temp 3"
+        label temp3 "PSU-3(L) Temp 3"
-        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        label power1 "PSU-3(L) 220V Rail Pwr (in)"
-        label power2 "PSU-1(L) 12V Rail Pwr (out)"
+        label power2 "PSU-3(L) 12V Rail Pwr (out)"
-        label curr1 "PSU-1(L) 220V Rail Curr (in)"
+        label curr1 "PSU-3(L) 220V Rail Curr (in)"
-        label curr2 "PSU-1(L) 12V Rail Curr (out)"
+        label curr2 "PSU-3(L) 12V Rail Curr (out)"
-    chip "d1u54p_w_2000_12-i2c-*-59"
+    chip "dps460-i2c-*-5a"
-        label in1 "PSU-2(R) 220V Rail (in)"
+        label in1 "PSU-4(L) 220V Rail (in)"
         ignore in2
-        label in3 "PSU-2(R) 12V Rail (out)"
+        label in3 "PSU-4(L) 12V Rail (out)"
-        label fan1 "PSU-2(R) Fan 1"
+        label fan1 "PSU-4(L) Fan 1"
-        label temp1 "PSU-2(R) Temp 1"
+        label temp1 "PSU-4(L) Temp 1"
-        label temp2 "PSU-2(R) Temp 2"
+        label temp2 "PSU-4(L) Temp 2"
-        label temp3 "PSU-2(R) Temp 3"
+        label temp3 "PSU-4(L) Temp 3"
-        label power1 "PSU-2(R) 220V Rail Pwr (in)"
+        label power1 "PSU-4(L) 220V Rail Pwr (in)"
-        label power2 "PSU-2(R) 12V Rail Pwr (out)"
+        label power2 "PSU-4(L) 12V Rail Pwr (out)"
-        label curr1 "PSU-2(R) 220V Rail Curr (in)"
+        label curr1 "PSU-4(L) 220V Rail Curr (in)"
-        label curr2 "PSU-2(R) 12V Rail Curr (out)"
+        label curr2 "PSU-4(L) 12V Rail Curr (out)"
 
 # Chassis fans
 chip "mlxreg_fan-isa-*"
     label fan1 "Chassis Fan Drawer-1 Tach 1"
-    label fan2 "Chassis Fan Drawer-1 Tach 2"
+    label fan2 "Chassis Fan Drawer-2 Tach 1"
-    label fan3 "Chassis Fan Drawer-2 Tach 1"
+    label fan3 "Chassis Fan Drawer-3 Tach 1"
-    label fan4 "Chassis Fan Drawer-2 Tach 2"
+    label fan4 "Chassis Fan Drawer-4 Tach 1"
-    label fan5 "Chassis Fan Drawer-3 Tach 1"
+    label fan5 "Chassis Fan Drawer-5 Tach 1"
-    label fan6 "Chassis Fan Drawer-3 Tach 2"
+    label fan6 "Chassis Fan Drawer-6 Tach 1"
-    label fan7 "Chassis Fan Drawer-4 Tach 1"
-    label fan8 "Chassis Fan Drawer-4 Tach 2"
-    label fan9 "Chassis Fan Drawer-5 Tach 1"
-    label fan10 "Chassis Fan Drawer-5 Tach 2"
-    label fan11 "Chassis Fan Drawer-6 Tach 1"
-    label fan12 "Chassis Fan Drawer-6 Tach 2"
-    label fan13 "Chassis Fan Drawer-7 Tach 1"
-    label fan14 "Chassis Fan Drawer-7 Tach 2"
 
-# Miscellaneous
+# Line card hotswap device (bus is variable, any above 63)
-chip "*-virtual-*"
+    chip "lm25066-i2c-*-15"
-    ignore temp1
+        label in1 "Linecard Hotswap 12V_IN Rail(vin)"
+        ignore in2
+        label in3 "Linecard Hotswap 12V Rail(vout)"
+        label power1 "Linecard Hotswap 12V_IN (pin)"
+        label power2 "Linecard Hotswap 12V (pout)"
+        label curr1 "Linecard Hotswap 12V_IN (iin)"
+        label curr2 "Linecard Hotswap 12V (iout)"
+        ignore temp1