From 507d4a55dce074e4922f577368ea7bdda70a3580 Mon Sep 17 00:00:00 2001
From: Matt Spinler <spinler@us.ibm.com>
Date: Wed, 15 Mar 2017 13:06:21 -0500
Subject: [PATCH] Wire up fsi_bit_bang part

The OpenBMC FSI device driver needs to know which BMC GPIOs are
wired to which FSI related functions, like data, clock, mux, etc.
So, an fsi_bit_bang part which has specifically named gpio slave units
will accept the GPIOs from the BMC, and then has an fsi-master unit
that can be wired to the processor's fsi-slave.
---
 witherspoon.xml | 1631 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 1234 insertions(+), 397 deletions(-)

diff --git a/witherspoon.xml b/witherspoon.xml
index 10fc2cc..1da4d76 100644
--- a/witherspoon.xml
+++ b/witherspoon.xml
@@ -2461,6 +2461,13 @@
 	<value></value>
 	</property>
 </globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1</id>
+	<property>
+	<id>FRU_ID</id>
+	<value></value>
+	</property>
+</globalSetting>
 <globalSetting>
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/BCM5719-0</id>
 	<property>
@@ -2646,13 +2653,43 @@
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_B20_gpioe0e7_uart3</id>
 	<property>
 	<id>IO_CONFIG_SELECT</id>
+	<value>1</value>
+	</property>
+	<property>
+	<id>IPMI_INSTANCE</id>
 	<value></value>
 	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_B20_gpioe0e7_uart3/chip-bmc-ast2500.pingroup_gpioe0e7</id>
 	<property>
 	<id>IPMI_INSTANCE</id>
 	<value></value>
 	</property>
 </globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_B20_gpioe0e7_uart3/chip-bmc-ast2500.pingroup_gpioe0e7/chip-bmc-ast2500.GPIOE0</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
 <globalSetting>
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_B20_gpioe0e7_uart3/chip-bmc-ast2500.pingroup_uart3/chip-bmc-ast2500.UART3</id>
 	<property>
@@ -2728,6 +2765,47 @@
 	<value></value>
 	</property>
 </globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_C13_gpioa6_timer7</id>
+	<property>
+	<id>IO_CONFIG_SELECT</id>
+	<value>1</value>
+	</property>
+	<property>
+	<id>IPMI_INSTANCE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_C13_gpioa6_timer7/chip-bmc-ast2500.pingroup_gpioa6</id>
+	<property>
+	<id>IPMI_INSTANCE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_C13_gpioa6_timer7/chip-bmc-ast2500.pingroup_gpioa6/chip-bmc-ast2500.GPIOA6</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
 <globalSetting>
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_C14_gpioa4_timer5_i2c9/chip-bmc-ast2500.pingroup_i2c9/chip-bmc-ast2500.I2C9</id>
 	<property>
@@ -2764,6 +2842,47 @@
 	<value></value>
 	</property>
 </globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_F19_gpiod0d7_sd</id>
+	<property>
+	<id>IO_CONFIG_SELECT</id>
+	<value>1</value>
+	</property>
+	<property>
+	<id>IPMI_INSTANCE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_F19_gpiod0d7_sd/chip-bmc-ast2500.pingroup_gpiod0d7</id>
+	<property>
+	<id>IPMI_INSTANCE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_F19_gpiod0d7_sd/chip-bmc-ast2500.pingroup_gpiod0d7/chip-bmc-ast2500.GPIOD0</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
 <globalSetting>
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_G21_espi_lpc_gpioac0ac7</id>
 	<property>
@@ -2878,13 +2997,43 @@
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_T17_gpior2r5_spi2</id>
 	<property>
 	<id>IO_CONFIG_SELECT</id>
+	<value>1</value>
+	</property>
+	<property>
+	<id>IPMI_INSTANCE</id>
 	<value></value>
 	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_T17_gpior2r5_spi2/chip-bmc-ast2500.pingroup_gpior2r5</id>
 	<property>
 	<id>IPMI_INSTANCE</id>
 	<value></value>
 	</property>
 </globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_T17_gpior2r5_spi2/chip-bmc-ast2500.pingroup_gpior2r5/chip-bmc-ast2500.GPIOR2</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
 <globalSetting>
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_T17_gpior2r5_spi2/chip-bmc-ast2500.pingroup_spi2</id>
 	<property>
@@ -3072,6 +3221,47 @@
 	<value></value>
 	</property>
 </globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_Y21_gpioaa0</id>
+	<property>
+	<id>IO_CONFIG_SELECT</id>
+	<value>1</value>
+	</property>
+	<property>
+	<id>IPMI_INSTANCE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_Y21_gpioaa0/chip-bmc-ast2500.pingroup_gpioaa0</id>
+	<property>
+	<id>IPMI_INSTANCE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_Y21_gpioaa0/chip-bmc-ast2500.pingroup_gpioaa0/chip-bmc-ast2500.GPIOAA0</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
 <globalSetting>
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/bmcserialconnector-1/chip-uartslave.uart-0</id>
 	<property>
@@ -3079,6 +3269,121 @@
 	<value></value>
 	</property>
 </globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/fsi_bit_bang-0/fsi_bit_bang.fsi_clk-0</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/fsi_bit_bang-0/fsi_bit_bang.fsi_dat-1</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/fsi_bit_bang-0/fsi_bit_bang.fsi_enable</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/fsi_bit_bang-0/fsi_bit_bang.fsi_mux</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/fsi_bit_bang-0/fsi_bit_bang.fsi_trans</id>
+	<property>
+	<id>DIRECTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>DRIVER_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>GPIO_TYPE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>PIN_NAME</id>
+	<value></value>
+	</property>
+	<property>
+	<id>POR_VALUE</id>
+	<value></value>
+	</property>
+</globalSetting>
 <globalSetting>
 	<id>/sys-0/node-0/motherboard-0/boxconn-6/boxelder-1/rtc-0</id>
 	<property>
@@ -6541,30 +6846,11 @@
 	</property>
 	<property>
 	<id>LED_TYPE</id>
-	<value></value>
-	</property>
-</globalSetting>
-<globalSetting>
-	<id>/sys-0/node-0/motherboard-0/rear-fault-led-0</id>
-	<property>
-	<id>BLINK_RATE</id>
-	<value></value>
-	</property>
-	<property>
-	<id>FUNCTION</id>
-	<value></value>
-	</property>
-	<property>
-	<id>IPMI_INSTANCE</id>
-	<value></value>
-	</property>
-	<property>
-	<id>LED_TYPE</id>
 	<value>ENC-FAULT</value>
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/rear-fault-led-0/led_enable</id>
+	<id>/sys-0/node-0/motherboard-0/rear-fault-0/led_enable</id>
 	<property>
 	<id>DIRECTION</id>
 	<value></value>
@@ -6587,7 +6873,7 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/rear-id-led-1</id>
+	<id>/sys-0/node-0/motherboard-0/rear-id-1</id>
 	<property>
 	<id>BLINK_RATE</id>
 	<value></value>
@@ -6606,7 +6892,7 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/rear-id-led-1/led_enable</id>
+	<id>/sys-0/node-0/motherboard-0/rear-id-1/led_enable</id>
 	<property>
 	<id>DIRECTION</id>
 	<value></value>
@@ -6629,7 +6915,7 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/rear-power-led-2</id>
+	<id>/sys-0/node-0/motherboard-0/rear-power-2</id>
 	<property>
 	<id>BLINK_RATE</id>
 	<value></value>
@@ -6648,7 +6934,7 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/rear-power-led-2/led_enable</id>
+	<id>/sys-0/node-0/motherboard-0/rear-power-2/led_enable</id>
 	<property>
 	<id>DIRECTION</id>
 	<value></value>
@@ -7363,7 +7649,22 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-fault-led-4/led_enable</id>
+	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-fault-4</id>
+	<property>
+	<id>BLINK_RATE</id>
+	<value></value>
+	</property>
+	<property>
+	<id>FUNCTION</id>
+	<value></value>
+	</property>
+	<property>
+	<id>LED_TYPE</id>
+	<value>ENC-FAULT</value>
+	</property>
+</globalSetting>
+<globalSetting>
+	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-fault-4/led_enable</id>
 	<property>
 	<id>DIRECTION</id>
 	<value></value>
