configurations: ventura: fix 2nd source of fan sensor issue

The fan chip that controls four fans and monitors eight tachometers
(two fan boards, each with two fans and each fan with two tachometers)
is located on the RMC board and has two sources of the fan chip.

Therefore, change the fan PWM/TACH sensor configurations from the fan
board to the RMC board to accommodate different scenarios and fix the
wrong index mapping of the fan TACH in the 2nd fan chip.

Additionally, modify the index naming of the sensors for the ADC chip
on the 2nd fan board (ventura_fanboard_adc_max.json) to resolve an issue
where the sensors were not displayed due to incorrect index mapping with
the driver's exported name.

Change-Id: I10ee20396be3c8071916d08f182daeef96fa550e
Signed-off-by: Yang Chen <yang.chen@quantatw.com>
diff --git a/configurations/meta/ventura_fanboard_adc_max.json b/configurations/meta/ventura_fanboard_adc_max.json
index b46cc8b..2d5cf4d 100644
--- a/configurations/meta/ventura_fanboard_adc_max.json
+++ b/configurations/meta/ventura_fanboard_adc_max.json
@@ -2,139 +2,13 @@
     {
         "Exposes": [
             {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN0_TACH_OL",
-                    "Pwm": 0,
-                    "PwmName": "FCB_0_FAN0_PWM",
-                    "Tachs": [
-                        1
-                    ]
-                },
-                "Index": 1,
-                "Name": "FCB_0_FAN0_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 39.2,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN0_TACH_IL",
-                    "Pwm": 0,
-                    "PwmName": "FCB_0_FAN0_PWM",
-                    "Tachs": [
-                        0
-                    ]
-                },
-                "Index": 0,
-                "Name": "FCB_0_FAN0_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN1_TACH_OL",
-                    "Pwm": 2,
-                    "PwmName": "FCB_0_FAN1_PWM",
-                    "Tachs": [
-                        2
-                    ]
-                },
-                "Index": 2,
-                "Name": "FCB_0_FAN1_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN1_TACH_IL",
-                    "Pwm": 2,
-                    "PwmName": "FCB_0_FAN1_PWM",
-                    "Tachs": [
-                        7
-                    ]
-                },
-                "Index": 7,
-                "Name": "FCB_0_FAN1_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 51.0,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
                 "Address": "0x35",
                 "Bus": "$bus",
                 "Labels": [
-                    "in0",
-                    "in1",
-                    "in2",
-                    "in3"
+                    "in_voltage0",
+                    "in_voltage1",
+                    "in_voltage2",
+                    "in_voltage3"
                 ],
                 "Name": "FAN_ADC",
                 "Thresholds": [
@@ -172,16 +46,16 @@
                     }
                 ],
                 "Type": "MAX11617",
-                "in0_Max": 18,
-                "in0_Name": "FCB_0_FAN_0_VOLT_V",
-                "in0_Scale": 133.262,
-                "in1_Name": "FCB_0_FAN_0_CURR_A",
-                "in1_Scale": 464,
-                "in2_Max": 18,
-                "in2_Name": "FCB_0_FAN_1_VOLT_V",
-                "in2_Scale": 133.262,
-                "in3_Name": "FCB_0_FAN_1_CURR_A",
-                "in3_Scale": 464
+                "in_voltage0_Max": 18,
+                "in_voltage0_Name": "FCB_0_FAN_0_VOLT_V",
+                "in_voltage0_Scale": 133.262,
+                "in_voltage1_Name": "FCB_0_FAN_0_CURR_A",
+                "in_voltage1_Scale": 464,
+                "in_voltage2_Max": 18,
+                "in_voltage2_Name": "FCB_0_FAN_1_VOLT_V",
+                "in_voltage2_Scale": 133.262,
+                "in_voltage3_Name": "FCB_0_FAN_1_CURR_A",
+                "in_voltage3_Scale": 464
             }
         ],
         "Name": "Ventura Fan Board 0",
