diff --git a/Makefile.am b/Makefile.am
index 109567d..046e1f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,6 +80,7 @@ endif
 DT = fake.dts fake2.dts p8-cronus.dts p9-cronus.dts \
      p8-fsi.dts p8-i2c.dts p8-kernel.dts \
      p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts p9-kernel.dts \
+     p9-sbefifo.dts \
      p8-host.dts p9-host.dts p8.dts
 
 DT_sources = $(DT:.dts=.dtb.S) p9.dtb.S
diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c
index 70b7962..f72f22b 100644
--- a/libpdbg/dtb.c
+++ b/libpdbg/dtb.c
@@ -43,6 +43,7 @@
 #include "p9-host.dt.h"
 #include "p8-cronus.dt.h"
 #include "p9-cronus.dt.h"
+#include "p9-sbefifo.dt.h"
 
 #include "p8.dt.h"
 #include "p9.dt.h"
@@ -402,6 +403,24 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt)
 		}
 		break;
 
+	case PDBG_BACKEND_SBEFIFO:
+		if (!pdbg_backend_option) {
+			pdbg_log(PDBG_ERROR, "No system type specified\n");
+			pdbg_log(PDBG_ERROR, "Use p9\n");
+			return NULL;
+		}
+
+		if (!strcmp(pdbg_backend_option, "p9")) {
+			if (!dtb->backend.fdt)
+				dtb->backend.fdt = &_binary_p9_sbefifo_dtb_o_start;
+			if (!dtb->system.fdt)
+				dtb->system.fdt = &_binary_p9_dtb_o_start;
+		} else {
+			pdbg_log(PDBG_ERROR, "Invalid system type %s\n", pdbg_backend_option);
+			pdbg_log(PDBG_ERROR, "Use p9\n");
+		}
+		break;
+
 	default:
 		pdbg_log(PDBG_WARNING, "Unable to determine a valid default backend, using fake backend for testing purposes\n");
 		/* Fall through */
diff --git a/libpdbg/libpdbg.h b/libpdbg/libpdbg.h
index 1c974f5..bdc6cea 100644
--- a/libpdbg/libpdbg.h
+++ b/libpdbg/libpdbg.h
@@ -142,7 +142,6 @@ enum pdbg_target_status {
 	PDBG_TARGET_RELEASED,
 };
 
-
 /**
  * @brief Describes the various methods (referred to as backends) for
  * accessing hardware depending on where the code is executed.
@@ -197,6 +196,12 @@ enum pdbg_backend {
 	 * the BMC network address / hostname.  For example p9@spoon2-bmc.
 	 */
 	PDBG_BACKEND_CRONUS,
