summaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake/include
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2022-12-06 21:05:16 -0600
committerFelix Held <felix-coreboot@felixheld.de>2022-12-21 14:00:13 +0000
commitbf3c648fa7f6cdd946698a2ec6584102b53e4c4a (patch)
tree5628cdf3a39071e5cf87c05dcf7bd329766bacc4 /src/soc/intel/skylake/include
parentca342e108227859112746bb262bb742e800b6973 (diff)
soc/intel/skl; mb/google/eve,poppy: Update NHLT methods
Adapted from WIP (and now abandoned) patches CB:25334, 26308, 26309. Update the nhlt_soc_add_*() methods for max98373, max98927, and rt5514 codecs to program the render and feedback slot numbers as appropriate. TEST=boot Windows on google/eve, atlas, nocturne, and rammus. Verify audio functional with both Google project campfire drivers as well as coolstar's AVS audio drivers. Change-Id: Ib8c6e24ba539e205bd5bbd856ecff43b2c016c2e Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/70394 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: CoolStar <coolstarorganization@gmail.com>
Diffstat (limited to 'src/soc/intel/skylake/include')
-rw-r--r--src/soc/intel/skylake/include/soc/nhlt.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/soc/intel/skylake/include/soc/nhlt.h b/src/soc/intel/skylake/include/soc/nhlt.h
index dd2825590c..a511f2ff8d 100644
--- a/src/soc/intel/skylake/include/soc/nhlt.h
+++ b/src/soc/intel/skylake/include/soc/nhlt.h
@@ -51,12 +51,14 @@ int nhlt_soc_add_max98357(struct nhlt *nhlt, int hwlink);
* Add max98373 amplifier in stereo configuration on provided SSP link.
* Return 0 on success, < 0 on error.
*/
-int nhlt_soc_add_max98373(struct nhlt *nhlt, int hwlink);
+int nhlt_soc_add_max98373(struct nhlt *nhlt, int hwlink, int render_slot,
+ int feedback_slot);
/*
* Add rt5514 DSP on provided SSP link. Return 0 on success, < 0 on error.
*/
-int nhlt_soc_add_rt5514(struct nhlt *nhlt, int hwlink, int num_channels);
+int nhlt_soc_add_rt5514(struct nhlt *nhlt, int hwlink, int num_channels,
+ int virtual_slot);
/*
* Add rt5663 headset codec on provided SSP link. Return 0 on success, < 0
@@ -68,7 +70,8 @@ int nhlt_soc_add_rt5663(struct nhlt *nhlt, int hwlink);
* Add max98927 amplifier in stereo configuration on provided SSP link.
* Return 0 on success, < 0 on error.
*/
-int nhlt_soc_add_max98927(struct nhlt *nhlt, int hwlink);
+int nhlt_soc_add_max98927(struct nhlt *nhlt, int hwlink, int render_slot,
+ int feedback_slot);
/*
* Add da7219 headset codec on provided SSP link. Return 0 on success, < 0