summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2023-09-08 20:57:55 -0500
committerFelix Held <felix-coreboot@felixheld.de>2023-09-25 15:35:20 +0000
commit189da313f98145e1da43d8bc69ceeb4a97db7971 (patch)
tree0b8a036013fbf6f1698415707cc7d3e43858688f
parent7f53e11425b59f27e2fa70bab9daa3ca0a509177 (diff)
downloadcoreboot-189da313f98145e1da43d8bc69ceeb4a97db7971.tar.gz
coreboot-189da313f98145e1da43d8bc69ceeb4a97db7971.tar.bz2
coreboot-189da313f98145e1da43d8bc69ceeb4a97db7971.zip
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 <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/77740 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: CoolStar <coolstarorganization@gmail.com>
-rw-r--r--src/mainboard/google/brya/Kconfig1
-rw-r--r--src/mainboard/google/brya/variants/craask/overridetree.cb16
-rw-r--r--src/mainboard/google/brya/variants/craaskov/overridetree.cb10
-rw-r--r--src/mainboard/google/brya/variants/gothrax/overridetree.cb8
-rw-r--r--src/mainboard/google/brya/variants/joxer/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/nereid/overridetree.cb8
-rw-r--r--src/mainboard/google/brya/variants/nivviks/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/pirrha/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/pujjo/overridetree.cb17
-rw-r--r--src/mainboard/google/brya/variants/uldren/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/xivu/overridetree.cb8
-rw-r--r--src/mainboard/google/brya/variants/yaviks/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/yavilla/overridetree.cb6
13 files changed, 103 insertions, 1 deletions
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index f2ed8cab6b55..c400af605a26 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 67a60c64fed1..e3081f4fcc9c 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 ca32cd5fee77..748abd6fe29e 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 44432c16dce8..552c140e1dbb 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 ec5ad3e70fb0..0c2ef6c7bcc4 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 12bfe4571731..9d9b871d0a88 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 13d67a58c456..d7be80418e73 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 62b5a0a60cb7..81e6edb9f517 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 0afe13a68b48..51383e0b48a8 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 6a7d35750d86..65c8151c2d0e 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 74a8609a2997..be4d8dffe830 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 fff0627d2ed3..8c36f7e9c353 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 6d2b47f918bd..8e8cf768b910 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