| Message ID | 20240731212153.921327-1-cujomalainey@chromium.org |
|---|---|
| State | Accepted |
| Commit | 7354eb7f1558466e92e926802d36e69e42938ea9 |
| Headers | show |
| Series | ASoC: SOF: Remove libraries from topology lookups | expand |
Il 31/07/24 23:21, cujomalainey@chromium.org ha scritto: > From: Curtis Malainey <cujomalainey@chromium.org> > > Default firmware shipped in open source are not licensed for 3P > libraries, therefore topologies should not reference them. > > If a OS wants to use 3P (that they have licensed) then they should use > the appropriate topology override mechanisms. > > Fixes: 8a7d5d85ed2161 ("ASoC: SOF: mediatek: mt8195: Add devicetree support to select topologies") > Signed-off-by: Curtis Malainey <cujomalainey@chromium.org> > Cc: Wojciech Macek <wmacek@google.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c > index 24ae1d4959be..1c6e035fd313 100644 > --- a/sound/soc/sof/mediatek/mt8195/mt8195.c > +++ b/sound/soc/sof/mediatek/mt8195/mt8195.c > @@ -573,7 +573,7 @@ static const struct snd_sof_dsp_ops sof_mt8195_ops = { > static struct snd_sof_of_mach sof_mt8195_machs[] = { > { > .compatible = "google,tomato", > - .sof_tplg_filename = "sof-mt8195-mt6359-rt1019-rt5682-dts.tplg" > + .sof_tplg_filename = "sof-mt8195-mt6359-rt1019-rt5682.tplg" > }, { > .compatible = "mediatek,mt8195", > .sof_tplg_filename = "sof-mt8195.tplg"
On Wed, 31 Jul 2024 14:21:44 -0700, cujomalainey@chromium.org wrote: > Default firmware shipped in open source are not licensed for 3P > libraries, therefore topologies should not reference them. > > If a OS wants to use 3P (that they have licensed) then they should use > the appropriate topology override mechanisms. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: Remove libraries from topology lookups commit: 7354eb7f1558466e92e926802d36e69e42938ea9 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c index 24ae1d4959be..1c6e035fd313 100644 --- a/sound/soc/sof/mediatek/mt8195/mt8195.c +++ b/sound/soc/sof/mediatek/mt8195/mt8195.c @@ -573,7 +573,7 @@ static const struct snd_sof_dsp_ops sof_mt8195_ops = { static struct snd_sof_of_mach sof_mt8195_machs[] = { { .compatible = "google,tomato", - .sof_tplg_filename = "sof-mt8195-mt6359-rt1019-rt5682-dts.tplg" + .sof_tplg_filename = "sof-mt8195-mt6359-rt1019-rt5682.tplg" }, { .compatible = "mediatek,mt8195", .sof_tplg_filename = "sof-mt8195.tplg"