diff --git a/src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/starbook/Kconfig
index a948e45c76..723f10e1de 100644
--- a/src/mainboard/starlabs/starbook/Kconfig
+++ b/src/mainboard/starlabs/starbook/Kconfig
@@ -73,6 +73,7 @@ config BOARD_STARLABS_STARBOOK_ADL_COMMON
 	select EC_STARLABS_MAX_CHARGE
 	select EC_STARLABS_MERLIN
 	select EC_STARLABS_NEED_ITE_BIN
+	select DRIVERS_GFX_GENERIC
 	select MAINBOARD_HAS_TPM2
 	select MEMORY_MAPPED_TPM
 	select PMC_IPC_ACPI_INTERFACE
@@ -90,7 +91,6 @@ config BOARD_STARLABS_STARBOOK_ADL
 config BOARD_STARLABS_STARBOOK_ADL_N
 	select BOARD_ROMSIZE_KB_16384
 	select BOARD_STARLABS_STARBOOK_ADL_COMMON
-	select DRIVERS_GFX_GENERIC
 	select FSP_TYPE_IOT
 	select SOC_INTEL_ALDERLAKE_PCH_N
 
diff --git a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
index c11cc71789..3212ee584a 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
@@ -29,11 +29,30 @@ chip soc/intel/alderlake
 	# Device Tree
 	device domain 0 on
 		device ref igpu		on
-			register "gfx"				= "GMA_DEFAULT_PANEL(0)"
+			chip drivers/gfx/generic
+				register "device_count"		= "6"
+				# [DDIA] eDP
+				register "device[0].name"	= ""LCD0""
+				register "device[0].type"	= "panel"
+				# [DDIB] HDMI
+				register "device[1].name"	= ""DD01""
+				# [TCP0] Type-C
+				register "device[2].name"	= ""DD02""
+				register "device[2].use_pld"	= "true"
+				register "device[2].pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
+				# [TCP1] Type-C
+				register "device[3].name"	= ""DD03""
+				# [TCP2] N/A
+				register "device[4].name"	= ""DD04""
+				# [TCP3] N/A
+				register "device[5].name"	= ""DD05""
+				device generic 0 on end
+			end
+
 			register "ddi_portA_config"		= "1"
 			register "ddi_ports_config" = "{
-				[DDI_PORT_A]				= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
-				[DDI_PORT_B]				= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
+				[DDI_PORT_A]			= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
+				[DDI_PORT_B]			= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
 			}"
 		end
 		device ref gna		on  end
@@ -67,13 +86,15 @@ chip soc/intel/alderlake
 					chip drivers/usb/acpi
 						register "desc"		= ""USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 0)"
+						register "use_custom_pld" = "true"
+						register "custom_pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
 						device ref usb2_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 0)"
+						register "use_custom_pld" = "true"
+						register "custom_pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
 						device ref usb3_port3 on end
 					end
 					chip drivers/usb/acpi
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
index 645bd5009e..7637af896b 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
@@ -31,11 +31,30 @@ chip soc/intel/alderlake
 	# Device Tree
 	device domain 0 on
 		device ref igpu		on
-			register "gfx"					= "GMA_DEFAULT_PANEL(0)"
-			register "ddi_portA_config"			= "1"
+			chip drivers/gfx/generic
+				register "device_count"		= "6"
+				# [DDIA] eDP
+				register "device[0].name"	= ""LCD0""
+				register "device[0].type"	= "panel"
+				# [DDIB] HDMI
+				register "device[1].name"	= ""DD01""
+				# [TCP0] Type-C
+				register "device[2].name"	= ""DD02""
+				register "device[2].use_pld"	= "true"
+				register "device[2].pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
+				# [TCP1] Type-C
+				register "device[3].name"	= ""DD03""
+				# [TCP2] N/A
+				register "device[4].name"	= ""DD04""
+				# [TCP3] N/A
+				register "device[5].name"	= ""DD05""
+				device generic 0 on end
+			end
+
+			register "ddi_portA_config"		= "1"
 			register "ddi_ports_config" = "{
-				[DDI_PORT_A]				= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
-				[DDI_PORT_B]				= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
+				[DDI_PORT_A]			= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
+				[DDI_PORT_B]			= DDI_ENABLE_HPD | DDI_ENABLE_DDC,
 			}"
 		end
 		device ref pcie4_0	on				# SSD x4
@@ -68,9 +87,10 @@ chip soc/intel/alderlake
 			chip drivers/usb/acpi
 				device ref tcss_root_hub on
 					chip drivers/usb/acpi
-						register "desc"		= ""USB Type-C""
-						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 0)"
+						register "desc"			= ""USB Type-C""
+						register "type"			= "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "use_custom_pld"	= "true"
+						register "custom_pld"		= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
 						device ref tcss_usb3_port1 on end
 					end
 				end
@@ -114,7 +134,8 @@ chip soc/intel/alderlake
 					chip drivers/usb/acpi
 						register "desc"		= ""USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group"	= "ACPI_PLD_GROUP(0, 0)"
+						register "use_custom_pld" = "true"
+						register "custom_pld"	= "ACPI_PLD_TYPE_C(LEFT, CENTER, ACPI_PLD_GROUP(0, 0))"
 						device ref usb2_port1 on end
 					end
 					chip drivers/usb/acpi