mb/system76/ptl: USB ACPI, CNVi, WLAN

Change-Id: I8c87906861fc070ad52163d70db0bf40afb93455
Signed-off-by: Tim Crawford <tcrawford@system76.com>

Author: crawfxrd

src/mainboard/system76/ptl/devicetree.cb

@@ -19,6 +19,14 @@ chip soc/intel/pantherlake
 			register "cnvi_bt_core" = "true"
 			register "cnvi_bt_audio_offload" = "true"
 			chip drivers/wifi/generic
+				register "wake" = "GPE0_PME_B0"
+				register "enable_cnvi_ddr_rfim" = "true"
+				use cnvi_bluetooth as bluetooth_companion
+				device generic 0 on end
+			end
+		end
+		device ref cnvi_bluetooth on
+			chip soc/intel/common/block/cnvi
 				register "wake" = "GPE0_PME_B0"
 				device generic 0 on end
 			end

src/mainboard/system76/ptl/variants/lemp14/overridetree.cb

@@ -86,14 +86,64 @@ chip soc/intel/pantherlake
 				[1] = USB2_PORT_MID(OC_SKIP),		/* TBT Type-C */
 				[2] = USB2_PORT_MID(OC_SKIP),		/* USB 3.2 Gen 2 Type-A */
 				[4] = USB2_PORT_MID(OC_SKIP),		/* USB 3.2 Gen 1 Type-A */
-				[5] = USB2_PORT_MID(OC_SKIP),		/* 3G/5G LTE */
+				[5] = USB2_PORT_EMPTY,			/* M.2 WWAN */
 				[6] = USB2_PORT_MID(OC_SKIP),		/* Camera */
-				[7] = USB2_PORT_MID(OC_SKIP),		/* Bluetooth */
+				[7] = USB2_PORT_MID(OC_SKIP),		/* M.2 Bluetooth */
 			}"
 			register "usb3_ports" = "{
 				[0] = USB3_PORT_DEFAULT(OC_SKIP),	/* USB 3.2 Gen 1 Type-A */
-				[1] = USB3_PORT_DEFAULT(OC_SKIP),	/* 3G/5G LTE */
+				[1] = USB3_PORT_EMPTY,			/* M.2 WWAN */
 			}"
+			chip drivers/usb/acpi
+				device ref xhci_root_hub on
+					chip drivers/usb/acpi
+						register "desc" = ""USB Type-C""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						device ref usb2_port1 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""TBT Type-C""
+						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
+						device ref usb2_port2 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""USB 3.2 Gen 2 Type-A""
+						register "type" = "UPC_TYPE_A"
+						device ref usb2_port3 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""USB 3.2 Gen 1 Type-A""
+						register "type" = "UPC_TYPE_A"
+						device ref usb2_port5 on end
+					end
+					#chip drivers/usb/acpi
+					#	register "desc" = ""USB2 WWAN""
+					#	register "type" = "UPC_TYPE_INTERNAL"
+					#	device ref usb2_port6 on end
+					#end
+					chip drivers/usb/acpi
+						register "desc" = ""USB2 Camera""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device ref usb2_port7 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""USB2 Bluetooth""
+						register "type" = "UPC_TYPE_INTERNAL"
+						register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A16)"
+						device ref usb2_port8 on end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""USB 3.2 Gen 1 Type-A""
+						register "type" = "UPC_TYPE_USB3_A"
+						device ref usb3_port1 on end
+					end
+					#chip drivers/usb/acpi
+					#	register "desc" = ""USB3 WWAN""
+					#	register "type" = "UPC_TYPE_INTERNAL"
+					#	device ref usb3_port2 on end
+					#end
+				end
+			end
 		end
 
 		device ref i2c4 on
@@ -142,7 +192,7 @@ chip soc/intel/pantherlake
 			smbios_slot_desc "SlotTypeM2Socket3" "SlotLengthOther" "M.2/M 2280 (J_SSD1)" "SlotDataBusWidth4X"
 		end
 		device ref pcie_rp6 off
-			# 5G/LTE
+			# WWAN
 			# NOTE: J_3G1 slot not populated
 			register "pcie_rp[PCIE_RP(6)]" = "{
 				.clk_src = 5,
@@ -178,6 +228,10 @@ chip soc/intel/pantherlake
 				register "srcclk_pin" = "4"
 				device generic 0 on end
 			end
+			chip drivers/wifi/generic
+				use usb2_port8 as bluetooth_companion
+				device pci 00.0 on end
+			end
 			smbios_slot_desc "SlotTypeM2Socket1_SD" "SlotLengthOther" "M.2/E 2230 (J_WLAN1)" "SlotDataBusWidth1X"
 		end
 	end