summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2023-01-17 13:44:23 -0600
committerMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2023-05-04 21:02:44 +0000
commit3f3dc504e9d2ce084e00cc0911bebf042056a78c (patch)
tree7f450dcbd896b065e7dd416015e6008cc3ed9c72 /src/mainboard
parent35470e1604ef2d65c69b05a39b4f4dbe3dc86c01 (diff)
mb/google/brya: 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 banshee and osiris variants, verify audio functional under Windows using coolstar's SOF drivers. Change-Id: I12614b85f9779cc40d83a9c868cc46b110f26af6 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/74817 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/brya/Kconfig1
-rw-r--r--src/mainboard/google/brya/variants/banshee/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb9
-rw-r--r--src/mainboard/google/brya/variants/felwinter/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/kano/overridetree.cb8
-rw-r--r--src/mainboard/google/brya/variants/osiris/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/taeko/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/taeko4es/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/taniks/overridetree.cb6
-rw-r--r--src/mainboard/google/brya/variants/volmar/overridetree.cb8
10 files changed, 61 insertions, 1 deletions
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index eb1790e984..733d7efd11 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -42,6 +42,7 @@ config BOARD_GOOGLE_BASEBOARD_BRYA
def_bool n
select BOARD_GOOGLE_BRYA_COMMON
select BOARD_ROMSIZE_KB_32768
+ select DRIVERS_AUDIO_SOF
select HAVE_SLP_S0_GATE
select MEMORY_SOLDERDOWN if !BOARD_GOOGLE_BANSHEE
select SOC_INTEL_ALDERLAKE_PCH_P
diff --git a/src/mainboard/google/brya/variants/banshee/overridetree.cb b/src/mainboard/google/brya/variants/banshee/overridetree.cb
index a6b1a087fb..c25209e181 100644
--- a/src/mainboard/google/brya/variants/banshee/overridetree.cb
+++ b/src/mainboard/google/brya/variants/banshee/overridetree.cb
@@ -275,6 +275,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_pdm1"
+ device generic 0 on end
+ end
end
device ref gspi1 off end
device ref pch_espi on
diff --git a/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb
index efc2fcbc98..d48462ca63 100644
--- a/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb
+++ b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb
@@ -196,6 +196,13 @@ chip soc/intel/alderlake
device pnp 0c09.0 on end
end
end
- device ref hda on end
+ device ref hda on
+ chip drivers/sof
+ register "spkr_tplg" = "max98360a"
+ 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/felwinter/overridetree.cb b/src/mainboard/google/brya/variants/felwinter/overridetree.cb
index e5a64b1021..9e7e739f84 100644
--- a/src/mainboard/google/brya/variants/felwinter/overridetree.cb
+++ b/src/mainboard/google/brya/variants/felwinter/overridetree.cb
@@ -316,6 +316,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_pdm1"
+ device generic 0 on end
+ end
end
device ref pch_espi on
chip ec/google/chromeec
diff --git a/src/mainboard/google/brya/variants/kano/overridetree.cb b/src/mainboard/google/brya/variants/kano/overridetree.cb
index 8b06732b74..6fdbbefa2e 100644
--- a/src/mainboard/google/brya/variants/kano/overridetree.cb
+++ b/src/mainboard/google/brya/variants/kano/overridetree.cb
@@ -558,5 +558,13 @@ chip soc/intel/alderlake
end
end
end
+ device ref hda on
+ chip drivers/sof
+ register "spkr_tplg" = "max98373"
+ register "jack_tplg" = "nau8825"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on end
+ end
+ end
end
end
diff --git a/src/mainboard/google/brya/variants/osiris/overridetree.cb b/src/mainboard/google/brya/variants/osiris/overridetree.cb
index 7d4672173d..aa2f5fe373 100644
--- a/src/mainboard/google/brya/variants/osiris/overridetree.cb
+++ b/src/mainboard/google/brya/variants/osiris/overridetree.cb
@@ -243,6 +243,12 @@ chip soc/intel/alderlake
probe AUDIO MAX98360_NAU88L25B_I2S
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_rp6 off end # PCIE6 WWAN
device ref pcie_rp7 on
diff --git a/src/mainboard/google/brya/variants/taeko/overridetree.cb b/src/mainboard/google/brya/variants/taeko/overridetree.cb
index ec43c97661..54a5ba783e 100644
--- a/src/mainboard/google/brya/variants/taeko/overridetree.cb
+++ b/src/mainboard/google/brya/variants/taeko/overridetree.cb
@@ -506,6 +506,12 @@ chip soc/intel/alderlake
probe AUDIO AUDIO_MAX98357_ALC5682I_VS_I2S
end
end
+ chip drivers/sof
+ register "spkr_tplg" = "max98357a"
+ register "jack_tplg" = "rt5682"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on end
+ end
end
device ref pcie_rp5 on
chip soc/intel/common/block/pcie/rtd3
diff --git a/src/mainboard/google/brya/variants/taeko4es/overridetree.cb b/src/mainboard/google/brya/variants/taeko4es/overridetree.cb
index e2481a1990..001e2b2cd8 100644
--- a/src/mainboard/google/brya/variants/taeko4es/overridetree.cb
+++ b/src/mainboard/google/brya/variants/taeko4es/overridetree.cb
@@ -368,6 +368,12 @@ chip soc/intel/alderlake
probe AUDIO AUDIO_MAX98357_ALC5682I_VS_I2S
end
end
+ chip drivers/sof
+ register "spkr_tplg" = "max98357a"
+ register "jack_tplg" = "rt5682"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on end
+ end
end
device ref pcie_rp5 on
chip soc/intel/common/block/pcie/rtd3
diff --git a/src/mainboard/google/brya/variants/taniks/overridetree.cb b/src/mainboard/google/brya/variants/taniks/overridetree.cb
index 01baf40ad4..8f5007ffe8 100644
--- a/src/mainboard/google/brya/variants/taniks/overridetree.cb
+++ b/src/mainboard/google/brya/variants/taniks/overridetree.cb
@@ -322,6 +322,12 @@ chip soc/intel/alderlake
probe AUDIO AUDIO_MAX98357_ALC5682I_I2S_2WAY
end
end
+ chip drivers/sof
+ register "spkr_tplg" = "max98357a"
+ register "jack_tplg" = "rt5682"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on end
+ end
end
device ref pcie_rp5 on
chip soc/intel/common/block/pcie/rtd3
diff --git a/src/mainboard/google/brya/variants/volmar/overridetree.cb b/src/mainboard/google/brya/variants/volmar/overridetree.cb
index 624e096e0d..9f61eed7b2 100644
--- a/src/mainboard/google/brya/variants/volmar/overridetree.cb
+++ b/src/mainboard/google/brya/variants/volmar/overridetree.cb
@@ -420,5 +420,13 @@ chip soc/intel/alderlake
end
end
end
+ device ref hda on
+ chip drivers/sof
+ register "spkr_tplg" = "max98373"
+ register "jack_tplg" = "nau8825"
+ register "mic_tplg" = "_2ch_pdm0"
+ device generic 0 on end
+ end
+ end
end
end