@@ -7386,7 +7687,7 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-id-led-5/led_enable</id>
+	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-id-5/led_enable</id>
 	<property>
 	<id>DIRECTION</id>
 	<value></value>
@@ -7409,7 +7710,7 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-power-led-3</id>
+	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-power-3</id>
 	<property>
 	<id>BLINK_RATE</id>
 	<value></value>
@@ -7428,7 +7729,7 @@
 	</property>
 </globalSetting>
 <globalSetting>
-	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-power-led-3/led_enable</id>
+	<id>/sys-0/node-0/motherboard-0/teakconn-7/teak-2/front-power-3/led_enable</id>
 	<property>
 	<id>DIRECTION</id>
 	<value></value>
@@ -11001,9 +11302,9 @@
 	<child_id>planar_vpd-0</child_id>
 	<child_id>boxconn-6</child_id>
 	<child_id>teakconn-7</child_id>
-	<child_id>rear-fault-led-0</child_id>
-	<child_id>rear-id-led-1</child_id>
-	<child_id>rear-power-led-2</child_id>
+	<child_id>rear-fault-0</child_id>
+	<child_id>rear-id-1</child_id>
+	<child_id>rear-power-2</child_id>
 	<child_id>UCD90160-0</child_id>
 	<child_id>PCA9552-0</child_id>
 	<child_id>TMP423A-0</child_id>
@@ -11345,12 +11646,12 @@
 		</bus_attribute>
 	</bus>
 	<bus>
-		<bus_id>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_V3_gpion2_pwm2/chip-bmc-ast2500.pingroup_gpion2/chip-bmc-ast2500.GPION2 => rear-fault-led-0/led_enable</bus_id>
+		<bus_id>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_V3_gpion2_pwm2/chip-bmc-ast2500.pingroup_gpion2/chip-bmc-ast2500.GPION2 => rear-fault-0/led_enable</bus_id>
 		<bus_type>GPIO</bus_type>
 		<cable>no</cable>
 		<source_path>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_V3_gpion2_pwm2/chip-bmc-ast2500.pingroup_gpion2/</source_path>
 		<source_target>chip-bmc-ast2500.GPION2</source_target>
-		<dest_path>rear-fault-led-0/</dest_path>
+		<dest_path>rear-fault-0/</dest_path>
 		<dest_target>led_enable</dest_target>
 		<bus_attribute>
 			<id>BUS_WIDTH</id>
@@ -11362,12 +11663,12 @@
 		</bus_attribute>
 	</bus>
 	<bus>
-		<bus_id>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_W3_gpion4_pwm4/chip-bmc-ast2500.pingroup_gpion4/chip-bmc-ast2500.GPION4 => rear-id-led-1/led_enable</bus_id>
+		<bus_id>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_W3_gpion4_pwm4/chip-bmc-ast2500.pingroup_gpion4/chip-bmc-ast2500.GPION4 => rear-id-1/led_enable</bus_id>
 		<bus_type>GPIO</bus_type>
 		<cable>no</cable>
 		<source_path>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_W3_gpion4_pwm4/chip-bmc-ast2500.pingroup_gpion4/</source_path>
 		<source_target>chip-bmc-ast2500.GPION4</source_target>
-		<dest_path>rear-id-led-1/</dest_path>
+		<dest_path>rear-id-1/</dest_path>
 		<dest_target>led_enable</dest_target>
 		<bus_attribute>
 			<id>BUS_WIDTH</id>
@@ -11379,12 +11680,12 @@
 		</bus_attribute>
 	</bus>
 	<bus>
-		<bus_id>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_U3_gpion3_pwm3/chip-bmc-ast2500.pingroup_gpion3/chip-bmc-ast2500.GPION3 => rear-power-led-2/led_enable</bus_id>
+		<bus_id>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_U3_gpion3_pwm3/chip-bmc-ast2500.pingroup_gpion3/chip-bmc-ast2500.GPION3 => rear-power-2/led_enable</bus_id>
 		<bus_type>GPIO</bus_type>
 		<cable>no</cable>
 		<source_path>boxconn-6/boxelder-1/bmc-0/chip-bmc-ast2500.pin_U3_gpion3_pwm3/chip-bmc-ast2500.pingroup_gpion3/</source_path>
 		<source_target>chip-bmc-ast2500.GPION3</source_target>
-		<dest_path>rear-power-led-2/</dest_path>
+		<dest_path>rear-power-2/</dest_path>
 		<dest_target>led_enable</dest_target>
 		<bus_attribute>
 			<id>BUS_WIDTH</id>
@@ -21867,8 +22168,8 @@
 		<default>0,0,0,0</default>
 	</attribute>
 	<attribute>
-        <id>PEC_PCIE_LANE_MASK_NON_BIFURCATED</id>
-        <default>0x0000,0x0000,0x0000,0x0000</default>
+		<id>PEC_PCIE_LANE_MASK_NON_BIFURCATED</id>
+		<default>0x0000,0x0000,0x0000,0x0000</default>
 	</attribute>
 	<attribute>
 		<id>PHYS_PATH</id>
@@ -21896,8 +22197,8 @@
 		<default>0</default>
 	</attribute>
 	<attribute>
-        <id>PROC_PCIE_LANE_MASK</id>
-        <default>0x0000,0x0000,0x0000,0x0000</default>
+		<id>PROC_PCIE_LANE_MASK</id>
+		<default>0x0000,0x0000,0x0000,0x0000</default>
 	</attribute>
 	<attribute>
 		<id>PROC_PCIE_PCS_M_CNTL</id>
@@ -22525,7 +22826,7 @@
 	</attribute>
 	<attribute>
 		<id>PEC_PCIE_LANE_MASK_NON_BIFURCATED</id>
-        <default>0x0000,0x0000,0x0000,0x0000</default>
+		<default>0x0000,0x0000,0x0000,0x0000</default>
 	</attribute>
 	<attribute>
 		<id>PHYS_PATH</id>
@@ -22554,7 +22855,7 @@
 	</attribute>
 	<attribute>
 		<id>PROC_PCIE_LANE_MASK</id>
-        <default>0x0000,0x0000,0x0000,0x0000</default>
+		<default>0x0000,0x0000,0x0000,0x0000</default>
 	</attribute>
 	<attribute>
 		<id>PROC_PCIE_PCS_M_CNTL</id>
@@ -23486,7 +23787,7 @@
 	</attribute>
 	<attribute>
 		<id>PEC_PCIE_LANE_MASK_NON_BIFURCATED</id>
-        <default>0x0000,0x0000,0x0000,0x0000</default>
+		<default>0x0000,0x0000,0x0000,0x0000</default>
 	</attribute>
 	<attribute>
 		<id>PHYS_PATH</id>
@@ -23515,7 +23816,7 @@
 	</attribute>
 	<attribute>
 		<id>PROC_PCIE_LANE_MASK</id>
-        <default>0x0000,0x0000,0x0000,0x0000</default>
+		<default>0x0000,0x0000,0x0000,0x0000</default>
 	</attribute>
 	<attribute>
 		<id>PROC_PCIE_PCS_M_CNTL</id>
@@ -47797,6 +48098,10 @@
 		<id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id>
 		<default></default>
 	</attribute>
+	<attribute>
+		<id>IPMI_INSTANCE</id>
+		<default>0xFF</default>
+	</attribute>
 	<attribute>
 		<id>MODEL</id>
 		<default></default>
@@ -49576,6 +49881,7 @@
 	<child_id>BCM5719-0</child_id>
 	<child_id>RS232connector-0</child_id>
 	<child_id>bmcserialconnector-1</child_id>
+	<child_id>fsi_bit_bang-0</child_id>
 	<attribute>
 		<id>CARD_TYPE</id>
 		<default></default>
@@ -49629,6 +49935,91 @@
 		<default>BUS</default>
 		</bus_attribute>
 	</bus>
