Sheng-Liang Pan has uploaded this change for review.

View Change

mb/google/volteer/var/voxel: change speaker smart amplifier to ALC1011

voxel change amp to ALC1011
adding ALC1011 amp acpi info into devicetree

BUG=b:160550394
BRANCH=None
TEST=build and verify ALC1011 can be recognized.

Signed-off-by: Pan Sheng-Liang <sheng-liang.pan@quanta.corp-partner.google.com>
Change-Id: If3e7b829000a61a27f6a45a2688bb434e57f479a
---
M src/mainboard/google/volteer/Kconfig.name
M src/mainboard/google/volteer/fw_config.c
M src/mainboard/google/volteer/variants/voxel/overridetree.cb
3 files changed, 15 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/43549/1

diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index 06bbc58..a3ece12 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -37,6 +37,8 @@
 	bool "-> Voxel"
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
+	select CHROMEOS_DSM_CALIB
+	select DRIVERS_I2C_RT1011
 
 config BOARD_GOOGLE_DELBIN
 	bool "-> Delbin"
diff --git a/src/mainboard/google/volteer/fw_config.c b/src/mainboard/google/volteer/fw_config.c
index 61e20f4..6cbde24 100644
--- a/src/mainboard/google/volteer/fw_config.c
+++ b/src/mainboard/google/volteer/fw_config.c
@@ -72,7 +72,8 @@
 		gpio_configure_pads(i2s_disable_pads, ARRAY_SIZE(i2s_disable_pads));
 	}
 	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, MAX98373_ALC5682I_I2S)) ||
+	    fw_config_probe(FW_CONFIG(AUDIO, RT1011_ALC5682I_I2S))) {
 		printk(BIOS_INFO, "Configure GPIOs for I2S audio.\n");
 		gpio_configure_pads(i2s_enable_pads, ARRAY_SIZE(i2s_enable_pads));
 		gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads));
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
index 2219de0..8838705 100644
--- a/src/mainboard/google/volteer/variants/voxel/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
@@ -12,24 +12,23 @@
 				register "property_list[0].name" = ""realtek,jd-src""
 				register "property_list[0].integer" = "1"
 				device i2c 1a on
+					probe AUDIO RT1011_ALC5682I_I2S
 				end
 			end
-			chip drivers/i2c/max98373
-				register "vmon_slot_no" = "0"
-				register "imon_slot_no" = "1"
+			chip drivers/i2c/rt1011
+				register "desc" = ""RT1011 Woofer Left Speaker Amp""
 				register "uid" = "0"
-				register "desc" = ""Right Speaker Amp""
-				register "name" = ""MAXR""
-				device i2c 31 on
+				register "name" = ""RTWL""
+				device i2c 38 on
+					probe AUDIO RT1011_ALC5682I_I2S
 				end
 			end
-			chip drivers/i2c/max98373
-				register "vmon_slot_no" = "2"
-				register "imon_slot_no" = "3"
+			chip drivers/i2c/rt1011
+				register "desc" = ""RT1011 Woofer Right Speaker Amp""
 				register "uid" = "1"
-				register "desc" = ""Left Speaker Amp""
-				register "name" = ""MAXL""
-				device i2c 32 on
+				register "name" = ""RTWR""
+				device i2c 39 on
+					probe AUDIO RT1011_ALC5682I_I2S
 				end
 			end
 		end # I2C #0			0xA0E8

To view, visit change 43549. To unsubscribe, or for help writing mail filters, visit settings.