aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2023-01-17 12:25:45 -0600
committerMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-05-04 21:03:15 +0000
commit1d8763806cae2b580953175dc3c06e1c2903e587 (patch)
tree21116725bee0d90697017b6cb6e6fb52b7500e86 /src/mainboard
parent8e883c11b407724077a1f9e1719ef7e0a4b4d0da (diff)
mb/google/puff: Add SOF chip driver
Add SOF chip driver entries for all variants, so that the correct audio config is passed to the OS drivers. TEST=build, boot Windows on wyvern variant, verify headphone output and microphone functional under Windows using coolstar's SOF drivers. Change-Id: I421c070eac321c2fc160b8f26868bcb1ec13001e Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/74815 Reviewed-by: CoolStar <coolstarorganization@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/puff/Kconfig1
-rw-r--r--src/mainboard/google/puff/variants/baseboard/devicetree.cb7
-rw-r--r--src/mainboard/google/puff/variants/dooly/overridetree.cb8
3 files changed, 15 insertions, 1 deletions
diff --git a/src/mainboard/google/puff/Kconfig b/src/mainboard/google/puff/Kconfig
index 1fe0de525a..e8ce796e96 100644
--- a/src/mainboard/google/puff/Kconfig
+++ b/src/mainboard/google/puff/Kconfig
@@ -1,6 +1,7 @@
config BOARD_GOOGLE_BASEBOARD_PUFF
def_bool n
select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768
+ select DRIVERS_AUDIO_SOF
select DRIVERS_GENERIC_GPIO_KEYS
select DRIVERS_GENERIC_MAX98357A
select DRIVERS_I2C_DA7219
diff --git a/src/mainboard/google/puff/variants/baseboard/devicetree.cb b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
index 1af96c586a..6a32bdc142 100644
--- a/src/mainboard/google/puff/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/puff/variants/baseboard/devicetree.cb
@@ -345,7 +345,12 @@ chip soc/intel/cannonlake
end # eSPI Interface
device pci 1f.1 on end # P2SB
device pci 1f.2 hidden end # Power Management Controller
- device pci 1f.3 on end # Intel HDA
+ device pci 1f.3 on
+ chip drivers/sof
+ register "jack_tplg" = "rt5682"
+ device generic 0 on end
+ end
+ end # Intel HDA
device pci 1f.4 on end # SMBus
device pci 1f.5 on end # PCH SPI
device pci 1f.6 off end # GbE
diff --git a/src/mainboard/google/puff/variants/dooly/overridetree.cb b/src/mainboard/google/puff/variants/dooly/overridetree.cb
index c40c61ca7e..a5cf3baa67 100644
--- a/src/mainboard/google/puff/variants/dooly/overridetree.cb
+++ b/src/mainboard/google/puff/variants/dooly/overridetree.cb
@@ -388,6 +388,14 @@ chip soc/intel/cannonlake
register "PcieRpSlotImplemented[10]" = "1"
end
device pci 1e.3 off end # GSPI #1
+ 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 end
+ end
+ end # Intel HDA
end
# VR Settings Configuration for 4 Domains