+	<bus>
+		<bus_id>bmc-0/chip-bmc-ast2500.pin_Y21_gpioaa0/chip-bmc-ast2500.pingroup_gpioaa0/chip-bmc-ast2500.GPIOAA0 => fsi_bit_bang-0/fsi_bit_bang.fsi_clk-0</bus_id>
+		<bus_type>GPIO</bus_type>
+		<cable>no</cable>
+		<source_path>bmc-0/chip-bmc-ast2500.pin_Y21_gpioaa0/chip-bmc-ast2500.pingroup_gpioaa0/</source_path>
+		<source_target>chip-bmc-ast2500.GPIOAA0</source_target>
+		<dest_path>fsi_bit_bang-0/</dest_path>
+		<dest_target>fsi_bit_bang.fsi_clk-0</dest_target>
+		<bus_attribute>
+			<id>BUS_WIDTH</id>
+		<default>1</default>
+		</bus_attribute>
+		<bus_attribute>
+			<id>CLASS</id>
+		<default>BUS</default>
+		</bus_attribute>
+	</bus>
+	<bus>
+		<bus_id>bmc-0/chip-bmc-ast2500.pin_B20_gpioe0e7_uart3/chip-bmc-ast2500.pingroup_gpioe0e7/chip-bmc-ast2500.GPIOE0 => fsi_bit_bang-0/fsi_bit_bang.fsi_dat-1</bus_id>
+		<bus_type>GPIO</bus_type>
+		<cable>no</cable>
+		<source_path>bmc-0/chip-bmc-ast2500.pin_B20_gpioe0e7_uart3/chip-bmc-ast2500.pingroup_gpioe0e7/</source_path>
+		<source_target>chip-bmc-ast2500.GPIOE0</source_target>
+		<dest_path>fsi_bit_bang-0/</dest_path>
+		<dest_target>fsi_bit_bang.fsi_dat-1</dest_target>
+		<bus_attribute>
+			<id>BUS_WIDTH</id>
+		<default>1</default>
+		</bus_attribute>
+		<bus_attribute>
+			<id>CLASS</id>
+		<default>BUS</default>
+		</bus_attribute>
+	</bus>
+	<bus>
+		<bus_id>bmc-0/chip-bmc-ast2500.pin_F19_gpiod0d7_sd/chip-bmc-ast2500.pingroup_gpiod0d7/chip-bmc-ast2500.GPIOD0 => fsi_bit_bang-0/fsi_bit_bang.fsi_enable</bus_id>
+		<bus_type>GPIO</bus_type>
+		<cable>no</cable>
+		<source_path>bmc-0/chip-bmc-ast2500.pin_F19_gpiod0d7_sd/chip-bmc-ast2500.pingroup_gpiod0d7/</source_path>
+		<source_target>chip-bmc-ast2500.GPIOD0</source_target>
+		<dest_path>fsi_bit_bang-0/</dest_path>
+		<dest_target>fsi_bit_bang.fsi_enable</dest_target>
+		<bus_attribute>
+			<id>BUS_WIDTH</id>
+		<default>1</default>
+		</bus_attribute>
+		<bus_attribute>
+			<id>CLASS</id>
+		<default>BUS</default>
+		</bus_attribute>
+	</bus>
+	<bus>
+		<bus_id>bmc-0/chip-bmc-ast2500.pin_C13_gpioa6_timer7/chip-bmc-ast2500.pingroup_gpioa6/chip-bmc-ast2500.GPIOA6 => fsi_bit_bang-0/fsi_bit_bang.fsi_mux</bus_id>
+		<bus_type>GPIO</bus_type>
+		<cable>no</cable>
+		<source_path>bmc-0/chip-bmc-ast2500.pin_C13_gpioa6_timer7/chip-bmc-ast2500.pingroup_gpioa6/</source_path>
+		<source_target>chip-bmc-ast2500.GPIOA6</source_target>
+		<dest_path>fsi_bit_bang-0/</dest_path>
+		<dest_target>fsi_bit_bang.fsi_mux</dest_target>
+		<bus_attribute>
+			<id>BUS_WIDTH</id>
+		<default>1</default>
+		</bus_attribute>
+		<bus_attribute>
+			<id>CLASS</id>
+		<default>BUS</default>
+		</bus_attribute>
+	</bus>
+	<bus>
+		<bus_id>bmc-0/chip-bmc-ast2500.pin_T17_gpior2r5_spi2/chip-bmc-ast2500.pingroup_gpior2r5/chip-bmc-ast2500.GPIOR2 => fsi_bit_bang-0/fsi_bit_bang.fsi_trans</bus_id>
+		<bus_type>GPIO</bus_type>
+		<cable>no</cable>
+		<source_path>bmc-0/chip-bmc-ast2500.pin_T17_gpior2r5_spi2/chip-bmc-ast2500.pingroup_gpior2r5/</source_path>
+		<source_target>chip-bmc-ast2500.GPIOR2</source_target>
+		<dest_path>fsi_bit_bang-0/</dest_path>
+		<dest_target>fsi_bit_bang.fsi_trans</dest_target>
+		<bus_attribute>
+			<id>BUS_WIDTH</id>
+		<default>1</default>
+		</bus_attribute>
+		<bus_attribute>
+			<id>CLASS</id>
+		<default>BUS</default>
+		</bus_attribute>
+	</bus>
 	<bus>
 		<bus_id>bmc-0/chip-bmc-ast2500.pin_C12_gpioc0c7_sd1_i2c/chip-bmc-ast2500.pingroup_i2c10111213/chip-bmc-ast2500.I2C12 => rtc-0/RX8900CE.i2c</bus_id>
 		<bus_type>I2C</bus_type>
@@ -108567,17 +108958,48 @@
 	<instance_name>BMC_FLASH.spi-slave</instance_name>
 	<position>0</position>
 	<attribute>
-		<id>AFFINITY_PATH</id>
+		<id>BUS_TYPE</id>
+		<default>SPI</default>
+	</attribute>
+	<attribute>
+		<id>CHIP_UNIT</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>CLASS</id>
+		<default>UNIT</default>
+	</attribute>
+	<attribute>
+		<id>DIRECTION</id>
+		<default>IN</default>
+	</attribute>
+	<attribute>
+		<id>MODEL</id>
 		<default></default>
 	</attribute>
 	<attribute>
-		<id>BUS_TYPE</id>
-		<default>SPI</default>
+		<id>MRW_TYPE</id>
+		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>CHIPLET_ID</id>
+		<id>RESOURCE_IS_CRITICAL</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>TYPE</id>
 		<default></default>
 	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>BMC_FLASH.gpio-slave-0</id>
+	<type>unit-gpio-generic</type>
+	<is_root>false</is_root>
+	<instance_name>BMC_FLASH.gpio-slave</instance_name>
+	<position>0</position>
+	<attribute>
+		<id>BUS_TYPE</id>
+		<default>GPIO</default>
+	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
 		<default>0</default>
@@ -108586,13 +109008,90 @@
 		<id>CLASS</id>
 		<default>UNIT</default>
 	</attribute>
+	<attribute>
+		<id>DIRECTION</id>
+		<default>IN</default>
+	</attribute>
+	<attribute>
+		<id>DRIVER_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>ENGINE</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>GPIO_TYPE</id>
+		<default>GENERIC_OUTPUT</default>
+	</attribute>
+	<attribute>
+		<id>MRW_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>PIN_NAME</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>PIN_NUM</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>POR_VALUE</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>SCHEMATIC_INTERFACE</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>TYPE</id>
+		<default>NA</default>
+	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>BMC_FLASH-1</id>
+	<type>chip-BMC_FLASH</type>
+	<is_root>false</is_root>
+	<instance_name>BMC_FLASH</instance_name>
+	<position>1</position>
+	<child_id>BMC_FLASH.spi-slave-0</child_id>
+	<child_id>BMC_FLASH.gpio-slave-0</child_id>
+	<attribute>
+		<id>AFFINITY_PATH</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>ALTFSI_MASTER_CHIP</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>ALTFSI_MASTER_PORT</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>CCIN</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>CHIP_ID</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>CLASS</id>
+		<default>CHIP</default>
+	</attribute>
 	<attribute>
 		<id>DECONFIG_GARDABLE</id>
 		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>DIRECTION</id>
-		<default>IN</default>
+		<id>EC</id>
+		<default></default>
 	</attribute>
 	<attribute>
 		<id>FAPI_NAME</id>
@@ -108602,6 +109101,33 @@
 		<id>FAPI_POS</id>
 		<default></default>
 	</attribute>
