Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47009 )
Change subject: mb/google/volteer/variant/lindar: change speaker smart amplifier to ALC1011 ......................................................................
mb/google/volteer/variant/lindar: change speaker smart amplifier to ALC1011
Lindar change amp to ALC1011 Add ALC1011 amp acpi info to devicetree
BUG=b:171771736 BRANCH=firmware-volteer-13521.B TEST=build and verify ALC1011 can be recognized.
Change-Id: I4d83a19b3baa87cc926bb7c3a2cb96bf3165d2f4 Signed-off-by: Stanley Wu stanley1.wu@lcfc.corp-partner.google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/47009 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Zhuohao Lee zhuohao@google.com Reviewed-by: Caveh Jalali caveh@chromium.org --- M src/mainboard/google/volteer/Kconfig.name M src/mainboard/google/volteer/fw_config.c M src/mainboard/google/volteer/variants/baseboard/devicetree.cb M src/mainboard/google/volteer/variants/lindar/overridetree.cb 4 files changed, 24 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Caveh Jalali: Looks good to me, approved Zhuohao Lee: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name index b651430..0f9b6e2 100644 --- a/src/mainboard/google/volteer/Kconfig.name +++ b/src/mainboard/google/volteer/Kconfig.name @@ -22,6 +22,8 @@ select BOARD_GOOGLE_BASEBOARD_VOLTEER select SOC_INTEL_CSE_LITE_SKU select INTEL_CAR_NEM + select CHROMEOS_DSM_CALIB + select DRIVERS_I2C_RT1011
config BOARD_GOOGLE_MALEFOR bool "-> Malefor" diff --git a/src/mainboard/google/volteer/fw_config.c b/src/mainboard/google/volteer/fw_config.c index 50e8f93..5080d9b 100644 --- a/src/mainboard/google/volteer/fw_config.c +++ b/src/mainboard/google/volteer/fw_config.c @@ -86,7 +86,8 @@ } if (fw_config_probe(FW_CONFIG(AUDIO, MAX98357_ALC5682I_I2S)) || fw_config_probe(FW_CONFIG(AUDIO, MAX98373_ALC5682I_I2S)) || - fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_I2S))) { + fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_I2S)) || + fw_config_probe(FW_CONFIG(AUDIO, RT1011_ALC5682I_I2S))) { printk(BIOS_INFO, "Configure GPIOs for I2S audio on UP3.\n"); gpio_configure_pads(i2s_up3_enable_pads, ARRAY_SIZE(i2s_up3_enable_pads)); gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads)); diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb index 7964885..bc1febb 100644 --- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb @@ -16,6 +16,7 @@ option MAX98373_ALC5682_SNDW 3 option MAX98373_ALC5682I_I2S_UP4 4 option MAX98360_ALC5682I_I2S 5 + option RT1011_ALC5682I_I2S 6 end field TABLETMODE 11 option TABLETMODE_DISABLED 0 diff --git a/src/mainboard/google/volteer/variants/lindar/overridetree.cb b/src/mainboard/google/volteer/variants/lindar/overridetree.cb index 64f5ab9..2e61071 100644 --- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb +++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb @@ -35,7 +35,25 @@ register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER" register "property_list[0].name" = ""realtek,jd-src"" register "property_list[0].integer" = "1" - device i2c 1a on end + device i2c 1a on + probe AUDIO RT1011_ALC5682I_I2S + end + end + chip drivers/i2c/rt1011 + register "desc" = ""Realtek SPK AMP L"" + register "uid" = "0" + register "name" = ""RTL"" + device i2c 38 on + probe AUDIO RT1011_ALC5682I_I2S + end + end + chip drivers/i2c/rt1011 + register "desc" = ""Realtek SPK AMP R"" + register "uid" = "1" + register "name" = ""RTR"" + device i2c 39 on + probe AUDIO RT1011_ALC5682I_I2S + end end end device ref i2c1 on