@@ -205,141 +79,13 @@
     {
         "Exposes": [
             {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN2_TACH_OL",
-                    "Pwm": 3,
-                    "PwmName": "FCB_1_FAN2_PWM",
-                    "Tachs": [
-                        4
-                    ]
-                },
-                "Index": 4,
-                "Name": "FCB_1_FAN2_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 39.2,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN2_TACH_IL",
-                    "Pwm": 3,
-                    "PwmName": "FCB_1_FAN2_PWM",
-                    "Tachs": [
-                        3
-                    ]
-                },
-                "Index": 3,
-                "Name": "FCB_1_FAN2_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 51.0,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN3_TACH_OL",
-                    "Pwm": 5,
-                    "PwmName": "FCB_1_FAN3_PWM",
-                    "Tachs": [
-                        5
-                    ]
-                },
-                "Index": 5,
-                "Name": "FCB_1_FAN3_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 39.2,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x23",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN3_TACH_IL",
-                    "Pwm": 5,
-                    "PwmName": "FCB_1_FAN3_PWM",
-                    "Tachs": [
-                        10
-                    ]
-                },
-                "Index": 10,
-                "Name": "FCB_1_FAN3_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 51.0,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
                 "Address": "0x35",
                 "Bus": "$bus",
                 "Labels": [
-                    "in0",
-                    "in1",
-                    "in2",
-                    "in3"
+                    "in_voltage0",
+                    "in_voltage1",
+                    "in_voltage2",
+                    "in_voltage3"
                 ],
                 "Name": "FAN_ADC",
                 "Thresholds": [
@@ -377,16 +123,16 @@
                     }
                 ],
                 "Type": "MAX11617",
-                "in0_Max": 18,
-                "in0_Name": "FCB_1_FAN_2_VOLT_V",
-                "in0_Scale": 133.262,
-                "in1_Name": "FCB_1_FAN_2_CURR_A",
-                "in1_Scale": 464,
-                "in2_Max": 18,
-                "in2_Name": "FCB_1_FAN_3_VOLT_V",
-                "in2_Scale": 133.262,
-                "in3_Name": "FCB_1_FAN_3_CURR_A",
-                "in3_Scale": 464
+                "in_voltage0_Max": 18,
+                "in_voltage0_Name": "FCB_1_FAN_2_VOLT_V",
+                "in_voltage0_Scale": 133.262,
+                "in_voltage1_Name": "FCB_1_FAN_2_CURR_A",
+                "in_voltage1_Scale": 464,
+                "in_voltage2_Max": 18,
+                "in_voltage2_Name": "FCB_1_FAN_3_VOLT_V",
+                "in_voltage2_Scale": 133.262,
+                "in_voltage3_Name": "FCB_1_FAN_3_CURR_A",
+                "in_voltage3_Scale": 464
             }
         ],
         "Name": "Ventura Fan Board 1",
diff --git a/configurations/meta/ventura_fanboard_adc_tic.json b/configurations/meta/ventura_fanboard_adc_tic.json
index a8b820f..e80b0e5 100644
--- a/configurations/meta/ventura_fanboard_adc_tic.json
+++ b/configurations/meta/ventura_fanboard_adc_tic.json
@@ -56,134 +56,6 @@
                 "in2_Scale": 133.262,
                 "in3_Name": "FCB_0_FAN_1_CURR_A",
                 "in3_Scale": 464
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN0_TACH_OL",
-                    "Pwm": 0,
-                    "PwmName": "FCB_0_FAN0_PWM",
-                    "Tachs": [
-                        1
-                    ]
-                },
-                "Index": 1,
-                "Name": "FCB_0_FAN0_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 39.2,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN0_TACH_IL",
-                    "Pwm": 0,
-                    "PwmName": "FCB_0_FAN0_PWM",
-                    "Tachs": [
-                        0
-                    ]
-                },
-                "Index": 0,
-                "Name": "FCB_0_FAN0_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 51,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN1_TACH_OL",
-                    "Pwm": 2,
-                    "PwmName": "FCB_0_FAN1_PWM",
-                    "Tachs": [
-                        2
-                    ]
-                },
-                "Index": 2,
-                "Name": "FCB_0_FAN1_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 39.2,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_0_FAN1_TACH_IL",
-                    "Pwm": 2,
-                    "PwmName": "FCB_0_FAN1_PWM",
-                    "Tachs": [
-                        7
-                    ]
-                },
-                "Index": 7,
-                "Name": "FCB_0_FAN1_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 51,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
             }
         ],
         "Name": "Ventura Fan Board 0",