+	<attribute>
+		<id>FRU_ID</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FSI_MASTER_CHIP</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FSI_MASTER_PORT</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FSI_MASTER_TYPE</id>
+		<default>NO_MASTER</default>
+	</attribute>
+	<attribute>
+		<id>FSI_OPTION_FLAGS</id>
+		<default>
+				<field><id>flipPort</id><value></value></field>
+				<field><id>reserved</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>FSI_SLAVE_CASCADE</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>HUID</id>
 		<default></default>
@@ -108629,13 +109155,21 @@
 		<id>IPMI_INSTANCE</id>
 		<default>0xFF</default>
 	</attribute>
+	<attribute>
+		<id>LOCATION_CODE</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>LOCATION_CODE_TYPE</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>MODEL</id>
 		<default></default>
 	</attribute>
 	<attribute>
 		<id>MRU_ID</id>
-		<default></default>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
@@ -108649,19 +109183,119 @@
 		<id>PHYS_PATH</id>
 		<default></default>
 	</attribute>
+	<attribute>
+		<id>POSITION</id>
+		<default>1</default>
+	</attribute>
 	<attribute>
 		<id>PRIMARY_CAPABILITIES</id>
 		<default>
-				<field><id>supportsFsiScom</id><value>1</value></field>
-				<field><id>supportsXscom</id><value>1</value></field>
-				<field><id>supportsInbandScom</id><value>0</value></field>
-				<field><id>reserved</id><value>0</value></field>
+				<field><id>supportsFsiScom</id><value></value></field>
+				<field><id>supportsXscom</id><value></value></field>
+				<field><id>supportsInbandScom</id><value></value></field>
+				<field><id>reserved</id><value></value></field>
 		</default>
 	</attribute>
 	<attribute>
-		<id>REL_POS</id>
+		<id>RESOURCE_IS_CRITICAL</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>RU_TYPE</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>TYPE</id>
+		<default>FLASH</default>
+	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>PNOR_FLASH-0</id>
+	<type>chip-PNOR_FLASH</type>
+	<is_root>false</is_root>
+	<instance_name>PNOR_FLASH</instance_name>
+	<position>0</position>
+	<child_id>PNOR_FLASH.spi-slave-0</child_id>
+	<child_id>PNOR_FLASH.gpio-slave-0</child_id>
+	<attribute>
+		<id>CCIN</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>CHIP_ID</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>CLASS</id>
+		<default>CHIP</default>
+	</attribute>
+	<attribute>
+		<id>LOCATION_CODE</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>LOCATION_CODE_TYPE</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>MODEL</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>MRU_ID</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>MRW_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>POSITION</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>RESOURCE_IS_CRITICAL</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>RU_TYPE</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>TYPE</id>
+		<default>FLASH</default>
+	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>PNOR_FLASH.spi-slave-0</id>
+	<type>spi-slave</type>
+	<is_root>false</is_root>
+	<instance_name>PNOR_FLASH.spi-slave</instance_name>
+	<position>0</position>
+	<attribute>
+		<id>BUS_TYPE</id>
+		<default>SPI</default>
+	</attribute>
+	<attribute>
+		<id>CHIP_UNIT</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>CLASS</id>
+		<default>UNIT</default>
+	</attribute>
+	<attribute>
+		<id>DIRECTION</id>
+		<default>IN</default>
+	</attribute>
+	<attribute>
+		<id>MODEL</id>
 		<default></default>
 	</attribute>
+	<attribute>
+		<id>MRW_TYPE</id>
+		<default>NA</default>
+	</attribute>
 	<attribute>
 		<id>RESOURCE_IS_CRITICAL</id>
 		<default>0</default>
@@ -108672,10 +109306,10 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>BMC_FLASH.gpio-slave-0</id>
+	<id>PNOR_FLASH.gpio-slave-0</id>
 	<type>unit-gpio-generic</type>
 	<is_root>false</is_root>
-	<instance_name>BMC_FLASH.gpio-slave</instance_name>
+	<instance_name>PNOR_FLASH.gpio-slave</instance_name>
 	<position>0</position>
 	<attribute>
 		<id>BUS_TYPE</id>
@@ -108735,113 +109369,117 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>BMC_FLASH-1</id>
-	<type>chip-BMC_FLASH</type>
+	<id>rtc-0</id>
+	<type>chip-RX8900CE</type>
 	<is_root>false</is_root>
-	<instance_name>BMC_FLASH</instance_name>
-	<position>1</position>
-	<child_id>BMC_FLASH.spi-slave-0</child_id>
-	<child_id>BMC_FLASH.gpio-slave-0</child_id>
+	<instance_name>rtc</instance_name>
+	<position>0</position>
+	<child_id>RX8900CE.i2c</child_id>
 	<attribute>
-		<id>AFFINITY_PATH</id>
-		<default></default>
+		<id>BMC_DT_COMPATIBLE</id>
+		<default>epson,rx8900</default>
 	</attribute>
 	<attribute>
-		<id>ALTFSI_MASTER_CHIP</id>
+		<id>CHIP_ID</id>
 		<default></default>
 	</attribute>
 	<attribute>
-		<id>ALTFSI_MASTER_PORT</id>
-		<default></default>
+		<id>CLASS</id>
+		<default>CHIP</default>
 	</attribute>
 	<attribute>
-		<id>CCIN</id>
+		<id>MODEL</id>
 		<default></default>
 	</attribute>
 	<attribute>
-		<id>CHIP_ID</id>
-		<default></default>
+		<id>MRU_ID</id>
+		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>CLASS</id>
-		<default>CHIP</default>
+		<id>MRW_TYPE</id>
+		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>DECONFIG_GARDABLE</id>
+		<id>POSITION</id>
 		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>EC</id>
-		<default></default>
+		<id>RESOURCE_IS_CRITICAL</id>
+		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>FAPI_NAME</id>
+		<id>RU_TYPE</id>
 		<default></default>
 	</attribute>
 	<attribute>
-		<id>FAPI_POS</id>
-		<default></default>
+		<id>TYPE</id>
+		<default>RTC</default>
 	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>RX8900CE.i2c</id>
+	<type>unit-i2c-slave</type>
+	<is_root>false</is_root>
+	<instance_name>RX8900CE.i2c</instance_name>
+	<position>-1</position>
 	<attribute>
-		<id>FRU_ID</id>
-		<default></default>
+		<id>BUS_TYPE</id>
+		<default>I2C</default>
 	</attribute>
 	<attribute>
-		<id>FSI_MASTER_CHIP</id>
-		<default></default>
+		<id>CHIP_UNIT</id>
+		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>FSI_MASTER_PORT</id>
-		<default></default>
+		<id>CLASS</id>
+		<default>UNIT</default>
 	</attribute>
 	<attribute>
-		<id>FSI_MASTER_TYPE</id>
-		<default>NO_MASTER</default>
+		<id>DIRECTION</id>
+		<default>IN</default>
 	</attribute>
 	<attribute>
-		<id>FSI_OPTION_FLAGS</id>
-		<default>
-				<field><id>flipPort</id><value></value></field>
-				<field><id>reserved</id><value></value></field>
-		</default>
+		<id>I2C_ADDRESS</id>
+		<default>0x64</default>
 	</attribute>
 	<attribute>
-		<id>FSI_SLAVE_CASCADE</id>
-		<default></default>
+		<id>MRW_TYPE</id>
+		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>HUID</id>
-		<default></default>
+		<id>TYPE</id>
+		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>HWAS_STATE</id>
-		<default>
-				<field><id>deconfiguredByEid</id><value></value></field>
-				<field><id>poweredOn</id><value></value></field>
-				<field><id>present</id><value></value></field>
-				<field><id>functional</id><value></value></field>
-				<field><id>dumpfunctional</id><value></value></field>
-				<field><id>specdeconfig</id><value></value></field>
-		</default>
+		<id>VPD_SIZE</id>
+		<default>NA</default>
 	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>SEEPROM-0</id>
+	<type>chip-SEEPROM</type>
+	<is_root>false</is_root>
+	<instance_name>SEEPROM</instance_name>
+	<position>0</position>
+	<child_id>SEEPROM.i2c</child_id>
 	<attribute>
