[coreboot-gerrit] Change in coreboot[master]: mb/google/brya/var/brya0: Replace amp max98357 with max98360

[Amanda Hwang (Code Review)]

Amanda Hwang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/62998 )

Change subject: mb/google/brya/var/brya0: Replace amp max98357 with max98360
......................................................................

mb/google/brya/var/brya0: Replace amp max98357 with max98360

Based on Brya EVT schametic, replace audio amp max98357 with max98360.
Add a new audio FW_CONFIG field to support ALC5682I+MAX98360.

BUG=b:224423056
BRANCH=firmware-brya-14505.B
TEST=dmidecode -t 11

Change-Id: I3033e31cf5c2dade02dc19531f5e5365eeeb7a78
Signed-off-by: Amanda Huang 
---
M src/mainboard/google/brya/variants/brya0/fw_config.c
M src/mainboard/google/brya/variants/brya0/overridetree.cb
2 files changed, 17 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/62998/1

diff --git a/src/mainboard/google/brya/variants/brya0/fw_config.c b/src/mainboard/google/brya/variants/brya0/fw_config.c
index 17d284a..e1c6f89 100644
--- a/src/mainboard/google/brya/variants/brya0/fw_config.c
+++ b/src/mainboard/google/brya/variants/brya0/fw_config.c
@@ -126,5 +126,10 @@
    	printk(BIOS_INFO, "Configure audio over I2S with ALC1019 NAU88L25B.\n");
    	enable_i2s();
    }
+
+	if (fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_I2S_AMP_SSP2))) {
+		printk(BIOS_INFO, "Configure audio over I2S with MAX98360 ALC5682I.\n");
+		enable_i2s();
+	}
 }
 BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb
index 0f1c693..0b9e756 100644
--- a/src/mainboard/google/brya/variants/brya0/overridetree.cb
+++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb
@@ -17,6 +17,7 @@
    	option MAX98373_ALC5682_SNDW	2
    	option MAX98373_NAU88L25B_I2S	3
    	option ALC1019_NAU88L25B_I2S	4
+		option MAX98360_ALC5682I_I2S_AMP_SSP2   5
    end
    field DB_LTE 11 12
    	option LTE_ABSENT		0
@@ -254,6 +255,7 @@
    			register "property_list[0].integer" = "1"
    			device i2c 1a on
    				probe AUDIO MAX98357_ALC5682I_I2S
+					probe AUDIO MAX98360_ALC5682I_I2S_AMP_SSP2
    			end
    		end
    		chip drivers/i2c/nau8825
@@ -611,6 +613,16 @@
    			end
    		end

+			chip drivers/generic/max98357a
+                                register "hid" = ""MX98360A""
+                                register "sdmode_gpio" =
+                                                "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)"
+                                register "sdmode_delay" = "5"
+                                device generic 0 on
+                                        probe AUDIO MAX98360_ALC5682I_I2S_AMP_SSP2
+                                end
+                        end
+
    		chip drivers/intel/soundwire
    			device generic 0 on
    				probe AUDIO MAX98373_ALC5682_SNDW