+
+	/**
+	 * This backend uses sbefifo kernel driver on BMC to access hardware
+	 * via SBE.
+	 */
+	PDBG_BACKEND_SBEFIFO,
 };
 
 /**
diff --git a/libpdbg/sbefifo.c b/libpdbg/sbefifo.c
index 69ea9c7..7936df6 100644
--- a/libpdbg/sbefifo.c
+++ b/libpdbg/sbefifo.c
@@ -448,10 +448,10 @@ static void register_sbefifo(void)
 {
 	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &kernel_sbefifo_hw_unit);
 	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &sbefifo_chipop_hw_unit);
-	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &sbefifo_pib_hw_unit);
-	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &sbefifo_chiplet_hw_unit);
-	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &sbefifo_core_hw_unit);
-	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &sbefifo_thread_hw_unit);
+	pdbg_hwunit_register(PDBG_BACKEND_SBEFIFO, &sbefifo_pib_hw_unit);
+	pdbg_hwunit_register(PDBG_BACKEND_SBEFIFO, &sbefifo_chiplet_hw_unit);
+	pdbg_hwunit_register(PDBG_BACKEND_SBEFIFO, &sbefifo_core_hw_unit);
+	pdbg_hwunit_register(PDBG_BACKEND_SBEFIFO, &sbefifo_thread_hw_unit);
 	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &sbefifo_mem_hw_unit);
 	pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &sbefifo_pba_hw_unit);
 }
diff --git a/p9-sbefifo.dts.m4 b/p9-sbefifo.dts.m4
new file mode 100644
index 0000000..48b3051
--- /dev/null
+++ b/p9-sbefifo.dts.m4
@@ -0,0 +1,86 @@
+/dts-v1/;
+
+/ {
+	#address-cells = <0x1>;
+	#size-cells = <0x0>;
+
+	fsi0: kernelfsi@0 {
+		#address-cells = <0x2>;
+		#size-cells = <0x1>;
+		compatible = "ibm,kernel-fsi";
+		reg = <0x0 0x0 0x0>;
+		index = <0x0>;
+		status = "mustexist";
+		system-path = "/proc0/fsi";
+
+		sbefifo@2400 { /* Bogus address */
+			reg = <0x0 0x2400 0x7>;
+			index = <0x0>;
+			compatible = "ibm,kernel-sbefifo";
+			device-path = "/dev/sbefifo1";
+
+			sbefifo-pib {
+				#address-cells = <0x2>;
+				#size-cells = <0x1>;
+				index = <0x0>;
+				compatible = "ibm,sbefifo-pib";
+				system-path = "/proc0/pib";
+			};
+
+			sbefifo-mem {
+				compatible = "ibm,sbefifo-mem";
+				system-path = "/mem0";
+			};
+
+			sbefifo-pba {
+				compatible = "ibm,sbefifo-mem-pba";
+				system-path = "/mempba0";
+			};
+
+			sbefifo-chipop {
+				compatible = "ibm,sbefifo-chipop";
+				index = <0x0>;
+			};
+		};
+
+		hmfsi@100000 {
+			#address-cells = <0x2>;
+			#size-cells = <0x1>;
+			compatible = "ibm,fsi-hmfsi";
+			reg = <0x0 0x100000 0x8000>;
+			port = <0x1>;
+			index = <0x1>;
+			system-path = "/proc1/fsi";
+
+			sbefifo@2400 { /* Bogus address */
+				reg = <0x0 0x2400 0x7>;
+				index = <0x1>;
+				compatible = "ibm,kernel-sbefifo";
+				device-path = "/dev/sbefifo2";
+
+				sbefifo-pib {
+					#address-cells = <0x2>;
+					#size-cells = <0x1>;
+					index = <0x1>;
+					compatible = "ibm,sbefifo-pib";
+					system-path = "/proc1/pib";
+				};
+
+				sbefifo-mem {
+					compatible = "ibm,sbefifo-mem";
+					system-path = "/mem1";
+				};
+
+				sbefifo-pba {
+					compatible = "ibm,sbefifo-mem-pba";
+					system-path = "/mempba1";
+				};
+
+				sbefifo-chipop {
+					compatible = "ibm,sbefifo-chipop";
+					index = <0x1>;
+				};
+			};
+		};
+	};
+};
diff --git a/p9.dts b/p9.dts
index dfc413c..f8cb88b 100644
--- a/p9.dts
+++ b/p9.dts
@@ -38,7 +38,7 @@
 			};
 
 			chiplet@1000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x01 >;
 				reg = < 0x00 0x1000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -52,7 +52,7 @@
 			};
 
 			chiplet@2000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x02 >;
 				reg = < 0x00 0x2000000 0xfffff >;
 
@@ -68,7 +68,7 @@
 			};
 
 			chiplet@3000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x03 >;
 				reg = < 0x00 0x3000000 0xfffff >;
 
@@ -89,7 +89,7 @@
 			};
 
 			chiplet@4000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x04 >;
 				reg = < 0x00 0x4000000 0xfffff >;
 
@@ -105,7 +105,7 @@
 			};
 
 			chiplet@5000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x05 >;
 				reg = < 0x00 0x5000000 0xfffff >;
 