-		<id>HWAS_STATE_CHANGED_FLAG</id>
-		<default></default>
+		<id>BMC_DT_ATTR_NAMES</id>
+		<default>WRITE_PAGE_SIZE, pagesize</default>
 	</attribute>
 	<attribute>
-		<id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id>
-		<default></default>
+		<id>BMC_DT_COMPATIBLE</id>
+		<default>atmel,24c64</default>
 	</attribute>
 	<attribute>
-		<id>IPMI_INSTANCE</id>
-		<default>0xFF</default>
+		<id>CHIP_ID</id>
+		<default></default>
 	</attribute>
 	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
+		<id>CLASS</id>
+		<default>CHIP</default>
 	</attribute>
 	<attribute>
-		<id>LOCATION_CODE_TYPE</id>
+		<id>MEMORY_SIZE_IN_KB</id>
 		<default></default>
 	</attribute>
 	<attribute>
@@ -108854,28 +109492,11 @@
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
-		<default>NA</default>
-	</attribute>
-	<attribute>
-		<id>ORDINAL_ID</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>PHYS_PATH</id>
-		<default></default>
+		<default>VPD</default>
 	</attribute>
 	<attribute>
 		<id>POSITION</id>
-		<default>1</default>
-	</attribute>
-	<attribute>
-		<id>PRIMARY_CAPABILITIES</id>
-		<default>
-				<field><id>supportsFsiScom</id><value></value></field>
-				<field><id>supportsXscom</id><value></value></field>
-				<field><id>supportsInbandScom</id><value></value></field>
-				<field><id>reserved</id><value></value></field>
-		</default>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>RESOURCE_IS_CRITICAL</id>
@@ -108887,99 +109508,89 @@
 	</attribute>
 	<attribute>
 		<id>TYPE</id>
-		<default>FLASH</default>
+		<default>SEEPROM</default>
+	</attribute>
+	<attribute>
+		<id>WRITE_PAGE_SIZE</id>
+		<default>32</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>PNOR_FLASH-0</id>
-	<type>chip-PNOR_FLASH</type>
+	<id>SEEPROM.i2c</id>
+	<type>unit-i2c-slave</type>
 	<is_root>false</is_root>
-	<instance_name>PNOR_FLASH</instance_name>
-	<position>0</position>
-	<child_id>PNOR_FLASH.spi-slave-0</child_id>
-	<child_id>PNOR_FLASH.gpio-slave-0</child_id>
+	<instance_name>SEEPROM.i2c</instance_name>
+	<position>-1</position>
 	<attribute>
-		<id>CCIN</id>
-		<default></default>
+		<id>BUS_TYPE</id>
+		<default>I2C</default>
 	</attribute>
 	<attribute>
-		<id>CHIP_ID</id>
-		<default></default>
+		<id>CHIP_UNIT</id>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
-		<default>CHIP</default>
-	</attribute>
-	<attribute>
-		<id>LOCATION_CODE</id>
-		<default></default>
+		<default>UNIT</default>
 	</attribute>
 	<attribute>
-		<id>LOCATION_CODE_TYPE</id>
-		<default></default>
+		<id>DIRECTION</id>
+		<default>IN</default>
 	</attribute>
 	<attribute>
-		<id>MODEL</id>
+		<id>I2C_ADDRESS</id>
 		<default></default>
 	</attribute>
-	<attribute>
-		<id>MRU_ID</id>
-		<default>0</default>
-	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>POSITION</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>RU_TYPE</id>
-		<default></default>
+		<id>TYPE</id>
+		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>TYPE</id>
-		<default>FLASH</default>
+		<id>VPD_SIZE</id>
+		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>PNOR_FLASH.spi-slave-0</id>
-	<type>spi-slave</type>
+	<id>BCM5719-0</id>
+	<type>chip-BCM5719</type>
 	<is_root>false</is_root>
-	<instance_name>PNOR_FLASH.spi-slave</instance_name>
+	<instance_name>BCM5719</instance_name>
 	<position>0</position>
+	<child_id>BCM5719.port0</child_id>
+	<child_id>BCM5719.port1</child_id>
+	<child_id>BCM5719.port2</child_id>
+	<child_id>BCM5719.port3</child_id>
 	<attribute>
 		<id>AFFINITY_PATH</id>
 		<default></default>
 	</attribute>
 	<attribute>
-		<id>BUS_TYPE</id>
-		<default>SPI</default>
+		<id>ALTFSI_MASTER_CHIP</id>
+		<default></default>
 	</attribute>
 	<attribute>
-		<id>CHIPLET_ID</id>
+		<id>ALTFSI_MASTER_PORT</id>
 		<default></default>
 	</attribute>
 	<attribute>
-		<id>CHIP_UNIT</id>
-		<default>0</default>
+		<id>CHIP_ID</id>
+		<default></default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
-		<default>UNIT</default>
+		<default>CHIP</default>
 	</attribute>
 	<attribute>
 		<id>DECONFIG_GARDABLE</id>
 		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>DIRECTION</id>
-		<default>IN</default>
+		<id>EC</id>
+		<default></default>
 	</attribute>
 	<attribute>
 		<id>FAPI_NAME</id>
@@ -108989,6 +109600,33 @@
 		<id>FAPI_POS</id>
 		<default></default>
 	</attribute>
+	<attribute>
+		<id>FRU_ID</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FSI_MASTER_CHIP</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FSI_MASTER_PORT</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FSI_MASTER_TYPE</id>
+		<default>NO_MASTER</default>
+	</attribute>
+	<attribute>
+		<id>FSI_OPTION_FLAGS</id>
+		<default>
+				<field><id>flipPort</id><value></value></field>
+				<field><id>reserved</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>FSI_SLAVE_CASCADE</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>HUID</id>
 		<default></default>
@@ -109022,7 +109660,7 @@
 	</attribute>
 	<attribute>
 		<id>MRU_ID</id>
-		<default></default>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
@@ -109036,37 +109674,41 @@
 		<id>PHYS_PATH</id>
 		<default></default>
 	</attribute>
+	<attribute>
+		<id>POSITION</id>
+		<default>0</default>
+	</attribute>
 	<attribute>
 		<id>PRIMARY_CAPABILITIES</id>
 		<default>
-				<field><id>supportsFsiScom</id><value>1</value></field>
-				<field><id>supportsXscom</id><value>1</value></field>
-				<field><id>supportsInbandScom</id><value>0</value></field>
-				<field><id>reserved</id><value>0</value></field>
+				<field><id>supportsFsiScom</id><value></value></field>
+				<field><id>supportsXscom</id><value></value></field>
+				<field><id>supportsInbandScom</id><value></value></field>
+				<field><id>reserved</id><value></value></field>
 		</default>
 	</attribute>
-	<attribute>
-		<id>REL_POS</id>
-		<default></default>
-	</attribute>
 	<attribute>
 		<id>RESOURCE_IS_CRITICAL</id>
 		<default>0</default>
 	</attribute>
+	<attribute>
+		<id>RU_TYPE</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>TYPE</id>
 		<default></default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>PNOR_FLASH.gpio-slave-0</id>
-	<type>unit-gpio-generic</type>
+	<id>BCM5719.port0</id>
+	<type>unit-ethernet-slave</type>
 	<is_root>false</is_root>
-	<instance_name>PNOR_FLASH.gpio-slave</instance_name>
-	<position>0</position>
+	<instance_name>BCM5719.port0</instance_name>
+	<position>-1</position>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>GPIO</default>
+		<default>ETHERNET</default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
@@ -109081,40 +109723,51 @@
 		<default>IN</default>
 	</attribute>
 	<attribute>
-		<id>DRIVER_TYPE</id>
+		<id>MRW_TYPE</id>
 		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>ENGINE</id>
+		<id>PIN_NAME</id>
 		<default>
 				<field><id>Value</id><value></value></field>
 		</default>
 	</attribute>
 	<attribute>
-		<id>GPIO_TYPE</id>
-		<default>GENERIC_OUTPUT</default>
+		<id>TYPE</id>
+		<default>NA</default>
 	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>BCM5719.port1</id>
+	<type>unit-ethernet-slave</type>
+	<is_root>false</is_root>
+	<instance_name>BCM5719.port1</instance_name>
+	<position>-1</position>
 	<attribute>
