summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@google.com>2020-05-10 11:20:20 -0700
committerDuncan Laurie <dlaurie@chromium.org>2020-06-02 18:06:51 +0000
commit4dffa9cbb7bd8c6a0af4133d3eec9cb4fa8ab4e7 (patch)
tree56668fa74b16bd898a10851f060ad14c0e6f5f33
parent47b7b3402b0864e5c782705bc24e4bf143c3c7f3 (diff)
downloadcoreboot-4dffa9cbb7bd8c6a0af4133d3eec9cb4fa8ab4e7.tar.xz
mb/google/volteer: Reorganize audio codecs
- Move all audio devices from baseboard to the volteer variant. - Add max98373 devices and enable the driver - Disable everything in FSP and let coreboot configure GPIOs. BUG=b:147462631 TEST=this change makes all audio devices show up in ACPI, so this was tested by ensuring that all audio devices are present in ACPI. Change-Id: Ic654ea52a549053622603aa8c81fb37577d4e011 Signed-off-by: Duncan Laurie <dlaurie@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41214 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
-rw-r--r--src/mainboard/google/volteer/Kconfig1
-rw-r--r--src/mainboard/google/volteer/variants/baseboard/devicetree.cb35
-rw-r--r--src/mainboard/google/volteer/variants/volteer/overridetree.cb36
3 files changed, 45 insertions, 27 deletions
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 63e70c5fc8..7b9963ad1c 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -6,6 +6,7 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
select DRIVERS_I2C_HID
select DRIVERS_I2C_SX9310
select DRIVERS_INTEL_PMC
+ select DRIVERS_I2C_MAX98373
select DRIVERS_INTEL_SOUNDWIRE
select DRIVERS_SPI_ACPI
select DRIVERS_SOUNDWIRE_ALC5682
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index b7f2a0a3de..23e2f75c18 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -115,10 +115,12 @@ chip soc/intel/tigerlake
# HD Audio
register "PchHdaDspEnable" = "1"
register "PchHdaAudioLinkHdaEnable" = "0"
- register "PchHdaAudioLinkDmicEnable[0]" = "1"
- register "PchHdaAudioLinkDmicEnable[1]" = "1"
- register "PchHdaAudioLinkSspEnable[0]" = "1"
- register "PchHdaAudioLinkSspEnable[1]" = "1"
+ register "PchHdaAudioLinkDmicEnable[0]" = "0"
+ register "PchHdaAudioLinkDmicEnable[1]" = "0"
+ register "PchHdaAudioLinkSspEnable[0]" = "0"
+ register "PchHdaAudioLinkSspEnable[1]" = "0"
+ register "PchHdaAudioLinkSndwEnable[0]" = "0"
+ register "PchHdaAudioLinkSndwEnable[1]" = "0"
# TCSS USB3
register "TcssXhciEn" = "1"
@@ -256,21 +258,7 @@ chip soc/intel/tigerlake
register "wake" = "GPE0_PME_B0"
device pci 14.3 on end # CNVi: WiFi 0xA0F0 - A0F3
end
-
- device pci 15.0 on
- chip drivers/i2c/generic
- register "hid" = ""10EC5682""
- register "name" = ""RT58""
- register "desc" = ""Realtek RT5682""
- register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_F8)"
- # Set the jd_src to RT5668_JD1 for jack detection
- register "property_count" = "1"
- 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
- end
- end # I2C #0 0xA0E8
+ device pci 15.0 on end # I2C #0 0xA0E8
device pci 15.1 on
chip drivers/i2c/hid
register "generic.hid" = ""GDIX0000""
@@ -399,14 +387,7 @@ chip soc/intel/tigerlake
end # eSPI 0xA080 - A09F
device pci 1f.1 off end # P2SB 0xA0A0
device pci 1f.2 hidden end # PMC 0xA0A1
- device pci 1f.3 on
- chip drivers/generic/max98357a
- register "hid" = ""MX98357A""
- register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)"
- register "sdmode_delay" = "5"
- device generic 0 on end
- end
- end # Intel HD audio 0xA0C8-A0CF
+ device pci 1f.3 on end # Intel HD audio 0xA0C8-A0CF
device pci 1f.4 off end # SMBus 0xA0A3
device pci 1f.5 on end # SPI 0xA0A4
device pci 1f.6 off end # GbE 0x15E1/0x15E2
diff --git a/src/mainboard/google/volteer/variants/volteer/overridetree.cb b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
index d941f5fd2f..d5c1756a83 100644
--- a/src/mainboard/google/volteer/variants/volteer/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/volteer/overridetree.cb
@@ -1,6 +1,42 @@
chip soc/intel/tigerlake
device domain 0 on
+ device pci 15.0 on
+ chip drivers/i2c/generic
+ register "hid" = ""10EC5682""
+ register "name" = ""RT58""
+ register "desc" = ""Headset Codec""
+ register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_F8)"
+ # Set the jd_src to RT5668_JD1 for jack detection
+ register "property_count" = "1"
+ 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
+ end
+ chip drivers/i2c/max98373
+ register "vmon_slot_no" = "0"
+ register "imon_slot_no" = "1"
+ register "uid" = "0"
+ register "desc" = ""Right Speaker Amp""
+ register "name" = ""MAXR""
+ device i2c 31 on end
+ end
+ chip drivers/i2c/max98373
+ register "vmon_slot_no" = "2"
+ register "imon_slot_no" = "3"
+ register "uid" = "1"
+ register "desc" = ""Left Speaker Amp""
+ register "name" = ""MAXL""
+ device i2c 32 on end
+ end
+ end
device pci 1f.3 on
+ chip drivers/generic/max98357a
+ register "hid" = ""MX98357A""
+ register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A10)"
+ register "sdmode_delay" = "5"
+ device generic 0 on end
+ end
chip drivers/intel/soundwire
device generic 0 on
chip drivers/soundwire/alc5682