From 189da313f98145e1da43d8bc69ceeb4a97db7971 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 8 Sep 2023 20:57:55 -0500 Subject: mb/google/brya: Add SOF driver entries for Nissa-based boards Facilitates correct profile selection by SOF Windows drivers. Profiles for nokris and quandiso will be added once correct board configs can be determined. TEST=build/boot Win11 on google/craask, verify correct audio profiles loaded, audio functional. Change-Id: Id4582b5dd74a4905ea509813ec99663577360095 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/77740 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: CoolStar --- src/mainboard/google/brya/Kconfig | 1 + .../google/brya/variants/craask/overridetree.cb | 16 ++++++++++++++++ .../google/brya/variants/craaskov/overridetree.cb | 10 +++++++++- .../google/brya/variants/gothrax/overridetree.cb | 8 ++++++++ .../google/brya/variants/joxer/overridetree.cb | 6 ++++++ .../google/brya/variants/nereid/overridetree.cb | 8 ++++++++ .../google/brya/variants/nivviks/overridetree.cb | 6 ++++++ .../google/brya/variants/pirrha/overridetree.cb | 6 ++++++ .../google/brya/variants/pujjo/overridetree.cb | 17 +++++++++++++++++ .../google/brya/variants/uldren/overridetree.cb | 6 ++++++ src/mainboard/google/brya/variants/xivu/overridetree.cb | 8 ++++++++ .../google/brya/variants/yaviks/overridetree.cb | 6 ++++++ .../google/brya/variants/yavilla/overridetree.cb | 6 ++++++ 13 files changed, 103 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index f2ed8cab6b..c400af605a 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -85,6 +85,7 @@ config BOARD_GOOGLE_BASEBOARD_NISSA select BOARD_GOOGLE_BRYA_COMMON select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768 select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if CHROMEOS + select DRIVERS_AUDIO_SOF select DRIVERS_INTEL_ISH select MAINBOARD_DISABLE_STAGE_CACHE select MEMORY_SOLDERDOWN diff --git a/src/mainboard/google/brya/variants/craask/overridetree.cb b/src/mainboard/google/brya/variants/craask/overridetree.cb index 67a60c64fe..e3081f4fcc 100644 --- a/src/mainboard/google/brya/variants/craask/overridetree.cb +++ b/src/mainboard/google/brya/variants/craask/overridetree.cb @@ -600,6 +600,22 @@ chip soc/intel/alderlake probe AMP AMP_MX98360A end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on + probe CODEC CODEC_ALC5682I_VS + end + end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "nau8825" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on + probe CODEC CODEC_NAU8825 + end + end end device ref pcie_rp7 on # Enable SD Card PCIe 7 using clk 3 diff --git a/src/mainboard/google/brya/variants/craaskov/overridetree.cb b/src/mainboard/google/brya/variants/craaskov/overridetree.cb index ca32cd5fee..748abd6fe2 100644 --- a/src/mainboard/google/brya/variants/craaskov/overridetree.cb +++ b/src/mainboard/google/brya/variants/craaskov/overridetree.cb @@ -293,6 +293,14 @@ chip soc/intel/alderlake end end end - end + device ref hda on + chip drivers/sof + register "spkr_tplg" = "rt5650_sp" + register "jack_tplg" = "rt5650_hp" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end + end + end end diff --git a/src/mainboard/google/brya/variants/gothrax/overridetree.cb b/src/mainboard/google/brya/variants/gothrax/overridetree.cb index 44432c16dc..552c140e1d 100644 --- a/src/mainboard/google/brya/variants/gothrax/overridetree.cb +++ b/src/mainboard/google/brya/variants/gothrax/overridetree.cb @@ -463,5 +463,13 @@ chip soc/intel/alderlake end end end + device ref hda on + chip drivers/sof + register "spkr_tplg" = "rt1019" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end + end end end diff --git a/src/mainboard/google/brya/variants/joxer/overridetree.cb b/src/mainboard/google/brya/variants/joxer/overridetree.cb index ec5ad3e70f..0c2ef6c7bc 100644 --- a/src/mainboard/google/brya/variants/joxer/overridetree.cb +++ b/src/mainboard/google/brya/variants/joxer/overridetree.cb @@ -283,6 +283,12 @@ chip soc/intel/alderlake register "sdmode_delay" = "5" device generic 0 on end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end end device ref pcie_rp4 on # PCIe 4 WLAN diff --git a/src/mainboard/google/brya/variants/nereid/overridetree.cb b/src/mainboard/google/brya/variants/nereid/overridetree.cb index 12bfe45717..9d9b871d0a 100644 --- a/src/mainboard/google/brya/variants/nereid/overridetree.cb +++ b/src/mainboard/google/brya/variants/nereid/overridetree.cb @@ -331,5 +331,13 @@ chip soc/intel/alderlake end end end + device ref hda on + chip drivers/sof + register "spkr_tplg" = "rt1019" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end + end end end diff --git a/src/mainboard/google/brya/variants/nivviks/overridetree.cb b/src/mainboard/google/brya/variants/nivviks/overridetree.cb index 13d67a58c4..d7be80418e 100644 --- a/src/mainboard/google/brya/variants/nivviks/overridetree.cb +++ b/src/mainboard/google/brya/variants/nivviks/overridetree.cb @@ -489,6 +489,12 @@ chip soc/intel/alderlake register "sdmode_delay" = "5" device generic 0 on end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "nau8825" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end end device ref pcie_rp7 on # Enable SD Card PCIe 7 using clk 3 diff --git a/src/mainboard/google/brya/variants/pirrha/overridetree.cb b/src/mainboard/google/brya/variants/pirrha/overridetree.cb index 62b5a0a60c..81e6edb9f5 100644 --- a/src/mainboard/google/brya/variants/pirrha/overridetree.cb +++ b/src/mainboard/google/brya/variants/pirrha/overridetree.cb @@ -421,6 +421,12 @@ chip soc/intel/alderlake register "sdmode_delay" = "5" device generic 0 on end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "da7219" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end end device ref pcie_rp7 off end device ref pcie_rp9 off end diff --git a/src/mainboard/google/brya/variants/pujjo/overridetree.cb b/src/mainboard/google/brya/variants/pujjo/overridetree.cb index 0afe13a68b..51383e0b48 100644 --- a/src/mainboard/google/brya/variants/pujjo/overridetree.cb +++ b/src/mainboard/google/brya/variants/pujjo/overridetree.cb @@ -615,6 +615,23 @@ chip soc/intel/alderlake probe AUDIO MAX98357_ALC5682IVS end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on + probe AUDIO MAX98357_ALC5682I + probe AUDIO MAX98357_ALC5682IVS + end + end + chip drivers/sof + register "spkr_tplg" = "rt1019" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on + probe AUDIO ALC1019_ALC5682IVS + end + end end device ref pcie_rp3 on # WWAN PCIE 3 using clk 0 diff --git a/src/mainboard/google/brya/variants/uldren/overridetree.cb b/src/mainboard/google/brya/variants/uldren/overridetree.cb index 6a7d35750d..65c8151c2d 100644 --- a/src/mainboard/google/brya/variants/uldren/overridetree.cb +++ b/src/mainboard/google/brya/variants/uldren/overridetree.cb @@ -371,6 +371,12 @@ chip soc/intel/alderlake register "sdmode_delay" = "5" device generic 0 on end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "cs42l42" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end end device ref pch_espi on chip ec/google/chromeec diff --git a/src/mainboard/google/brya/variants/xivu/overridetree.cb b/src/mainboard/google/brya/variants/xivu/overridetree.cb index 74a8609a29..be4d8dffe8 100644 --- a/src/mainboard/google/brya/variants/xivu/overridetree.cb +++ b/src/mainboard/google/brya/variants/xivu/overridetree.cb @@ -485,5 +485,13 @@ chip soc/intel/alderlake end end end + device ref hda on + chip drivers/sof + register "spkr_tplg" = "rt1019" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end + end end end diff --git a/src/mainboard/google/brya/variants/yaviks/overridetree.cb b/src/mainboard/google/brya/variants/yaviks/overridetree.cb index fff0627d2e..8c36f7e9c3 100644 --- a/src/mainboard/google/brya/variants/yaviks/overridetree.cb +++ b/src/mainboard/google/brya/variants/yaviks/overridetree.cb @@ -433,6 +433,12 @@ chip soc/intel/alderlake register "sdmode_delay" = "5" device generic 0 on end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end end device ref pcie_rp4 on # PCIe 4 WLAN diff --git a/src/mainboard/google/brya/variants/yavilla/overridetree.cb b/src/mainboard/google/brya/variants/yavilla/overridetree.cb index 6d2b47f918..8e8cf768b9 100644 --- a/src/mainboard/google/brya/variants/yavilla/overridetree.cb +++ b/src/mainboard/google/brya/variants/yavilla/overridetree.cb @@ -421,6 +421,12 @@ chip soc/intel/alderlake register "sdmode_delay" = "5" device generic 0 on end end + chip drivers/sof + register "spkr_tplg" = "max98360a" + register "jack_tplg" = "rt5682" + register "mic_tplg" = "_2ch_pdm0" + device generic 0 on end + end end device ref pcie_rp4 on # PCIe 4 WLAN -- cgit v1.2.3