summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCezary Rojewski <cezary.rojewski@intel.com>2023-05-19 22:17:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-30 12:57:58 +0100
commit80a4b9ad4288c29aebaf1b09f6eb208c33ba3303 (patch)
tree7fb2c9470d5a3c442ff52a6ab5f7504f8f2e9ee1
parentc966b58c8515b2d6720ddf7b327b4ba5d9ba89a2 (diff)
downloadlinux-stable-80a4b9ad4288c29aebaf1b09f6eb208c33ba3303.tar.gz
linux-stable-80a4b9ad4288c29aebaf1b09f6eb208c33ba3303.tar.bz2
linux-stable-80a4b9ad4288c29aebaf1b09f6eb208c33ba3303.zip
ASoC: Intel: Skylake: Fix declaration of enum skl_ch_cfg
commit 95109657471311601b98e71f03d0244f48dc61bb upstream. Constant 'C4_CHANNEL' does not exist on the firmware side. Value 0xC is reserved for 'C7_1' instead. Fixes: 04afbbbb1cba ("ASoC: Intel: Skylake: Update the topology interface structure") Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20230519201711.4073845-4-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/uapi/sound/skl-tplg-interface.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index a93c0decfdd5..215ce16b37d2 100644
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -66,7 +66,8 @@ enum skl_ch_cfg {
SKL_CH_CFG_DUAL_MONO = 9,
SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10,
SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11,
- SKL_CH_CFG_4_CHANNEL = 12,
+ SKL_CH_CFG_7_1 = 12,
+ SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1,
SKL_CH_CFG_INVALID
};