@@ -261,134 +133,6 @@
                 "in2_Scale": 133.262,
                 "in3_Name": "FCB_1_FAN_3_CURR_A",
                 "in3_Scale": 464
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN2_TACH_OL",
-                    "Pwm": 3,
-                    "PwmName": "FCB_1_FAN2_PWM",
-                    "Tachs": [
-                        4
-                    ]
-                },
-                "Index": 4,
-                "Name": "FCB_1_FAN2_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 39.2,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN2_TACH_IL",
-                    "Pwm": 3,
-                    "PwmName": "FCB_1_FAN2_PWM",
-                    "Tachs": [
-                        3
-                    ]
-                },
-                "Index": 3,
-                "Name": "FCB_1_FAN2_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 51.0,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN3_TACH_OL",
-                    "Pwm": 5,
-                    "PwmName": "FCB_1_FAN3_PWM",
-                    "Tachs": [
-                        5
-                    ]
-                },
-                "Index": 5,
-                "Name": "FCB_1_FAN3_TACH_OL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 660.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 33000
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 39.2,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 1960
-                    }
-                ],
-                "Type": "I2CFan"
-            },
-            {
-                "Address": "0x20",
-                "Bus": "18",
-                "Connector": {
-                    "Name": "FCB_1_FAN3_TACH_IL",
-                    "Pwm": 5,
-                    "PwmName": "FCB_1_FAN3_PWM",
-                    "Tachs": [
-                        10
-                    ]
-                },
-                "Index": 10,
-                "Name": "FCB_1_FAN3_TACH_IL_SPEED_RPM",
-                "PowerState": "Always",
-                "Thresholds": [
-                    {
-                        "Direction": "greater than",
-                        "Hysteresis": 726.0,
-                        "Name": "upper critical",
-                        "Severity": 1,
-                        "Value": 36300
-                    },
-                    {
-                        "Direction": "less than",
-                        "Hysteresis": 51.0,
-                        "Name": "lower critical",
-                        "Severity": 1,
-                        "Value": 2550
-                    }
-                ],
-                "Type": "I2CFan"
             }
         ],
         "Name": "Ventura Fan Board 1",
