From 35470e1604ef2d65c69b05a39b4f4dbe3dc86c01 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 17 Jan 2023 14:09:46 -0600 Subject: mb/google/dedede: Add SOF chip driver Add all SOF chip drivers to baseboard and use FW_CONFIG to determine the correct option, to ensure the correct audio config is passed to the SOF OS drivers. TEST=build, boot Windows on several dedede variants, verify audio functional under Windows using coolstar's SOF drivers. Change-Id: I9452b11af614d8727aa8dd448e37f7a06faa450d Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/74818 Reviewed-by: CoolStar Tested-by: build bot (Jenkins) Reviewed-by: Sean Rhodes --- src/mainboard/google/dedede/Kconfig | 1 + .../google/dedede/variants/baseboard/devicetree.cb | 28 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) (limited to 'src/mainboard') diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 054bc2252f..02087acbc4 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -1,6 +1,7 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE def_bool n select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768 + select DRIVERS_AUDIO_SOF select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_I2C_CS42L42 select DRIVERS_I2C_GENERIC diff --git a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb index 2124dc4cb1..30a971c326 100644 --- a/src/mainboard/google/dedede/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/dedede/variants/baseboard/devicetree.cb @@ -384,7 +384,33 @@ chip soc/intel/jasperlake end # eSPI Interface device pci 1f.1 on end # P2SB device pci 1f.2 hidden end # Power Management Controller - device pci 1f.3 off end # Intel HDA/cAVS + device pci 1f.3 on + chip drivers/sof + register "spkr_tplg" = "rt1015" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on + probe AUDIO_AMP RT1015_I2C + probe AUDIO_AMP RT1015P_AUTO + end + end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on + probe AUDIO_AMP MAX98360 + end + end + chip drivers/sof + register "spkr_tplg" = "max98357a" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on + probe AUDIO_AMP UNPROVISIONED + end + end + end # Intel HDA/cAVS device pci 1f.4 off end # SMBus device pci 1f.5 on end # PCH SPI device pci 1f.7 off end # Intel Trace Hub -- cgit v1.2.3