[coreboot-gerrit] [XS] Change in coreboot[main]: mb/google/nissa/var/quandiso: Add LTE only daughterboard support

[Robert Chen (Code Review)]

Robert Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79297?usp=email )

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

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

Quandiso did 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 
---
M src/mainboard/google/brya/variants/quandiso/fw_config.c
M src/mainboard/google/brya/variants/quandiso/overridetree.cb
2 files changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/79297/1

diff --git a/src/mainboard/google/brya/variants/quandiso/fw_config.c b/src/mainboard/google/brya/variants/quandiso/fw_config.c
index c5ac0d2..3d0bbd2 100644
--- a/src/mainboard/google/brya/variants/quandiso/fw_config.c
+++ b/src/mainboard/google/brya/variants/quandiso/fw_config.c
@@ -75,7 +75,7 @@

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));
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