-		<id>MRW_TYPE</id>
-		<default>NA</default>
+		<id>BUS_TYPE</id>
+		<default>ETHERNET</default>
 	</attribute>
 	<attribute>
-		<id>PIN_NAME</id>
-		<default>
-				<field><id>Value</id><value></value></field>
-		</default>
+		<id>CHIP_UNIT</id>
+		<default>1</default>
 	</attribute>
 	<attribute>
-		<id>PIN_NUM</id>
-		<default></default>
+		<id>CLASS</id>
+		<default>UNIT</default>
 	</attribute>
 	<attribute>
-		<id>POR_VALUE</id>
-		<default>0</default>
+		<id>DIRECTION</id>
+		<default>IN</default>
 	</attribute>
 	<attribute>
-		<id>SCHEMATIC_INTERFACE</id>
-		<default></default>
+		<id>MRW_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>PIN_NAME</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
 	</attribute>
 	<attribute>
 		<id>TYPE</id>
@@ -109122,66 +109775,55 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>rtc-0</id>
-	<type>chip-RX8900CE</type>
+	<id>BCM5719.port2</id>
+	<type>unit-ethernet-slave</type>
 	<is_root>false</is_root>
-	<instance_name>rtc</instance_name>
-	<position>0</position>
-	<child_id>RX8900CE.i2c</child_id>
+	<instance_name>BCM5719.port2</instance_name>
+	<position>-1</position>
 	<attribute>
-		<id>BMC_DT_COMPATIBLE</id>
-		<default>epson,rx8900</default>
+		<id>BUS_TYPE</id>
+		<default>ETHERNET</default>
 	</attribute>
 	<attribute>
-		<id>CHIP_ID</id>
-		<default></default>
+		<id>CHIP_UNIT</id>
+		<default>2</default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
-		<default>CHIP</default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
+		<default>UNIT</default>
 	</attribute>
 	<attribute>
-		<id>MRU_ID</id>
-		<default>0</default>
+		<id>DIRECTION</id>
+		<default>IN</default>
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>POSITION</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
-		<default>0</default>
-	</attribute>
-	<attribute>
-		<id>RU_TYPE</id>
-		<default></default>
+		<id>PIN_NAME</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
 	</attribute>
 	<attribute>
 		<id>TYPE</id>
-		<default>RTC</default>
+		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>RX8900CE.i2c</id>
-	<type>unit-i2c-slave</type>
+	<id>BCM5719.port3</id>
+	<type>unit-ethernet-slave</type>
 	<is_root>false</is_root>
-	<instance_name>RX8900CE.i2c</instance_name>
+	<instance_name>BCM5719.port3</instance_name>
 	<position>-1</position>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>I2C</default>
+		<default>ETHERNET</default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
-		<default>0</default>
+		<default>3</default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
@@ -109191,38 +109833,28 @@
 		<id>DIRECTION</id>
 		<default>IN</default>
 	</attribute>
-	<attribute>
-		<id>I2C_ADDRESS</id>
-		<default>0x64</default>
-	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>TYPE</id>
-		<default>NA</default>
+		<id>PIN_NAME</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
 	</attribute>
 	<attribute>
-		<id>VPD_SIZE</id>
+		<id>TYPE</id>
 		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>SEEPROM-0</id>
-	<type>chip-SEEPROM</type>
+	<id>RS232connector-0</id>
+	<type>chip-uartslave</type>
 	<is_root>false</is_root>
-	<instance_name>SEEPROM</instance_name>
+	<instance_name>RS232connector</instance_name>
 	<position>0</position>
-	<child_id>SEEPROM.i2c</child_id>
-	<attribute>
-		<id>BMC_DT_ATTR_NAMES</id>
-		<default>WRITE_PAGE_SIZE, pagesize</default>
-	</attribute>
-	<attribute>
-		<id>BMC_DT_COMPATIBLE</id>
-		<default>atmel,24c64</default>
-	</attribute>
+	<child_id>chip-uartslave.uart-0</child_id>
 	<attribute>
 		<id>CHIP_ID</id>
 		<default></default>
@@ -109231,10 +109863,6 @@
 		<id>CLASS</id>
 		<default>CHIP</default>
 	</attribute>
-	<attribute>
-		<id>MEMORY_SIZE_IN_KB</id>
-		<default></default>
-	</attribute>
 	<attribute>
 		<id>MODEL</id>
 		<default></default>
@@ -109245,7 +109873,7 @@
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
-		<default>VPD</default>
+		<default>NA</default>
 	</attribute>
 	<attribute>
 		<id>POSITION</id>
@@ -109261,22 +109889,18 @@
 	</attribute>
 	<attribute>
 		<id>TYPE</id>
-		<default>SEEPROM</default>
-	</attribute>
-	<attribute>
-		<id>WRITE_PAGE_SIZE</id>
-		<default>32</default>
+		<default></default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>SEEPROM.i2c</id>
-	<type>unit-i2c-slave</type>
+	<id>chip-uartslave.uart-0</id>
+	<type>unit-uart-slave</type>
 	<is_root>false</is_root>
-	<instance_name>SEEPROM.i2c</instance_name>
-	<position>-1</position>
+	<instance_name>chip-uartslave.uart</instance_name>
+	<position>0</position>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>I2C</default>
+		<default>U750</default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
@@ -109290,10 +109914,6 @@
 		<id>DIRECTION</id>
 		<default>IN</default>
 	</attribute>
-	<attribute>
-		<id>I2C_ADDRESS</id>
-		<default></default>
-	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
@@ -109302,21 +109922,63 @@
 		<id>TYPE</id>
 		<default>NA</default>
 	</attribute>
+</targetInstance>
+<targetInstance>
+	<id>bmcserialconnector-1</id>
+	<type>chip-uartslave</type>
+	<is_root>false</is_root>
+	<instance_name>bmcserialconnector</instance_name>
+	<position>1</position>
+	<child_id>chip-uartslave.uart-0</child_id>
 	<attribute>
-		<id>VPD_SIZE</id>
+		<id>CHIP_ID</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>CLASS</id>
+		<default>CHIP</default>
+	</attribute>
+	<attribute>
+		<id>MODEL</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>MRU_ID</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>MRW_TYPE</id>
 		<default>NA</default>
 	</attribute>
+	<attribute>
+		<id>POSITION</id>
+		<default>1</default>
+	</attribute>
+	<attribute>
+		<id>RESOURCE_IS_CRITICAL</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>RU_TYPE</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>TYPE</id>
+		<default></default>
+	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>BCM5719-0</id>
-	<type>chip-BCM5719</type>
+	<id>fsi_bit_bang-0</id>
+	<type>chip-fsi_bit_bang</type>
 	<is_root>false</is_root>
-	<instance_name>BCM5719</instance_name>
+	<instance_name>fsi_bit_bang</instance_name>
 	<position>0</position>
-	<child_id>BCM5719.port0</child_id>
-	<child_id>BCM5719.port1</child_id>
-	<child_id>BCM5719.port2</child_id>
-	<child_id>BCM5719.port3</child_id>
+	<child_id>fsi_bit_bang.fsi_clk-0</child_id>
+	<child_id>fsi_bit_bang.fsi_dat-1</child_id>
+	<child_id>fsi_bit_bang.fsi_master-0</child_id>
+	<child_id>fsi_bit_bang.fsi_mux</child_id>
+	<child_id>fsi_bit_bang.fsi_enable</child_id>
+	<child_id>fsi_bit_bang.fsi_trans</child_id>
 	<attribute>
 		<id>AFFINITY_PATH</id>
 		<default></default>
@@ -109454,14 +110116,14 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>BCM5719.port0</id>
-	<type>unit-ethernet-slave</type>
+	<id>fsi_bit_bang.fsi_clk-0</id>
+	<type>unit-gpio-generic</type>
 	<is_root>false</is_root>
-	<instance_name>BCM5719.port0</instance_name>
-	<position>-1</position>
+	<instance_name>fsi_bit_bang.fsi_clk</instance_name>
+	<position>0</position>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>ETHERNET</default>
+		<default>GPIO</default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
@@ -109475,6 +110137,20 @@
 		<id>DIRECTION</id>
 		<default>IN</default>
 	</attribute>
