commit 508296333b144487721d7efc4dcd240496ae579a
author Robert Chen <robert.chen@quanta.corp-partner.google.com> Tue Nov 28 02:24:58 2023 -0500
committer Felix Held <felix-coreboot@felixheld.de> Thu Nov 30 15:06:27 2023 +0000
tree e1418ec40f1de392d5a2d2c4d1a80841f7ab7567
parent 22ac6f6b2c43317f38938dedd68051a4e0b07c81

mb/google/nissa/var/quandiso: Add LTE only daughterboard support

Quandiso does not use DB_1C, replace the fw_config with LTE only
daughterboard.

BUG=b:312094048
BRANCH=firmware-nissa-15217.B
TEST=emerge-nissa coreboot

Change-Id: Id7129e52d3733f62405f9d766f08563f05016c69
Signed-off-by: Robert Chen <robert.chen@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79297
Reviewed-by: Eric Lai <ericllai@google.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Shawn Ku <shawnku@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/mainboard/google/brya/variants/quandiso/fw_config.c

diff --git a/src/mainboard/google/brya/variants/quandiso/fw_config.c b/src/mainboard/google/brya/variants/quandiso/fw_config.c
index c5ac0d2..dc286a8 100644
--- a/src/mainboard/google/brya/variants/quandiso/fw_config.c
+++ b/src/mainboard/google/brya/variants/quandiso/fw_config.c
@@ -75,7 +75,8 @@
 
 void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
 {
-	if (!fw_config_probe(FW_CONFIG(DB_USB, DB_1C_LTE))) {
+	if (!fw_config_probe(FW_CONFIG(DB_USB, DB_1C_LTE)) &&
+	    !fw_config_probe(FW_CONFIG(DB_USB, DB_LTE))) {
 		printk(BIOS_INFO, "Disable LTE-related GPIO pins.\n");
 		gpio_padbased_override(padbased_table, lte_disable_pads,
 				       ARRAY_SIZE(lte_disable_pads));

src/mainboard/google/brya/variants/quandiso/overridetree.cb

diff --git a/src/mainboard/google/brya/variants/quandiso/overridetree.cb b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
index 29a4cee..205fd2b 100644
--- a/src/mainboard/google/brya/variants/quandiso/overridetree.cb
+++ b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
@@ -2,7 +2,7 @@
 	field DB_USB 0 1
 		option DB_NONE			0
 		option DB_1C_1A			1
-		option DB_1C			2
+		option DB_LTE			2
 		option DB_1C_LTE		3
 	end
 	field WIFI_SAR_ID 2 3
@@ -333,6 +333,7 @@
 				register "reg_adv_ctrl19" = "0xf0"
 				register "reg_adv_ctrl20" = "0xf0"
 				device i2c 28 on
+					probe DB_USB DB_LTE
 					probe DB_USB DB_1C_LTE
 				end
 			end
@@ -444,7 +445,6 @@
 						use tcss_usb3_port2 as usb3_port
 						device generic 1 alias conn1 on
 							probe DB_USB DB_1C_1A
-							probe DB_USB DB_1C
 							probe DB_USB DB_1C_LTE
 						end
 					end
@@ -468,7 +468,6 @@
                                                 register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
 						device ref tcss_usb3_port2 on
 							probe DB_USB DB_1C_1A
-							probe DB_USB DB_1C
 							probe DB_USB DB_1C_LTE
 						end
 					end
@@ -492,7 +491,6 @@
                                                 register "custom_pld" = "ACPI_PLD_TYPE_C(RIGHT, LEFT, ACPI_PLD_GROUP(2, 1))"
 						device ref usb2_port2 on
 							probe DB_USB DB_1C_1A
-							probe DB_USB DB_1C
 							probe DB_USB DB_1C_LTE
 						end
 					end
@@ -565,6 +563,7 @@
 						register "desc" = ""USB3 WWAN""
 						register "type" = "UPC_TYPE_INTERNAL"
 						device ref usb3_port2 on
+							probe DB_USB DB_LTE
 							probe DB_USB DB_1C_LTE
 						end
 					end