April 2021 - Alsa-devel - mailman.alsa-project.org

advice for creating special ALSA driver or plugin
by Marc Lavallée 11 Apr '21

11 Apr '21

Hi ALSA developers. I'm completely new to ALSA developing, so I'm being lazy and ask for advices. I have a USB recording device for four 16bit/48Khz channels, "encoded" in a stereo 16bit/96Khz track; because it is a USB audio recording device, so no special recording software is required, but a (proprietary Windows) converting software is provided (that I can't use). Output channels are alternated at the sample level: L: 1313131313, R: 2424242424, etc... So basically the driver/plugin would alternates between input samples of a stereo track to output 4 channels (at half the input sample rate). Is there a code base I could study and adapt to start my simple project? Thanks for your attention. Marc

1 0

[PATCH] ALSA: core - add more card sysfs entries
by Jaroslav Kysela 10 Apr '21

10 Apr '21

There are several strings which are describing the card. As time goes, we have new universal drivers which probe components in a way, which is disassociated from the card structure (ASoC). Also, some drivers may require to select another firmware depending on the specific platform using udev. The new firmware may change the sound card behaviour. This patch allows flexible modifications of the card description from the user space to handle the specific boot / plug-in settings. Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/core/init.c | 166 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 155 insertions(+), 11 deletions(-) diff --git a/sound/core/init.c b/sound/core/init.c index ef41f5b3a240..01b26912a4d0 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -662,6 +662,33 @@ void snd_card_set_id(struct snd_card *card, const char *nid) } EXPORT_SYMBOL(snd_card_set_id); +#define EXTRA_ID_CHARS "_-" +#define EXTRA_NAME_CHARS " _-.:" + +static bool safe_attr_strcpy(char *dst, size_t dst_count, + const char *src, size_t src_count, + const char *extra_characters) +{ + size_t idx, copy; + int c; + + copy = src_count >= dst_count ? dst_count - 1 : src_count; + for (idx = 0; idx < copy; idx++) { + c = src[idx]; + if (c < ' ') { + copy = idx; + break; + } + if (!isalnum(c) && !strchr(extra_characters, c)) + return false; + } + if (copy < 3) + return false; + memcpy(dst, src, copy); + dst[copy] = '\0'; + return true; +} + static ssize_t card_id_show_attr(struct device *dev, struct device_attribute *attr, char *buf) @@ -676,18 +703,10 @@ card_id_store_attr(struct device *dev, struct device_attribute *attr, { struct snd_card *card = container_of(dev, struct snd_card, card_dev); char buf1[sizeof(card->id)]; - size_t copy = count > sizeof(card->id) - 1 ? - sizeof(card->id) - 1 : count; - size_t idx; - int c; - for (idx = 0; idx < copy; idx++) { - c = buf[idx]; - if (!isalnum(c) && c != '_' && c != '-') - return -EINVAL; - } - memcpy(buf1, buf, copy); - buf1[copy] = '\0'; + if (!safe_attr_strcpy(buf1, sizeof(buf1), buf, count, EXTRA_ID_CHARS)) + return -EINVAL; + mutex_lock(&snd_card_mutex); if (!card_id_ok(NULL, buf1)) { mutex_unlock(&snd_card_mutex); @@ -712,9 +731,134 @@ card_number_show_attr(struct device *dev, static DEVICE_ATTR(number, 0444, card_number_show_attr, NULL); +static ssize_t +card_driver_show_attr(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + return scnprintf(buf, PAGE_SIZE, "%s\n", card->driver); +} + +static ssize_t +card_driver_store_attr(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + char driver1[sizeof(card->driver)]; + + if (!safe_attr_strcpy(driver1, sizeof(driver1), buf, count, EXTRA_NAME_CHARS)) + return -EINVAL; + mutex_lock(&snd_card_mutex); + strcpy(card->driver, driver1); + mutex_unlock(&snd_card_mutex); + return count; +} + +static DEVICE_ATTR(driver, 0644, card_driver_show_attr, card_driver_store_attr); + +static ssize_t +card_name_show_attr(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + return scnprintf(buf, PAGE_SIZE, "%s\n", card->shortname); +} + +static ssize_t +card_name_store_attr(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + char name1[sizeof(card->shortname)]; + + if (!safe_attr_strcpy(name1, sizeof(name1), buf, count, EXTRA_NAME_CHARS)) + return -EINVAL; + mutex_lock(&snd_card_mutex); + strcpy(card->shortname, name1); + mutex_unlock(&snd_card_mutex); + return count; +} + +static DEVICE_ATTR(name, 0644, card_name_show_attr, card_name_store_attr); + +static ssize_t +card_longname_show_attr(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + return scnprintf(buf, PAGE_SIZE, "%s\n", card->longname); +} + +static ssize_t +card_longname_store_attr(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + char longname1[sizeof(card->longname)]; + + if (!safe_attr_strcpy(longname1, sizeof(longname1), buf, count, EXTRA_NAME_CHARS)) + return -EINVAL; + mutex_lock(&snd_card_mutex); + strcpy(card->longname, longname1); + mutex_unlock(&snd_card_mutex); + return count; +} + +static DEVICE_ATTR(longname, 0644, card_longname_show_attr, card_longname_store_attr); + +static ssize_t +card_mixername_show_attr(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + return scnprintf(buf, PAGE_SIZE, "%s\n", card->mixername); +} + +static ssize_t +card_mixername_store_attr(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + char mixername1[sizeof(card->mixername)]; + + if (!safe_attr_strcpy(mixername1, sizeof(mixername1), buf, count, EXTRA_NAME_CHARS)) + return -EINVAL; + mutex_lock(&snd_card_mutex); + strcpy(card->mixername, mixername1); + mutex_unlock(&snd_card_mutex); + return count; +} + +static DEVICE_ATTR(mixername, 0644, card_mixername_show_attr, card_mixername_store_attr); + +static ssize_t +card_components_show_attr(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + return scnprintf(buf, PAGE_SIZE, "%s\n", card->components); +} + +static ssize_t +card_components_store_attr(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + char components1[sizeof(card->components)]; + + if (!safe_attr_strcpy(components1, sizeof(components1), buf, count, EXTRA_NAME_CHARS)) + return -EINVAL; + mutex_lock(&snd_card_mutex); + strcpy(card->components, components1); + mutex_unlock(&snd_card_mutex); + return count; +} + +static DEVICE_ATTR(components, 0644, card_components_show_attr, card_components_store_attr); + static struct attribute *card_dev_attrs[] = { &dev_attr_id.attr, &dev_attr_number.attr, + &dev_attr_driver.attr, + &dev_attr_name.attr, + &dev_attr_longname.attr, + &dev_attr_mixername.attr, + &dev_attr_components.attr, NULL }; -- 2.30.2