@@ -126,7 +126,7 @@
 			};
 
 			chiplet@6000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x06 >;
 				reg = < 0x00 0x6000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -141,7 +141,7 @@
 			};
 
 			chiplet@7000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x07 >;
 				reg = < 0x00 0x7000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -180,7 +180,7 @@
 			};
 
 			chiplet@8000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x08 >;
 				reg = < 0x00 0x8000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -219,7 +219,7 @@
 			};
 
 			chiplet@9000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x09 >;
 				reg = < 0x00 0x9000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -248,7 +248,7 @@
 			};
 
 			chiplet@c000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0c >;
 				reg = < 0x00 0xc000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -277,7 +277,7 @@
 			};
 
 			chiplet@d000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0d >;
 				reg = < 0x00 0xd000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -301,7 +301,7 @@
 			};
 
 			chiplet@e000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0e >;
 				reg = < 0x00 0xe000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -325,7 +325,7 @@
 			};
 
 			chiplet@f000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0f >;
 				reg = < 0x00 0xf000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -349,7 +349,7 @@
 			};
 
 			chiplet@10000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x10 >;
 				reg = < 0x00 0x10000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -372,40 +372,40 @@
 						chiplet@20000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x20 >;
 							reg = < 0x00 0x20000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x00 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -416,40 +416,40 @@
 						chiplet@21000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x21 >;
 							reg = < 0x00 0x21000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x01 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -468,40 +468,40 @@
 						chiplet@22000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x22 >;
 							reg = < 0x00 0x22000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x02 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -512,40 +512,40 @@
 						chiplet@23000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x23 >;
 							reg = < 0x00 0x23000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x03 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -557,7 +557,7 @@
 			};
 
 			chiplet@11000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x11 >;
 				reg = < 0x00 0x11000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -580,40 +580,40 @@
 						chiplet@24000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x24 >;
 							reg = < 0x00 0x24000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x04 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -624,40 +624,40 @@
 						chiplet@25000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x25 >;
 							reg = < 0x00 0x25000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x05 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -676,40 +676,40 @@
 						chiplet@26000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x26 >;
 							reg = < 0x00 0x26000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x06 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -720,40 +720,40 @@
 						chiplet@27000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x27 >;
 							reg = < 0x00 0x27000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x07 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -765,7 +765,7 @@
 			};
 
 			chiplet@12000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x12 >;
 				reg = < 0x00 0x12000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -788,40 +788,40 @@
 						chiplet@28000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x28 >;
 							reg = < 0x00 0x28000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x08 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -832,40 +832,40 @@
 						chiplet@29000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x29 >;
 							reg = < 0x00 0x29000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x09 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -884,40 +884,40 @@
 						chiplet@2a000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2a >;
 							reg = < 0x00 0x2a000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0a >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -928,40 +928,40 @@
 						chiplet@2b000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2b >;
 							reg = < 0x00 0x2b000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0b >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -973,7 +973,7 @@
 			};
 
 			chiplet@13000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x13 >;
 				reg = < 0x00 0x13000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -996,40 +996,40 @@
 						chiplet@2c000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2c >;
 							reg = < 0x00 0x2c000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0c >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1040,40 +1040,40 @@
 						chiplet@2d000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2d >;
 							reg = < 0x00 0x2d000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0d >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1092,40 +1092,40 @@
 						chiplet@2e000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2e >;
 							reg = < 0x00 0x2e000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0e >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1136,40 +1136,40 @@
 						chiplet@2f000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2f >;
 							reg = < 0x00 0x2f000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0f >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1181,7 +1181,7 @@
 			};
 
 			chiplet@14000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x14 >;
 				reg = < 0x00 0x14000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1204,40 +1204,40 @@
 						chiplet@30000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x30 >;
 							reg = < 0x00 0x30000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x10 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1248,40 +1248,40 @@
 						chiplet@31000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x31 >;
 							reg = < 0x00 0x31000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x11 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1300,40 +1300,40 @@
 						chiplet@32000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x32 >;
 							reg = < 0x00 0x32000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x12 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1344,40 +1344,40 @@
 						chiplet@33000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x33 >;
 							reg = < 0x00 0x33000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x13 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1389,7 +1389,7 @@
 			};
 
 			chiplet@15000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x15 >;
 				reg = < 0x00 0x15000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1412,40 +1412,40 @@
 						chiplet@34000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x34 >;
 							reg = < 0x00 0x34000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x14 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1456,40 +1456,40 @@
 						chiplet@35000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x35 >;
 							reg = < 0x00 0x35000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x15 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1508,40 +1508,40 @@
 						chiplet@36000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x36 >;
 							reg = < 0x00 0x36000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x16 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1552,40 +1552,40 @@
 						chiplet@37000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x37 >;
 							reg = < 0x00 0x37000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x17 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -1754,7 +1754,7 @@
 			};
 
 			chiplet@1000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x01 >;
 				reg = < 0x00 0x1000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1768,7 +1768,7 @@
 			};
 
 			chiplet@2000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x02 >;
 				reg = < 0x00 0x2000000 0xfffff >;
 
