UPSTREAM: 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: I15986dc631e38cb1a0de7e05d1992905d446308a
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 64f7bdf19a05b773eaf68acc9067bab8309cbefb
Original-Change-Id: I4d83a19b3baa87cc926bb7c3a2cb96bf3165d2f4
Original-Signed-off-by: Stanley Wu <stanley1.wu@lcfc.corp-partner.google.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/47009
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Zhuohao Lee <zhuohao@google.com>
Original-Reviewed-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2560472
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Commit-Queue: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
(cherry picked from commit 0e47f4f5630e9ca2eb5d9dce25e4676f9c5a3c54)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2560394
Reviewed-by: Zhuohao Lee <zhuohao@chromium.org>
Tested-by: stanley.wu <stanley1.wu@lcfc.corp-partner.google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>
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 4067fa5..e8c8a22 100644
--- a/src/mainboard/google/volteer/fw_config.c
+++ b/src/mainboard/google/volteer/fw_config.c
@@ -82,7 +82,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 50be736..8bdabab 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 0c6e8629..b629031 100644
--- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
@@ -37,7 +37,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