+	<attribute>
+		<id>DRIVER_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>ENGINE</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>GPIO_TYPE</id>
+		<default>GENERIC_OUTPUT</default>
+	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
@@ -109485,24 +110161,36 @@
 				<field><id>Value</id><value></value></field>
 		</default>
 	</attribute>
+	<attribute>
+		<id>PIN_NUM</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>POR_VALUE</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>SCHEMATIC_INTERFACE</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>TYPE</id>
 		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>BCM5719.port1</id>
-	<type>unit-ethernet-slave</type>
+	<id>fsi_bit_bang.fsi_dat-1</id>
+	<type>unit-gpio-generic</type>
 	<is_root>false</is_root>
-	<instance_name>BCM5719.port1</instance_name>
-	<position>-1</position>
+	<instance_name>fsi_bit_bang.fsi_dat</instance_name>
+	<position>1</position>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>ETHERNET</default>
+		<default>GPIO</default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
-		<default>1</default>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
@@ -109512,6 +110200,20 @@
 		<id>DIRECTION</id>
 		<default>IN</default>
 	</attribute>
+	<attribute>
+		<id>DRIVER_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>ENGINE</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>GPIO_TYPE</id>
+		<default>GENERIC_OUTPUT</default>
+	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
@@ -109522,61 +110224,163 @@
 				<field><id>Value</id><value></value></field>
 		</default>
 	</attribute>
+	<attribute>
+		<id>PIN_NUM</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>POR_VALUE</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>SCHEMATIC_INTERFACE</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>TYPE</id>
 		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>BCM5719.port2</id>
-	<type>unit-ethernet-slave</type>
+	<id>fsi_bit_bang.fsi_master-0</id>
+	<type>unit-fsi-master</type>
 	<is_root>false</is_root>
-	<instance_name>BCM5719.port2</instance_name>
-	<position>-1</position>
+	<instance_name>fsi_bit_bang.fsi_master</instance_name>
+	<position>0</position>
+	<attribute>
+		<id>AFFINITY_PATH</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>ETHERNET</default>
+		<default>FSIM</default>
+	</attribute>
+	<attribute>
+		<id>CHIPLET_ID</id>
+		<default></default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
-		<default>2</default>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
 		<default>UNIT</default>
 	</attribute>
+	<attribute>
+		<id>CMFSI</id>
+		<default>0x00</default>
+	</attribute>
+	<attribute>
+		<id>DECONFIG_GARDABLE</id>
+		<default>0</default>
+	</attribute>
 	<attribute>
 		<id>DIRECTION</id>
-		<default>IN</default>
+		<default>OUT</default>
+	</attribute>
+	<attribute>
+		<id>FAPI_NAME</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FAPI_POS</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>FSI_ENGINE</id>
+		<default>0x00</default>
+	</attribute>
+	<attribute>
+		<id>FSI_LINK</id>
+		<default>0x00</default>
+	</attribute>
+	<attribute>
+		<id>FSI_PORT</id>
+		<default>0x00</default>
+	</attribute>
+	<attribute>
+		<id>HUID</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>HWAS_STATE</id>
+		<default>
+				<field><id>deconfiguredByEid</id><value></value></field>
+				<field><id>poweredOn</id><value></value></field>
+				<field><id>present</id><value></value></field>
+				<field><id>functional</id><value></value></field>
+				<field><id>dumpfunctional</id><value></value></field>
+				<field><id>specdeconfig</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>HWAS_STATE_CHANGED_FLAG</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>IPMI_INSTANCE</id>
+		<default>0xFF</default>
+	</attribute>
+	<attribute>
+		<id>MODEL</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>MRU_ID</id>
+		<default></default>
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
-		<default>NA</default>
+		<default>FSIM</default>
 	</attribute>
 	<attribute>
-		<id>PIN_NAME</id>
+		<id>ORDINAL_ID</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>PHYS_PATH</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>PRIMARY_CAPABILITIES</id>
 		<default>
-				<field><id>Value</id><value></value></field>
+				<field><id>supportsFsiScom</id><value>1</value></field>
+				<field><id>supportsXscom</id><value>1</value></field>
+				<field><id>supportsInbandScom</id><value>0</value></field>
+				<field><id>reserved</id><value>0</value></field>
 		</default>
 	</attribute>
+	<attribute>
+		<id>REL_POS</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>RESOURCE_IS_CRITICAL</id>
+		<default>0</default>
+	</attribute>
 	<attribute>
 		<id>TYPE</id>
-		<default>NA</default>
+		<default>FSI</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>BCM5719.port3</id>
-	<type>unit-ethernet-slave</type>
+	<id>fsi_bit_bang.fsi_mux</id>
+	<type>unit-gpio-generic</type>
 	<is_root>false</is_root>
-	<instance_name>BCM5719.port3</instance_name>
+	<instance_name>fsi_bit_bang.fsi_mux</instance_name>
 	<position>-1</position>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>ETHERNET</default>
+		<default>GPIO</default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
-		<default>3</default>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
@@ -109586,6 +110390,20 @@
 		<id>DIRECTION</id>
 		<default>IN</default>
 	</attribute>
+	<attribute>
+		<id>DRIVER_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>ENGINE</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>GPIO_TYPE</id>
+		<default>GENERIC_OUTPUT</default>
+	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
@@ -109596,64 +110414,95 @@
 				<field><id>Value</id><value></value></field>
 		</default>
 	</attribute>
+	<attribute>
+		<id>PIN_NUM</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>POR_VALUE</id>
+		<default>0</default>
+	</attribute>
+	<attribute>
+		<id>SCHEMATIC_INTERFACE</id>
+		<default></default>
+	</attribute>
 	<attribute>
 		<id>TYPE</id>
 		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>RS232connector-0</id>
-	<type>chip-uartslave</type>
+	<id>fsi_bit_bang.fsi_enable</id>
+	<type>unit-gpio-generic</type>
 	<is_root>false</is_root>
-	<instance_name>RS232connector</instance_name>
-	<position>0</position>
-	<child_id>chip-uartslave.uart-0</child_id>
+	<instance_name>fsi_bit_bang.fsi_enable</instance_name>
+	<position>-1</position>
 	<attribute>
-		<id>CHIP_ID</id>
-		<default></default>
+		<id>BUS_TYPE</id>
+		<default>GPIO</default>
+	</attribute>
+	<attribute>
+		<id>CHIP_UNIT</id>
+		<default>0</default>
 	</attribute>
 	<attribute>
 		<id>CLASS</id>
-		<default>CHIP</default>
+		<default>UNIT</default>
 	</attribute>
 	<attribute>
-		<id>MODEL</id>
-		<default></default>
+		<id>DIRECTION</id>
+		<default>IN</default>
 	</attribute>
 	<attribute>
-		<id>MRU_ID</id>
-		<default>0</default>
+		<id>DRIVER_TYPE</id>
+		<default>NA</default>
+	</attribute>
+	<attribute>
+		<id>ENGINE</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
+	</attribute>
+	<attribute>
+		<id>GPIO_TYPE</id>
+		<default>GENERIC_OUTPUT</default>
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>POSITION</id>
-		<default>0</default>
+		<id>PIN_NAME</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
 	</attribute>
 	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
+		<id>PIN_NUM</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>POR_VALUE</id>
 		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>RU_TYPE</id>
+		<id>SCHEMATIC_INTERFACE</id>
 		<default></default>
 	</attribute>
 	<attribute>
 		<id>TYPE</id>
-		<default></default>
+		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>chip-uartslave.uart-0</id>
-	<type>unit-uart-slave</type>
+	<id>fsi_bit_bang.fsi_trans</id>
+	<type>unit-gpio-generic</type>
 	<is_root>false</is_root>
-	<instance_name>chip-uartslave.uart</instance_name>
-	<position>0</position>
+	<instance_name>fsi_bit_bang.fsi_trans</instance_name>
+	<position>-1</position>
 	<attribute>
 		<id>BUS_TYPE</id>
-		<default>U750</default>
+		<default>GPIO</default>
 	</attribute>
 	<attribute>
 		<id>CHIP_UNIT</id>
@@ -109668,56 +110517,44 @@
 		<default>IN</default>
 	</attribute>
 	<attribute>
-		<id>MRW_TYPE</id>
+		<id>DRIVER_TYPE</id>
 		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>TYPE</id>
