GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <amanda_hwang@compal.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62998
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frank Wu <frank_wu@compal.corp-partner.google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Amanda Huang 2022-03-23 00:25:07 +08:00 committed by Felix Held
parent 4625b58833
commit 651b765567
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/google/brya/variants/brya0/fw_config.c
View File

@ -126,5 +126,10 @@ static void fw_config_handle(void *unused)
printk(BIOS_INFO, "Configure audio over I2S with ALC1019 NAU88L25B.\n"); printk(BIOS_INFO, "Configure audio over I2S with ALC1019 NAU88L25B.\n");
enable_i2s(); 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); BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);

12
src/mainboard/google/brya/variants/brya0/overridetree.cb
View File

@ -17,6 +17,7 @@ fw_config
option MAX98373_ALC5682_SNDW 2 option MAX98373_ALC5682_SNDW 2
option MAX98373_NAU88L25B_I2S 3 option MAX98373_NAU88L25B_I2S 3
option ALC1019_NAU88L25B_I2S 4 option ALC1019_NAU88L25B_I2S 4
option MAX98360_ALC5682I_I2S_AMP_SSP2 5
end end
field DB_LTE 11 12 field DB_LTE 11 12
option LTE_ABSENT 0 option LTE_ABSENT 0
@ -254,6 +255,7 @@ chip soc/intel/alderlake
register "property_list[0].integer" = "1" register "property_list[0].integer" = "1"
device i2c 1a on device i2c 1a on
probe AUDIO MAX98357_ALC5682I_I2S probe AUDIO MAX98357_ALC5682I_I2S
probe AUDIO MAX98360_ALC5682I_I2S_AMP_SSP2
end end
end end
chip drivers/i2c/nau8825 chip drivers/i2c/nau8825
@ -611,6 +613,16 @@ chip soc/intel/alderlake
end end
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 chip drivers/intel/soundwire
device generic 0 on device generic 0 on
probe AUDIO MAX98373_ALC5682_SNDW probe AUDIO MAX98373_ALC5682_SNDW