diff --git a/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json b/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
index c77775e..c4684e6 100644
--- a/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
+++ b/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
@@ -1,6 +1,262 @@
 {
     "Exposes": [
         {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN0_TACH_OL",
+                "Pwm": 0,
+                "PwmName": "FCB_0_FAN0_PWM",
+                "Tachs": [
+                    1
+                ]
+            },
+            "Index": 1,
+            "Name": "FCB_0_FAN0_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN0_TACH_IL",
+                "Pwm": 0,
+                "PwmName": "FCB_0_FAN0_PWM",
+                "Tachs": [
+                    0
+                ]
+            },
+            "Index": 0,
+            "Name": "FCB_0_FAN0_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN1_TACH_OL",
+                "Pwm": 2,
+                "PwmName": "FCB_0_FAN1_PWM",
+                "Tachs": [
+                    2
+                ]
+            },
+            "Index": 2,
+            "Name": "FCB_0_FAN1_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN1_TACH_IL",
+                "Pwm": 2,
+                "PwmName": "FCB_0_FAN1_PWM",
+                "Tachs": [
+                    7
+                ]
+            },
+            "Index": 7,
+            "Name": "FCB_0_FAN1_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN2_TACH_OL",
+                "Pwm": 3,
+                "PwmName": "FCB_1_FAN2_PWM",
+                "Tachs": [
+                    4
+                ]
+            },
+            "Index": 4,
+            "Name": "FCB_1_FAN2_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN2_TACH_IL",
+                "Pwm": 3,
+                "PwmName": "FCB_1_FAN2_PWM",
+                "Tachs": [
+                    3
+                ]
+            },
+            "Index": 3,
+            "Name": "FCB_1_FAN2_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51.0,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN3_TACH_OL",
+                "Pwm": 5,
+                "PwmName": "FCB_1_FAN3_PWM",
+                "Tachs": [
+                    5
+                ]
+            },
+            "Index": 5,
+            "Name": "FCB_1_FAN3_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x20",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN3_TACH_IL",
+                "Pwm": 5,
+                "PwmName": "FCB_1_FAN3_PWM",
+                "Tachs": [
+                    10
+                ]
+            },
+            "Index": 10,
+            "Name": "FCB_1_FAN3_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51.0,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
             "Address": "0x40",
             "Bus": 10,
             "Labels": [
diff --git a/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
index fc25671..3b58531 100644
--- a/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
+++ b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
@@ -1,6 +1,262 @@
 {
     "Exposes": [
         {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN0_TACH_OL",
+                "Pwm": 0,
+                "PwmName": "FCB_0_FAN0_PWM",
+                "Tachs": [
+                    11
+                ]
+            },
+            "Index": 11,
+            "Name": "FCB_0_FAN0_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN0_TACH_IL",
+                "Pwm": 0,
+                "PwmName": "FCB_0_FAN0_PWM",
+                "Tachs": [
+                    9
+                ]
+            },
+            "Index": 9,
+            "Name": "FCB_0_FAN0_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN1_TACH_OL",
+                "Pwm": 4,
+                "PwmName": "FCB_0_FAN1_PWM",
+                "Tachs": [
+                    13
+                ]
+            },
+            "Index": 13,
+            "Name": "FCB_0_FAN1_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_0_FAN1_TACH_IL",
+                "Pwm": 4,
+                "PwmName": "FCB_0_FAN1_PWM",
+                "Tachs": [
+                    10
+                ]
+            },
+            "Index": 10,
+            "Name": "FCB_0_FAN1_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN2_TACH_OL",
+                "Pwm": 6,
+                "PwmName": "FCB_1_FAN2_PWM",
+                "Tachs": [
+                    1
+                ]
+            },
+            "Index": 1,
+            "Name": "FCB_1_FAN2_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN2_TACH_IL",
+                "Pwm": 6,
+                "PwmName": "FCB_1_FAN2_PWM",
+                "Tachs": [
+                    15
+                ]
+            },
+            "Index": 15,
+            "Name": "FCB_1_FAN2_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51.0,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN3_TACH_OL",
+                "Pwm": 10,
+                "PwmName": "FCB_1_FAN3_PWM",
+                "Tachs": [
+                    3
+                ]
+            },
+            "Index": 3,
+            "Name": "FCB_1_FAN3_TACH_OL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 660.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 33000
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 39.2,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 1960
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
+            "Address": "0x23",
+            "Bus": "18",
+            "Connector": {
+                "Name": "FCB_1_FAN3_TACH_IL",
+                "Pwm": 10,
+                "PwmName": "FCB_1_FAN3_PWM",
+                "Tachs": [
+                    0
+                ]
+            },
+            "Index": 0,
+            "Name": "FCB_1_FAN3_TACH_IL_SPEED_RPM",
+            "PowerState": "Always",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Hysteresis": 726.0,
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 36300
+                },
+                {
+                    "Direction": "less than",
+                    "Hysteresis": 51.0,
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 2550
+                }
+            ],
+            "Type": "I2CFan"
+        },
+        {
             "Address": "0x40",
             "Bus": 10,
             "Labels": [