[S] Change in coreboot[main]: mb/starlabs/*: Use the new Intel Bluetooth driver

[Sean Rhodes (Code Review)]

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84636?usp=email )

Change subject: mb/starlabs/*: Use the new Intel Bluetooth driver
......................................................................

mb/starlabs/*: Use the new Intel Bluetooth driver

Use the newly created Intel Bluetooth ACPI driver.

Change-Id: I6438a21a73e8ddab21fb5b9021fb4d5e2f8c1c22
Signed-off-by: Sean Rhodes 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84636
Reviewed-by: Matt DeVillier 
Reviewed-by: Alicja Michalska 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
M src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
M src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
M src/mainboard/starlabs/starbook/variants/adl/gpio.c
M src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
M src/mainboard/starlabs/starbook/variants/cml/gpio.c
M src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
M src/mainboard/starlabs/starbook/variants/rpl/gpio.c
M src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
M src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
M src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
M src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
M src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
13 files changed, 33 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Matt DeVillier: Looks good to me, approved
  Alicja Michalska: Looks good to me, but someone else must approve

diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
index 87cab71..3753b46 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
@@ -122,6 +122,10 @@
    					register "desc"		= ""Internal Bluetooth""
    					register "type"		= "UPC_TYPE_INTERNAL"
    					register "group"	= "ACPI_PLD_GROUP(0, 5)"
+						register "is_intel_bluetooth" = "1"
+						register "cnvi_bt_audio_offload" = "1"
+						register "enable_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_VGPIO_0)"
+						register "reset_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A13)"
    					device ref usb2_port10 on end
    				end
    			end
diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
index 497ba75..6353d64 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
@@ -63,7 +63,7 @@
    /* A12:		PCH M.2 SSD PEDET				*/
    PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1),
    /* A13:		BlueTooth RF Kill				*/
-	PAD_CFG_GPO(GPP_A13, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE),
    /* A14:		Type C VBUS OverCurrent				*/
    PAD_CFG_NF(GPP_A14, NONE, DEEP, NF1),
    /* A15:		Test Point 3					*/
@@ -244,7 +244,7 @@
    /* E2:		Not Connected					*/
    PAD_NC(GPP_E2, NONE),
    /* E3:		WiFi RF Kill					*/
-	PAD_CFG_GPO(GPP_E3, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE),
    /* E4:		Test Point 7					*/
    PAD_NC(GPP_E4, NONE),
    /* E5:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
index ce5bda4..330e440 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
@@ -120,6 +120,9 @@
    					register "desc"		= ""Internal Bluetooth""
    					register "type"		= "UPC_TYPE_INTERNAL"
    					register "group"	= "ACPI_PLD_GROUP(0, 6)"
+						register "is_intel_bluetooth" = "1"
+						register "enable_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A13)"
+						register "reset_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A13)"
    					device ref usb2_port10 on end
    				end
    			end
diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
index dd1c7a7..00a4a08 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
@@ -63,7 +63,7 @@
    /* A12:		PCH M.2 SSD PEDET				*/
    PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1),
    /* A13:		BlueTooth RF Kill				*/
-	PAD_CFG_GPO(GPP_A13, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE),
    /* A14:		Test Point 45					*/
    PAD_NC(GPP_A14, NONE),
    /* A15:		Test Point 52					*/
@@ -244,7 +244,7 @@
    /* E2:		Not Connected					*/
    PAD_CFG_GPO(GPP_E2, 1, PLTRST),
    /* E3:		WiFi RF Kill					*/
-	PAD_CFG_GPO(GPP_E3, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE),
    /* E4:		Test Point 14					*/
    PAD_NC(GPP_E4, NONE),
    /* E5:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
index 6769ac9..6569b04 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
@@ -121,6 +121,9 @@
    					register "desc"		= ""Internal Bluetooth""
    					register "type"		= "UPC_TYPE_INTERNAL"
    					register "group"	= "ACPI_PLD_GROUP(0, 5)"
+						register "is_intel_bluetooth" = "1"
+						register "enable_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(CNV_BTEN)"
+						register "reset_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
    					device ref usb2_port10 on end
    				end
    			end
diff --git a/src/mainboard/starlabs/starbook/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
index e29cd81..2baac30 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
@@ -116,7 +116,7 @@
    /* B3:	CLICK_PAD_INT_R_N		*/
    PAD_CFG_GPI_APIC_LOW(GPP_B3, NONE, PLTRST),
    /* B4:	BT_RF_KILL_N			*/
-	PAD_CFG_GPO(GPP_B4, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_B4, 1, DEEP, NONE),
    /* B5:	 WLAN_CLKREQ#			*/
    PAD_CFG_NF(GPP_B5, NONE, DEEP, NF1),
    /* B6:	 CLKREQ1_SSD_N			*/