7 34

[PATCH] ALSA: HDA: Add access description in __snd_hda_add_vmaster
by Ranjani Sridharan 10 Apr '21

10 Apr '21

Add description for access parameter in __snd_hda_add_vmaster() to prevent the compilation warning: warning: Function parameter or member 'access' not described in '__snd_hda_add_vmaster' Fixes: e65bf99718b5 ("ALSA: HDA - remove the custom implementation for the audio LED trigger") Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- sound/pci/hda/hda_codec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index e54e39b35709..a31009afc025 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1938,6 +1938,7 @@ static int add_follower(struct hda_codec *codec, * @followers: follower control names (optional) * @suffix: suffix string to each follower name (optional) * @init_follower_vol: initialize followers to unmute/0dB + * @access: kcontrol access rights * @ctl_ret: store the vmaster kcontrol in return * * Create a virtual master control with the given name. The TLV data -- 2.25.1

2 1

[PATCH v2] ASoC: amd: Add support for ALC1015P codec in acp3x machine driver
by Vijendar Mukunda 09 Apr '21

09 Apr '21

Add ALC1015p codec support for acp3x machine driver. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> --- v1 -> v2: update ACPI HID as "10021015" for AMD platform with RT1015p support sound/soc/amd/Kconfig | 1 + sound/soc/amd/acp3x-rt5682-max9836.c | 46 +++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig index 256c192..ba5a85b 100644 --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -35,6 +35,7 @@ config SND_SOC_AMD_RV_RT5682_MACH select SND_SOC_CROS_EC_CODEC select I2C_CROS_EC_TUNNEL select SND_SOC_RT1015 + select SND_SOC_RT1015P depends on SND_SOC_AMD_ACP3x && I2C && CROS_EC help This option enables machine driver for RT5682 and MAX9835. diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index cea320a..d9980ab 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -275,6 +275,8 @@ SND_SOC_DAILINK_DEF(rt5682, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5682:00", "rt5682-aif1"))); SND_SOC_DAILINK_DEF(max, DAILINK_COMP_ARRAY(COMP_CODEC("MX98357A:00", "HiFi"))); +SND_SOC_DAILINK_DEF(rt1015p, + DAILINK_COMP_ARRAY(COMP_CODEC("RTL1015:00", "HiFi"))); SND_SOC_DAILINK_DEF(rt1015, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1015:00", "rt1015-aif"), COMP_CODEC("i2c-10EC1015:01", "rt1015-aif"))); @@ -419,6 +421,43 @@ static struct snd_soc_card acp3x_1015 = { .num_controls = ARRAY_SIZE(acp3x_mc_1015_controls), }; +static const struct snd_soc_dapm_widget acp3x_1015p_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MUX("Dmic Mux", SND_SOC_NOPM, 0, 0, + &acp3x_dmic_mux_control), + SND_SOC_DAPM_SPK("Speakers", NULL), +}; + +static const struct snd_soc_dapm_route acp3x_1015p_route[] = { + {"Headphone Jack", NULL, "HPOL"}, + {"Headphone Jack", NULL, "HPOR"}, + {"IN1P", NULL, "Headset Mic"}, + {"Dmic Mux", "Front Mic", "DMIC"}, + {"Dmic Mux", "Rear Mic", "DMIC"}, + /* speaker */ + { "Speakers", NULL, "Speaker" }, +}; + +static const struct snd_kcontrol_new acp3x_mc_1015p_controls[] = { + SOC_DAPM_PIN_SWITCH("Speakers"), + SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), +}; + +static struct snd_soc_card acp3x_1015p = { + .name = "acp3xalc56821015p", + .owner = THIS_MODULE, + .dai_link = acp3x_dai, + .num_links = ARRAY_SIZE(acp3x_dai), + .dapm_widgets = acp3x_1015p_widgets, + .num_dapm_widgets = ARRAY_SIZE(acp3x_1015p_widgets), + .dapm_routes = acp3x_1015p_route, + .num_dapm_routes = ARRAY_SIZE(acp3x_1015p_route), + .controls = acp3x_mc_1015p_controls, + .num_controls = ARRAY_SIZE(acp3x_mc_1015p_controls), +}; + void *soc_is_rltk_max(struct device *dev) { const struct acpi_device_id *match; @@ -435,6 +474,9 @@ static void card_spk_dai_link_present(struct snd_soc_dai_link *links, if (!strcmp(card_name, "acp3xalc56821015")) { links[1].codecs = rt1015; links[1].num_codecs = ARRAY_SIZE(rt1015); + } else if (!strcmp(card_name, "acp3xalc56821015p")) { + links[1].codecs = rt1015p; + links[1].num_codecs = ARRAY_SIZE(rt1015p); } else { links[1].codecs = max; links[1].num_codecs = ARRAY_SIZE(max); @@ -486,6 +528,7 @@ static int acp3x_probe(struct platform_device *pdev) static const struct acpi_device_id acp3x_audio_acpi_match[] = { { "AMDI5682", (unsigned long)&acp3x_5682}, { "AMDI1015", (unsigned long)&acp3x_1015}, + { "10021015", (unsigned long)&acp3x_1015p}, {}, }; MODULE_DEVICE_TABLE(acpi, acp3x_audio_acpi_match); @@ -503,5 +546,6 @@ module_platform_driver(acp3x_audio); MODULE_AUTHOR("akshu.agrawal(a)amd.com"); MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); -MODULE_DESCRIPTION("ALC5682 ALC1015 & MAX98357 audio support"); +MODULE_AUTHOR("Vijendar.Mukunda(a)amd.com"); +MODULE_DESCRIPTION("ALC5682 ALC1015, ALC1015P & MAX98357 audio support"); MODULE_LICENSE("GPL v2"); -- 2.7.4

2 1

[PATCH -next] ASoC: rt715-sdca: Constify static struct snd_soc_dai_ops
by Ye Bin 09 Apr '21

09 Apr '21

The snd_soc_dai_ops structures is only stored in the ops field of a snd_soc_dai_driver structure, so make the snd_soc_dai_ops structure const to allow the compiler to put it in read-only memory. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Ye Bin <yebin10(a)huawei.com> --- sound/soc/codecs/rt715-sdca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c index 20528afbdc57..7db76c19e048 100644 --- a/sound/soc/codecs/rt715-sdca.c +++ b/sound/soc/codecs/rt715-sdca.c @@ -935,7 +935,7 @@ static int rt715_sdca_pcm_hw_free(struct snd_pcm_substream *substream, #define RT715_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8) -static struct snd_soc_dai_ops rt715_sdca_ops = { +static const struct snd_soc_dai_ops rt715_sdca_ops = { .hw_params = rt715_sdca_pcm_hw_params, .hw_free = rt715_sdca_pcm_hw_free, .set_sdw_stream = rt715_sdca_set_sdw_stream,

2 1

[PATCH] ASoC: soc-compress: lock pcm_mutex to resolve lockdep error
by Gyeongtaek Lee 09 Apr '21

09 Apr '21

If panic_on_warn=1 is added in bootargs and compress offload playback with DPCM is started, kernel panic would be occurred because rtd->card->pcm_mutex isn't held in soc_compr_open_fe() and soc_compr_free_fe() and it generates lockdep warning in the following code. void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd, int stream, int action) { struct snd_soc_dai *dai; int i; lockdep_assert_held(&rtd->card->pcm_mutex); To prevent lockdep warning but minimize side effect by adding mutex, pcm_mutex is held just before snd_soc_runtime_activate() and snd_soc_runtime_deactivate() and is released right after them. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> --- sound/soc/soc-compress.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 246a5e32e22a..b4810266f5e5 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -153,7 +153,9 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].state = SND_SOC_DPCM_STATE_OPEN; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_activate(fe, stream); + mutex_unlock(&fe->card->pcm_mutex); mutex_unlock(&fe->card->mutex); @@ -181,7 +183,9 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME); + mutex_lock_nested(&fe->card->pcm_mutex, fe->card->pcm_subclass); snd_soc_runtime_deactivate(fe, stream); + mutex_unlock(&fe->card->pcm_mutex); fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; base-commit: e49d033bddf5b565044e2abe4241353959bc9120 -- 2.21.0

2 1

[PATCH -next] ASoC: amd: raven: acp3x-i2s: Constify static struct snd_soc_dai_ops
by Ye Bin 09 Apr '21

09 Apr '21

The snd_soc_dai_ops structures is only stored in the ops field of a snd_soc_dai_driver structure, so make the snd_soc_dai_ops structure const to allow the compiler to put it in read-only memory. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Ye Bin <yebin10(a)huawei.com> --- sound/soc/amd/raven/acp3x-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 5bc028692fcf..396cb7d619e2 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -249,7 +249,7 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, return ret; } -static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { +static const struct snd_soc_dai_ops acp3x_i2s_dai_ops = { .hw_params = acp3x_i2s_hwparams, .trigger = acp3x_i2s_trigger, .set_fmt = acp3x_i2s_set_fmt,

2 1

[PATCH] ASoC: rt1019: remove registers to sync with rt1019 datasheet
by Jack Yu 09 Apr '21

09 Apr '21

Remove some registers to synchronize with the latest rt1019 datasheet. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- sound/soc/codecs/rt1019.c | 334 +------------------------------------- sound/soc/codecs/rt1019.h | 162 ------------------ 2 files changed, 1 insertion(+), 495 deletions(-) diff --git a/sound/soc/codecs/rt1019.c b/sound/soc/codecs/rt1019.c index f64bb7302720..10656a5927f1 100644 --- a/sound/soc/codecs/rt1019.c +++ b/sound/soc/codecs/rt1019.c @@ -32,210 +32,40 @@ static const struct reg_default rt1019_reg[] = { { 0x0000, 0x00 }, - { 0x0002, 0x55 }, - { 0x0003, 0x55 }, - { 0x0005, 0x54 }, - { 0x0006, 0x05 }, - { 0x0007, 0x01 }, - { 0x0008, 0x70 }, - { 0x0009, 0x28 }, - { 0x000a, 0x7f }, { 0x0011, 0x04 }, { 0x0013, 0x00 }, - { 0x0015, 0x00 }, - { 0x0017, 0x00 }, { 0x0019, 0x30 }, { 0x001b, 0x01 }, - { 0x001d, 0x18 }, - { 0x001f, 0x29 }, - { 0x0021, 0x09 }, - { 0x0023, 0x02 }, - { 0x0025, 0x00 }, - { 0x0026, 0x00 }, - { 0x0028, 0x03 }, - { 0x0053, 0x00 }, - { 0x0055, 0x00 }, - { 0x0056, 0x00 }, - { 0x0057, 0x00 }, - { 0x0058, 0x00 }, - { 0x005a, 0x00 }, { 0x005c, 0x00 }, - { 0x005d, 0x00 }, { 0x005e, 0x10 }, { 0x005f, 0xec }, { 0x0061, 0x10 }, { 0x0062, 0x19 }, - { 0x0064, 0x00 }, { 0x0066, 0x08 }, - { 0x0068, 0x00 }, - { 0x006a, 0x00 }, - { 0x006c, 0x00 }, - { 0x006e, 0x00 }, { 0x0100, 0x80 }, { 0x0100, 0x51 }, { 0x0102, 0x23 }, - { 0x0102, 0x0f }, - { 0x0104, 0x6c }, - { 0x0105, 0xec }, - { 0x0106, 0x00 }, - { 0x0107, 0x00 }, - { 0x0108, 0x00 }, - { 0x0200, 0x40 }, - { 0x0201, 0x00 }, - { 0x0202, 0x00 }, - { 0x0203, 0x00 }, - { 0x0301, 0x02 }, - { 0x0302, 0xaa }, - { 0x0303, 0x2a }, - { 0x0304, 0x6a }, - { 0x0306, 0xb0 }, - { 0x0308, 0x48 }, - { 0x030a, 0x0a }, - { 0x030b, 0x4b }, - { 0x030d, 0x7d }, - { 0x030e, 0xef }, - { 0x030f, 0x5a }, { 0x0311, 0x00 }, { 0x0312, 0x3e }, { 0x0313, 0x86 }, - { 0x0315, 0xa8 }, - { 0x0318, 0x1b }, - { 0x031a, 0x3d }, - { 0x031c, 0x40 }, - { 0x031d, 0x40 }, - { 0x031e, 0x30 }, - { 0x031f, 0xbb }, - { 0x0320, 0xa5 }, - { 0x0321, 0xa5 }, - { 0x0323, 0x5a }, - { 0x0324, 0xaa }, - { 0x0325, 0x80 }, - { 0x0326, 0xaa }, - { 0x0327, 0x66 }, - { 0x0328, 0x94 }, - { 0x0329, 0x00 }, - { 0x0330, 0x00 }, - { 0x0331, 0x30 }, - { 0x0332, 0x05 }, { 0x0400, 0x03 }, { 0x0401, 0x02 }, { 0x0402, 0x01 }, - { 0x0403, 0x23 }, - { 0x0404, 0x45 }, - { 0x0405, 0x67 }, - { 0x0500, 0x80 }, - { 0x0501, 0x00 }, - { 0x0502, 0x00 }, - { 0x0503, 0x00 }, { 0x0504, 0xff }, { 0x0505, 0x24 }, - { 0x0600, 0x75 }, - { 0x0601, 0x41 }, - { 0x0602, 0x60 }, - { 0x0603, 0x7f }, - { 0x0604, 0x65 }, - { 0x0605, 0x43 }, - { 0x0606, 0x00 }, - { 0x0607, 0x00 }, - { 0x0608, 0x00 }, - { 0x0609, 0x00 }, - { 0x060a, 0x00 }, - { 0x060b, 0x00 }, - { 0x060c, 0x00 }, - { 0x060d, 0x00 }, - { 0x060e, 0x00 }, - { 0x060f, 0x00 }, - { 0x0700, 0x15 }, - { 0x0701, 0xc8 }, - { 0x0704, 0x02 }, - { 0x0705, 0x00 }, - { 0x0706, 0x00 }, - { 0x0707, 0x80 }, - { 0x0708, 0x08 }, - { 0x0709, 0x00 }, - { 0x0800, 0x00 }, - { 0x0801, 0x00 }, - { 0x0802, 0x09 }, - { 0x0803, 0x00 }, - { 0x0900, 0x87 }, - { 0x0a01, 0x99 }, - { 0x0a02, 0x40 }, - { 0x0a03, 0x10 }, { 0x0b00, 0x50 }, { 0x0b01, 0xc3 }, - { 0x0c00, 0x84 }, - { 0x0c01, 0x00 }, - { 0x0c02, 0xbb }, - { 0x0c03, 0x80 }, - { 0x0c04, 0x10 }, - { 0x0c05, 0x30 }, - { 0x0c06, 0x00 }, - { 0x0d00, 0x80 }, - { 0x0d01, 0xbb }, - { 0x0d02, 0x80 }, - { 0x0d03, 0x00 }, - { 0x0d04, 0x00 }, - { 0x0d05, 0x00 }, - { 0x0e00, 0x80 }, - { 0x0e01, 0xbb }, - { 0x0e02, 0x80 }, - { 0x0e03, 0x00 }, - { 0x0e04, 0x10 }, - { 0x0e05, 0x30 }, - { 0x0f00, 0x80 }, - { 0x0f01, 0xbb }, - { 0x0f02, 0x80 }, - { 0x0f03, 0x00 }, - { 0x0f04, 0x10 }, - { 0x0f05, 0x30 }, - { 0x0f06, 0x88 }, - { 0x0f07, 0x88 }, - { 0x0f08, 0x00 }, - { 0x0f09, 0x00 }, }; static bool rt1019_volatile_register(struct device *dev, unsigned int reg) { switch (reg) { - case RT1019_PWR_STRP_1: case RT1019_PWR_STRP_2: - case RT1019_SIL_DET_GAT: - case RT1019_PHASE_SYNC: - case RT1019_STAT_MACH_2: - case RT1019_FS_DET_1: - case RT1019_FS_DET_2: - case RT1019_FS_DET_3: - case RT1019_FS_DET_4: - case RT1019_FS_DET_5: - case RT1019_FS_DET_6: - case RT1019_FS_DET_7: - case RT1019_ANA_READ: case RT1019_VER_ID: - case RT1019_CUSTOM_ID: case RT1019_VEND_ID_1: case RT1019_VEND_ID_2: case RT1019_DEV_ID_1: case RT1019_DEV_ID_2: - case RT1019_CAL_TOP_3: - case RT1019_CAL_TOP_7: - case RT1019_CAL_TOP_17: - case RT1019_CAL_TOP_18: - case RT1019_CAL_TOP_19: - case RT1019_CAL_TOP_20: - case RT1019_CAL_TOP_21: - case RT1019_CAL_TOP_22: - case RT1019_MDRE_CTRL_2: - case RT1019_MDRE_CTRL_3: - case RT1019_MDRE_CTRL_4: - case RT1019_SIL_DET_2: - case RT1019_PWM_DC_DET_1: - case RT1019_PMC_8: - case RT1019_PMC_9: - case RT1019_SPKDRC_7: - case RT1019_HALF_FREQ_7: - case RT1019_CUR_CTRL_11: - case RT1019_CUR_CTRL_12: - case RT1019_CUR_CTRL_13: return true; default: @@ -247,191 +77,29 @@ static bool rt1019_readable_register(struct device *dev, unsigned int reg) { switch (reg) { case RT1019_RESET: - case RT1019_PAD_DRV_1: - case RT1019_PAD_DRV_2: - case RT1019_PAD_PULL_1: - case RT1019_PAD_PULL_2: - case RT1019_PAD_PULL_3: - case RT1019_I2C_CTRL_1: - case RT1019_I2C_CTRL_2: - case RT1019_I2C_CTRL_3: case RT1019_IDS_CTRL: case RT1019_ASEL_CTRL: - case RT1019_PLL_RESET: - case RT1019_PWR_STRP_1: case RT1019_PWR_STRP_2: case RT1019_BEEP_TONE: - case RT1019_SIL_DET_GAT: - case RT1019_CLASSD_TIME: - case RT1019_CLASSD_OCP: - case RT1019_PHASE_SYNC: - case RT1019_STAT_MACH_1: - case RT1019_STAT_MACH_2: - case RT1019_EFF_CTRL: - case RT1019_FS_DET_1: - case RT1019_FS_DET_2: - case RT1019_FS_DET_3: - case RT1019_FS_DET_4: - case RT1019_FS_DET_5: - case RT1019_FS_DET_6: - case RT1019_FS_DET_7: - case RT1019_ANA_CTRL: - case RT1019_DUMMY_A: - case RT1019_DUMMY_B: - case RT1019_DUMMY_C: - case RT1019_DUMMY_D: - case RT1019_ANA_READ: case RT1019_VER_ID: - case RT1019_CUSTOM_ID: case RT1019_VEND_ID_1: case RT1019_VEND_ID_2: case RT1019_DEV_ID_1: case RT1019_DEV_ID_2: - case RT1019_TEST_PAD: case RT1019_SDB_CTRL: - case RT1019_TEST_CTRL_1: - case RT1019_TEST_CTRL_2: - case RT1019_TEST_CTRL_3: - case RT1019_SCAN_MODE: case RT1019_CLK_TREE_1: case RT1019_CLK_TREE_2: case RT1019_CLK_TREE_3: - case RT1019_CLK_TREE_4: - case RT1019_CLK_TREE_5: - case RT1019_CLK_TREE_6: - case RT1019_CLK_TREE_7: - case RT1019_CLK_TREE_8: - case RT1019_CLK_TREE_9: - case RT1019_ASRC_1: - case RT1019_ASRC_2: - case RT1019_ASRC_3: - case RT1019_ASRC_4: - case RT1019_SYS_CLK: - case RT1019_BIAS_CUR_1: - case RT1019_BIAS_CUR_2: - case RT1019_BIAS_CUR_3: - case RT1019_BIAS_CUR_4: - case RT1019_CHOP_CLK_DAC: - case RT1019_CHOP_CLK_ADC: - case RT1019_LDO_CTRL_1: - case RT1019_LDO_CTRL_2: - case RT1019_PM_ANA_1: - case RT1019_PM_ANA_2: - case RT1019_PM_ANA_3: case RT1019_PLL_1: case RT1019_PLL_2: case RT1019_PLL_3: - case RT1019_PLL_INT_1: - case RT1019_PLL_INT_3: - case RT1019_MIXER: - case RT1019_CLD_OUT_1: - case RT1019_CLD_OUT_2: - case RT1019_CLD_OUT_3: - case RT1019_CLD_OUT_4: - case RT1019_CLD_OUT_5: - case RT1019_CLD_OUT_6: - case RT1019_CLS_INT_REG_1: - case RT1019_CLS_INT_REG_2: - case RT1019_CLS_INT_REG_3: - case RT1019_CLS_INT_REG_4: - case RT1019_CLS_INT_REG_5: - case RT1019_CLS_INT_REG_6: - case RT1019_CLS_INT_REG_7: - case RT1019_CLS_INT_REG_8: - case RT1019_CLS_INT_REG_9: - case RT1019_CLS_INT_REG_10: case RT1019_TDM_1: case RT1019_TDM_2: case RT1019_TDM_3: - case RT1019_TDM_4: - case RT1019_TDM_5: - case RT1019_TDM_6: - case RT1019_DVOL_1: - case RT1019_DVOL_2: - case RT1019_DVOL_3: - case RT1019_DVOL_4: case RT1019_DMIX_MONO_1: case RT1019_DMIX_MONO_2: - case RT1019_CAL_TOP_1: - case RT1019_CAL_TOP_2: - case RT1019_CAL_TOP_3: - case RT1019_CAL_TOP_4: - case RT1019_CAL_TOP_5: - case RT1019_CAL_TOP_6: - case RT1019_CAL_TOP_7: - case RT1019_CAL_TOP_8: - case RT1019_CAL_TOP_9: - case RT1019_CAL_TOP_10: - case RT1019_CAL_TOP_11: - case RT1019_CAL_TOP_12: - case RT1019_CAL_TOP_13: - case RT1019_CAL_TOP_14: - case RT1019_CAL_TOP_15: - case RT1019_CAL_TOP_16: - case RT1019_CAL_TOP_17: - case RT1019_CAL_TOP_18: - case RT1019_CAL_TOP_19: - case RT1019_CAL_TOP_20: - case RT1019_CAL_TOP_21: - case RT1019_CAL_TOP_22: - case RT1019_MDRE_CTRL_1: - case RT1019_MDRE_CTRL_2: - case RT1019_MDRE_CTRL_3: - case RT1019_MDRE_CTRL_4: - case RT1019_MDRE_CTRL_5: - case RT1019_MDRE_CTRL_6: - case RT1019_MDRE_CTRL_7: - case RT1019_MDRE_CTRL_8: - case RT1019_MDRE_CTRL_9: - case RT1019_MDRE_CTRL_10: - case RT1019_SCC_CTRL_1: - case RT1019_SCC_CTRL_2: - case RT1019_SCC_CTRL_3: - case RT1019_SCC_DUMMY: - case RT1019_SIL_DET_1: - case RT1019_SIL_DET_2: - case RT1019_PWM_DC_DET_1: - case RT1019_PWM_DC_DET_2: - case RT1019_PWM_DC_DET_3: - case RT1019_PWM_DC_DET_4: case RT1019_BEEP_1: case RT1019_BEEP_2: - case RT1019_PMC_1: - case RT1019_PMC_2: - case RT1019_PMC_3: - case RT1019_PMC_4: - case RT1019_PMC_5: - case RT1019_PMC_6: - case RT1019_PMC_7: - case RT1019_PMC_8: - case RT1019_PMC_9: - case RT1019_SPKDRC_1: - case RT1019_SPKDRC_2: - case RT1019_SPKDRC_3: - case RT1019_SPKDRC_4: - case RT1019_SPKDRC_5: - case RT1019_SPKDRC_6: - case RT1019_SPKDRC_7: - case RT1019_HALF_FREQ_1: - case RT1019_HALF_FREQ_2: - case RT1019_HALF_FREQ_3: - case RT1019_HALF_FREQ_4: - case RT1019_HALF_FREQ_5: - case RT1019_HALF_FREQ_6: - case RT1019_HALF_FREQ_7: - case RT1019_CUR_CTRL_1: - case RT1019_CUR_CTRL_2: - case RT1019_CUR_CTRL_3: - case RT1019_CUR_CTRL_4: - case RT1019_CUR_CTRL_5: - case RT1019_CUR_CTRL_6: - case RT1019_CUR_CTRL_7: - case RT1019_CUR_CTRL_8: - case RT1019_CUR_CTRL_9: - case RT1019_CUR_CTRL_10: - case RT1019_CUR_CTRL_11: - case RT1019_CUR_CTRL_12: - case RT1019_CUR_CTRL_13: return true; default: return false; @@ -861,7 +529,7 @@ static const struct regmap_config rt1019_regmap = { .val_bits = 8, .use_single_read = true, .use_single_write = true, - .max_register = RT1019_CUR_CTRL_13, + .max_register = RT1019_BEEP_2, .volatile_reg = rt1019_volatile_register, .readable_reg = rt1019_readable_register, .cache_type = REGCACHE_RBTREE, diff --git a/sound/soc/codecs/rt1019.h b/sound/soc/codecs/rt1019.h index 46973e71c963..64df831eeb72 100644 --- a/sound/soc/codecs/rt1019.h +++ b/sound/soc/codecs/rt1019.h @@ -12,191 +12,29 @@ #define RT1019_DEVICE_ID_VAL2 0x6731 #define RT1019_RESET 0x0000 -#define RT1019_PAD_DRV_1 0x0002 -#define RT1019_PAD_DRV_2 0x0003 -#define RT1019_PAD_PULL_1 0x0005 -#define RT1019_PAD_PULL_2 0x0006 -#define RT1019_PAD_PULL_3 0x0007 -#define RT1019_I2C_CTRL_1 0x0008 -#define RT1019_I2C_CTRL_2 0x0009 -#define RT1019_I2C_CTRL_3 0x000a #define RT1019_IDS_CTRL 0x0011 #define RT1019_ASEL_CTRL 0x0013 -#define RT1019_PLL_RESET 0x0015 -#define RT1019_PWR_STRP_1 0x0017 #define RT1019_PWR_STRP_2 0x0019 #define RT1019_BEEP_TONE 0x001b -#define RT1019_SIL_DET_GAT 0x001d -#define RT1019_CLASSD_TIME 0x001f -#define RT1019_CLASSD_OCP 0x0021 -#define RT1019_PHASE_SYNC 0x0023 -#define RT1019_STAT_MACH_1 0x0025 -#define RT1019_STAT_MACH_2 0x0026 -#define RT1019_EFF_CTRL 0x0028 -#define RT1019_FS_DET_1 0x002a -#define RT1019_FS_DET_2 0x002b -#define RT1019_FS_DET_3 0x002c -#define RT1019_FS_DET_4 0x002d -#define RT1019_FS_DET_5 0x002e -#define RT1019_FS_DET_6 0x002f -#define RT1019_FS_DET_7 0x0030 -#define RT1019_ANA_CTRL 0x0053 -#define RT1019_DUMMY_A 0x0055 -#define RT1019_DUMMY_B 0x0056 -#define RT1019_DUMMY_C 0x0057 -#define RT1019_DUMMY_D 0x0058 -#define RT1019_ANA_READ 0x005a #define RT1019_VER_ID 0x005c -#define RT1019_CUSTOM_ID 0x005d #define RT1019_VEND_ID_1 0x005e #define RT1019_VEND_ID_2 0x005f #define RT1019_DEV_ID_1 0x0061 #define RT1019_DEV_ID_2 0x0062 -#define RT1019_TEST_PAD 0x0064 #define RT1019_SDB_CTRL 0x0066 -#define RT1019_TEST_CTRL_1 0x0068 -#define RT1019_TEST_CTRL_2 0x006a -#define RT1019_TEST_CTRL_3 0x006c -#define RT1019_SCAN_MODE 0x006e #define RT1019_CLK_TREE_1 0x0100 #define RT1019_CLK_TREE_2 0x0101 #define RT1019_CLK_TREE_3 0x0102 -#define RT1019_CLK_TREE_4 0x0103 -#define RT1019_CLK_TREE_5 0x0104 -#define RT1019_CLK_TREE_6 0x0105 -#define RT1019_CLK_TREE_7 0x0106 -#define RT1019_CLK_TREE_8 0x0107 -#define RT1019_CLK_TREE_9 0x0108 -#define RT1019_ASRC_1 0x0200 -#define RT1019_ASRC_2 0x0201 -#define RT1019_ASRC_3 0x0202 -#define RT1019_ASRC_4 0x0203 -#define RT1019_SYS_CLK 0x0300 -#define RT1019_BIAS_CUR_1 0x0301 -#define RT1019_BIAS_CUR_2 0x0302 -#define RT1019_BIAS_CUR_3 0x0303 -#define RT1019_BIAS_CUR_4 0x0304 -#define RT1019_CHOP_CLK_DAC 0x0306 -#define RT1019_CHOP_CLK_ADC 0x0308 -#define RT1019_LDO_CTRL_1 0x030a -#define RT1019_LDO_CTRL_2 0x030b -#define RT1019_PM_ANA_1 0x030d -#define RT1019_PM_ANA_2 0x030e -#define RT1019_PM_ANA_3 0x030f #define RT1019_PLL_1 0x0311 #define RT1019_PLL_2 0x0312 #define RT1019_PLL_3 0x0313 -#define RT1019_PLL_INT_1 0x0315 -#define RT1019_PLL_INT_3 0x0318 -#define RT1019_MIXER 0x031a -#define RT1019_CLD_OUT_1 0x031c -#define RT1019_CLD_OUT_2 0x031d -#define RT1019_CLD_OUT_3 0x031e -#define RT1019_CLD_OUT_4 0x031f -#define RT1019_CLD_OUT_5 0x0320 -#define RT1019_CLD_OUT_6 0x0321 -#define RT1019_CLS_INT_REG_1 0x0323 -#define RT1019_CLS_INT_REG_2 0x0324 -#define RT1019_CLS_INT_REG_3 0x0325 -#define RT1019_CLS_INT_REG_4 0x0326 -#define RT1019_CLS_INT_REG_5 0x0327 -#define RT1019_CLS_INT_REG_6 0x0328 -#define RT1019_CLS_INT_REG_7 0x0329 -#define RT1019_CLS_INT_REG_8 0x0330 -#define RT1019_CLS_INT_REG_9 0x0331 -#define RT1019_CLS_INT_REG_10 0x0332 #define RT1019_TDM_1 0x0400 #define RT1019_TDM_2 0x0401 #define RT1019_TDM_3 0x0402 -#define RT1019_TDM_4 0x0403 -#define RT1019_TDM_5 0x0404 -#define RT1019_TDM_6 0x0405 -#define RT1019_DVOL_1 0x0500 -#define RT1019_DVOL_2 0x0501 -#define RT1019_DVOL_3 0x0502 -#define RT1019_DVOL_4 0x0503 #define RT1019_DMIX_MONO_1 0x0504 #define RT1019_DMIX_MONO_2 0x0505 -#define RT1019_CAL_TOP_1 0x0600 -#define RT1019_CAL_TOP_2 0x0601 -#define RT1019_CAL_TOP_3 0x0602 -#define RT1019_CAL_TOP_4 0x0603 -#define RT1019_CAL_TOP_5 0x0604 -#define RT1019_CAL_TOP_6 0x0605 -#define RT1019_CAL_TOP_7 0x0606 -#define RT1019_CAL_TOP_8 0x0607 -#define RT1019_CAL_TOP_9 0x0608 -#define RT1019_CAL_TOP_10 0x0609 -#define RT1019_CAL_TOP_11 0x060a -#define RT1019_CAL_TOP_12 0x060b -#define RT1019_CAL_TOP_13 0x060c -#define RT1019_CAL_TOP_14 0x060d -#define RT1019_CAL_TOP_15 0x060e -#define RT1019_CAL_TOP_16 0x060f -#define RT1019_CAL_TOP_17 0x0610 -#define RT1019_CAL_TOP_18 0x0611 -#define RT1019_CAL_TOP_19 0x0612 -#define RT1019_CAL_TOP_20 0x0613 -#define RT1019_CAL_TOP_21 0x0614 -#define RT1019_CAL_TOP_22 0x0615 -#define RT1019_MDRE_CTRL_1 0x0700 -#define RT1019_MDRE_CTRL_2 0x0701 -#define RT1019_MDRE_CTRL_3 0x0702 -#define RT1019_MDRE_CTRL_4 0x0703 -#define RT1019_MDRE_CTRL_5 0x0704 -#define RT1019_MDRE_CTRL_6 0x0705 -#define RT1019_MDRE_CTRL_7 0x0706 -#define RT1019_MDRE_CTRL_8 0x0707 -#define RT1019_MDRE_CTRL_9 0x0708 -#define RT1019_MDRE_CTRL_10 0x0709 -#define RT1019_SCC_CTRL_1 0x0800 -#define RT1019_SCC_CTRL_2 0x0801 -#define RT1019_SCC_CTRL_3 0x0802 -#define RT1019_SCC_DUMMY 0x0803 -#define RT1019_SIL_DET_1 0x0900 -#define RT1019_SIL_DET_2 0x0901 -#define RT1019_PWM_DC_DET_1 0x0a00 -#define RT1019_PWM_DC_DET_2 0x0a01 -#define RT1019_PWM_DC_DET_3 0x0a02 -#define RT1019_PWM_DC_DET_4 0x0a03 #define RT1019_BEEP_1 0x0b00 #define RT1019_BEEP_2 0x0b01 -#define RT1019_PMC_1 0x0c00 -#define RT1019_PMC_2 0x0c01 -#define RT1019_PMC_3 0x0c02 -#define RT1019_PMC_4 0x0c03 -#define RT1019_PMC_5 0x0c04 -#define RT1019_PMC_6 0x0c05 -#define RT1019_PMC_7 0x0c06 -#define RT1019_PMC_8 0x0c07 -#define RT1019_PMC_9 0x0c08 -#define RT1019_SPKDRC_1 0x0d00 -#define RT1019_SPKDRC_2 0x0d01 -#define RT1019_SPKDRC_3 0x0d02 -#define RT1019_SPKDRC_4 0x0d03 -#define RT1019_SPKDRC_5 0x0d04 -#define RT1019_SPKDRC_6 0x0d05 -#define RT1019_SPKDRC_7 0x0d06 -#define RT1019_HALF_FREQ_1 0x0e00 -#define RT1019_HALF_FREQ_2 0x0e01 -#define RT1019_HALF_FREQ_3 0x0e02 -#define RT1019_HALF_FREQ_4 0x0e03 -#define RT1019_HALF_FREQ_5 0x0e04 -#define RT1019_HALF_FREQ_6 0x0e05 -#define RT1019_HALF_FREQ_7 0x0e06 -#define RT1019_CUR_CTRL_1 0x0f00 -#define RT1019_CUR_CTRL_2 0x0f01 -#define RT1019_CUR_CTRL_3 0x0f02 -#define RT1019_CUR_CTRL_4 0x0f03 -#define RT1019_CUR_CTRL_5 0x0f04 -#define RT1019_CUR_CTRL_6 0x0f05 -#define RT1019_CUR_CTRL_7 0x0f06 -#define RT1019_CUR_CTRL_8 0x0f07 -#define RT1019_CUR_CTRL_9 0x0f08 -#define RT1019_CUR_CTRL_10 0x0f09 -#define RT1019_CUR_CTRL_11 0x0f0a -#define RT1019_CUR_CTRL_12 0x0f0b -#define RT1019_CUR_CTRL_13 0x0f0c /* 0x0019 Power On Strap Control-2 */ #define RT1019_AUTO_BITS_SEL_MASK (0x1 << 5) -- 2.29.0

2 1

[PATCH -next] ASoC: codecs: lpass-wsa-macro: constify static struct snd_soc_dai_ops
by Ye Bin 09 Apr '21

09 Apr '21

The snd_soc_dai_ops structures is only stored in the ops field of a snd_soc_dai_driver structure, so make the snd_soc_dai_ops structure const to allow the compiler to put it in read-only memory. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Ye Bin <yebin10(a)huawei.com> --- sound/soc/codecs/lpass-wsa-macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index e37c8148c0de..e79a70386b4b 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1031,7 +1031,7 @@ static int wsa_macro_get_channel_map(struct snd_soc_dai *dai, return 0; } -static struct snd_soc_dai_ops wsa_macro_dai_ops = { +static const struct snd_soc_dai_ops wsa_macro_dai_ops = { .hw_params = wsa_macro_hw_params, .get_channel_map = wsa_macro_get_channel_map, };

2 1

[PATCH -next] ASoC: codecs: lpass-rx-macro: constify static struct snd_soc_dai_ops
by Ye Bin 09 Apr '21

09 Apr '21

The snd_soc_dai_ops structures is only stored in the ops field of a snd_soc_dai_driver structure, so make the snd_soc_dai_ops structure const to allow the compiler to put it in read-only memory. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Ye Bin <yebin10(a)huawei.com> --- sound/soc/codecs/lpass-rx-macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 08fed40372ab..8e6a47f152ad 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -1767,7 +1767,7 @@ static int rx_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream) return 0; } -static struct snd_soc_dai_ops rx_macro_dai_ops = { +static const struct snd_soc_dai_ops rx_macro_dai_ops = { .hw_params = rx_macro_hw_params, .get_channel_map = rx_macro_get_channel_map, .mute_stream = rx_macro_digital_mute,

2 1