-		<default>NA</default>
-	</attribute>
-</targetInstance>
-<targetInstance>
-	<id>bmcserialconnector-1</id>
-	<type>chip-uartslave</type>
-	<is_root>false</is_root>
-	<instance_name>bmcserialconnector</instance_name>
-	<position>1</position>
-	<child_id>chip-uartslave.uart-0</child_id>
-	<attribute>
-		<id>CHIP_ID</id>
-		<default></default>
-	</attribute>
-	<attribute>
-		<id>CLASS</id>
-		<default>CHIP</default>
-	</attribute>
-	<attribute>
-		<id>MODEL</id>
-		<default></default>
+		<id>ENGINE</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
 	</attribute>
 	<attribute>
-		<id>MRU_ID</id>
-		<default>0</default>
+		<id>GPIO_TYPE</id>
+		<default>GENERIC_OUTPUT</default>
 	</attribute>
 	<attribute>
 		<id>MRW_TYPE</id>
 		<default>NA</default>
 	</attribute>
 	<attribute>
-		<id>POSITION</id>
-		<default>1</default>
+		<id>PIN_NAME</id>
+		<default>
+				<field><id>Value</id><value></value></field>
+		</default>
 	</attribute>
 	<attribute>
-		<id>RESOURCE_IS_CRITICAL</id>
+		<id>PIN_NUM</id>
+		<default></default>
+	</attribute>
+	<attribute>
+		<id>POR_VALUE</id>
 		<default>0</default>
 	</attribute>
 	<attribute>
-		<id>RU_TYPE</id>
+		<id>SCHEMATIC_INTERFACE</id>
 		<default></default>
 	</attribute>
 	<attribute>
 		<id>TYPE</id>
-		<default></default>
+		<default>NA</default>
 	</attribute>
 </targetInstance>
 <targetInstance>
@@ -109766,9 +110603,9 @@
 	<child_id>MAX31785-0</child_id>
 	<child_id>BMP280-0</child_id>
 	<child_id>PCA9552-1</child_id>
-	<child_id>front-power-led-3</child_id>
-	<child_id>front-fault-led-4</child_id>
-	<child_id>front-id-led-5</child_id>
+	<child_id>front-power-3</child_id>
+	<child_id>front-fault-4</child_id>
+	<child_id>front-id-5</child_id>
 	<child_id>fanconn-10</child_id>
 	<child_id>fanconn-11</child_id>
 	<child_id>fanconn-12</child_id>
@@ -109882,12 +110719,12 @@
 		</bus_attribute>
 	</bus>
 	<bus>
-		<bus_id>PCA9552-1/PCA9552.gpio-13 => front-fault-led-4/led_enable</bus_id>
+		<bus_id>PCA9552-1/PCA9552.gpio-13 => front-fault-4/led_enable</bus_id>
 		<bus_type>GPIO</bus_type>
 		<cable>no</cable>
 		<source_path>PCA9552-1/</source_path>
 		<source_target>PCA9552.gpio-13</source_target>
-		<dest_path>front-fault-led-4/</dest_path>
+		<dest_path>front-fault-4/</dest_path>
 		<dest_target>led_enable</dest_target>
 		<bus_attribute>
 			<id>BUS_WIDTH</id>
@@ -109899,12 +110736,12 @@
 		</bus_attribute>
 	</bus>
 	<bus>
-		<bus_id>PCA9552-1/PCA9552.gpio-14 => front-power-led-3/led_enable</bus_id>
+		<bus_id>PCA9552-1/PCA9552.gpio-14 => front-power-3/led_enable</bus_id>
 		<bus_type>GPIO</bus_type>
 		<cable>no</cable>
 		<source_path>PCA9552-1/</source_path>
 		<source_target>PCA9552.gpio-14</source_target>
-		<dest_path>front-power-led-3/</dest_path>
+		<dest_path>front-power-3/</dest_path>
 		<dest_target>led_enable</dest_target>
 		<bus_attribute>
 			<id>BUS_WIDTH</id>
@@ -109916,12 +110753,12 @@
 		</bus_attribute>
 	</bus>
 	<bus>
-		<bus_id>PCA9552-1/PCA9552.gpio-15 => front-id-led-5/led_enable</bus_id>
+		<bus_id>PCA9552-1/PCA9552.gpio-15 => front-id-5/led_enable</bus_id>
 		<bus_type>GPIO</bus_type>
 		<cable>no</cable>
 		<source_path>PCA9552-1/</source_path>
 		<source_target>PCA9552.gpio-15</source_target>
-		<dest_path>front-id-led-5/</dest_path>
+		<dest_path>front-id-5/</dest_path>
 		<dest_target>led_enable</dest_target>
 		<bus_attribute>
 			<id>BUS_WIDTH</id>
@@ -112957,10 +113794,10 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>front-power-led-3</id>
+	<id>front-power-3</id>
 	<type>led-led-generic</type>
 	<is_root>false</is_root>
-	<instance_name>front-power-led</instance_name>
+	<instance_name>front-power</instance_name>
 	<position>3</position>
 	<child_id>led_enable</child_id>
 	<child_id>generic-logic-assoc</child_id>
@@ -113131,10 +113968,10 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>front-fault-led-4</id>
+	<id>front-fault-4</id>
 	<type>led-led-generic</type>
 	<is_root>false</is_root>
-	<instance_name>front-fault-led</instance_name>
+	<instance_name>front-fault</instance_name>
 	<position>4</position>
 	<child_id>led_enable</child_id>
 	<child_id>generic-logic-assoc</child_id>
@@ -113204,10 +114041,10 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>front-id-led-5</id>
+	<id>front-id-5</id>
 	<type>led-led-generic</type>
 	<is_root>false</is_root>
-	<instance_name>front-id-led</instance_name>
+	<instance_name>front-id</instance_name>
 	<position>5</position>
 	<child_id>led_enable</child_id>
 	<child_id>generic-logic-assoc</child_id>
@@ -113226,10 +114063,10 @@
 	<attribute>
 		<id>CONTROL_GROUPS</id>
 		<default>EnclosureIdentify,1,50,
-        Fan0Identify,1,50,
-        Fan1Identify,1,50,
-        Fan2Identify,1,50,
-        Fan3Identify,1,50,
+        Fan0Identify,0,50,
+        Fan1Identify,0,50,
+        Fan2Identify,0,50,
+        Fan3Identify,0,50,
         NA,0,50,
         NA,0,50,
         NA,0,50,
@@ -114120,10 +114957,10 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>rear-fault-led-0</id>
+	<id>rear-fault-0</id>
 	<type>led-led-generic</type>
 	<is_root>false</is_root>
-	<instance_name>rear-fault-led</instance_name>
+	<instance_name>rear-fault</instance_name>
 	<position>0</position>
 	<child_id>led_enable</child_id>
 	<child_id>generic-logic-assoc</child_id>
@@ -114193,10 +115030,10 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>rear-id-led-1</id>
+	<id>rear-id-1</id>
 	<type>led-led-generic</type>
 	<is_root>false</is_root>
-	<instance_name>rear-id-led</instance_name>
+	<instance_name>rear-id</instance_name>
 	<position>1</position>
 	<child_id>led_enable</child_id>
 	<child_id>generic-logic-assoc</child_id>
@@ -114215,10 +115052,10 @@
 	<attribute>
 		<id>CONTROL_GROUPS</id>
 		<default>EnclosureIdentify,1,50,
-        Fan0Identify,1,50,
-        Fan1Identify,1,50,
-        Fan2Identify,1,50,
-        Fan3Identify,1,50,
+        Fan0Identify,0,50,
+        Fan1Identify,0,50,
+        Fan2Identify,0,50,
+        Fan3Identify,0,50,
         NA,0,50,
         NA,0,50,
         NA,0,50,
@@ -114270,10 +115107,10 @@
 	</attribute>
 </targetInstance>
 <targetInstance>
-	<id>rear-power-led-2</id>
+	<id>rear-power-2</id>
 	<type>led-led-generic</type>
 	<is_root>false</is_root>
-	<instance_name>rear-power-led</instance_name>
+	<instance_name>rear-power</instance_name>
 	<position>2</position>
 	<child_id>led_enable</child_id>
 	<child_id>generic-logic-assoc</child_id>