@@ -161,7 +161,7 @@
    /* C1:	 SMB_DATA			*/
    PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1),
    /* C2:	 WIFI_RF_KILL_N			*/
-	PAD_CFG_GPO(GPP_C2, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_C2, 1, DEEP, NONE),
    /* C3:	Not Connected			*/
    PAD_NC(GPP_C3, NONE),
    /* C4:	Not Connected			*/
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
index 7faf157..dc27e4e 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb
@@ -161,6 +161,9 @@
    					register "desc"		= ""Internal Bluetooth""
    					register "type"		= "UPC_TYPE_INTERNAL"
    					register "group"	= "ACPI_PLD_GROUP(0, 6)"
+						register "is_intel_bluetooth" = "1"
+						register "enable_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A13)"
+						register "reset_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A13)"
    					device ref usb2_port10 on end
    				end
    			end
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
index 99b8604..9b7b25c 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
@@ -63,7 +63,7 @@
    /* A12:		PCH M.2 SSD PEDET				*/
    PAD_NC(GPP_A12, NONE),
    /* A13:		BlueTooth RF Kill				*/
-	PAD_NC(GPP_A13, NONE),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE),
    /* A14:		Test Point 45					*/
    PAD_NC(GPP_A14, NONE),
    /* A15:		Test Point 52					*/
@@ -244,7 +244,7 @@
    /* E2:		Not Connected					*/
    PAD_NC(GPP_E2, NONE),
    /* E3:		WiFi RF Kill					*/
-	PAD_NC(GPP_E3, NONE),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE),
    /* E4:		Retimer Force Power				*/
    PAD_CFG_GPO(GPP_E4, 0, PLTRST),
    /* E5:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
index c221285..b7b93d5 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
@@ -153,6 +153,9 @@
    					register "desc"		= ""Internal Bluetooth""
    					register "type"		= "UPC_TYPE_INTERNAL"
    					register "group"	= "ACPI_PLD_GROUP(0, 5)"
+						register "is_intel_bluetooth" = "1"
+						register "cnvi_bt_audio_offload" = "1"
+						register "enable_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(CNV_BTEN)"
    					device ref usb2_port10 on end
    				end
    			end
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
index e8ccf90..c3b9792 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb
@@ -165,6 +165,8 @@
    					register "desc"		= ""Internal Bluetooth""
    					register "type"		= "UPC_TYPE_INTERNAL"
    					register "group"	= "ACPI_PLD_GROUP(0, 5)"
+						register "is_intel_bluetooth" = "1"
+						register "enable_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A13)"
    					device ref usb2_port10 on end
    				end
    			end
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
index 604e1b4..c28592e 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
@@ -72,7 +72,7 @@
    /* A12:		PCH M.2 SSD PEDET				*/
    PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1),
    /* A13:		BlueTooth RF Kill				*/
-	PAD_CFG_GPO(GPP_A13, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE),
    /* A14:		Test Point 45					*/
    PAD_NC(GPP_A14, NONE),
    /* A15:		Test Point 52					*/
@@ -249,7 +249,7 @@
    /* E2:		Not Connected					*/
    PAD_CFG_GPO(GPP_E2, 1, PLTRST),
    /* E3:		WiFi RF Kill					*/
-	PAD_CFG_GPO(GPP_E3, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE),
    /* E4:		Retimer Force Power				*/
    PAD_CFG_GPO(GPP_E4, 0, PLTRST),
    /* E5:		Not Connected					*/
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
index e1cb6bd..b127716 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb
@@ -112,6 +112,9 @@
    				chip drivers/usb/acpi
    					register "desc"		= ""CNVi Bluetooth""
    					register "type"		= "UPC_TYPE_INTERNAL"
+						register "is_intel_bluetooth" = "1"
+						register "cnvi_bt_audio_offload" = "1"
+						register "enable_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_VGPIO_0)"
    					register "reset_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A13)"
    					register "group"	= "ACPI_PLD_GROUP(0, 5)"
    					device ref usb2_port10 on end
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
index d026769..c60c369 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
@@ -63,7 +63,7 @@
    /* A12:		PCH M.2 SSD PEDET				*/
    PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1),
    /* A13:		BlueTooth RF Kill				*/
-	PAD_CFG_GPO(GPP_A13, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_A13, 1, DEEP, NONE),
    /* A14:		Camera Power Enable				*/
    PAD_NC(GPP_A14, NONE),
    /* A15:		Camera Reset					*/
@@ -242,7 +242,7 @@
    /* E2:		Not Connected					*/
    PAD_NC(GPP_E2, NONE),
    /* E3:		WiFi RF Kill					*/
-	PAD_CFG_GPO(GPP_E3, 1, DEEP),
+	PAD_CFG_GPO_GPIO_DRIVER(GPP_E3, 1, DEEP, NONE),
    /* E4:		P Offset					*/
    PAD_NC(GPP_E4, NONE),
    /* E5:		P Out						*/