diff mbox series

ASoC: wm_adsp: Support new metadata block ID's

Message ID 20200723110321.16382-1-ckeepax@opensource.cirrus.com (mailing list archive)
State Accepted
Commit 779bedff9bfaf34cae6bfcbdd98d972149f687e5
Headers show
Series ASoC: wm_adsp: Support new metadata block ID's | expand

Commit Message

Charles Keepax July 23, 2020, 11:03 a.m. UTC
From: James Schulman <james.schulman@cirrus.com>

Coefficient files now support additional metadata blocks, these
contain machine parsable text strings describing the parameters
contained in the coefficient file.

Signed-off-by: James Schulman <james.schulman@cirrus.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 sound/soc/codecs/wm_adsp.c | 1 +
 sound/soc/codecs/wmfw.h    | 1 +
 2 files changed, 2 insertions(+)

Comments

Mark Brown July 23, 2020, 8:19 p.m. UTC | #1
On Thu, 23 Jul 2020 12:03:21 +0100, Charles Keepax wrote:
> Coefficient files now support additional metadata blocks, these
> contain machine parsable text strings describing the parameters
> contained in the coefficient file.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: wm_adsp: Support new metadata block ID's
      commit: 779bedff9bfaf34cae6bfcbdd98d972149f687e5

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 mbox series

Patch

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 88c397c700ee9..410cca57da52d 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2621,6 +2621,7 @@  static int wm_adsp_load_coeff(struct wm_adsp *dsp)
 		switch (type) {
 		case (WMFW_NAME_TEXT << 8):
 		case (WMFW_INFO_TEXT << 8):
+		case (WMFW_METADATA << 8):
 			break;
 		case (WMFW_ABSOLUTE << 8):
 			/*
diff --git a/sound/soc/codecs/wmfw.h b/sound/soc/codecs/wmfw.h
index 4278aa6aeb01b..7423272c30e94 100644
--- a/sound/soc/codecs/wmfw.h
+++ b/sound/soc/codecs/wmfw.h
@@ -180,6 +180,7 @@  struct wmfw_coeff_item {
 
 #define WMFW_ABSOLUTE         0xf0
 #define WMFW_ALGORITHM_DATA   0xf2
+#define WMFW_METADATA         0xfc
 #define WMFW_NAME_TEXT        0xfe
 #define WMFW_INFO_TEXT        0xff