@@ -1784,7 +1784,7 @@
 			};
 
 			chiplet@3000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x03 >;
 				reg = < 0x00 0x3000000 0xfffff >;
 
@@ -1805,7 +1805,7 @@
 			};
 
 			chiplet@4000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x04 >;
 				reg = < 0x00 0x4000000 0xfffff >;
 
@@ -1821,7 +1821,7 @@
 			};
 
 			chiplet@5000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x05 >;
 				reg = < 0x00 0x5000000 0xfffff >;
 
@@ -1842,7 +1842,7 @@
 			};
 
 			chiplet@6000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x06 >;
 				reg = < 0x00 0x6000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1857,7 +1857,7 @@
 			};
 
 			chiplet@7000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x07 >;
 				reg = < 0x00 0x7000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1896,7 +1896,7 @@
 			};
 
 			chiplet@8000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x08 >;
 				reg = < 0x00 0x8000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1935,7 +1935,7 @@
 			};
 
 			chiplet@9000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x09 >;
 				reg = < 0x00 0x9000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1964,7 +1964,7 @@
 			};
 
 			chiplet@c000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0c >;
 				reg = < 0x00 0xc000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -1993,7 +1993,7 @@
 			};
 
 			chiplet@d000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0d >;
 				reg = < 0x00 0xd000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2017,7 +2017,7 @@
 			};
 
 			chiplet@e000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0e >;
 				reg = < 0x00 0xe000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2041,7 +2041,7 @@
 			};
 
 			chiplet@f000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x0f >;
 				reg = < 0x00 0xf000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2065,7 +2065,7 @@
 			};
 
 			chiplet@10000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x10 >;
 				reg = < 0x00 0x10000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2088,40 +2088,40 @@
 						chiplet@20000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x20 >;
 							reg = < 0x00 0x20000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x00 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2132,40 +2132,40 @@
 						chiplet@21000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x21 >;
 							reg = < 0x00 0x21000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x01 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2184,40 +2184,40 @@
 						chiplet@22000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x22 >;
 							reg = < 0x00 0x22000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x02 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2228,40 +2228,40 @@
 						chiplet@23000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x23 >;
 							reg = < 0x00 0x23000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x03 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2273,7 +2273,7 @@
 			};
 
 			chiplet@11000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x11 >;
 				reg = < 0x00 0x11000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2296,40 +2296,40 @@
 						chiplet@24000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x24 >;
 							reg = < 0x00 0x24000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x04 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2340,40 +2340,40 @@
 						chiplet@25000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x25 >;
 							reg = < 0x00 0x25000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x05 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2392,40 +2392,40 @@
 						chiplet@26000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x26 >;
 							reg = < 0x00 0x26000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x06 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2436,40 +2436,40 @@
 						chiplet@27000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x27 >;
 							reg = < 0x00 0x27000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x07 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2481,7 +2481,7 @@
 			};
 
 			chiplet@12000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x12 >;
 				reg = < 0x00 0x12000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2504,40 +2504,40 @@
 						chiplet@28000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x28 >;
 							reg = < 0x00 0x28000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x08 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2548,40 +2548,40 @@
 						chiplet@29000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x29 >;
 							reg = < 0x00 0x29000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x09 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2600,40 +2600,40 @@
 						chiplet@2a000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2a >;
 							reg = < 0x00 0x2a000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0a >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2644,40 +2644,40 @@
 						chiplet@2b000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2b >;
 							reg = < 0x00 0x2b000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0b >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2689,7 +2689,7 @@
 			};
 
 			chiplet@13000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x13 >;
 				reg = < 0x00 0x13000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2712,40 +2712,40 @@
 						chiplet@2c000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2c >;
 							reg = < 0x00 0x2c000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0c >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2756,40 +2756,40 @@
 						chiplet@2d000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2d >;
 							reg = < 0x00 0x2d000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0d >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2808,40 +2808,40 @@
 						chiplet@2e000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2e >;
 							reg = < 0x00 0x2e000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0e >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2852,40 +2852,40 @@
 						chiplet@2f000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x2f >;
 							reg = < 0x00 0x2f000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x0f >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2897,7 +2897,7 @@
 			};
 
 			chiplet@14000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x14 >;
 				reg = < 0x00 0x14000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -2920,40 +2920,40 @@
 						chiplet@30000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x30 >;
 							reg = < 0x00 0x30000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x10 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -2964,40 +2964,40 @@
 						chiplet@31000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x31 >;
 							reg = < 0x00 0x31000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x11 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -3016,40 +3016,40 @@
 						chiplet@32000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x32 >;
 							reg = < 0x00 0x32000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x12 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -3060,40 +3060,40 @@
 						chiplet@33000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x33 >;
 							reg = < 0x00 0x33000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x13 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -3105,7 +3105,7 @@
 			};
 
 			chiplet@15000000 {
-				compatible = "ibm,power9-chiplet";
+				compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 				index = < 0x15 >;
 				reg = < 0x00 0x15000000 0xfffff >;
 				#address-cells = < 0x02 >;
@@ -3128,40 +3128,40 @@
 						chiplet@34000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x34 >;
 							reg = < 0x00 0x34000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x14 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -3172,40 +3172,40 @@
 						chiplet@35000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x35 >;
 							reg = < 0x00 0x35000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x15 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -3224,40 +3224,40 @@
 						chiplet@36000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x36 >;
 							reg = < 0x00 0x36000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x16 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
@@ -3268,40 +3268,40 @@
 						chiplet@37000000 {
 							#address-cells = < 0x02 >;
 							#size-cells = < 0x01 >;
-							compatible = "ibm,power9-chiplet";
+							compatible = "ibm,sbefifo-chiplet", "ibm,power9-chiplet";
 							index = < 0x37 >;
 							reg = < 0x00 0x37000000 0xfffff >;
 
 							core@0 {
 								#address-cells = < 0x01 >;
 								#size-cells = < 0x00 >;
-								compatible = "ibm,power9-core";
+								compatible = "ibm,sbefifo-core", "ibm,power9-core";
 								index = < 0x17 >;
 								reg = < 0x00 0x00 0xfffff >;
 
 								thread@0 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x00 >;
 									index = < 0x00 >;
 								};
 
 								thread@1 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x01 >;
 									index = < 0x01 >;
 								};
 
 								thread@2 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x02 >;
 									index = < 0x02 >;
 								};
 
 								thread@3 {
-									compatible = "ibm,power9-thread";
+									compatible = "ibm,sbefifo-thread", "ibm,power9-thread";
 									reg = < 0x00 >;
 									tid = < 0x03 >;
 									index = < 0x03 >;
