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

[PATCH v3 0/7] kselftest/alsa: pcm-test improvements
by Mark Brown 02 Dec '22

02 Dec '22

This series provides a bunch of quick updates which should make the coverage from pcm-test a bit more useful, it adds some support for skipping tests when the hardware/driver is unable to support the requested configuration, support for providing user visible descriptions and then expands the set of cases we cover to include more sample rates and channel counts. This should exercise switching between 8kHz and 44.1kHz based rates and ensure that clocking doesn't get confused by non-stereo channel counts, both of which are I expect common real world errors, at least for embedded cards. v3: - "Rebase" onto Takashi's current tree (with a revert). - Include Jaroslav's changes to specify all tests in the configuration file parsing. - Add a new "description" field to the configuration instead of trying to name the tests. - Always run both default and per-system tests, logging our success at setting the per-system configurations as a separate test since they shouldn't fail. v2: - Rebase onto Takashi's current tree. - Tweak the buffer sizes for the newly added cases, don't be quite so ambitious in how big a buffer we request for 96kHz and don't go quite so small for 8kHz since some devices start hitting lower limits on period size and struggle to deliver accurate timing. Jaroslav Kysela (1): kselftest/alsa: pcm - move more configuration to configuration files Mark Brown (6): kselftest/alsa: pcm - Drop recent coverage improvement changes kselftest/alsa: pcm - Always run the default set of tests kselftest/alsa: pcm - skip tests when we fail to set params kselftest/alsa: pcm - Support optional description for tests kselftest/alsa: pcm - Provide descriptions for the default tests kselftest/alsa: pcm - Add more coverage by default tools/testing/selftests/alsa/Makefile | 2 +- tools/testing/selftests/alsa/alsa-local.h | 3 + tools/testing/selftests/alsa/conf.c | 26 ++- .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 43 ++-- tools/testing/selftests/alsa/pcm-test.c | 205 ++++++++++++------ tools/testing/selftests/alsa/pcm-test.conf | 63 ++++++ 6 files changed, 250 insertions(+), 92 deletions(-) create mode 100644 tools/testing/selftests/alsa/pcm-test.conf base-commit: 7d721baea138696d5a6746fb5bce0a510a91bd65 -- 2.30.2

2 8

[PATCH 00/16] ASoC: Intel: avs: Data probing and fw logging
by Cezary Rojewski 02 Dec '22

02 Dec '22

The patchset focuses on debug functionality for the avs-driver. Two major blocks are covered here: data probing and AudioDSP firmware logging. Both are configured and controlled through debugfs. Data probing is a AudioDSP debug functionality which allows for gathering the actual data that is being routed to or from a module. Helps in debugging its processing capabilities - navigate to a specific module which may have caused a glitch within a pipeline (set of modules bound together). First few allow for assigning compress stream to a HDAudio stream, what is currently limited to pcm substreams only. These patches were already present on this list and reviewed in the past [1]. The next few tidy existing debug-related code up so it's ready for addition of new functionalities and make it clear which part of the avs is debug related and which is not. These also simplify the existing locking around the trace fifo. Afterward, debug-related IPCs are defined along with stub soc-component and compress DAI operations. Not much is done there as it's not a standard PCM streaming scenario. Most code found in compress operations is inherited from the HOST side of HDAudio streaming found in pcm.c file of the driver. Finally, a debugfs file operations are defined. These facilitate connecting to DSP modules from which the data shall be gathered as well as control and configuration of firmware logging. Additionally, entries are added to allow for dumping snapshots of key memory windows. [1]: https://lore.kernel.org/alsa-devel/20200124190413.18154-1-cezary.rojewski@i… Cezary Rojewski (16): ALSA: hda: Allow for compress stream to hdac_ext_stream assignment ALSA: hda: Prepare for compress stream support ALSA: hda: Interrupt servicing and BDL setup for compress streams ASoC: Intel: avs: Introduce avs_log_buffer_status_locked() ASoC: Intel: avs: Drop fifo_lock ASoC: Intel: avs: Introduce debug-context aware helpers ASoC: Intel: avs: Make enable_logs() dependent on DEBUG_FS ASoC: Intel: avs: Drop usage of debug members in non-debug code ASoC: Intel: avs: Add data probing requests ASoC: Intel: avs: Probe compress operations ASoC: Intel: avs: Data probing soc-component ASoC: Intel: avs: Add probe machine board ASoC: Intel: avs: Probing and firmware tracing over debugfs ASoC: Intel: avs: Gather remaining logs on strace_release() ASoC: Intel: avs: Allow for dumping FW_REGS area ASoC: Intel: avs: Allow for dumping debug window snapshot include/sound/hdaudio_ext.h | 2 + sound/hda/ext/hdac_ext_stream.c | 41 +++ sound/hda/hdac_controller.c | 4 +- sound/hda/hdac_stream.c | 52 +-- sound/soc/intel/Kconfig | 1 + sound/soc/intel/avs/Makefile | 4 + sound/soc/intel/avs/apl.c | 24 +- sound/soc/intel/avs/avs.h | 80 ++++- sound/soc/intel/avs/board_selection.c | 33 ++ sound/soc/intel/avs/boards/Kconfig | 8 + sound/soc/intel/avs/boards/Makefile | 2 + sound/soc/intel/avs/boards/probe.c | 64 ++++ sound/soc/intel/avs/core.c | 2 + sound/soc/intel/avs/debugfs.c | 436 ++++++++++++++++++++++++++ sound/soc/intel/avs/ipc.c | 2 +- sound/soc/intel/avs/messages.c | 104 +++++- sound/soc/intel/avs/messages.h | 53 ++++ sound/soc/intel/avs/pcm.c | 6 +- sound/soc/intel/avs/probes.c | 312 ++++++++++++++++++ sound/soc/intel/avs/registers.h | 3 +- sound/soc/intel/avs/skl.c | 17 +- sound/soc/intel/avs/utils.c | 22 -- 22 files changed, 1172 insertions(+), 100 deletions(-) create mode 100644 sound/soc/intel/avs/boards/probe.c create mode 100644 sound/soc/intel/avs/debugfs.c create mode 100644 sound/soc/intel/avs/probes.c -- 2.25.1

2 19

[PATCH] kselftests/alsa: pcm - move more configuration to configuration files
by Jaroslav Kysela 02 Dec '22

02 Dec '22

Obtain all test parameters from the configuration files. The defaults are defined in the pcm-test.conf file. The test count and parameters may be variable per specific hardware. Also, handle alt_formats field now (with the fixes in the format loop). It replaces the original "automatic" logic which is not so universal. The code may be further extended to skip various tests based on the configuration hints, if the exact PCM hardware parameters are not available for the given hardware. Cc: Mark Brown <broonie(a)kernel.org> Cc: Shuah Khan <shuah(a)kernel.org> Cc: linux-kselftest(a)vger.kernel.org Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- tools/testing/selftests/alsa/Makefile | 2 +- tools/testing/selftests/alsa/alsa-local.h | 3 + tools/testing/selftests/alsa/conf.c | 26 ++++- .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 8 ++ tools/testing/selftests/alsa/pcm-test.c | 102 ++++++++++++------ tools/testing/selftests/alsa/pcm-test.conf | 16 +++ 6 files changed, 121 insertions(+), 36 deletions(-) create mode 100644 tools/testing/selftests/alsa/pcm-test.conf diff --git a/tools/testing/selftests/alsa/Makefile b/tools/testing/selftests/alsa/Makefile index a8c0383878d3..77fba3e498cc 100644 --- a/tools/testing/selftests/alsa/Makefile +++ b/tools/testing/selftests/alsa/Makefile @@ -14,7 +14,7 @@ TEST_GEN_PROGS := mixer-test pcm-test TEST_GEN_PROGS_EXTENDED := libatest.so -TEST_FILES := conf.d +TEST_FILES := conf.d pcm-test.conf include ../lib.mk diff --git a/tools/testing/selftests/alsa/alsa-local.h b/tools/testing/selftests/alsa/alsa-local.h index 65f197ea9773..de030dc23bd1 100644 --- a/tools/testing/selftests/alsa/alsa-local.h +++ b/tools/testing/selftests/alsa/alsa-local.h @@ -12,6 +12,7 @@ snd_config_t *get_alsalib_config(void); +snd_config_t *conf_load_from_file(const char *filename); void conf_load(void); void conf_free(void); snd_config_t *conf_by_card(int card); @@ -20,5 +21,7 @@ int conf_get_count(snd_config_t *root, const char *key1, const char *key2); const char *conf_get_string(snd_config_t *root, const char *key1, const char *key2, const char *def); long conf_get_long(snd_config_t *root, const char *key1, const char *key2, long def); int conf_get_bool(snd_config_t *root, const char *key1, const char *key2, int def); +void conf_get_string_array(snd_config_t *root, const char *key1, const char *key2, + const char **array, int array_size, const char *def); #endif /* __ALSA_LOCAL_H */ diff --git a/tools/testing/selftests/alsa/conf.c b/tools/testing/selftests/alsa/conf.c index c7ffc8f04195..d7aafe5a1993 100644 --- a/tools/testing/selftests/alsa/conf.c +++ b/tools/testing/selftests/alsa/conf.c @@ -125,7 +125,7 @@ static int dump_config_tree(snd_config_t *top) snd_output_close(out); } -static snd_config_t *load(const char *filename) +snd_config_t *conf_load_from_file(const char *filename) { snd_config_t *dst; snd_input_t *input; @@ -235,7 +235,7 @@ static bool test_filename1(int card, const char *filename, const char *sysfs_car snd_config_t *config, *sysfs_config, *card_config, *sysfs_card_config, *node; snd_config_iterator_t i, next; - config = load(filename); + config = conf_load_from_file(filename); if (snd_config_search(config, "sysfs", &sysfs_config) || snd_config_get_type(sysfs_config) != SND_CONFIG_TYPE_COMPOUND) ksft_exit_fail_msg("Missing global sysfs block in filename %s\n", filename); @@ -446,3 +446,25 @@ int conf_get_bool(snd_config_t *root, const char *key1, const char *key2, int de ksft_exit_fail_msg("key '%s'.'%s' is not an bool\n", key1, key2); return !!ret; } + +void conf_get_string_array(snd_config_t *root, const char *key1, const char *key2, + const char **array, int array_size, const char *def) +{ + snd_config_t *cfg; + char buf[16]; + int ret, index; + + ret = conf_get_by_keys(root, key1, key2, &cfg); + if (ret == -ENOENT) + cfg = NULL; + else if (ret < 0) + ksft_exit_fail_msg("key '%s'.'%s' search error: %s\n", key1, key2, snd_strerror(ret)); + for (index = 0; index < array_size; index++) { + if (cfg == NULL) { + array[index] = def; + } else { + sprintf(buf, "%i", index); + array[index] = conf_get_string(cfg, buf, NULL, def); + } + } +} diff --git a/tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf b/tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf index 0a83f35d43eb..5b40a916295d 100644 --- a/tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf +++ b/tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf @@ -55,6 +55,14 @@ card.hda { period_size 24000 buffer_size 192000 } + test.time3 { + access RW_INTERLEAVED + format S16_LE + rate 44100 + channels 2 + period_size 24000 + buffer_size 192000 + } } CAPTURE { # use default tests, check for the presence diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c index 6e7dfc395b98..e973b03ae1fd 100644 --- a/tools/testing/selftests/alsa/pcm-test.c +++ b/tools/testing/selftests/alsa/pcm-test.c @@ -31,7 +31,6 @@ struct pcm_data { struct pcm_data *next; }; -int num_pcms = 0; struct pcm_data *pcm_list = NULL; int num_missing = 0; @@ -200,7 +199,6 @@ static void find_pcms(void) pcm_data->pcm_config = conf_get_subtree(card_config, key, NULL); pcm_data->next = pcm_list; pcm_list = pcm_data; - num_pcms++; } } } @@ -219,17 +217,15 @@ static void find_pcms(void) snd_config_delete(config); } -static void test_pcm_time1(struct pcm_data *data, - const char *cfg_prefix, const char *sformat, - long srate, long schannels, - long speriod_size, long sbuffer_size) +static void test_pcm_time(struct pcm_data *data, const char *test_name, snd_config_t *pcm_cfg) { char name[64], key[128], msg[256]; const char *cs; int i, err; snd_pcm_t *handle = NULL; snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; - snd_pcm_format_t format; + snd_pcm_format_t format, old_format; + const char *alt_formats[8]; unsigned char *samples = NULL; snd_pcm_sframes_t frames; long long ms; @@ -237,27 +233,23 @@ static void test_pcm_time1(struct pcm_data *data, unsigned int rrate; snd_pcm_uframes_t rperiod_size, rbuffer_size, start_threshold; timestamp_t tstamp; - bool pass = false, automatic = true; + bool pass = false; snd_pcm_hw_params_t *hw_params; snd_pcm_sw_params_t *sw_params; snd_pcm_hw_params_alloca(&hw_params); snd_pcm_sw_params_alloca(&sw_params); - cs = conf_get_string(data->pcm_config, cfg_prefix, "format", sformat); + cs = conf_get_string(pcm_cfg, "format", NULL, "S16_LE"); format = snd_pcm_format_value(cs); if (format == SND_PCM_FORMAT_UNKNOWN) ksft_exit_fail_msg("Wrong format '%s'\n", cs); - rate = conf_get_long(data->pcm_config, cfg_prefix, "rate", srate); - channels = conf_get_long(data->pcm_config, cfg_prefix, "channels", schannels); - period_size = conf_get_long(data->pcm_config, cfg_prefix, "period_size", speriod_size); - buffer_size = conf_get_long(data->pcm_config, cfg_prefix, "buffer_size", sbuffer_size); - - automatic = strcmp(sformat, snd_pcm_format_name(format)) == 0 && - srate == rate && - schannels == channels && - speriod_size == period_size && - sbuffer_size == buffer_size; + conf_get_string_array(pcm_cfg, "alt_formats", NULL, + alt_formats, ARRAY_SIZE(alt_formats), NULL); + rate = conf_get_long(pcm_cfg, "rate", NULL, 48000); + channels = conf_get_long(pcm_cfg, "channels", NULL, 2); + period_size = conf_get_long(pcm_cfg, "period_size", NULL, 4096); + buffer_size = conf_get_long(pcm_cfg, "buffer_size", NULL, 16384); samples = malloc((rate * channels * snd_pcm_format_physical_width(format)) / 8); if (!samples) @@ -287,16 +279,29 @@ static void test_pcm_time1(struct pcm_data *data, snd_pcm_access_name(access), snd_strerror(err)); goto __close; } + i = -1; __format: err = snd_pcm_hw_params_set_format(handle, hw_params, format); if (err < 0) { - if (automatic && format == SND_PCM_FORMAT_S16_LE) { - format = SND_PCM_FORMAT_S32_LE; - ksft_print_msg("%s.%d.%d.%d.%s.%s format S16_LE -> S32_LE\n", - cfg_prefix, - data->card, data->device, data->subdevice, - snd_pcm_stream_name(data->stream), - snd_pcm_access_name(access)); + i++; + if (i < ARRAY_SIZE(alt_formats) && alt_formats[i]) { + old_format = format; + format = snd_pcm_format_value(alt_formats[i]); + if (format != SND_PCM_FORMAT_UNKNOWN) { + ksft_print_msg("%s.%d.%d.%d.%s.%s format %s -> %s\n", + test_name, + data->card, data->device, data->subdevice, + snd_pcm_stream_name(data->stream), + snd_pcm_access_name(access), + snd_pcm_format_name(old_format), + snd_pcm_format_name(format)); + samples = realloc(samples, (rate * channels * + snd_pcm_format_physical_width(format)) / 8); + if (!samples) + ksft_exit_fail_msg("Out of memory\n"); + snd_pcm_format_set_silence(format, samples, rate * channels); + goto __format; + } } snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_format %s: %s", snd_pcm_format_name(format), snd_strerror(err)); @@ -362,7 +367,7 @@ static void test_pcm_time1(struct pcm_data *data, } ksft_print_msg("%s.%d.%d.%d.%s hw_params.%s.%s.%ld.%ld.%ld.%ld sw_params.%ld\n", - cfg_prefix, + test_name, data->card, data->device, data->subdevice, snd_pcm_stream_name(data->stream), snd_pcm_access_name(access), @@ -411,7 +416,7 @@ static void test_pcm_time1(struct pcm_data *data, pass = true; __close: ksft_test_result(pass, "%s.%d.%d.%d.%s%s%s\n", - cfg_prefix, + test_name, data->card, data->device, data->subdevice, snd_pcm_stream_name(data->stream), msg[0] ? " " : "", msg); @@ -420,19 +425,35 @@ static void test_pcm_time1(struct pcm_data *data, snd_pcm_close(handle); } -#define TESTS_PER_PCM 2 - int main(void) { struct pcm_data *pcm; + snd_config_t *global_config, *default_pcm_config, *cfg, *pcm_cfg; + snd_config_iterator_t i, next; + int num_pcm_tests = 0, num_tests; + const char *test_name, *test_type; ksft_print_header(); + global_config = conf_load_from_file("pcm-test.conf"); + default_pcm_config = conf_get_subtree(global_config, "pcm", NULL); + if (default_pcm_config == NULL) + ksft_exit_fail_msg("default pcm test configuration (pcm compound) is missing\n"); + conf_load(); find_pcms(); - ksft_set_plan(num_missing + num_pcms * TESTS_PER_PCM); + for (pcm = pcm_list; pcm != NULL; pcm = pcm->next) { + cfg = pcm->pcm_config; + if (cfg == NULL) + cfg = default_pcm_config; + num_tests = conf_get_count(cfg, "test", NULL); + if (num_tests > 0) + num_pcm_tests += num_tests; + } + + ksft_set_plan(num_missing + num_pcm_tests); for (pcm = pcm_missing; pcm != NULL; pcm = pcm->next) { ksft_test_result(false, "test.missing.%d.%d.%d.%s\n", @@ -441,10 +462,25 @@ int main(void) } for (pcm = pcm_list; pcm != NULL; pcm = pcm->next) { - test_pcm_time1(pcm, "test.time1", "S16_LE", 48000, 2, 512, 4096); - test_pcm_time1(pcm, "test.time2", "S16_LE", 48000, 2, 24000, 192000); + cfg = pcm->pcm_config; + if (cfg == NULL) + cfg = default_pcm_config; + cfg = conf_get_subtree(cfg, "test", NULL); + if (cfg == NULL) + continue; + snd_config_for_each(i, next, cfg) { + pcm_cfg = snd_config_iterator_entry(i); + if (snd_config_get_id(pcm_cfg, &test_name) < 0) + ksft_exit_fail_msg("snd_config_get_id\n"); + test_type = conf_get_string(pcm_cfg, "type", NULL, "time"); + if (strcmp(test_type, "time") == 0) + test_pcm_time(pcm, test_name, pcm_cfg); + else + ksft_exit_fail_msg("unknown test type '%s'\n", test_type); + } } + snd_config_delete(global_config); conf_free(); ksft_exit_pass(); diff --git a/tools/testing/selftests/alsa/pcm-test.conf b/tools/testing/selftests/alsa/pcm-test.conf new file mode 100644 index 000000000000..473a19251b49 --- /dev/null +++ b/tools/testing/selftests/alsa/pcm-test.conf @@ -0,0 +1,16 @@ +pcm.test.time1 { + format S16_LE + alt_formats [ S32_LE ] + rate 48000 + channels 2 + period_size 512 + buffer_size 4096 +} +pcm.test.time2 { + format S16_LE + alt_formats [ S32_LE ] + rate 48000 + channels 2 + period_size 24000 + buffer_size 192000 +} -- 2.35.3

2 3

[PATCH v7 0/2] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 01 Dec '22

01 Dec '22

Since: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") we wait for all the workloads to be completed during shutdown. This was done to avoid a stall once the device is started again. Unfortunately this has the side effect of stalling kexec(), if the userspace is frozen. Let's handle that case. To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Liam Girdwood <lgirdwood(a)gmail.com> To: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> To: Bard Liao <yung-chuan.liao(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Daniel Baluta <daniel.baluta(a)nxp.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> To: Eric Biederman <ebiederm(a)xmission.com> To: Chromeos Kdump <chromeos-kdump(a)google.com> To: Steven Rostedt <rostedt(a)goodmis.org> Cc: stable(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: kexec(a)lists.infradead.org Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- Changes in v7: - Fix commit message (Thanks Pierre-Louis). - Link to v6: https://lore.kernel.org/r/20221127-snd-freeze-v6-0-3e90553f64a5@chromium.org Changes in v6: - Check if we are in kexec with the userspace frozen. - Link to v5: https://lore.kernel.org/r/20221127-snd-freeze-v5-0-4ededeb08ba0@chromium.org Changes in v5: - Edit subject prefix. - Link to v4: https://lore.kernel.org/r/20221127-snd-freeze-v4-0-51ca64b7f2ab@chromium.org Changes in v4: - Do not call snd_sof_machine_unregister from shutdown. - Link to v3: https://lore.kernel.org/r/20221127-snd-freeze-v3-0-a2eda731ca14@chromium.org Changes in v3: - Wrap pm_freezing in a function. - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER . - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- Ricardo Ribalda (2): kexec: Introduce kexec_with_frozen_processes ASoC: SOF: Fix deadlock when shutdown a frozen userspace include/linux/kexec.h | 3 +++ kernel/kexec_core.c | 5 +++++ sound/soc/sof/core.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

3 5

[PATCH v2 0/6] kselftest/alsa: pcm-test improvements
by Mark Brown 01 Dec '22

01 Dec '22

This series provides a bunch of quick updates which should make the coverage from pcm-test a bit more useful, it adds some support for skipping tests when the hardware/driver is unable to support the requested configuration and then expands the set of cases we cover to include more sample rates and channel counts. This should exercise switching between 8kHz and 44.1kHz based rates and ensure that clocking doesn't get confused by non-stereo channel counts, both of which are I expect common real world errors, at least for embedded cards. v2: - Rebase onto Takashi's current tree. - Tweak the buffer sizes for the newly added cases, don't be quite so ambitious in how big a buffer we request for 96kHz and don't go quite so small for 8kHz since some devices start hitting lower limits on period size and struggle to deliver accurate timing. Mark Brown (6): kselftest/alsa: Refactor pcm-test to list the tests to run in a struct kselftest/alsa: Report failures to set the requested sample rate as skips kselftest/alsa: Report failures to set the requested channels as skips kselftest/alsa: Don't any configuration in the sample config kselftest/alsa: Provide more meaningful names for tests kselftest/alsa: Add more coverage of sample rates and channel counts .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 35 ++++---- tools/testing/selftests/alsa/pcm-test.c | 88 +++++++++++++------ 2 files changed, 81 insertions(+), 42 deletions(-) base-commit: 2133dc91d6658242009177b564ac47c49e08668a -- 2.30.2

2 7

[PATCH] soundwire: bus_type: Avoid lockdep assert in sdw_drv_probe()
by Richard Fitzgerald 01 Dec '22

01 Dec '22

Don't hold sdw_dev_lock while calling the peripheral driver probe() and remove() callbacks. Holding sdw_dev_lock around the probe() and remove() calls causes a theoretical mutex inversion which lockdep will assert on. The peripheral driver probe will probably register a soundcard, which will take ALSA and ASoC locks. During normal operation a runtime resume suspend can be triggered while these locks are held and will then take sdw_dev_lock. It's not necessary to hold sdw_dev_lock when calling the probe() and remove(), it is only used to prevent the bus core calling the driver callbacks if there isn't a driver or the driver is removing. If sdw_dev_lock is held while setting and clearing the 'probed' flag this is sufficient to guarantee the safety of callback functions. The potential race of a bus event happening while probe() is executing is the same as the existing race of the bus event handler taking the mutex first and processing the event before probe() can run. In both cases the event has already happened before the driver is probed and ready to accept callbacks. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- drivers/soundwire/bus_type.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 04b3529f8929..963498db0fd2 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -105,20 +105,19 @@ static int sdw_drv_probe(struct device *dev) if (ret) return ret; - mutex_lock(&slave->sdw_dev_lock); - ret = drv->probe(slave, id); if (ret) { name = drv->name; if (!name) name = drv->driver.name; - mutex_unlock(&slave->sdw_dev_lock); dev_err(dev, "Probe of %s failed: %d\n", name, ret); dev_pm_domain_detach(dev, false); return ret; } + mutex_lock(&slave->sdw_dev_lock); + /* device is probed so let's read the properties now */ if (drv->ops && drv->ops->read_prop) drv->ops->read_prop(slave); @@ -167,14 +166,12 @@ static int sdw_drv_remove(struct device *dev) int ret = 0; mutex_lock(&slave->sdw_dev_lock); - slave->probed = false; + mutex_unlock(&slave->sdw_dev_lock); if (drv->remove) ret = drv->remove(slave); - mutex_unlock(&slave->sdw_dev_lock); - dev_pm_domain_detach(dev, false); return ret; -- 2.30.2

3 6

Update HiFi.conf
by GitHub pull_request - opened 01 Dec '22

01 Dec '22

alsa-project/alsa-ucm-conf pull request #246 was opened from junocomp: This enables the speakers from startup, detects the HDMI audio and enables the internal microphone. I have tested this on 3 devices with Debian now and it seems to work. Can other people test it too please. If it works, it will be worth pushing it upstream. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/246 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/246.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2 00/12] ASoC: mediatek: Add support for MT8188 SoC
by Trevor Wu 01 Dec '22

01 Dec '22

This series of patches adds support for Mediatek AFE of MT8188 SoC. Patches are based on broonie tree "for-next" branch. Changes since v1: - remove bus protection functions in case of unmerged dependency problem - replace some bit operation macro with FIELD_PREP - simplify register control by regmap_set_bits and regmap_clear_bits - fix dt-binding errors - rename compatible string for recognition Trevor Wu (12): ASoC: mediatek: common: add SMC ops and SMC CMD ASoC: mediatek: mt8188: add common header ASoC: mediatek: mt8188: support audsys clock ASoC: mediatek: mt8188: support adda in platform driver ASoC: mediatek: mt8188: support etdm in platform driver ASoC: mediatek: mt8188: support pcmif in platform driver ASoC: mediatek: mt8188: support audio clock control ASoC: mediatek: mt8188: add platform driver ASoC: mediatek: mt8188: add control for timing select dt-bindings: mediatek: mt8188: add audio afe document ASoC: mediatek: mt8188: add machine driver with mt6359 dt-bindings: mediatek: mt8188: add mt8188-mt6359 document .../bindings/sound/mt8188-afe-pcm.yaml | 187 + .../bindings/sound/mt8188-mt6359.yaml | 64 + sound/soc/mediatek/Kconfig | 23 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/common/mtk-base-afe.h | 19 + sound/soc/mediatek/mt8188/Makefile | 15 + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 656 ++++ sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 114 + sound/soc/mediatek/mt8188/mt8188-afe-common.h | 151 + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 3359 +++++++++++++++++ sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 206 + sound/soc/mediatek/mt8188/mt8188-audsys-clk.h | 15 + .../soc/mediatek/mt8188/mt8188-audsys-clkid.h | 83 + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 631 ++++ sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 2596 +++++++++++++ sound/soc/mediatek/mt8188/mt8188-dai-pcm.c | 366 ++ sound/soc/mediatek/mt8188/mt8188-mt6359.c | 808 ++++ sound/soc/mediatek/mt8188/mt8188-reg.h | 3180 ++++++++++++++++ 18 files changed, 12474 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mt8188-afe-pcm.yaml create mode 100644 Documentation/devicetree/bindings/sound/mt8188-mt6359.yaml create mode 100644 sound/soc/mediatek/mt8188/Makefile create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-common.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-pcm.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-adda.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-etdm.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-pcm.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-mt6359.c create mode 100644 sound/soc/mediatek/mt8188/mt8188-reg.h -- 2.18.0

6 28

[PATCH] ASoC: qcom: lpass-sc7180: Add maybe_unused tag for system PM ops
by Srinivasa Rao Mandadapu 01 Dec '22

01 Dec '22

Add __maybe_unused tag for system PM ops suspend and resume. This is required to fix allmodconfig compilation issue. Fixes: c3bf7699747c ("ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- sound/soc/qcom/lpass-sc7180.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index b96b85a..41db661 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -163,14 +163,14 @@ static int sc7180_lpass_exit(struct platform_device *pdev) return 0; } -static int sc7180_lpass_dev_resume(struct device *dev) +static int __maybe_unused sc7180_lpass_dev_resume(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev); return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); } -static int sc7180_lpass_dev_suspend(struct device *dev) +static int __maybe_unused sc7180_lpass_dev_suspend(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev); -- 2.7.4

4 12

[PATCH] ALSA: dice: Remove left-over license text
by Takashi Sakamoto 01 Dec '22

01 Dec '22

Following a commit 1dd0dd0b1fef ("ALSA: firewire: Remove some left-over license text in sound/firewire"), this patch removes it added carelessly. Fixes: 2133dc91d665 ("ALSA: dice: add support for Focusrite Saffire Pro 40 with TCD3070 ASIC") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/dice/dice-focusrite.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/firewire/dice/dice-focusrite.c b/sound/firewire/dice/dice-focusrite.c index caf9f620c5d0..ea27cfb01cc0 100644 --- a/sound/firewire/dice/dice-focusrite.c +++ b/sound/firewire/dice/dice-focusrite.c @@ -2,8 +2,6 @@ // dice-focusrite.c - a part of driver for DICE based devices // // Copyright (c) 2022 Takashi Sakamoto -// -// Licensed under the terms of the GNU General Public License, version 2. #include "dice.h" -- 2.37.2

2 1

USB-Audio: Update quirk for Aorus Pro WiFi Rev 1.2
by GitHub pull_request - opened 30 Nov '22

30 Nov '22

alsa-project/alsa-ucm-conf pull request #245 was opened from 13r0ck: An improvement for https://github.com/alsa-project/alsa-ucm-conf/pull/157 The line in was using the wrong device. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/245 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/245.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[GIT PULL] ASoC fixes for v6.1-rc7
by Mark Brown 30 Nov '22

30 Nov '22

The following changes since commit db8f91d424fe0ea6db337aca8bc05908bbce1498: ASoC: soc-pcm: Add NULL check in BE reparenting (2022-11-22 12:23:00 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.1-rc7 for you to fetch changes up to 3d1bb6cc1a654c8693a85b1d262e610196edec8b: ASoC: cs42l51: Correct PGA Volume minimum value (2022-11-25 16:29:52 +0000) ---------------------------------------------------------------- ASoC: Fixes for v6.1 Some more fixes for v6.1, some of these are very old and were originally intended to get sent for v5.18 but got lost in the shuffle when there was an issue with Linus not liking my branching strategy and I rebuilt bits of my workflow. The ops changes have been validated by people looking at real hardware and are how things getting dropped got noticed. ---------------------------------------------------------------- Charles Keepax (2): ASoC: ops: Correct bounds check for second channel on SX controls ASoC: cs42l51: Correct PGA Volume minimum value Hui Tang (1): ASoC: tlv320adc3xxx: Fix build error for implicit function declaration Mark Brown (3): ASoC: ops: Fix bounds check for _sx controls ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() ASoC: Merge dropped fixes from v5.18 Shengjiu Wang (2): ASoC: fsl_micfil: explicitly clear software reset bit ASoC: fsl_micfil: explicitly clear CHnF flags sound/soc/codecs/cs42l51.c | 2 +- sound/soc/codecs/tlv320adc3xxx.c | 3 +++ sound/soc/fsl/fsl_micfil.c | 19 +++++++++++++++++++ sound/soc/soc-ops.c | 11 ++++++++--- 4 files changed, 31 insertions(+), 4 deletions(-)

2 3

[PATCH v6 0/2] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 30 Nov '22

30 Nov '22

Since: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") we wait for all the workloads to be completed during shutdown. This was done to avoid a stall once the device is started again. Unfortunately this has the side effect of stalling kexec(), if the userspace is frozen. Let's handle that case. To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Liam Girdwood <lgirdwood(a)gmail.com> To: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> To: Bard Liao <yung-chuan.liao(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Daniel Baluta <daniel.baluta(a)nxp.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> To: Eric Biederman <ebiederm(a)xmission.com> To: Chromeos Kdump <chromeos-kdump(a)google.com> To: Steven Rostedt <rostedt(a)goodmis.org> Cc: stable(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: kexec(a)lists.infradead.org Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- Changes in v6: - Check if we are in kexec with the userspace frozen. - Link to v5: https://lore.kernel.org/r/20221127-snd-freeze-v5-0-4ededeb08ba0@chromium.org Changes in v5: - Edit subject prefix. - Link to v4: https://lore.kernel.org/r/20221127-snd-freeze-v4-0-51ca64b7f2ab@chromium.org Changes in v4: - Do not call snd_sof_machine_unregister from shutdown. - Link to v3: https://lore.kernel.org/r/20221127-snd-freeze-v3-0-a2eda731ca14@chromium.org Changes in v3: - Wrap pm_freezing in a function. - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER . - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- Ricardo Ribalda (2): kexec: Introduce kexec_with_frozen_processes ASoC: SOF: Fix deadlock when shutdown a frozen userspace include/linux/kexec.h | 3 +++ kernel/kexec_core.c | 5 +++++ sound/soc/sof/core.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

2 3

[PATCH v4] ALSA: core: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 30 Nov '22

30 Nov '22

During kexec(), the userspace is frozen. Therefore we cannot wait for it to complete. Avoid running snd_sof_machine_unregister during shutdown. This fixes: [ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done. [ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds. [ 246.819035] Call Trace: [ 246.821782] <TASK> [ 246.824186] __schedule+0x5f9/0x1263 [ 246.828231] schedule+0x87/0xc5 [ 246.831779] snd_card_disconnect_sync+0xb5/0x127 ... [ 246.889249] snd_sof_device_shutdown+0xb4/0x150 [ 246.899317] pci_device_shutdown+0x37/0x61 [ 246.903990] device_shutdown+0x14c/0x1d6 [ 246.908391] kernel_kexec+0x45/0xb9 And: [ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds. [ 246.927709] Call Trace: [ 246.930461] <TASK> [ 246.932819] __schedule+0x5f9/0x1263 [ 246.936855] ? fsnotify_grab_connector+0x5c/0x70 [ 246.942045] schedule+0x87/0xc5 [ 246.945567] schedule_timeout+0x49/0xf3 [ 246.949877] wait_for_completion+0x86/0xe8 [ 246.954463] snd_card_free+0x68/0x89 ... [ 247.001080] platform_device_unregister+0x12/0x35 Cc: stable(a)vger.kernel.org Fixes: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Liam Girdwood <lgirdwood(a)gmail.com> To: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> To: Bard Liao <yung-chuan.liao(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Daniel Baluta <daniel.baluta(a)nxp.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org --- Changes in v4: - Do not call snd_sof_machine_unregister from shutdown. - Link to v3: https://lore.kernel.org/r/20221127-snd-freeze-v3-0-a2eda731ca14@chromium.org Changes in v3: - Wrap pm_freezing in a function - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- sound/soc/sof/core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 3e6141d03770..9616ba607ded 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -475,19 +475,16 @@ EXPORT_SYMBOL(snd_sof_device_remove); int snd_sof_device_shutdown(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev); - struct snd_sof_pdata *pdata = sdev->pdata; if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) cancel_work_sync(&sdev->probe_work); /* - * make sure clients and machine driver(s) are unregistered to force - * all userspace devices to be closed prior to the DSP shutdown sequence + * make sure clients are unregistered prior to the DSP shutdown + * sequence. */ sof_unregister_clients(sdev); - snd_sof_machine_unregister(sdev, pdata); - if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) return snd_sof_shutdown(sdev); --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

4 7

[PATCH] ALSA: dice: add support for Focusrite Saffire Pro 40 with TCD3070 ASIC
by Takashi Sakamoto 30 Nov '22

30 Nov '22

TC Applied Technologies (TCAT) produces TCD3070 as final DICE ASIC for communication in IEEE 1394 bus for IEC 61883-1/6 protocol. As long as I know, latter model of Focusrite Saffire Pro 40 is an application of the ASIC and only in the market for consumers. This patchset adds support for the device. The device has several remarkable points. 1. No support for extended synchronization information section in TCAT general protocol. The value of GLOBAL_EXTENDED_STATUS register is always zero. Additionally, NOTIFY_EXT_STATUS message is never emitted. 2. No support for TCAT protocol extension. Hard coding is required for format of CIP payload. 3. During several seconds after changing sampling rate, the block to process PCM frames is under disfunction. When starting packet streaming during the state, the block is never function till configuring different sampling rate and several seconds. This commit adds support for the device. The item 1 and 2 can be adaptable, while item 3 is not. It's not preferable that user process is forced to sleep during the disfunction in the call of ioctl(2) with SNDRV_PCM_IOCTL_HW_PARAMS or SNDRV_PCM_IOCTL_PREPARE request. It's inconvenient but let user configure preferable sampling rate in advance of starting PCM substream. The content of configuration ROM in the device I used is available at: * https://github.com/takaswie/am-config-roms/ I note that any mixer control operation is implemented by unique transaction. The frame of request consists of 16 bytes header followed by payload. header (4 quadlets): 1st: the type of request, prefixed with 0x8000 2nd: counter at 2 bytes in MSB side, the length of data at 2 bytes in LSB side 3rd: parameter 0 4th: parameter 1 payload (variable length if need): 5th-: data according to parameters The request frame is sent by block write request to 0x'ffff'e040'01c0. The frame of response is similar to the frame of request, but it is header only, thus fixed to 16 bytes. The response frame is sent to the address which is registered by lock transaction to 0x'ffff'e040'0008. If the operation results in batch of data, the 2nd quadlet of header includes the length of data like request. The data is itself readable by read block request to 0x'ffff'e040'0030, which includes both header and payload for data, thus the length to read should be the length of data plus 16 bytes for header The actual value of request, parameter 0, parameter 1, and data is unclear yet. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/dice/Makefile | 2 +- sound/firewire/dice/dice-focusrite.c | 25 +++++++++++++++++++++++++ sound/firewire/dice/dice.c | 10 ++++++++++ sound/firewire/dice/dice.h | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 sound/firewire/dice/dice-focusrite.c diff --git a/sound/firewire/dice/Makefile b/sound/firewire/dice/Makefile index 9bf7b960a720..a5f3fbf28b8c 100644 --- a/sound/firewire/dice/Makefile +++ b/sound/firewire/dice/Makefile @@ -2,5 +2,5 @@ snd-dice-objs := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \ dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \ dice-alesis.o dice-extension.o dice-mytek.o dice-presonus.o \ - dice-harman.o + dice-harman.o dice-focusrite.o obj-$(CONFIG_SND_DICE) += snd-dice.o diff --git a/sound/firewire/dice/dice-focusrite.c b/sound/firewire/dice/dice-focusrite.c new file mode 100644 index 000000000000..caf9f620c5d0 --- /dev/null +++ b/sound/firewire/dice/dice-focusrite.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +// dice-focusrite.c - a part of driver for DICE based devices +// +// Copyright (c) 2022 Takashi Sakamoto +// +// Licensed under the terms of the GNU General Public License, version 2. + +#include "dice.h" + +int snd_dice_detect_focusrite_pro40_tcd3070_formats(struct snd_dice *dice) +{ + // Focusrite shipped several variants of Saffire Pro 40. One of them is based on TCD3070-CH + // apart from the others with TCD2220. It doesn't support TCAT protocol extension. + dice->tx_pcm_chs[0][0] = 20; + dice->tx_midi_ports[0] = 1; + dice->rx_pcm_chs[0][0] = 20; + dice->rx_midi_ports[0] = 1; + + dice->tx_pcm_chs[0][1] = 16; + dice->tx_midi_ports[1] = 1; + dice->rx_pcm_chs[0][1] = 16; + dice->rx_midi_ports[1] = 1; + + return 0; +} diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c index f75902bc8e74..6036a5edbcb8 100644 --- a/sound/firewire/dice/dice.c +++ b/sound/firewire/dice/dice.c @@ -382,6 +382,16 @@ static const struct ieee1394_device_id dice_id_table[] = { .model_id = 0x000001, .driver_data = (kernel_ulong_t)snd_dice_detect_harman_formats, }, + // Focusrite Saffire Pro 40 with TCD3070-CH. + // The model has quirk in its GUID, in which model field is 0x000013 and different from + // model ID (0x0000de) in its root/unit directory. + { + .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_MODEL_ID, + .vendor_id = OUI_FOCUSRITE, + .model_id = 0x0000de, + .driver_data = (kernel_ulong_t)snd_dice_detect_focusrite_pro40_tcd3070_formats, + }, { .match_flags = IEEE1394_MATCH_VERSION, .version = DICE_INTERFACE, diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h index fd440cc625f9..674f7d552c2e 100644 --- a/sound/firewire/dice/dice.h +++ b/sound/firewire/dice/dice.h @@ -231,5 +231,6 @@ int snd_dice_detect_extension_formats(struct snd_dice *dice); int snd_dice_detect_mytek_formats(struct snd_dice *dice); int snd_dice_detect_presonus_formats(struct snd_dice *dice); int snd_dice_detect_harman_formats(struct snd_dice *dice); +int snd_dice_detect_focusrite_pro40_tcd3070_formats(struct snd_dice *dice); #endif -- 2.37.2

2 1

[PATCH] ALSA: dice: fix regression for Lexicon I-ONIX FW810S
by Takashi Sakamoto 30 Nov '22

30 Nov '22

For Lexicon I-ONIX FW810S, the call of ioctl(2) with SNDRV_PCM_IOCTL_HW_PARAMS can returns -ETIMEDOUT. This is a regression due to the commit 41319eb56e19 ("ALSA: dice: wait just for NOTIFY_CLOCK_ACCEPTED after GLOBAL_CLOCK_SELECT operation"). The device does not emit NOTIFY_CLOCK_ACCEPTED notification when accepting GLOBAL_CLOCK_SELECT operation with the same parameters as current ones. This commit fixes the regression. When receiving no notification, return -ETIMEDOUT as long as operating for any change. Fixes: 41319eb56e19 ("ALSA: dice: wait just for NOTIFY_CLOCK_ACCEPTED after GLOBAL_CLOCK_SELECT operation") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/dice/dice-stream.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c index f99e00083141..4c677c8546c7 100644 --- a/sound/firewire/dice/dice-stream.c +++ b/sound/firewire/dice/dice-stream.c @@ -59,7 +59,7 @@ int snd_dice_stream_get_rate_mode(struct snd_dice *dice, unsigned int rate, static int select_clock(struct snd_dice *dice, unsigned int rate) { - __be32 reg; + __be32 reg, new; u32 data; int i; int err; @@ -83,15 +83,17 @@ static int select_clock(struct snd_dice *dice, unsigned int rate) if (completion_done(&dice->clock_accepted)) reinit_completion(&dice->clock_accepted); - reg = cpu_to_be32(data); + new = cpu_to_be32(data); err = snd_dice_transaction_write_global(dice, GLOBAL_CLOCK_SELECT, - &reg, sizeof(reg)); + &new, sizeof(new)); if (err < 0) return err; if (wait_for_completion_timeout(&dice->clock_accepted, - msecs_to_jiffies(NOTIFICATION_TIMEOUT_MS)) == 0) - return -ETIMEDOUT; + msecs_to_jiffies(NOTIFICATION_TIMEOUT_MS)) == 0) { + if (reg != new) + return -ETIMEDOUT; + } return 0; } -- 2.37.2

2 1

[RESEND PATCH -next] ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table
by Artem Lukyanov 30 Nov '22

30 Nov '22

This model requires an additional detection quirk to enable the internal microphone - BIOS doesn't seem to support AcpDmicConnected (nothing in acpidump output). Signed-off-by: Artem Lukyanov <dukzcry(a)ya.ru> --- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index d9715bea965e..1f0b5527c594 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -213,6 +213,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"), + DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"), + } + }, {} }; -- 2.36.2

2 1

[PATCH] ASoC: SOF: mediatek: add shutdown callback
by Ricardo Ribalda 30 Nov '22

30 Nov '22

If we do not shutdown the peripheral properly at shutdown, the whole system crashes after kexec() on the first io access. Let's implement the appropriate callback. Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Liam Girdwood <lgirdwood(a)gmail.com> To: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> To: Bard Liao <yung-chuan.liao(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Daniel Baluta <daniel.baluta(a)nxp.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> To: Matthias Brugger <matthias.bgg(a)gmail.com> Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-mediatek(a)lists.infradead.org Cc: linux-kernel(a)vger.kernel.org --- sound/soc/sof/mediatek/mt8186/mt8186.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c index 181189e00e02..79da25725987 100644 --- a/sound/soc/sof/mediatek/mt8186/mt8186.c +++ b/sound/soc/sof/mediatek/mt8186/mt8186.c @@ -430,6 +430,11 @@ static int mt8186_dsp_remove(struct snd_sof_dev *sdev) return 0; } +static int mt8186_dsp_shutdown(struct snd_sof_dev *sdev) +{ + return snd_sof_suspend(sdev->dev); +} + static int mt8186_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) { mt8186_sof_hifixdsp_shutdown(sdev); @@ -538,6 +543,7 @@ static struct snd_sof_dsp_ops sof_mt8186_ops = { /* probe and remove */ .probe = mt8186_dsp_probe, .remove = mt8186_dsp_remove, + .shutdown = mt8186_dsp_shutdown, /* DSP core boot */ .run = mt8186_run, @@ -629,6 +635,7 @@ MODULE_DEVICE_TABLE(of, sof_of_mt8186_ids); static struct platform_driver snd_sof_of_mt8186_driver = { .probe = sof_of_probe, .remove = sof_of_remove, + .shutdown = sof_of_shutdown, .driver = { .name = "sof-audio-of-mt8186", .pm = &sof_of_pm, --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-mtk-snd-e0abf36be4c0 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

3 2

[PATCH] ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table
by Artem Lukyanov 30 Nov '22

30 Nov '22

This model requires an additional detection quirk to enable the internal microphone - BIOS doesn't seem to support AcpDmicConnected (nothing in acpidump output). Signed-off-by: Artem Lukyanov <dukzcry(a)ya.ru> --- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index d9715bea9..1f0b5527c 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -213,6 +213,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"), + DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"), + } + }, {} }; -- 2.36.2

3 3

arecord leaves doubled audio at end after a SIGTERM
by GitHub issues - edited 30 Nov '22

30 Nov '22

alsa-project/alsa-utils issue #179 was edited from chconnor: Hello: I issue a command like this: `arecord -t wav -c 1 -f S16_LE -r44100 -D hw:2,0 test.wav ` It works fine, but then I hit ctrl-C to terminate. This works, but the file has "junk" at the end that repeats the last fraction of a second. E.g. in this demo file I ctrl-C when I say the word "one", and the recording is like "three, two, on-on": https://caseyconnor.org/pub/audio/arecord_bug.wav It's as if it is mistakenly writing a buffer an extra time? (In my total ignorance and total lack of qualifications, I traced the code to [here](https://github.com/alsa-project/alsa-lib/blob/d28e8cb29485cc93f741b01…, but I get lost and can't see if anything is awry...) (Edit: version 1.2.6 on Lubuntu 22.04 with a Shure X2U interface) Issue URL : https://github.com/alsa-project/alsa-utils/issues/179 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

arecord leaves doubled audio at end after a SIGTERM
by GitHub issues - edited 30 Nov '22

30 Nov '22

alsa-project/alsa-utils issue #179 was edited from chconnor: Hello: I issue a command like this: `arecord -t wav -c 1 -f S16_LE -r44100 -D hw:2,0 test.wav ` It works fine, but then I hit ctrl-C to terminate. This works, but the file has "junk" at the end that repeats the last fraction of a second. E.g. in this demo file I ctrl-C when I say the word "one", and the recording is like "three, two, on-on": https://caseyconnor.org/pub/audio/arecord_bug.wav It's as if it is mistakenly writing a buffer an extra time? (In my total ignorance and total lack of qualifications, I traced the code to [here](https://github.com/alsa-project/alsa-lib/blob/d28e8cb29485cc93f741b01…, but I get lost and can't see if anything is awry...) Issue URL : https://github.com/alsa-project/alsa-utils/issues/179 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

arecord leaves doubled audio at end after a SIGTERM
by GitHub issues - opened 30 Nov '22

30 Nov '22

alsa-project/alsa-utils issue #179 was opened from chconnor: Hello: I issue a command like this: `arecord -t wav -c 1 -f S16_LE -r44100 -D hw:2,0 test.wav ` It works fine, but then I hit ctrl-C to terminate. This works, but the file has "junk" at the end that repeats the last fraction of a second. E.g. in this demo file I ctrl-C when I say the word "one", and the recording is like "three, two, on-on": http://caseyconnor.org/pub/audio/arecord_bug.wav It's as if it is mistakenly writing a buffer an extra time? (In my total ignorance and total lack of qualifications, I traced the code to [here](https://github.com/alsa-project/alsa-lib/blob/d28e8cb29485cc93f741b01…, but I get lost and can't see if anything is awry...) Issue URL : https://github.com/alsa-project/alsa-utils/issues/179 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH v2 0/2] ASoC: Intel: avs: rt5682: Refactor jack handling
by Cezary Rojewski 29 Nov '22

29 Nov '22

Leftover from recent series [1]. Following changes are proposed for the rt5682 sound card driver: 1) Move jack unassignment from platform_device->remove() to dai_link->exit(). This is done to make jack init and deinit flows symmetric 2) Remove platform_device->remove() function 3) Simplify card->suspend_pre() and card->resume_post() by making use of snd_soc_card_get_codec_dai() helper Changes in v2: - fixed compilation of the first patch in the series by moving offending pieces to the second patch [1]: https://lore.kernel.org/alsa-devel/20221125184032.2565979-1-cezary.rojewski… Amadeusz Sławiński (2): ASoC: Intel: avs: rt5682: Add define for codec DAI name ASoC: Intel: avs: rt5682: Refactor jack handling sound/soc/intel/avs/boards/rt5682.c | 31 ++++++++++++----------------- 1 file changed, 13 insertions(+), 18 deletions(-) -- 2.25.1

2 3

[PATCH -next] ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe
by Zhang Qilong 29 Nov '22

29 Nov '22

The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. We fix it by going to err_pm instead of err_clk. Fixes:f086ba9d5389c ("ASoC: pcm512x: Support mastering BCLK/LRCLK using the PLL") Signed-off-by: Zhang Qilong <zhangqilong3(a)huawei.com> --- sound/soc/codecs/pcm512x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 767463e82665..89059a673cf0 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -1634,7 +1634,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) if (val > 6) { dev_err(dev, "Invalid pll-in\n"); ret = -EINVAL; - goto err_clk; + goto err_pm; } pcm512x->pll_in = val; } @@ -1643,7 +1643,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) if (val > 6) { dev_err(dev, "Invalid pll-out\n"); ret = -EINVAL; - goto err_clk; + goto err_pm; } pcm512x->pll_out = val; } @@ -1652,12 +1652,12 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) dev_err(dev, "Error: both pll-in and pll-out, or none\n"); ret = -EINVAL; - goto err_clk; + goto err_pm; } if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) { dev_err(dev, "Error: pll-in == pll-out\n"); ret = -EINVAL; - goto err_clk; + goto err_pm; } } #endif -- 2.25.1

2 1

[PATCH V3 0/6] ASoC: codecs: Add Awinic AW883XX audio amplifier driver
by wangweidong.a＠awinic.com 29 Nov '22

29 Nov '22

From: Weidong Wang <wangweidong.a(a)awinic.com> The Awinic AW883XX is an I2S/TDM input, high efficiency digital Smart K audio amplifier with an integrated 10.25V smart boost convert Add a DT schema for describing Awinic AW883xx audio amplifiers. They are controlled using I2C. v2 -> v3 : i2c reads and writes are changed to regmap The monitor, calib, and spin files were deleted Deleted firmware load retry Linux version compatibility and driver version control were removed The global variable was deleted The renaming of dai was removed Platform compatibility was removed Simplified log information use module_i2c_driver Delete the custom interface and use the kernel standard interface Weidong Wang (6): ASoC: codecs: Add i2c and codec registration for aw883xx and their associated operation functions ASoC: codecs: Added configuration file parsing for aw883xx ASoC: codecs: Add aw883xx chip control logic, such as power-on and power-off ASoC: codecs: Realize aw883xx register configuration and register address file ASoC: dt-bindings: Add schema for "awinic,aw883xx" ASoC:codecs:aw883xx corresponds to the modified Makefile and Kconfig .../devicetree/bindings/sound/awinic,aw883xx.yaml | 60 + sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 7 + sound/soc/codecs/aw883xx/aw883xx.c | 1806 +++++++++++++++ sound/soc/codecs/aw883xx/aw883xx.h | 155 ++ sound/soc/codecs/aw883xx/aw883xx_bin_parse.c | 1294 +++++++++++ sound/soc/codecs/aw883xx/aw883xx_bin_parse.h | 145 ++ sound/soc/codecs/aw883xx/aw883xx_data_type.h | 148 ++ sound/soc/codecs/aw883xx/aw883xx_device.c | 1618 +++++++++++++ sound/soc/codecs/aw883xx/aw883xx_device.h | 544 +++++ sound/soc/codecs/aw883xx/aw883xx_init.c | 549 +++++ sound/soc/codecs/aw883xx/aw883xx_pid_2049_reg.h | 2387 ++++++++++++++++++++ 12 files changed, 8723 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml create mode 100644 sound/soc/codecs/aw883xx/aw883xx.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_bin_parse.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_bin_parse.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_data_type.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_device.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_device.h create mode 100644 sound/soc/codecs/aw883xx/aw883xx_init.c create mode 100644 sound/soc/codecs/aw883xx/aw883xx_pid_2049_reg.h -- 2.7.4

4 32

[PATCH 0/2] ASoC: Add a driver for the Iron Device SMA1303 Amp
by Kiseok Jo 29 Nov '22

29 Nov '22

This adds basic audio support for the Iron Device SMA1303 amplifier. Kiseok Jo (2): ASoC: sma1303: Add driver for Iron Device SMA1303 Amp ASoC: dt-bindings: sma1303: Iron Device SMA1303 Amp .../bindings/sound/irondevice,sma1303.yaml | 40 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + sound/soc/codecs/Kconfig | 7 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sma1303.c | 2119 +++++++++++++++++ sound/soc/codecs/sma1303.h | 609 +++++ 6 files changed, 2779 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml create mode 100644 sound/soc/codecs/sma1303.c create mode 100644 sound/soc/codecs/sma1303.h -- 2.30.2

2 3

[PATCH 0/3] ASoC: mediatek:mt8186: fix both the speaker and hdmi
by Jiaxin Yu 29 Nov '22

29 Nov '22

The speaker and hdmi of mt8186 platform are shared the same port of I2S, when connect the external display, use build-in speakers to play audio, they both playback at the same time. So we want to manage the playback device through DAPM events. Jiaxin Yu (3): drm: bridge: it6505: bridge to hdmi-codec ASoC: hdmi-codec: Add event handler for hdmi TX ASoC: mediatek: mt8186: correct the HDMI widgets drivers/gpu/drm/bridge/ite-it6505.c | 36 +++++++++++++++--- include/sound/hdmi-codec.h | 6 +++ sound/soc/codecs/hdmi-codec.c | 37 +++++++++++++++++-- .../mt8186/mt8186-mt6366-da7219-max98357.c | 2 +- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 2 +- 5 files changed, 71 insertions(+), 12 deletions(-) -- 2.18.0

2 4

[PATCH 00/11] ASoC: Intel: avs: Refactor jack handling
by Cezary Rojewski 29 Nov '22

29 Nov '22

For all the boards included in this patchset, a similar set of changes is proposed: 1) Move jack unassignment from platform_device->remove() to dai_link->exit(). This is done to make jack init and deinit flows symmetric 2) Remove platform_device->remove() function 3) Simplify card->suspend_pre() and card->resume_post() by making use of snd_soc_card_get_codec_dai() helper While bdw_rt286 board - which is utilized by the catpt-driver - is definitely not part of "avs", same treatment applies. And thus decided to make it part of this series instead of sending it separately. Amadeusz Sławiński (10): ASoC: Intel: avs: da7219: Refactor jack handling ASoC: Intel: avs: nau8825: Refactor jack handling ASoC: Intel: avs: rt274: Refer to DAI name through a constant ASoC: Intel: avs: rt274: Refactor jack handling ASoC: Intel: avs: rt286: Add define for codec DAI name ASoC: Intel: avs: rt286: Refactor jack handling ASoC: Intel: avs: rt298: Add define for codec DAI name ASoC: Intel: avs: rt298: Refactor jack handling ASoC: Intel: avs: rt5682: Add define for codec DAI name ASoC: Intel: avs: rt5682: Refactor jack handling Cezary Rojewski (1): ASoC: Intel: bdw_rt286: Refactor jack handling sound/soc/intel/avs/boards/da7219.c | 34 +++++++---------- sound/soc/intel/avs/boards/nau8825.c | 35 ++++++------------ sound/soc/intel/avs/boards/rt274.c | 30 ++++++--------- sound/soc/intel/avs/boards/rt286.c | 37 ++++++++----------- sound/soc/intel/avs/boards/rt298.c | 37 ++++++++----------- sound/soc/intel/avs/boards/rt5682.c | 31 +++++++--------- sound/soc/intel/boards/bdw_rt286.c | 55 ++++++++-------------------- 7 files changed, 95 insertions(+), 164 deletions(-) -- 2.25.1

3 14

[PATCH v2] ASoC: qcom: lpass-sc7180: Add maybe_unused tag for system PM ops
by Srinivasa Rao Mandadapu 29 Nov '22

29 Nov '22

Add __maybe_unused tag for system PM ops suspend and resume. This is required to fix allmodconfig compilation issue. Fixes: 2d68148f8f85 ("ASoC: qcom: lpass-sc7180: Add system suspend/resume PM ops") Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- Changes since v1: -- Updated Fixes tag. sound/soc/qcom/lpass-sc7180.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index b96b85a..41db661 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -163,14 +163,14 @@ static int sc7180_lpass_exit(struct platform_device *pdev) return 0; } -static int sc7180_lpass_dev_resume(struct device *dev) +static int __maybe_unused sc7180_lpass_dev_resume(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev); return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); } -static int sc7180_lpass_dev_suspend(struct device *dev) +static int __maybe_unused sc7180_lpass_dev_suspend(struct device *dev) { struct lpass_data *drvdata = dev_get_drvdata(dev); -- 2.7.4

1 0

[PATCH v2 1/1] ASoC: SOF: Add DAI configuration support for AMD platforms.
by V sujith kumar Reddy 29 Nov '22

29 Nov '22

From: V sujith kumar Reddy <Vsujithkumar.Reddy(a)amd.com> Add support for configuring sp and hs DAI from topology. Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy(a)amd.com> Changes since v1 -- Apply on latest broonie-git for-next --- include/sound/sof/dai-amd.h | 1 + include/sound/sof/dai.h | 2 ++ include/uapi/sound/sof/tokens.h | 5 +++++ sound/soc/sof/ipc3-pcm.c | 2 ++ sound/soc/sof/ipc3-topology.c | 36 +++++++++++++++++++++++++-------- sound/soc/sof/sof-audio.h | 1 + sound/soc/sof/topology.c | 10 +++++++++ 7 files changed, 49 insertions(+), 8 deletions(-) diff --git a/include/sound/sof/dai-amd.h b/include/sound/sof/dai-amd.h index 92f45c180b7c..9df7ac824efe 100644 --- a/include/sound/sof/dai-amd.h +++ b/include/sound/sof/dai-amd.h @@ -17,6 +17,7 @@ struct sof_ipc_dai_acp_params { uint32_t fsync_rate; /* FSYNC frequency in Hz */ uint32_t tdm_slots; + uint32_t tdm_mode; } __packed; /* ACPDMIC Configuration Request - SOF_IPC_DAI_AMD_CONFIG */ diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h index 9fbd3832bcdc..3041f5805b7b 100644 --- a/include/sound/sof/dai.h +++ b/include/sound/sof/dai.h @@ -86,6 +86,8 @@ enum sof_ipc_dai_type { SOF_DAI_AMD_DMIC, /**< AMD ACP DMIC */ SOF_DAI_MEDIATEK_AFE, /**< Mediatek AFE */ SOF_DAI_AMD_HS, /**< Amd HS */ + SOF_DAI_AMD_SP_VIRTUAL, /**< AMD ACP SP VIRTUAL */ + SOF_DAI_AMD_HS_VIRTUAL, /**< AMD ACP HS VIRTUAL */ }; /* general purpose DAI configuration */ diff --git a/include/uapi/sound/sof/tokens.h b/include/uapi/sound/sof/tokens.h index f187dfbd9325..bacaf8a6317e 100644 --- a/include/uapi/sound/sof/tokens.h +++ b/include/uapi/sound/sof/tokens.h @@ -198,4 +198,9 @@ /* COPIER */ #define SOF_TKN_INTEL_COPIER_NODE_TYPE 1980 +/* ACP I2S */ +#define SOF_TKN_AMD_ACPI2S_RATE 1700 +#define SOF_TKN_AMD_ACPI2S_CH 1701 +#define SOF_TKN_AMD_ACPI2S_TDM_MODE 1702 + #endif diff --git a/sound/soc/sof/ipc3-pcm.c b/sound/soc/sof/ipc3-pcm.c index dad57bef38f6..f10bfc9bd5cb 100644 --- a/sound/soc/sof/ipc3-pcm.c +++ b/sound/soc/sof/ipc3-pcm.c @@ -336,6 +336,7 @@ static int sof_ipc3_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, channels->min, channels->max); break; case SOF_DAI_AMD_SP: + case SOF_DAI_AMD_SP_VIRTUAL: rate->min = private->dai_config->acpsp.fsync_rate; rate->max = private->dai_config->acpsp.fsync_rate; channels->min = private->dai_config->acpsp.tdm_slots; @@ -347,6 +348,7 @@ static int sof_ipc3_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, channels->min, channels->max); break; case SOF_DAI_AMD_HS: + case SOF_DAI_AMD_HS_VIRTUAL: rate->min = private->dai_config->acphs.fsync_rate; rate->max = private->dai_config->acphs.fsync_rate; channels->min = private->dai_config->acphs.tdm_slots; diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c index 0720e1eae084..b94cc40485ed 100644 --- a/sound/soc/sof/ipc3-topology.c +++ b/sound/soc/sof/ipc3-topology.c @@ -276,6 +276,16 @@ static const struct sof_topology_token acpdmic_tokens[] = { offsetof(struct sof_ipc_dai_acpdmic_params, pdm_ch)}, }; +/* ACPI2S */ +static const struct sof_topology_token acpi2s_tokens[] = { + {SOF_TKN_AMD_ACPI2S_RATE, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, + offsetof(struct sof_ipc_dai_acp_params, fsync_rate)}, + {SOF_TKN_AMD_ACPI2S_CH, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, + offsetof(struct sof_ipc_dai_acp_params, tdm_slots)}, + {SOF_TKN_AMD_ACPI2S_TDM_MODE, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, + offsetof(struct sof_ipc_dai_acp_params, tdm_mode)}, +}; + /* Core tokens */ static const struct sof_topology_token core_tokens[] = { {SOF_TKN_COMP_CORE_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, @@ -311,6 +321,7 @@ static const struct sof_token_info ipc3_token_list[SOF_TOKEN_COUNT] = { [SOF_SAI_TOKENS] = {"SAI tokens", sai_tokens, ARRAY_SIZE(sai_tokens)}, [SOF_AFE_TOKENS] = {"AFE tokens", afe_tokens, ARRAY_SIZE(afe_tokens)}, [SOF_ACPDMIC_TOKENS] = {"ACPDMIC tokens", acpdmic_tokens, ARRAY_SIZE(acpdmic_tokens)}, + [SOF_ACPI2S_TOKENS] = {"ACPI2S tokens", acpi2s_tokens, ARRAY_SIZE(acpi2s_tokens)}, }; /** @@ -1193,6 +1204,7 @@ static int sof_link_acp_sp_load(struct snd_soc_component *scomp, struct snd_sof_ struct snd_soc_tplg_hw_config *hw_config = slink->hw_configs; struct sof_dai_private_data *private = dai->private; u32 size = sizeof(*config); + int ret; /* handle master/slave and inverted clocks */ sof_dai_set_format(hw_config, config); @@ -1201,12 +1213,15 @@ static int sof_link_acp_sp_load(struct snd_soc_component *scomp, struct snd_sof_ memset(&config->acpsp, 0, sizeof(config->acpsp)); config->hdr.size = size; - config->acpsp.fsync_rate = le32_to_cpu(hw_config->fsync_rate); - config->acpsp.tdm_slots = le32_to_cpu(hw_config->tdm_slots); + ret = sof_update_ipc_object(scomp, &config->acpsp, SOF_ACPI2S_TOKENS, slink->tuples, + slink->num_tuples, size, slink->num_hw_configs); + if (ret < 0) + return ret; - dev_info(scomp->dev, "ACP_SP config ACP%d channel %d rate %d\n", + + dev_info(scomp->dev, "ACP_SP config ACP%d channel %d rate %d tdm_mode %d\n", config->dai_index, config->acpsp.tdm_slots, - config->acpsp.fsync_rate); + config->acpsp.fsync_rate, config->acpsp.tdm_mode); dai->number_configs = 1; dai->current_config = 0; @@ -1223,6 +1238,7 @@ static int sof_link_acp_hs_load(struct snd_soc_component *scomp, struct snd_sof_ struct snd_soc_tplg_hw_config *hw_config = slink->hw_configs; struct sof_dai_private_data *private = dai->private; u32 size = sizeof(*config); + int ret; /* Configures the DAI hardware format and inverted clocks */ sof_dai_set_format(hw_config, config); @@ -1231,12 +1247,14 @@ static int sof_link_acp_hs_load(struct snd_soc_component *scomp, struct snd_sof_ memset(&config->acphs, 0, sizeof(config->acphs)); config->hdr.size = size; - config->acphs.fsync_rate = le32_to_cpu(hw_config->fsync_rate); - config->acphs.tdm_slots = le32_to_cpu(hw_config->tdm_slots); + ret = sof_update_ipc_object(scomp, &config->acphs, SOF_ACPI2S_TOKENS, slink->tuples, + slink->num_tuples, size, slink->num_hw_configs); + if (ret < 0) + return ret; - dev_info(scomp->dev, "ACP_HS config ACP%d channel %d rate %d\n", + dev_info(scomp->dev, "ACP_HS config ACP%d channel %d rate %d tdm_mode %d\n", config->dai_index, config->acphs.tdm_slots, - config->acphs.fsync_rate); + config->acphs.fsync_rate, config->acphs.tdm_mode); dai->number_configs = 1; dai->current_config = 0; @@ -1545,9 +1563,11 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget) ret = sof_link_acp_bt_load(scomp, slink, config, dai); break; case SOF_DAI_AMD_SP: + case SOF_DAI_AMD_SP_VIRTUAL: ret = sof_link_acp_sp_load(scomp, slink, config, dai); break; case SOF_DAI_AMD_HS: + case SOF_DAI_AMD_HS_VIRTUAL: ret = sof_link_acp_hs_load(scomp, slink, config, dai); break; case SOF_DAI_AMD_DMIC: diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h index 1b5b3ea53a6e..29cf951e3526 100644 --- a/sound/soc/sof/sof-audio.h +++ b/sound/soc/sof/sof-audio.h @@ -248,6 +248,7 @@ enum sof_tokens { SOF_COPIER_FORMAT_TOKENS, SOF_GAIN_TOKENS, SOF_ACPDMIC_TOKENS, + SOF_ACPI2S_TOKENS, /* this should be the last */ SOF_TOKEN_COUNT, diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 9d9fcaa2a948..c668bd9d21ec 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -289,6 +289,9 @@ static const struct sof_dai_types sof_dais[] = { {"ACPDMIC", SOF_DAI_AMD_DMIC}, {"ACPHS", SOF_DAI_AMD_HS}, {"AFE", SOF_DAI_MEDIATEK_AFE}, + {"ACPSP_VIRTUAL", SOF_DAI_AMD_SP_VIRTUAL}, + {"ACPHS_VIRTUAL", SOF_DAI_AMD_HS_VIRTUAL}, + }; static enum sof_ipc_dai_type find_dai(const char *name) @@ -1895,6 +1898,13 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_ token_id = SOF_ACPDMIC_TOKENS; num_tuples += token_list[SOF_ACPDMIC_TOKENS].count; break; + case SOF_DAI_AMD_SP: + case SOF_DAI_AMD_HS: + case SOF_DAI_AMD_SP_VIRTUAL: + case SOF_DAI_AMD_HS_VIRTUAL: + token_id = SOF_ACPI2S_TOKENS; + num_tuples += token_list[SOF_ACPI2S_TOKENS].count; + break; default: break; } -- 2.25.1

2 2

[PATCH] selftests: alsa - move shared library configuration code to conf.c
by Jaroslav Kysela 29 Nov '22

29 Nov '22

The minimal alsa-lib configuration code is similar in both mixer and pcm tests. Move this code to the shared conf.c source file. Also, fix the build rules inspired by rseq tests. Build libatest.so which is linked to the both test utilities dynamically. Also, set the TEST_FILES variable for lib.mk. Cc: linux-kselftest(a)vger.kernel.org Cc: Shuah Khan <shuah(a)kernel.org> Reported-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- tools/testing/selftests/alsa/Makefile | 13 ++++- tools/testing/selftests/alsa/alsa-local.h | 2 + tools/testing/selftests/alsa/conf.c | 69 ++++++++++++++++++++++ tools/testing/selftests/alsa/mixer-test.c | 53 +---------------- tools/testing/selftests/alsa/pcm-test.c | 70 ----------------------- 5 files changed, 85 insertions(+), 122 deletions(-) diff --git a/tools/testing/selftests/alsa/Makefile b/tools/testing/selftests/alsa/Makefile index 8ac22d2eb2ba..a8c0383878d3 100644 --- a/tools/testing/selftests/alsa/Makefile +++ b/tools/testing/selftests/alsa/Makefile @@ -6,9 +6,20 @@ LDLIBS += $(shell pkg-config --libs alsa) ifeq ($(LDLIBS),) LDLIBS += -lasound endif +CFLAGS += -L$(OUTPUT) -Wl,-rpath=./ + +OVERRIDE_TARGETS = 1 TEST_GEN_PROGS := mixer-test pcm-test -pcm-test: pcm-test.c conf.c +TEST_GEN_PROGS_EXTENDED := libatest.so + +TEST_FILES := conf.d include ../lib.mk + +$(OUTPUT)/libatest.so: conf.c alsa-local.h + $(CC) $(CFLAGS) -shared -fPIC $< $(LDLIBS) -o $@ + +$(OUTPUT)/%: %.c $(TEST_GEN_PROGS_EXTENDED) alsa-local.h + $(CC) $(CFLAGS) $< $(LDLIBS) -latest -o $@ diff --git a/tools/testing/selftests/alsa/alsa-local.h b/tools/testing/selftests/alsa/alsa-local.h index fd0771ac600d..65f197ea9773 100644 --- a/tools/testing/selftests/alsa/alsa-local.h +++ b/tools/testing/selftests/alsa/alsa-local.h @@ -10,6 +10,8 @@ #include <alsa/asoundlib.h> +snd_config_t *get_alsalib_config(void); + void conf_load(void); void conf_free(void); snd_config_t *conf_by_card(int card); diff --git a/tools/testing/selftests/alsa/conf.c b/tools/testing/selftests/alsa/conf.c index dd6aa90deef9..c7ffc8f04195 100644 --- a/tools/testing/selftests/alsa/conf.c +++ b/tools/testing/selftests/alsa/conf.c @@ -28,6 +28,75 @@ struct card_data { static struct card_data *conf_cards; +static const char *alsa_config = +"ctl.hw {\n" +" @args [ CARD ]\n" +" @args.CARD.type string\n" +" type hw\n" +" card $CARD\n" +"}\n" +"pcm.hw {\n" +" @args [ CARD DEV SUBDEV ]\n" +" @args.CARD.type string\n" +" @args.DEV.type integer\n" +" @args.SUBDEV.type integer\n" +" type hw\n" +" card $CARD\n" +" device $DEV\n" +" subdevice $SUBDEV\n" +"}\n" +; + +#ifdef SND_LIB_VER +#if SND_LIB_VERSION >= SND_LIB_VER(1, 2, 6) +#define LIB_HAS_LOAD_STRING +#endif +#endif + +#ifndef LIB_HAS_LOAD_STRING +static int snd_config_load_string(snd_config_t **config, const char *s, + size_t size) +{ + snd_input_t *input; + snd_config_t *dst; + int err; + + assert(config && s); + if (size == 0) + size = strlen(s); + err = snd_input_buffer_open(&input, s, size); + if (err < 0) + return err; + err = snd_config_top(&dst); + if (err < 0) { + snd_input_close(input); + return err; + } + err = snd_config_load(dst, input); + snd_input_close(input); + if (err < 0) { + snd_config_delete(dst); + return err; + } + *config = dst; + return 0; +} +#endif + +snd_config_t *get_alsalib_config(void) +{ + snd_config_t *config; + int err; + + err = snd_config_load_string(&config, alsa_config, strlen(alsa_config)); + if (err < 0) { + ksft_print_msg("Unable to parse custom alsa-lib configuration: %s\n", + snd_strerror(err)); + ksft_exit_fail(); + } + return config; +} + static struct card_data *conf_data_by_card(int card, bool msg) { struct card_data *conf; diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index a38b89c28030..05f1749ae19d 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -26,6 +26,7 @@ #include <stdint.h> #include "../kselftest.h" +#include "alsa-local.h" #define TESTS_PER_CONTROL 7 @@ -50,56 +51,11 @@ struct ctl_data { struct ctl_data *next; }; -static const char *alsa_config = -"ctl.hw {\n" -" @args [ CARD ]\n" -" @args.CARD.type string\n" -" type hw\n" -" card $CARD\n" -"}\n" -; - int num_cards = 0; int num_controls = 0; struct card_data *card_list = NULL; struct ctl_data *ctl_list = NULL; -#ifdef SND_LIB_VER -#if SND_LIB_VERSION >= SND_LIB_VER(1, 2, 6) -#define LIB_HAS_LOAD_STRING -#endif -#endif - -#ifndef LIB_HAS_LOAD_STRING -static int snd_config_load_string(snd_config_t **config, const char *s, - size_t size) -{ - snd_input_t *input; - snd_config_t *dst; - int err; - - assert(config && s); - if (size == 0) - size = strlen(s); - err = snd_input_buffer_open(&input, s, size); - if (err < 0) - return err; - err = snd_config_top(&dst); - if (err < 0) { - snd_input_close(input); - return err; - } - err = snd_config_load(dst, input); - snd_input_close(input); - if (err < 0) { - snd_config_delete(dst); - return err; - } - *config = dst; - return 0; -} -#endif - static void find_controls(void) { char name[32]; @@ -112,12 +68,7 @@ static void find_controls(void) if (snd_card_next(&card) < 0 || card < 0) return; - err = snd_config_load_string(&config, alsa_config, strlen(alsa_config)); - if (err < 0) { - ksft_print_msg("Unable to parse custom alsa-lib configuration: %s\n", - snd_strerror(err)); - ksft_exit_fail(); - } + config = get_alsalib_config(); while (card >= 0) { sprintf(name, "hw:%d", card); diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c index 2814d8f74f82..6e7dfc395b98 100644 --- a/tools/testing/selftests/alsa/pcm-test.c +++ b/tools/testing/selftests/alsa/pcm-test.c @@ -31,26 +31,6 @@ struct pcm_data { struct pcm_data *next; }; -static const char *alsa_config = -"ctl.hw {\n" -" @args [ CARD ]\n" -" @args.CARD.type string\n" -" type hw\n" -" card $CARD\n" -"}\n" -"pcm.hw {\n" -" @args [ CARD DEV SUBDEV ]\n" -" @args.CARD.type string\n" -" @args.DEV.type integer\n" -" @args.SUBDEV.type integer\n" -" type hw\n" -" card $CARD\n" -" device $DEV\n" -" subdevice $SUBDEV\n" -"}\n" - -; - int num_pcms = 0; struct pcm_data *pcm_list = NULL; @@ -77,56 +57,6 @@ long long timestamp_diff_ms(timestamp_t *tstamp) return (diff.tv_sec * 1000) + ((diff.tv_nsec + 500000L) / 1000000L); } -#ifdef SND_LIB_VER -#if SND_LIB_VERSION >= SND_LIB_VER(1, 2, 6) -#define LIB_HAS_LOAD_STRING -#endif -#endif - -#ifndef LIB_HAS_LOAD_STRING -static int snd_config_load_string(snd_config_t **config, const char *s, - size_t size) -{ - snd_input_t *input; - snd_config_t *dst; - int err; - - assert(config && s); - if (size == 0) - size = strlen(s); - err = snd_input_buffer_open(&input, s, size); - if (err < 0) - return err; - err = snd_config_top(&dst); - if (err < 0) { - snd_input_close(input); - return err; - } - err = snd_config_load(dst, input); - snd_input_close(input); - if (err < 0) { - snd_config_delete(dst); - return err; - } - *config = dst; - return 0; -} -#endif - -static snd_config_t *get_alsalib_config(void) -{ - snd_config_t *config; - int err; - - err = snd_config_load_string(&config, alsa_config, strlen(alsa_config)); - if (err < 0) { - ksft_print_msg("Unable to parse custom alsa-lib configuration: %s\n", - snd_strerror(err)); - ksft_exit_fail(); - } - return config; -} - static long device_from_id(snd_config_t *node) { const char *id; -- 2.35.3

3 2

[PATCH v2] ALSA: usb-audio: Add quirk for Tascam Model 12
by John Keeping 29 Nov '22

29 Nov '22

Tascam's Model 12 is a mixer which can also operate as a USB audio interface. The audio interface uses explicit feedback but it seems that it does not correctly handle missing isochronous frames. When injecting an xrun (or doing anything else that pauses the playback stream) the feedback rate climbs (for example, at 44,100Hz nominal, I see a stable rate around 44,099 but xrun injection sees this peak at around 44,135 in most cases) and glitches are heard in the audio stream for several seconds - this is significantly worse than the single glitch expected for an underrun. While the stream does normally recover and the feedback rate returns to a stable value, I have seen some occurrences where this does not happen and the rate continues to increase while no audio is heard from the output. I have not found a solid reproduction for this. This misbehaviour can be avoided by totally resetting the stream state by switching the interface to alt 0 and back before restarting the playback stream. Add a new quirk flag which forces the endpoint and interface to be reconfigured whenever the stream is stopped, and use this for the Tascam Model 12. Separate interfaces are used for the playback and capture endpoints, so resetting the playback interface here will not affect the capture stream if it is running. While there are two endpoints on the interface, these are the OUT data endpoint and the IN explicit feedback endpoint corresponding to it and these are always stopped and started together. Signed-off-by: John Keeping <john(a)metanate.com> --- v2: - Set ep->need_prepare not ep->need_setup; this was missed when forward porting the patch as need_prepare is new in 6.1 - Add more details to the commit message about why it is safe to reset the interface here sound/usb/endpoint.c | 7 +++++++ sound/usb/quirks.c | 2 ++ sound/usb/usbaudio.h | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 310cd6fb0038..4aaf0784940b 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1673,6 +1673,13 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, bool keep_pending) stop_urbs(ep, false, keep_pending); if (ep->clock_ref) atomic_dec(&ep->clock_ref->locked); + + if (ep->chip->quirk_flags & QUIRK_FLAG_FORCE_IFACE_RESET && + usb_pipeout(ep->pipe)) { + ep->need_prepare = true; + if (ep->iface_ref) + ep->iface_ref->need_setup = true; + } } } diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0f4dd3503a6a..58b37bfc885c 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2044,6 +2044,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { DEVICE_FLG(0x0644, 0x804a, /* TEAC UD-301 */ QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY), + DEVICE_FLG(0x0644, 0x805f, /* TEAC Model 12 */ + QUIRK_FLAG_FORCE_IFACE_RESET), DEVICE_FLG(0x06f8, 0xb000, /* Hercules DJ Console (Windows Edition) */ QUIRK_FLAG_IGNORE_CTL_ERROR), DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */ diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index e97141ef730a..2aba508a4831 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -172,6 +172,9 @@ extern bool snd_usb_skip_validation; * Don't apply implicit feedback sync mode * QUIRK_FLAG_IFACE_SKIP_CLOSE * Don't closed interface during setting sample rate + * QUIRK_FLAG_FORCE_IFACE_RESET + * Force an interface reset whenever stopping & restarting a stream + * (e.g. after xrun) */ #define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0) @@ -194,5 +197,6 @@ extern bool snd_usb_skip_validation; #define QUIRK_FLAG_GENERIC_IMPLICIT_FB (1U << 17) #define QUIRK_FLAG_SKIP_IMPLICIT_FB (1U << 18) #define QUIRK_FLAG_IFACE_SKIP_CLOSE (1U << 19) +#define QUIRK_FLAG_FORCE_IFACE_RESET (1U << 20) #endif /* __USBAUDIO_H */ -- 2.38.1

2 1

stop drivers from passing GFP_COMP to dma_alloc_coherent
by Christoph Hellwig 29 Nov '22

29 Nov '22

Hi all, this series fixes up various drivers that either try to get a compound page from dma_alloc_coherent or more often just did a bit of cargo cult copy and paste, and then warns about this flag passed in the DMA layer instead of silently clearing it like done by ARM and dma-iommu before. Diffstat: arch/arm/mm/dma-mapping.c | 17 ----------------- drivers/infiniband/hw/hfi1/init.c | 21 +++------------------ drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- drivers/infiniband/hw/qib/qib_init.c | 21 ++++----------------- drivers/iommu/dma-iommu.c | 3 --- drivers/media/v4l2-core/videobuf-dma-contig.c | 22 ++++++++-------------- drivers/net/ethernet/broadcom/cnic.c | 6 ++---- drivers/s390/net/ism_drv.c | 3 ++- kernel/dma/mapping.c | 8 ++++++++ sound/core/memalloc.c | 5 ++--- 10 files changed, 30 insertions(+), 78 deletions(-)

9 26

[PATCH v2] ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops
by Srinivasa Rao Mandadapu 29 Nov '22

29 Nov '22

Update lpass sc7280 platform driver with PM ops, such as system supend and resume callbacks. This update is required to disable clocks during supend and avoid XO shutdown issue. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Tested-by: Rahul Ajmeriya <quic_rajmeriy(a)quicinc.com> --- Changes since v1: -- Add __maybe_unused flag for suspend/resume APIs. sound/soc/qcom/lpass-sc7280.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c index 70c4df8..d43f480 100644 --- a/sound/soc/qcom/lpass-sc7280.c +++ b/sound/soc/qcom/lpass-sc7280.c @@ -232,10 +232,28 @@ static int sc7280_lpass_exit(struct platform_device *pdev) struct lpass_data *drvdata = platform_get_drvdata(pdev); clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); + return 0; +} + +static int __maybe_unused sc7280_lpass_dev_resume(struct device *dev) +{ + struct lpass_data *drvdata = dev_get_drvdata(dev); + + return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); +} +static int __maybe_unused sc7280_lpass_dev_suspend(struct device *dev) +{ + struct lpass_data *drvdata = dev_get_drvdata(dev); + + clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); return 0; } +static const struct dev_pm_ops sc7280_lpass_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(sc7280_lpass_dev_suspend, sc7280_lpass_dev_resume) +}; + static struct lpass_variant sc7280_data = { .i2sctrl_reg_base = 0x1000, .i2sctrl_reg_stride = 0x1000, @@ -426,6 +444,7 @@ static struct platform_driver sc7280_lpass_cpu_platform_driver = { .driver = { .name = "sc7280-lpass-cpu", .of_match_table = of_match_ptr(sc7280_lpass_cpu_device_id), + .pm = &sc7280_lpass_pm_ops, }, .probe = asoc_qcom_lpass_cpu_platform_probe, .remove = asoc_qcom_lpass_cpu_platform_remove, -- 2.7.4

2 2

[PATCH] ASoC: qcom: lpass-sc7280: Add system suspend/resume PM ops
by Srinivasa Rao Mandadapu 29 Nov '22

29 Nov '22

Update lpass sc7280 platform driver with PM ops, such as system supend and resume callbacks. This update is required to disable clocks during supend and avoid XO shutdown issue. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Tested-by: Rahul Ajmeriya <quic_rajmeriy(a)quicinc.com> --- sound/soc/qcom/lpass-sc7280.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c index 70c4df8..65a04d3 100644 --- a/sound/soc/qcom/lpass-sc7280.c +++ b/sound/soc/qcom/lpass-sc7280.c @@ -232,10 +232,27 @@ static int sc7280_lpass_exit(struct platform_device *pdev) struct lpass_data *drvdata = platform_get_drvdata(pdev); clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); + return 0; +} + +static int sc7280_lpass_dev_resume(struct device *dev) +{ + struct lpass_data *drvdata = dev_get_drvdata(dev); + + return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); +} + +static int sc7280_lpass_dev_suspend(struct device *dev) +{ + struct lpass_data *drvdata = dev_get_drvdata(dev); + clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); return 0; } +static const struct dev_pm_ops sc7280_lpass_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(sc7280_lpass_dev_suspend, sc7280_lpass_dev_resume) +}; static struct lpass_variant sc7280_data = { .i2sctrl_reg_base = 0x1000, .i2sctrl_reg_stride = 0x1000, @@ -426,6 +443,7 @@ static struct platform_driver sc7280_lpass_cpu_platform_driver = { .driver = { .name = "sc7280-lpass-cpu", .of_match_table = of_match_ptr(sc7280_lpass_cpu_device_id), + .pm = &sc7280_lpass_pm_ops, }, .probe = asoc_qcom_lpass_cpu_platform_probe, .remove = asoc_qcom_lpass_cpu_platform_remove, -- 2.7.4

2 1

[PATCH v2] ASoC: qcom: lpass-sc7180: Delete redundant error log from _resume()
by Matthias Kaehlcke 29 Nov '22

29 Nov '22

sc7180_lpass_dev_resume() logs an error if clk_bulk_prepare_enable() fails. The clock framework already generates error logs if anything goes wrong, so the logging in _resume() is redundant, drop it. Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- Changes in v2: - removed the log in the error path (requested by Doug) - updated subject (was "ASoC: qcom: lpass-sc7180: Return 0 instead of 'ret' at the end of _resume()") and commit message sound/soc/qcom/lpass-sc7180.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index 6ad1c5b5f2de..db3be15cf14c 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -162,15 +162,9 @@ static int sc7180_lpass_exit(struct platform_device *pdev) static int sc7180_lpass_dev_resume(struct device *dev) { - int ret = 0; struct lpass_data *drvdata = dev_get_drvdata(dev); - ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); - if (ret) { - dev_err(dev, "sc7180 clk prepare and enable failed\n"); - return ret; - } - return ret; + return clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); } static int sc7180_lpass_dev_suspend(struct device *dev) -- 2.38.1.584.g0f3c55d4c2-goog

3 2

[PATCH] ASoC: qcom: lpass-sc7180: Add system suspend/resume PM ops
by Srinivasa Rao Mandadapu 29 Nov '22

29 Nov '22

Update lpass sc7180 platform driver with PM ops, such as system supend and resume callbacks. This update is required to disable clocks during supend and avoid XO shutdown issue. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Tested-by: Rahul Ajmeriya <quic_rajmeriy(a)quicinc.com> --- sound/soc/qcom/lpass-sc7180.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index 77a556b..6ad1c5b 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -12,6 +12,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <dt-bindings/sound/sc7180-lpass.h> #include <sound/pcm.h> #include <sound/soc.h> @@ -156,10 +157,34 @@ static int sc7180_lpass_exit(struct platform_device *pdev) struct lpass_data *drvdata = platform_get_drvdata(pdev); clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); + return 0; +} + +static int sc7180_lpass_dev_resume(struct device *dev) +{ + int ret = 0; + struct lpass_data *drvdata = dev_get_drvdata(dev); + ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); + if (ret) { + dev_err(dev, "sc7180 clk prepare and enable failed\n"); + return ret; + } + return ret; +} + +static int sc7180_lpass_dev_suspend(struct device *dev) +{ + struct lpass_data *drvdata = dev_get_drvdata(dev); + + clk_bulk_disable_unprepare(drvdata->num_clks, drvdata->clks); return 0; } +static const struct dev_pm_ops sc7180_lpass_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(sc7180_lpass_dev_suspend, sc7180_lpass_dev_resume) +}; + static struct lpass_variant sc7180_data = { .i2sctrl_reg_base = 0x1000, .i2sctrl_reg_stride = 0x1000, @@ -293,6 +318,7 @@ static struct platform_driver sc7180_lpass_cpu_platform_driver = { .driver = { .name = "sc7180-lpass-cpu", .of_match_table = of_match_ptr(sc7180_lpass_cpu_device_id), + .pm = &sc7180_lpass_pm_ops, }, .probe = asoc_qcom_lpass_cpu_platform_probe, .remove = asoc_qcom_lpass_cpu_platform_remove, -- 2.7.4

5 6

[PATCH v2] [RFC] selftests: alsa - add PCM test
by Jaroslav Kysela 29 Nov '22

29 Nov '22

This initial code does a simple sample transfer tests. By default, all PCM devices are detected and tested with short and long buffering parameters for 4 seconds. If the sample transfer timing is not in a +-100ms boundary, the test fails. Only the interleaved buffering scheme is supported in this version. The configuration may be modified with the configuration files. A specific hardware configuration is detected and activated using the sysfs regex matching. This allows to use the DMI string (/sys/class/dmi/id/* tree) or any other system parameters exposed in sysfs for the matching for the CI automation. The configuration file may also specify the PCM device list to detect the missing PCM devices. v1..v2: - added missing alsa-local.h header file Cc: Mark Brown <broonie(a)kernel.org> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)intel.com> Cc: Liam Girdwood <liam.r.girdwood(a)intel.com> Cc: Jesse Barnes <jsbarnes(a)google.com> Cc: Jimmy Cheng-Yi Chiang <cychiang(a)google.com> Cc: Curtis Malainey <cujomalainey(a)google.com> Cc: Brian Norris <briannorris(a)chromium.org> Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- tools/testing/selftests/alsa/Makefile | 4 +- tools/testing/selftests/alsa/alsa-local.h | 22 + tools/testing/selftests/alsa/conf.c | 379 +++++++++++++ .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 76 +++ tools/testing/selftests/alsa/pcm-test.c | 523 ++++++++++++++++++ 5 files changed, 1003 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/alsa/alsa-local.h create mode 100644 tools/testing/selftests/alsa/conf.c create mode 100644 tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf create mode 100644 tools/testing/selftests/alsa/pcm-test.c diff --git a/tools/testing/selftests/alsa/Makefile b/tools/testing/selftests/alsa/Makefile index fd8ddce2b1a6..8ac22d2eb2ba 100644 --- a/tools/testing/selftests/alsa/Makefile +++ b/tools/testing/selftests/alsa/Makefile @@ -7,6 +7,8 @@ ifeq ($(LDLIBS),) LDLIBS += -lasound endif -TEST_GEN_PROGS := mixer-test +TEST_GEN_PROGS := mixer-test pcm-test + +pcm-test: pcm-test.c conf.c include ../lib.mk diff --git a/tools/testing/selftests/alsa/alsa-local.h b/tools/testing/selftests/alsa/alsa-local.h new file mode 100644 index 000000000000..fd0771ac600d --- /dev/null +++ b/tools/testing/selftests/alsa/alsa-local.h @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// kselftest configuration helpers for the hw specific configuration +// +// Original author: Jaroslav Kysela <perex(a)perex.cz> +// Copyright (c) 2022 Red Hat Inc. + +#ifndef __ALSA_LOCAL_H +#define __ALSA_LOCAL_H + +#include <alsa/asoundlib.h> + +void conf_load(void); +void conf_free(void); +snd_config_t *conf_by_card(int card); +snd_config_t *conf_get_subtree(snd_config_t *root, const char *key1, const char *key2); +int conf_get_count(snd_config_t *root, const char *key1, const char *key2); +const char *conf_get_string(snd_config_t *root, const char *key1, const char *key2, const char *def); +long conf_get_long(snd_config_t *root, const char *key1, const char *key2, long def); +int conf_get_bool(snd_config_t *root, const char *key1, const char *key2, int def); + +#endif /* __ALSA_LOCAL_H */ diff --git a/tools/testing/selftests/alsa/conf.c b/tools/testing/selftests/alsa/conf.c new file mode 100644 index 000000000000..dd6aa90deef9 --- /dev/null +++ b/tools/testing/selftests/alsa/conf.c @@ -0,0 +1,379 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// kselftest configuration helpers for the hw specific configuration +// +// Original author: Jaroslav Kysela <perex(a)perex.cz> +// Copyright (c) 2022 Red Hat Inc. + +#include <stdio.h> +#include <stdlib.h> +#include <stdbool.h> +#include <errno.h> +#include <assert.h> +#include <dirent.h> +#include <regex.h> +#include <sys/stat.h> + +#include "../kselftest.h" +#include "alsa-local.h" + +#define SYSFS_ROOT "/sys" + +struct card_data { + int card; + snd_config_t *config; + const char *filename; + struct card_data *next; +}; + +static struct card_data *conf_cards; + +static struct card_data *conf_data_by_card(int card, bool msg) +{ + struct card_data *conf; + + for (conf = conf_cards; conf; conf = conf->next) { + if (conf->card == card) { + if (msg) + ksft_print_msg("using hw card config %s for card %d\n", + conf->filename, card); + return conf; + } + } + return NULL; +} + +static int dump_config_tree(snd_config_t *top) +{ + snd_output_t *out; + int err; + + err = snd_output_stdio_attach(&out, stdout, 0); + if (err < 0) + ksft_exit_fail_msg("stdout attach\n"); + if (snd_config_save(top, out)) + ksft_exit_fail_msg("config save\n"); + snd_output_close(out); +} + +static snd_config_t *load(const char *filename) +{ + snd_config_t *dst; + snd_input_t *input; + int err; + + err = snd_input_stdio_open(&input, filename, "r"); + if (err < 0) + ksft_exit_fail_msg("Unable to parse filename %s\n", filename); + err = snd_config_top(&dst); + if (err < 0) + ksft_exit_fail_msg("Out of memory\n"); + err = snd_config_load(dst, input); + snd_input_close(input); + if (err < 0) + ksft_exit_fail_msg("Unable to parse filename %s\n", filename); + return dst; +} + +static char *sysfs_get(const char *sysfs_root, const char *id) +{ + char path[PATH_MAX], link[PATH_MAX + 1]; + struct stat sb; + ssize_t len; + char *e; + int fd; + + if (id[0] == '/') + id++; + snprintf(path, sizeof(path), "%s/%s", sysfs_root, id); + if (lstat(path, &sb) != 0) + return NULL; + if (S_ISLNK(sb.st_mode)) { + len = readlink(path, link, sizeof(link) - 1); + if (len <= 0) { + ksft_exit_fail_msg("sysfs: cannot read link '%s': %s\n", + path, strerror(errno)); + return NULL; + } + link[len] = '\0'; + e = strrchr(link, '/'); + if (e) + return strdup(e + 1); + return NULL; + } + if (S_ISDIR(sb.st_mode)) + return NULL; + if ((sb.st_mode & S_IRUSR) == 0) + return NULL; + + fd = open(path, O_RDONLY); + if (fd < 0) { + if (errno == ENOENT) + return NULL; + ksft_exit_fail_msg("sysfs: open failed for '%s': %s\n", + path, strerror(errno)); + } + len = read(fd, path, sizeof(path)-1); + close(fd); + if (len < 0) + ksft_exit_fail_msg("sysfs: unable to read value '%s': %s\n", + path, errno); + while (len > 0 && path[len-1] == '\n') + len--; + path[len] = '\0'; + e = strdup(path); + if (e == NULL) + ksft_exit_fail_msg("Out of memory\n"); + return e; +} + +static bool sysfs_match(const char *sysfs_root, snd_config_t *config) +{ + snd_config_t *node, *path_config, *regex_config; + snd_config_iterator_t i, next; + const char *path_string, *regex_string, *v; + regex_t re; + regmatch_t match[1]; + int iter = 0, ret; + + snd_config_for_each(i, next, config) { + node = snd_config_iterator_entry(i); + if (snd_config_search(node, "path", &path_config)) + ksft_exit_fail_msg("Missing path field in the sysfs block\n"); + if (snd_config_search(node, "regex", &regex_config)) + ksft_exit_fail_msg("Missing regex field in the sysfs block\n"); + if (snd_config_get_string(path_config, &path_string)) + ksft_exit_fail_msg("Path field in the sysfs block is not a string\n"); + if (snd_config_get_string(regex_config, &regex_string)) + ksft_exit_fail_msg("Regex field in the sysfs block is not a string\n"); + iter++; + v = sysfs_get(sysfs_root, path_string); + if (!v) + return false; + if (regcomp(&re, regex_string, REG_EXTENDED)) + ksft_exit_fail_msg("Wrong regex '%s'\n", regex_string); + ret = regexec(&re, v, 1, match, 0); + regfree(&re); + if (ret) + return false; + } + return iter > 0; +} + +static bool test_filename1(int card, const char *filename, const char *sysfs_card_root) +{ + struct card_data *data, *data2; + snd_config_t *config, *sysfs_config, *card_config, *sysfs_card_config, *node; + snd_config_iterator_t i, next; + + config = load(filename); + if (snd_config_search(config, "sysfs", &sysfs_config) || + snd_config_get_type(sysfs_config) != SND_CONFIG_TYPE_COMPOUND) + ksft_exit_fail_msg("Missing global sysfs block in filename %s\n", filename); + if (snd_config_search(config, "card", &card_config) || + snd_config_get_type(card_config) != SND_CONFIG_TYPE_COMPOUND) + ksft_exit_fail_msg("Missing global card block in filename %s\n", filename); + if (!sysfs_match(SYSFS_ROOT, sysfs_config)) + return false; + snd_config_for_each(i, next, card_config) { + node = snd_config_iterator_entry(i); + if (snd_config_search(node, "sysfs", &sysfs_card_config) || + snd_config_get_type(sysfs_card_config) != SND_CONFIG_TYPE_COMPOUND) + ksft_exit_fail_msg("Missing card sysfs block in filename %s\n", filename); + if (!sysfs_match(sysfs_card_root, sysfs_card_config)) + continue; + data = malloc(sizeof(*data)); + if (!data) + ksft_exit_fail_msg("Out of memory\n"); + data2 = conf_data_by_card(card, false); + if (data2) + ksft_exit_fail_msg("Duplicate card '%s' <-> '%s'\n", filename, data2->filename); + data->card = card; + data->filename = filename; + data->config = node; + data->next = conf_cards; + conf_cards = data; + return true; + } + return false; +} + +static bool test_filename(const char *filename) +{ + char fn[128]; + int card; + + for (card = 0; card < 32; card++) { + snprintf(fn, sizeof(fn), "%s/class/sound/card%d", SYSFS_ROOT, card); + if (access(fn, R_OK) == 0 && test_filename1(card, filename, fn)) + return true; + } + return false; +} + +static int filename_filter(const struct dirent *dirent) +{ + size_t flen; + + if (dirent == NULL) + return 0; + if (dirent->d_type == DT_DIR) + return 0; + flen = strlen(dirent->d_name); + if (flen <= 5) + return 0; + if (strncmp(&dirent->d_name[flen-5], ".conf", 5) == 0) + return 1; + return 0; +} + +void conf_load(void) +{ + const char *fn = "conf.d"; + struct dirent **namelist; + int n, j; + + n = scandir(fn, &namelist, filename_filter, alphasort); + if (n < 0) + ksft_exit_fail_msg("scandir: %s\n", strerror(errno)); + for (j = 0; j < n; j++) { + size_t sl = strlen(fn) + strlen(namelist[j]->d_name) + 2; + char *filename = malloc(sl); + if (filename == NULL) + ksft_exit_fail_msg("Out of memory\n"); + sprintf(filename, "%s/%s", fn, namelist[j]->d_name); + if (test_filename(filename)) + filename = NULL; + free(filename); + free(namelist[j]); + } + free(namelist); +} + +void conf_free(void) +{ + struct card_data *conf; + + while (conf_cards) { + conf = conf_cards; + conf_cards = conf->next; + snd_config_delete(conf->config); + } +} + +snd_config_t *conf_by_card(int card) +{ + struct card_data *conf; + + conf = conf_data_by_card(card, true); + if (conf) + return conf->config; + return NULL; +} + +static int conf_get_by_keys(snd_config_t *root, const char *key1, + const char *key2, snd_config_t **result) +{ + int ret; + + if (key1) { + ret = snd_config_search(root, key1, &root); + if (ret != -ENOENT && ret < 0) + return ret; + } + if (key2) + ret = snd_config_search(root, key2, &root); + if (ret >= 0) + *result = root; + return ret; +} + +snd_config_t *conf_get_subtree(snd_config_t *root, const char *key1, const char *key2) +{ + int ret; + + if (!root) + return NULL; + ret = conf_get_by_keys(root, key1, key2, &root); + if (ret == -ENOENT) + return NULL; + if (ret < 0) + ksft_exit_fail_msg("key '%s'.'%s' search error: %s\n", key1, key2, snd_strerror(ret)); + return root; +} + +int conf_get_count(snd_config_t *root, const char *key1, const char *key2) +{ + snd_config_t *cfg; + snd_config_iterator_t i, next; + int count, ret; + + if (!root) + return -1; + ret = conf_get_by_keys(root, key1, key2, &cfg); + if (ret == -ENOENT) + return -1; + if (ret < 0) + ksft_exit_fail_msg("key '%s'.'%s' search error: %s\n", key1, key2, snd_strerror(ret)); + if (snd_config_get_type(cfg) != SND_CONFIG_TYPE_COMPOUND) + ksft_exit_fail_msg("key '%s'.'%s' is not a compound\n", key1, key2); + count = 0; + snd_config_for_each(i, next, cfg) + count++; + return count; +} + +const char *conf_get_string(snd_config_t *root, const char *key1, const char *key2, const char *def) +{ + snd_config_t *cfg; + const char *s; + int ret; + + if (!root) + return def; + ret = conf_get_by_keys(root, key1, key2, &cfg); + if (ret == -ENOENT) + return def; + if (ret < 0) + ksft_exit_fail_msg("key '%s'.'%s' search error: %s\n", key1, key2, snd_strerror(ret)); + if (snd_config_get_string(cfg, &s)) + ksft_exit_fail_msg("key '%s'.'%s' is not a string\n", key1, key2); + return s; +} + +long conf_get_long(snd_config_t *root, const char *key1, const char *key2, long def) +{ + snd_config_t *cfg; + long l; + int ret; + + if (!root) + return def; + ret = conf_get_by_keys(root, key1, key2, &cfg); + if (ret == -ENOENT) + return def; + if (ret < 0) + ksft_exit_fail_msg("key '%s'.'%s' search error: %s\n", key1, key2, snd_strerror(ret)); + if (snd_config_get_integer(cfg, &l)) + ksft_exit_fail_msg("key '%s'.'%s' is not an integer\n", key1, key2); + return l; +} + +int conf_get_bool(snd_config_t *root, const char *key1, const char *key2, int def) +{ + snd_config_t *cfg; + long l; + int ret; + + if (!root) + return def; + ret = conf_get_by_keys(root, key1, key2, &cfg); + if (ret == -ENOENT) + return def; + if (ret < 0) + ksft_exit_fail_msg("key '%s'.'%s' search error: %s\n", key1, key2, snd_strerror(ret)); + ret = snd_config_get_bool(cfg); + if (ret < 0) + ksft_exit_fail_msg("key '%s'.'%s' is not an bool\n", key1, key2); + return !!ret; +} diff --git a/tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf b/tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf new file mode 100644 index 000000000000..0a83f35d43eb --- /dev/null +++ b/tools/testing/selftests/alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf @@ -0,0 +1,76 @@ +# +# Example configuration for Lenovo ThinkPad P1 Gen2 +# + +# +# Use regex match for the string read from the given sysfs path +# +# The sysfs root directory (/sys) is hardwired in the test code +# (may be changed on demand). +# +# All strings must match. +# +sysfs [ + { + path "class/dmi/id/product_sku" + regex "LENOVO_MT_20QU_BU_Think_FM_ThinkPad P1 Gen 2" + } +] + +card.hda { + # + # Use regex match for the /sys/class/sound/card*/ tree (relative) + # + sysfs [ + { + path "device/subsystem_device" + regex "0x229e" + } + { + path "device/subsystem_vendor" + regex "0x17aa" + } + ] + + # + # PCM configuration + # + # pcm.0.0 - device 0 subdevice 0 + # + pcm.0.0 { + PLAYBACK { + test.time1 { + access RW_INTERLEAVED # can be omitted - default + format S16_LE # can be omitted - default + rate 48000 # can be omitted - default + channels 2 # can be omitted - default + period_size 512 + buffer_size 4096 + } + test.time2 { + access RW_INTERLEAVED + format S16_LE + rate 48000 + channels 2 + period_size 24000 + buffer_size 192000 + } + } + CAPTURE { + # use default tests, check for the presence + } + } + # + # uncomment to force the missing device checks + # + #pcm.0.2 { + # PLAYBACK { + # # check for the presence + # } + #} + #pcm.0.3 { + # CAPTURE { + # # check for the presence + # } + #} +} diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c new file mode 100644 index 000000000000..2814d8f74f82 --- /dev/null +++ b/tools/testing/selftests/alsa/pcm-test.c @@ -0,0 +1,523 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// kselftest for the ALSA PCM API +// +// Original author: Jaroslav Kysela <perex(a)perex.cz> +// Copyright (c) 2022 Red Hat Inc. + +// This test will iterate over all cards detected in the system, exercising +// every PCM device it can find. This may conflict with other system +// software if there is audio activity so is best run on a system with a +// minimal active userspace. + +#include <stdio.h> +#include <stdlib.h> +#include <stdbool.h> +#include <errno.h> +#include <assert.h> + +#include "../kselftest.h" +#include "alsa-local.h" + +typedef struct timespec timestamp_t; + +struct pcm_data { + snd_pcm_t *handle; + int card; + int device; + int subdevice; + snd_pcm_stream_t stream; + snd_config_t *pcm_config; + struct pcm_data *next; +}; + +static const char *alsa_config = +"ctl.hw {\n" +" @args [ CARD ]\n" +" @args.CARD.type string\n" +" type hw\n" +" card $CARD\n" +"}\n" +"pcm.hw {\n" +" @args [ CARD DEV SUBDEV ]\n" +" @args.CARD.type string\n" +" @args.DEV.type integer\n" +" @args.SUBDEV.type integer\n" +" type hw\n" +" card $CARD\n" +" device $DEV\n" +" subdevice $SUBDEV\n" +"}\n" + +; + +int num_pcms = 0; +struct pcm_data *pcm_list = NULL; + +int num_missing = 0; +struct pcm_data *pcm_missing = NULL; + +void timestamp_now(timestamp_t *tstamp) +{ + if (clock_gettime(CLOCK_MONOTONIC_RAW, tstamp)) + ksft_exit_fail_msg("clock_get_time\n"); +} + +long long timestamp_diff_ms(timestamp_t *tstamp) +{ + timestamp_t now, diff; + timestamp_now(&now); + if (tstamp->tv_nsec > now.tv_nsec) { + diff.tv_sec = now.tv_sec - tstamp->tv_sec - 1; + diff.tv_nsec = (now.tv_nsec + 1000000000L) - tstamp->tv_nsec; + } else { + diff.tv_sec = now.tv_sec - tstamp->tv_sec; + diff.tv_nsec = now.tv_nsec - tstamp->tv_nsec; + } + return (diff.tv_sec * 1000) + ((diff.tv_nsec + 500000L) / 1000000L); +} + +#ifdef SND_LIB_VER +#if SND_LIB_VERSION >= SND_LIB_VER(1, 2, 6) +#define LIB_HAS_LOAD_STRING +#endif +#endif + +#ifndef LIB_HAS_LOAD_STRING +static int snd_config_load_string(snd_config_t **config, const char *s, + size_t size) +{ + snd_input_t *input; + snd_config_t *dst; + int err; + + assert(config && s); + if (size == 0) + size = strlen(s); + err = snd_input_buffer_open(&input, s, size); + if (err < 0) + return err; + err = snd_config_top(&dst); + if (err < 0) { + snd_input_close(input); + return err; + } + err = snd_config_load(dst, input); + snd_input_close(input); + if (err < 0) { + snd_config_delete(dst); + return err; + } + *config = dst; + return 0; +} +#endif + +static snd_config_t *get_alsalib_config(void) +{ + snd_config_t *config; + int err; + + err = snd_config_load_string(&config, alsa_config, strlen(alsa_config)); + if (err < 0) { + ksft_print_msg("Unable to parse custom alsa-lib configuration: %s\n", + snd_strerror(err)); + ksft_exit_fail(); + } + return config; +} + +static long device_from_id(snd_config_t *node) +{ + const char *id; + char *end; + long v; + + if (snd_config_get_id(node, &id)) + ksft_exit_fail_msg("snd_config_get_id\n"); + errno = 0; + v = strtol(id, &end, 10); + if (errno || *end) + return -1; + return v; +} + +static void missing_device(int card, int device, int subdevice, snd_pcm_stream_t stream) +{ + struct pcm_data *pcm_data; + + for (pcm_data = pcm_list; pcm_data != NULL; pcm_data = pcm_data->next) { + if (pcm_data->card != card) + continue; + if (pcm_data->device != device) + continue; + if (pcm_data->subdevice != subdevice) + continue; + if (pcm_data->stream != stream) + continue; + return; + } + pcm_data = calloc(1, sizeof(*pcm_data)); + if (!pcm_data) + ksft_exit_fail_msg("Out of memory\n"); + pcm_data->card = card; + pcm_data->device = device; + pcm_data->subdevice = subdevice; + pcm_data->stream = stream; + pcm_data->next = pcm_missing; + pcm_missing = pcm_data; + num_missing++; +} + +static void missing_devices(int card, snd_config_t *card_config) +{ + snd_config_t *pcm_config, *node1, *node2; + snd_config_iterator_t i1, i2, next1, next2; + int device, subdevice; + + pcm_config = conf_get_subtree(card_config, "pcm", NULL); + if (!pcm_config) + return; + snd_config_for_each(i1, next1, pcm_config) { + node1 = snd_config_iterator_entry(i1); + device = device_from_id(node1); + if (device < 0) + continue; + if (snd_config_get_type(node1) != SND_CONFIG_TYPE_COMPOUND) + continue; + snd_config_for_each(i2, next2, node1) { + node2 = snd_config_iterator_entry(i2); + subdevice = device_from_id(node2); + if (subdevice < 0) + continue; + if (conf_get_subtree(node2, "PLAYBACK", NULL)) + missing_device(card, device, subdevice, SND_PCM_STREAM_PLAYBACK); + if (conf_get_subtree(node2, "CAPTURE", NULL)) + missing_device(card, device, subdevice, SND_PCM_STREAM_CAPTURE); + } + } +} + +static void find_pcms(void) +{ + char name[32], key[64]; + int card, dev, subdev, count, direction, err; + snd_pcm_stream_t stream; + struct pcm_data *pcm_data; + snd_ctl_t *handle; + snd_pcm_info_t *pcm_info; + snd_config_t *config, *card_config, *pcm_config; + + snd_pcm_info_alloca(&pcm_info); + + card = -1; + if (snd_card_next(&card) < 0 || card < 0) + return; + + config = get_alsalib_config(); + + while (card >= 0) { + sprintf(name, "hw:%d", card); + + err = snd_ctl_open_lconf(&handle, name, 0, config); + if (err < 0) { + ksft_print_msg("Failed to get hctl for card %d: %s\n", + card, snd_strerror(err)); + goto next_card; + } + + card_config = conf_by_card(card); + + dev = -1; + while (1) { + if (snd_ctl_pcm_next_device(handle, &dev) < 0) + ksft_exit_fail_msg("snd_ctl_pcm_next_device\n"); + if (dev < 0) + break; + + for (direction = 0; direction < 2; direction++) { + stream = direction ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK; + sprintf(key, "pcm.%d.%s", dev, snd_pcm_stream_name(stream)); + pcm_config = conf_get_subtree(card_config, key, NULL); + if (conf_get_bool(card_config, key, "skip", false)) { + ksft_print_msg("skipping pcm %d.%d.%s\n", card, dev, snd_pcm_stream_name(stream)); + continue; + } + snd_pcm_info_set_device(pcm_info, dev); + snd_pcm_info_set_subdevice(pcm_info, 0); + snd_pcm_info_set_stream(pcm_info, stream); + err = snd_ctl_pcm_info(handle, pcm_info); + if (err == -ENOENT) + continue; + if (err < 0) + ksft_exit_fail_msg("snd_ctl_pcm_info: %d:%d:%d\n", + dev, 0, stream); + count = snd_pcm_info_get_subdevices_count(pcm_info); + for (subdev = 0; subdev < count; subdev++) { + sprintf(key, "pcm.%d.%d.%s", dev, subdev, snd_pcm_stream_name(stream)); + if (conf_get_bool(card_config, key, "skip", false)) { + ksft_print_msg("skipping pcm %d.%d.%d.%s\n", card, dev, + subdev, snd_pcm_stream_name(stream)); + continue; + } + pcm_data = calloc(1, sizeof(*pcm_data)); + if (!pcm_data) + ksft_exit_fail_msg("Out of memory\n"); + pcm_data->card = card; + pcm_data->device = dev; + pcm_data->subdevice = subdev; + pcm_data->stream = stream; + pcm_data->pcm_config = conf_get_subtree(card_config, key, NULL); + pcm_data->next = pcm_list; + pcm_list = pcm_data; + num_pcms++; + } + } + } + + /* check for missing devices */ + missing_devices(card, card_config); + + next_card: + snd_ctl_close(handle); + if (snd_card_next(&card) < 0) { + ksft_print_msg("snd_card_next"); + break; + } + } + + snd_config_delete(config); +} + +static void test_pcm_time1(struct pcm_data *data, + const char *cfg_prefix, const char *sformat, + long srate, long schannels, + long speriod_size, long sbuffer_size) +{ + char name[64], key[128], msg[256]; + const char *cs; + int i, err; + snd_pcm_t *handle = NULL; + snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; + snd_pcm_format_t format; + unsigned char *samples = NULL; + snd_pcm_sframes_t frames; + long long ms; + long rate, channels, period_size, buffer_size; + unsigned int rrate; + snd_pcm_uframes_t rperiod_size, rbuffer_size, start_threshold; + timestamp_t tstamp; + bool pass = false, automatic = true; + snd_pcm_hw_params_t *hw_params; + snd_pcm_sw_params_t *sw_params; + + snd_pcm_hw_params_alloca(&hw_params); + snd_pcm_sw_params_alloca(&sw_params); + + cs = conf_get_string(data->pcm_config, cfg_prefix, "format", sformat); + format = snd_pcm_format_value(cs); + if (format == SND_PCM_FORMAT_UNKNOWN) + ksft_exit_fail_msg("Wrong format '%s'\n", cs); + rate = conf_get_long(data->pcm_config, cfg_prefix, "rate", srate); + channels = conf_get_long(data->pcm_config, cfg_prefix, "channels", schannels); + period_size = conf_get_long(data->pcm_config, cfg_prefix, "period_size", speriod_size); + buffer_size = conf_get_long(data->pcm_config, cfg_prefix, "buffer_size", sbuffer_size); + + automatic = strcmp(sformat, snd_pcm_format_name(format)) == 0 && + srate == rate && + schannels == channels && + speriod_size == period_size && + sbuffer_size == buffer_size; + + samples = malloc((rate * channels * snd_pcm_format_physical_width(format)) / 8); + if (!samples) + ksft_exit_fail_msg("Out of memory\n"); + snd_pcm_format_set_silence(format, samples, rate * channels); + + sprintf(name, "hw:%d,%d,%d", data->card, data->device, data->subdevice); + err = snd_pcm_open(&handle, name, data->stream, 0); + if (err < 0) { + snprintf(msg, sizeof(msg), "Failed to get pcm handle: %s", snd_strerror(err)); + goto __close; + } + + err = snd_pcm_hw_params_any(handle, hw_params); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_any: %s", snd_strerror(err)); + goto __close; + } + err = snd_pcm_hw_params_set_rate_resample(handle, hw_params, 0); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_rate_resample: %s", snd_strerror(err)); + goto __close; + } + err = snd_pcm_hw_params_set_access(handle, hw_params, access); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_access %s: %s", + snd_pcm_access_name(access), snd_strerror(err)); + goto __close; + } +__format: + err = snd_pcm_hw_params_set_format(handle, hw_params, format); + if (err < 0) { + if (automatic && format == SND_PCM_FORMAT_S16_LE) { + format = SND_PCM_FORMAT_S32_LE; + ksft_print_msg("%s.%d.%d.%d.%s.%s format S16_LE -> S32_LE\n", + cfg_prefix, + data->card, data->device, data->subdevice, + snd_pcm_stream_name(data->stream), + snd_pcm_access_name(access)); + } + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_format %s: %s", + snd_pcm_format_name(format), snd_strerror(err)); + goto __close; + } + err = snd_pcm_hw_params_set_channels(handle, hw_params, channels); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_channels %ld: %s", channels, snd_strerror(err)); + goto __close; + } + rrate = rate; + err = snd_pcm_hw_params_set_rate_near(handle, hw_params, &rrate, 0); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_rate %ld: %s", rate, snd_strerror(err)); + goto __close; + } + if (rrate != rate) { + snprintf(msg, sizeof(msg), "rate mismatch %ld != %ld", rate, rrate); + goto __close; + } + rperiod_size = period_size; + err = snd_pcm_hw_params_set_period_size_near(handle, hw_params, &rperiod_size, 0); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_period_size %ld: %s", period_size, snd_strerror(err)); + goto __close; + } + rbuffer_size = buffer_size; + err = snd_pcm_hw_params_set_buffer_size_near(handle, hw_params, &rbuffer_size); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_buffer_size %ld: %s", buffer_size, snd_strerror(err)); + goto __close; + } + err = snd_pcm_hw_params(handle, hw_params); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_hw_params: %s", snd_strerror(err)); + goto __close; + } + + err = snd_pcm_sw_params_current(handle, sw_params); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_sw_params_current: %s", snd_strerror(err)); + goto __close; + } + if (data->stream == SND_PCM_STREAM_PLAYBACK) { + start_threshold = (rbuffer_size / rperiod_size) * rperiod_size; + } else { + start_threshold = rperiod_size; + } + err = snd_pcm_sw_params_set_start_threshold(handle, sw_params, start_threshold); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_sw_params_set_start_threshold %ld: %s", (long)start_threshold, snd_strerror(err)); + goto __close; + } + err = snd_pcm_sw_params_set_avail_min(handle, sw_params, rperiod_size); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_sw_params_set_avail_min %ld: %s", (long)rperiod_size, snd_strerror(err)); + goto __close; + } + err = snd_pcm_sw_params(handle, sw_params); + if (err < 0) { + snprintf(msg, sizeof(msg), "snd_pcm_sw_params: %s", snd_strerror(err)); + goto __close; + } + + ksft_print_msg("%s.%d.%d.%d.%s hw_params.%s.%s.%ld.%ld.%ld.%ld sw_params.%ld\n", + cfg_prefix, + data->card, data->device, data->subdevice, + snd_pcm_stream_name(data->stream), + snd_pcm_access_name(access), + snd_pcm_format_name(format), + (long)rate, (long)channels, + (long)rperiod_size, (long)rbuffer_size, + (long)start_threshold); + + timestamp_now(&tstamp); + for (i = 0; i < 4; i++) { + if (data->stream == SND_PCM_STREAM_PLAYBACK) { + frames = snd_pcm_writei(handle, samples, rate); + if (frames < 0) { + snprintf(msg, sizeof(msg), + "Write failed: expected %d, wrote %li", rate, frames); + goto __close; + } + if (frames < rate) { + snprintf(msg, sizeof(msg), + "expected %d, wrote %li", rate, frames); + goto __close; + } + } else { + frames = snd_pcm_readi(handle, samples, rate); + if (frames < 0) { + snprintf(msg, sizeof(msg), + "expected %d, wrote %li", rate, frames); + goto __close; + } + if (frames < rate) { + snprintf(msg, sizeof(msg), + "expected %d, wrote %li", rate, frames); + goto __close; + } + } + } + + snd_pcm_drain(handle); + ms = timestamp_diff_ms(&tstamp); + if (ms < 3900 || ms > 4100) { + snprintf(msg, sizeof(msg), "time mismatch: expected 4000ms got %lld", ms); + goto __close; + } + + msg[0] = '\0'; + pass = true; +__close: + ksft_test_result(pass, "%s.%d.%d.%d.%s%s%s\n", + cfg_prefix, + data->card, data->device, data->subdevice, + snd_pcm_stream_name(data->stream), + msg[0] ? " " : "", msg); + free(samples); + if (handle) + snd_pcm_close(handle); +} + +#define TESTS_PER_PCM 2 + +int main(void) +{ + struct pcm_data *pcm; + + ksft_print_header(); + + conf_load(); + + find_pcms(); + + ksft_set_plan(num_missing + num_pcms * TESTS_PER_PCM); + + for (pcm = pcm_missing; pcm != NULL; pcm = pcm->next) { + ksft_test_result(false, "test.missing.%d.%d.%d.%s\n", + pcm->card, pcm->device, pcm->subdevice, + snd_pcm_stream_name(pcm->stream)); + } + + for (pcm = pcm_list; pcm != NULL; pcm = pcm->next) { + test_pcm_time1(pcm, "test.time1", "S16_LE", 48000, 2, 512, 4096); + test_pcm_time1(pcm, "test.time2", "S16_LE", 48000, 2, 24000, 192000); + } + + conf_free(); + + ksft_exit_pass(); + + return 0; +} -- 2.35.3

3 5

[PATCH] ALSA: usb-audio: Add quirk for Tascam Model 12
by John Keeping 29 Nov '22

29 Nov '22

Tascam's Model 12 is a mixer which can also operate as a USB audio interface. The audio interface uses explicit feedback but it seems that it does not correctly handle missing isochronous frames. When injecting an xrun (or doing anything else that pauses the playback stream) the feedback rate climbs (for example, at 44,100Hz nominal, I see a stable rate around 44,099 but xrun injection sees this peak at around 44,135 in most cases) and glitches are heard in the audio stream for several seconds - this is significantly worse than the single glitch expected for an underrun. While the stream does normally recover and the feedback rate returns to a stable value, I have seen some occurrences where this does not happen and the rate continues to increase while no audio is heard from the output. I have not found a solid reproduction for this. This misbehaviour can be avoided by totally resetting the stream state by switching the interface to alt 0 and back before restarting the playback stream. Add a new quirk flag which forces the endpoint and interface to be reconfigured whenever the stream is stopped, and use this for the Tascam Model 12. Signed-off-by: John Keeping <john(a)metanate.com> --- sound/usb/endpoint.c | 7 +++++++ sound/usb/quirks.c | 2 ++ sound/usb/usbaudio.h | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 310cd6fb0038..ab248d554774 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1673,6 +1673,13 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, bool keep_pending) stop_urbs(ep, false, keep_pending); if (ep->clock_ref) atomic_dec(&ep->clock_ref->locked); + + if (ep->chip->quirk_flags & QUIRK_FLAG_FORCE_IFACE_RESET && + usb_pipeout(ep->pipe)) { + ep->need_setup = true; + if (ep->iface_ref) + ep->iface_ref->need_setup = true; + } } } diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0f4dd3503a6a..58b37bfc885c 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2044,6 +2044,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { DEVICE_FLG(0x0644, 0x804a, /* TEAC UD-301 */ QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY), + DEVICE_FLG(0x0644, 0x805f, /* TEAC Model 12 */ + QUIRK_FLAG_FORCE_IFACE_RESET), DEVICE_FLG(0x06f8, 0xb000, /* Hercules DJ Console (Windows Edition) */ QUIRK_FLAG_IGNORE_CTL_ERROR), DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */ diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index e97141ef730a..2aba508a4831 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -172,6 +172,9 @@ extern bool snd_usb_skip_validation; * Don't apply implicit feedback sync mode * QUIRK_FLAG_IFACE_SKIP_CLOSE * Don't closed interface during setting sample rate + * QUIRK_FLAG_FORCE_IFACE_RESET + * Force an interface reset whenever stopping & restarting a stream + * (e.g. after xrun) */ #define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0) @@ -194,5 +197,6 @@ extern bool snd_usb_skip_validation; #define QUIRK_FLAG_GENERIC_IMPLICIT_FB (1U << 17) #define QUIRK_FLAG_SKIP_IMPLICIT_FB (1U << 18) #define QUIRK_FLAG_IFACE_SKIP_CLOSE (1U << 19) +#define QUIRK_FLAG_FORCE_IFACE_RESET (1U << 20) #endif /* __USBAUDIO_H */ -- 2.38.1

2 3

[PATCH] ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook
by Andy Chi 29 Nov '22

29 Nov '22

There is a HP ProBook which using ALC236 codec and need the ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF quirk to make mute LED and micmute LED work. Signed-off-by: Andy Chi <andy.chi(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e5c036385666..cf7c825078dc 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9354,6 +9354,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x8abb, "HP ZBook Firefly 14 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8ad1, "HP EliteBook 840 14 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8ad2, "HP EliteBook 860 16 inch G9 Notebook PC", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8b5d, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), + SND_PCI_QUIRK(0x103c, 0x8b5e, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), -- 2.34.1

2 1

[PATCH 1/2] ASoC: qcom: lpass-sc7180: Drop unnecessary initialization in _resume()
by Matthias Kaehlcke 29 Nov '22

29 Nov '22

The initialization of the variable 'ret' in sc7180_lpass_dev_resume() is unnecessary, as it is always assigned a few lines below. Drop the initialization. Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- sound/soc/qcom/lpass-sc7180.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index 9c3365ddc274..7a81e609727c 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -165,7 +165,7 @@ static int sc7180_lpass_exit(struct platform_device *pdev) static int sc7180_lpass_dev_resume(struct device *dev) { - int ret = 0; + int ret; struct lpass_data *drvdata = dev_get_drvdata(dev); ret = clk_bulk_prepare_enable(drvdata->num_clks, drvdata->clks); -- 2.38.1.584.g0f3c55d4c2-goog

2 4

[PATCH AUTOSEL 4.9 5/5] ASoC: soc-pcm: Add NULL check in BE reparenting
by Sasha Levin 28 Nov '22

28 Nov '22

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> [ Upstream commit db8f91d424fe0ea6db337aca8bc05908bbce1498 ] Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Link: https://lore.kernel.org/r/1669098673-29703-1-git-send-email-quic_srivasam@q… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 6c31a909845c..f6cebe2b3cbb 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1182,6 +1182,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; list_for_each_entry(dpcm, &be->dpcm[stream].fe_clients, list_fe) { if (dpcm->fe == fe) -- 2.35.1

1 0

[PATCH AUTOSEL 4.9 4/5] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Sasha Levin 28 Nov '22

28 Nov '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 4c8cbcd89887..42f4aa841051 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -126,15 +126,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -163,8 +167,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH AUTOSEL 4.14 7/9] ASoC: soc-pcm: Add NULL check in BE reparenting
by Sasha Levin 28 Nov '22

28 Nov '22

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> [ Upstream commit db8f91d424fe0ea6db337aca8bc05908bbce1498 ] Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Link: https://lore.kernel.org/r/1669098673-29703-1-git-send-email-quic_srivasam@q… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e995e96ab903..3a9c875534c1 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1168,6 +1168,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; list_for_each_entry(dpcm, &be->dpcm[stream].fe_clients, list_fe) { if (dpcm->fe == fe) -- 2.35.1

1 0

[PATCH AUTOSEL 4.14 6/9] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Sasha Levin 28 Nov '22

28 Nov '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index ab1112e90f88..6f413c711535 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -126,15 +126,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -163,8 +167,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH AUTOSEL 4.19 08/12] ASoC: soc-pcm: Add NULL check in BE reparenting
by Sasha Levin 28 Nov '22

28 Nov '22

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> [ Upstream commit db8f91d424fe0ea6db337aca8bc05908bbce1498 ] Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Link: https://lore.kernel.org/r/1669098673-29703-1-git-send-email-quic_srivasam@q… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index c03b653bf6ff..1fabb285b016 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1266,6 +1266,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; list_for_each_entry(dpcm, &be->dpcm[stream].fe_clients, list_fe) { if (dpcm->fe == fe) -- 2.35.1

1 0

[PATCH AUTOSEL 4.19 07/12] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Sasha Levin 28 Nov '22

28 Nov '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 5b0388202bac..ac854beb8347 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -126,15 +126,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -163,8 +167,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH AUTOSEL 5.4 12/16] ASoC: soc-pcm: Add NULL check in BE reparenting
by Sasha Levin 28 Nov '22

28 Nov '22

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> [ Upstream commit db8f91d424fe0ea6db337aca8bc05908bbce1498 ] Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Link: https://lore.kernel.org/r/1669098673-29703-1-git-send-email-quic_srivasam@q… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 1196167364d4..2f1ab70a68fc 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1201,6 +1201,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) -- 2.35.1

1 0

[PATCH AUTOSEL 5.4 10/16] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Sasha Levin 28 Nov '22

28 Nov '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 65db1a7c77b7..bb76a2dd0a2f 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -112,15 +112,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -149,8 +153,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 14/19] ASoC: soc-pcm: Add NULL check in BE reparenting
by Sasha Levin 28 Nov '22

28 Nov '22

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> [ Upstream commit db8f91d424fe0ea6db337aca8bc05908bbce1498 ] Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Link: https://lore.kernel.org/r/1669098673-29703-1-git-send-email-quic_srivasam@q… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8b8a9aca2912..9a60d62f12fe 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1159,6 +1159,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 12/19] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Sasha Levin 28 Nov '22

28 Nov '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index 65db1a7c77b7..bb76a2dd0a2f 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -112,15 +112,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -149,8 +153,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 08/19] ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register
by Sasha Levin 28 Nov '22

28 Nov '22

From: Chancel Liu <chancel.liu(a)nxp.com> [ Upstream commit 3ca507bf99611c82dafced73e921c1b10ee12869 ] DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate correct frequency of LRCLK and BCLK. Sometimes the read-only value can't be updated timely after enabling SYSCLK. This results in wrong calculation values. Delay is introduced here to wait for newest value from register. The time of the delay should be at least 500~1000us according to test. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20221109121354.123958-1-chancel.liu@nxp.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm8962.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 21574447650c..57aeded978c2 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2489,6 +2489,14 @@ static void wm8962_configure_bclk(struct snd_soc_component *component) snd_soc_component_update_bits(component, WM8962_CLOCKING2, WM8962_SYSCLK_ENA_MASK, WM8962_SYSCLK_ENA); + /* DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate + * correct frequency of LRCLK and BCLK. Sometimes the read-only value + * can't be updated timely after enabling SYSCLK. This results in wrong + * calculation values. Delay is introduced here to wait for newest + * value from register. The time of the delay should be at least + * 500~1000us according to test. + */ + usleep_range(500, 1000); dspclk = snd_soc_component_read(component, WM8962_CLOCKING1); if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON) -- 2.35.1

1 0

[PATCH] ASoC: mediatek: mt8173: Enable IRQ when pdata is ready
by Ricardo Ribalda 28 Nov '22

28 Nov '22

If the device does not come straight from reset, we might receive an IRQ before we are ready to handle it. Fixes: [ 2.334737] Unable to handle kernel read from unreadable memory at virtual address 00000000000001e4 [ 2.522601] Call trace: [ 2.525040] regmap_read+0x1c/0x80 [ 2.528434] mt8173_afe_irq_handler+0x40/0xf0 ... [ 2.598921] start_kernel+0x338/0x42c Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- To: Liam Girdwood <lgirdwood(a)gmail.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> To: Matthias Brugger <matthias.bgg(a)gmail.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-mediatek(a)lists.infradead.org Cc: linux-kernel(a)vger.kernel.org --- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c index dcaeeeb8aac7..bc155dd937e0 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c @@ -1070,16 +1070,6 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) afe->dev = &pdev->dev; - irq_id = platform_get_irq(pdev, 0); - if (irq_id <= 0) - return irq_id < 0 ? irq_id : -ENXIO; - ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler, - 0, "Afe_ISR_Handle", (void *)afe); - if (ret) { - dev_err(afe->dev, "could not request_irq\n"); - return ret; - } - afe->base_addr = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(afe->base_addr)) return PTR_ERR(afe->base_addr); @@ -1185,6 +1175,16 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) if (ret) goto err_cleanup_components; + irq_id = platform_get_irq(pdev, 0); + if (irq_id <= 0) + return irq_id < 0 ? irq_id : -ENXIO; + ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler, + 0, "Afe_ISR_Handle", (void *)afe); + if (ret) { + dev_err(afe->dev, "could not request_irq\n"); + goto err_pm_disable; + } + dev_info(&pdev->dev, "MT8173 AFE driver initialized.\n"); return 0; --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221128-mt8173-afe-5fda4512e8b5 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

3 4

[PATCH AUTOSEL 5.15 19/24] ASoC: soc-pcm: Add NULL check in BE reparenting
by Sasha Levin 28 Nov '22

28 Nov '22

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> [ Upstream commit db8f91d424fe0ea6db337aca8bc05908bbce1498 ] Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Link: https://lore.kernel.org/r/1669098673-29703-1-git-send-email-quic_srivasam@q… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 48f71bb81a2f..de837bacf219 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1171,6 +1171,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 16/24] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Sasha Levin 28 Nov '22

28 Nov '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index b7aee23fc387..47ef6bc30c0e 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -113,15 +113,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -151,8 +155,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 13/24] ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions
by Sasha Levin 28 Nov '22

28 Nov '22

From: Shuming Fan <shumingf(a)realtek.com> [ Upstream commit c7d7d4e7bb1290cc473610b0bb96d9fa606d00e7 ] Due to the hardware behavior, it takes some time for CBJ detection/impedance sensing/de-bounce. The ClockStop_NotFinished flag will be raised until these functions are completed. In ClockStopMode0 mode case, the SdW controller might check this flag from D3 to D0 when the jack detection interrupt happened. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> Link: https://lore.kernel.org/r/20221116090318.5017-1-shumingf@realtek.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt711-sdca-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c index a085b2f530aa..31e77d462ef3 100644 --- a/sound/soc/codecs/rt711-sdca-sdw.c +++ b/sound/soc/codecs/rt711-sdca-sdw.c @@ -230,7 +230,7 @@ static int rt711_sdca_read_prop(struct sdw_slave *slave) } /* set the timeout values */ - prop->clk_stop_timeout = 20; + prop->clk_stop_timeout = 700; /* wake-up event */ prop->wake_capable = 1; -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 10/24] ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register
by Sasha Levin 28 Nov '22

28 Nov '22

From: Chancel Liu <chancel.liu(a)nxp.com> [ Upstream commit 3ca507bf99611c82dafced73e921c1b10ee12869 ] DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate correct frequency of LRCLK and BCLK. Sometimes the read-only value can't be updated timely after enabling SYSCLK. This results in wrong calculation values. Delay is introduced here to wait for newest value from register. The time of the delay should be at least 500~1000us according to test. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20221109121354.123958-1-chancel.liu@nxp.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm8962.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 09a73b854964..779f7097d336 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2490,6 +2490,14 @@ static void wm8962_configure_bclk(struct snd_soc_component *component) snd_soc_component_update_bits(component, WM8962_CLOCKING2, WM8962_SYSCLK_ENA_MASK, WM8962_SYSCLK_ENA); + /* DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate + * correct frequency of LRCLK and BCLK. Sometimes the read-only value + * can't be updated timely after enabling SYSCLK. This results in wrong + * calculation values. Delay is introduced here to wait for newest + * value from register. The time of the delay should be at least + * 500~1000us according to test. + */ + usleep_range(500, 1000); dspclk = snd_soc_component_read(component, WM8962_CLOCKING1); if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON) -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 30/39] ASoC: soc-pcm: Add NULL check in BE reparenting
by Sasha Levin 28 Nov '22

28 Nov '22

From: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> [ Upstream commit db8f91d424fe0ea6db337aca8bc05908bbce1498 ] Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> Link: https://lore.kernel.org/r/1669098673-29703-1-git-send-email-quic_srivasam@q… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 4d9b91e7e14f..91a1bfe00d9b 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1247,6 +1247,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 22/39] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Sasha Levin 28 Nov '22

28 Nov '22

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit 05530ef7cf7c7d700f6753f058999b1b5099a026 ] With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> Link: https://lore.kernel.org/r/20221118232346.never.380-kees@kernel.org Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index b7aee23fc387..47ef6bc30c0e 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -113,15 +113,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -151,8 +155,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 19/39] ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions
by Sasha Levin 28 Nov '22

28 Nov '22

From: Shuming Fan <shumingf(a)realtek.com> [ Upstream commit c7d7d4e7bb1290cc473610b0bb96d9fa606d00e7 ] Due to the hardware behavior, it takes some time for CBJ detection/impedance sensing/de-bounce. The ClockStop_NotFinished flag will be raised until these functions are completed. In ClockStopMode0 mode case, the SdW controller might check this flag from D3 to D0 when the jack detection interrupt happened. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> Link: https://lore.kernel.org/r/20221116090318.5017-1-shumingf@realtek.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/rt711-sdca-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c index a085b2f530aa..31e77d462ef3 100644 --- a/sound/soc/codecs/rt711-sdca-sdw.c +++ b/sound/soc/codecs/rt711-sdca-sdw.c @@ -230,7 +230,7 @@ static int rt711_sdca_read_prop(struct sdw_slave *slave) } /* set the timeout values */ - prop->clk_stop_timeout = 20; + prop->clk_stop_timeout = 700; /* wake-up event */ prop->wake_capable = 1; -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 16/39] ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register
by Sasha Levin 28 Nov '22

28 Nov '22

From: Chancel Liu <chancel.liu(a)nxp.com> [ Upstream commit 3ca507bf99611c82dafced73e921c1b10ee12869 ] DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate correct frequency of LRCLK and BCLK. Sometimes the read-only value can't be updated timely after enabling SYSCLK. This results in wrong calculation values. Delay is introduced here to wait for newest value from register. The time of the delay should be at least 500~1000us according to test. Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Link: https://lore.kernel.org/r/20221109121354.123958-1-chancel.liu@nxp.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/codecs/wm8962.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 6df06fba4377..ee1cad5af535 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2503,6 +2503,14 @@ static void wm8962_configure_bclk(struct snd_soc_component *component) snd_soc_component_update_bits(component, WM8962_CLOCKING2, WM8962_SYSCLK_ENA_MASK, WM8962_SYSCLK_ENA); + /* DSPCLK_DIV field in WM8962_CLOCKING1 register is used to generate + * correct frequency of LRCLK and BCLK. Sometimes the read-only value + * can't be updated timely after enabling SYSCLK. This results in wrong + * calculation values. Delay is introduced here to wait for newest + * value from register. The time of the delay should be at least + * 500~1000us according to test. + */ + usleep_range(500, 1000); dspclk = snd_soc_component_read(component, WM8962_CLOCKING1); if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON) -- 2.35.1

1 0

[PATCH v2 1/2] ASoC: ops: Correct bounds check for second channel on SX controls
by Charles Keepax 28 Nov '22

28 Nov '22

Currently the check against the max value for the control is being applied after the value has had the minimum applied and been masked. But the max value simply indicates the number of volume levels on an SX control, and as such should just be applied on the raw value. Fixes: 97eea946b939 ("ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Changes since v1: - Correct fixes SHA. sound/soc/soc-ops.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 1970bda074d8a..55b009d3c6815 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -464,16 +464,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, ret = err; if (snd_soc_volsw_is_stereo(mc)) { - unsigned int val2; - - val_mask = mask << rshift; - val2 = (ucontrol->value.integer.value[1] + min) & mask; + unsigned int val2 = ucontrol->value.integer.value[1]; if (mc->platform_max && val2 > mc->platform_max) return -EINVAL; if (val2 > max) return -EINVAL; + val_mask = mask << rshift; + val2 = (val2 + min) & mask; val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.30.2

2 5

[PATCH v5] ASoC: SOF: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 28 Nov '22

28 Nov '22

During kexec(), the userspace is frozen. Therefore we cannot wait for it to complete. Avoid running snd_sof_machine_unregister during shutdown. This fixes: [ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done. [ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds. [ 246.819035] Call Trace: [ 246.821782] <TASK> [ 246.824186] __schedule+0x5f9/0x1263 [ 246.828231] schedule+0x87/0xc5 [ 246.831779] snd_card_disconnect_sync+0xb5/0x127 ... [ 246.889249] snd_sof_device_shutdown+0xb4/0x150 [ 246.899317] pci_device_shutdown+0x37/0x61 [ 246.903990] device_shutdown+0x14c/0x1d6 [ 246.908391] kernel_kexec+0x45/0xb9 And: [ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds. [ 246.927709] Call Trace: [ 246.930461] <TASK> [ 246.932819] __schedule+0x5f9/0x1263 [ 246.936855] ? fsnotify_grab_connector+0x5c/0x70 [ 246.942045] schedule+0x87/0xc5 [ 246.945567] schedule_timeout+0x49/0xf3 [ 246.949877] wait_for_completion+0x86/0xe8 [ 246.954463] snd_card_free+0x68/0x89 ... [ 247.001080] platform_device_unregister+0x12/0x35 Cc: stable(a)vger.kernel.org Fixes: 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Liam Girdwood <lgirdwood(a)gmail.com> To: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> To: Bard Liao <yung-chuan.liao(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Daniel Baluta <daniel.baluta(a)nxp.com> To: Mark Brown <broonie(a)kernel.org> To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> Cc: sound-open-firmware(a)alsa-project.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org --- Changes in v5: - Edit subject prefix - Link to v4: https://lore.kernel.org/r/20221127-snd-freeze-v4-0-51ca64b7f2ab@chromium.org Changes in v4: - Do not call snd_sof_machine_unregister from shutdown. - Link to v3: https://lore.kernel.org/r/20221127-snd-freeze-v3-0-a2eda731ca14@chromium.org Changes in v3: - Wrap pm_freezing in a function - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- sound/soc/sof/core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 3e6141d03770..9616ba607ded 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -475,19 +475,16 @@ EXPORT_SYMBOL(snd_sof_device_remove); int snd_sof_device_shutdown(struct device *dev) { struct snd_sof_dev *sdev = dev_get_drvdata(dev); - struct snd_sof_pdata *pdata = sdev->pdata; if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) cancel_work_sync(&sdev->probe_work); /* - * make sure clients and machine driver(s) are unregistered to force - * all userspace devices to be closed prior to the DSP shutdown sequence + * make sure clients are unregistered prior to the DSP shutdown + * sequence. */ sof_unregister_clients(sdev); - snd_sof_machine_unregister(sdev, pdata); - if (sdev->fw_state == SOF_FW_BOOT_COMPLETE) return snd_sof_shutdown(sdev); --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

2 2

[PATCH] ASoC: rsnd: adg: use __clk_get_name() instead of local clk_name[]
by Kuninori Morimoto 28 Nov '22

28 Nov '22

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current rsnd_adg_clk_dbg_info() is using locak clk_name[] to ndicating clk name, but we don't want to use local clk_name[] everywhere when we support R-Car Gen4 sound to handling non compatible clk naming. This patch uses __clk_get_name() instead of local clk_name[] for it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/adg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 5f1e72edfee0..ca1e1281cefa 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -648,8 +648,8 @@ void rsnd_adg_clk_dbg_info(struct rsnd_priv *priv, struct seq_file *m) int i; for_each_rsnd_clk(clk, adg, i) - dbg_msg(dev, m, "%s : %pa : %ld\n", - clk_name[i], clk, clk_get_rate(clk)); + dbg_msg(dev, m, "%-18s : %pa : %ld\n", + __clk_get_name(clk), clk, clk_get_rate(clk)); dbg_msg(dev, m, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n", adg->ckr, adg->rbga, adg->rbgb); -- 2.25.1

2 1

[PATCH] ASoC: rt5640: Fix Jack work after system suspend
by Oder Chiou 28 Nov '22

28 Nov '22

We found an corner case in RT5640 codec driver which schedules jack work after system suspend as IRQ was enabled. Due to this, hitting the error as register access happening after suspend as jack worker thread getting scheduled in irq handler. The patch disables the irq during the suspend to prevent the corner case happening. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> Reported-by: Mohan Kumar D <mkumard(a)nvidia.com> --- sound/soc/codecs/rt5640.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 0f8e6dd214b..708e55b7431 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2792,6 +2792,11 @@ static int rt5640_suspend(struct snd_soc_component *component) { struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component); + if (rt5640->irq) { + /* disable jack interrupts during system suspend */ + disable_irq(rt5640->irq); + } + rt5640_cancel_work(rt5640); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF); rt5640_reset(component); @@ -2815,6 +2820,9 @@ static int rt5640_resume(struct snd_soc_component *component) regcache_cache_only(rt5640->regmap, false); regcache_sync(rt5640->regmap); + if (rt5640->irq) + enable_irq(rt5640->irq); + if (rt5640->jack) { if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) { snd_soc_component_update_bits(component, -- 2.34.1

2 1

[PATCH v3 1/9] sound: sdw: Add hw_params to SoundWire config helper function
by Charles Keepax 28 Nov '22

28 Nov '22

The vast majority of the current users of the SoundWire framework have almost identical code for converting from hw_params to SoundWire configuration. Whilst complex devices might require more, it is very likely that most new devices will follow the same pattern. Save a little code by factoring this out into a helper function. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- I was a little bit two minds about whether to make this an inline or not, so any thoughts on that would be super welcome. The function does very little, especially given that SNDRV_PCM_STREAM_PLAYBACK == SDW_DATA_DIR_RX so the if is also really just an assignment. Thanks, Charles Changes since v2: - No difference Changes since v1: - Correct spelling error in commit message include/sound/sdw.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 include/sound/sdw.h diff --git a/include/sound/sdw.h b/include/sound/sdw.h new file mode 100644 index 0000000000000..6dcdb3228dba6 --- /dev/null +++ b/include/sound/sdw.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * linux/sound/sdw.h -- SoundWire helpers for ALSA/ASoC + * + * Copyright (c) 2022 Cirrus Logic Inc. + * + * Author: Charles Keepax <ckeepax(a)opensource.cirrus.com> + */ + +#include <linux/soundwire/sdw.h> +#include <sound/asound.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> + +#ifndef __INCLUDE_SOUND_SDW_H +#define __INCLUDE_SOUND_SDW_H + +/** + * snd_sdw_params_to_config() - Conversion from hw_params to SoundWire config + * + * @substream: Pointer to the PCM substream structure + * @params: Pointer to the hardware params structure + * @stream_config: Stream configuration for the SoundWire audio stream + * @port_config: Port configuration for the SoundWire audio stream + * + * This function provides a basic conversion from the hw_params structure to + * SoundWire configuration structures. The user will at a minimum need to also + * set the port number in the port config, but may also override more of the + * setup, or in the case of a complex user, not use this helper at all and + * open-code everything. + */ +static inline void snd_sdw_params_to_config(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct sdw_stream_config *stream_config, + struct sdw_port_config *port_config) +{ + stream_config->frame_rate = params_rate(params); + stream_config->ch_count = params_channels(params); + stream_config->bps = snd_pcm_format_width(params_format(params)); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + stream_config->direction = SDW_DATA_DIR_RX; + else + stream_config->direction = SDW_DATA_DIR_TX; + + port_config->ch_mask = GENMASK(stream_config->ch_count - 1, 0); +} + +#endif -- 2.30.2

2 9

[PATCH v2 00/11] ASoC: dt-bindings: Rework Qualcomm APR/GPR Sound nodes for SM8450
by Krzysztof Kozlowski 28 Nov '22

28 Nov '22

Changes since v1 ================ 1. Patch 2: Keep compatibles in qcom,apr.yaml. 2. Patch 3: New patch. Description =========== Adding sound support for Qualcomm SM8450 SoC (and later for SC8280XP) brought some changes to APR/GPR services bindings. These bindings are part of qcom,apr.yaml: apr-or-gpr-device-node <- qcom,apr.yaml apr-gpr-service@[0-9] <- qcom,apr.yaml service-specific-components <- /schemas/sound/qcom,q6*.yaml The schema for services (apr-gpr-service@[0-9]) was not complete and is still quite not specific. It allows several incorrect combinations, like adding a clock-controller to a APM device. Restricting it would complicate the schema even more. Bringing new support for sound on Qualcomm SM8450 and SC8280XP SoC would grow it as well. Refactor the bindings before extending them for Qualcomm SM8450 SoC. DTS was sent here: https://lore.kernel.org/linux-arm-msm/20221115110053.110319-1-krzysztof.koz… Best regards, Krzysztof --- Cc: quic_srivasam(a)quicinc.com Cc: quic_plai(a)quicinc.com Krzysztof Kozlowski (11): ASoC: dt-bindings: qcom,apr: Add GLINK channel name for SM8450 ASoC: dt-bindings: qcom,apr: Split services to shared schema ASoC: dt-bindings: qcom,apr: Correct and extend example ASoC: dt-bindings: qcom,q6afe: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Split to separate schema ASoC: dt-bindings: qcom,q6adm: Split to separate schema ASoC: dt-bindings: qcom,q6asm: Split to separate schema ASoC: dt-bindings: qcom,q6prm: Split to separate schema ASoC: dt-bindings: qcom,q6core: Split to separate schema ASoC: dt-bindings: qcom,q6apm-lpass-dais: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Add SM8450 bedais node .../bindings/soc/qcom/qcom,apr-services.yaml | 54 ++++++ .../bindings/soc/qcom/qcom,apr.yaml | 170 ++++++------------ .../bindings/sound/qcom,q6adm-routing.yaml | 22 +-- .../devicetree/bindings/sound/qcom,q6adm.yaml | 51 ++++++ .../devicetree/bindings/sound/qcom,q6afe.yaml | 68 +++++++ .../bindings/sound/qcom,q6apm-dai.yaml | 19 +- .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 32 ++++ .../devicetree/bindings/sound/qcom,q6apm.yaml | 67 +++++++ .../bindings/sound/qcom,q6asm-dais.yaml | 48 ++--- .../devicetree/bindings/sound/qcom,q6asm.yaml | 68 +++++++ .../bindings/sound/qcom,q6core.yaml | 39 ++++ .../sound/qcom,q6dsp-lpass-clocks.yaml | 40 +---- .../sound/qcom,q6dsp-lpass-ports.yaml | 57 +----- .../devicetree/bindings/sound/qcom,q6prm.yaml | 50 ++++++ MAINTAINERS | 2 +- 15 files changed, 515 insertions(+), 272 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6prm.yaml -- 2.34.1

3 23

[PATCH v1 0/4] ADD support for reading position updates from
by V sujith kumar Reddy 28 Nov '22

28 Nov '22

This series consists of 1.Reading postion update from stream box 2.selecting clock source as external ACLK clock 3.ADD virtual HS and SP DAI 4.Add AMD virtual DAI configuration support in sof core. V sujith kumar Reddy (4): ASoC: SOF: amd: Fix for reading position updates from stream box. ASoC: SOF: amd: Fix for selecting clock source as external clock. ASoC: SOF: amd: ADD HS and SP virtual DAI. ASoC: SOF: Add DAI configuration support for AMD platforms. include/sound/sof/dai-amd.h | 1 + include/sound/sof/dai.h | 2 ++ include/uapi/sound/sof/tokens.h | 5 +++++ sound/soc/sof/amd/acp-common.c | 1 + sound/soc/sof/amd/acp-ipc.c | 30 ++++++++++++++++++++++++++- sound/soc/sof/amd/acp.c | 4 +++- sound/soc/sof/amd/acp.h | 12 +++++++++++ sound/soc/sof/amd/rembrandt.c | 16 +++++++++++++++ sound/soc/sof/amd/renoir.c | 16 +++++++++++++++ sound/soc/sof/ipc3-pcm.c | 2 ++ sound/soc/sof/ipc3-topology.c | 36 +++++++++++++++++++++++++-------- sound/soc/sof/sof-audio.h | 1 + sound/soc/sof/topology.c | 10 +++++++++ 13 files changed, 126 insertions(+), 10 deletions(-) -- 2.25.1

2 6

[PATCH] ASoC: max9867: Implement exact integer mode
by Pavel Dobias 28 Nov '22

28 Nov '22

For 8kHz and 16kHz sample rates and certain PCLK values the codec can be programmed to operate in exact integer mode. If available, use it to achieve the exact sample rate. Signed-off-by: Pavel Dobias <dobias(a)2n.com> --- sound/soc/codecs/max9867.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 6d2941a9dbd6..e161ab037bf7 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -323,7 +323,7 @@ static int max9867_startup(struct snd_pcm_substream *substream, static int max9867_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - int value; + int value, freq = 0; unsigned long int rate, ratio; struct snd_soc_component *component = dai->component; struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); @@ -373,6 +373,35 @@ static int max9867_dai_hw_params(struct snd_pcm_substream *substream, } regmap_update_bits(max9867->regmap, MAX9867_IFC1B, MAX9867_IFC1B_BCLK_MASK, value); + + /* Exact integer mode available for 8kHz and 16kHz sample rates + * and certain PCLK (prescaled MCLK) values. + */ + if (params_rate(params) == 8000 || + params_rate(params) == 16000) { + switch (max9867->pclk) { + case 12000000: + freq = 0x08; + break; + case 13000000: + freq = 0x0A; + break; + case 16000000: + freq = 0x0C; + break; + case 19200000: + freq = 0x0E; + break; + } + } + if (freq && params_rate(params) == 16000) + freq++; + + /* If exact integer mode not available, the freq value + * remains zero, i.e. normal mode is used. + */ + regmap_update_bits(max9867->regmap, MAX9867_SYSCLK, + MAX9867_FREQ_MASK, freq); } else { /* * digital pll locks on to any externally supplied LRCLK signal @@ -428,8 +457,6 @@ static int max9867_set_dai_sysclk(struct snd_soc_dai *codec_dai, freq); max9867->sysclk = freq; value = value << MAX9867_PSCLK_SHIFT; - /* exact integer mode is not supported */ - value &= ~MAX9867_FREQ_MASK; regmap_update_bits(max9867->regmap, MAX9867_SYSCLK, MAX9867_PSCLK_MASK, value); return 0; -- 2.20.1

2 1

[PATCH] ALSA: pcm: fix tracing reason in hw_ptr_error
by John Keeping 28 Nov '22

28 Nov '22

Strings need to be specially marked in trace events to ensure the content is captured, othewise the trace just shows the value of the pointer. Signed-off-by: John Keeping <john(a)metanate.com> --- sound/core/pcm_trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/core/pcm_trace.h b/sound/core/pcm_trace.h index f18da2050772..350b40b906ca 100644 --- a/sound/core/pcm_trace.h +++ b/sound/core/pcm_trace.h @@ -88,19 +88,19 @@ TRACE_EVENT(hw_ptr_error, __field( unsigned int, device ) __field( unsigned int, number ) __field( unsigned int, stream ) - __field( const char *, reason ) + __string( reason, why ) ), TP_fast_assign( __entry->card = (substream)->pcm->card->number; __entry->device = (substream)->pcm->device; __entry->number = (substream)->number; __entry->stream = (substream)->stream; - __entry->reason = (why); + __assign_str(reason, why); ), TP_printk("pcmC%dD%d%s/sub%d: ERROR: %s", __entry->card, __entry->device, __entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c", - __entry->number, __entry->reason) + __entry->number, __get_str(reason)) ); TRACE_EVENT(applptr, -- 2.38.1

3 3

[PATCH] ALSA: asihpi: fix missing pci_disable_device()
by Liu Shixin 28 Nov '22

28 Nov '22

pci_disable_device() need be called while module exiting, switch to use pcim_enable(), pci_disable_device() will be called in pcim_release(). Fixes: 3285ea10e9b0 ("ALSA: asihpi - Interrelated HPI tidy up.") Signed-off-by: Liu Shixin <liushixin2(a)huawei.com> --- sound/pci/asihpi/hpioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c index bb31b7fe867d..477a5b4b50bc 100644 --- a/sound/pci/asihpi/hpioctl.c +++ b/sound/pci/asihpi/hpioctl.c @@ -361,7 +361,7 @@ int asihpi_adapter_probe(struct pci_dev *pci_dev, pci_dev->device, pci_dev->subsystem_vendor, pci_dev->subsystem_device, pci_dev->devfn); - if (pci_enable_device(pci_dev) < 0) { + if (pcim_enable_device(pci_dev) < 0) { dev_err(&pci_dev->dev, "pci_enable_device failed, disabling device\n"); return -EIO; -- 2.25.1

2 1

[PATCH v3 0/2] ALSA: core: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 28 Nov '22

28 Nov '22

Since 83bfc7e793b5 ("ASoC: SOF: core: unregister clients and machine drivers in .shutdown") we wait for userspace to close its fds. But that will never occur with a frozen userspace (like during kexec()). Lets detect the frozen userpace and act accordingly. To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> To: "Rafael J. Wysocki" <rafael(a)kernel.org> To: Pavel Machek <pavel(a)ucw.cz> To: Len Brown <len.brown(a)intel.com> To: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> To: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> To: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> To: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: "Joel Fernandes (Google)" <joel(a)joelfernandes.org> Cc: linux-pm(a)vger.kernel.org Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- Changes in v3: - Wrap pm_freezing in a function - Link to v2: https://lore.kernel.org/r/20221127-snd-freeze-v2-0-d8a425ea9663@chromium.org Changes in v2: - Only use pm_freezing if CONFIG_FREEZER - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- Ricardo Ribalda (2): freezer: Add processes_frozen() ALSA: core: Fix deadlock when shutdown a frozen userspace include/linux/freezer.h | 2 ++ kernel/freezer.c | 11 +++++++++++ sound/core/init.c | 13 +++++++++++++ 3 files changed, 26 insertions(+) --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

3 7

[PATCH v2] ALSA: core: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 28 Nov '22

28 Nov '22

If the user space is frozen, we cannot wait for it to complete. This fixes: [ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done. [ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds. [ 246.819035] Call Trace: [ 246.821782] <TASK> [ 246.824186] __schedule+0x5f9/0x1263 [ 246.828231] schedule+0x87/0xc5 [ 246.831779] snd_card_disconnect_sync+0xb5/0x127 ... [ 246.889249] snd_sof_device_shutdown+0xb4/0x150 [ 246.899317] pci_device_shutdown+0x37/0x61 [ 246.903990] device_shutdown+0x14c/0x1d6 [ 246.908391] kernel_kexec+0x45/0xb9 And [ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds. [ 246.927709] Call Trace: [ 246.930461] <TASK> [ 246.932819] __schedule+0x5f9/0x1263 [ 246.936855] ? fsnotify_grab_connector+0x5c/0x70 [ 246.942045] schedule+0x87/0xc5 [ 246.945567] schedule_timeout+0x49/0xf3 [ 246.949877] wait_for_completion+0x86/0xe8 [ 246.954463] snd_card_free+0x68/0x89 ... [ 247.001080] platform_device_unregister+0x12/0x35 Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: "Joel Fernandes (Google)" <joel(a)joelfernandes.org> --- Changes in v2: - Only use pm_freezing if CONFIG_FREEZER - Link to v1: https://lore.kernel.org/r/20221127-snd-freeze-v1-0-57461a366ec2@chromium.org --- sound/core/init.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sound/core/init.c b/sound/core/init.c index 5377f94eb211..35fb71177fea 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/file.h> +#include <linux/freezer.h> #include <linux/slab.h> #include <linux/time.h> #include <linux/ctype.h> @@ -573,6 +574,13 @@ void snd_card_disconnect_sync(struct snd_card *card) return; } +#ifdef CONFIG_FREEZER + if (pm_freezing) { + dev_err(card->dev, "Userspace is frozen, skipping sync\n"); + return; + } +#endif + spin_lock_irq(&card->files_lock); wait_event_lock_irq(card->remove_sleep, list_empty(&card->files_list), @@ -658,6 +666,15 @@ int snd_card_free(struct snd_card *card) ret = snd_card_free_when_closed(card); if (ret) return ret; + +#ifdef CONFIG_FREEZER + /* + * If userspace is frozen the wait from completion will never end. + */ + if (pm_freezing) + return 0; +#endif + /* wait, until all devices are ready for the free operation */ wait_for_completion(&released); --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

2 1

[PATCH] ALSA: core: Fix deadlock when shutdown a frozen userspace
by Ricardo Ribalda 28 Nov '22

28 Nov '22

If the user space is frozen, we cannot wait for it to complete. This fixes: [ 84.943749] Freezing user space processes ... (elapsed 0.111 seconds) done. [ 246.784446] INFO: task kexec-lite:5123 blocked for more than 122 seconds. [ 246.819035] Call Trace: [ 246.821782] <TASK> [ 246.824186] __schedule+0x5f9/0x1263 [ 246.828231] schedule+0x87/0xc5 [ 246.831779] snd_card_disconnect_sync+0xb5/0x127 ... [ 246.889249] snd_sof_device_shutdown+0xb4/0x150 [ 246.899317] pci_device_shutdown+0x37/0x61 [ 246.903990] device_shutdown+0x14c/0x1d6 [ 246.908391] kernel_kexec+0x45/0xb9 And [ 246.893222] INFO: task kexec-lite:4891 blocked for more than 122 seconds. [ 246.927709] Call Trace: [ 246.930461] <TASK> [ 246.932819] __schedule+0x5f9/0x1263 [ 246.936855] ? fsnotify_grab_connector+0x5c/0x70 [ 246.942045] schedule+0x87/0xc5 [ 246.945567] schedule_timeout+0x49/0xf3 [ 246.949877] wait_for_completion+0x86/0xe8 [ 246.954463] snd_card_free+0x68/0x89 ... [ 247.001080] platform_device_unregister+0x12/0x35 Signed-off-by: Ricardo Ribalda <ribalda(a)chromium.org> --- To: Jaroslav Kysela <perex(a)perex.cz> To: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: "Joel Fernandes (Google)" <joel(a)joelfernandes.org> --- sound/core/init.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/core/init.c b/sound/core/init.c index 5377f94eb211..f614a2cdea3d 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/file.h> +#include <linux/freezer.h> #include <linux/slab.h> #include <linux/time.h> #include <linux/ctype.h> @@ -573,6 +574,11 @@ void snd_card_disconnect_sync(struct snd_card *card) return; } + if (pm_freezing) { + dev_err(card->dev, "Userspace is frozen, skipping sync\n"); + return; + } + spin_lock_irq(&card->files_lock); wait_event_lock_irq(card->remove_sleep, list_empty(&card->files_list), @@ -658,6 +664,13 @@ int snd_card_free(struct snd_card *card) ret = snd_card_free_when_closed(card); if (ret) return ret; + + /* + * If userspace is frozen the wait from completion will never end. + */ + if (pm_freezing) + return 0; + /* wait, until all devices are ready for the free operation */ wait_for_completion(&released); --- base-commit: 4312098baf37ee17a8350725e6e0d0e8590252d4 change-id: 20221127-snd-freeze-1ee143228326 Best regards, -- Ricardo Ribalda <ribalda(a)chromium.org>

2 1

[PATCH 1/2] ASoC: tas5805m: rework to avoid scheduling while atomic.
by Daniel Beer 27 Nov '22

27 Nov '22

There's some setup we need to do in order to get the DSP initialized, and this can't be done until a bit-clock is ready. In an earlier version of this driver, this work was done in a DAPM callback. The DAPM callback doesn't guarantee that the bit-clock is running, so the work was moved instead to the trigger callback. Unfortunately this callback runs in atomic context, and the setup code needs to do I2C transactions. Here we use a work_struct to kick off the setup in a thread instead. Fixes: ec45268467f4 ("ASoC: add support for TAS5805M digital amplifier") Signed-off-by: Daniel Beer <daniel.beer(a)igorinstitute.com> --- sound/soc/codecs/tas5805m.c | 126 ++++++++++++++++++++++++------------ 1 file changed, 86 insertions(+), 40 deletions(-) diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index beb4ec629a03..d720c67b9675 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -154,6 +154,7 @@ static const uint32_t tas5805m_volume[] = { #define TAS5805M_VOLUME_MIN 0 struct tas5805m_priv { + struct i2c_client *i2c; struct regulator *pvdd; struct gpio_desc *gpio_pdn_n; @@ -165,6 +166,9 @@ struct tas5805m_priv { int vol[2]; bool is_powered; bool is_muted; + + struct work_struct work; + struct mutex lock; }; static void set_dsp_scale(struct regmap *rm, int offset, int vol) @@ -181,13 +185,11 @@ static void set_dsp_scale(struct regmap *rm, int offset, int vol) regmap_bulk_write(rm, offset, v, ARRAY_SIZE(v)); } -static void tas5805m_refresh(struct snd_soc_component *component) +static void tas5805m_refresh(struct tas5805m_priv *tas5805m) { - struct tas5805m_priv *tas5805m = - snd_soc_component_get_drvdata(component); struct regmap *rm = tas5805m->regmap; - dev_dbg(component->dev, "refresh: is_muted=%d, vol=%d/%d\n", + dev_dbg(&tas5805m->i2c->dev, "refresh: is_muted=%d, vol=%d/%d\n", tas5805m->is_muted, tas5805m->vol[0], tas5805m->vol[1]); regmap_write(rm, REG_PAGE, 0x00); @@ -226,8 +228,11 @@ static int tas5805m_vol_get(struct snd_kcontrol *kcontrol, struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); + mutex_lock(&tas5805m->lock); ucontrol->value.integer.value[0] = tas5805m->vol[0]; ucontrol->value.integer.value[1] = tas5805m->vol[1]; + mutex_unlock(&tas5805m->lock); + return 0; } @@ -243,11 +248,13 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, snd_soc_kcontrol_component(kcontrol); struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); + int ret = 0; if (!(volume_is_valid(ucontrol->value.integer.value[0]) && volume_is_valid(ucontrol->value.integer.value[1]))) return -EINVAL; + mutex_lock(&tas5805m->lock); if (tas5805m->vol[0] != ucontrol->value.integer.value[0] || tas5805m->vol[1] != ucontrol->value.integer.value[1]) { tas5805m->vol[0] = ucontrol->value.integer.value[0]; @@ -256,9 +263,10 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, tas5805m->vol[0], tas5805m->vol[1], tas5805m->is_powered); if (tas5805m->is_powered) - tas5805m_refresh(component); - return 1; + tas5805m_refresh(tas5805m); + ret = 1; } + mutex_unlock(&tas5805m->lock); return 0; } @@ -294,54 +302,83 @@ static int tas5805m_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_component *component = dai->component; struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); - struct regmap *rm = tas5805m->regmap; - unsigned int chan, global1, global2; switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - dev_dbg(component->dev, "DSP startup\n"); - - /* We mustn't issue any I2C transactions until the I2S - * clock is stable. Furthermore, we must allow a 5ms - * delay after the first set of register writes to - * allow the DSP to boot before configuring it. - */ - usleep_range(5000, 10000); - send_cfg(rm, dsp_cfg_preboot, - ARRAY_SIZE(dsp_cfg_preboot)); - usleep_range(5000, 15000); - send_cfg(rm, tas5805m->dsp_cfg_data, - tas5805m->dsp_cfg_len); - - tas5805m->is_powered = true; - tas5805m_refresh(component); + dev_dbg(component->dev, "clock start\n"); + schedule_work(&tas5805m->work); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - dev_dbg(component->dev, "DSP shutdown\n"); + break; - tas5805m->is_powered = false; + default: + return -EINVAL; + } - regmap_write(rm, REG_PAGE, 0x00); - regmap_write(rm, REG_BOOK, 0x00); + return 0; +} - regmap_read(rm, REG_CHAN_FAULT, &chan); - regmap_read(rm, REG_GLOBAL_FAULT1, &global1); - regmap_read(rm, REG_GLOBAL_FAULT2, &global2); +static void do_work(struct work_struct *work) +{ + struct tas5805m_priv *tas5805m = + container_of(work, struct tas5805m_priv, work); + struct regmap *rm = tas5805m->regmap; - dev_dbg(component->dev, - "fault regs: CHAN=%02x, GLOBAL1=%02x, GLOBAL2=%02x\n", - chan, global1, global2); + dev_dbg(&tas5805m->i2c->dev, "DSP startup\n"); - regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); - break; + mutex_lock(&tas5805m->lock); + /* We mustn't issue any I2C transactions until the I2S + * clock is stable. Furthermore, we must allow a 5ms + * delay after the first set of register writes to + * allow the DSP to boot before configuring it. + */ + usleep_range(5000, 10000); + send_cfg(rm, dsp_cfg_preboot, ARRAY_SIZE(dsp_cfg_preboot)); + usleep_range(5000, 15000); + send_cfg(rm, tas5805m->dsp_cfg_data, tas5805m->dsp_cfg_len); + + tas5805m->is_powered = true; + tas5805m_refresh(tas5805m); + mutex_unlock(&tas5805m->lock); +} - default: - return -EINVAL; +static int tas5805m_dac_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct tas5805m_priv *tas5805m = + snd_soc_component_get_drvdata(component); + struct regmap *rm = tas5805m->regmap; + + if (event & SND_SOC_DAPM_PRE_PMD) { + unsigned int chan, global1, global2; + + dev_dbg(component->dev, "DSP shutdown\n"); + cancel_work_sync(&tas5805m->work); + + mutex_lock(&tas5805m->lock); + if (tas5805m->is_powered) { + tas5805m->is_powered = false; + + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x00); + + regmap_read(rm, REG_CHAN_FAULT, &chan); + regmap_read(rm, REG_GLOBAL_FAULT1, &global1); + regmap_read(rm, REG_GLOBAL_FAULT2, &global2); + + dev_dbg(component->dev, "fault regs: CHAN=%02x, " + "GLOBAL1=%02x, GLOBAL2=%02x\n", + chan, global1, global2); + + regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); + } + mutex_unlock(&tas5805m->lock); } return 0; @@ -354,7 +391,8 @@ static const struct snd_soc_dapm_route tas5805m_audio_map[] = { static const struct snd_soc_dapm_widget tas5805m_dapm_widgets[] = { SND_SOC_DAPM_AIF_IN("DAC IN", "Playback", 0, SND_SOC_NOPM, 0, 0), - SND_SOC_DAPM_DAC("DAC", NULL, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC_E("DAC", NULL, SND_SOC_NOPM, 0, 0, + tas5805m_dac_event, SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_OUTPUT("OUT") }; @@ -375,11 +413,14 @@ static int tas5805m_mute(struct snd_soc_dai *dai, int mute, int direction) struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); + mutex_lock(&tas5805m->lock); dev_dbg(component->dev, "set mute=%d (is_powered=%d)\n", mute, tas5805m->is_powered); + tas5805m->is_muted = mute; if (tas5805m->is_powered) - tas5805m_refresh(component); + tas5805m_refresh(tas5805m); + mutex_unlock(&tas5805m->lock); return 0; } @@ -434,6 +475,7 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c) if (!tas5805m) return -ENOMEM; + tas5805m->i2c = i2c; tas5805m->pvdd = devm_regulator_get(dev, "pvdd"); if (IS_ERR(tas5805m->pvdd)) { dev_err(dev, "failed to get pvdd supply: %ld\n", @@ -507,6 +549,9 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c) gpiod_set_value(tas5805m->gpio_pdn_n, 1); usleep_range(10000, 15000); + INIT_WORK(&tas5805m->work, do_work); + mutex_init(&tas5805m->lock); + /* Don't register through devm. We need to be able to unregister * the component prior to deasserting PDN# */ @@ -527,6 +572,7 @@ static void tas5805m_i2c_remove(struct i2c_client *i2c) struct device *dev = &i2c->dev; struct tas5805m_priv *tas5805m = dev_get_drvdata(dev); + cancel_work_sync(&tas5805m->work); snd_soc_unregister_component(dev); gpiod_set_value(tas5805m->gpio_pdn_n, 0); usleep_range(10000, 15000); -- 2.38.1

2 1

[PATCH 2/2] ASoC: tas5805m: add missing page switch.
by Daniel Beer 27 Nov '22

27 Nov '22

In tas5805m_refresh, we switch pages to update the DSP volume control, but we need to switch back to page 0 before trying to alter the soft-mute control. This latter page-switch was missing. Fixes: ec45268467f4 ("ASoC: add support for TAS5805M digital amplifier") Signed-off-by: Daniel Beer <daniel.beer(a)igorinstitute.com> --- sound/soc/codecs/tas5805m.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index d720c67b9675..5cf7726904c2 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -203,6 +203,9 @@ static void tas5805m_refresh(struct tas5805m_priv *tas5805m) set_dsp_scale(rm, 0x24, tas5805m->vol[0]); set_dsp_scale(rm, 0x28, tas5805m->vol[1]); + regmap_write(rm, REG_PAGE, 0x00); + regmap_write(rm, REG_BOOK, 0x00); + /* Set/clear digital soft-mute */ regmap_write(rm, REG_DEVICE_CTRL_2, (tas5805m->is_muted ? DCTRL2_MUTE : 0) | -- 2.38.1

1 0

[PATCH 000/606] i2c: Complete conversion to i2c_probe_new
by Uwe Kleine-König 26 Nov '22

26 Nov '22

Hello, since commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type") from 2016 there is a "temporary" alternative probe callback for i2c drivers. This series completes all drivers to this new callback (unless I missed something). It's based on current next/master. A part of the patches depend on commit 662233731d66 ("i2c: core: Introduce i2c_client_get_device_id helper function"), there is a branch that you can pull into your tree to get it: https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/client_device_id_helper-immutable I don't think it's feasable to apply this series in one go, so I ask the maintainers of the changed files to apply via their tree. I guess it will take a few kernel release iterations until all patch are in, but I think a single tree creates too much conflicts. The last patch changes i2c_driver::probe, all non-converted drivers will fail to compile then. So I hope the build bots will tell me about any driver I missed to convert. This patch is obviously not for application now. I dropped most individuals from the recipents of this mail to not challenge the mail servers and mailing list filters too much. Sorry if you had extra efforts to find this mail. Best regards Uwe Uwe Kleine-König (606): tpm: st33zp24: Convert to Convert to i2c's .probe_new() tpm: tpm_i2c_atmel: Convert to i2c's .probe_new() tpm: tpm_i2c_infineon: Convert to i2c's .probe_new() tpm: tpm_i2c_nuvoton: Convert to i2c's .probe_new() tpm: tis_i2c: Convert to i2c's .probe_new() crypto: atmel-ecc - Convert to i2c's .probe_new() crypto: atmel-sha204a - Convert to i2c's .probe_new() extcon: fsa9480: Convert to i2c's .probe_new() extcon: rt8973: Convert to i2c's .probe_new() extcon: usbc-tusb320: Convert to i2c's .probe_new() gpio: max732x: Convert to i2c's .probe_new() gpio: pca953x: Convert to i2c's .probe_new() gpio: pcf857x: Convert to i2c's .probe_new() drm/bridge: adv7511: Convert to i2c's .probe_new() drm/bridge/analogix/anx6345: Convert to i2c's .probe_new() drm/bridge/analogix/anx78xx: Convert to i2c's .probe_new() drm/bridge: anx7625: Convert to i2c's .probe_new() drm/bridge: icn6211: Convert to i2c's .probe_new() drm/bridge: chrontel-ch7033: Convert to i2c's .probe_new() drm/bridge: it6505: Convert to i2c's .probe_new() drm/bridge: it66121: Convert to i2c's .probe_new() drm/bridge: lt8912b: Convert to i2c's .probe_new() drm/bridge: lt9211: Convert to i2c's .probe_new() drm/bridge: lt9611: Convert to i2c's .probe_new() drm/bridge: lt9611uxc: Convert to i2c's .probe_new() drm/bridge: megachips: Convert to i2c's .probe_new() drm/bridge: nxp-ptn3460: Convert to i2c's .probe_new() drm/bridge: parade-ps8622: Convert to i2c's .probe_new() drm/bridge: sii902x: Convert to i2c's .probe_new() drm/bridge: sii9234: Convert to i2c's .probe_new() drm/bridge: sii8620: Convert to i2c's .probe_new() drm/bridge: tc358767: Convert to i2c's .probe_new() drm/bridge: tc358768: Convert to i2c's .probe_new() drm/bridge/tc358775: Convert to i2c's .probe_new() drm/bridge: ti-sn65dsi83: Convert to i2c's .probe_new() drm/bridge: ti-sn65dsi86: Convert to i2c's .probe_new() drm/bridge: tfp410: Convert to i2c's .probe_new() drm/i2c/ch7006: Convert to i2c's .probe_new() drm/i2c/sil164: Convert to i2c's .probe_new() drm/i2c/tda9950: Convert to i2c's .probe_new() drm/i2c/tda998x: Convert to i2c's .probe_new() drm/panel: olimex-lcd-olinuxino: Convert to i2c's .probe_new() drm/panel: raspberrypi-touchscreen: Convert to i2c's .probe_new() i2c: core: Convert to i2c's .probe_new() i2c: slave-eeprom: Convert to i2c's .probe_new() i2c: smbus: Convert to i2c's .probe_new() i2c: mux: pca9541: Convert to i2c's .probe_new() i2c: mux: pca954x: Convert to i2c's .probe_new() iio: accel: adxl372_i2c: Convert to i2c's .probe_new() iio: accel: bma180: Convert to i2c's .probe_new() iio: accel: bma400: Convert to i2c's .probe_new() iio: accel: bmc150: Convert to i2c's .probe_new() iio: accel: da280: Convert to i2c's .probe_new() iio: accel: kxcjk-1013: Convert to i2c's .probe_new() iio: accel: mma7455_i2c: Convert to i2c's .probe_new() iio: accel: mma8452: Convert to i2c's .probe_new() iio: accel: mma9551: Convert to i2c's .probe_new() iio: accel: mma9553: Convert to i2c's .probe_new() iio: adc: ad7091r5: Convert to i2c's .probe_new() iio: adc: ad7291: Convert to i2c's .probe_new() iio: adc: ad799x: Convert to i2c's .probe_new() iio: adc: ina2xx-adc: Convert to i2c's .probe_new() iio: adc: ltc2471: Convert to i2c's .probe_new() iio: adc: ltc2485: Convert to i2c's .probe_new() iio: adc: ltc2497: Convert to i2c's .probe_new() iio: adc: max1363: Convert to i2c's .probe_new() iio: adc: max9611: Convert to i2c's .probe_new() iio: adc: mcp3422: Convert to i2c's .probe_new() iio: adc: ti-adc081c: Convert to i2c's .probe_new() iio: adc: ti-ads1015: Convert to i2c's .probe_new() iio: cdc: ad7150: Convert to i2c's .probe_new() iio: cdc: ad7746: Convert to i2c's .probe_new() iio: chemical: ams-iaq-core: Convert to i2c's .probe_new() iio: chemical: atlas-ezo-sensor: Convert to i2c's .probe_new() iio: chemical: atlas-sensor: Convert to i2c's .probe_new() iio: chemical: bme680_i2c: Convert to i2c's .probe_new() iio: chemical: ccs811: Convert to i2c's .probe_new() iio: chemical: scd4x: Convert to i2c's .probe_new() iio: chemical: sgp30: Convert to i2c's .probe_new() iio: chemical: sgp40: Convert to i2c's .probe_new() iio: chemical: vz89x: Convert to i2c's .probe_new() iio: dac: ad5064: Convert to i2c's .probe_new() iio: dac: ad5380: Convert to i2c's .probe_new() iio: dac: ad5446: Convert to i2c's .probe_new() iio: dac: ad5593r: Convert to i2c's .probe_new() iio: dac: ad5696-i2c: Convert to i2c's .probe_new() iio: dac: ds4424: Convert to i2c's .probe_new() iio: dac: m62332: Convert to i2c's .probe_new() iio: dac: max517: Convert to i2c's .probe_new() iio: dac: max5821: Convert to i2c's .probe_new() iio: dac: mcp4725: Convert to i2c's .probe_new() iio: dac: ti-dac5571: Convert to i2c's .probe_new() iio: gyro: bmg160_i2c: Convert to i2c's .probe_new() iio: gyro: itg3200_core: Convert to i2c's .probe_new() iio: gyro: mpu3050-i2c: Convert to i2c's .probe_new() iio: gyro: st_gyro_i2c: Convert to i2c's .probe_new() iio: health: afe4404: Convert to i2c's .probe_new() iio: health: max30100: Convert to i2c's .probe_new() iio: health: max30102: Convert to i2c's .probe_new() iio: humidity: am2315: Convert to i2c's .probe_new() iio: humidity: hdc100x: Convert to i2c's .probe_new() iio: humidity: hdc2010: Convert to i2c's .probe_new() iio: humidity: hts221_i2c: Convert to i2c's .probe_new() iio: humidity: htu21: Convert to i2c's .probe_new() iio: humidity: si7005: Convert to i2c's .probe_new() iio: humidity: si7020: Convert to i2c's .probe_new() iio: imu: bmi160/bmi160_i2c: Convert to i2c's .probe_new() iio: imu: fxos8700_i2c: Convert to i2c's .probe_new() iio: imu: inv_mpu6050: Convert to i2c's .probe_new() iio: imu: kmx61: Convert to i2c's .probe_new() iio: imu: st_lsm6dsx: Convert to i2c's .probe_new() iio: light: adjd_s311: Convert to i2c's .probe_new() iio: light: adux1020: Convert to i2c's .probe_new() iio: light: al3010: Convert to i2c's .probe_new() iio: light: al3320a: Convert to i2c's .probe_new() iio: light: apds9300: Convert to i2c's .probe_new() iio: light: apds9960: Convert to i2c's .probe_new() iio: light: bh1750: Convert to i2c's .probe_new() iio: light: bh1780: Convert to i2c's .probe_new() iio: light: cm3232: Convert to i2c's .probe_new() iio: light: cm3323: Convert to i2c's .probe_new() iio: light: cm36651: Convert to i2c's .probe_new() iio: light: gp2ap002: Convert to i2c's .probe_new() iio: light: gp2ap020a00f: Convert to i2c's .probe_new() iio: light: isl29018: Convert to i2c's .probe_new() iio: light: isl29028: Convert to i2c's .probe_new() iio: light: isl29125: Convert to i2c's .probe_new() iio: light: jsa1212: Convert to i2c's .probe_new() iio: light: ltr501: Convert to i2c's .probe_new() iio: light: lv0104cs: Convert to i2c's .probe_new() iio: light: max44000: Convert to i2c's .probe_new() iio: light: max44009: Convert to i2c's .probe_new() iio: light: noa1305: Convert to i2c's .probe_new() iio: light: opt3001: Convert to i2c's .probe_new() iio: light: pa12203001: Convert to i2c's .probe_new() iio: light: rpr0521: Convert to i2c's .probe_new() iio: light: si1133: Convert to i2c's .probe_new() iio: light: si1145: Convert to i2c's .probe_new() iio: light: st_uvis25_i2c: Convert to i2c's .probe_new() iio: light: stk3310: Convert to i2c's .probe_new() iio: light: tcs3414: Convert to i2c's .probe_new() iio: light: tcs3472: Convert to i2c's .probe_new() iio: light: tsl2563: Convert to i2c's .probe_new() iio: light: tsl2583: Convert to i2c's .probe_new() iio: light: tsl2772: Convert to i2c's .probe_new() iio: light: tsl4531: Convert to i2c's .probe_new() iio: light: us5182d: Convert to i2c's .probe_new() iio: light: vcnl4000: Convert to i2c's .probe_new() iio: light: vcnl4035: Convert to i2c's .probe_new() iio: light: veml6030: Convert to i2c's .probe_new() iio: light: veml6070: Convert to i2c's .probe_new() iio: light: zopt2201: Convert to i2c's .probe_new() iio: magnetometer: ak8974: Convert to i2c's .probe_new() iio: magnetometer: ak8975: Convert to i2c's .probe_new() iio: magnetometer: bmc150_magn_i2c: Convert to i2c's .probe_new() iio: magnetometer: hmc5843: Convert to i2c's .probe_new() iio: magnetometer: mag3110: Convert to i2c's .probe_new() iio: magnetometer: mmc35240: Convert to i2c's .probe_new() iio: magnetometer: yamaha-yas530: Convert to i2c's .probe_new() iio: potentiometer: ad5272: Convert to i2c's .probe_new() iio: potentiometer: ds1803: Convert to i2c's .probe_new() iio: potentiometer: max5432: Convert to i2c's .probe_new() iio: potentiometer: tpl0102: Convert to i2c's .probe_new() iio: potentiostat: lmp91000: Convert to i2c's .probe_new() iio: pressure: abp060mg: Convert to i2c's .probe_new() iio: pressure: bmp280-i2c: Convert to i2c's .probe_new() iio: pressure: dlhl60d: Convert to i2c's .probe_new() iio: pressure: dps310: Convert to i2c's .probe_new() iio: pressure: hp03: Convert to i2c's .probe_new() iio: pressure: hp206c: Convert to i2c's .probe_new() iio: pressure: icp10100: Convert to i2c's .probe_new() iio: pressure: mpl115_i2c: Convert to i2c's .probe_new() iio: pressure: mpl3115: Convert to i2c's .probe_new() iio: pressure: ms5611_i2c: Convert to i2c's .probe_new() iio: pressure: ms5637: Convert to i2c's .probe_new() iio: pressure: st_pressure_i2c: Convert to i2c's .probe_new() iio: pressure: t5403: Convert to i2c's .probe_new() iio: pressure: zpa2326_i2c: Convert to i2c's .probe_new() iio: proximity: isl29501: Convert to i2c's .probe_new() iio: proximity: mb1232: Convert to i2c's .probe_new() iio: proximity: pulsedlight-lidar-lite-v2: Convert to i2c's .probe_new() iio: proximity: rfd77402: Convert to i2c's .probe_new() iio: proximity: srf08: Convert to i2c's .probe_new() iio: proximity: sx9500: Convert to i2c's .probe_new() iio: temperature: mlx90614: Convert to i2c's .probe_new() iio: temperature: mlx90632: Convert to i2c's .probe_new() iio: temperature: tmp006: Convert to i2c's .probe_new() iio: temperature: tmp007: Convert to i2c's .probe_new() iio: temperature: tsys01: Convert to i2c's .probe_new() iio: temperature: tsys02d: Convert to i2c's .probe_new() Input: as5011 - Convert to i2c's .probe_new() Input: adp5588-keys - Convert to i2c's .probe_new() Input: adp5589-keys - Convert to i2c's .probe_new() Input: cap11xx - Convert to i2c's .probe_new() Input: dlink-dir685-touchkeys - Convert to i2c's .probe_new() Input: lm8323 - Convert to i2c's .probe_new() Input: lm8333 - Convert to i2c's .probe_new() Input: max7359_keypad - Convert to i2c's .probe_new() Input: mcs_touchkey - Convert to i2c's .probe_new() Input: mpr121_touchkey - Convert to i2c's .probe_new() Input: qt1070 - Convert to i2c's .probe_new() Input: qt2160 - Convert to i2c's .probe_new() Input: tca6416-keypad - Convert to i2c's .probe_new() Input: tca8418_keypad - Convert to i2c's .probe_new() Input: tm2-touchkey - Convert to i2c's .probe_new() Input: ad714x-i2c - Convert to i2c's .probe_new() Input: adxl34x-i2c - Convert to i2c's .probe_new() Input: apanel - Convert to i2c's .probe_new() Input: atmel_captouch - Convert to i2c's .probe_new() Input: bma150 - Convert to i2c's .probe_new() Input: cma3000_d0x_i2c - Convert to i2c's .probe_new() Input: da7280 - Convert to i2c's .probe_new() Input: drv260x - Convert to i2c's .probe_new() Input: drv2665 - Convert to i2c's .probe_new() Input: drv2667 - Convert to i2c's .probe_new() Input: ibm-panel - Convert to i2c's .probe_new() Input: kxtj9 - Convert to i2c's .probe_new() Input: mma8450 - Convert to i2c's .probe_new() Input: pcf8574_keypad - Convert to i2c's .probe_new() Input: cyapa - Convert to i2c's .probe_new() Input: elan_i2c_core - Convert to i2c's .probe_new() Input: synaptics_i2c - Convert to i2c's .probe_new() Input: rmi_i2c - Convert to i2c's .probe_new() Input: rmi_smbus - Convert to i2c's .probe_new() Input: ad7879-i2c - Convert to i2c's .probe_new() Input: ar1021_i2c - Convert to i2c's .probe_new() Input: atmel_mxt_ts - Convert to i2c's .probe_new() Input: auo-pixcir-ts - Convert to i2c's .probe_new() Input: bu21013_ts - Convert to i2c's .probe_new() Input: bu21029_ts - Convert to i2c's .probe_new() Input: chipone_icn8318 - Convert to i2c's .probe_new() Input: cy8ctma140 - Convert to i2c's .probe_new() Input: cy8ctmg110_ts - Convert to i2c's .probe_new() Input: cyttsp4 - Convert to i2c's .probe_new() Input: cyttsp5: Convert to i2c's .probe_new() Input: cyttsp_i2c - Convert to i2c's .probe_new() Input: edt-ft5x06 - Convert to i2c's .probe_new() Input: eeti_ts - Convert to i2c's .probe_new() Input: egalax_ts - Convert to i2c's .probe_new() Input: ektf2127 - Convert to i2c's .probe_new() Input: goodix - Convert to i2c's .probe_new() Input: hideep - Convert to i2c's .probe_new() Input: hx83112b: Convert to i2c's .probe_new() Input: hycon-hy46xx - Convert to i2c's .probe_new() Input: ili210x - Convert to i2c's .probe_new() Input: ilitek_ts_i2c - Convert to i2c's .probe_new() Input: iqs5xx - Convert to i2c's .probe_new() Input: max11801_ts - Convert to i2c's .probe_new() Input: mcs5000_ts - Convert to i2c's .probe_new() Input: melfas_mip4 - Convert to i2c's .probe_new() Input: migor_ts - Convert to i2c's .probe_new() Input: mms114 - Convert to i2c's .probe_new() Input: pixcir_i2c_ts - Convert to i2c's .probe_new() Input: raydium_i2c_ts - Convert to i2c's .probe_new() Input: rohm_bu21023 - Convert to i2c's .probe_new() Input: s6sy761 - Convert to i2c's .probe_new() Input: silead - Convert to i2c's .probe_new() Input: sis_i2c - Convert to i2c's .probe_new() Input: st1232 - Convert to i2c's .probe_new() Input: stmfts - Convert to i2c's .probe_new() Input: sx8654 - Convert to i2c's .probe_new() Input: tsc2004 - Convert to i2c's .probe_new() Input: tsc2007_core - Convert to i2c's .probe_new() Input: wacom_i2c - Convert to i2c's .probe_new() Input: wdt87xx_i2c - Convert to i2c's .probe_new() Input: zet6223 - Convert to i2c's .probe_new() Input: zforce_ts - Convert to i2c's .probe_new() leds: bd2802: Convert to i2c's .probe_new() leds: blinkm: Convert to i2c's .probe_new() leds: is31fl32xx: Convert to i2c's .probe_new() leds: lm3530: Convert to i2c's .probe_new() leds: lm3532: Convert to i2c's .probe_new() leds: lm355x: Convert to i2c's .probe_new() leds: lm3642: Convert to i2c's .probe_new() leds: lm3692x: Convert to i2c's .probe_new() leds: lm3697: Convert to i2c's .probe_new() leds: lp3944: Convert to i2c's .probe_new() leds: lp3952: Convert to i2c's .probe_new() leds: lp5521: Convert to i2c's .probe_new() leds: lp5523: Convert to i2c's .probe_new() leds: lp5562: Convert to i2c's .probe_new() leds: lp8501: Convert to i2c's .probe_new() leds: lp8860: Convert to i2c's .probe_new() leds: pca9532: Convert to i2c's .probe_new() leds: pca963x: Convert to i2c's .probe_new() leds: tca6507: Convert to i2c's .probe_new() leds: tlc591xx: Convert to i2c's .probe_new() leds: turris-omnia: Convert to i2c's .probe_new() macintosh: ams/ams-i2c: Convert to i2c's .probe_new() macintosh: therm_adt746x: Convert to i2c's .probe_new() macintosh: therm_windtunnel: Convert to i2c's .probe_new() macintosh: windfarm_ad7417_sensor: Convert to i2c's .probe_new() macintosh: windfarm_fcu_controls: Convert to i2c's .probe_new() macintosh: windfarm_lm75_sensor: Convert to i2c's .probe_new() macintosh: windfarm_lm87_sensor: Convert to i2c's .probe_new() macintosh: windfarm_max6690_sensor: Convert to i2c's .probe_new() macintosh: windfarm_smu_sat: Convert to i2c's .probe_new() media: dvb-frontends/a8293: Convert to i2c's .probe_new() media: dvb-frontends/af9013: Convert to i2c's .probe_new() media: dvb-frontends/af9033: Convert to i2c's .probe_new() media: dvb-frontends/au8522_decoder: Convert to i2c's .probe_new() media: dvb-frontends/cxd2099: Convert to i2c's .probe_new() media: dvb-frontends/cxd2820r_core: Convert to i2c's .probe_new() media: dvb-frontends/dvb-pll: Convert to i2c's .probe_new() media: dvb-frontends/helene: Convert to i2c's .probe_new() media: dvb-frontends/lgdt3306a: Convert to i2c's .probe_new() media: dvb-frontends/lgdt330x: Convert to i2c's .probe_new() media: dvb-frontends/m88ds3103: Convert to i2c's .probe_new() media: dvb-frontends/mn88443x: Convert to i2c's .probe_new() media: dvb-frontends/mn88472: Convert to i2c's .probe_new() media: dvb-frontends/mn88473: Convert to i2c's .probe_new() media: dvb-frontends/mxl692: Convert to i2c's .probe_new() media: dvb-frontends/rtl2830: Convert to i2c's .probe_new() media: dvb-frontends/rtl2832: Convert to i2c's .probe_new() media: dvb-frontends/si2165: Convert to i2c's .probe_new() media: dvb-frontends/si2168: Convert to i2c's .probe_new() media: dvb-frontends/sp2: Convert to i2c's .probe_new() media: dvb-frontends/stv090x: Convert to i2c's .probe_new() media: dvb-frontends/stv6110x: Convert to i2c's .probe_new() media: dvb-frontends/tc90522: Convert to i2c's .probe_new() media: dvb-frontends/tda10071: Convert to i2c's .probe_new() media: dvb-frontends/ts2020: Convert to i2c's .probe_new() media: i2c/ad5820: Convert to i2c's .probe_new() media: i2c/ad9389b: Convert to i2c's .probe_new() media: i2c/adp1653: Convert to i2c's .probe_new() media: i2c/adv7170: Convert to i2c's .probe_new() media: i2c/adv7175: Convert to i2c's .probe_new() media: i2c/adv7180: Convert to i2c's .probe_new() media: i2c/adv7183: Convert to i2c's .probe_new() media: i2c/adv7393: Convert to i2c's .probe_new() media: i2c/adv7511-v4l2: Convert to i2c's .probe_new() media: i2c/adv7604: Convert to i2c's .probe_new() media: i2c/adv7842: Convert to i2c's .probe_new() media: i2c/ak881x: Convert to i2c's .probe_new() media: i2c/bt819: Convert to i2c's .probe_new() media: i2c/bt856: Convert to i2c's .probe_new() media: i2c/bt866: Convert to i2c's .probe_new() media: i2c/cs3308: Convert to i2c's .probe_new() media: i2c/cs5345: Convert to i2c's .probe_new() media: i2c/cs53l32a: Convert to i2c's .probe_new() media: cx25840: Convert to i2c's .probe_new() media: i2c/ir-kbd-i2c: Convert to i2c's .probe_new() media: i2c/ks0127: Convert to i2c's .probe_new() media: i2c/lm3560: Convert to i2c's .probe_new() media: i2c/lm3646: Convert to i2c's .probe_new() media: i2c/m52790: Convert to i2c's .probe_new() media: m5mols: Convert to i2c's .probe_new() media: i2c/ml86v7667: Convert to i2c's .probe_new() media: i2c/msp3400-driver: Convert to i2c's .probe_new() media: i2c/mt9m032: Convert to i2c's .probe_new() media: i2c/mt9p031: Convert to i2c's .probe_new() media: i2c/mt9t001: Convert to i2c's .probe_new() media: i2c/mt9t112: Convert to i2c's .probe_new() media: i2c/mt9v011: Convert to i2c's .probe_new() media: i2c/mt9v032: Convert to i2c's .probe_new() media: i2c/noon010pc30: Convert to i2c's .probe_new() media: i2c/ov13858: Convert to i2c's .probe_new() media: i2c/ov6650: Convert to i2c's .probe_new() media: i2c/ov7640: Convert to i2c's .probe_new() media: i2c/ov7670: Convert to i2c's .probe_new() media: i2c/ov9640: Convert to i2c's .probe_new() media: i2c/rj54n1cb0c: Convert to i2c's .probe_new() media: i2c/s5k4ecgx: Convert to i2c's .probe_new() media: i2c/s5k6aa: Convert to i2c's .probe_new() media: i2c/saa6588: Convert to i2c's .probe_new() media: i2c/saa6752hs: Convert to i2c's .probe_new() media: i2c/saa7110: Convert to i2c's .probe_new() media: i2c/saa7115: Convert to i2c's .probe_new() media: i2c/saa7127: Convert to i2c's .probe_new() media: i2c/saa717x: Convert to i2c's .probe_new() media: i2c/saa7185: Convert to i2c's .probe_new() media: i2c/sony-btf-mpx: Convert to i2c's .probe_new() media: i2c/sr030pc30: Convert to i2c's .probe_new() media: i2c/tda1997x: Convert to i2c's .probe_new() media: i2c/tda7432: Convert to i2c's .probe_new() media: i2c/tda9840: Convert to i2c's .probe_new() media: i2c/tea6415c: Convert to i2c's .probe_new() media: i2c/tea6420: Convert to i2c's .probe_new() media: i2c/ths7303: Convert to i2c's .probe_new() media: i2c/tlv320aic23b: Convert to i2c's .probe_new() media: i2c/tvaudio: Convert to i2c's .probe_new() media: i2c/tvp514x: Convert to i2c's .probe_new() media: i2c/tw2804: Convert to i2c's .probe_new() media: i2c/tw9903: Convert to i2c's .probe_new() media: i2c/tw9906: Convert to i2c's .probe_new() media: i2c/tw9910: Convert to i2c's .probe_new() media: i2c/uda1342: Convert to i2c's .probe_new() media: i2c/upd64031a: Convert to i2c's .probe_new() media: i2c/upd64083: Convert to i2c's .probe_new() media: i2c/video-i2c: Convert to i2c's .probe_new() media: i2c/vp27smpx: Convert to i2c's .probe_new() media: i2c/vpx3220: Convert to i2c's .probe_new() media: i2c/vs6624: Convert to i2c's .probe_new() media: i2c/wm8739: Convert to i2c's .probe_new() media: i2c/wm8775: Convert to i2c's .probe_new() media: radio/radio-tea5764: Convert to i2c's .probe_new() media: radio/saa7706h: Convert to i2c's .probe_new() media: radio/tef6862: Convert to i2c's .probe_new() media: vidtv: Convert to i2c's .probe_new() media: tuners/e4000: Convert to i2c's .probe_new() media: tuners/fc2580: Convert to i2c's .probe_new() media: tuners/m88rs6000t: Convert to i2c's .probe_new() media: tuners/mt2060: Convert to i2c's .probe_new() media: tuners/mxl301rf: Convert to i2c's .probe_new() media: tuners/qm1d1b0004: Convert to i2c's .probe_new() media: tuners/qm1d1c0042: Convert to i2c's .probe_new() media: tuners/si2157: Convert to i2c's .probe_new() media: tuners/tda18212: Convert to i2c's .probe_new() media: tuners/tda18250: Convert to i2c's .probe_new() media: tuners/tua9001: Convert to i2c's .probe_new() media: usb: go7007: s2250-board: Convert to i2c's .probe_new() media: v4l2-core/tuner-core: Convert to i2c's .probe_new() mfd: 88pm800: Convert to i2c's .probe_new() mfd: 88pm805: Convert to i2c's .probe_new() mfd: aat2870-core: Convert to i2c's .probe_new() mfd: act8945a: Convert to i2c's .probe_new() mfd: adp5520: Convert to i2c's .probe_new() mfd: arizona-i2c: Convert to i2c's .probe_new() mfd: as3711: Convert to i2c's .probe_new() mfd: as3722: Convert to i2c's .probe_new() mfd: atc260x-i2c: Convert to i2c's .probe_new() mfd: axp20x-i2c: Convert to i2c's .probe_new() mfd: bcm590xx: Convert to i2c's .probe_new() mfd: bd9571mwv: Convert to i2c's .probe_new() mfd: da903x: Convert to i2c's .probe_new() mfd: da9052-i2c: Convert to i2c's .probe_new() mfd: da9055-i2c: Convert to i2c's .probe_new() mfd: da9062-core: Convert to i2c's .probe_new() mfd: da9063-i2c: Convert to i2c's .probe_new() mfd: da9150-core: Convert to i2c's .probe_new() mfd: khadas-mcu: Convert to i2c's .probe_new() mfd: lm3533-core: Convert to i2c's .probe_new() mfd: lp3943: Convert to i2c's .probe_new() mfd: lp873x: Convert to i2c's .probe_new() mfd: lp87565: Convert to i2c's .probe_new() mfd: lp8788: Convert to i2c's .probe_new() mfd: madera-i2c: Convert to i2c's .probe_new() mfd: max14577: Convert to i2c's .probe_new() mfd: max77620: Convert to i2c's .probe_new() mfd: max77693: Convert to i2c's .probe_new() mfd: max77843: Convert to i2c's .probe_new() mfd: max8907: Convert to i2c's .probe_new() mfd: max8925-i2c: Convert to i2c's .probe_new() mfd: max8997: Convert to i2c's .probe_new() mfd: max8998: Convert to i2c's .probe_new() mfd: mc13xxx-i2c: Convert to i2c's .probe_new() mfd: menelaus: Convert to i2c's .probe_new() mfd: menf21bmc: Convert to i2c's .probe_new() mfd: palmas: Convert to i2c's .probe_new() mfd: pcf50633-core: Convert to i2c's .probe_new() mfd: rc5t583: Convert to i2c's .probe_new() mfd: retu-mfd: Convert to i2c's .probe_new() mfd: rk808: Convert to i2c's .probe_new() mfd: rohm-bd718x7: Convert to i2c's .probe_new() mfd: rsmu_i2c: Convert to i2c's .probe_new() mfd: rt5033: Convert to i2c's .probe_new() mfd: sec-core: Convert to i2c's .probe_new() mfd: si476x-i2c: Convert to i2c's .probe_new() mfd: sky81452: Convert to i2c's .probe_new() mfd: stmfx: Convert to i2c's .probe_new() mfd: stmpe-i2c: Convert to i2c's .probe_new() mfd: stpmic1: Convert to i2c's .probe_new() mfd: stw481x: Convert to i2c's .probe_new() mfd: tc3589x: Convert to i2c's .probe_new() mfd: ti-lmu: Convert to i2c's .probe_new() mfd: tps6105x: Convert to i2c's .probe_new() mfd: tps65010: Convert to i2c's .probe_new() mfd: tps6507x: Convert to i2c's .probe_new() mfd: tps65086: Convert to i2c's .probe_new() mfd: tps65090: Convert to i2c's .probe_new() mfd: tps65218: Convert to i2c's .probe_new() mfd: tps6586x: Convert to i2c's .probe_new() mfd: tps65910: Convert to i2c's .probe_new() mfd: tps65912-i2c: Convert to i2c's .probe_new() mfd: twl-core: Convert to i2c's .probe_new() mfd: twl6040: Convert to i2c's .probe_new() mfd: wl1273-core: Convert to i2c's .probe_new() mfd: wm831x-i2c: Convert to i2c's .probe_new() mfd: wm8350-i2c: Convert to i2c's .probe_new() mfd: wm8400-core: Convert to i2c's .probe_new() mfd: wm8994-core: Convert to i2c's .probe_new() misc: ad525x_dpot-i2c: Convert to i2c's .probe_new() misc: apds9802als: Convert to i2c's .probe_new() misc: apds990x: Convert to i2c's .probe_new() misc: bh1770glc: Convert to i2c's .probe_new() misc: ds1682: Convert to i2c's .probe_new() misc: eeprom/eeprom: Convert to i2c's .probe_new() misc: eeprom/idt_89hpesx: Convert to i2c's .probe_new() misc: eeprom/max6875: Convert to i2c's .probe_new() misc: hmc6352: Convert to i2c's .probe_new() misc: ics932s401: Convert to i2c's .probe_new() misc: isl29003: Convert to i2c's .probe_new() misc: isl29020: Convert to i2c's .probe_new() misc: lis3lv02d/lis3lv02d_i2c: Convert to i2c's .probe_new() misc: tsl2550: Convert to i2c's .probe_new() mtd: maps: pismo: Convert to i2c's .probe_new() net: dsa: lan9303: Convert to i2c's .probe_new() net: dsa: microchip: ksz9477: Convert to i2c's .probe_new() net: dsa: xrs700x: Convert to i2c's .probe_new() net/mlx5: Convert to i2c's .probe_new() nfc: microread: Convert to i2c's .probe_new() nfc: mrvl: Convert to i2c's .probe_new() NFC: nxp-nci: Convert to i2c's .probe_new() nfc: pn533: Convert to i2c's .probe_new() nfc: pn544: Convert to i2c's .probe_new() nfc: s3fwrn5: Convert to i2c's .probe_new() nfc: st-nci: Convert to i2c's .probe_new() nfc: st21nfca: i2c: Convert to i2c's .probe_new() of: unittest: Convert to i2c's .probe_new() pinctrl: mcp23s08: Convert to i2c's .probe_new() pinctrl: sx150x: Convert to i2c's .probe_new() platform/chrome: cros_ec: Convert to i2c's .probe_new() power: supply: adp5061: Convert to i2c's .probe_new() power: supply: bq2415x: Convert to i2c's .probe_new() power: supply: bq24190: Convert to i2c's .probe_new() power: supply: bq24257: Convert to i2c's .probe_new() power: supply: bq24735: Convert to i2c's .probe_new() power: supply: bq2515x: Convert to i2c's .probe_new() power: supply: bq256xx: Convert to i2c's .probe_new() power: supply: bq25890: Convert to i2c's .probe_new() power: supply: bq25980: Convert to i2c's .probe_new() power: supply: bq27xxx: Convert to i2c's .probe_new() power: supply: ds2782: Convert to i2c's .probe_new() power: supply: lp8727: Convert to i2c's .probe_new() power: supply: ltc2941: Convert to i2c's .probe_new() power: supply: ltc4162-l: Convert to i2c's .probe_new() power: supply: max14656: Convert to i2c's .probe_new() power: supply: max17040: Convert to i2c's .probe_new() power: supply: max17042_battery: Convert to i2c's .probe_new() power: supply: rt5033_battery: Convert to i2c's .probe_new() power: supply: rt9455: Convert to i2c's .probe_new() power: supply: sbs: Convert to i2c's .probe_new() power: supply: sbs-manager: Convert to i2c's .probe_new() power: supply: smb347: Convert to i2c's .probe_new() power: supply: ucs1002: Convert to i2c's .probe_new() power: supply: z2_battery: Convert to i2c's .probe_new() pwm: pca9685: Convert to i2c's .probe_new() regulator: act8865-regulator: Convert to i2c's .probe_new() regulator: ad5398: Convert to i2c's .probe_new() regulator: da9121-regulator: Convert to i2c's .probe_new() regulator: fan53555: Convert to i2c's .probe_new() regulator: isl6271a-regulator: Convert to i2c's .probe_new() regulator: lp3972: Convert to i2c's .probe_new() regulator: lp872x: Convert to i2c's .probe_new() regulator: lp8755: Convert to i2c's .probe_new() regulator: ltc3589: Convert to i2c's .probe_new() regulator: max1586: Convert to i2c's .probe_new() regulator: max8649: Convert to i2c's .probe_new() regulator: max8660: Convert to i2c's .probe_new() regulator: max8952: Convert to i2c's .probe_new() regulator: max8973-regulator: Convert to i2c's .probe_new() regulator: pca9450-regulator: Convert to i2c's .probe_new() regulator: pfuze100-regulator: Convert to i2c's .probe_new() regulator: pv88080-regulator: Convert to i2c's .probe_new() regulator: rpi-panel-attiny-regulator: Convert to i2c's .probe_new() regulator: tps51632-regulator: Convert to i2c's .probe_new() regulator: tps62360-regulator: Convert to i2c's .probe_new() regulator: tps6286x-regulator: Convert to i2c's .probe_new() regulator: tps65023-regulator: Convert to i2c's .probe_new() rtc: ds1307: Convert to i2c's .probe_new() rtc: isl1208: Convert to i2c's .probe_new() rtc: m41t80: Convert to i2c's .probe_new() rtc: rs5c372: Convert to i2c's .probe_new() spi: sc18is602: Convert to i2c's .probe_new() spi: xcomm: Convert to i2c's .probe_new() staging: iio: adt7316: Convert to i2c's .probe_new() staging: iio: ad5933: Convert to i2c's .probe_new() staging: iio: ade7854: Convert to i2c's .probe_new() staging: most: i2c: Convert to i2c's .probe_new() staging: olpc_dcon: Convert to i2c's .probe_new() serial: sc16is7xx: Convert to i2c's .probe_new() usb: usb251xb: Convert to i2c's .probe_new() usb: misc: usb3503: Convert to i2c's .probe_new() usb: usb4604: Convert to i2c's .probe_new() usb: isp1301-omap: Convert to i2c's .probe_new() usb: phy: isp1301: Convert to i2c's .probe_new() usb: typec: anx7411: Convert to i2c's .probe_new() usb: typec: hd3ss3220: Convert to i2c's .probe_new() usb: typec: tcpm/fusb302: Convert to i2c's .probe_new() usb: typec: tcpm/tcpci: Convert to i2c's .probe_new() usb: typec: tcpm/tcpci_maxim: Convert to i2c's .probe_new() usb: typec: tcpm/tcpci_rt1711h: Convert to i2c's .probe_new() usb: typec: ucsi/ucsi_ccg: Convert to i2c's .probe_new() usb: typec: ucsi: stm32g0: Convert to i2c's .probe_new() backlight: adp8860: Convert to i2c's .probe_new() backlight: adp8870: Convert to i2c's .probe_new() backlight: arcxcnn: Convert to i2c's .probe_new() backlight: bd6107: Convert to i2c's .probe_new() backlight: lm3630a: Convert to i2c's .probe_new() backlight: lm3639: Convert to i2c's .probe_new() backlight: lp855x: Convert to i2c's .probe_new() backlight: lv5207lp: Convert to i2c's .probe_new() backlight: tosa: Convert to i2c's .probe_new() video: fbdev: matrox: Convert to i2c's .probe_new() w1: ds2482: Convert to i2c's .probe_new() watchdog: ziirave_wdt: Convert to i2c's .probe_new() ALSA: aoa: onyx: Convert to i2c's .probe_new() ALSA: aoa: tas: Convert to i2c's .probe_new() ALSA: hda: cs35l41: Convert to i2c's .probe_new() ALSA: ppc: keywest: Convert to i2c's .probe_new() ASoC: codecs: es8326: Convert to i2c's .probe_new() ASoC: max98396: Convert to i2c's .probe_new() ASoC: codecs: src4xxx-i2c: Convert to i2c's .probe_new() ASoC: codecs: tas2780: Convert to i2c's .probe_new() ipmi: ssif_bmc: Convert to i2c's .probe_new() [DON'T APPLY] i2c: Switch .probe() to not take an id parameter drivers/char/ipmi/ssif_bmc.c | 4 ++-- drivers/char/tpm/st33zp24/i2c.c | 5 ++--- drivers/char/tpm/tpm_i2c_atmel.c | 5 ++--- drivers/char/tpm/tpm_i2c_infineon.c | 5 ++--- drivers/char/tpm/tpm_i2c_nuvoton.c | 6 +++--- drivers/char/tpm/tpm_tis_i2c.c | 5 ++--- drivers/crypto/atmel-ecc.c | 6 +++--- drivers/crypto/atmel-sha204a.c | 6 +++--- drivers/extcon/extcon-fsa9480.c | 5 ++--- drivers/extcon/extcon-rt8973a.c | 5 ++--- drivers/extcon/extcon-usbc-tusb320.c | 5 ++--- drivers/gpio/gpio-max732x.c | 6 +++--- drivers/gpio/gpio-pca953x.c | 6 +++--- drivers/gpio/gpio-pcf857x.c | 6 +++--- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +++-- .../gpu/drm/bridge/analogix/analogix-anx6345.c | 5 ++--- .../gpu/drm/bridge/analogix/analogix-anx78xx.c | 5 ++--- drivers/gpu/drm/bridge/analogix/anx7625.c | 5 ++--- drivers/gpu/drm/bridge/chipone-icn6211.c | 5 ++--- drivers/gpu/drm/bridge/chrontel-ch7033.c | 5 ++--- drivers/gpu/drm/bridge/ite-it6505.c | 5 ++--- drivers/gpu/drm/bridge/ite-it66121.c | 5 ++--- drivers/gpu/drm/bridge/lontium-lt8912b.c | 5 ++--- drivers/gpu/drm/bridge/lontium-lt9211.c | 5 ++--- drivers/gpu/drm/bridge/lontium-lt9611.c | 5 ++--- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 5 ++--- .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 10 ++++------ drivers/gpu/drm/bridge/nxp-ptn3460.c | 5 ++--- drivers/gpu/drm/bridge/parade-ps8622.c | 6 +++--- drivers/gpu/drm/bridge/sii902x.c | 5 ++--- drivers/gpu/drm/bridge/sii9234.c | 5 ++--- drivers/gpu/drm/bridge/sil-sii8620.c | 5 ++--- drivers/gpu/drm/bridge/tc358767.c | 4 ++-- drivers/gpu/drm/bridge/tc358768.c | 5 ++--- drivers/gpu/drm/bridge/tc358775.c | 4 ++-- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 6 +++--- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 5 ++--- drivers/gpu/drm/bridge/ti-tfp410.c | 5 ++--- drivers/gpu/drm/i2c/ch7006_drv.c | 4 ++-- drivers/gpu/drm/i2c/sil164_drv.c | 4 ++-- drivers/gpu/drm/i2c/tda9950.c | 5 ++--- drivers/gpu/drm/i2c/tda998x_drv.c | 4 ++-- .../gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 ++--- .../drm/panel/panel-raspberrypi-touchscreen.c | 5 ++--- drivers/i2c/i2c-core-base.c | 16 ++++------------ drivers/i2c/i2c-slave-eeprom.c | 5 +++-- drivers/i2c/i2c-smbus.c | 5 ++--- drivers/i2c/muxes/i2c-mux-pca9541.c | 5 ++--- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++--- drivers/iio/accel/adxl372_i2c.c | 6 +++--- drivers/iio/accel/bma180.c | 6 +++--- drivers/iio/accel/bma400_i2c.c | 6 +++--- drivers/iio/accel/bmc150-accel-i2c.c | 6 +++--- drivers/iio/accel/da280.c | 6 +++--- drivers/iio/accel/kxcjk-1013.c | 6 +++--- drivers/iio/accel/mma7455_i2c.c | 6 +++--- drivers/iio/accel/mma8452.c | 6 +++--- drivers/iio/accel/mma9551.c | 6 +++--- drivers/iio/accel/mma9553.c | 6 +++--- drivers/iio/adc/ad7091r5.c | 6 +++--- drivers/iio/adc/ad7291.c | 6 +++--- drivers/iio/adc/ad799x.c | 6 +++--- drivers/iio/adc/ina2xx-adc.c | 6 +++--- drivers/iio/adc/ltc2471.c | 6 +++--- drivers/iio/adc/ltc2485.c | 6 +++--- drivers/iio/adc/ltc2497.c | 6 +++--- drivers/iio/adc/max1363.c | 6 +++--- drivers/iio/adc/max9611.c | 5 ++--- drivers/iio/adc/mcp3422.c | 6 +++--- drivers/iio/adc/ti-adc081c.c | 6 +++--- drivers/iio/adc/ti-ads1015.c | 6 +++--- drivers/iio/cdc/ad7150.c | 6 +++--- drivers/iio/cdc/ad7746.c | 6 +++--- drivers/iio/chemical/ams-iaq-core.c | 5 ++--- drivers/iio/chemical/atlas-ezo-sensor.c | 6 +++--- drivers/iio/chemical/atlas-sensor.c | 6 +++--- drivers/iio/chemical/bme680_i2c.c | 6 +++--- drivers/iio/chemical/ccs811.c | 6 +++--- drivers/iio/chemical/scd4x.c | 4 ++-- drivers/iio/chemical/sgp30.c | 6 +++--- drivers/iio/chemical/sgp40.c | 6 +++--- drivers/iio/chemical/vz89x.c | 6 +++--- drivers/iio/dac/ad5064.c | 6 +++--- drivers/iio/dac/ad5380.c | 6 +++--- drivers/iio/dac/ad5446.c | 6 +++--- drivers/iio/dac/ad5593r.c | 6 +++--- drivers/iio/dac/ad5696-i2c.c | 6 +++--- drivers/iio/dac/ds4424.c | 6 +++--- drivers/iio/dac/m62332.c | 5 ++--- drivers/iio/dac/max517.c | 6 +++--- drivers/iio/dac/max5821.c | 6 +++--- drivers/iio/dac/mcp4725.c | 6 +++--- drivers/iio/dac/ti-dac5571.c | 6 +++--- drivers/iio/gyro/bmg160_i2c.c | 6 +++--- drivers/iio/gyro/itg3200_core.c | 5 ++--- drivers/iio/gyro/mpu3050-i2c.c | 6 +++--- drivers/iio/gyro/st_gyro_i2c.c | 5 ++--- drivers/iio/health/afe4404.c | 5 ++--- drivers/iio/health/max30100.c | 5 ++--- drivers/iio/health/max30102.c | 6 +++--- drivers/iio/humidity/am2315.c | 5 ++--- drivers/iio/humidity/hdc100x.c | 5 ++--- drivers/iio/humidity/hdc2010.c | 5 ++--- drivers/iio/humidity/hts221_i2c.c | 5 ++--- drivers/iio/humidity/htu21.c | 6 +++--- drivers/iio/humidity/si7005.c | 5 ++--- drivers/iio/humidity/si7020.c | 5 ++--- drivers/iio/imu/bmi160/bmi160_i2c.c | 6 +++--- drivers/iio/imu/fxos8700_i2c.c | 6 +++--- drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 +++--- drivers/iio/imu/kmx61.c | 6 +++--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 6 +++--- drivers/iio/light/adjd_s311.c | 5 ++--- drivers/iio/light/adux1020.c | 5 ++--- drivers/iio/light/al3010.c | 5 ++--- drivers/iio/light/al3320a.c | 5 ++--- drivers/iio/light/apds9300.c | 5 ++--- drivers/iio/light/apds9960.c | 5 ++--- drivers/iio/light/bh1750.c | 6 +++--- drivers/iio/light/bh1780.c | 5 ++--- drivers/iio/light/cm3232.c | 6 +++--- drivers/iio/light/cm3323.c | 5 ++--- drivers/iio/light/cm36651.c | 6 +++--- drivers/iio/light/gp2ap002.c | 5 ++--- drivers/iio/light/gp2ap020a00f.c | 6 +++--- drivers/iio/light/isl29018.c | 6 +++--- drivers/iio/light/isl29028.c | 6 +++--- drivers/iio/light/isl29125.c | 5 ++--- drivers/iio/light/jsa1212.c | 5 ++--- drivers/iio/light/ltr501.c | 6 +++--- drivers/iio/light/lv0104cs.c | 5 ++--- drivers/iio/light/max44000.c | 5 ++--- drivers/iio/light/max44009.c | 5 ++--- drivers/iio/light/noa1305.c | 5 ++--- drivers/iio/light/opt3001.c | 5 ++--- drivers/iio/light/pa12203001.c | 5 ++--- drivers/iio/light/rpr0521.c | 5 ++--- drivers/iio/light/si1133.c | 6 +++--- drivers/iio/light/si1145.c | 6 +++--- drivers/iio/light/st_uvis25_i2c.c | 5 ++--- drivers/iio/light/stk3310.c | 5 ++--- drivers/iio/light/tcs3414.c | 5 ++--- drivers/iio/light/tcs3472.c | 5 ++--- drivers/iio/light/tsl2563.c | 5 ++--- drivers/iio/light/tsl2583.c | 5 ++--- drivers/iio/light/tsl2772.c | 6 +++--- drivers/iio/light/tsl4531.c | 5 ++--- drivers/iio/light/us5182d.c | 5 ++--- drivers/iio/light/vcnl4000.c | 6 +++--- drivers/iio/light/vcnl4035.c | 5 ++--- drivers/iio/light/veml6030.c | 5 ++--- drivers/iio/light/veml6070.c | 5 ++--- drivers/iio/light/zopt2201.c | 5 ++--- drivers/iio/magnetometer/ak8974.c | 5 ++--- drivers/iio/magnetometer/ak8975.c | 6 +++--- drivers/iio/magnetometer/bmc150_magn_i2c.c | 6 +++--- drivers/iio/magnetometer/hmc5843_i2c.c | 6 +++--- drivers/iio/magnetometer/mag3110.c | 6 +++--- drivers/iio/magnetometer/mmc35240.c | 5 ++--- drivers/iio/magnetometer/yamaha-yas530.c | 6 +++--- drivers/iio/potentiometer/ad5272.c | 6 +++--- drivers/iio/potentiometer/ds1803.c | 5 +++-- drivers/iio/potentiometer/max5432.c | 5 ++--- drivers/iio/potentiometer/tpl0102.c | 6 +++--- drivers/iio/potentiostat/lmp91000.c | 5 ++--- drivers/iio/pressure/abp060mg.c | 6 +++--- drivers/iio/pressure/bmp280-i2c.c | 1 + drivers/iio/pressure/dlhl60d.c | 6 +++--- drivers/iio/pressure/dps310.c | 6 +++--- drivers/iio/pressure/hp03.c | 6 +++--- drivers/iio/pressure/hp206c.c | 6 +++--- drivers/iio/pressure/icp10100.c | 5 ++--- drivers/iio/pressure/mpl115_i2c.c | 6 +++--- drivers/iio/pressure/mpl3115.c | 6 +++--- drivers/iio/pressure/ms5611_i2c.c | 6 +++--- drivers/iio/pressure/ms5637.c | 6 +++--- drivers/iio/pressure/st_pressure_i2c.c | 5 ++--- drivers/iio/pressure/t5403.c | 6 +++--- drivers/iio/pressure/zpa2326_i2c.c | 6 +++--- drivers/iio/proximity/isl29501.c | 5 ++--- drivers/iio/proximity/mb1232.c | 6 +++--- .../iio/proximity/pulsedlight-lidar-lite-v2.c | 5 ++--- drivers/iio/proximity/rfd77402.c | 5 ++--- drivers/iio/proximity/srf08.c | 6 +++--- drivers/iio/proximity/sx9500.c | 5 ++--- drivers/iio/temperature/mlx90614.c | 6 +++--- drivers/iio/temperature/mlx90632.c | 12 ++++++++++-- drivers/iio/temperature/tmp006.c | 5 ++--- drivers/iio/temperature/tmp007.c | 6 +++--- drivers/iio/temperature/tsys01.c | 5 ++--- drivers/iio/temperature/tsys02d.c | 6 +++--- drivers/input/joystick/as5011.c | 5 ++--- drivers/input/keyboard/adp5588-keys.c | 5 ++--- drivers/input/keyboard/adp5589-keys.c | 6 +++--- drivers/input/keyboard/cap11xx.c | 6 +++--- drivers/input/keyboard/dlink-dir685-touchkeys.c | 5 ++--- drivers/input/keyboard/lm8323.c | 5 ++--- drivers/input/keyboard/lm8333.c | 5 ++--- drivers/input/keyboard/max7359_keypad.c | 5 ++--- drivers/input/keyboard/mcs_touchkey.c | 6 +++--- drivers/input/keyboard/mpr121_touchkey.c | 5 ++--- drivers/input/keyboard/qt1070.c | 5 ++--- drivers/input/keyboard/qt2160.c | 5 ++--- drivers/input/keyboard/tca6416-keypad.c | 6 +++--- drivers/input/keyboard/tca8418_keypad.c | 5 ++--- drivers/input/keyboard/tm2-touchkey.c | 5 ++--- drivers/input/misc/ad714x-i2c.c | 5 ++--- drivers/input/misc/adxl34x-i2c.c | 5 ++--- drivers/input/misc/apanel.c | 5 ++--- drivers/input/misc/atmel_captouch.c | 5 ++--- drivers/input/misc/bma150.c | 5 ++--- drivers/input/misc/cma3000_d0x_i2c.c | 5 ++--- drivers/input/misc/da7280.c | 5 ++--- drivers/input/misc/drv260x.c | 5 ++--- drivers/input/misc/drv2665.c | 5 ++--- drivers/input/misc/drv2667.c | 5 ++--- drivers/input/misc/ibm-panel.c | 5 ++--- drivers/input/misc/kxtj9.c | 5 ++--- drivers/input/misc/mma8450.c | 5 ++--- drivers/input/misc/pcf8574_keypad.c | 4 ++-- drivers/input/mouse/cyapa.c | 5 ++--- drivers/input/mouse/elan_i2c_core.c | 5 ++--- drivers/input/mouse/synaptics_i2c.c | 5 ++--- drivers/input/rmi4/rmi_i2c.c | 5 ++--- drivers/input/rmi4/rmi_smbus.c | 5 ++--- drivers/input/touchscreen/ad7879-i2c.c | 5 ++--- drivers/input/touchscreen/ar1021_i2c.c | 5 ++--- drivers/input/touchscreen/atmel_mxt_ts.c | 4 ++-- drivers/input/touchscreen/auo-pixcir-ts.c | 5 ++--- drivers/input/touchscreen/bu21013_ts.c | 5 ++--- drivers/input/touchscreen/bu21029_ts.c | 5 ++--- drivers/input/touchscreen/chipone_icn8318.c | 5 ++--- drivers/input/touchscreen/cy8ctma140.c | 5 ++--- drivers/input/touchscreen/cy8ctmg110_ts.c | 5 ++--- drivers/input/touchscreen/cyttsp4_i2c.c | 5 ++--- drivers/input/touchscreen/cyttsp5.c | 5 ++--- drivers/input/touchscreen/cyttsp_i2c.c | 5 ++--- drivers/input/touchscreen/edt-ft5x06.c | 6 +++--- drivers/input/touchscreen/eeti_ts.c | 5 ++--- drivers/input/touchscreen/egalax_ts.c | 5 ++--- drivers/input/touchscreen/ektf2127.c | 5 ++--- drivers/input/touchscreen/goodix.c | 5 ++--- drivers/input/touchscreen/hideep.c | 5 ++--- drivers/input/touchscreen/himax_hx83112b.c | 5 ++--- drivers/input/touchscreen/hycon-hy46xx.c | 5 ++--- drivers/input/touchscreen/ili210x.c | 6 +++--- drivers/input/touchscreen/ilitek_ts_i2c.c | 5 ++--- drivers/input/touchscreen/iqs5xx.c | 5 ++--- drivers/input/touchscreen/max11801_ts.c | 5 ++--- drivers/input/touchscreen/mcs5000_ts.c | 5 ++--- drivers/input/touchscreen/melfas_mip4.c | 4 ++-- drivers/input/touchscreen/migor_ts.c | 5 ++--- drivers/input/touchscreen/mms114.c | 5 ++--- drivers/input/touchscreen/pixcir_i2c_ts.c | 6 +++--- drivers/input/touchscreen/raydium_i2c_ts.c | 5 ++--- drivers/input/touchscreen/rohm_bu21023.c | 5 ++--- drivers/input/touchscreen/s6sy761.c | 5 ++--- drivers/input/touchscreen/silead.c | 6 +++--- drivers/input/touchscreen/sis_i2c.c | 5 ++--- drivers/input/touchscreen/st1232.c | 6 +++--- drivers/input/touchscreen/stmfts.c | 5 ++--- drivers/input/touchscreen/sx8654.c | 6 +++--- drivers/input/touchscreen/tsc2004.c | 5 ++--- drivers/input/touchscreen/tsc2007_core.c | 6 +++--- drivers/input/touchscreen/wacom_i2c.c | 5 ++--- drivers/input/touchscreen/wdt87xx_i2c.c | 5 ++--- drivers/input/touchscreen/zet6223.c | 5 ++--- drivers/input/touchscreen/zforce_ts.c | 5 ++--- drivers/leds/leds-bd2802.c | 5 ++--- drivers/leds/leds-blinkm.c | 5 ++--- drivers/leds/leds-is31fl32xx.c | 5 ++--- drivers/leds/leds-lm3530.c | 5 ++--- drivers/leds/leds-lm3532.c | 5 ++--- drivers/leds/leds-lm355x.c | 6 +++--- drivers/leds/leds-lm3642.c | 5 ++--- drivers/leds/leds-lm3692x.c | 6 +++--- drivers/leds/leds-lm3697.c | 5 ++--- drivers/leds/leds-lp3944.c | 5 ++--- drivers/leds/leds-lp3952.c | 5 ++--- drivers/leds/leds-lp5521.c | 6 +++--- drivers/leds/leds-lp5523.c | 6 +++--- drivers/leds/leds-lp5562.c | 5 ++--- drivers/leds/leds-lp8501.c | 6 +++--- drivers/leds/leds-lp8860.c | 5 ++--- drivers/leds/leds-pca9532.c | 9 ++++----- drivers/leds/leds-pca963x.c | 6 +++--- drivers/leds/leds-tca6507.c | 5 ++--- drivers/leds/leds-tlc591xx.c | 5 ++--- drivers/leds/leds-turris-omnia.c | 5 ++--- drivers/macintosh/ams/ams-i2c.c | 8 +++----- drivers/macintosh/therm_adt746x.c | 6 +++--- drivers/macintosh/therm_windtunnel.c | 5 +++-- drivers/macintosh/windfarm_ad7417_sensor.c | 5 ++--- drivers/macintosh/windfarm_fcu_controls.c | 5 ++--- drivers/macintosh/windfarm_lm75_sensor.c | 8 ++++---- drivers/macintosh/windfarm_lm87_sensor.c | 5 ++--- drivers/macintosh/windfarm_max6690_sensor.c | 5 ++--- drivers/macintosh/windfarm_smu_sat.c | 5 ++--- drivers/media/dvb-frontends/a8293.c | 5 ++--- drivers/media/dvb-frontends/af9013.c | 5 ++--- drivers/media/dvb-frontends/af9033.c | 5 ++--- drivers/media/dvb-frontends/au8522_decoder.c | 5 ++--- drivers/media/dvb-frontends/cxd2099.c | 5 ++--- drivers/media/dvb-frontends/cxd2820r_core.c | 5 ++--- drivers/media/dvb-frontends/dvb-pll.c | 5 +++-- drivers/media/dvb-frontends/helene.c | 5 ++--- drivers/media/dvb-frontends/lgdt3306a.c | 5 ++--- drivers/media/dvb-frontends/lgdt330x.c | 5 ++--- drivers/media/dvb-frontends/m88ds3103.c | 6 +++--- drivers/media/dvb-frontends/mn88443x.c | 6 +++--- drivers/media/dvb-frontends/mn88472.c | 5 ++--- drivers/media/dvb-frontends/mn88473.c | 5 ++--- drivers/media/dvb-frontends/mxl692.c | 5 ++--- drivers/media/dvb-frontends/rtl2830.c | 5 ++--- drivers/media/dvb-frontends/rtl2832.c | 5 ++--- drivers/media/dvb-frontends/si2165.c | 5 ++--- drivers/media/dvb-frontends/si2168.c | 5 ++--- drivers/media/dvb-frontends/sp2.c | 5 ++--- drivers/media/dvb-frontends/stv090x.c | 5 ++--- drivers/media/dvb-frontends/stv6110x.c | 5 ++--- drivers/media/dvb-frontends/tc90522.c | 6 +++--- drivers/media/dvb-frontends/tda10071.c | 5 ++--- drivers/media/dvb-frontends/ts2020.c | 5 ++--- drivers/media/i2c/ad5820.c | 5 ++--- drivers/media/i2c/ad9389b.c | 4 ++-- drivers/media/i2c/adp1653.c | 5 ++--- drivers/media/i2c/adv7170.c | 5 ++--- drivers/media/i2c/adv7175.c | 5 ++--- drivers/media/i2c/adv7180.c | 6 +++--- drivers/media/i2c/adv7183.c | 5 ++--- drivers/media/i2c/adv7393.c | 5 ++--- drivers/media/i2c/adv7511-v4l2.c | 4 ++-- drivers/media/i2c/adv7604.c | 6 +++--- drivers/media/i2c/adv7842.c | 5 ++--- drivers/media/i2c/ak881x.c | 5 ++--- drivers/media/i2c/bt819.c | 5 ++--- drivers/media/i2c/bt856.c | 5 ++--- drivers/media/i2c/bt866.c | 5 ++--- drivers/media/i2c/cs3308.c | 5 ++--- drivers/media/i2c/cs5345.c | 5 ++--- drivers/media/i2c/cs53l32a.c | 6 +++--- drivers/media/i2c/cx25840/cx25840-core.c | 5 ++--- drivers/media/i2c/ir-kbd-i2c.c | 5 +++-- drivers/media/i2c/ks0127.c | 4 ++-- drivers/media/i2c/lm3560.c | 5 ++--- drivers/media/i2c/lm3646.c | 5 ++--- drivers/media/i2c/m52790.c | 5 ++--- drivers/media/i2c/m5mols/m5mols_core.c | 5 ++--- drivers/media/i2c/ml86v7667.c | 5 ++--- drivers/media/i2c/msp3400-driver.c | 5 +++-- drivers/media/i2c/mt9m032.c | 5 ++--- drivers/media/i2c/mt9p031.c | 6 +++--- drivers/media/i2c/mt9t001.c | 5 ++--- drivers/media/i2c/mt9t112.c | 5 ++--- drivers/media/i2c/mt9v011.c | 5 ++--- drivers/media/i2c/mt9v032.c | 6 +++--- drivers/media/i2c/noon010pc30.c | 5 ++--- drivers/media/i2c/ov13858.c | 5 ++--- drivers/media/i2c/ov6650.c | 5 ++--- drivers/media/i2c/ov7640.c | 5 ++--- drivers/media/i2c/ov7670.c | 6 +++--- drivers/media/i2c/ov9640.c | 5 ++--- drivers/media/i2c/rj54n1cb0c.c | 5 ++--- drivers/media/i2c/s5k4ecgx.c | 5 ++--- drivers/media/i2c/s5k6aa.c | 5 ++--- drivers/media/i2c/saa6588.c | 5 ++--- drivers/media/i2c/saa6752hs.c | 5 ++--- drivers/media/i2c/saa7110.c | 5 ++--- drivers/media/i2c/saa7115.c | 6 +++--- drivers/media/i2c/saa7127.c | 6 +++--- drivers/media/i2c/saa717x.c | 5 ++--- drivers/media/i2c/saa7185.c | 5 ++--- drivers/media/i2c/sony-btf-mpx.c | 5 ++--- drivers/media/i2c/sr030pc30.c | 5 ++--- drivers/media/i2c/tda1997x.c | 6 +++--- drivers/media/i2c/tda7432.c | 5 ++--- drivers/media/i2c/tda9840.c | 5 ++--- drivers/media/i2c/tea6415c.c | 5 ++--- drivers/media/i2c/tea6420.c | 5 ++--- drivers/media/i2c/ths7303.c | 5 ++--- drivers/media/i2c/tlv320aic23b.c | 5 ++--- drivers/media/i2c/tvaudio.c | 5 +++-- drivers/media/i2c/tvp514x.c | 5 +++-- drivers/media/i2c/tw2804.c | 5 ++--- drivers/media/i2c/tw9903.c | 5 ++--- drivers/media/i2c/tw9906.c | 5 ++--- drivers/media/i2c/tw9910.c | 5 ++--- drivers/media/i2c/uda1342.c | 5 ++--- drivers/media/i2c/upd64031a.c | 5 ++--- drivers/media/i2c/upd64083.c | 5 ++--- drivers/media/i2c/video-i2c.c | 6 +++--- drivers/media/i2c/vp27smpx.c | 5 ++--- drivers/media/i2c/vpx3220.c | 5 ++--- drivers/media/i2c/vs6624.c | 5 ++--- drivers/media/i2c/wm8739.c | 5 ++--- drivers/media/i2c/wm8775.c | 5 ++--- drivers/media/radio/radio-tea5764.c | 5 ++--- drivers/media/radio/saa7706h.c | 5 ++--- drivers/media/radio/tef6862.c | 5 ++--- drivers/media/test-drivers/vidtv/vidtv_demod.c | 5 ++--- drivers/media/test-drivers/vidtv/vidtv_tuner.c | 5 ++--- drivers/media/tuners/e4000.c | 5 ++--- drivers/media/tuners/fc2580.c | 5 ++--- drivers/media/tuners/m88rs6000t.c | 5 ++--- drivers/media/tuners/mt2060.c | 5 ++--- drivers/media/tuners/mxl301rf.c | 5 ++--- drivers/media/tuners/qm1d1b0004.c | 4 ++-- drivers/media/tuners/qm1d1c0042.c | 5 ++--- drivers/media/tuners/si2157.c | 6 +++--- drivers/media/tuners/tda18212.c | 5 ++--- drivers/media/tuners/tda18250.c | 5 ++--- drivers/media/tuners/tua9001.c | 5 ++--- drivers/media/usb/go7007/s2250-board.c | 5 ++--- drivers/media/v4l2-core/tuner-core.c | 5 ++--- drivers/mfd/88pm800.c | 5 ++--- drivers/mfd/88pm805.c | 5 ++--- drivers/mfd/aat2870-core.c | 5 ++--- drivers/mfd/act8945a.c | 5 ++--- drivers/mfd/adp5520.c | 6 +++--- drivers/mfd/arizona-i2c.c | 6 +++--- drivers/mfd/as3711.c | 5 ++--- drivers/mfd/as3722.c | 5 ++--- drivers/mfd/atc260x-i2c.c | 5 ++--- drivers/mfd/axp20x-i2c.c | 5 ++--- drivers/mfd/bcm590xx.c | 5 ++--- drivers/mfd/bd9571mwv.c | 5 ++--- drivers/mfd/da903x.c | 6 +++--- drivers/mfd/da9052-i2c.c | 6 +++--- drivers/mfd/da9055-i2c.c | 5 ++--- drivers/mfd/da9062-core.c | 6 +++--- drivers/mfd/da9063-i2c.c | 6 +++--- drivers/mfd/da9150-core.c | 5 ++--- drivers/mfd/khadas-mcu.c | 5 ++--- drivers/mfd/lm3533-core.c | 5 ++--- drivers/mfd/lp3943.c | 4 ++-- drivers/mfd/lp873x.c | 5 ++--- drivers/mfd/lp87565.c | 5 ++--- drivers/mfd/lp8788.c | 4 ++-- drivers/mfd/madera-i2c.c | 6 +++--- drivers/mfd/max14577.c | 6 +++--- drivers/mfd/max77620.c | 6 +++--- drivers/mfd/max77693.c | 6 +++--- drivers/mfd/max77843.c | 6 +++--- drivers/mfd/max8907.c | 5 ++--- drivers/mfd/max8925-i2c.c | 5 ++--- drivers/mfd/max8997.c | 6 +++--- drivers/mfd/max8998.c | 6 +++--- drivers/mfd/mc13xxx-i2c.c | 6 +++--- drivers/mfd/menelaus.c | 5 ++--- drivers/mfd/menf21bmc.c | 4 ++-- drivers/mfd/palmas.c | 5 ++--- drivers/mfd/pcf50633-core.c | 5 ++--- drivers/mfd/rc5t583.c | 5 ++--- drivers/mfd/retu-mfd.c | 4 ++-- drivers/mfd/rk808.c | 5 ++--- drivers/mfd/rohm-bd718x7.c | 5 ++--- drivers/mfd/rsmu_i2c.c | 6 +++--- drivers/mfd/rt5033.c | 5 ++--- drivers/mfd/sec-core.c | 5 ++--- drivers/mfd/si476x-i2c.c | 6 +++--- drivers/mfd/sky81452.c | 5 ++--- drivers/mfd/stmfx.c | 5 ++--- drivers/mfd/stmpe-i2c.c | 5 +++-- drivers/mfd/stpmic1.c | 5 ++--- drivers/mfd/stw481x.c | 5 ++--- drivers/mfd/tc3589x.c | 6 +++--- drivers/mfd/ti-lmu.c | 5 +++-- drivers/mfd/tps6105x.c | 5 ++--- drivers/mfd/tps65010.c | 6 +++--- drivers/mfd/tps6507x.c | 5 ++--- drivers/mfd/tps65086.c | 5 ++--- drivers/mfd/tps65090.c | 5 ++--- drivers/mfd/tps65218.c | 5 ++--- drivers/mfd/tps6586x.c | 5 ++--- drivers/mfd/tps65910.c | 6 +++--- drivers/mfd/tps65912-i2c.c | 5 ++--- drivers/mfd/twl-core.c | 5 +++-- drivers/mfd/twl6040.c | 5 ++--- drivers/mfd/wl1273-core.c | 5 ++--- drivers/mfd/wm831x-i2c.c | 6 +++--- drivers/mfd/wm8350-i2c.c | 5 ++--- drivers/mfd/wm8400-core.c | 5 ++--- drivers/mfd/wm8994-core.c | 6 +++--- drivers/misc/ad525x_dpot-i2c.c | 6 +++--- drivers/misc/apds9802als.c | 5 ++--- drivers/misc/apds990x.c | 5 ++--- drivers/misc/bh1770glc.c | 5 ++--- drivers/misc/ds1682.c | 5 ++--- drivers/misc/eeprom/eeprom.c | 5 ++--- drivers/misc/eeprom/idt_89hpesx.c | 4 ++-- drivers/misc/eeprom/max6875.c | 5 ++--- drivers/misc/hmc6352.c | 5 ++--- drivers/misc/ics932s401.c | 8 +++----- drivers/misc/isl29003.c | 5 ++--- drivers/misc/isl29020.c | 5 ++--- drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 5 ++--- drivers/misc/tsl2550.c | 5 ++--- drivers/mtd/maps/pismo.c | 5 ++--- drivers/net/dsa/lan9303_i2c.c | 5 ++--- drivers/net/dsa/microchip/ksz9477_i2c.c | 5 ++--- drivers/net/dsa/xrs700x/xrs700x_i2c.c | 5 ++--- drivers/net/ethernet/mellanox/mlxsw/i2c.c | 6 +++--- drivers/nfc/microread/i2c.c | 5 ++--- drivers/nfc/nfcmrvl/i2c.c | 5 ++--- drivers/nfc/nxp-nci/i2c.c | 5 ++--- drivers/nfc/pn533/i2c.c | 5 ++--- drivers/nfc/pn544/i2c.c | 5 ++--- drivers/nfc/s3fwrn5/i2c.c | 5 ++--- drivers/nfc/st-nci/i2c.c | 5 ++--- drivers/nfc/st21nfca/i2c.c | 5 ++--- drivers/of/unittest.c | 10 ++++------ drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 5 +++-- drivers/pinctrl/pinctrl-sx150x.c | 6 +++--- drivers/platform/chrome/cros_ec_i2c.c | 5 ++--- drivers/power/supply/adp5061.c | 5 ++--- drivers/power/supply/bq2415x_charger.c | 6 +++--- drivers/power/supply/bq24190_charger.c | 6 +++--- drivers/power/supply/bq24257_charger.c | 6 +++--- drivers/power/supply/bq24735-charger.c | 5 ++--- drivers/power/supply/bq2515x_charger.c | 6 +++--- drivers/power/supply/bq256xx_charger.c | 6 +++--- drivers/power/supply/bq25890_charger.c | 5 ++--- drivers/power/supply/bq25980_charger.c | 6 +++--- drivers/power/supply/bq27xxx_battery_i2c.c | 6 +++--- drivers/power/supply/ds2782_battery.c | 6 +++--- drivers/power/supply/lp8727_charger.c | 4 ++-- drivers/power/supply/ltc2941-battery-gauge.c | 5 ++--- drivers/power/supply/ltc4162-l-charger.c | 5 ++--- drivers/power/supply/max14656_charger_detector.c | 5 ++--- drivers/power/supply/max17040_battery.c | 6 +++--- drivers/power/supply/max17042_battery.c | 6 +++--- drivers/power/supply/rt5033_battery.c | 5 ++--- drivers/power/supply/rt9455_charger.c | 5 ++--- drivers/power/supply/sbs-charger.c | 5 ++--- drivers/power/supply/sbs-manager.c | 6 +++--- drivers/power/supply/smb347-charger.c | 6 +++--- drivers/power/supply/ucs1002_power.c | 5 ++--- drivers/power/supply/z2_battery.c | 5 ++--- drivers/pwm/pwm-pca9685.c | 5 ++--- drivers/regulator/act8865-regulator.c | 6 +++--- drivers/regulator/ad5398.c | 6 +++--- drivers/regulator/da9121-regulator.c | 5 ++--- drivers/regulator/fan53555.c | 6 +++--- drivers/regulator/isl6271a-regulator.c | 6 +++--- drivers/regulator/lp3972.c | 5 ++--- drivers/regulator/lp872x.c | 5 +++-- drivers/regulator/lp8755.c | 5 ++--- drivers/regulator/ltc3589.c | 6 +++--- drivers/regulator/max1586.c | 5 ++--- drivers/regulator/max8649.c | 5 ++--- drivers/regulator/max8660.c | 6 +++--- drivers/regulator/max8952.c | 5 ++--- drivers/regulator/max8973-regulator.c | 6 +++--- drivers/regulator/pca9450-regulator.c | 5 ++--- drivers/regulator/pfuze100-regulator.c | 6 +++--- drivers/regulator/pv88080-regulator.c | 6 +++--- drivers/regulator/rpi-panel-attiny-regulator.c | 5 ++--- drivers/regulator/tps51632-regulator.c | 5 ++--- drivers/regulator/tps62360-regulator.c | 6 +++--- drivers/regulator/tps6286x-regulator.c | 5 ++--- drivers/regulator/tps65023-regulator.c | 6 +++--- drivers/rtc/rtc-ds1307.c | 6 +++--- drivers/rtc/rtc-isl1208.c | 1 + drivers/rtc/rtc-m41t80.c | 1 + drivers/rtc/rtc-rs5c372.c | 1 + drivers/spi/spi-sc18is602.c | 6 +++--- drivers/spi/spi-xcomm.c | 5 ++--- drivers/staging/iio/addac/adt7316-i2c.c | 6 +++--- drivers/staging/iio/impedance-analyzer/ad5933.c | 6 +++--- drivers/staging/iio/meter/ade7854-i2c.c | 5 ++--- drivers/staging/most/i2c/i2c.c | 4 ++-- drivers/staging/olpc_dcon/olpc_dcon.c | 4 ++-- drivers/tty/serial/sc16is7xx.c | 6 +++--- drivers/usb/misc/usb251xb.c | 5 ++--- drivers/usb/misc/usb3503.c | 5 ++--- drivers/usb/misc/usb4604.c | 5 ++--- drivers/usb/phy/phy-isp1301-omap.c | 4 ++-- drivers/usb/phy/phy-isp1301.c | 5 ++--- drivers/usb/typec/anx7411.c | 5 ++--- drivers/usb/typec/hd3ss3220.c | 5 ++--- drivers/usb/typec/tcpm/fusb302.c | 5 ++--- drivers/usb/typec/tcpm/tcpci.c | 5 ++--- drivers/usb/typec/tcpm/tcpci_maxim.c | 4 ++-- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 5 ++--- drivers/usb/typec/ucsi/ucsi_ccg.c | 5 ++--- drivers/usb/typec/ucsi/ucsi_stm32g0.c | 4 ++-- drivers/video/backlight/adp8860_bl.c | 6 +++--- drivers/video/backlight/adp8870_bl.c | 6 +++--- drivers/video/backlight/arcxcnn_bl.c | 4 ++-- drivers/video/backlight/bd6107.c | 5 ++--- drivers/video/backlight/lm3630a_bl.c | 5 ++--- drivers/video/backlight/lm3639_bl.c | 5 ++--- drivers/video/backlight/lp855x_bl.c | 5 +++-- drivers/video/backlight/lv5207lp.c | 5 ++--- drivers/video/backlight/tosa_bl.c | 5 ++--- drivers/video/fbdev/matrox/matroxfb_maven.c | 5 ++--- drivers/w1/masters/ds2482.c | 5 ++--- drivers/watchdog/ziirave_wdt.c | 5 ++--- include/linux/i2c.h | 12 +++++++----- sound/aoa/codecs/onyx.c | 5 ++--- sound/aoa/codecs/tas.c | 5 ++--- sound/pci/hda/cs35l41_hda_i2c.c | 4 ++-- sound/ppc/keywest.c | 5 ++--- sound/soc/codecs/es8326.c | 5 ++--- sound/soc/codecs/max98396.c | 6 +++--- sound/soc/codecs/src4xxx-i2c.c | 5 ++--- sound/soc/codecs/tas2780.c | 5 ++--- 607 files changed, 1429 insertions(+), 1790 deletions(-) base-commit: 147307c69ba4441ee90c1f8ce8edf5df4ea60f67 -- 2.38.1

12 36

[PATCH 0/4] RK3588 Audio Support
by Nicolas Frattaroli 25 Nov '22

25 Nov '22

This patchset refactors the Rockchip I2S/TDM driver in order to support the RK3588 SoC, and then adds the necessary compatible string to load the driver for it. Patch 1 rectifies a problem with the bindings where we were too strict about requiring the rockchip,grf property. Most features of this audio device don't need access to the GRF to function. Patch 2 modifies the driver to adjust its behaviour to what the changed bindings now allow, namely using most things without the GRF. Patch 3 and 4 are boring compatible string stuff that enables RK3588 support. No special data is needed to initialise the driver for this instance of the I2S/TDM IP. Nicolas Frattaroli (4): ASoC: dt-bindings: rockchip: i2s-tdm: Make grf property optional ASoC: rockchip: i2s_tdm: Make the grf property optional ASoC: dt-bindings: rockchip: i2s-tdm: Add RK3588 compatible ASoC: rockchip: i2s_tdm: Add support for RK3588 .../bindings/sound/rockchip,i2s-tdm.yaml | 2 +- sound/soc/rockchip/rockchip_i2s_tdm.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) -- 2.38.1

3 8

[PATCH 0/3] ASoC: adau1372: fixes after debugging custom board
by Maarten Zanders 25 Nov '22

25 Nov '22

Maarten Zanders (3): ASoC: adau1372: fix mclk ASoC: adau1372: add support for S24_LE mode ASoC: adau1372: correct PGA enable & mute bit sound/soc/codecs/adau1372.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) base-commit: ef6747add3ad08a23a94b20db0b62688efb9ccd9 -- 2.37.3

3 9

Re: [PATCH] ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd
by Mark Brown 25 Nov '22

25 Nov '22

On Wed, 16 Nov 2022 11:07:50 +0800, Jiasheng Jiang wrote: > As the mtk_btcvsd_snd_write and mtk_btcvsd_snd_read may return error, > it should be better to catch the exception. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_snd commit: d067b3378a78c9c3048ac535e31c171b6f5b5846 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

1 0

[PATCH 1/2] ASoC: ops: Correct bounds check for second channel on SX controls
by Charles Keepax 25 Nov '22

25 Nov '22

Currently the check against the max value for the control is being applied after the value has had the minimum applied and been masked. But the max value simply indicates the number of volume levels on an SX control, and as such should just be applied on the raw value. Fixes: e9b397afabb8 ("ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/soc-ops.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 1970bda074d8a..55b009d3c6815 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -464,16 +464,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, ret = err; if (snd_soc_volsw_is_stereo(mc)) { - unsigned int val2; - - val_mask = mask << rshift; - val2 = (ucontrol->value.integer.value[1] + min) & mask; + unsigned int val2 = ucontrol->value.integer.value[1]; if (mc->platform_max && val2 > mc->platform_max) return -EINVAL; if (val2 > max) return -EINVAL; + val_mask = mask << rshift; + val2 = (val2 + min) & mask; val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask, -- 2.30.2

2 5

Unable to open hostless PCM device after introduction of commit - ASoC: Stop dummy from overriding hwparams
by Patrick Lai 25 Nov '22

25 Nov '22

Hi Amadeusz, On the product I am working on, a hostless PCM device is defined for purpose of activating CODEC driver to setup the path inside CODEC. So, CPU DAI and PCM Platform are defined to use dummy dai & DMA supplied by sound/soc/soc-utils.c. After upgrading to newer kernel, hostless PCM device failed to open. After doing a bit of digging, the root cause is that dummy_dma_hardware is not set in dummy_dma_open() due to new conditional check logic introduced in this commit - 6c504663ba2ee2abeaf5622e27082819326c1bd4. In order to fix problem I am encountering properly without regressing your scenario, I would like to get a better understanding of problem you were addressing. My understanding, from looking through other drivers under sound/soc, is that pcm hardware info is usually set by PCM platform/DMA drivers. For your scenario, do you have other component e.g CPU/CODEC DAI, set PCM hardware definition? I am not sure conditional check logic from 6c504663ba2ee2abeaf5622e27082819326c1bd4 guarantees that other component would be setting pcm hardware info. Appreciate if you can provide more insight to your scenario? Thanks Patrick

3 2

SOC_DOUBLE_R_SX_TLV controls broken in cs24l51 driver
by Guillermo Rodriguez Garcia 25 Nov '22

25 Nov '22

Hi all, I am using a dev board with a Cirrus Logic cs24l51 codec. This used to work fine prior to kernel version 5.x, however after 5.x it is not possible to set certain values for ALSA controls from userspace. I believe this is related to the input validation that is mentioned in this thread: https://lore.kernel.org/all/Yph8C3bRxcr6ogW7@sirena.org.uk/T/, and possibly in this commit: 4f1e50d6a9cf9c1b8c859d449b5031cacfa8404e ("ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()") For the cs24l51, all the controls that fail are using the SOC_DOUBLE_R_SX_TLV macro. I have traced this to the checks in snd_soc_put_volsw_sx, specifically the (val > max - min) check: pr_warn("Max: %d, Min: %d, Value: %d", max, min, val); pr_warn("platform_max: %d", mc->platform_max); if (mc->platform_max && val > mc->platform_max) { return -EINVAL; } if (val > max - min){ pr_warn("(val > max - min) check failed"); return -EINVAL; } if (val < 0) return -EINVAL; According to the datasheet of the CS24L51, section 6.13, page 61, the PCMMIXX_VOL registers accept the following range of values: Binary Code / Volume Setting 001 1000 / +12.0 dB ··· ··· 000 0000 / 0 dB 111 1111 / -0.5 dB 111 1110 / -1.0 dB ··· ··· 001 1001 / -51.5 dB Minimum value is 0x19 (001 1001) corresponding to -51.5 dB, then there are 127 possible gain settings from -51.5 dB to +12.0 dB, in 0.5 dB steps. This is declared in the driver as follows: SOC_DOUBLE_R_SX_TLV("PCM Playback Volume", CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, 0, 0x19, 0x7F, adc_pcm_tlv), 0x19 = min value 0x7F = number of gain settings This seems to be correct according to the semantics of the SOC_DOUBLE_R_SX_TLV macro as described in commit 34198710f55b5f359f43e67d9a08fe5aadfbca1b ("ASoC: Add info callback for SX_TLV controls"). However, the (val > max - min) check in snd_soc_put_volsw_sx fails in the above example because val = 127, max - min = 127 - 25 = 102. So I am not sure how this should be fixed. Is the SX_TLV macro being used incorrectly here? Is the check in snd_soc_put_volsw_sx wrong? Any pointers are welcome. Thanks, (If possible, please CC me in any replies) Guillermo Rodriguez Garcia guille.rodriguez(a)gmail.com

3 4

[PATCH 0/2] SX control bounds check fixups
by Charles Keepax 25 Nov '22

25 Nov '22

These two SX control fixups seem to have got lost somewhere along the line. They were merged back in 5.18 but never seems to actually make it into the kernel: https://lore.kernel.org/all/165236477046.1016627.15470197691244479154.b4-ty… Apologies if resending isn't the correct course but it seemed the safest way to go. Note I have made a slight fixup to the second patch. Thanks, Charles Mark Brown (2): ASoC: ops: Fix bounds check for _sx controls ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() sound/soc/soc-ops.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.30.2

2 3

[PATCH] kselftest/alsa: Add a .gitignore for the newly added PCM test
by Mark Brown 25 Nov '22

25 Nov '22

The newly added PCM test produces a binary which is not ignored by git when built in tree, fix that. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/alsa/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/alsa/.gitignore b/tools/testing/selftests/alsa/.gitignore index 3bb7c41266a8..2b0d11797f25 100644 --- a/tools/testing/selftests/alsa/.gitignore +++ b/tools/testing/selftests/alsa/.gitignore @@ -1 +1,2 @@ mixer-test +pcm-test -- 2.30.2

3 2

[PATCH 0/2] firmware: cs_dsp: Switch to using namespaced exports
by Richard Fitzgerald 25 Nov '22

25 Nov '22

Use EXPORT_SYMBOL_NS_GPL() instead of EXPORT_SYMBOL_GPL() and patch the three drivers that use cs_dsp to add the MODULE_IMPORT_NS(). To make the namespace more specific the KConfig symbol for cs_dsp is changed from CS_DSP to FW_CS_DSP. Richard Fitzgerald (2): firmware: cs_dsp: Rename KConfig symbol CS_DSP -> FW_CS_DSP firmware: cs_dsp: Make the exports namespaced drivers/firmware/cirrus/Kconfig | 2 +- drivers/firmware/cirrus/Makefile | 2 +- drivers/firmware/cirrus/cs_dsp.c | 62 ++++++++++++++++---------------- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/cs35l41_hda.c | 1 + sound/pci/hda/hda_cs_dsp_ctl.c | 1 + sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wm_adsp.c | 1 + 8 files changed, 38 insertions(+), 35 deletions(-) -- 2.30.2

2 3

[PATCH] ASoC: qcom: cleanup and fix dependency of QCOM_COMMON
by Srinivas Kandagatla 25 Nov '22

25 Nov '22

SND_SOC_QCOM_COMMON depends on SOUNDWIRE for some symbols but this is not explicitly specified using Kconfig depends. On the other hand SND_SOC_QCOM_COMMON is also directly selected by the sound card Kconfigs, this could result in various combinations and some symbols ending up in modules and soundcard that uses those symbols as in-build driver. Fix these issues by explicitly specifying the dependencies of SND_SOC_QCOM_COMMON and also use imply a to select SND_SOC_QCOM_COMMON so that the symbol is selected based on its dependencies. Also remove dummy stubs in common.c around CONFIG_SOUNDWIRE Fixes: 3bd975f3ae0a ("ASoC: qcom: sm8250: move some code to common") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/qcom/Kconfig | 16 +++++++++------- sound/soc/qcom/common.c | 2 -- sound/soc/qcom/common.h | 23 ----------------------- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 8c7398bc1ca8..96a6d4731e6f 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -2,6 +2,7 @@ menuconfig SND_SOC_QCOM tristate "ASoC support for QCOM platforms" depends on ARCH_QCOM || COMPILE_TEST + imply SND_SOC_QCOM_COMMON help Say Y or M if you want to add support to use audio devices in Qualcomm Technologies SOC-based platforms. @@ -59,13 +60,14 @@ config SND_SOC_STORM config SND_SOC_APQ8016_SBC tristate "SoC Audio support for APQ8016 SBC platforms" select SND_SOC_LPASS_APQ8016 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help Support for Qualcomm Technologies LPASS audio block in APQ8016 SOC-based systems. Say Y if you want to use audio devices on MI2S. config SND_SOC_QCOM_COMMON + depends on SOUNDWIRE tristate config SND_SOC_QDSP6_COMMON @@ -142,7 +144,7 @@ config SND_SOC_MSM8996 depends on QCOM_APR depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help Support for Qualcomm Technologies LPASS audio block in APQ8096 SoC-based systems. @@ -153,7 +155,7 @@ config SND_SOC_SDM845 depends on QCOM_APR && I2C && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_RT5663 select SND_SOC_MAX98927 imply SND_SOC_CROS_EC_CODEC @@ -167,7 +169,7 @@ config SND_SOC_SM8250 depends on QCOM_APR && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help To add support for audio on Qualcomm Technologies Inc. SM8250 SoC-based systems. @@ -178,7 +180,7 @@ config SND_SOC_SC8280XP depends on QCOM_APR && SOUNDWIRE depends on COMMON_CLK select SND_SOC_QDSP6 - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON help To add support for audio on Qualcomm Technologies Inc. SC8280XP SoC-based systems. @@ -188,7 +190,7 @@ config SND_SOC_SC7180 tristate "SoC Machine driver for SC7180 boards" depends on I2C && GPIOLIB depends on SOUNDWIRE || SOUNDWIRE=n - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_LPASS_SC7180 select SND_SOC_MAX98357A select SND_SOC_RT5682_I2C @@ -202,7 +204,7 @@ config SND_SOC_SC7180 config SND_SOC_SC7280 tristate "SoC Machine driver for SC7280 boards" depends on I2C && SOUNDWIRE - select SND_SOC_QCOM_COMMON + depends on SND_SOC_QCOM_COMMON select SND_SOC_LPASS_SC7280 select SND_SOC_MAX98357A select SND_SOC_WCD938X_SDW diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 69dd3b504e20..49c74c1662a3 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -180,7 +180,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card) } EXPORT_SYMBOL_GPL(qcom_snd_parse_of); -#if IS_ENABLED(CONFIG_SOUNDWIRE) int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, struct sdw_stream_runtime *sruntime, bool *stream_prepared) @@ -294,7 +293,6 @@ int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream, return 0; } EXPORT_SYMBOL_GPL(qcom_snd_sdw_hw_free); -#endif int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup) diff --git a/sound/soc/qcom/common.h b/sound/soc/qcom/common.h index c5472a642de0..3ef5bb6d12df 100644 --- a/sound/soc/qcom/common.h +++ b/sound/soc/qcom/common.h @@ -11,7 +11,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card); int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup); -#if IS_ENABLED(CONFIG_SOUNDWIRE) int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, struct sdw_stream_runtime *runtime, bool *stream_prepared); @@ -21,26 +20,4 @@ int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream, struct sdw_stream_runtime *sruntime, bool *stream_prepared); -#else -static inline int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, - struct sdw_stream_runtime *runtime, - bool *stream_prepared) -{ - return -ENOTSUPP; -} - -static inline int qcom_snd_sdw_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct sdw_stream_runtime **psruntime) -{ - return -ENOTSUPP; -} - -static inline int qcom_snd_sdw_hw_free(struct snd_pcm_substream *substream, - struct sdw_stream_runtime *sruntime, - bool *stream_prepared) -{ - return -ENOTSUPP; -} -#endif #endif -- 2.25.1

2 1

[PATCH] ASoC: qcom: Add checks for devm_kcalloc
by Yuan Can 25 Nov '22

25 Nov '22

As the devm_kcalloc may return NULL, the return value needs to be checked to avoid NULL poineter dereference. Fixes: 24caf8d9eb10 ("ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio") Signed-off-by: Yuan Can <yuancan(a)huawei.com> --- sound/soc/qcom/lpass-sc7180.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index 77a556b27cf0..24a1c121cb2e 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -131,6 +131,9 @@ static int sc7180_lpass_init(struct platform_device *pdev) drvdata->clks = devm_kcalloc(dev, variant->num_clks, sizeof(*drvdata->clks), GFP_KERNEL); + if (!drvdata->clks) + return -ENOMEM; + drvdata->num_clks = variant->num_clks; for (i = 0; i < drvdata->num_clks; i++) -- 2.17.1

2 1

[PATCH 1/2] ASoC: dt-bindings: add compatible string for NAU8318
by David Lin 25 Nov '22

25 Nov '22

The audio amplifier NAU8318 is almost functionally identical to NAU8315. Adds compatible string "nuvoton,nau8318" for driver reuse. Signed-off-by: David Lin <CTLIN0(a)nuvoton.com> --- Documentation/devicetree/bindings/sound/nau8315.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/nau8315.txt b/Documentation/devicetree/bindings/sound/nau8315.txt index 6eaec46f384c..1cd94517d45e 100644 --- a/Documentation/devicetree/bindings/sound/nau8315.txt +++ b/Documentation/devicetree/bindings/sound/nau8315.txt @@ -2,6 +2,7 @@ Nuvoton NAU8315 Mono Class-D Amplifier Required properties: - compatible : "nuvoton,nau8315" + "nuvoton,nau8318" Optional properties: - enable-gpios : GPIO specifier for the chip's device enable input(EN) pin. @@ -16,3 +17,8 @@ nau8315 { compatible = "nuvoton,nau8315"; enable-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; + +nau8318 { + compatible = "nuvoton,nau8318"; + enable-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; +}; -- 2.25.1

2 2

[PATCH 1/2] ASoC: nau8315: add new acpi id and compatible id
by David Lin 25 Nov '22

25 Nov '22

Add new acpi id and compatible id for nau8315. Signed-off-by: David Lin <CTLIN0(a)nuvoton.com> --- sound/soc/codecs/nau8315.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/nau8315.c b/sound/soc/codecs/nau8315.c index ad4dce9e5080..125742601f88 100644 --- a/sound/soc/codecs/nau8315.c +++ b/sound/soc/codecs/nau8315.c @@ -137,6 +137,7 @@ static int nau8315_platform_probe(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id nau8315_device_id[] = { { .compatible = "nuvoton,nau8315" }, + { .compatible = "nuvoton,nau8318" }, {} }; MODULE_DEVICE_TABLE(of, nau8315_device_id); @@ -145,6 +146,7 @@ MODULE_DEVICE_TABLE(of, nau8315_device_id); #ifdef CONFIG_ACPI static const struct acpi_device_id nau8315_acpi_match[] = { { "NVTN2010", 0 }, + { "NVTN2012", 0}, {}, }; MODULE_DEVICE_TABLE(acpi, nau8315_acpi_match); -- 2.25.1

3 7

[PATCH v2] ASoC: mediatek: mt8186: Correct I2S shared clocks
by Jiaxin Yu 25 Nov '22

25 Nov '22

In mt8186 platform, I2S2 should be the main I2S port that provide the clock, on the contrary I2S3 should be the second I2S port that use this clock. Fixes: 9986bdaee477 ("ASoC: mediatek: mt8186: Configure shared clocks") Signed-off-by: Jiaxin Yu <jiaxin.yu(a)mediatek.com> --- Change since v1: Add Fixes tag. --- sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 2 +- sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c index d8c93d66b4e6..970b980a81e6 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c @@ -192,7 +192,7 @@ static int mt8186_mt6366_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *r struct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv; int ret; - ret = mt8186_dai_i2s_set_share(afe, "I2S3", "I2S2"); + ret = mt8186_dai_i2s_set_share(afe, "I2S2", "I2S3"); if (ret) { dev_err(rtd->dev, "Failed to set up shared clocks\n"); return ret; diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index e59d92e2afa3..8f77a0bc1dc8 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -260,7 +260,7 @@ static int mt8186_mt6366_rt1019_rt5682s_hdmi_init(struct snd_soc_pcm_runtime *rt struct mt8186_mt6366_rt1019_rt5682s_priv *priv = soc_card_data->mach_priv; int ret; - ret = mt8186_dai_i2s_set_share(afe, "I2S3", "I2S2"); + ret = mt8186_dai_i2s_set_share(afe, "I2S2", "I2S3"); if (ret) { dev_err(rtd->dev, "Failed to set up shared clocks\n"); return ret; -- 2.25.1

3 2

[PATCH] ASoC: mediatek: mt8186: Correct I2S shared clocks
by Jiaxin Yu 25 Nov '22

25 Nov '22

In mt8186 platform, I2S2 should be the main I2S port that will provide the clock, on the contrary I2S3 should be the second I2S port that will use this clock. Signed-off-by: Jiaxin Yu <jiaxin.yu(a)mediatek.com> --- sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 2 +- sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c index d8c93d66b4e6..970b980a81e6 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c @@ -192,7 +192,7 @@ static int mt8186_mt6366_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *r struct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv; int ret; - ret = mt8186_dai_i2s_set_share(afe, "I2S3", "I2S2"); + ret = mt8186_dai_i2s_set_share(afe, "I2S2", "I2S3"); if (ret) { dev_err(rtd->dev, "Failed to set up shared clocks\n"); return ret; diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index e59d92e2afa3..8f77a0bc1dc8 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -260,7 +260,7 @@ static int mt8186_mt6366_rt1019_rt5682s_hdmi_init(struct snd_soc_pcm_runtime *rt struct mt8186_mt6366_rt1019_rt5682s_priv *priv = soc_card_data->mach_priv; int ret; - ret = mt8186_dai_i2s_set_share(afe, "I2S3", "I2S2"); + ret = mt8186_dai_i2s_set_share(afe, "I2S2", "I2S3"); if (ret) { dev_err(rtd->dev, "Failed to set up shared clocks\n"); return ret; -- 2.18.0

3 2

[PATCH v2 0/2] ASoC: wm_adsp: Report when a control write changes the value
by Richard Fitzgerald 25 Nov '22

25 Nov '22

Writing a firmware control should be returning 1 if the control value changed, so these two patches add that. Though this is an ALSA requirement it is also useful for non-ALSA clients of cs_dsp to know if the control value changed, so the main handling is implemented in cs_dsp. TLV controls are specifically an ALSA thing so they are handled specially in wm_adsp. Simon Trimmer (2): firmware: cs_dsp: cs_dsp_coeff_write_ctrl() should report changed ASoC: wm_adsp: Return whether changed when writing controls drivers/firmware/cirrus/cs_dsp.c | 17 ++++++++++++----- sound/soc/codecs/wm_adsp.c | 27 ++++++++++++++++++--------- 2 files changed, 30 insertions(+), 14 deletions(-) -- 2.30.2

2 3

[PATCH 0/8] ASoC/soundwire: revisit interrupt and lcount handling
by Bard Liao 25 Nov '22

25 Nov '22

The code in drivers/soundwire/intel_init.c is hardware-dependent and the code does not apply to new generations starting with MeteorLake. Refactor and clean-up the code to make this intel_init.c hardware-agnostic and move all hardware-dependencies in the SOF driver using chip descriptors. The ASoC patches are dependent on some patches that are applied to ASoC tree recently. So, this series won't apply to SoundWire tree. @Vinod Could you Ack if it looks good to you, and lets go through ASoC tree? Pierre-Louis Bossart (8): soundwire: intel_init: remove useless interrupt enablement in interrupt thread ASoC: SOF: Intel: hda: add per-chip enable_sdw_irq() callback ASoC: SOF: Intel: mtl: factor interrupt enable/disable interrupt functions ASoC: SOF: Intel: mtl: move SoundWire interrupt enabling to callback ASoC: SOF: Intel: hda: add callback to check SoundWire lcount information soundwire: intel_init: remove sdw_intel_enable_irq() soundwire: intel_init: remove check on number of links ASoC: SOF: Intel: hda: read multi-link capabilities earlier drivers/soundwire/intel_init.c | 37 -------- include/linux/soundwire/sdw_intel.h | 2 - sound/soc/sof/intel/cnl.c | 4 + sound/soc/sof/intel/hda.c | 63 ++++++++++++- sound/soc/sof/intel/hda.h | 12 +++ sound/soc/sof/intel/icl.c | 2 + sound/soc/sof/intel/mtl.c | 131 +++++++++++----------------- sound/soc/sof/intel/shim.h | 2 + sound/soc/sof/intel/tgl.c | 8 ++ 9 files changed, 139 insertions(+), 122 deletions(-) -- 2.25.1

3 12

[PATCH 0/2] ASoC: wm_adsp: Report when a control write changes the value
by Richard Fitzgerald 25 Nov '22

25 Nov '22

Writing a firmware control should be returning 1 if the control value changed, so these two patches add that. Though this is an ALSA requirement it is also useful for non-ALSA clients of cs_dsp to know if the control value changed, so the main handling is implemented in cs_dsp. TLV controls are specifically an ALSA thing so they are handled specially in wm_adsp. Simon Trimmer (2): firmware: cs_dsp: cs_dsp_coeff_write_ctrl() should report changed ASoC: wm_adsp: Return whether changed when writing controls drivers/firmware/cirrus/cs_dsp.c | 17 ++++++++++++----- sound/soc/codecs/wm_adsp.c | 26 +++++++++++++++++--------- 2 files changed, 29 insertions(+), 14 deletions(-) -- 2.30.2

2 3

[PATCH 2/5] driver core: make struct class.devnode() take a const *
by Greg Kroah-Hartman 25 Nov '22

25 Nov '22

The devnode() in struct class should not be modifying the device that is passed into it, so mark it as a const * and propagate the function signature changes out into all relevant subsystems that use this callback. Cc: Fenghua Yu <fenghua.yu(a)intel.com> Cc: Reinette Chatre <reinette.chatre(a)intel.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Dave Hansen <dave.hansen(a)linux.intel.com> Cc: x86(a)kernel.org Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: FUJITA Tomonori <fujita.tomonori(a)lab.ntt.co.jp> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: Justin Sanders <justin(a)coraid.com> Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Benjamin Gaignard <benjamin.gaignard(a)collabora.com> Cc: Liam Mark <lmark(a)codeaurora.org> Cc: Laura Abbott <labbott(a)redhat.com> Cc: Brian Starkey <Brian.Starkey(a)arm.com> Cc: John Stultz <jstultz(a)google.com> Cc: "Christian König" <christian.koenig(a)amd.com> Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Cc: Maxime Ripard <mripard(a)kernel.org> Cc: Thomas Zimmermann <tzimmermann(a)suse.de> Cc: David Airlie <airlied(a)gmail.com> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Jason Gunthorpe <jgg(a)ziepe.ca> Cc: Leon Romanovsky <leon(a)kernel.org> Cc: Dennis Dalessandro <dennis.dalessandro(a)cornelisnetworks.com> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Sean Young <sean(a)mess.org> Cc: Frank Haverkamp <haver(a)linux.ibm.com> Cc: Jiri Slaby <jirislaby(a)kernel.org> Cc: "Michael S. Tsirkin" <mst(a)redhat.com> Cc: Jason Wang <jasowang(a)redhat.com> Cc: Alex Williamson <alex.williamson(a)redhat.com> Cc: Cornelia Huck <cohuck(a)redhat.com> Cc: Kees Cook <keescook(a)chromium.org> Cc: Anton Vorontsov <anton(a)enomsg.org> Cc: Colin Cross <ccross(a)android.com> Cc: Tony Luck <tony.luck(a)intel.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> Cc: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Cc: Xie Yongji <xieyongji(a)bytedance.com> Cc: Gautam Dawar <gautam.dawar(a)xilinx.com> Cc: Dan Carpenter <error27(a)gmail.com> Cc: Eli Cohen <elic(a)nvidia.com> Cc: Parav Pandit <parav(a)nvidia.com> Cc: Maxime Coquelin <maxime.coquelin(a)redhat.com> Cc: alsa-devel(a)alsa-project.org Cc: dri-devel(a)lists.freedesktop.org Cc: kvm(a)vger.kernel.org Cc: linaro-mm-sig(a)lists.linaro.org Cc: linux-block(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-media(a)vger.kernel.org Cc: linux-rdma(a)vger.kernel.org Cc: linux-scsi(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: virtualization(a)lists.linux-foundation.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 ++-- arch/x86/kernel/cpuid.c | 2 +- arch/x86/kernel/msr.c | 2 +- block/bsg.c | 2 +- drivers/block/aoe/aoechr.c | 2 +- drivers/char/mem.c | 2 +- drivers/char/misc.c | 4 ++-- drivers/dma-buf/dma-heap.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 2 +- drivers/infiniband/core/user_mad.c | 2 +- drivers/infiniband/core/uverbs_main.c | 2 +- drivers/infiniband/hw/hfi1/device.c | 4 ++-- drivers/input/input.c | 2 +- drivers/media/dvb-core/dvbdev.c | 4 ++-- drivers/media/pci/ddbridge/ddbridge-core.c | 4 ++-- drivers/media/rc/rc-main.c | 2 +- drivers/misc/genwqe/card_base.c | 2 +- drivers/tty/tty_io.c | 2 +- drivers/usb/core/file.c | 2 +- drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- drivers/vfio/vfio_main.c | 2 +- fs/pstore/pmsg.c | 2 +- include/linux/device/class.h | 2 +- sound/sound_core.c | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c index d961ae3ed96e..4e4231a58f38 100644 --- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c +++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c @@ -1560,9 +1560,9 @@ static const struct file_operations pseudo_lock_dev_fops = { .mmap = pseudo_lock_dev_mmap, }; -static char *pseudo_lock_devnode(struct device *dev, umode_t *mode) +static char *pseudo_lock_devnode(const struct device *dev, umode_t *mode) { - struct rdtgroup *rdtgrp; + const struct rdtgroup *rdtgrp; rdtgrp = dev_get_drvdata(dev); if (mode) diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 6f7b8cc1bc9f..621ba9c0f17a 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c @@ -139,7 +139,7 @@ static int cpuid_device_destroy(unsigned int cpu) return 0; } -static char *cpuid_devnode(struct device *dev, umode_t *mode) +static char *cpuid_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt)); } diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index ed8ac6bcbafb..708751311786 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -250,7 +250,7 @@ static int msr_device_destroy(unsigned int cpu) return 0; } -static char *msr_devnode(struct device *dev, umode_t *mode) +static char *msr_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev->devt)); } diff --git a/block/bsg.c b/block/bsg.c index 2ab1351eb082..08046bd9207d 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -232,7 +232,7 @@ struct bsg_device *bsg_register_queue(struct request_queue *q, } EXPORT_SYMBOL_GPL(bsg_register_queue); -static char *bsg_devnode(struct device *dev, umode_t *mode) +static char *bsg_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev)); } diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c index 8eea2529da20..7a368c90467d 100644 --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c @@ -273,7 +273,7 @@ static const struct file_operations aoe_fops = { .llseek = noop_llseek, }; -static char *aoe_devnode(struct device *dev, umode_t *mode) +static char *aoe_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "etherd/%s", dev_name(dev)); } diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 5611d127363e..83bf2a4dcb57 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -746,7 +746,7 @@ static const struct file_operations memory_fops = { .llseek = noop_llseek, }; -static char *mem_devnode(struct device *dev, umode_t *mode) +static char *mem_devnode(const struct device *dev, umode_t *mode) { if (mode && devlist[MINOR(dev->devt)].mode) *mode = devlist[MINOR(dev->devt)].mode; diff --git a/drivers/char/misc.c b/drivers/char/misc.c index cba19bfdc44d..88c6995b9a3d 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -254,9 +254,9 @@ void misc_deregister(struct miscdevice *misc) } EXPORT_SYMBOL(misc_deregister); -static char *misc_devnode(struct device *dev, umode_t *mode) +static char *misc_devnode(const struct device *dev, umode_t *mode) { - struct miscdevice *c = dev_get_drvdata(dev); + const struct miscdevice *c = dev_get_drvdata(dev); if (mode && c->mode) *mode = c->mode; diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c index 8f5848aa144f..4d7150791315 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -299,7 +299,7 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) return err_ret; } -static char *dma_heap_devnode(struct device *dev, umode_t *mode) +static char *dma_heap_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "dma_heap/%s", dev_name(dev)); } diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 430e00b16eec..14bf156b3f1b 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -90,7 +90,7 @@ static void drm_sysfs_acpi_register(void) { } static void drm_sysfs_acpi_unregister(void) { } #endif -static char *drm_devnode(struct device *dev, umode_t *mode) +static char *drm_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev)); } diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 98cb594cd9a6..f83954180a33 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -1224,7 +1224,7 @@ static struct attribute *umad_class_dev_attrs[] = { }; ATTRIBUTE_GROUPS(umad_class_dev); -static char *umad_devnode(struct device *dev, umode_t *mode) +static char *umad_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev)); } diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index d54434088727..bdb179a09d77 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -1237,7 +1237,7 @@ static void ib_uverbs_remove_one(struct ib_device *device, void *client_data) put_device(&uverbs_dev->dev); } -static char *uverbs_devnode(struct device *dev, umode_t *mode) +static char *uverbs_devnode(const struct device *dev, umode_t *mode) { if (mode) *mode = 0666; diff --git a/drivers/infiniband/hw/hfi1/device.c b/drivers/infiniband/hw/hfi1/device.c index 8ceff7141baf..1f4496032170 100644 --- a/drivers/infiniband/hw/hfi1/device.c +++ b/drivers/infiniband/hw/hfi1/device.c @@ -72,7 +72,7 @@ const char *class_name(void) return hfi1_class_name; } -static char *hfi1_devnode(struct device *dev, umode_t *mode) +static char *hfi1_devnode(const struct device *dev, umode_t *mode) { if (mode) *mode = 0600; @@ -85,7 +85,7 @@ static const char *class_name_user(void) return hfi1_class_name_user; } -static char *hfi1_user_devnode(struct device *dev, umode_t *mode) +static char *hfi1_user_devnode(const struct device *dev, umode_t *mode) { if (mode) *mode = 0666; diff --git a/drivers/input/input.c b/drivers/input/input.c index ebb2b7f0f8ff..50597165dc54 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1913,7 +1913,7 @@ static const struct device_type input_dev_type = { #endif }; -static char *input_devnode(struct device *dev, umode_t *mode) +static char *input_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev)); } diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index 6ef18bab9648..e73f5240cc2c 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -1018,9 +1018,9 @@ static int dvb_uevent(const struct device *dev, struct kobj_uevent_env *env) return 0; } -static char *dvb_devnode(struct device *dev, umode_t *mode) +static char *dvb_devnode(const struct device *dev, umode_t *mode) { - struct dvb_device *dvbdev = dev_get_drvdata(dev); + const struct dvb_device *dvbdev = dev_get_drvdata(dev); return kasprintf(GFP_KERNEL, "dvb/adapter%d/%s%d", dvbdev->adapter->num, dnames[dvbdev->type], dvbdev->id); diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c index fe833f39698a..ee8087f29b2c 100644 --- a/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/drivers/media/pci/ddbridge/ddbridge-core.c @@ -2716,9 +2716,9 @@ static const struct file_operations ddb_fops = { .release = ddb_release, }; -static char *ddb_devnode(struct device *device, umode_t *mode) +static char *ddb_devnode(const struct device *device, umode_t *mode) { - struct ddb *dev = dev_get_drvdata(device); + const struct ddb *dev = dev_get_drvdata(device); return kasprintf(GFP_KERNEL, "ddbridge/card%d", dev->nr); } diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index eba0cd30e314..527d9324742b 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -1017,7 +1017,7 @@ static void ir_close(struct input_dev *idev) } /* class for /sys/class/rc */ -static char *rc_devnode(struct device *dev, umode_t *mode) +static char *rc_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev)); } diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c index 693981891870..0f00687f72d4 100644 --- a/drivers/misc/genwqe/card_base.c +++ b/drivers/misc/genwqe/card_base.c @@ -1349,7 +1349,7 @@ static struct pci_driver genwqe_driver = { * Default mode should be rw for everybody. Do not change default * device name. */ -static char *genwqe_devnode(struct device *dev, umode_t *mode) +static char *genwqe_devnode(const struct device *dev, umode_t *mode) { if (mode) *mode = 0666; diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index de06c3c2ff70..aad8171f6c21 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -3494,7 +3494,7 @@ void tty_default_fops(struct file_operations *fops) *fops = tty_fops; } -static char *tty_devnode(struct device *dev, umode_t *mode) +static char *tty_devnode(const struct device *dev, umode_t *mode) { if (!mode) return NULL; diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index 558890ada0e5..da7d88e069e6 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c @@ -62,7 +62,7 @@ static struct usb_class { struct class *class; } *usb_class; -static char *usb_devnode(struct device *dev, umode_t *mode) +static char *usb_devnode(const struct device *dev, umode_t *mode) { struct usb_class_driver *drv; diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c index 35dceee3ed56..0dd3c1f291da 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -1656,7 +1656,7 @@ static const struct file_operations vduse_ctrl_fops = { .llseek = noop_llseek, }; -static char *vduse_devnode(struct device *dev, umode_t *mode) +static char *vduse_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "vduse/%s", dev_name(dev)); } diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index 6e8804fe0095..5bf4b3454918 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -1812,7 +1812,7 @@ EXPORT_SYMBOL(vfio_set_irqs_validate_and_prepare); /* * Module/class support */ -static char *vfio_devnode(struct device *dev, umode_t *mode) +static char *vfio_devnode(const struct device *dev, umode_t *mode) { return kasprintf(GFP_KERNEL, "vfio/%s", dev_name(dev)); } diff --git a/fs/pstore/pmsg.c b/fs/pstore/pmsg.c index d8542ec2f38c..b31c9c72d90b 100644 --- a/fs/pstore/pmsg.c +++ b/fs/pstore/pmsg.c @@ -46,7 +46,7 @@ static int pmsg_major; #undef pr_fmt #define pr_fmt(fmt) PMSG_NAME ": " fmt -static char *pmsg_devnode(struct device *dev, umode_t *mode) +static char *pmsg_devnode(const struct device *dev, umode_t *mode) { if (mode) *mode = 0220; diff --git a/include/linux/device/class.h b/include/linux/device/class.h index 94b1107258e5..42cc3fb44a84 100644 --- a/include/linux/device/class.h +++ b/include/linux/device/class.h @@ -60,7 +60,7 @@ struct class { struct kobject *dev_kobj; int (*dev_uevent)(const struct device *dev, struct kobj_uevent_env *env); - char *(*devnode)(struct device *dev, umode_t *mode); + char *(*devnode)(const struct device *dev, umode_t *mode); void (*class_release)(struct class *class); void (*dev_release)(struct device *dev); diff --git a/sound/sound_core.c b/sound/sound_core.c index 3332fe321737..3e7dd6fcb7cf 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -30,7 +30,7 @@ MODULE_DESCRIPTION("Core sound module"); MODULE_AUTHOR("Alan Cox"); MODULE_LICENSE("GPL"); -static char *sound_devnode(struct device *dev, umode_t *mode) +static char *sound_devnode(const struct device *dev, umode_t *mode) { if (MAJOR(dev->devt) == SOUND_MAJOR) return NULL; -- 2.38.1

3 2

[PATCH] ASoC: qcom: Fix build error if CONFIG_SOUNDWIRE=m
by Zhang Qilong 25 Nov '22

25 Nov '22

If CONFIG_SND_SOC_APQ8016_SBC=y || CONFIG_SND_SOC_MSM8996=y, CONFIG_SND_SOC_QCOM_COMMON=y, CONFIG_SOUNDWIRE=m, building fails: sound/soc/qcom/common.o: in function `qcom_snd_sdw_hw_free': common.c:(.text+0x294): undefined reference to `sdw_disable_stream' common.c:(.text+0x2a0): undefined reference to `sdw_deprepare_stream' sound/soc/qcom/common.o: in function `qcom_snd_sdw_prepare': common.c:(.text+0x314): undefined reference to `sdw_prepare_stream' common.c:(.text+0x324): undefined reference to `sdw_enable_stream' common.c:(.text+0x364): undefined reference to `sdw_disable_stream' common.c:(.text+0x36c): undefined reference to `sdw_deprepare_stream' common.c:(.text+0x3a8): undefined reference to `sdw_deprepare_stream' Make SND_SOC_APQ8016_SBC,SND_SOC_MSM8996 depends on 'SOUNDWIRE || !SOUNDWIRE' to fix this. Fixes: 3bd975f3ae0a ("ASoC: qcom: sm8250: move some code to common") Signed-off-by: Zhang Qilong <zhangqilong3(a)huawei.com> --- sound/soc/qcom/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 8c7398bc1ca8..f5f0b48d74af 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -58,6 +58,7 @@ config SND_SOC_STORM config SND_SOC_APQ8016_SBC tristate "SoC Audio support for APQ8016 SBC platforms" + depends on SOUNDWIRE || !SOUNDWIRE select SND_SOC_LPASS_APQ8016 select SND_SOC_QCOM_COMMON help @@ -141,6 +142,7 @@ config SND_SOC_MSM8996 tristate "SoC Machine driver for MSM8996 and APQ8096 boards" depends on QCOM_APR depends on COMMON_CLK + depends on SOUNDWIRE || !SOUNDWIRE select SND_SOC_QDSP6 select SND_SOC_QCOM_COMMON help -- 2.25.1

2 1

PROBLEM: No sound on HP Firefly 14 G9 laptop
by Ivan Mrva 25 Nov '22

25 Nov '22

[1.] One line summary of the problem: No sound on HP Firefly 14 G9 [2.] Full description of the problem/report: Although the corresponding kernel module is loaded successfully and I can also see a sound output being produced on the software level (in gnome-control-center), physically there is still no sound coming out of the speakers. My HW card was identified with the code "0x103c" "0x896d", for which a patch was already submitted in the following commit: https://github.com/torvalds/linux/commit/f86bfeb689f2c4ebe12782ef0578ef778f…. Unfortunately not working in my case. Also the patch identified the model as "HP Zbook Firefly 16 G9", however in my case the model is used "HP Zbook Firefly 14 G6" (14 not 16). [4.1.] Kernel version: 6.1-rc6 [8.3.] Module information: snd_hda_scodec_cs35l41_i2c [8.4.] Loaded driver and hardware information (/proc/ioports, /proc/iomem): Here some relevant output from systemd's journalctl: Nov 24 20:52:43 laptop-brn alsactl[2916]: Found hardware: "HDA-Intel" "Realtek ALC245" "HDA:10ec0245,103c8972,00100001 HDA:8086281c,80860101,00100000" "0x103c" "0x896d" Nov 24 21:07:26 laptop-brn alsactl[2937]: Found hardware: "HDA-Intel" "Realtek ALC245" "HDA:10ec0245,103c8972,00100001 HDA:8086281c,80860101,00100000" "0x103c" "0x896d" Nov 25 07:34:11 laptop-brn kernel: snd_hda_intel 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040100 Nov 25 07:34:11 laptop-brn kernel: snd_hda_intel 0000:00:1f.3: Digital mics found on Skylake+ platform, using SOF driver Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: autoconfig for ALC245: line_outs=1 (0x17/0x0/0x0/0x0/0x0) type:speaker Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: hp_outs=1 (0x21/0x0/0x0/0x0/0x0) Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: mono: mono_out=0x0 Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: inputs: Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: Mic=0x19 Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: ASoC: sink widget AIF1TX overwritten Nov 25 07:34:15 laptop-brn kernel: snd_hda_codec_realtek ehdaudio0D0: ASoC: source widget AIF1RX overwritten [X.] Other notes, patches, fixes, workarounds: I don't know by myself how to fix it - not sure what exactly is relevant on the HW side to be checked and how to patch it in the patch_realtek.c exactly. Would be glad if you could help me navigate here (what HW information should I look for) and would be happy to try to patch it and test by myself on my machine. Thank you.

1 0

[PATCH v2 0/9] dt-bindings: cleanup titles
by Krzysztof Kozlowski 24 Nov '22

24 Nov '22

Changes since v1 ================ 1. "common parts" -> "Common Properties". 2. Capitalize titles in other patches doing manual fixups. 3. Drop change of quotes in common DMA bindings. 4. Drop also "schema" from titles in few files. 5. Add tags. Merging ======= Intention is to regenerate the commits with commands at the end of merge window. This should go then via Rob's tree. Description =========== The Devicetree bindings document does not have to say in the title that it is a "Devicetree binding" or "schema', but instead just describe the hardware. We have several of such patterns, so when people copy existing bindings into new ones, they make similar mistake. Clean this stuff with: 1. Automated find+sed commands. 2. Manual updates to have something meaningful in the title. Best regards, Krzysztof Krzysztof Kozlowski (9): dt-bindings: drop redundant part of title of shared bindings dt-bindings: memory-controllers: ti,gpmc-child: drop redundant part of title dt-bindings: clock: st,stm32mp1-rcc: add proper title dt-bindings: drop redundant part of title (end) dt-bindings: drop redundant part of title (end, part two) dt-bindings: drop redundant part of title (end, part three) dt-bindings: drop redundant part of title (beginning) dt-bindings: clock: drop redundant part of title dt-bindings: drop redundant part of title (manual) Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml | 2 +- Documentation/devicetree/bindings/arm/cci-control-port.yaml | 2 +- Documentation/devicetree/bindings/arm/cpus.yaml | 2 +- .../devicetree/bindings/arm/firmware/linaro,optee-tz.yaml | 2 +- Documentation/devicetree/bindings/arm/hisilicon/hisilicon.yaml | 2 +- .../devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml | 2 +- Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml | 2 +- Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml | 2 +- Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml | 2 +- Documentation/devicetree/bindings/arm/mstar/mstar.yaml | 2 +- Documentation/devicetree/bindings/arm/npcm/npcm.yaml | 2 +- Documentation/devicetree/bindings/arm/nxp/lpc32xx.yaml | 2 +- Documentation/devicetree/bindings/arm/socionext/milbeaut.yaml | 2 +- Documentation/devicetree/bindings/arm/socionext/uniphier.yaml | 2 +- Documentation/devicetree/bindings/arm/sp810.yaml | 2 +- Documentation/devicetree/bindings/arm/sprd/sprd.yaml | 2 +- Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml | 2 +- .../devicetree/bindings/arm/stm32/st,stm32-syscon.yaml | 2 +- Documentation/devicetree/bindings/arm/stm32/stm32.yaml | 2 +- .../bindings/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml | 2 +- .../devicetree/bindings/arm/sunxi/allwinner,sun9i-a80-prcm.yaml | 2 +- .../bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 2 +- .../devicetree/bindings/arm/tegra/nvidia,tegra194-cbb.yaml | 2 +- .../devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 2 +- Documentation/devicetree/bindings/arm/ti/k3.yaml | 2 +- Documentation/devicetree/bindings/arm/ti/ti,davinci.yaml | 2 +- Documentation/devicetree/bindings/arm/vexpress-config.yaml | 2 +- Documentation/devicetree/bindings/arm/vexpress-sysreg.yaml | 2 +- .../devicetree/bindings/ata/allwinner,sun4i-a10-ahci.yaml | 2 +- .../devicetree/bindings/ata/allwinner,sun8i-r40-ahci.yaml | 2 +- Documentation/devicetree/bindings/bus/ti-sysc.yaml | 2 +- Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml | 2 +- Documentation/devicetree/bindings/clock/calxeda.yaml | 2 +- Documentation/devicetree/bindings/clock/cirrus,cs2000-cp.yaml | 2 +- Documentation/devicetree/bindings/clock/fixed-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/fixed-factor-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/fixed-mmio-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/fsl,plldig.yaml | 2 +- Documentation/devicetree/bindings/clock/fsl,sai-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/fsl,scu-clk.yaml | 2 +- Documentation/devicetree/bindings/clock/idt,versaclock5.yaml | 2 +- Documentation/devicetree/bindings/clock/imx1-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx21-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx23-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx25-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx27-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx28-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx31-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx35-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx5-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6q-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6sl-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6sll-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6sx-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6ul-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx7d-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx7ulp-pcc-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx7ulp-scg-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx8m-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml | 2 +- Documentation/devicetree/bindings/clock/imx8ulp-cgc-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx8ulp-pcc-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx93-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/ingenic,cgu.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,agilex.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,cgu-lgm.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,easic-n5x.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,stratix10.yaml | 2 +- .../devicetree/bindings/clock/microchip,mpfs-clkcfg.yaml | 2 +- Documentation/devicetree/bindings/clock/milbeaut-clock.yaml | 2 +- .../devicetree/bindings/clock/nuvoton,npcm845-clk.yaml | 2 +- .../devicetree/bindings/clock/qcom,dispcc-sc8280xp.yaml | 2 +- Documentation/devicetree/bindings/clock/qcom,gcc.yaml | 2 +- Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 +- Documentation/devicetree/bindings/clock/renesas,9series.yaml | 2 +- .../devicetree/bindings/clock/renesas,versaclock7.yaml | 2 +- .../devicetree/bindings/clock/rockchip,rk3568-cru.yaml | 2 +- Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 2 +- Documentation/devicetree/bindings/clock/ti,lmk04832.yaml | 2 +- Documentation/devicetree/bindings/clock/ti,sci-clk.yaml | 2 +- Documentation/devicetree/bindings/clock/ti/ti,clksel.yaml | 2 +- Documentation/devicetree/bindings/cpu/idle-states.yaml | 2 +- .../devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml | 2 +- .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- Documentation/devicetree/bindings/crypto/st,stm32-crc.yaml | 2 +- Documentation/devicetree/bindings/crypto/st,stm32-cryp.yaml | 2 +- Documentation/devicetree/bindings/crypto/st,stm32-hash.yaml | 2 +- Documentation/devicetree/bindings/display/arm,hdlcd.yaml | 2 +- Documentation/devicetree/bindings/display/arm,malidp.yaml | 2 +- Documentation/devicetree/bindings/display/bridge/anx6345.yaml | 2 +- .../devicetree/bindings/display/bridge/chrontel,ch7033.yaml | 2 +- .../devicetree/bindings/display/bridge/ingenic,jz4780-hdmi.yaml | 2 +- .../devicetree/bindings/display/bridge/intel,keembay-dsi.yaml | 2 +- .../devicetree/bindings/display/bridge/ite,it6505.yaml | 2 +- .../devicetree/bindings/display/bridge/ite,it66121.yaml | 2 +- Documentation/devicetree/bindings/display/bridge/ps8640.yaml | 2 +- .../devicetree/bindings/display/bridge/toshiba,tc358767.yaml | 2 +- .../devicetree/bindings/display/bridge/toshiba,tc358775.yaml | 2 +- Documentation/devicetree/bindings/display/ingenic,ipu.yaml | 2 +- Documentation/devicetree/bindings/display/ingenic,lcd.yaml | 2 +- .../devicetree/bindings/display/intel,keembay-display.yaml | 2 +- .../devicetree/bindings/display/intel,keembay-msscam.yaml | 2 +- .../devicetree/bindings/display/mediatek/mediatek,cec.yaml | 2 +- .../devicetree/bindings/display/mediatek/mediatek,dsi.yaml | 2 +- .../devicetree/bindings/display/mediatek/mediatek,hdmi-ddc.yaml | 2 +- .../devicetree/bindings/display/mediatek/mediatek,hdmi.yaml | 2 +- Documentation/devicetree/bindings/display/msm/gmu.yaml | 2 +- Documentation/devicetree/bindings/display/msm/gpu.yaml | 2 +- .../devicetree/bindings/display/panel/display-timings.yaml | 2 +- .../devicetree/bindings/display/panel/ilitek,ili9163.yaml | 2 +- .../devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml | 2 +- Documentation/devicetree/bindings/display/panel/panel-lvds.yaml | 2 +- .../devicetree/bindings/display/panel/panel-timing.yaml | 2 +- .../devicetree/bindings/display/panel/visionox,rm69299.yaml | 2 +- Documentation/devicetree/bindings/dma/dma-common.yaml | 2 +- Documentation/devicetree/bindings/dma/dma-controller.yaml | 2 +- Documentation/devicetree/bindings/dma/dma-router.yaml | 2 +- Documentation/devicetree/bindings/dma/ingenic,dma.yaml | 2 +- Documentation/devicetree/bindings/dma/st,stm32-dma.yaml | 2 +- Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- Documentation/devicetree/bindings/dma/st,stm32-mdma.yaml | 2 +- Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml | 2 +- Documentation/devicetree/bindings/dma/ti/k3-pktdma.yaml | 2 +- Documentation/devicetree/bindings/dma/ti/k3-udma.yaml | 2 +- .../devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 2 +- Documentation/devicetree/bindings/edac/dmc-520.yaml | 2 +- Documentation/devicetree/bindings/eeprom/microchip,93lc46b.yaml | 2 +- Documentation/devicetree/bindings/example-schema.yaml | 2 +- Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 2 +- Documentation/devicetree/bindings/firmware/arm,scpi.yaml | 2 +- .../devicetree/bindings/firmware/qemu,fw-cfg-mmio.yaml | 2 +- Documentation/devicetree/bindings/gpio/gpio-tpic2810.yaml | 2 +- Documentation/devicetree/bindings/gpio/ti,omap-gpio.yaml | 2 +- Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 2 +- Documentation/devicetree/bindings/gpu/vivante,gc.yaml | 2 +- .../devicetree/bindings/hwlock/st,stm32-hwspinlock.yaml | 2 +- Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml | 2 +- Documentation/devicetree/bindings/i2c/i2c-gpio.yaml | 2 +- Documentation/devicetree/bindings/i2c/i2c-pxa.yaml | 2 +- Documentation/devicetree/bindings/i2c/ingenic,i2c.yaml | 2 +- Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml | 2 +- Documentation/devicetree/bindings/i2c/ti,omap4-i2c.yaml | 2 +- Documentation/devicetree/bindings/i3c/i3c.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/adc.yaml | 2 +- .../devicetree/bindings/iio/adc/allwinner,sun8i-a33-ths.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml | 2 +- .../devicetree/bindings/iio/adc/motorola,cpcap-adc.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/nxp,lpc1850-adc.yaml | 2 +- .../devicetree/bindings/iio/adc/sigma-delta-modulator.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/ti,palmas-gpadc.yaml | 2 +- .../devicetree/bindings/iio/adc/x-powers,axp209-adc.yaml | 2 +- Documentation/devicetree/bindings/iio/dac/nxp,lpc1850-dac.yaml | 2 +- Documentation/devicetree/bindings/iio/dac/st,stm32-dac.yaml | 2 +- .../devicetree/bindings/iio/multiplexer/io-channel-mux.yaml | 2 +- Documentation/devicetree/bindings/input/fsl,scu-key.yaml | 2 +- Documentation/devicetree/bindings/input/gpio-keys.yaml | 2 +- Documentation/devicetree/bindings/input/input.yaml | 2 +- Documentation/devicetree/bindings/input/matrix-keymap.yaml | 2 +- Documentation/devicetree/bindings/input/microchip,cap11xx.yaml | 2 +- .../devicetree/bindings/input/pine64,pinephone-keyboard.yaml | 2 +- .../devicetree/bindings/input/touchscreen/chipone,icn8318.yaml | 2 +- .../bindings/input/touchscreen/cypress,cy8ctma140.yaml | 2 +- .../bindings/input/touchscreen/cypress,cy8ctma340.yaml | 2 +- .../devicetree/bindings/input/touchscreen/edt-ft5x06.yaml | 2 +- Documentation/devicetree/bindings/input/touchscreen/goodix.yaml | 2 +- .../devicetree/bindings/input/touchscreen/himax,hx83112b.yaml | 2 +- .../devicetree/bindings/input/touchscreen/hycon,hy46xx.yaml | 2 +- .../devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml | 2 +- .../devicetree/bindings/input/touchscreen/melfas,mms114.yaml | 2 +- .../devicetree/bindings/input/touchscreen/mstar,msg2638.yaml | 2 +- .../devicetree/bindings/input/touchscreen/pixcir,pixcir_ts.yaml | 2 +- .../devicetree/bindings/input/touchscreen/silead,gsl1680.yaml | 2 +- .../devicetree/bindings/input/touchscreen/ti,tsc2005.yaml | 2 +- .../devicetree/bindings/input/touchscreen/touchscreen.yaml | 2 +- .../devicetree/bindings/input/touchscreen/zinitix,bt400.yaml | 2 +- .../devicetree/bindings/interrupt-controller/ingenic,intc.yaml | 2 +- .../devicetree/bindings/interrupt-controller/mrvl,intc.yaml | 2 +- .../bindings/interrupt-controller/nuvoton,wpcm450-aic.yaml | 2 +- .../bindings/interrupt-controller/realtek,rtl-intc.yaml | 2 +- .../devicetree/bindings/interrupt-controller/renesas,irqc.yaml | 2 +- Documentation/devicetree/bindings/ipmi/ipmi-ipmb.yaml | 2 +- Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml | 2 +- .../devicetree/bindings/leds/backlight/gpio-backlight.yaml | 2 +- .../devicetree/bindings/leds/backlight/led-backlight.yaml | 2 +- .../devicetree/bindings/leds/backlight/pwm-backlight.yaml | 2 +- Documentation/devicetree/bindings/leds/backlight/qcom-wled.yaml | 2 +- Documentation/devicetree/bindings/leds/issi,is31fl319x.yaml | 2 +- Documentation/devicetree/bindings/leds/register-bit-led.yaml | 2 +- Documentation/devicetree/bindings/leds/regulator-led.yaml | 2 +- .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 +- Documentation/devicetree/bindings/mailbox/sprd-mailbox.yaml | 2 +- Documentation/devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 2 +- .../devicetree/bindings/media/i2c/dongwoon,dw9768.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ov8856.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov5640.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/st,st-vgxy61.yaml | 2 +- Documentation/devicetree/bindings/media/marvell,mmp2-ccic.yaml | 2 +- Documentation/devicetree/bindings/media/renesas,ceu.yaml | 2 +- Documentation/devicetree/bindings/media/st,stm32-cec.yaml | 2 +- Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 2 +- Documentation/devicetree/bindings/media/st,stm32-dma2d.yaml | 2 +- .../devicetree/bindings/media/video-interface-devices.yaml | 2 +- Documentation/devicetree/bindings/media/video-interfaces.yaml | 2 +- .../bindings/memory-controllers/calxeda-ddr-ctrlr.yaml | 2 +- .../bindings/memory-controllers/ingenic,nemc-peripherals.yaml | 2 +- .../devicetree/bindings/memory-controllers/ingenic,nemc.yaml | 2 +- .../bindings/memory-controllers/st,stm32-fmc2-ebi.yaml | 2 +- .../devicetree/bindings/memory-controllers/ti,gpmc-child.yaml | 2 +- .../devicetree/bindings/memory-controllers/ti,gpmc.yaml | 2 +- Documentation/devicetree/bindings/mfd/actions,atc260x.yaml | 2 +- Documentation/devicetree/bindings/mfd/ene-kb3930.yaml | 2 +- Documentation/devicetree/bindings/mfd/ene-kb930.yaml | 2 +- Documentation/devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml | 2 +- Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71847-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stmfx.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stpmic1.yaml | 2 +- Documentation/devicetree/bindings/mips/ingenic/devices.yaml | 2 +- Documentation/devicetree/bindings/mips/ingenic/ingenic,cpu.yaml | 2 +- .../devicetree/bindings/mips/lantiq/lantiq,dma-xway.yaml | 2 +- Documentation/devicetree/bindings/mips/loongson/devices.yaml | 2 +- Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 2 +- Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml | 2 +- Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 +- Documentation/devicetree/bindings/mmc/ingenic,mmc.yaml | 2 +- .../devicetree/bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 +- Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 2 +- Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml | 2 +- Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml | 2 +- Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 2 +- Documentation/devicetree/bindings/mtd/gpmi-nand.yaml | 2 +- Documentation/devicetree/bindings/mtd/ingenic,nand.yaml | 2 +- Documentation/devicetree/bindings/mtd/microchip,mchp48l640.yaml | 2 +- Documentation/devicetree/bindings/mtd/mxc-nand.yaml | 2 +- Documentation/devicetree/bindings/mtd/nand-chip.yaml | 2 +- Documentation/devicetree/bindings/mtd/nand-controller.yaml | 2 +- .../devicetree/bindings/mtd/partitions/qcom,smem-part.yaml | 2 +- Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml | 2 +- Documentation/devicetree/bindings/mux/gpio-mux.yaml | 2 +- Documentation/devicetree/bindings/mux/mux-consumer.yaml | 2 +- Documentation/devicetree/bindings/mux/mux-controller.yaml | 2 +- Documentation/devicetree/bindings/mux/reg-mux.yaml | 2 +- Documentation/devicetree/bindings/net/asix,ax88178.yaml | 2 +- .../devicetree/bindings/net/bluetooth/bluetooth-controller.yaml | 2 +- Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml | 2 +- .../devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml | 2 +- Documentation/devicetree/bindings/net/can/bosch,c_can.yaml | 2 +- Documentation/devicetree/bindings/net/can/bosch,m_can.yaml | 2 +- Documentation/devicetree/bindings/net/can/can-controller.yaml | 2 +- Documentation/devicetree/bindings/net/can/can-transceiver.yaml | 2 +- Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/dsa-port.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +- .../devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml | 2 +- .../devicetree/bindings/net/dsa/microchip,lan937x.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml | 2 +- Documentation/devicetree/bindings/net/engleder,tsnep.yaml | 2 +- Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 +- Documentation/devicetree/bindings/net/ethernet-phy.yaml | 2 +- Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml | 2 +- Documentation/devicetree/bindings/net/ingenic,mac.yaml | 2 +- Documentation/devicetree/bindings/net/mctp-i2c-controller.yaml | 2 +- Documentation/devicetree/bindings/net/mdio.yaml | 2 +- Documentation/devicetree/bindings/net/microchip,lan95xx.yaml | 2 +- Documentation/devicetree/bindings/net/wireless/esp,esp8089.yaml | 2 +- Documentation/devicetree/bindings/net/wireless/ieee80211.yaml | 2 +- .../devicetree/bindings/net/wireless/mediatek,mt76.yaml | 2 +- .../devicetree/bindings/net/wireless/microchip,wilc1000.yaml | 2 +- Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml | 2 +- Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml | 2 +- Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml | 2 +- Documentation/devicetree/bindings/nvmem/fsl,scu-ocotp.yaml | 2 +- .../devicetree/bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 +- Documentation/devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 2 +- .../devicetree/bindings/nvmem/socionext,uniphier-efuse.yaml | 2 +- Documentation/devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v1.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2-base.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2.yaml | 2 +- Documentation/devicetree/bindings/pci/pci-ep.yaml | 2 +- Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 +- Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/calxeda-combophy.yaml | 2 +- Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml | 2 +- Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml | 2 +- .../devicetree/bindings/phy/intel,keembay-phy-usb.yaml | 2 +- .../devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml | 2 +- Documentation/devicetree/bindings/phy/marvell,mmp3-usb-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/mediatek,ufs-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/phy-cadence-sierra.yaml | 2 +- Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml | 2 +- Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 +- Documentation/devicetree/bindings/phy/phy-tegra194-p2u.yaml | 2 +- Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.yaml | 2 +- Documentation/devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 2 +- Documentation/devicetree/bindings/phy/transmit-amplitude.yaml | 2 +- Documentation/devicetree/bindings/pinctrl/fsl,scu-pinctrl.yaml | 2 +- Documentation/devicetree/bindings/pinctrl/ingenic,pinctrl.yaml | 2 +- Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml | 2 +- Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml | 2 +- Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml | 2 +- Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml | 2 +- Documentation/devicetree/bindings/power/domain-idle-state.yaml | 2 +- Documentation/devicetree/bindings/power/fsl,scu-pd.yaml | 2 +- .../devicetree/bindings/power/reset/restart-handler.yaml | 2 +- .../devicetree/bindings/power/reset/xlnx,zynqmp-power.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq2415x.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq24190.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq24257.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq24735.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq25890.yaml | 2 +- .../devicetree/bindings/power/supply/dlg,da9150-charger.yaml | 2 +- .../devicetree/bindings/power/supply/dlg,da9150-fuel-gauge.yaml | 2 +- .../devicetree/bindings/power/supply/ingenic,battery.yaml | 2 +- Documentation/devicetree/bindings/power/supply/isp1704.yaml | 2 +- .../devicetree/bindings/power/supply/lltc,lt3651-charger.yaml | 2 +- .../devicetree/bindings/power/supply/lltc,ltc294x.yaml | 2 +- .../devicetree/bindings/power/supply/maxim,ds2760.yaml | 2 +- .../devicetree/bindings/power/supply/maxim,max14656.yaml | 2 +- .../devicetree/bindings/power/supply/richtek,rt9455.yaml | 2 +- .../devicetree/bindings/power/supply/sc2731-charger.yaml | 2 +- Documentation/devicetree/bindings/power/supply/sc27xx-fg.yaml | 2 +- Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml | 2 +- Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml | 2 +- Documentation/devicetree/bindings/regulator/pwm-regulator.yaml | 2 +- .../devicetree/bindings/regulator/st,stm32-booster.yaml | 2 +- .../devicetree/bindings/regulator/st,stm32-vrefbuf.yaml | 2 +- .../devicetree/bindings/remoteproc/amlogic,meson-mx-ao-arc.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/ingenic,vpu.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/qcom,pil-info.yaml | 2 +- .../devicetree/bindings/remoteproc/renesas,rcar-rproc.yaml | 2 +- .../devicetree/bindings/remoteproc/st,stm32-rproc.yaml | 2 +- .../devicetree/bindings/reserved-memory/shared-dma-pool.yaml | 2 +- Documentation/devicetree/bindings/reset/ti,sci-reset.yaml | 2 +- Documentation/devicetree/bindings/reset/ti,tps380x-reset.yaml | 2 +- Documentation/devicetree/bindings/riscv/cpus.yaml | 2 +- Documentation/devicetree/bindings/rng/ingenic,rng.yaml | 2 +- Documentation/devicetree/bindings/rng/ingenic,trng.yaml | 2 +- Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml | 2 +- .../devicetree/bindings/rng/silex-insight,ba431-rng.yaml | 2 +- Documentation/devicetree/bindings/rng/st,stm32-rng.yaml | 2 +- .../devicetree/bindings/rng/xiphera,xip8001b-trng.yaml | 2 +- Documentation/devicetree/bindings/rtc/epson,rx8900.yaml | 2 +- Documentation/devicetree/bindings/rtc/fsl,scu-rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/ingenic,rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/sa1100-rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml | 2 +- Documentation/devicetree/bindings/serial/8250.yaml | 2 +- Documentation/devicetree/bindings/serial/8250_omap.yaml | 2 +- Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml | 2 +- Documentation/devicetree/bindings/serial/ingenic,uart.yaml | 2 +- Documentation/devicetree/bindings/serial/rs485.yaml | 2 +- Documentation/devicetree/bindings/serial/serial.yaml | 2 +- Documentation/devicetree/bindings/serial/st,stm32-uart.yaml | 2 +- Documentation/devicetree/bindings/serio/ps2-gpio.yaml | 2 +- Documentation/devicetree/bindings/soc/mediatek/mtk-svs.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,smem.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,spm.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom-stats.yaml | 2 +- Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml | 2 +- Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml | 2 +- Documentation/devicetree/bindings/sound/audio-graph-port.yaml | 2 +- Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 +- Documentation/devicetree/bindings/sound/ingenic,aic.yaml | 2 +- Documentation/devicetree/bindings/sound/ingenic,codec.yaml | 2 +- Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-rx-macro.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-tx-macro.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-va-macro.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml | 2 +- .../devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 2 +- .../devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wsa883x.yaml | 2 +- Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml | 2 +- Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml | 2 +- Documentation/devicetree/bindings/sound/ti,src4xxx.yaml | 2 +- .../devicetree/bindings/soundwire/soundwire-controller.yaml | 2 +- Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml | 2 +- Documentation/devicetree/bindings/spi/ingenic,spi.yaml | 2 +- Documentation/devicetree/bindings/spi/marvell,mmp2-ssp.yaml | 2 +- Documentation/devicetree/bindings/spi/omap-spi.yaml | 2 +- Documentation/devicetree/bindings/spi/spi-controller.yaml | 2 +- Documentation/devicetree/bindings/spi/spi-gpio.yaml | 2 +- Documentation/devicetree/bindings/spi/st,stm32-qspi.yaml | 2 +- Documentation/devicetree/bindings/spi/st,stm32-spi.yaml | 2 +- Documentation/devicetree/bindings/thermal/fsl,scu-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/imx-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/imx8mm-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/sprd-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/st,stm32-thermal.yaml | 2 +- .../devicetree/bindings/thermal/thermal-cooling-devices.yaml | 2 +- Documentation/devicetree/bindings/thermal/thermal-idle.yaml | 2 +- Documentation/devicetree/bindings/thermal/thermal-sensor.yaml | 2 +- Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 2 +- Documentation/devicetree/bindings/thermal/ti,am654-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/ti,j72xx-thermal.yaml | 2 +- Documentation/devicetree/bindings/timer/ingenic,sysost.yaml | 2 +- Documentation/devicetree/bindings/timer/ingenic,tcu.yaml | 2 +- Documentation/devicetree/bindings/timer/mrvl,mmp-timer.yaml | 2 +- Documentation/devicetree/bindings/timer/st,stm32-timer.yaml | 2 +- Documentation/devicetree/bindings/usb/analogix,anx7411.yaml | 2 +- Documentation/devicetree/bindings/usb/cdns,usb3.yaml | 2 +- Documentation/devicetree/bindings/usb/dwc2.yaml | 2 +- Documentation/devicetree/bindings/usb/faraday,fotg210.yaml | 2 +- Documentation/devicetree/bindings/usb/ingenic,musb.yaml | 2 +- Documentation/devicetree/bindings/usb/marvell,pxau2o-ehci.yaml | 2 +- Documentation/devicetree/bindings/usb/maxim,max33359.yaml | 2 +- Documentation/devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml | 2 +- Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 +- Documentation/devicetree/bindings/usb/nxp,isp1760.yaml | 2 +- Documentation/devicetree/bindings/usb/realtek,rts5411.yaml | 2 +- Documentation/devicetree/bindings/usb/richtek,rt1719.yaml | 2 +- Documentation/devicetree/bindings/usb/st,stusb160x.yaml | 2 +- Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml | 2 +- Documentation/devicetree/bindings/usb/ti,tps6598x.yaml | 2 +- Documentation/devicetree/bindings/usb/ti,usb8041.yaml | 2 +- Documentation/devicetree/bindings/usb/usb-device.yaml | 2 +- Documentation/devicetree/bindings/usb/willsemi,wusb3801.yaml | 2 +- Documentation/devicetree/bindings/virtio/virtio-device.yaml | 2 +- Documentation/devicetree/bindings/watchdog/fsl,scu-wdt.yaml | 2 +- Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml | 2 +- Documentation/devicetree/bindings/watchdog/watchdog.yaml | 2 +- 476 files changed, 476 insertions(+), 476 deletions(-) -- 2.34.1

9 38

[PATCH v1 0/2] Use ACPI_COMPANION macro to obtain acpi_device in cs35l41_hda
by Stefan Binding 24 Nov '22

24 Nov '22

Currently, in cs35l41_hda driver, we use acpi_dev_get_first_match_dev to obtain the acpi_device used to obtain the properties and gpios. It is better to use the ACPI_COMPANION macro to do this, since it guarentees that we get the correct acpi_device for the device. However, the cs35l41_hda driver uses the serial-multi-instantiate driver to enumerate, and whilst the ACPI_CONPANION macro works with spi, it does not work with i2c. This is fixed by setting the fwnode for i2c. Stefan Binding (2): platform/x86: serial-multi-instantiate: Set fwnode for i2c ALSA: hda: cs35l41: Use ACPI_COMPANION to read acpi properties .../platform/x86/serial-multi-instantiate.c | 1 + sound/pci/hda/cs35l41_hda.c | 50 ++++++++----------- 2 files changed, 22 insertions(+), 29 deletions(-) -- 2.34.1

3 8

[alsa-devel] [PATCH 0/6] ASoC: mediatek: mt8183: support DP audio
by Tzung-Bi Shih 24 Nov '22

24 Nov '22

(This series depends on https://lore.kernel.org/patchwork/patch/1126819/ which has not applied to the maintainer's tree yet.) This series makes mt8183-mt6358-ts3a227-max98357 support DP (display port) audio output. ASoC: hdmi-codec: add PCM trigger operator - add a PCM trigger callback if codec driver is interested in PCM events. drm: bridge: it6505: bridge to hdmi-codec - add audio feature support of it6505. - bridge to hdmi-codec so that ASoC can use the audio feature. - defer the "enabling" after receiving PCM START or RESUME event. ASoC: dt-bindings: mt8183: add a property "mediatek,hdmi-codec" ASoC: mediatek: mt8183: use hdmi-codec - bind to hdmi-codec in mt8183-mt6358-ts3a227-max98357. drm: bridge: it6505: report connector status ASoC: mediatek: mt8183: support HDMI jack reporting - use the mechanism from the following patch https://mailman.alsa-project.org/pipermail/alsa-devel/2019-September/155302… to report jack status (from DRM to ASoC). Allen Chen (1): drm: bridge: it6505: bridge to hdmi-codec Tzung-Bi Shih (5): ASoC: hdmi-codec: add PCM trigger operator ASoC: dt-bindings: mt8183: add a property "mediatek,hdmi-codec" ASoC: mediatek: mt8183: use hdmi-codec drm: bridge: it6505: report connector status ASoC: mediatek: mt8183: support HDMI jack reporting .../sound/mt8183-mt6358-ts3a227-max98357.txt | 2 + drivers/gpu/drm/bridge/ite-it6505.c | 191 +++++++++++++++++- include/sound/hdmi-codec.h | 13 ++ sound/soc/codecs/hdmi-codec.c | 31 +++ sound/soc/mediatek/Kconfig | 3 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 36 +++- 6 files changed, 266 insertions(+), 10 deletions(-) -- 2.23.0.866.gb869b98d4c-goog

3 9

[PATCH v3 0/4] Minor SoundWire clean ups
by Charles Keepax 24 Nov '22

24 Nov '22

Just some minor tidy ups and preparation for starting to upstream some Cirrus SoundWire devices. The first three patches are pretty trivial, the last patch which moves the remaining core over to using the no_pm functions could probably use some careful review. Changes since v2: - Fix up a memory leak of a buffer on the error path - Added some reviewed by's Thanks, Charles Charles Keepax (3): soundwire: Provide build stubs for common functions soundwire: debugfs: Switch to sdw_read_no_pm soundwire: stream: Move remaining register accesses over to no_pm Simon Trimmer (1): soundwire: bus: export sdw_nwrite_no_pm and sdw_nread_no_pm functions drivers/soundwire/bus.c | 10 ++-- drivers/soundwire/debugfs.c | 13 ++++- drivers/soundwire/stream.c | 30 +++++------ include/linux/soundwire/sdw.h | 94 +++++++++++++++++++++++++++++++---- 4 files changed, 116 insertions(+), 31 deletions(-) -- 2.30.2

2 7

MSI MPG X570S EDGE MAX WIFI compatibility
by GitHub issues - edited 24 Nov '22

24 Nov '22

alsa-project/alsa-ucm-conf issue #172 was edited from yhojann-cl: Please, add `0db0:151f` to `realtek-alc4080` chip compatibility in MPG X570S EDGE MAX WIFI motherboard in https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/USB-Audio/US… : ``` $ lsusb | grep 0db0 Bus 001 Device 003: ID 0db0:151f Micro Star International USB Audio ``` In `ucm2/USB-Audio/USB-Audio.conf` add `151f` to regex of `0db0`: ``` Regex "USB((0b05:(1996|1a2[07]))|(0db0:(1feb|419c|a073|151f)))" ``` My Motherboard is MSI X570S and output audio works fine but: - Motherboard microphone plug is not work. - Frontal microphone plug is not work. - When change output from gnome settings to hdmi audio does not work, the audio continues to play in the plug and not in the monitor. - When I change the input or output from digital to analog or sinput it does not change at all. - The strangest thing is that the microphone input captures the audio that is heard in the system as if it were the output, audacious records the audio from the desktop when it tries to monitor the microphone. - When plugging or unplugging the microphone, the system detects this change and tries to change the audio input automatically, but it does not capture the microphone and the desktop continues to be heard. - When plug headphone in frontal plug the gnome setting change automaticaly to the headphone item, but the sound play in speakers, not in headphone. - On Audacity when capture Alsa + `USB Audio: #2 (hw: 1,2)` works fine!, but can not set on gnome settings. My alsa data: http://alsa-project.org/db/?f=e29a6593e48350efeba75f69d5ece62379973c35 Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/172 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[GIT PULL] ASoC fixes for v6.1-rc6
by Mark Brown 23 Nov '22

23 Nov '22

The following changes since commit 7d945b046be3d2605dbb1806e73095aadd7ae129: ASoC: stm32: dfsdm: manage cb buffers cleanup (2022-11-09 17:56:37 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.1-rc6 for you to fetch changes up to db8f91d424fe0ea6db337aca8bc05908bbce1498: ASoC: soc-pcm: Add NULL check in BE reparenting (2022-11-22 12:23:00 +0000) ---------------------------------------------------------------- ASoC: Fixes for v6.1 A clutch of small fixes that have come in in the past week, people seem to have been unusually active for this late in the release cycle. The most critical one here is the fix to renumber the SOF DAI types in order to restore ABI compatibility which was broken by the addition of AMD support. ---------------------------------------------------------------- Chancel Liu (1): ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register Detlev Casanova (1): ASoC: sgtl5000: Reset the CHIP_CLK_CTRL reg on remove Jiasheng Jiang (1): ASoC: max98373: Add checks for devm_kcalloc Junxiao Chang (1): ASoC: hdac_hda: fix hda pcm buffer overflow issue Olivier Moysan (1): ASoC: stm32: i2s: remove irqf_oneshot flag Pierre-Louis Bossart (1): ASoC: SOF: dai: move AMD_HS to end of list to restore backwards-compatibility Richard Fitzgerald (1): ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open() Shuming Fan (1): ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions Srinivasa Rao Mandadapu (1): ASoC: soc-pcm: Add NULL check in BE reparenting include/sound/sof/dai.h | 2 +- sound/soc/codecs/hdac_hda.h | 4 ++-- sound/soc/codecs/max98373-i2c.c | 4 ++++ sound/soc/codecs/rt711-sdca-sdw.c | 2 +- sound/soc/codecs/sgtl5000.c | 1 + sound/soc/codecs/wm8962.c | 8 ++++++++ sound/soc/soc-pcm.c | 7 ++----- sound/soc/stm/stm32_i2s.c | 2 +- 8 files changed, 20 insertions(+), 10 deletions(-)

2 1

[PATCH v2 1/9] sound: sdw: Add hw_params to SoundWire config helper function
by Charles Keepax 23 Nov '22

23 Nov '22

The vast majority of the current users of the SoundWire framework have almost identical code for converting from hw_params to SoundWire configuration. Whilst complex devices might require more, it is very likely that most new devices will follow the same pattern. Save a little code by factoring this out into a helper function. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- I was a little bit two minds about whether to make this an inline or not, so any thoughts on that would be super welcome. The function does very little, especially given that SNDRV_PCM_STREAM_PLAYBACK == SDW_DATA_DIR_RX so the if is also really just an assignment. Thanks, Charles Changes since v1: - Correct spelling error in commit message include/sound/sdw.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 include/sound/sdw.h diff --git a/include/sound/sdw.h b/include/sound/sdw.h new file mode 100644 index 0000000000000..6dcdb3228dba6 --- /dev/null +++ b/include/sound/sdw.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * linux/sound/sdw.h -- SoundWire helpers for ALSA/ASoC + * + * Copyright (c) 2022 Cirrus Logic Inc. + * + * Author: Charles Keepax <ckeepax(a)opensource.cirrus.com> + */ + +#include <linux/soundwire/sdw.h> +#include <sound/asound.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> + +#ifndef __INCLUDE_SOUND_SDW_H +#define __INCLUDE_SOUND_SDW_H + +/** + * snd_sdw_params_to_config() - Conversion from hw_params to SoundWire config + * + * @substream: Pointer to the PCM substream structure + * @params: Pointer to the hardware params structure + * @stream_config: Stream configuration for the SoundWire audio stream + * @port_config: Port configuration for the SoundWire audio stream + * + * This function provides a basic conversion from the hw_params structure to + * SoundWire configuration structures. The user will at a minimum need to also + * set the port number in the port config, but may also override more of the + * setup, or in the case of a complex user, not use this helper at all and + * open-code everything. + */ +static inline void snd_sdw_params_to_config(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct sdw_stream_config *stream_config, + struct sdw_port_config *port_config) +{ + stream_config->frame_rate = params_rate(params); + stream_config->ch_count = params_channels(params); + stream_config->bps = snd_pcm_format_width(params_format(params)); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + stream_config->direction = SDW_DATA_DIR_RX; + else + stream_config->direction = SDW_DATA_DIR_TX; + + port_config->ch_mask = GENMASK(stream_config->ch_count - 1, 0); +} + +#endif -- 2.30.2

1 8

[PATCH 0/2] soundwire: revisit support for clock registers
by Bard Liao 23 Nov '22

23 Nov '22

SoundWire clock base and scale registers are only supported for SDCA devices. That's fine, but that leaves SoundWire 1.2 with optional registers not supported. This is a corner case that needs to be supported. Pierre-Louis Bossart (2): soundwire: remove is_sdca boolean property soundwire: enable optional clock registers for SoundWire 1.2 devices drivers/soundwire/bus.c | 11 ++++++----- include/linux/soundwire/sdw.h | 6 ++++-- sound/soc/codecs/rt1316-sdw.c | 1 - sound/soc/codecs/rt711-sdca-sdw.c | 1 - 4 files changed, 10 insertions(+), 9 deletions(-) -- 2.25.1

2 3

[PATCH 0/7] soundwire: intel: introduce hw_ops and move auxdevice handling to dedicated file
by Bard Liao 23 Nov '22

23 Nov '22

This series adds yet another set of cleanups a) all the helpers are now exposed as hw_ops callbacks b) the auxiliary device code is now completely generic. This will allow for easier introduction of new hw_ops implementations in the future without throwing away all the goodness of the auxiliary device handling. Since there will be a tighter coupling with HDaudio, it's likely that future hw_ops are implemented in the SOF driver directly. Pierre-Louis Bossart (7): soundwire: intel: start using hw_ops soundwire: intel: add debugfs callbacks in hw_ops soundwire: intel: add register_dai callback in hw_ops soundwire: intel: add bus management callbacks in hw_ops soundwire: intel: add link power management callbacks in hw_ops soundwire: intel: add in-band wake callbacks in hw_ops soundwire: intel: split auxdevice to different file drivers/soundwire/Makefile | 2 +- drivers/soundwire/intel.c | 658 +-------------------------- drivers/soundwire/intel.h | 96 +++- drivers/soundwire/intel_auxdevice.c | 678 ++++++++++++++++++++++++++++ drivers/soundwire/intel_auxdevice.h | 18 + drivers/soundwire/intel_init.c | 2 + include/linux/soundwire/sdw_intel.h | 44 ++ sound/soc/sof/intel/hda.c | 2 + 8 files changed, 853 insertions(+), 647 deletions(-) create mode 100644 drivers/soundwire/intel_auxdevice.c create mode 100644 drivers/soundwire/intel_auxdevice.h -- 2.25.1

3 9

[PATCH v3 0/2] ASoC: Intel: avs: DSP recovery and resume fixes
by Cezary Rojewski 23 Nov '22

23 Nov '22

Two fixes that are result of the recent discussions [1][2]. First adds missing locking around snd_pcm_stop() while the second fix sets substream state to DISCONNECTED if any suspend/resume related operation fails so that userspace has means to be aware that something went wrong during said operation. Changes in v3: - added a comment why non-_irq() locking is used around snd_pcm_stop() Changes in v2: - __snd_pcm_set_state() replaced direct assignments of PCM state [1]: https://lore.kernel.org/alsa-devel/73e6425f-8e51-e26f-ad83-ccc5df517a43@int… [2]: https://lore.kernel.org/alsa-devel/20221104131244.3920179-1-cezary.rojewski… Cezary Rojewski (2): ASoC: Intel: avs: Lock substream before snd_pcm_stop() ASoC: Intel: avs: Disconnect substream if suspend or resume fails sound/soc/intel/avs/ipc.c | 3 +++ sound/soc/intel/avs/pcm.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) -- 2.25.1

2 3

[PATCH] ASoC: soc-dai: Do not call snd_soc_link_be_hw_params_fixup() twice
by Richard Fitzgerald 23 Nov '22

23 Nov '22

For a BE link snd_soc_link_be_hw_params_fixup() is called by dpcm_be_dai_hw_params() to initialize the params before it passes them to __soc_pcm_hw_params(). Then __soc_pcm_hw_params() refines params to match the BE codec and passes that to snd_soc_dai_hw_params(). The second call of snd_soc_link_be_hw_params_fixup() within snd_soc_dai_hw_params() was overwriting the refined params with the original BE CPU DAI params. This would then lead to various problems, for example passing an invalid number of channels to the codec driver hw_params(), or enabling more AIF widgets on the codec than are actually mapped by TDM slots. These errors may not be noticed on a simple 1:1 link between one CPU DAI and one codec DAI, because most likely they have the same DAI config (though this is not necessarily true, for example if the CPU end has dummy TDM slots to achieve a desirable BCLK). For 1:N mappings there are likely to be multiple codecs using different subsets of the TDM slots and this overwriting of the refined params can cause incorrect configuration of each codec on the link. The erroneous extra call to the BE fixup function() was introduced by: commit a655de808cbd ("ASoC: core: Allow topology to override machine driver FE DAI link config.") at that time, the call to the BE fixup was already done by dpcm_be_dai_hw_params(), which was introduced several years earlier by: commit 01d7584cd2e5 ("ASoC: dpcm: Add Dynamic PCM core operations.") The erroneous code has changed and moved to a different source file since the patch that introduced it, so this fix patch won't directly apply as a fix on top of code older than: commit 8b4ba1d31771 ("ASoC: soc-dai: fix up hw params only if it is needed") though it can be applied with some minor adjustment to code before that patch but after: commit aa6166c2ac28 ("ASoC: soc-dai: mv soc_dai_hw_params() to soc-dai") On any tree older than that the code is in soc-pcm.c. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- sound/soc/soc-dai.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 49752af0e205..29a75fdf90e0 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -386,23 +386,16 @@ int snd_soc_dai_hw_params(struct snd_soc_dai *dai, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); int ret = 0; if (dai->driver->ops && - dai->driver->ops->hw_params) { - /* perform any topology hw_params fixups before DAI */ - ret = snd_soc_link_be_hw_params_fixup(rtd, params); - if (ret < 0) - goto end; - + dai->driver->ops->hw_params) ret = dai->driver->ops->hw_params(substream, params, dai); - } /* mark substream if succeeded */ if (ret == 0) soc_dai_mark_push(dai, substream, hw_params); -end: + return soc_dai_ret(dai, ret); } -- 2.30.2

2 1

[PATCH 00/12] Add support for the Cirrus Logic CS48L32 audio codecs
by Richard Fitzgerald 23 Nov '22

23 Nov '22

The CS48L32 is a high-performance low-power audio DSP for smartphones and other portable audio devices. It has various digital audio I/O, a programmable Halo Core DSP, fixed-function audio processors, configurable GPIO and microphone bias regulators. The CS48L31 and CS48L33 were derivatives of the CS48L32. Piotr Stankiewicz (2): mfd: cs48l32: Add support for CS48L31/32/33 codecs pinctrl: cirrus: Add support for CS48L31/32/33 codecs Richard Fitzgerald (9): dt-bindings: mfd: Add Cirrus Logic CS48L32 audio codec mfd: cs48l32: Add register definitions for Cirrus Logic CS48L31/32/33 dt-bindings: pinctrl: Add Cirrus Logic CS48L31/32/33 regulator: arizona-micsupp: Don't hardcode use of ARIZONA defines regulator: arizona-micsupp: Don't use a common regulator name regulator: arizona-micsupp: Support Cirrus Logic CS48L31/32/33 irqchip: cirrus: Add driver for Cirrus Logic CS48L31/32/33 codecs ASoC: wm_adsp: Allow client to hook into pre_run callback dt-bindings: sound: Add Cirrus Logic CS48L31/32/33 codecs Stuart Henderson (1): ASoC: cs48l32: Add codec driver for Cirrus Logic CS48L31/32/33 .../bindings/mfd/cirrus,cs48l32.yaml | 166 + .../bindings/pinctrl/cirrus,cs48l32.yaml | 98 + .../bindings/sound/cirrus,cs48l32.yaml | 96 + MAINTAINERS | 12 +- drivers/irqchip/Kconfig | 3 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-cirrus-cs48l32.c | 281 ++ drivers/irqchip/irq-cirrus-cs48l32.h | 74 + drivers/mfd/Kconfig | 13 + drivers/mfd/Makefile | 2 + drivers/mfd/cs48l32-tables.c | 541 ++++ drivers/mfd/cs48l32.c | 434 +++ drivers/mfd/cs48l32.h | 28 + drivers/pinctrl/cirrus/Kconfig | 5 + drivers/pinctrl/cirrus/Makefile | 2 + drivers/pinctrl/cirrus/pinctrl-cs48l32.c | 932 ++++++ drivers/pinctrl/cirrus/pinctrl-cs48l32.h | 62 + drivers/regulator/Kconfig | 8 +- drivers/regulator/arizona-micsupp.c | 78 +- include/dt-bindings/sound/cs48l32.h | 25 + include/linux/irqchip/irq-cirrus-cs48l32.h | 101 + include/linux/mfd/cs48l32/core.h | 49 + include/linux/mfd/cs48l32/registers.h | 509 +++ include/sound/cs48l32.h | 89 + sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs48l32-core.c | 2782 +++++++++++++++++ sound/soc/codecs/cs48l32.c | 1211 +++++++ sound/soc/codecs/cs48l32.h | 386 +++ sound/soc/codecs/wm_adsp.c | 11 + sound/soc/codecs/wm_adsp.h | 1 + 31 files changed, 7997 insertions(+), 14 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/cirrus,cs48l32.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,cs48l32.yaml create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs48l32.yaml create mode 100644 drivers/irqchip/irq-cirrus-cs48l32.c create mode 100644 drivers/irqchip/irq-cirrus-cs48l32.h create mode 100644 drivers/mfd/cs48l32-tables.c create mode 100644 drivers/mfd/cs48l32.c create mode 100644 drivers/mfd/cs48l32.h create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs48l32.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs48l32.h create mode 100644 include/dt-bindings/sound/cs48l32.h create mode 100644 include/linux/irqchip/irq-cirrus-cs48l32.h create mode 100644 include/linux/mfd/cs48l32/core.h create mode 100644 include/linux/mfd/cs48l32/registers.h create mode 100644 include/sound/cs48l32.h create mode 100644 sound/soc/codecs/cs48l32-core.c create mode 100644 sound/soc/codecs/cs48l32.c create mode 100644 sound/soc/codecs/cs48l32.h -- 2.30.2

9 48

[PATCH AUTOSEL 5.4 03/15] ASoC: Intel: soc-acpi: add ES83x6 support to IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 9a1d248bb4beaf1b43d17ba12481ee0629fa29b9 ] Missing entry to find a machine driver for ES83x6-based platforms. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Link: https://lore.kernel.org/r/20221031195836.250193-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index 38977669b576..4f5229b196ec 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -10,6 +10,11 @@ #include <sound/soc-acpi-intel-match.h> #include "../skylake/skl.h" +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs = 3, + .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"}, +}; + static struct skl_machine_pdata icl_pdata = { .use_tplg_pcm = true, }; @@ -29,6 +34,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = { .sof_fw_filename = "sof-icl.ri", .sof_tplg_filename = "sof-icl-rt5682.tplg", }, + { + .comp_ids = &essx_83x6, + .drv_name = "sof-essx8336", + .sof_tplg_filename = "sof-icl-es8336", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER | + SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | + SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines); -- 2.35.1

1 0

[PATCH AUTOSEL 5.4 02/15] ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01
by Sasha Levin 23 Nov '22

23 Nov '22

From: Hans de Goede <hdegoede(a)redhat.com> [ Upstream commit 8bb0ac0e6f64ebdf15d963c26b028de391c9bcf9 ] The Nanote UMPC-01 mini laptop has stereo speakers, while the default bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20221025140942.509066-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index ed332177b0f9..57d6d0b48068 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -446,6 +446,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, + { /* Nanote UMPC-01 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), + }, + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, + }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 04/22] ASoC: hda: intel-dsp-config: add ES83x6 quirk for IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 5d73263f9e7c54ccb20814dc50809b9deb9e2bc7 ] Yet another hardware variant we need to handle. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Link: https://lore.kernel.org/r/20221031195639.250062-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/hda/intel-dsp-config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 2a5ba9dca6b0..7fd5c819ec36 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -302,6 +302,11 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SOF, + .device = 0x34c8, + .codec_hid = &essx_83x6, + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x34c8, -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 03/22] ASoC: Intel: soc-acpi: add ES83x6 support to IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 9a1d248bb4beaf1b43d17ba12481ee0629fa29b9 ] Missing entry to find a machine driver for ES83x6-based platforms. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Link: https://lore.kernel.org/r/20221031195836.250193-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index 9a529a785288..80995dc732a1 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -10,6 +10,11 @@ #include <sound/soc-acpi-intel-match.h> #include "../skylake/skl.h" +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs = 3, + .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"}, +}; + static struct skl_machine_pdata icl_pdata = { .use_tplg_pcm = true, }; @@ -29,6 +34,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = { .sof_fw_filename = "sof-icl.ri", .sof_tplg_filename = "sof-icl-rt5682.tplg", }, + { + .comp_ids = &essx_83x6, + .drv_name = "sof-essx8336", + .sof_tplg_filename = "sof-icl-es8336", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER | + SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | + SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines); -- 2.35.1

1 0

[PATCH AUTOSEL 5.10 02/22] ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01
by Sasha Levin 23 Nov '22

23 Nov '22

From: Hans de Goede <hdegoede(a)redhat.com> [ Upstream commit 8bb0ac0e6f64ebdf15d963c26b028de391c9bcf9 ] The Nanote UMPC-01 mini laptop has stereo speakers, while the default bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20221025140942.509066-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 7ed869bf1a92..81269ed5a2aa 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -450,6 +450,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, + { /* Nanote UMPC-01 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), + }, + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, + }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 12/31] ASoC: stm32: dfsdm: manage cb buffers cleanup
by Sasha Levin 23 Nov '22

23 Nov '22

From: Olivier Moysan <olivier.moysan(a)foss.st.com> [ Upstream commit 7d945b046be3d2605dbb1806e73095aadd7ae129 ] Ensure that resources allocated by iio_channel_get_all_cb() are released on driver unbind. Signed-off-by: Olivier Moysan <olivier.moysan(a)foss.st.com> Link: https://lore.kernel.org/r/20221109170849.273719-1-olivier.moysan@foss.st.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/stm/stm32_adfsdm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index e6078f50e508..1e9b4b1df69e 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -303,6 +303,11 @@ static int stm32_adfsdm_dummy_cb(const void *data, void *private) return 0; } +static void stm32_adfsdm_cleanup(void *data) +{ + iio_channel_release_all_cb(data); +} + static struct snd_soc_component_driver stm32_adfsdm_soc_platform = { .open = stm32_adfsdm_pcm_open, .close = stm32_adfsdm_pcm_close, @@ -349,6 +354,12 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) if (IS_ERR(priv->iio_cb)) return PTR_ERR(priv->iio_cb); + ret = devm_add_action_or_reset(&pdev->dev, stm32_adfsdm_cleanup, priv->iio_cb); + if (ret < 0) { + dev_err(&pdev->dev, "Unable to add action\n"); + return ret; + } + component = devm_kzalloc(&pdev->dev, sizeof(*component), GFP_KERNEL); if (!component) return -ENOMEM; -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 06/31] ASoC: hda: intel-dsp-config: add ES83x6 quirk for IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 5d73263f9e7c54ccb20814dc50809b9deb9e2bc7 ] Yet another hardware variant we need to handle. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Link: https://lore.kernel.org/r/20221031195639.250062-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/hda/intel-dsp-config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 4208fa8a4db5..05af409f1a83 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -303,6 +303,11 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SOF, + .device = 0x34c8, + .codec_hid = &essx_83x6, + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x34c8, -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 04/31] ASoC: Intel: soc-acpi: add ES83x6 support to IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 9a1d248bb4beaf1b43d17ba12481ee0629fa29b9 ] Missing entry to find a machine driver for ES83x6-based platforms. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Link: https://lore.kernel.org/r/20221031195836.250193-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index 768ed538c4ea..bc49295bcfe2 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -10,6 +10,11 @@ #include <sound/soc-acpi-intel-match.h> #include "../skylake/skl.h" +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs = 3, + .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"}, +}; + static struct skl_machine_pdata icl_pdata = { .use_tplg_pcm = true, }; @@ -29,6 +34,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = { .sof_fw_filename = "sof-icl.ri", .sof_tplg_filename = "sof-icl-rt5682.tplg", }, + { + .comp_ids = &essx_83x6, + .drv_name = "sof-essx8336", + .sof_tplg_filename = "sof-icl-es8336", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER | + SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | + SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines); -- 2.35.1

1 0

[PATCH AUTOSEL 5.15 03/31] ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01
by Sasha Levin 23 Nov '22

23 Nov '22

From: Hans de Goede <hdegoede(a)redhat.com> [ Upstream commit 8bb0ac0e6f64ebdf15d963c26b028de391c9bcf9 ] The Nanote UMPC-01 mini laptop has stereo speakers, while the default bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20221025140942.509066-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 4d313d0d0f23..950457bcc28f 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -443,6 +443,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, + { /* Nanote UMPC-01 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), + }, + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, + }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 19/44] ASoC: stm32: dfsdm: manage cb buffers cleanup
by Sasha Levin 23 Nov '22

23 Nov '22

From: Olivier Moysan <olivier.moysan(a)foss.st.com> [ Upstream commit 7d945b046be3d2605dbb1806e73095aadd7ae129 ] Ensure that resources allocated by iio_channel_get_all_cb() are released on driver unbind. Signed-off-by: Olivier Moysan <olivier.moysan(a)foss.st.com> Link: https://lore.kernel.org/r/20221109170849.273719-1-olivier.moysan@foss.st.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/stm/stm32_adfsdm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index 643fc8a17018..837c1848d9bf 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -304,6 +304,11 @@ static int stm32_adfsdm_dummy_cb(const void *data, void *private) return 0; } +static void stm32_adfsdm_cleanup(void *data) +{ + iio_channel_release_all_cb(data); +} + static struct snd_soc_component_driver stm32_adfsdm_soc_platform = { .open = stm32_adfsdm_pcm_open, .close = stm32_adfsdm_pcm_close, @@ -350,6 +355,12 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) if (IS_ERR(priv->iio_cb)) return PTR_ERR(priv->iio_cb); + ret = devm_add_action_or_reset(&pdev->dev, stm32_adfsdm_cleanup, priv->iio_cb); + if (ret < 0) { + dev_err(&pdev->dev, "Unable to add action\n"); + return ret; + } + component = devm_kzalloc(&pdev->dev, sizeof(*component), GFP_KERNEL); if (!component) return -ENOMEM; -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 14/44] ASoC: sof_es8336: reduce pop noise on speaker
by Sasha Levin 23 Nov '22

23 Nov '22

From: Zhu Ning <zhuning0077(a)gmail.com> [ Upstream commit 89cdb224f2abe37ec4ac21ba0d9ddeb5a6a9cf68 ] The Speaker GPIO needs to be turned on slightly behind the codec turned on. It also need to be turned off slightly before the codec turned down. Current code uses delay in DAPM_EVENT to do it but the mdelay delays the DAPM itself and thus has no effect. A delayed_work is added to turn on the speaker. The Speaker is turned off in .trigger since trigger is called slightly before the DAPM events. Signed-off-by: Zhu Ning <zhuning(a)everest-semi.com> ------------ v1: cancel delayed work while disabling speaker. Link: https://lore.kernel.org/r/20221028020456.90286-1-zhuning0077@gmail.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/sof_es8336.c | 60 ++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index 606cc3242a60..5c218a39ca20 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -63,6 +63,7 @@ struct sof_es8336_private { struct snd_soc_jack jack; struct list_head hdmi_pcm_list; bool speaker_en; + struct delayed_work pcm_pop_work; }; struct sof_hdmi_pcm { @@ -111,6 +112,46 @@ static void log_quirks(struct device *dev) dev_info(dev, "quirk headset at mic1 port enabled\n"); } +static void pcm_pop_work_events(struct work_struct *work) +{ + struct sof_es8336_private *priv = + container_of(work, struct sof_es8336_private, pcm_pop_work.work); + + gpiod_set_value_cansleep(priv->gpio_speakers, priv->speaker_en); + + if (quirk & SOF_ES8336_HEADPHONE_GPIO) + gpiod_set_value_cansleep(priv->gpio_headphone, priv->speaker_en); + +} + +static int sof_8336_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_card *card = rtd->card; + struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_RESUME: + break; + + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_STOP: + if (priv->speaker_en == false) + if (substream->stream == 0) { + cancel_delayed_work(&priv->pcm_pop_work); + gpiod_set_value_cansleep(priv->gpio_speakers, true); + } + break; + default: + return -EINVAL; + } + + return 0; +} + static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -122,19 +163,7 @@ static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w, priv->speaker_en = !SND_SOC_DAPM_EVENT_ON(event); - if (SND_SOC_DAPM_EVENT_ON(event)) - msleep(70); - - gpiod_set_value_cansleep(priv->gpio_speakers, priv->speaker_en); - - if (!(quirk & SOF_ES8336_HEADPHONE_GPIO)) - return 0; - - if (SND_SOC_DAPM_EVENT_ON(event)) - msleep(70); - - gpiod_set_value_cansleep(priv->gpio_headphone, priv->speaker_en); - + queue_delayed_work(system_wq, &priv->pcm_pop_work, msecs_to_jiffies(70)); return 0; } @@ -344,6 +373,7 @@ static int sof_es8336_hw_params(struct snd_pcm_substream *substream, /* machine stream operations */ static struct snd_soc_ops sof_es8336_ops = { .hw_params = sof_es8336_hw_params, + .trigger = sof_8336_trigger, }; static struct snd_soc_dai_link_component platform_component[] = { @@ -722,7 +752,8 @@ static int sof_es8336_probe(struct platform_device *pdev) } INIT_LIST_HEAD(&priv->hdmi_pcm_list); - + INIT_DELAYED_WORK(&priv->pcm_pop_work, + pcm_pop_work_events); snd_soc_card_set_drvdata(card, priv); if (mach->mach_params.dmic_num > 0) { @@ -751,6 +782,7 @@ static int sof_es8336_remove(struct platform_device *pdev) struct snd_soc_card *card = platform_get_drvdata(pdev); struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); + cancel_delayed_work(&priv->pcm_pop_work); gpiod_put(priv->gpio_speakers); device_remove_software_node(priv->codec_dev); put_device(priv->codec_dev); -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 08/44] ASoC: SOF: ipc3-topology: use old pipeline teardown flow with SOF2.1 and older
by Sasha Levin 23 Nov '22

23 Nov '22

From: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> [ Upstream commit 003b786b678919e072c2b12ffa73901ef840963e ] Originally in commit b2ebcf42a48f ("ASoC: SOF: free widgets in sof_tear_down_pipelines() for static pipelines"), freeing of pipeline components at suspend was only done with recent FW as there were known limitations in older firmware versions. Tests show that if static pipelines are used, i.e. all pipelines are setup whenever firmware is powered up, the reverse action of freeing all components at power down, leads to firmware failures with also SOF2.0 and SOF2.1 based firmware. The problems can be specific to certain topologies with e.g. components not prepared to be freed at suspend (as this did not happen with older SOF kernels). To avoid hitting these problems when kernel is upgraded and used with an older firmware, bump the firmware requirement to SOF2.2 or newer. If an older firmware is used, and pipeline is a static one, do not free the components at suspend. This ensures the suspend flow remains backwards compatible with older firmware versions. This limitation does not apply if the product configuration is updated to dynamic pipelines. The limitation is not linked to firmware ABI, as the interface to free pipeline components has been available already before ABI3.19. The problem is in the implementation, so firmware version should be used to decide whether it is safe to use the newer flow or not. This patch adds a new SOF_FW_VER() macro to compare SOF firmware release versions. Link: https://github.com/thesofproject/sof/issues/6475 Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Link: https://lore.kernel.org/r/20221101114913.1292671-1-kai.vehmanen@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- include/sound/sof/info.h | 4 ++++ sound/soc/sof/ipc3-topology.c | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h index 65e86e4e9fd8..75193850ead0 100644 --- a/include/sound/sof/info.h +++ b/include/sound/sof/info.h @@ -36,6 +36,10 @@ enum sof_ipc_ext_data { SOF_IPC_EXT_USER_ABI_INFO = 4, }; +/* Build u32 number in format MMmmmppp */ +#define SOF_FW_VER(MAJOR, MINOR, PATCH) ((uint32_t)( \ + ((MAJOR) << 24) | ((MINOR) << 12) | (PATCH))) + /* FW version - SOF_IPC_GLB_VERSION */ struct sof_ipc_fw_version { struct sof_ipc_hdr hdr; diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c index a39b43850f0e..bf8a46463cec 100644 --- a/sound/soc/sof/ipc3-topology.c +++ b/sound/soc/sof/ipc3-topology.c @@ -2242,6 +2242,7 @@ static int sof_ipc3_tear_down_all_pipelines(struct snd_sof_dev *sdev, bool verif struct sof_ipc_fw_version *v = &sdev->fw_ready.version; struct snd_sof_widget *swidget; struct snd_sof_route *sroute; + bool dyn_widgets = false; int ret; /* @@ -2251,12 +2252,14 @@ static int sof_ipc3_tear_down_all_pipelines(struct snd_sof_dev *sdev, bool verif * topology loading the sound card unavailable to open PCMs. */ list_for_each_entry(swidget, &sdev->widget_list, list) { - if (swidget->dynamic_pipeline_widget) + if (swidget->dynamic_pipeline_widget) { + dyn_widgets = true; continue; + } - /* Do not free widgets for static pipelines with FW ABI older than 3.19 */ + /* Do not free widgets for static pipelines with FW older than SOF2.2 */ if (!verify && !swidget->dynamic_pipeline_widget && - v->abi_version < SOF_ABI_VER(3, 19, 0)) { + SOF_FW_VER(v->major, v->minor, v->micro) < SOF_FW_VER(2, 2, 0)) { swidget->use_count = 0; swidget->complete = 0; continue; @@ -2270,9 +2273,11 @@ static int sof_ipc3_tear_down_all_pipelines(struct snd_sof_dev *sdev, bool verif /* * Tear down all pipelines associated with PCMs that did not get suspended * and unset the prepare flag so that they can be set up again during resume. - * Skip this step for older firmware. + * Skip this step for older firmware unless topology has any + * dynamic pipeline (in which case the step is mandatory). */ - if (!verify && v->abi_version >= SOF_ABI_VER(3, 19, 0)) { + if (!verify && (dyn_widgets || SOF_FW_VER(v->major, v->minor, v->micro) >= + SOF_FW_VER(2, 2, 0))) { ret = sof_tear_down_left_over_pipelines(sdev); if (ret < 0) { dev_err(sdev->dev, "failed to tear down paused pipelines\n"); -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 07/44] ASoC: hda: intel-dsp-config: add ES83x6 quirk for IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 5d73263f9e7c54ccb20814dc50809b9deb9e2bc7 ] Yet another hardware variant we need to handle. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Link: https://lore.kernel.org/r/20221031195639.250062-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/hda/intel-dsp-config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index b9eb3208f288..ae31bb127594 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -320,6 +320,11 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SOF, + .device = 0x34c8, + .codec_hid = &essx_83x6, + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x34c8, -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 05/44] ASoC: Intel: soc-acpi: add ES83x6 support to IceLake
by Sasha Levin 23 Nov '22

23 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> [ Upstream commit 9a1d248bb4beaf1b43d17ba12481ee0629fa29b9 ] Missing entry to find a machine driver for ES83x6-based platforms. Link: https://github.com/thesofproject/linux/issues/3873 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Link: https://lore.kernel.org/r/20221031195836.250193-1-pierre-louis.bossart@linu… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c index b032bc07de8b..d0062f2cd256 100644 --- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c @@ -10,6 +10,11 @@ #include <sound/soc-acpi-intel-match.h> #include "../skylake/skl.h" +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs = 3, + .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"}, +}; + static struct skl_machine_pdata icl_pdata = { .use_tplg_pcm = true, }; @@ -27,6 +32,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = { .drv_name = "sof_rt5682", .sof_tplg_filename = "sof-icl-rt5682.tplg", }, + { + .comp_ids = &essx_83x6, + .drv_name = "sof-essx8336", + .sof_tplg_filename = "sof-icl-es8336", /* the tplg suffix is added at run time */ + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER | + SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | + SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines); -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 04/44] ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01
by Sasha Levin 23 Nov '22

23 Nov '22

From: Hans de Goede <hdegoede(a)redhat.com> [ Upstream commit 8bb0ac0e6f64ebdf15d963c26b028de391c9bcf9 ] The Nanote UMPC-01 mini laptop has stereo speakers, while the default bytcht_es8316 settings assume a mono speaker setup. Add a quirk for this. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/20221025140942.509066-1-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/intel/boards/bytcht_es8316.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 6432b83f616f..a935c5fd9edb 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -443,6 +443,13 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, + { /* Nanote UMPC-01 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), + }, + .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, + }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"), -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 03/44] ASoC: amd: yc: Add Alienware m17 R5 AMD into DMI table
by Sasha Levin 23 Nov '22

23 Nov '22

From: Brent Mendelsohn <mendiebm(a)gmail.com> [ Upstream commit d40b6529c6269cd5afddb1116a383cab9f126694 ] This model requires an additional detection quirk to enable the internal microphone - BIOS doesn't seem to support AcpDmicConnected (nothing in acpidump output). Link: https://bugzilla.kernel.org/show_bug.cgi?id=216590 Signed-off-by: Brent Mendelsohn <mendiebm(a)gmail.com> Reviewed-by: Mario Limonciello <mario.limonciello(a)amd.com> Link: https://lore.kernel.org/r/20221024174227.4160-1-mendiebm@gmail.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 2cb50d5cf1a9..a868a890f00c 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -185,6 +185,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "UM5302TA"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Alienware"), + DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m17 R5 AMD"), + } + }, {} }; -- 2.35.1

1 0

[PATCH] ASoC: Intel: avs: Add missing audio amplifier for KBL
by Alicja Michalska 23 Nov '22

23 Nov '22

KBL platform is missing the definition of 'max98357a' audio amplifier. This amplifier is used on many KBL Chromebooks, for instance variant 'nami' of 'Google/poppy' baseboard. Reported-by: CoolStar <coolstarorganization(a)gmail.com> Signed-off-by: Alicja Michalska <ahplka19(a)gmail.com> diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index 87f9c18be238..650faebb33ef 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -129,6 +129,14 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { }, .tplg_filename = "max98373-tplg.bin", }, + { + .id = "MX98357A", + .drv_name = "avs_max98357a", + .mach_params = { + .i2s_link_mask = AVS_SSP(0), + }, + .tplg_filename = "max98357a-tplg.bin", + }, { .id = "DLGS7219", .drv_name = "avs_da7219", --- sound/soc/intel/avs/board_selection.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index 87f9c18be238..650faebb33ef 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -129,6 +129,14 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { }, .tplg_filename = "max98373-tplg.bin", }, + { + .id = "MX98357A", + .drv_name = "avs_max98357a", + .mach_params = { + .i2s_link_mask = AVS_SSP(0), + }, + .tplg_filename = "max98357a-tplg.bin", + }, { .id = "DLGS7219", .drv_name = "avs_da7219", -- 2.38.1

4 5

[PATCH v2] ASoC: soc-pcm: Add NULL check in BE reparenting
by Srinivasa Rao Mandadapu 23 Nov '22

23 Nov '22

Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. The issue occurred in fuzzing test. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- Changes Since V1: -- Update commit title. sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 493f003..a7810c7 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1247,6 +1247,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) -- 2.7.4

3 2

starting from kernel 5.10.x latency test fails systematically on multiple platforms
by GitHub issues - edited 23 Nov '22

23 Nov '22

alsa-project/alsa-lib issue #285 was edited from bondagit: If I try the latency test application ([test/latency.c](https://github.com/alsa-project/alsa-lib/blob/master/test/l…) using a **Linux Kernel 5.9.x** with alsa-lib v1.2.4 on the following audio card: _PCH [HDA Intel PCH], device 1: ALC269VC Analog [ALC269VC Analog]_ (for example) I get the following result: ``` sudo ./latency -C hw:1 -P hw:1 -f S16_LE -r 48000 -c 2 -s 10 -m 128 -M 128 Scheduler set to Round Robin with priority 99... Playback device is hw:1 Capture device is hw:1 Parameters are 48000Hz, S16_LE, 2 channels, non-blocking mode Poll mode: no Loop limit is 480000 frames, minimum latency = 128, maximum latency = 128 Hardware PCM card 1 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Hardware PCM card 1 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Trying latency 128 frames, 2666.667us, 2.666667ms (375.0000Hz) Success Playback: *** frames = 480128 *** state : RUNNING trigger_time: 1907393.672215 tstamp : 0.000000 delay : 80 avail : 48 avail_max : 64 Capture: *** frames = 480000 *** state : RUNNING trigger_time: 1907393.672215 tstamp : 0.000000 delay : 0 avail : 0 avail_max : 16 Maximum read: 16 frames Maximum read latency: 333.333us, 0.333333ms (3000.0000Hz) Hardware sync Playback time = 1907393.672215, Record time = 1907393.672215, diff = 0 ``` The tests succeeded and final state is **RUNNING** If I try the same tests on the same audio device and distribution but with a **Linux Kernel >= 5.10.x** it fails systematically and I get: ``` sudo ./lantency -C hw:1 -P hw:1 -f S16_LE -r 48000 -c 2 -s 10 -m 128 -M 128 Scheduler set to Round Robin with priority 99... Playback device is hw:0 Capture device is hw:0 Parameters are 48000Hz, S16_LE, 2 channels, non-blocking mode Poll mode: no Loop limit is 480000 frames, minimum latency = 128, maximum latency = 128 Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Trying latency 128 frames, 2666.667us, 2.666667ms (375.0000Hz) Failure Playback: *** frames = 90720 *** state : XRUN trigger_time: 967.658489 tstamp : 0.000000 delay : 0 avail : 216 avail_max : 216 Capture: *** frames = 90592 *** state : XRUN trigger_time: 967.658489 tstamp : 0.000000 delay : 0 avail : 88 avail_max : 88 Maximum read: 16 frames Maximum read latency: 333.333us, 0.333333ms (3000.0000Hz) Hardware sync ``` I get an **XRUN** during the test execution. I can reproduce the same error on multiple boards for multiple audio cards and on different Linux distribution just changing the Linux kernel version. The problem was originally reported at: [AES67 Linux daemon: Latency test fails with Linux kernel starting from 5.10.0x](https://github.com/bondagit/aes67-linux-daemon/issues/79) I am interested in testing with low latency (-m 128 -M 128). My guess is that something changed in the Linux audio core and the latency application has to be adapted. Any idea ? Issue URL : https://github.com/alsa-project/alsa-lib/issues/285 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

starting from kernel 5.10.x latency test fails systematically on multiple platforms
by GitHub issues - edited 23 Nov '22

23 Nov '22

alsa-project/alsa-lib issue #285 was edited from bondagit: If I try the latency test application ([test/latency.c](https://github.com/alsa-project/alsa-lib/blob/master/test/l…) using a **Linux Kernel 5.9.x** with alsa-lib v1.2.4 on the following audio card: _PCH [HDA Intel PCH], device 1: ALC269VC Analog [ALC269VC Analog]_ (for example) I get the following result: ``` sudo ./latency -C hw:1 -P hw:1 -f S16_LE -r 48000 -c 2 -s 10 -m 128 -M 128 Scheduler set to Round Robin with priority 99... Playback device is hw:1 Capture device is hw:1 Parameters are 48000Hz, S16_LE, 2 channels, non-blocking mode Poll mode: no Loop limit is 480000 frames, minimum latency = 128, maximum latency = 128 Hardware PCM card 1 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Hardware PCM card 1 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Trying latency 128 frames, 2666.667us, 2.666667ms (375.0000Hz) Success Playback: *** frames = 480128 *** state : RUNNING trigger_time: 1907393.672215 tstamp : 0.000000 delay : 80 avail : 48 avail_max : 64 Capture: *** frames = 480000 *** state : RUNNING trigger_time: 1907393.672215 tstamp : 0.000000 delay : 0 avail : 0 avail_max : 16 Maximum read: 16 frames Maximum read latency: 333.333us, 0.333333ms (3000.0000Hz) Hardware sync Playback time = 1907393.672215, Record time = 1907393.672215, diff = 0 ``` The tests succeeded and final state is **RUNNING** If I try the same tests on the same audio device and distribution but with a **Linux Kernel >= 5.10.x** it fails systematically and I get: ``` sudo ./lantency -C hw:1 -P hw:1 -f S16_LE -r 48000 -c 2 -s 10 -m 128 -M 128 Scheduler set to Round Robin with priority 99... Playback device is hw:0 Capture device is hw:0 Parameters are 48000Hz, S16_LE, 2 channels, non-blocking mode Poll mode: no Loop limit is 480000 frames, minimum latency = 128, maximum latency = 128 Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Trying latency 128 frames, 2666.667us, 2.666667ms (375.0000Hz) Failure Playback: *** frames = 90720 *** state : XRUN trigger_time: 967.658489 tstamp : 0.000000 delay : 0 avail : 216 avail_max : 216 Capture: *** frames = 90592 *** state : XRUN trigger_time: 967.658489 tstamp : 0.000000 delay : 0 avail : 88 avail_max : 88 Maximum read: 16 frames Maximum read latency: 333.333us, 0.333333ms (3000.0000Hz) Hardware sync ``` I get an **XRUN** during the test execution. I can reproduce the same error on multiple boards for multiple audio cards and on different Linux distribution just changing the Linux kernel version. The problem was originally reported at: [AES67 Linux daemon: Latency test fails with Linux kernel starting from 5.10.0x](https://github.com/bondagit/aes67-linux-daemon/issues/79) I am interested in testing a with low latency (-m 128 -M 128). My guess is that something changed in the Linux audio core and the latency application has to be adapted. Any idea ? Issue URL : https://github.com/alsa-project/alsa-lib/issues/285 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

starting from kernel 5.10.x latency test fails systematically on multiple platforms
by GitHub issues - opened 23 Nov '22

23 Nov '22

alsa-project/alsa-lib issue #285 was opened from bondagit: If I try the latency test application ([test/latency.c](https://github.com/alsa-project/alsa-lib/blob/master/test/l…) using a **Linux Kernel 5.9.x** with alsa-lib v1.2.4 on the following audio card: _PCH [HDA Intel PCH], device 1: ALC269VC Analog [ALC269VC Analog]_ (for example) I get the following result: ``` sudo ./latency -C hw:1 -P hw:1 -f S16_LE -r 48000 -c 2 -s 10 -m 128 -M 128 Scheduler set to Round Robin with priority 99... Playback device is hw:1 Capture device is hw:1 Parameters are 48000Hz, S16_LE, 2 channels, non-blocking mode Poll mode: no Loop limit is 480000 frames, minimum latency = 128, maximum latency = 128 Hardware PCM card 1 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Hardware PCM card 1 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Trying latency 128 frames, 2666.667us, 2.666667ms (375.0000Hz) Success Playback: *** frames = 480128 *** state : RUNNING trigger_time: 1907393.672215 tstamp : 0.000000 delay : 80 avail : 48 avail_max : 64 Capture: *** frames = 480000 *** state : RUNNING trigger_time: 1907393.672215 tstamp : 0.000000 delay : 0 avail : 0 avail_max : 16 Maximum read: 16 frames Maximum read latency: 333.333us, 0.333333ms (3000.0000Hz) Hardware sync Playback time = 1907393.672215, Record time = 1907393.672215, diff = 0 ``` The tests succeeded and final state is **RUNNING** If I try the same tests on the same audio device and distribution but with a **Linux Kernel >= 5.10.x** it fails systematically and I get: ``` sudo ./lantency -C hw:1 -P hw:1 -f S16_LE -r 48000 -c 2 -s 10 -m 128 -M 128 Scheduler set to Round Robin with priority 99... Playback device is hw:0 Capture device is hw:0 Parameters are 48000Hz, S16_LE, 2 channels, non-blocking mode Poll mode: no Loop limit is 480000 frames, minimum latency = 128, maximum latency = 128 Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Its setup is: stream : CAPTURE access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 48000 exact rate : 48000 (48000/1) msbits : 16 buffer_size : 128 period_size : 64 period_time : 1333 tstamp_mode : NONE tstamp_type : MONOTONIC period_step : 1 avail_min : 64 period_event : 0 start_threshold : 2147483647 stop_threshold : 128 silence_threshold: 0 silence_size : 0 boundary : 4611686018427387904 appl_ptr : 0 hw_ptr : 0 Trying latency 128 frames, 2666.667us, 2.666667ms (375.0000Hz) Failure Playback: *** frames = 90720 *** state : XRUN trigger_time: 967.658489 tstamp : 0.000000 delay : 0 avail : 216 avail_max : 216 Capture: *** frames = 90592 *** state : XRUN trigger_time: 967.658489 tstamp : 0.000000 delay : 0 avail : 88 avail_max : 88 Maximum read: 16 frames Maximum read latency: 333.333us, 0.333333ms (3000.0000Hz) Hardware sync ``` I get an **XRUN** during the test execution. I can reproduce the same error on multiple boards for multiple audio cards and on different Linux distribution just changing the Linux kernel version. The problem was originally reported at: [AES67 Linux daemon: Latency test fails with Linux kernel starting from 5.10.0x](https://github.com/bondagit/aes67-linux-daemon/issues/79) My guess is that something changed in the Linux audio core and the latency application has to be adapted. Any idea ? Issue URL : https://github.com/alsa-project/alsa-lib/issues/285 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[RESEND PATCH] ALSA: rawmidi: fix infoleak in snd_rawmidi_ioctl_status_compat64
by Xiaolong Huang 23 Nov '22

23 Nov '22

The compat_status is declared off of the stack, so it needs to be zeroed out before copied back to userspace to prevent any unintentional data leakage. Fixes: d9e5582c4bb2 ("ALSA: Avoid using timespec for struct snd_rawmidi_status") Signed-off-by: Xiaolong Huang <butterflyhuangxx(a)gmail.com> --- Reason for resend: 1. add Fixes line. --- sound/core/rawmidi_compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/rawmidi_compat.c b/sound/core/rawmidi_compat.c index 68a93443583c..6afa68165b17 100644 --- a/sound/core/rawmidi_compat.c +++ b/sound/core/rawmidi_compat.c @@ -80,6 +80,7 @@ static int snd_rawmidi_ioctl_status_compat64(struct snd_rawmidi_file *rfile, if (err < 0) return err; + memset(&compat_status, 0, sizeof(compat_status)); compat_status = (struct compat_snd_rawmidi_status64) { .stream = status.stream, .tstamp_sec = status.tstamp_sec, base-commit: eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 -- 2.25.1

3 3

[PATCH -next v2] ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT
by Baisong Zhong 23 Nov '22

23 Nov '22

Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below: UBSAN: shift-out-of-bounds in sound/core/seq/seq_clientmgr.c:509:22 left shift of 1 by 31 places cannot be represented in type 'int' ... Call Trace: <TASK> dump_stack_lvl+0x8d/0xcf ubsan_epilogue+0xa/0x44 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 snd_seq_deliver_single_event.constprop.21+0x191/0x2f0 snd_seq_deliver_event+0x1a2/0x350 snd_seq_kernel_client_dispatch+0x8b/0xb0 snd_seq_client_notify_subscription+0x72/0xa0 snd_seq_ioctl_subscribe_port+0x128/0x160 snd_seq_kernel_client_ctl+0xce/0xf0 snd_seq_oss_create_client+0x109/0x15b alsa_seq_oss_init+0x11c/0x1aa do_one_initcall+0x80/0x440 kernel_init_freeable+0x370/0x3c3 kernel_init+0x1b/0x190 ret_from_fork+0x1f/0x30 </TASK> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> --- v2: update all SNDRV_SEQ_FILTER_* to 1U to keep consistent --- include/uapi/sound/asequencer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h index 6d4a2c60808d..00d2703e8fca 100644 --- a/include/uapi/sound/asequencer.h +++ b/include/uapi/sound/asequencer.h @@ -328,10 +328,10 @@ typedef int __bitwise snd_seq_client_type_t; #define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2) /* event filter flags */ -#define SNDRV_SEQ_FILTER_BROADCAST (1<<0) /* accept broadcast messages */ -#define SNDRV_SEQ_FILTER_MULTICAST (1<<1) /* accept multicast messages */ -#define SNDRV_SEQ_FILTER_BOUNCE (1<<2) /* accept bounce event in error */ -#define SNDRV_SEQ_FILTER_USE_EVENT (1<<31) /* use event filter */ +#define SNDRV_SEQ_FILTER_BROADCAST (1U<<0) /* accept broadcast messages */ +#define SNDRV_SEQ_FILTER_MULTICAST (1U<<1) /* accept multicast messages */ +#define SNDRV_SEQ_FILTER_BOUNCE (1U<<2) /* accept bounce event in error */ +#define SNDRV_SEQ_FILTER_USE_EVENT (1U<<31) /* use event filter */ struct snd_seq_client_info { int client; /* client number to inquire */ -- 2.25.1

2 1

[PATCH -next v2] ALSA: pcm: fix undefined behavior in bit shift for SNDRV_PCM_RATE_KNOT
by Baisong Zhong 23 Nov '22

23 Nov '22

Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below: UBSAN: shift-out-of-bounds in sound/core/pcm_native.c:2676:21 left shift of 1 by 31 places cannot be represented in type 'int' ... Call Trace: <TASK> dump_stack_lvl+0x8d/0xcf ubsan_epilogue+0xa/0x44 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 snd_pcm_open_substream+0x9f0/0xa90 snd_pcm_oss_open.part.26+0x313/0x670 snd_pcm_oss_open+0x30/0x40 soundcore_open+0x18b/0x2e0 chrdev_open+0xe2/0x270 do_dentry_open+0x2f7/0x620 path_openat+0xd66/0xe70 do_filp_open+0xe3/0x170 do_sys_openat2+0x357/0x4a0 do_sys_open+0x87/0xd0 do_syscall_64+0x34/0x80 Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> --- v2: update all SNDRV_PCM_RATE_* to 1U to keep consistent -- include/sound/pcm.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 7b1a022910e8..27040b472a4f 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -106,24 +106,24 @@ struct snd_pcm_ops { #define SNDRV_PCM_POS_XRUN ((snd_pcm_uframes_t)-1) /* If you change this don't forget to change rates[] table in pcm_native.c */ -#define SNDRV_PCM_RATE_5512 (1<<0) /* 5512Hz */ -#define SNDRV_PCM_RATE_8000 (1<<1) /* 8000Hz */ -#define SNDRV_PCM_RATE_11025 (1<<2) /* 11025Hz */ -#define SNDRV_PCM_RATE_16000 (1<<3) /* 16000Hz */ -#define SNDRV_PCM_RATE_22050 (1<<4) /* 22050Hz */ -#define SNDRV_PCM_RATE_32000 (1<<5) /* 32000Hz */ -#define SNDRV_PCM_RATE_44100 (1<<6) /* 44100Hz */ -#define SNDRV_PCM_RATE_48000 (1<<7) /* 48000Hz */ -#define SNDRV_PCM_RATE_64000 (1<<8) /* 64000Hz */ -#define SNDRV_PCM_RATE_88200 (1<<9) /* 88200Hz */ -#define SNDRV_PCM_RATE_96000 (1<<10) /* 96000Hz */ -#define SNDRV_PCM_RATE_176400 (1<<11) /* 176400Hz */ -#define SNDRV_PCM_RATE_192000 (1<<12) /* 192000Hz */ -#define SNDRV_PCM_RATE_352800 (1<<13) /* 352800Hz */ -#define SNDRV_PCM_RATE_384000 (1<<14) /* 384000Hz */ - -#define SNDRV_PCM_RATE_CONTINUOUS (1<<30) /* continuous range */ -#define SNDRV_PCM_RATE_KNOT (1<<31) /* supports more non-continuos rates */ +#define SNDRV_PCM_RATE_5512 (1U<<0) /* 5512Hz */ +#define SNDRV_PCM_RATE_8000 (1U<<1) /* 8000Hz */ +#define SNDRV_PCM_RATE_11025 (1U<<2) /* 11025Hz */ +#define SNDRV_PCM_RATE_16000 (1U<<3) /* 16000Hz */ +#define SNDRV_PCM_RATE_22050 (1U<<4) /* 22050Hz */ +#define SNDRV_PCM_RATE_32000 (1U<<5) /* 32000Hz */ +#define SNDRV_PCM_RATE_44100 (1U<<6) /* 44100Hz */ +#define SNDRV_PCM_RATE_48000 (1U<<7) /* 48000Hz */ +#define SNDRV_PCM_RATE_64000 (1U<<8) /* 64000Hz */ +#define SNDRV_PCM_RATE_88200 (1U<<9) /* 88200Hz */ +#define SNDRV_PCM_RATE_96000 (1U<<10) /* 96000Hz */ +#define SNDRV_PCM_RATE_176400 (1U<<11) /* 176400Hz */ +#define SNDRV_PCM_RATE_192000 (1U<<12) /* 192000Hz */ +#define SNDRV_PCM_RATE_352800 (1U<<13) /* 352800Hz */ +#define SNDRV_PCM_RATE_384000 (1U<<14) /* 384000Hz */ + +#define SNDRV_PCM_RATE_CONTINUOUS (1U<<30) /* continuous range */ +#define SNDRV_PCM_RATE_KNOT (1U<<31) /* supports more non-continuos rates */ #define SNDRV_PCM_RATE_8000_44100 (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|\ SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_22050|\ -- 2.25.1

2 1

[PATCH] dt-bindings: Move fixed string node names under 'properties'
by Rob Herring 23 Nov '22

23 Nov '22

Fixed string node names should be under 'properties' rather than 'patternProperties'. Additionally, without beginning and end of line anchors, any prefix or suffix is allowed on the specified node name. These cases don't appear to want a prefix or suffix, so move them under 'properties'. In some cases, the diff turns out to look like we're moving some patterns rather than the fixed string properties. Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../arm/tegra/nvidia,tegra20-pmc.yaml | 54 ++++++++-------- .../bindings/regulator/ti,tps65219.yaml | 14 ++-- .../bindings/sound/tlv320adcx140.yaml | 64 +++++++++---------- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml index 7fd8d47b1be4..4a00593b9f7f 100644 --- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml +++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml @@ -123,6 +123,33 @@ properties: some PLLs, clocks and then brings up CPU0 for resuming the system. + core-supply: + description: + Phandle to voltage regulator connected to the SoC Core power rail. + + core-domain: + type: object + description: | + The vast majority of hardware blocks of Tegra SoC belong to a + Core power domain, which has a dedicated voltage rail that powers + the blocks. + + properties: + operating-points-v2: + description: + Should contain level, voltages and opp-supported-hw property. + The supported-hw is a bitfield indicating SoC speedo or process + ID mask. + + "#power-domain-cells": + const: 0 + + required: + - operating-points-v2 + - "#power-domain-cells" + + additionalProperties: false + i2c-thermtrip: type: object description: @@ -300,33 +327,6 @@ patternProperties: additionalProperties: false - core-domain: - type: object - description: | - The vast majority of hardware blocks of Tegra SoC belong to a - Core power domain, which has a dedicated voltage rail that powers - the blocks. - - properties: - operating-points-v2: - description: - Should contain level, voltages and opp-supported-hw property. - The supported-hw is a bitfield indicating SoC speedo or process - ID mask. - - "#power-domain-cells": - const: 0 - - required: - - operating-points-v2 - - "#power-domain-cells" - - additionalProperties: false - - core-supply: - description: - Phandle to voltage regulator connected to the SoC Core power rail. - required: - compatible - reg diff --git a/Documentation/devicetree/bindings/regulator/ti,tps65219.yaml b/Documentation/devicetree/bindings/regulator/ti,tps65219.yaml index 78be79930fda..78e64521d401 100644 --- a/Documentation/devicetree/bindings/regulator/ti,tps65219.yaml +++ b/Documentation/devicetree/bindings/regulator/ti,tps65219.yaml @@ -51,13 +51,6 @@ properties: where the board has a button wired to the pin and triggers an interrupt on pressing it. -patternProperties: - "^buck[1-3]-supply$": - description: Input supply phandle of one regulator. - - "^ldo[1-4]-supply$": - description: Input supply phandle of one regulator. - regulators: type: object description: | @@ -82,6 +75,13 @@ patternProperties: additionalProperties: false +patternProperties: + "^buck[1-3]-supply$": + description: Input supply phandle of one regulator. + + "^ldo[1-4]-supply$": + description: Input supply phandle of one regulator. + required: - compatible - reg diff --git a/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml b/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml index ee698614862e..6b8214071115 100644 --- a/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml +++ b/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml @@ -109,38 +109,6 @@ properties: maximum: 7 default: [0, 0, 0, 0] - ti,asi-tx-drive: - type: boolean - description: | - When set the device will set the Tx ASI output to a Hi-Z state for unused - data cycles. Default is to drive the output low on unused ASI cycles. - -patternProperties: - '^ti,gpo-config-[1-4]$': - $ref: /schemas/types.yaml#/definitions/uint32-array - description: | - Defines the configuration and output driver for the general purpose - output pins (GPO). These values are pairs, the first value is for the - configuration type and the second value is for the output drive type. - The array is defined as <GPO_CFG GPO_DRV> - - GPO output configuration can be one of the following: - - 0 - (default) disabled - 1 - GPOX is configured as a general-purpose output (GPO) - 2 - GPOX is configured as a device interrupt output (IRQ) - 3 - GPOX is configured as a secondary ASI output (SDOUT2) - 4 - GPOX is configured as a PDM clock output (PDMCLK) - - GPO output drive configuration for the GPO pins can be one of the following: - - 0d - (default) Hi-Z output - 1d - Drive active low and active high - 2d - Drive active low and weak high - 3d - Drive active low and Hi-Z - 4d - Drive weak low and active high - 5d - Drive Hi-Z and active high - ti,gpio-config: description: | Defines the configuration and output drive for the General Purpose @@ -183,6 +151,38 @@ patternProperties: maximum: 15 default: [2, 2] + ti,asi-tx-drive: + type: boolean + description: | + When set the device will set the Tx ASI output to a Hi-Z state for unused + data cycles. Default is to drive the output low on unused ASI cycles. + +patternProperties: + '^ti,gpo-config-[1-4]$': + $ref: /schemas/types.yaml#/definitions/uint32-array + description: | + Defines the configuration and output driver for the general purpose + output pins (GPO). These values are pairs, the first value is for the + configuration type and the second value is for the output drive type. + The array is defined as <GPO_CFG GPO_DRV> + + GPO output configuration can be one of the following: + + 0 - (default) disabled + 1 - GPOX is configured as a general-purpose output (GPO) + 2 - GPOX is configured as a device interrupt output (IRQ) + 3 - GPOX is configured as a secondary ASI output (SDOUT2) + 4 - GPOX is configured as a PDM clock output (PDMCLK) + + GPO output drive configuration for the GPO pins can be one of the following: + + 0d - (default) Hi-Z output + 1d - Drive active low and active high + 2d - Drive active low and weak high + 3d - Drive active low and Hi-Z + 4d - Drive weak low and active high + 5d - Drive Hi-Z and active high + required: - compatible - reg -- 2.35.1

3 3

[PATCH] ALSA: rawmidi: fix infoleak in snd_rawmidi_ioctl_status_compat64
by Xiaolong Huang 22 Nov '22

22 Nov '22

The compat_status is declared off of the stack, so it needs to be zeroed out before copied back to userspace to prevent any unintentional data leakage. Signed-off-by: Xiaolong Huang <butterflyhuangxx(a)gmail.com> --- sound/core/rawmidi_compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/rawmidi_compat.c b/sound/core/rawmidi_compat.c index 68a93443583c..6afa68165b17 100644 --- a/sound/core/rawmidi_compat.c +++ b/sound/core/rawmidi_compat.c @@ -80,6 +80,7 @@ static int snd_rawmidi_ioctl_status_compat64(struct snd_rawmidi_file *rfile, if (err < 0) return err; + memset(&compat_status, 0, sizeof(compat_status)); compat_status = (struct compat_snd_rawmidi_status64) { .stream = status.stream, .tstamp_sec = status.tstamp_sec, base-commit: eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 -- 2.25.1

1 0

[PATCH 0/3] ASoC: Intel: add Dell SKU 0C11 support
by Bard Liao 22 Nov '22

22 Nov '22

Add Dell SKU 0C11 support with rt1318 codec. Gongjun Song (3): ASoC: intel: sof_sdw: add rt1318 codec support. ASoC: Intel: sof_sdw: Add support for SKU 0C11 product ASoC: Intel: soc-acpi: add SKU 0C11 SoundWire configuration sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/Makefile | 4 +- sound/soc/intel/boards/sof_sdw.c | 17 +++ sound/soc/intel/boards/sof_sdw_common.h | 7 + sound/soc/intel/boards/sof_sdw_rt1318.c | 120 ++++++++++++++++++ .../intel/common/soc-acpi-intel-rpl-match.c | 48 +++++++ 6 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 sound/soc/intel/boards/sof_sdw_rt1318.c -- 2.25.1

2 4

[PATCH 1/2] ASoC: nau8825: Adjust internal clock during jack detection
by David Lin 22 Nov '22

22 Nov '22

This patch is to rasie up internal clock during jack detection. The fast clock will accelerate charge and discharge effect. So this mechanism will make jack detection more robust. Signed-off-by: David Lin <CTLIN0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 3eac7c92df88..ba7f5ec28609 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1686,6 +1686,9 @@ static void nau8825_setup_auto_irq(struct nau8825 *nau8825) /* Enable internal VCO needed for interruptions */ nau8825_configure_sysclk(nau8825, NAU8825_CLK_INTERNAL, 0); + /* Raise up the internal clock for jack detection */ + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, 0); /* Enable ADC needed for interruptions */ regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, @@ -1800,6 +1803,10 @@ static int nau8825_jack_insert(struct nau8825 *nau8825) break; } + /* Update to the default divider of internal clock for power saving */ + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, 0xf); + /* Leaving HPOL/R grounded after jack insert by default. They will be * ungrounded as part of the widget power up sequence at the beginning * of playback to reduce pop. -- 2.25.1

2 2

[PATCH] ASoC: Intel: sof_sdw: Add support for SKU 0C4F product
by Bard Liao 22 Nov '22

22 Nov '22

From: Gongjun Song <gongjun.song(a)intel.com> SKU 0C4F product supports a SoundWire headset codec, SoundWire capture from local microphones and two SoundWire amplifiers. Signed-off-by: Gongjun Song <gongjun.song(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 172f008adea0..ffef492e3f3d 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -376,6 +376,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { RT711_JD2 | SOF_SDW_FOUR_SPK), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0C4F") + }, + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + RT711_JD2 | + SOF_SDW_FOUR_SPK), + }, /* MeteorLake devices */ { .callback = sof_sdw_quirk_cb, -- 2.25.1

2 1

[PATCH] ASoC: Intel: Skylake: Fix Kconfig dependency
by lili.li＠intel.com 22 Nov '22

22 Nov '22

From: Lili Li <lili.li(a)intel.com> Commit e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines") introduced HDA codec init routine which depends on SND_HDA. Select SND_SOC_HDAC_HDA unconditionally to fix following compile error: ERROR: modpost: "snd_hda_codec_device_init" [sound/soc/intel/skylake/snd-soc-skl.ko] undefined! Fixes: e4746d94d00c ("ASoC: Intel: Skylake: Introduce HDA codec init and exit routines") Reviewed-by: Junxiao Chang <junxiao.chang(a)intel.com> Suggested-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Signed-off-by: Lili Li <lili.li(a)intel.com> --- sound/soc/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index d2ca710ac3fa..ac799de4f7fd 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -177,7 +177,7 @@ config SND_SOC_INTEL_SKYLAKE_COMMON select SND_HDA_DSP_LOADER select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST - select SND_SOC_HDAC_HDA if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC + select SND_SOC_HDAC_HDA select SND_SOC_ACPI_INTEL_MATCH select SND_INTEL_DSP_CONFIG help -- 2.25.1

3 2

(E)AC3, DTS, MPEG-H support in tinycompress and the kernel uapi?
by GitHub issues - opened 22 Nov '22

22 Nov '22

alsa-project/tinycompress issue #20 was opened from dv1: Have there been discussions about adding support for (E)AC3, DTS, and MPEG-H? These days, 3D Audio is a use case where the Compress-Offload API is useful. It therefore would make sense to add support for these formats. I'm talking about direct support, not through IEC958 / IEC61937 payloading. I know that some HW vendors add their own custom changes to tinycompress to support these formats, so why not add these to upstream? Issue URL : https://github.com/alsa-project/tinycompress/issues/20 Repository URL: https://github.com/alsa-project/tinycompress

1 0

[PATCH 1/9] sound: sdw: Add hw_params to SoundWire config helper function
by Charles Keepax 22 Nov '22

22 Nov '22

The vast majority of the current users of the SoundWire framework have almost identical code for converting from hw_params to SoundWire configuration. Whilst complex devices might require more, it is very likely that most new devices will follow the same pattern. Save a little code by factoring this out into a helper function. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- I was a little bit two minds about whether to make this an inline or not, so any thoughts on that would be super welcome. The function does very little, especially given that SNDRV_PCM_STREAM_PLAYBACK == SDW_DATA_DIR_RX so the if is also really just an assignment. Thanks, Charles include/sound/sdw.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 include/sound/sdw.h diff --git a/include/sound/sdw.h b/include/sound/sdw.h new file mode 100644 index 0000000000000..6dcdb3228dba6 --- /dev/null +++ b/include/sound/sdw.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * linux/sound/sdw.h -- SoundWire helpers for ALSA/ASoC + * + * Copyright (c) 2022 Cirrus Logic Inc. + * + * Author: Charles Keepax <ckeepax(a)opensource.cirrus.com> + */ + +#include <linux/soundwire/sdw.h> +#include <sound/asound.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> + +#ifndef __INCLUDE_SOUND_SDW_H +#define __INCLUDE_SOUND_SDW_H + +/** + * snd_sdw_params_to_config() - Conversion from hw_params to SoundWire config + * + * @substream: Pointer to the PCM substream structure + * @params: Pointer to the hardware params structure + * @stream_config: Stream configuration for the SoundWire audio stream + * @port_config: Port configuration for the SoundWire audio stream + * + * This function provides a basic conversion from the hw_params structure to + * SoundWire configuration structures. The user will at a minimum need to also + * set the port number in the port config, but may also override more of the + * setup, or in the case of a complex user, not use this helper at all and + * open-code everything. + */ +static inline void snd_sdw_params_to_config(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct sdw_stream_config *stream_config, + struct sdw_port_config *port_config) +{ + stream_config->frame_rate = params_rate(params); + stream_config->ch_count = params_channels(params); + stream_config->bps = snd_pcm_format_width(params_format(params)); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + stream_config->direction = SDW_DATA_DIR_RX; + else + stream_config->direction = SDW_DATA_DIR_TX; + + port_config->ch_mask = GENMASK(stream_config->ch_count - 1, 0); +} + +#endif -- 2.30.2

2 10

[PATCH] ALSA: usb-audio: fix urb timeout with URB_ISO_ASAP flag
by Michael Wu 22 Nov '22

22 Nov '22

When the loglevel is greater than 4, with a long messages printed on the console while playing or recording audios, the usb controller may become abnormal. `usb 1-2: timeout: still 1 active urbs on EP #1` Fix it by configuring the transfer_flags URB_ISO_ASAP flag. Signed-off-by: Michael Wu <michael(a)allwinnertech.com> --- sound/usb/endpoint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 310cd6fb0038..df9a91c2fc7d 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1245,7 +1245,7 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep) if (!u->urb->transfer_buffer) goto out_of_memory; u->urb->pipe = ep->pipe; - u->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; + u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; u->urb->interval = 1 << ep->datainterval; u->urb->context = u; u->urb->complete = snd_complete_urb; @@ -1288,7 +1288,7 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep) u->urb->transfer_dma = ep->sync_dma + i * 4; u->urb->transfer_buffer_length = 4; u->urb->pipe = ep->pipe; - u->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; + u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; u->urb->number_of_packets = 1; u->urb->interval = 1 << ep->syncinterval; u->urb->context = u; -- 2.29.0

2 2

[PATCH] kernel: Add HP Device 0x8711 to force connect list
by Jiao Zhou 22 Nov '22

22 Nov '22

Signed-off-by: Jiao Zhou <jiaozhou(a)google.com> --- HDMI audio is not working on the HP EliteDesk 800 G6 because the pin is unconnected. This issue can be resolved by using the 'hdajackretask' tool to override the unconnected pin to force it to connect. Change-Id: If7ffc0691466078e59240f9eab89de562b3f119d --- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 21edf7a619f0..7a40ddfd695a 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1975,6 +1975,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) static const struct snd_pci_quirk force_connect_list[] = { SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1), SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), + SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1), {} -- 2.38.1.431.g37b22c650d-goog

2 1

[PATCH] ASoC: soc-pcm.c: Add NULL check in BE reparenting
by Srinivasa Rao Mandadapu 22 Nov '22

22 Nov '22

Add NULL check in dpcm_be_reparent API, to handle kernel NULL pointer dereference error. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- sound/soc/soc-pcm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 493f003..a7810c7 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1247,6 +1247,8 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) + return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe) -- 2.7.4

2 2

[linux-next:master] BUILD REGRESSION e4cd8d3ff7f9efeb97330e5e9b99eeb2a68f5cf9
by kernel test robot 21 Nov '22

21 Nov '22

tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master branch HEAD: e4cd8d3ff7f9efeb97330e5e9b99eeb2a68f5cf9 Add linux-next specific files for 20221121 Error/Warning reports: https://lore.kernel.org/oe-kbuild-all/202211130053.Np70VIdn-lkp@intel.com https://lore.kernel.org/oe-kbuild-all/202211191949.jqnWetUW-lkp@intel.com https://lore.kernel.org/oe-kbuild-all/202211200417.23aUOpyC-lkp@intel.com https://lore.kernel.org/oe-kbuild-all/202211211917.yLICUnMb-lkp@intel.com https://lore.kernel.org/oe-kbuild-all/202211212249.livTPi3Y-lkp@intel.com https://lore.kernel.org/oe-kbuild-all/202211220547.7Jd7QBi7-lkp@intel.com Error/Warning: (recently discovered and may have been fixed) arch/arm/mach-s3c/devs.c:32:10: fatal error: linux/platform_data/dma-s3c24xx.h: No such file or directory drivers/clk/clk.c:1022:5: error: redefinition of 'clk_prepare' drivers/clk/clk.c:1268:6: error: redefinition of 'clk_is_enabled_when_prepared' drivers/clk/clk.c:941:6: error: redefinition of 'clk_unprepare' drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:4939: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:5075:24: warning: implicit conversion from 'enum <anonymous>' to 'enum dc_status' [-Wenum-conversion] drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn201/irq_service_dcn201.c:139:43: warning: unused variable 'dmub_outbox_irq_info_funcs' [-Wunused-const-variable] drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn201/irq_service_dcn201.c:40:20: warning: no previous prototype for 'to_dal_irq_source_dcn201' [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/../display/dc/irq/dcn201/irq_service_dcn201.c:40:20: warning: no previous prototype for function 'to_dal_irq_source_dcn201' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c:451:1: warning: no previous prototype for 'gf100_fifo_nonstall_block' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c:451:1: warning: no previous prototype for function 'gf100_fifo_nonstall_block' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c:34:1: warning: no previous prototype for 'nvkm_engn_cgrp_get' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c:34:1: warning: no previous prototype for function 'nvkm_engn_cgrp_get' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c:210:1: warning: no previous prototype for 'tu102_gr_load' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c:210:1: warning: no previous prototype for function 'tu102_gr_load' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/nvfw/acr.c:49:1: warning: no previous prototype for 'wpr_generic_header_dump' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/nvfw/acr.c:49:1: warning: no previous prototype for function 'wpr_generic_header_dump' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c:221:21: warning: variable 'loc' set but not used [-Wunused-but-set-variable] include/linux/ftrace.h:126:16: error: implicit declaration of function 'arch_ftrace_get_regs'; did you mean 'ftrace_get_regs'? [-Werror=implicit-function-declaration] include/linux/ftrace.h:126:16: warning: returning 'int' from a function with return type 'struct pt_regs *' makes pointer from integer without a cast [-Wint-conversion] microblaze-linux-ld: (.text+0x158): undefined reference to `drm_bridge_add' microblaze-linux-ld: drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.o:(.rodata+0x3b4): undefined reference to `drm_atomic_helper_bridge_duplicate_state' microblaze-linux-ld: drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.o:(.rodata+0x3b8): undefined reference to `drm_atomic_helper_bridge_destroy_state' microblaze-linux-ld: drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.o:(.rodata+0x3c8): undefined reference to `drm_atomic_helper_bridge_reset' Unverified Error/Warning (likely false positive, please contact us if interested): drivers/gpu/drm/nouveau/nouveau_dp.c:237 nouveau_dp_irq() warn: variable dereferenced before check 'outp' (see line 232) drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c:116 nvkm_uoutp_mthd_infoframe() error: we previously assumed 'ior->func->hdmi' could be null (see line 114) drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c:250 nvkm_uoutp_mthd_acquire() error: we previously assumed 'outp->ior' could be null (see line 217) drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c:133 nvkm_chan_cctx_get() warn: inconsistent returns '&cgrp->mutex'. drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c:480 gf100_gr_chan_new() warn: inconsistent returns '&gr->fecs.mutex'. drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c:232:13: warning: use of uninitialized value '<unknown>' [CWE-457] [-Wanalyzer-use-of-uninitialized-value] drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c:263 gv100_gr_oneinit_sm_id() warn: potentially one past the end of array 'gpc_tpc_mask[gpc_table[gtpc]]' drivers/gpu/drm/nouveau/nvkm/subdev/acr/lsfw.c:350 nvkm_acr_lsfw_load_bl_sig_net() warn: passing zero to 'PTR_ERR' drivers/mmc/host/renesas_sdhi_internal_dmac.c:327 renesas_sdhi_internal_dmac_dma_irq() warn: set_bit() takes a bit number drivers/mmc/host/renesas_sdhi_internal_dmac.c:341 renesas_sdhi_internal_dmac_dataend_dma() warn: set_bit() takes a bit number drivers/mmc/host/renesas_sdhi_internal_dmac.c:444 renesas_sdhi_internal_dmac_issue_tasklet_fn() warn: set_bit() takes a bit number lib/zstd/compress/huf_compress.c:460 HUF_getIndex() warn: the 'RANK_POSITION_LOG_BUCKETS_BEGIN' macro might need parens lib/zstd/decompress/zstd_decompress_block.c:1009 ZSTD_execSequence() warn: inconsistent indenting lib/zstd/decompress/zstd_decompress_block.c:894 ZSTD_execSequenceEnd() warn: inconsistent indenting lib/zstd/decompress/zstd_decompress_block.c:942 ZSTD_execSequenceEndSplitLitBuffer() warn: inconsistent indenting lib/zstd/decompress/zstd_decompress_internal.h:206 ZSTD_DCtx_get_bmi2() warn: inconsistent indenting mm/hugetlb.c:2073 alloc_pool_huge_page() error: uninitialized symbol 'folio'. sound/hda/ext/hdac_ext_controller.c:140:28: warning: Shifting signed 32-bit value by 31 bits is implementation-defined behaviour. See condition at line 160. [shiftTooManyBitsSigned] Error/Warning ids grouped by kconfigs: gcc_recent_errors |-- alpha-allyesconfig | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc_link_dp.c:warning:implicit-conversion-from-enum-anonymous-to-enum-dc_status | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:no-previous-prototype-for-to_dal_irq_source_dcn201 | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-gf100.c:warning:no-previous-prototype-for-gf100_fifo_nonstall_block | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-runl.c:warning:no-previous-prototype-for-nvkm_engn_cgrp_get | |-- drivers-gpu-drm-nouveau-nvkm-engine-gr-tu102.c:warning:no-previous-prototype-for-tu102_gr_load | |-- drivers-gpu-drm-nouveau-nvkm-nvfw-acr.c:warning:no-previous-prototype-for-wpr_generic_header_dump | `-- drivers-gpu-drm-nouveau-nvkm-subdev-acr-lsfw.c:warning:variable-loc-set-but-not-used |-- arc-allyesconfig | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc_link_dp.c:warning:implicit-conversion-from-enum-anonymous-to-enum-dc_status | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:no-previous-prototype-for-to_dal_irq_source_dcn201 | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-gf100.c:warning:no-previous-prototype-for-gf100_fifo_nonstall_block | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-runl.c:warning:no-previous-prototype-for-nvkm_engn_cgrp_get | |-- drivers-gpu-drm-nouveau-nvkm-engine-gr-tu102.c:warning:no-previous-prototype-for-tu102_gr_load | |-- drivers-gpu-drm-nouveau-nvkm-nvfw-acr.c:warning:no-previous-prototype-for-wpr_generic_header_dump | `-- drivers-gpu-drm-nouveau-nvkm-subdev-acr-lsfw.c:warning:variable-loc-set-but-not-used |-- arc-randconfig-r022-20221120 | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc_link_dp.c:warning:implicit-conversion-from-enum-anonymous-to-enum-dc_status | `-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:no-previous-prototype-for-to_dal_irq_source_dcn201 |-- arc-randconfig-r033-20221120 | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-gf100.c:warning:no-previous-prototype-for-gf100_fifo_nonstall_block | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-runl.c:warning:no-previous-prototype-for-nvkm_engn_cgrp_get | |-- drivers-gpu-drm-nouveau-nvkm-engine-gr-tu102.c:warning:no-previous-prototype-for-tu102_gr_load | |-- drivers-gpu-drm-nouveau-nvkm-nvfw-acr.c:warning:no-previous-prototype-for-wpr_generic_header_dump | `-- drivers-gpu-drm-nouveau-nvkm-subdev-acr-lsfw.c:warning:variable-loc-set-but-not-used |-- arm-allyesconfig | |-- arch-arm-mach-s3c-devs.c:fatal-error:linux-platform_data-dma-s3c24xx.h:No-such-file-or-directory | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc_link_dp.c:warning:implicit-conversion-from-enum-anonymous-to-enum-dc_status | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:no-previous-prototype-for-to_dal_irq_source_dcn201 | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-gf100.c:warning:no-previous-prototype-for-gf100_fifo_nonstall_block | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-runl.c:warning:no-previous-prototype-for-nvkm_engn_cgrp_get | |-- drivers-gpu-drm-nouveau-nvkm-engine-gr-tu102.c:warning:no-previous-prototype-for-tu102_gr_load | |-- drivers-gpu-drm-nouveau-nvkm-nvfw-acr.c:warning:no-previous-prototype-for-wpr_generic_header_dump | `-- drivers-gpu-drm-nouveau-nvkm-subdev-acr-lsfw.c:warning:variable-loc-set-but-not-used |-- arm-defconfig | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-gf100.c:warning:no-previous-prototype-for-gf100_fifo_nonstall_block | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-runl.c:warning:no-previous-prototype-for-nvkm_engn_cgrp_get | |-- drivers-gpu-drm-nouveau-nvkm-engine-gr-tu102.c:warning:no-previous-prototype-for-tu102_gr_load | |-- drivers-gpu-drm-nouveau-nvkm-nvfw-acr.c:warning:no-previous-prototype-for-wpr_generic_header_dump | `-- drivers-gpu-drm-nouveau-nvkm-subdev-acr-lsfw.c:warning:variable-loc-set-but-not-used |-- arm-randconfig-c002-20221115 | `-- drivers-gpu-drm-nouveau-nvkm-engine-gr-gv100.c:warning:use-of-uninitialized-value-unknown-CWE |-- arm64-allyesconfig | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc.c:warning:This-comment-starts-with-but-isn-t-a-kernel-doc-comment.-Refer-Documentation-doc-guide-kernel-doc.rst | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-core-dc_link_dp.c:warning:implicit-conversion-from-enum-anonymous-to-enum-dc_status | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:no-previous-prototype-for-to_dal_irq_source_dcn201 clang_recent_errors |-- powerpc-randconfig-r004-20221121 | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:no-previous-prototype-for-function-to_dal_irq_source_dcn201 | |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:unused-variable-dmub_outbox_irq_info_funcs | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-gf100.c:warning:no-previous-prototype-for-function-gf100_fifo_nonstall_block | |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-runl.c:warning:no-previous-prototype-for-function-nvkm_engn_cgrp_get | |-- drivers-gpu-drm-nouveau-nvkm-engine-gr-tu102.c:warning:no-previous-prototype-for-function-tu102_gr_load | `-- drivers-gpu-drm-nouveau-nvkm-nvfw-acr.c:warning:no-previous-prototype-for-function-wpr_generic_header_dump |-- riscv-randconfig-r042-20221120 | `-- ld.lld:error:too-many-errors-emitted-stopping-now-(use-error-limit-to-see-all-errors) `-- s390-randconfig-r044-20221120 |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:no-previous-prototype-for-function-to_dal_irq_source_dcn201 |-- drivers-gpu-drm-amd-amdgpu-..-display-dc-irq-dcn201-irq_service_dcn201.c:warning:unused-variable-dmub_outbox_irq_info_funcs |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-gf100.c:warning:no-previous-prototype-for-function-gf100_fifo_nonstall_block |-- drivers-gpu-drm-nouveau-nvkm-engine-fifo-runl.c:warning:no-previous-prototype-for-function-nvkm_engn_cgrp_get |-- drivers-gpu-drm-nouveau-nvkm-engine-gr-tu102.c:warning:no-previous-prototype-for-function-tu102_gr_load `-- drivers-gpu-drm-nouveau-nvkm-nvfw-acr.c:warning:no-previous-prototype-for-function-wpr_generic_header_dump elapsed time: 730m configs tested: 73 configs skipped: 4 gcc tested configs: um x86_64_defconfig arc defconfig alpha defconfig um i386_defconfig i386 defconfig s390 defconfig s390 allmodconfig s390 allyesconfig ia64 allmodconfig x86_64 rhel-8.3-func x86_64 rhel-8.3-kselftests x86_64 defconfig i386 allyesconfig x86_64 randconfig-a011-20221121 x86_64 rhel-8.3 arc randconfig-r043-20221120 x86_64 randconfig-a013-20221121 i386 randconfig-a011-20221121 riscv randconfig-r042-20221121 i386 randconfig-a013-20221121 x86_64 allyesconfig arm defconfig x86_64 randconfig-a012-20221121 i386 randconfig-a012-20221121 x86_64 randconfig-a015-20221121 i386 randconfig-a014-20221121 x86_64 randconfig-a014-20221121 x86_64 randconfig-a016-20221121 i386 randconfig-a016-20221121 i386 randconfig-a015-20221121 x86_64 allnoconfig arc randconfig-r043-20221121 arm oxnas_v6_defconfig s390 randconfig-r044-20221121 arm imxrt_defconfig x86_64 rhel-8.3-syz x86_64 rhel-8.3-kunit arm axm55xx_defconfig powerpc cm5200_defconfig mips ip32_defconfig arm pxa_defconfig powerpc adder875_defconfig mips bcm47xx_defconfig xtensa common_defconfig x86_64 rhel-8.3-kvm arm allyesconfig arm64 allyesconfig alpha allyesconfig m68k allmodconfig arc allyesconfig m68k allyesconfig powerpc allnoconfig mips allyesconfig powerpc allmodconfig sh allmodconfig clang tested configs: x86_64 randconfig-a004-20221121 x86_64 randconfig-a001-20221121 i386 randconfig-a001-20221121 hexagon randconfig-r041-20221120 i386 randconfig-a003-20221121 hexagon randconfig-r041-20221121 i386 randconfig-a005-20221121 i386 randconfig-a002-20221121 hexagon randconfig-r045-20221120 x86_64 randconfig-a003-20221121 i386 randconfig-a004-20221121 hexagon randconfig-r045-20221121 i386 randconfig-a006-20221121 x86_64 randconfig-a002-20221121 x86_64 randconfig-a005-20221121 x86_64 randconfig-a006-20221121 riscv randconfig-r042-20221120 s390 randconfig-r044-20221120 -- 0-DAY CI Kernel Test Service https://01.org/lkp

1 0

[PATCH 0/4] Minor SoundWire clean ups
by Charles Keepax 21 Nov '22

21 Nov '22

Just some minor tidy ups and preparation for starting to upstream some Cirrus SoundWire devices. The first three patches are pretty trivial, the last patch which moves the remaining core over to using the no_pm functions could probably use some careful review. Thanks, Charles Charles Keepax (3): soundwire: Provide build stubs for common functions soundwire: debugfs: Switch to sdw_read_no_pm soundwire: stream: Move remaining register accesses over to no_pm Simon Trimmer (1): soundwire: bus: export sdw_nwrite_no_pm and sdw_nread_no_pm functions drivers/soundwire/bus.c | 10 ++-- drivers/soundwire/debugfs.c | 11 +++- drivers/soundwire/stream.c | 30 +++++------ include/linux/soundwire/sdw.h | 94 +++++++++++++++++++++++++++++++---- 4 files changed, 114 insertions(+), 31 deletions(-) -- 2.30.2

4 14

[PATCH -next] ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT
by Baisong Zhong 21 Nov '22

21 Nov '22

Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below: UBSAN: shift-out-of-bounds in sound/core/seq/seq_clientmgr.c:509:22 left shift of 1 by 31 places cannot be represented in type 'int' ... Call Trace: <TASK> dump_stack_lvl+0x8d/0xcf ubsan_epilogue+0xa/0x44 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 snd_seq_deliver_single_event.constprop.21+0x191/0x2f0 snd_seq_deliver_event+0x1a2/0x350 snd_seq_kernel_client_dispatch+0x8b/0xb0 snd_seq_client_notify_subscription+0x72/0xa0 snd_seq_ioctl_subscribe_port+0x128/0x160 snd_seq_kernel_client_ctl+0xce/0xf0 snd_seq_oss_create_client+0x109/0x15b alsa_seq_oss_init+0x11c/0x1aa do_one_initcall+0x80/0x440 kernel_init_freeable+0x370/0x3c3 kernel_init+0x1b/0x190 ret_from_fork+0x1f/0x30 </TASK> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> --- include/uapi/sound/asequencer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h index 6d4a2c60808d..4c5c4dd15d02 100644 --- a/include/uapi/sound/asequencer.h +++ b/include/uapi/sound/asequencer.h @@ -331,7 +331,7 @@ typedef int __bitwise snd_seq_client_type_t; #define SNDRV_SEQ_FILTER_BROADCAST (1<<0) /* accept broadcast messages */ #define SNDRV_SEQ_FILTER_MULTICAST (1<<1) /* accept multicast messages */ #define SNDRV_SEQ_FILTER_BOUNCE (1<<2) /* accept bounce event in error */ -#define SNDRV_SEQ_FILTER_USE_EVENT (1<<31) /* use event filter */ +#define SNDRV_SEQ_FILTER_USE_EVENT (1U<<31) /* use event filter */ struct snd_seq_client_info { int client; /* client number to inquire */ -- 2.17.1

3 2

[PATCH -next] ALSA: pcm: fix undefined behavior in bit shift for SNDRV_PCM_RATE_KNOT
by Baisong Zhong 21 Nov '22

21 Nov '22

Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below: UBSAN: shift-out-of-bounds in sound/core/pcm_native.c:2676:21 left shift of 1 by 31 places cannot be represented in type 'int' ... Call Trace: <TASK> dump_stack_lvl+0x8d/0xcf ubsan_epilogue+0xa/0x44 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 snd_pcm_open_substream+0x9f0/0xa90 snd_pcm_oss_open.part.26+0x313/0x670 snd_pcm_oss_open+0x30/0x40 soundcore_open+0x18b/0x2e0 chrdev_open+0xe2/0x270 do_dentry_open+0x2f7/0x620 path_openat+0xd66/0xe70 do_filp_open+0xe3/0x170 do_sys_openat2+0x357/0x4a0 do_sys_open+0x87/0xd0 do_syscall_64+0x34/0x80 Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Baisong Zhong <zhongbaisong(a)huawei.com> --- include/sound/pcm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 7b1a022910e8..ec28c2ec89de 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -123,7 +123,7 @@ struct snd_pcm_ops { #define SNDRV_PCM_RATE_384000 (1<<14) /* 384000Hz */ #define SNDRV_PCM_RATE_CONTINUOUS (1<<30) /* continuous range */ -#define SNDRV_PCM_RATE_KNOT (1<<31) /* supports more non-continuos rates */ +#define SNDRV_PCM_RATE_KNOT (1U<<31) /* supports more non-continuos rates */ #define SNDRV_PCM_RATE_8000_44100 (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|\ SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_22050|\ -- 2.17.1

3 2

[PATCH] dt-bindings: Add missing start and/or end of line regex anchors
by Rob Herring 21 Nov '22

21 Nov '22

json-schema patterns by default will match anywhere in a string, so typically we want at least the start or end anchored. Fix the obvious cases where the anchors were forgotten. Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- Documentation/devicetree/bindings/hwmon/adt7475.yaml | 4 ++-- .../bindings/opp/allwinner,sun50i-h6-operating-points.yaml | 4 ++-- .../devicetree/bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- .../devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- Documentation/devicetree/bindings/regulator/max8660.yaml | 2 +- .../devicetree/bindings/regulator/maxim,max77802.yaml | 2 +- Documentation/devicetree/bindings/regulator/regulator.yaml | 2 +- .../devicetree/bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- Documentation/devicetree/bindings/sound/renesas,rsnd.yaml | 2 +- .../devicetree/bindings/spi/nvidia,tegra210-quad.yaml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml index a11e1b867379..3c00ad09eeaa 100644 --- a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml @@ -38,7 +38,7 @@ properties: type: object patternProperties: - 'cpu@[0-9a-f]+': + '^cpu@[0-9a-f]+$': type: object properties: diff --git a/Documentation/devicetree/bindings/hwmon/adt7475.yaml b/Documentation/devicetree/bindings/hwmon/adt7475.yaml index ea595102a86e..051c976ab711 100644 --- a/Documentation/devicetree/bindings/hwmon/adt7475.yaml +++ b/Documentation/devicetree/bindings/hwmon/adt7475.yaml @@ -61,7 +61,7 @@ patternProperties: $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1] - "adi,pin(5|10)-function": + "^adi,pin(5|10)-function$": description: | Configures the function for pin 5 on the adi,adt7473 and adi,adt7475. Or pin 10 on the adi,adt7476 and adi,adt7490. @@ -70,7 +70,7 @@ patternProperties: - pwm2 - smbalert# - "adi,pin(9|14)-function": + "^adi,pin(9|14)-function$": description: | Configures the function for pin 9 on the adi,adt7473 and adi,adt7475. Or pin 14 on the adi,adt7476 and adi,adt7490 diff --git a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml index 385b0692261c..51f62c3ae194 100644 --- a/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml +++ b/Documentation/devicetree/bindings/opp/allwinner,sun50i-h6-operating-points.yaml @@ -41,7 +41,7 @@ required: - nvmem-cells patternProperties: - "opp-[0-9]+": + "^opp-[0-9]+$": type: object properties: @@ -49,7 +49,7 @@ patternProperties: clock-latency-ns: true patternProperties: - "opp-microvolt-.*": true + "^opp-microvolt-speed[0-9]$": true required: - opp-hz diff --git a/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml b/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml index d60f43fd9c5a..e63e6458cea8 100644 --- a/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml @@ -31,7 +31,7 @@ properties: maxItems: 2 patternProperties: - 'pcie@[0-2],0': + '^pcie@[0-2],0$': type: object $ref: /schemas/pci/pci-bus.yaml# diff --git a/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml b/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml index 0f18cceba3d5..5a0d64d3ae6b 100644 --- a/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml +++ b/Documentation/devicetree/bindings/pci/renesas,pci-rcar-gen2.yaml @@ -65,7 +65,7 @@ properties: maxItems: 1 patternProperties: - 'usb@[0-1],0': + '^usb@[0-1],0$': type: object description: diff --git a/Documentation/devicetree/bindings/regulator/max8660.yaml b/Documentation/devicetree/bindings/regulator/max8660.yaml index 9c038698f880..4d550ca396eb 100644 --- a/Documentation/devicetree/bindings/regulator/max8660.yaml +++ b/Documentation/devicetree/bindings/regulator/max8660.yaml @@ -24,7 +24,7 @@ properties: type: object patternProperties: - "regulator-.+": + "^regulator-.+$": $ref: "regulator.yaml#" additionalProperties: false diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml index 71138c611b6c..b704f05ea454 100644 --- a/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml +++ b/Documentation/devicetree/bindings/regulator/maxim,max77802.yaml @@ -77,7 +77,7 @@ patternProperties: regulator-initial-mode: false patternProperties: - regulator-state-(standby|mem|disk): + "^regulator-state-(standby|mem|disk)$": type: object additionalProperties: true properties: diff --git a/Documentation/devicetree/bindings/regulator/regulator.yaml b/Documentation/devicetree/bindings/regulator/regulator.yaml index 6e8aa9eed3aa..53b81d8a2d41 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/regulator.yaml @@ -231,7 +231,7 @@ patternProperties: ".*-supply$": description: Input supply phandle(s) for this node - regulator-state-(standby|mem|disk): + "^regulator-state-(standby|mem|disk)$": type: object description: sub-nodes for regulator state in Standby, Suspend-to-RAM, and diff --git a/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml b/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml index 7cb74cc8c5d9..54be194bb244 100644 --- a/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml @@ -21,7 +21,7 @@ description: | regulator-voutl1, regulator-vouts1 patternProperties: - "regulator-.+": + "^regulator-.+$": type: object description: Properties for single regulator. diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml index 679a246dd666..7df40c38e865 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.yaml @@ -115,7 +115,7 @@ properties: ports: $ref: /schemas/graph.yaml#/properties/ports patternProperties: - port(@[0-9a-f]+)?: + '^port(@[0-9a-f]+)?$': $ref: audio-graph-port.yaml# unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml b/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml index 6b733e5c1163..899100e783c9 100644 --- a/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml +++ b/Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml @@ -48,7 +48,7 @@ properties: - const: tx patternProperties: - "@[0-9a-f]+": + "@[0-9a-f]+$": type: object properties: -- 2.35.1

8 7

[Regression] Bug 216675 Since 6.0.3 Roland STUDIO-CAPTURE no longer registers
by Thorsten Leemhuis 21 Nov '22

21 Nov '22

Hi, this is your Linux kernel regression tracker speaking. I noticed a regression report in bugzilla.kernel.org. As many (most?) kernel developer don't keep an eye on it, I decided to forward it by mail. Quoting from https://bugzilla.kernel.org/show_bug.cgi?id=216675 : > Casey Tucker 2022-11-09 20:09:22 UTC > > After updating kernel to latest, my Roland audio device no longer shows up in aplay -l or cat /proc/asound/cards. > > I'm running Arch Linux. The last known good kernel was 6.0.2-arch1, and I was able to determine by booting a couple of virtual machines in qemu that an upstream patch shipped in 6.0.3-arch3 refactors card registration, and effectively breaks initialization of this device. > > Patch: https://lore.kernel.org/all/20220904161247.16461-1-tiwai@suse.de/ @Casey, btw and just to be sure you are aware of it, there was a fix-up patch ("ALSA: usb-audio: Fix last interface check for registration") for that commit in 6.0.3, too: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=… > I will be looking at this later this evening attempting to implement a fix that doesn't depend on reverting this patch, and may update this bug report with more details. See the ticket for more details. BTW, let me use this mail to also add the report to the list of tracked regressions to ensure it's doesn't fall through the cracks: #regzbot introduced: 30d629795e2 https://bugzilla.kernel.org/show_bug.cgi?id=216675 #regzbot ignore-activity Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat) P.S.: As the Linux kernel's regression tracker I deal with a lot of reports and sometimes miss something important when writing mails like this. If that's the case here, don't hesitate to tell me in a public reply, it's in everyone's interest to set the public record straight.

1 1

[RESEND PATCH] ASoC: core: Exit all links before removing their components
by Cezary Rojewski 20 Nov '22

20 Nov '22

Flows leading to link->init() and link->exit() are not symmetric. Currently the relevant part of card probe sequence goes as: for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->probe() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->probe() for_each_card_rtds(card, rtd) rtd->init() On the other side, equivalent remove sequence goes as: for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove() for_each_card_rtds(card, rtd) rtd->exit() what can lead to errors as link->exit() may still operate on resources owned by its components despite the probability of them being freed during the component->remove(). This change modifies the remove sequence to: for_each_card_rtds(card, rtd) rtd->exit() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove() so code found in link->exit() is safe to touch any component stuff as component->remove() has not been called yet. Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- Original review for v1: https://lore.kernel.org/alsa-devel/20220621115758.3154933-1-cezary.rojewski… sound/soc/soc-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4a3fca50a536..638e781df3b0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -935,9 +935,6 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card, { lockdep_assert_held(&client_mutex); - /* release machine specific resources */ - snd_soc_link_exit(rtd); - /* * Notify the machine driver for extra destruction */ @@ -1888,6 +1885,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card) snd_soc_dapm_shutdown(card); + /* release machine specific resources */ + for_each_card_rtds(card, rtd) + snd_soc_link_exit(rtd); /* remove and free each DAI */ soc_remove_link_dais(card); soc_remove_link_components(card); -- 2.25.1

2 2

es8336 HiFi.conf
by GitHub issues - opened 19 Nov '22

19 Nov '22

alsa-project/alsa-ucm-conf issue #244 was opened from junocomp: I believe the current HiFi.conf for es8336 is incorrect and does not enable the require volumes for the speakers. I have attached my conf file, this enables the speakers from startup, detects the HDMI audio and enables the internal microphone. I have tested this on 3 devices with Debian now and it seems to work. Can other people test it too please. If it works, it will be worth pushing it upstream. Make sure you backup your /usr/share/alsa/ucm2/Intel/sof-essx8336/HiFi.conf and replace it with the configuration below. Restart your machine to take effect. ``` SectionVerb { EnableSequence [ #disdevall "" # Disable all inputs / outputs # (may be duplicated with disdevall) cset "name='Left Headphone Mixer Left DAC Switch' on" cset "name='Right Headphone Mixer Right DAC Switch' on" ] } SectionDevice."Mic" { Comment "Analog Microphone" EnableSequence [ cset "name='Internal Mic Switch' on" cset "name='Headset Mic Switch' on" ] DisableSequence [ ] Value { CapturePriority 100 CapturePCM "hw:${CardId}" CaptureMixerElem "ADC PGA Gain" CaptureMasterElem "ADC" } } SectionDevice."Speaker" { Comment "Speakers" ConflictingDevice [ "Headphones" ] EnableSequence [ cset "name='Speaker Switch' on" cset "name='Differential Mux' lin1-rin1" ] DisableSequence [ cset "name='Speaker Switch' off" cset "name='Differential Mux' lin2-rin2" ] Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" # The es8316 only has a HP-amp which is muxed to the speaker # or to the headpones output PlaybackMixerElem "Headphone Mixer" PlaybackMasterElem "DAC" } } SectionDevice."Headphones" { Comment "Headphones" ConflictingDevice [ "Speaker" ] EnableSequence [ cset "name='Headset Mic Switch' on" cset "name='Speaker Switch' off" cset "name='Differential Mux' lin2-rin2" ] DisableSequence [ cset "name='Differential Mux' lin1-rin1" ] Value { PlaybackPriority 300 PlaybackPCM "hw:${CardId}" PlaybackMixerElem "Headphone Mixer" PlaybackMasterElem "DAC" JackControl "Headphone Jack" JackHWMute "Speaker" } } Include.hdmi.File "/Intel/sof-essx8336/Hdmi.conf" ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/244 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
by Kees Cook 19 Nov '22

19 Nov '22

With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. seq_copy_in_user() and seq_copy_in_kernel() did not have prototypes matching snd_seq_dump_func_t. Adjust this and remove the casts. There are not resulting binary output differences. This was found as a result of Clang's new -Wcast-function-type-strict flag, which is more sensitive than the simpler -Wcast-function-type, which only checks for type width mismatches. Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/lkml/202211041527.HD8TLSE1-lkp@intel.com Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: "Gustavo A. R. Silva" <gustavoars(a)kernel.org> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Kees Cook <keescook(a)chromium.org> --- sound/core/seq/seq_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index b7aee23fc387..47ef6bc30c0e 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -113,15 +113,19 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(char **bufptr, const void *src, int size) +static int seq_copy_in_kernel(void *ptr, void *src, int size) { + char **bufptr = ptr; + memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(char __user **bufptr, const void *src, int size) +static int seq_copy_in_user(void *ptr, void *src, int size) { + char __user **bufptr = ptr; + if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -151,8 +155,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : - (snd_seq_dump_func_t)seq_copy_in_user, + in_kernel ? seq_copy_in_kernel : seq_copy_in_user, &buf); return err < 0 ? err : newlen; } -- 2.34.1

2 1

[PATCH AUTOSEL 5.15 25/27] ALSA: usb-audio: add quirk to fix Hamedal C20 disconnect issue
by Sasha Levin 19 Nov '22

19 Nov '22

From: Ai Chao <aichao(a)kylinos.cn> [ Upstream commit bf990c10231937c0f51e5da5558e08cf5adc6a78 ] For Hamedal C20, the current rate is different from the runtime rate, snd_usb_endpoint stop and close endpoint to resetting rate. if snd_usb_endpoint close the endpoint, sometimes usb will disconnect the device. Signed-off-by: Ai Chao <aichao(a)kylinos.cn> Link: https://lore.kernel.org/r/20221110063452.295110-1-aichao@kylinos.cn Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/usb/endpoint.c | 3 ++- sound/usb/quirks.c | 2 ++ sound/usb/usbaudio.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 3bbc227769d0..092350eb5f4e 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -887,7 +887,8 @@ void snd_usb_endpoint_close(struct snd_usb_audio *chip, usb_audio_dbg(chip, "Closing EP 0x%x (count %d)\n", ep->ep_num, ep->opened); - if (!--ep->iface_ref->opened) + if (!--ep->iface_ref->opened && + !(chip->quirk_flags & QUIRK_FLAG_IFACE_SKIP_CLOSE)) endpoint_set_interface(chip, ep, false); if (!--ep->opened) { diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 879d8b1f301c..2ae9ad993ff4 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1884,6 +1884,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_GENERIC_IMPLICIT_FB), DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */ QUIRK_FLAG_GENERIC_IMPLICIT_FB), + DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */ + QUIRK_FLAG_IFACE_SKIP_CLOSE), /* Vendor matches */ VENDOR_FLG(0x045e, /* MS Lifecam */ diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 39c3c61a7e49..ec06f441e890 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -169,6 +169,8 @@ extern bool snd_usb_skip_validation; * Apply the generic implicit feedback sync mode (same as implicit_fb=1 option) * QUIRK_FLAG_SKIP_IMPLICIT_FB * Don't apply implicit feedback sync mode + * QUIRK_FLAG_IFACE_SKIP_CLOSE + * Don't closed interface during setting sample rate */ #define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0) @@ -190,5 +192,6 @@ extern bool snd_usb_skip_validation; #define QUIRK_FLAG_SET_IFACE_FIRST (1U << 16) #define QUIRK_FLAG_GENERIC_IMPLICIT_FB (1U << 17) #define QUIRK_FLAG_SKIP_IMPLICIT_FB (1U << 18) +#define QUIRK_FLAG_IFACE_SKIP_CLOSE (1U << 19) #endif /* __USBAUDIO_H */ -- 2.35.1

1 0

[PATCH AUTOSEL 6.0 41/44] ALSA: usb-audio: add quirk to fix Hamedal C20 disconnect issue
by Sasha Levin 19 Nov '22

19 Nov '22

From: Ai Chao <aichao(a)kylinos.cn> [ Upstream commit bf990c10231937c0f51e5da5558e08cf5adc6a78 ] For Hamedal C20, the current rate is different from the runtime rate, snd_usb_endpoint stop and close endpoint to resetting rate. if snd_usb_endpoint close the endpoint, sometimes usb will disconnect the device. Signed-off-by: Ai Chao <aichao(a)kylinos.cn> Link: https://lore.kernel.org/r/20221110063452.295110-1-aichao@kylinos.cn Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/usb/endpoint.c | 3 ++- sound/usb/quirks.c | 2 ++ sound/usb/usbaudio.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 2420dc994632..4c9ea13f72d4 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -923,7 +923,8 @@ void snd_usb_endpoint_close(struct snd_usb_audio *chip, usb_audio_dbg(chip, "Closing EP 0x%x (count %d)\n", ep->ep_num, ep->opened); - if (!--ep->iface_ref->opened) + if (!--ep->iface_ref->opened && + !(chip->quirk_flags & QUIRK_FLAG_IFACE_SKIP_CLOSE)) endpoint_set_interface(chip, ep, false); if (!--ep->opened) { diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index eadac586bcc8..a50e15be1229 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -2185,6 +2185,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_GENERIC_IMPLICIT_FB), DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */ QUIRK_FLAG_GENERIC_IMPLICIT_FB), + DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */ + QUIRK_FLAG_IFACE_SKIP_CLOSE), /* Vendor matches */ VENDOR_FLG(0x045e, /* MS Lifecam */ diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 2c6575029b1c..e97141ef730a 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -170,6 +170,8 @@ extern bool snd_usb_skip_validation; * Apply the generic implicit feedback sync mode (same as implicit_fb=1 option) * QUIRK_FLAG_SKIP_IMPLICIT_FB * Don't apply implicit feedback sync mode + * QUIRK_FLAG_IFACE_SKIP_CLOSE + * Don't closed interface during setting sample rate */ #define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0) @@ -191,5 +193,6 @@ extern bool snd_usb_skip_validation; #define QUIRK_FLAG_SET_IFACE_FIRST (1U << 16) #define QUIRK_FLAG_GENERIC_IMPLICIT_FB (1U << 17) #define QUIRK_FLAG_SKIP_IMPLICIT_FB (1U << 18) +#define QUIRK_FLAG_IFACE_SKIP_CLOSE (1U << 19) #endif /* __USBAUDIO_H */ -- 2.35.1

1 0

[PATCH] ASoC: Intel: avs: Initialize private data for subsequent HDA FEs
by Cezary Rojewski 18 Nov '22

18 Nov '22

HDAudio implementation found in sound/pci/hda expects a valid stream pointer in substream->runtime->private_data location. For ASoC users, that should point to a valid link stream which is assigned when BE opens. As BE borrows its runtime from FE, the information may be lost when reparenting comes into picture - see dpcm_be_reparent(). To support the DPCM reparenting functionality for HDAudio scenarios while still fulfilling expectations of HDAudio common code, have all FEs point to the same private data. Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- This is a tough one and spawned a range of patches. Some of the discussion is present at thesofproject/linux [1]. In the end decided to drop any soc-core/pcm.c modifications for now, instead addressing the problem directly in the avs-driver. Long term - perhaps BE should have a separate runtime so there is no ambiguity between FE and BE. [1]: https://github.com/thesofproject/linux/pull/3987 sound/soc/intel/avs/pcm.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index e237ab23fef9..41030aaae02d 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -1507,9 +1507,29 @@ static int avs_component_hda_open(struct snd_soc_component *component, if (!rtd->dai_link->no_pcm) { struct snd_pcm_hardware hwparams = avs_pcm_hardware; + struct snd_soc_pcm_runtime *be; + struct snd_soc_dpcm *dpcm; + int dir = substream->stream; + + /* + * Support the DPCM reparenting while still fulfilling expectations of HDAudio + * common code - a valid stream pointer at substream->runtime->private_data - + * by having all FEs point to the same private data. + */ + for_each_dpcm_be(rtd, dir, dpcm) { + struct snd_pcm_substream *be_substream; + + be = dpcm->be; + if (be->dpcm[dir].users == 1) + break; + + be_substream = snd_soc_dpcm_get_substream(be, dir); + substream->runtime->private_data = be_substream->runtime->private_data; + break; + } /* RESUME unsupported for de-coupled HD-Audio capture. */ - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + if (dir == SNDRV_PCM_STREAM_CAPTURE) hwparams.info &= ~SNDRV_PCM_INFO_RESUME; return snd_soc_set_runtime_hwparams(substream, &hwparams); -- 2.25.1

2 1

[PATCH] ASoC: Intel: sof_sdw_amp: mark coeff tables with __maybe_unused
by Bard Liao 18 Nov '22

18 Nov '22

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> The same file provides two tables used in separate drivers, make them as __maybe_unused to avoid errors: sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h:163:17: error: ‘dell_0b00_bq_params’ defined but not used [-Werror=unused-const-variable=] 163 | static const u8 dell_0b00_bq_params[] = { Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h b/sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h index 82230fbb5b05..4a3e6fdbd623 100644 --- a/sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h +++ b/sound/soc/intel/boards/sof_sdw_amp_coeff_tables.h @@ -11,7 +11,7 @@ #define RT1308_MAX_BQ_REG 480 #define RT1316_MAX_BQ_REG 580 -static const u8 dell_0a5d_bq_params[] = { +static const u8 __maybe_unused dell_0a5d_bq_params[] = { 0xb0, 0xc5, 0x00, /* address: 0xc5b0; data: 0x00 */ 0xb1, 0xc5, 0x32, 0xb2, 0xc5, 0x44, @@ -160,7 +160,7 @@ static const u8 dell_0a5d_bq_params[] = { 0x50, 0xc5, 0x01, }; -static const u8 dell_0b00_bq_params[] = { +static const u8 __maybe_unused dell_0b00_bq_params[] = { 0x03, 0xc2, 0x00, 0x04, 0xc2, 0xb2, 0x05, 0xc2, 0xe0, -- 2.25.1

2 1

[PATCH 0/3] ASoC: mchp-spdiftx: add power saving features
by Claudiu Beznea 18 Nov '22

18 Nov '22

Hi, This series adds support for runtime PM and system suspend/resume for Microchip SPDIFTX (patches 2/3, 3/3). Along with it I took the chance and added a minor cleanup (patch 1/3). Thank you, Claudiu Beznea Claudiu Beznea (3): ASoC: mchp-spdiftx: simplify locking around ctrl->ch_stat ASoC: mchp-spdiftx: add runtime pm support ASoC: mchp-spdiftx: add support for system suspend/resume sound/soc/atmel/mchp-spdiftx.c | 165 ++++++++++++++++++++++----------- 1 file changed, 113 insertions(+), 52 deletions(-) -- 2.34.1

2 4

[PATCH v2] ASoC: amd: acp: Fix possible UAF in acp_dma_open
by Gaosheng Cui 18 Nov '22

18 Nov '22

Smatch report warning as follows: sound/soc/amd/acp/acp-platform.c:199 acp_dma_open() warn: '&stream->list' not removed from list If snd_pcm_hw_constraint_integer() fails in acp_dma_open(), stream will be freed, but stream->list will not be removed from adata->stream_list, then list traversal may cause UAF. Fix by adding the newly allocated stream to the list once it's fully initialised. Fixes: 7929985cfe36 ("ASoC: amd: acp: Initialize list to store acp_stream during pcm_open") Signed-off-by: Gaosheng Cui <cuigaosheng1(a)huawei.com> --- v2: - Fix by adding the newly allocated stream to the list once it's fully initialised. v1: - Fix by removeing it from adata->stream_list before free(). sound/soc/amd/acp/acp-platform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c index 85a81add4ef9..447612a7a762 100644 --- a/sound/soc/amd/acp/acp-platform.c +++ b/sound/soc/amd/acp/acp-platform.c @@ -184,10 +184,6 @@ static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_subs stream->substream = substream; - spin_lock_irq(&adata->acp_lock); - list_add_tail(&stream->list, &adata->stream_list); - spin_unlock_irq(&adata->acp_lock); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) runtime->hw = acp_pcm_hardware_playback; else @@ -203,6 +199,10 @@ static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_subs writel(1, ACP_EXTERNAL_INTR_ENB(adata)); + spin_lock_irq(&adata->acp_lock); + list_add_tail(&stream->list, &adata->stream_list); + spin_unlock_irq(&adata->acp_lock); + return ret; } -- 2.25.1

2 1

[PATCH] ASoC: Intel: sof_nau8825: support rt1015p speaker amplifier
by Pierre-Louis Bossart 18 Nov '22

18 Nov '22

From: Brent Lu <brent.lu(a)intel.com> Add rt1015p speaker amplifier support with a new board info 'adl_rt1015p_nau8825' which supports NAU8825 on SSP0 and ALC1015Q on SSP1. Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Signed-off-by: Brent Lu <brent.lu(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/boards/sof_nau8825.c | 16 ++++++++++++++++ .../soc/intel/common/soc-acpi-intel-adl-match.c | 12 ++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 5585c217f78d3..27880224359d5 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -47,6 +47,7 @@ #define SOF_RT1019P_SPEAKER_AMP_PRESENT BIT(14) #define SOF_MAX98373_SPEAKER_AMP_PRESENT BIT(15) #define SOF_MAX98360A_SPEAKER_AMP_PRESENT BIT(16) +#define SOF_RT1015P_SPEAKER_AMP_PRESENT BIT(17) static unsigned long sof_nau8825_quirk = SOF_NAU8825_SSP_CODEC(0); @@ -483,6 +484,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, } else if (sof_nau8825_quirk & SOF_MAX98360A_SPEAKER_AMP_PRESENT) { max_98360a_dai_link(&links[id]); + } else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) { + sof_rt1015p_dai_link(&links[id]); } else { goto devm_err; } @@ -576,6 +579,8 @@ static int sof_audio_probe(struct platform_device *pdev) if (sof_nau8825_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT) max_98373_set_codec_conf(&sof_audio_card_nau8825); + else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) + sof_rt1015p_codec_conf(&sof_audio_card_nau8825); if (sof_nau8825_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) sof_audio_card_nau8825.num_links++; @@ -642,6 +647,16 @@ static const struct platform_device_id board_ids[] = { SOF_SSP_BT_OFFLOAD_PRESENT), }, + { + .name = "adl_rt1015p_nau8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_RT1015P_SPEAKER_AMP_PRESENT | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); @@ -663,3 +678,4 @@ MODULE_AUTHOR("Mac Chiang <mac.chiang(a)intel.com>"); MODULE_LICENSE("GPL"); MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON); MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON); +MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_REALTEK_COMMON); diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 3ca0a96d94de8..60aee56f94bd4 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -430,6 +430,11 @@ static const struct snd_soc_acpi_codecs adl_rt5682_rt5682s_hp = { .codecs = {"10EC5682", "RTL5682"}, }; +static const struct snd_soc_acpi_codecs adl_rt1015p_amp = { + .num_codecs = 1, + .codecs = {"RTL1015"} +}; + static const struct snd_soc_acpi_codecs adl_rt1019p_amp = { .num_codecs = 1, .codecs = {"RTL1019"} @@ -495,6 +500,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .quirk_data = &adl_rt1019p_amp, .sof_tplg_filename = "sof-adl-rt1019-rt5682.tplg", }, + { + .id = "10508825", + .drv_name = "adl_rt1015p_nau8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &adl_rt1015p_amp, + .sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg", + }, { .id = "10508825", .drv_name = "sof_nau8825", -- 2.34.1

2 1

[PATCH] ASoC: dt-bindings: sun50i-dmic: Add D1 compatible string
by Samuel Holland 18 Nov '22

18 Nov '22

The Allwinner D1 SoC has a DMIC codec like the one in the H6. It appears to be register-compatible with the H6 variant, and the existing Linux driver has been tested on a D1-based board, the Lichee RV 86 Panel. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- .../bindings/sound/allwinner,sun50i-h6-dmic.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml index 2f12cabe4c71..0920f2f81a1c 100644 --- a/Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml +++ b/Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml @@ -11,7 +11,12 @@ maintainers: properties: compatible: - const: allwinner,sun50i-h6-dmic + oneOf: + - items: + - enum: + - allwinner,sun20i-d1-dmic + - const: allwinner,sun50i-h6-dmic + - const: allwinner,sun50i-h6-dmic "#sound-dai-cells": const: 0 -- 2.37.3

4 3

[PATCH] ASoC: SOF: dai: move AMD_HS to end of list to restore backwards-compatibility
by Pierre-Louis Bossart 18 Nov '22

18 Nov '22

The addition of AMD_HS breaks Mediatek platforms by using an index previously allocated to Mediatek. This is a backwards-compatibility issue and needs to be fixed. All firmware released by AMD needs to be re-generated and re-distributed. Fixes: ed2562c64b4f ("ASoC: SOF: Adding amd HS functionality to the sof core") Link: https://github.com/thesofproject/sof/issues/6615 Link: https://lore.kernel.org/alsa-devel/36a45c7a-820a-7675-d740-c0e83ae2c417@col… Reported-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> Reviewed-by: Daniel Baluta <daniel.baluta(a)nxp.com> Reviewed-by: Basavaraj Hiregoudar <basavaraj.hiregoudar(a)amd.com> Reviewed-by: V sujith kumar Reddy <Vsujithkumar.Reddy(a)amd.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- include/sound/sof/dai.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h index 83fd81c82e4c1..9fbd3832bcdc7 100644 --- a/include/sound/sof/dai.h +++ b/include/sound/sof/dai.h @@ -84,8 +84,8 @@ enum sof_ipc_dai_type { SOF_DAI_AMD_BT, /**< AMD ACP BT*/ SOF_DAI_AMD_SP, /**< AMD ACP SP */ SOF_DAI_AMD_DMIC, /**< AMD ACP DMIC */ - SOF_DAI_AMD_HS, /**< Amd HS */ SOF_DAI_MEDIATEK_AFE, /**< Mediatek AFE */ + SOF_DAI_AMD_HS, /**< Amd HS */ }; /* general purpose DAI configuration */ -- 2.34.1

2 1

[PATCH v1 1/1] ASoC: SOF: probes: Check ops before memory allocation
by Andy Shevchenko 18 Nov '22

18 Nov '22

We may check ops before spending resources on memory allocation. While at it, utilize dev_get_platdata() helper. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- sound/soc/sof/sof-client-probes.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c index d08395182b1a..fff126808bc0 100644 --- a/sound/soc/sof/sof-client-probes.c +++ b/sound/soc/sof/sof-client-probes.c @@ -399,23 +399,21 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev, if (!sof_probes_enabled) return -ENXIO; - if (!dev->platform_data) { + ops = dev_get_platdata(dev); + if (!ops) { dev_err(dev, "missing platform data\n"); return -ENODEV; } - - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - - ops = dev->platform_data; - if (!ops->startup || !ops->shutdown || !ops->set_params || !ops->trigger || !ops->pointer) { dev_err(dev, "missing platform callback(s)\n"); return -ENODEV; } + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + priv->host_ops = ops; switch (sof_client_get_ipc_type(cdev)) { -- 2.35.1

3 2

[RFC PATCH 0/9] dt-bindings: cleanup titles
by Krzysztof Kozlowski 18 Nov '22

18 Nov '22

RFC and merging =============== Intention is to regenerate the commits with commands at the end of merge window. This should go then via Rob's tree. Description =========== The Devicetree bindings document does not have to say in the title that it is a "Devicetree binding", but instead just describe the hardware. We have several of such patterns, so when people copy existing bindings into new ones, they also make similar mistake. Clean this stuff: 1. Automated with find+sed commands, 2. Manual to have something meaningful. Best regards, Krzysztof Krzysztof Kozlowski (9): dt-bindings: drop redundant part of title of shared bindings dt-bindings: memory-controllers: ti,gpmc-child: drop redundant part of title dt-bindings: clock: st,stm32mp1-rcc: add proper title dt-bindings: drop redundant part of title (end) dt-bindings: drop redundant part of title (end, part two) dt-bindings: drop redundant part of title (end, part three) dt-bindings: drop redundant part of title (beginning) dt-bindings: clock: drop redundant part of title dt-bindings: drop redundant part of title (manual) Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml | 2 +- Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml | 2 +- .../devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml | 2 +- Documentation/devicetree/bindings/arm/cci-control-port.yaml | 2 +- Documentation/devicetree/bindings/arm/cpus.yaml | 2 +- .../devicetree/bindings/arm/firmware/linaro,optee-tz.yaml | 2 +- .../devicetree/bindings/arm/hisilicon/hisilicon.yaml | 2 +- .../devicetree/bindings/arm/keystone/ti,k3-sci-common.yaml | 2 +- Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml | 2 +- .../devicetree/bindings/arm/marvell/armada-7k-8k.yaml | 2 +- Documentation/devicetree/bindings/arm/mrvl/mrvl.yaml | 2 +- Documentation/devicetree/bindings/arm/mstar/mstar.yaml | 2 +- Documentation/devicetree/bindings/arm/npcm/npcm.yaml | 2 +- Documentation/devicetree/bindings/arm/nxp/lpc32xx.yaml | 2 +- Documentation/devicetree/bindings/arm/socionext/milbeaut.yaml | 2 +- Documentation/devicetree/bindings/arm/socionext/uniphier.yaml | 2 +- Documentation/devicetree/bindings/arm/sp810.yaml | 2 +- Documentation/devicetree/bindings/arm/sprd/sprd.yaml | 2 +- Documentation/devicetree/bindings/arm/stm32/st,mlahb.yaml | 2 +- .../devicetree/bindings/arm/stm32/st,stm32-syscon.yaml | 2 +- Documentation/devicetree/bindings/arm/stm32/stm32.yaml | 2 +- .../bindings/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml | 2 +- .../bindings/arm/sunxi/allwinner,sun9i-a80-prcm.yaml | 2 +- .../bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 2 +- .../devicetree/bindings/arm/tegra/nvidia,tegra194-cbb.yaml | 2 +- .../devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 2 +- Documentation/devicetree/bindings/arm/ti/k3.yaml | 2 +- Documentation/devicetree/bindings/arm/ti/ti,davinci.yaml | 2 +- Documentation/devicetree/bindings/arm/vexpress-config.yaml | 2 +- Documentation/devicetree/bindings/arm/vexpress-sysreg.yaml | 2 +- .../devicetree/bindings/ata/allwinner,sun4i-a10-ahci.yaml | 2 +- .../devicetree/bindings/ata/allwinner,sun8i-r40-ahci.yaml | 2 +- Documentation/devicetree/bindings/bus/ti-sysc.yaml | 2 +- Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml | 2 +- Documentation/devicetree/bindings/clock/calxeda.yaml | 2 +- Documentation/devicetree/bindings/clock/cirrus,cs2000-cp.yaml | 2 +- Documentation/devicetree/bindings/clock/fixed-clock.yaml | 2 +- .../devicetree/bindings/clock/fixed-factor-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/fixed-mmio-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/fsl,plldig.yaml | 2 +- Documentation/devicetree/bindings/clock/fsl,sai-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/fsl,scu-clk.yaml | 2 +- Documentation/devicetree/bindings/clock/idt,versaclock5.yaml | 2 +- Documentation/devicetree/bindings/clock/imx1-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx21-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx23-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx25-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx27-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx28-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx31-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx35-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx5-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6q-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6sl-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6sll-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6sx-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx6ul-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx7d-clock.yaml | 2 +- .../devicetree/bindings/clock/imx7ulp-pcc-clock.yaml | 2 +- .../devicetree/bindings/clock/imx7ulp-scg-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx8m-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx8qxp-lpcg.yaml | 2 +- .../devicetree/bindings/clock/imx8ulp-cgc-clock.yaml | 2 +- .../devicetree/bindings/clock/imx8ulp-pcc-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imx93-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/imxrt1050-clock.yaml | 2 +- Documentation/devicetree/bindings/clock/ingenic,cgu.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,agilex.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,cgu-lgm.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,easic-n5x.yaml | 2 +- Documentation/devicetree/bindings/clock/intel,stratix10.yaml | 2 +- .../devicetree/bindings/clock/microchip,mpfs-clkcfg.yaml | 2 +- Documentation/devicetree/bindings/clock/milbeaut-clock.yaml | 2 +- .../devicetree/bindings/clock/nuvoton,npcm845-clk.yaml | 2 +- .../devicetree/bindings/clock/qcom,dispcc-sc8280xp.yaml | 2 +- Documentation/devicetree/bindings/clock/qcom,gcc.yaml | 2 +- Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 +- Documentation/devicetree/bindings/clock/renesas,9series.yaml | 2 +- .../devicetree/bindings/clock/renesas,versaclock7.yaml | 2 +- .../devicetree/bindings/clock/rockchip,rk3568-cru.yaml | 2 +- Documentation/devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 2 +- Documentation/devicetree/bindings/clock/ti,lmk04832.yaml | 2 +- Documentation/devicetree/bindings/clock/ti,sci-clk.yaml | 2 +- Documentation/devicetree/bindings/clock/ti/ti,clksel.yaml | 2 +- Documentation/devicetree/bindings/cpu/idle-states.yaml | 2 +- .../devicetree/bindings/cpufreq/cpufreq-mediatek-hw.yaml | 2 +- .../devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 2 +- Documentation/devicetree/bindings/crypto/st,stm32-crc.yaml | 2 +- Documentation/devicetree/bindings/crypto/st,stm32-cryp.yaml | 2 +- Documentation/devicetree/bindings/crypto/st,stm32-hash.yaml | 2 +- Documentation/devicetree/bindings/display/arm,hdlcd.yaml | 2 +- Documentation/devicetree/bindings/display/arm,malidp.yaml | 2 +- Documentation/devicetree/bindings/display/bridge/anx6345.yaml | 2 +- .../devicetree/bindings/display/bridge/chrontel,ch7033.yaml | 2 +- .../bindings/display/bridge/ingenic,jz4780-hdmi.yaml | 2 +- .../devicetree/bindings/display/bridge/intel,keembay-dsi.yaml | 2 +- .../devicetree/bindings/display/bridge/ite,it6505.yaml | 2 +- .../devicetree/bindings/display/bridge/ite,it66121.yaml | 2 +- Documentation/devicetree/bindings/display/bridge/ps8640.yaml | 2 +- .../devicetree/bindings/display/bridge/toshiba,tc358767.yaml | 2 +- .../devicetree/bindings/display/bridge/toshiba,tc358775.yaml | 2 +- Documentation/devicetree/bindings/display/ingenic,ipu.yaml | 2 +- Documentation/devicetree/bindings/display/ingenic,lcd.yaml | 2 +- .../devicetree/bindings/display/intel,keembay-display.yaml | 2 +- .../devicetree/bindings/display/intel,keembay-msscam.yaml | 2 +- .../devicetree/bindings/display/mediatek/mediatek,cec.yaml | 2 +- .../devicetree/bindings/display/mediatek/mediatek,dsi.yaml | 2 +- .../bindings/display/mediatek/mediatek,hdmi-ddc.yaml | 2 +- .../devicetree/bindings/display/mediatek/mediatek,hdmi.yaml | 2 +- Documentation/devicetree/bindings/display/msm/gmu.yaml | 2 +- Documentation/devicetree/bindings/display/msm/gpu.yaml | 2 +- .../devicetree/bindings/display/panel/display-timings.yaml | 2 +- .../devicetree/bindings/display/panel/ilitek,ili9163.yaml | 2 +- .../bindings/display/panel/olimex,lcd-olinuxino.yaml | 2 +- .../devicetree/bindings/display/panel/panel-lvds.yaml | 2 +- .../devicetree/bindings/display/panel/panel-timing.yaml | 2 +- .../devicetree/bindings/display/panel/visionox,rm69299.yaml | 2 +- Documentation/devicetree/bindings/dma/dma-common.yaml | 2 +- Documentation/devicetree/bindings/dma/dma-controller.yaml | 4 ++-- Documentation/devicetree/bindings/dma/dma-router.yaml | 4 ++-- Documentation/devicetree/bindings/dma/ingenic,dma.yaml | 2 +- Documentation/devicetree/bindings/dma/st,stm32-dma.yaml | 2 +- Documentation/devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- Documentation/devicetree/bindings/dma/st,stm32-mdma.yaml | 2 +- Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml | 2 +- Documentation/devicetree/bindings/dma/ti/k3-pktdma.yaml | 2 +- Documentation/devicetree/bindings/dma/ti/k3-udma.yaml | 2 +- .../devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 2 +- Documentation/devicetree/bindings/edac/dmc-520.yaml | 2 +- .../devicetree/bindings/eeprom/microchip,93lc46b.yaml | 2 +- Documentation/devicetree/bindings/firmware/arm,scmi.yaml | 2 +- Documentation/devicetree/bindings/firmware/arm,scpi.yaml | 2 +- .../devicetree/bindings/firmware/qemu,fw-cfg-mmio.yaml | 2 +- Documentation/devicetree/bindings/gpio/gpio-tpic2810.yaml | 2 +- Documentation/devicetree/bindings/gpio/ti,omap-gpio.yaml | 2 +- Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml | 2 +- .../devicetree/bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 2 +- Documentation/devicetree/bindings/gpu/vivante,gc.yaml | 2 +- .../devicetree/bindings/hwlock/st,stm32-hwspinlock.yaml | 2 +- Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml | 2 +- Documentation/devicetree/bindings/i2c/i2c-gpio.yaml | 2 +- Documentation/devicetree/bindings/i2c/i2c-pxa.yaml | 2 +- Documentation/devicetree/bindings/i2c/ingenic,i2c.yaml | 2 +- Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml | 2 +- Documentation/devicetree/bindings/i2c/ti,omap4-i2c.yaml | 2 +- Documentation/devicetree/bindings/i3c/i3c.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/adc.yaml | 2 +- .../devicetree/bindings/iio/adc/allwinner,sun8i-a33-ths.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml | 2 +- .../devicetree/bindings/iio/adc/motorola,cpcap-adc.yaml | 2 +- .../devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml | 2 +- .../devicetree/bindings/iio/adc/nxp,lpc1850-adc.yaml | 2 +- .../devicetree/bindings/iio/adc/sigma-delta-modulator.yaml | 2 +- .../devicetree/bindings/iio/adc/sprd,sc2720-adc.yaml | 2 +- Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml | 2 +- .../devicetree/bindings/iio/adc/ti,palmas-gpadc.yaml | 2 +- .../devicetree/bindings/iio/adc/x-powers,axp209-adc.yaml | 2 +- .../devicetree/bindings/iio/dac/nxp,lpc1850-dac.yaml | 2 +- Documentation/devicetree/bindings/iio/dac/st,stm32-dac.yaml | 2 +- .../devicetree/bindings/iio/multiplexer/io-channel-mux.yaml | 2 +- Documentation/devicetree/bindings/input/fsl,scu-key.yaml | 2 +- Documentation/devicetree/bindings/input/gpio-keys.yaml | 2 +- Documentation/devicetree/bindings/input/input.yaml | 2 +- Documentation/devicetree/bindings/input/matrix-keymap.yaml | 2 +- .../devicetree/bindings/input/microchip,cap11xx.yaml | 2 +- .../devicetree/bindings/input/pine64,pinephone-keyboard.yaml | 2 +- .../bindings/input/touchscreen/chipone,icn8318.yaml | 2 +- .../bindings/input/touchscreen/cypress,cy8ctma140.yaml | 2 +- .../bindings/input/touchscreen/cypress,cy8ctma340.yaml | 2 +- .../devicetree/bindings/input/touchscreen/edt-ft5x06.yaml | 2 +- .../devicetree/bindings/input/touchscreen/goodix.yaml | 2 +- .../devicetree/bindings/input/touchscreen/himax,hx83112b.yaml | 2 +- .../devicetree/bindings/input/touchscreen/hycon,hy46xx.yaml | 2 +- .../bindings/input/touchscreen/imagis,ist3038c.yaml | 2 +- .../devicetree/bindings/input/touchscreen/melfas,mms114.yaml | 2 +- .../devicetree/bindings/input/touchscreen/mstar,msg2638.yaml | 2 +- .../bindings/input/touchscreen/pixcir,pixcir_ts.yaml | 2 +- .../devicetree/bindings/input/touchscreen/silead,gsl1680.yaml | 2 +- .../devicetree/bindings/input/touchscreen/ti,tsc2005.yaml | 2 +- .../devicetree/bindings/input/touchscreen/touchscreen.yaml | 2 +- .../devicetree/bindings/input/touchscreen/zinitix,bt400.yaml | 2 +- .../bindings/interrupt-controller/ingenic,intc.yaml | 2 +- .../devicetree/bindings/interrupt-controller/mrvl,intc.yaml | 2 +- .../bindings/interrupt-controller/nuvoton,wpcm450-aic.yaml | 2 +- .../bindings/interrupt-controller/realtek,rtl-intc.yaml | 2 +- .../bindings/interrupt-controller/renesas,irqc.yaml | 2 +- Documentation/devicetree/bindings/ipmi/ipmi-ipmb.yaml | 2 +- Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml | 2 +- .../devicetree/bindings/leds/backlight/gpio-backlight.yaml | 2 +- .../devicetree/bindings/leds/backlight/led-backlight.yaml | 2 +- .../devicetree/bindings/leds/backlight/pwm-backlight.yaml | 2 +- .../devicetree/bindings/leds/backlight/qcom-wled.yaml | 2 +- Documentation/devicetree/bindings/leds/issi,is31fl319x.yaml | 2 +- Documentation/devicetree/bindings/leds/register-bit-led.yaml | 2 +- Documentation/devicetree/bindings/leds/regulator-led.yaml | 2 +- .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 +- Documentation/devicetree/bindings/mailbox/sprd-mailbox.yaml | 2 +- Documentation/devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 2 +- .../devicetree/bindings/media/i2c/dongwoon,dw9768.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ov8856.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov5640.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +- Documentation/devicetree/bindings/media/i2c/st,st-vgxy61.yaml | 2 +- .../devicetree/bindings/media/marvell,mmp2-ccic.yaml | 2 +- Documentation/devicetree/bindings/media/renesas,ceu.yaml | 2 +- Documentation/devicetree/bindings/media/st,stm32-cec.yaml | 2 +- Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml | 2 +- Documentation/devicetree/bindings/media/st,stm32-dma2d.yaml | 2 +- .../devicetree/bindings/media/video-interface-devices.yaml | 2 +- Documentation/devicetree/bindings/media/video-interfaces.yaml | 2 +- .../bindings/memory-controllers/calxeda-ddr-ctrlr.yaml | 2 +- .../bindings/memory-controllers/ingenic,nemc-peripherals.yaml | 2 +- .../devicetree/bindings/memory-controllers/ingenic,nemc.yaml | 2 +- .../bindings/memory-controllers/st,stm32-fmc2-ebi.yaml | 2 +- .../devicetree/bindings/memory-controllers/ti,gpmc-child.yaml | 2 +- .../devicetree/bindings/memory-controllers/ti,gpmc.yaml | 2 +- Documentation/devicetree/bindings/mfd/actions,atc260x.yaml | 2 +- Documentation/devicetree/bindings/mfd/ene-kb3930.yaml | 2 +- Documentation/devicetree/bindings/mfd/ene-kb930.yaml | 2 +- Documentation/devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml | 2 +- Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd71847-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/rohm,bd9576-pmic.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stm32-lptimer.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stmfx.yaml | 2 +- Documentation/devicetree/bindings/mfd/st,stpmic1.yaml | 2 +- Documentation/devicetree/bindings/mips/ingenic/devices.yaml | 2 +- .../devicetree/bindings/mips/ingenic/ingenic,cpu.yaml | 2 +- .../devicetree/bindings/mips/lantiq/lantiq,dma-xway.yaml | 2 +- Documentation/devicetree/bindings/mips/loongson/devices.yaml | 2 +- Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 2 +- Documentation/devicetree/bindings/mmc/arasan,sdhci.yaml | 2 +- Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 +- Documentation/devicetree/bindings/mmc/ingenic,mmc.yaml | 2 +- .../devicetree/bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +- Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 +- Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 2 +- Documentation/devicetree/bindings/mmc/sdhci-pxa.yaml | 2 +- Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml | 2 +- Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.yaml | 2 +- Documentation/devicetree/bindings/mtd/gpmi-nand.yaml | 2 +- Documentation/devicetree/bindings/mtd/ingenic,nand.yaml | 2 +- .../devicetree/bindings/mtd/microchip,mchp48l640.yaml | 2 +- Documentation/devicetree/bindings/mtd/mxc-nand.yaml | 2 +- Documentation/devicetree/bindings/mtd/nand-chip.yaml | 2 +- Documentation/devicetree/bindings/mtd/nand-controller.yaml | 2 +- .../devicetree/bindings/mtd/partitions/qcom,smem-part.yaml | 2 +- Documentation/devicetree/bindings/mtd/st,stm32-fmc2-nand.yaml | 2 +- Documentation/devicetree/bindings/mux/gpio-mux.yaml | 2 +- Documentation/devicetree/bindings/mux/mux-consumer.yaml | 2 +- Documentation/devicetree/bindings/mux/mux-controller.yaml | 2 +- Documentation/devicetree/bindings/mux/reg-mux.yaml | 2 +- Documentation/devicetree/bindings/net/asix,ax88178.yaml | 2 +- .../bindings/net/bluetooth/bluetooth-controller.yaml | 2 +- Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml | 2 +- .../devicetree/bindings/net/can/allwinner,sun4i-a10-can.yaml | 2 +- Documentation/devicetree/bindings/net/can/bosch,c_can.yaml | 2 +- Documentation/devicetree/bindings/net/can/bosch,m_can.yaml | 2 +- Documentation/devicetree/bindings/net/can/can-controller.yaml | 2 +- .../devicetree/bindings/net/can/can-transceiver.yaml | 2 +- Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/dsa-port.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +- .../devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml | 2 +- .../devicetree/bindings/net/dsa/microchip,lan937x.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml | 2 +- Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml | 2 +- Documentation/devicetree/bindings/net/engleder,tsnep.yaml | 2 +- .../devicetree/bindings/net/ethernet-controller.yaml | 2 +- Documentation/devicetree/bindings/net/ethernet-phy.yaml | 2 +- Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml | 2 +- Documentation/devicetree/bindings/net/ingenic,mac.yaml | 2 +- .../devicetree/bindings/net/mctp-i2c-controller.yaml | 2 +- Documentation/devicetree/bindings/net/mdio.yaml | 2 +- Documentation/devicetree/bindings/net/microchip,lan95xx.yaml | 2 +- .../devicetree/bindings/net/wireless/esp,esp8089.yaml | 2 +- Documentation/devicetree/bindings/net/wireless/ieee80211.yaml | 2 +- .../devicetree/bindings/net/wireless/mediatek,mt76.yaml | 2 +- .../devicetree/bindings/net/wireless/microchip,wilc1000.yaml | 2 +- Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml | 2 +- .../devicetree/bindings/net/wireless/qcom,ath11k.yaml | 2 +- .../devicetree/bindings/net/wireless/silabs,wfx.yaml | 2 +- Documentation/devicetree/bindings/nvmem/fsl,scu-ocotp.yaml | 2 +- .../devicetree/bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 +- Documentation/devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 2 +- .../devicetree/bindings/nvmem/socionext,uniphier-efuse.yaml | 2 +- Documentation/devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v1.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2-base.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml | 2 +- Documentation/devicetree/bindings/opp/opp-v2.yaml | 2 +- Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 +- Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/calxeda-combophy.yaml | 2 +- Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml | 2 +- Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml | 2 +- .../devicetree/bindings/phy/intel,keembay-phy-usb.yaml | 2 +- .../devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml | 2 +- .../devicetree/bindings/phy/marvell,mmp3-usb-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/mediatek,ufs-phy.yaml | 2 +- Documentation/devicetree/bindings/phy/phy-cadence-sierra.yaml | 2 +- .../devicetree/bindings/phy/phy-cadence-torrent.yaml | 2 +- Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 +- Documentation/devicetree/bindings/phy/phy-tegra194-p2u.yaml | 2 +- Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 2 +- .../devicetree/bindings/phy/ti,phy-am654-serdes.yaml | 2 +- Documentation/devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 2 +- Documentation/devicetree/bindings/phy/transmit-amplitude.yaml | 2 +- .../devicetree/bindings/pinctrl/fsl,scu-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/ingenic,pinctrl.yaml | 2 +- Documentation/devicetree/bindings/pinctrl/intel,lgm-io.yaml | 2 +- Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml | 2 +- .../devicetree/bindings/power/domain-idle-state.yaml | 2 +- Documentation/devicetree/bindings/power/fsl,scu-pd.yaml | 2 +- .../devicetree/bindings/power/reset/restart-handler.yaml | 2 +- .../devicetree/bindings/power/reset/xlnx,zynqmp-power.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq2415x.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq24190.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq24257.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq24735.yaml | 2 +- Documentation/devicetree/bindings/power/supply/bq25890.yaml | 2 +- .../devicetree/bindings/power/supply/dlg,da9150-charger.yaml | 2 +- .../bindings/power/supply/dlg,da9150-fuel-gauge.yaml | 2 +- .../devicetree/bindings/power/supply/ingenic,battery.yaml | 2 +- Documentation/devicetree/bindings/power/supply/isp1704.yaml | 2 +- .../devicetree/bindings/power/supply/lltc,lt3651-charger.yaml | 2 +- .../devicetree/bindings/power/supply/lltc,ltc294x.yaml | 2 +- .../devicetree/bindings/power/supply/maxim,ds2760.yaml | 2 +- .../devicetree/bindings/power/supply/maxim,max14656.yaml | 2 +- .../devicetree/bindings/power/supply/richtek,rt9455.yaml | 2 +- .../devicetree/bindings/power/supply/sc2731-charger.yaml | 2 +- Documentation/devicetree/bindings/power/supply/sc27xx-fg.yaml | 2 +- Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml | 2 +- Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml | 2 +- .../devicetree/bindings/regulator/pwm-regulator.yaml | 2 +- .../devicetree/bindings/regulator/st,stm32-booster.yaml | 2 +- .../devicetree/bindings/regulator/st,stm32-vrefbuf.yaml | 2 +- .../bindings/remoteproc/amlogic,meson-mx-ao-arc.yaml | 2 +- .../devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/ingenic,vpu.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 2 +- Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml | 2 +- .../devicetree/bindings/remoteproc/qcom,pil-info.yaml | 2 +- .../devicetree/bindings/remoteproc/renesas,rcar-rproc.yaml | 2 +- .../devicetree/bindings/remoteproc/st,stm32-rproc.yaml | 2 +- .../devicetree/bindings/reserved-memory/shared-dma-pool.yaml | 2 +- Documentation/devicetree/bindings/reset/ti,sci-reset.yaml | 2 +- Documentation/devicetree/bindings/reset/ti,tps380x-reset.yaml | 2 +- Documentation/devicetree/bindings/riscv/cpus.yaml | 2 +- Documentation/devicetree/bindings/rng/ingenic,rng.yaml | 2 +- Documentation/devicetree/bindings/rng/ingenic,trng.yaml | 2 +- Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml | 2 +- .../devicetree/bindings/rng/silex-insight,ba431-rng.yaml | 2 +- Documentation/devicetree/bindings/rng/st,stm32-rng.yaml | 2 +- .../devicetree/bindings/rng/xiphera,xip8001b-trng.yaml | 2 +- Documentation/devicetree/bindings/rtc/epson,rx8900.yaml | 2 +- Documentation/devicetree/bindings/rtc/fsl,scu-rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/ingenic,rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/sa1100-rtc.yaml | 2 +- Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml | 2 +- Documentation/devicetree/bindings/serial/8250.yaml | 2 +- Documentation/devicetree/bindings/serial/8250_omap.yaml | 2 +- .../devicetree/bindings/serial/brcm,bcm7271-uart.yaml | 2 +- Documentation/devicetree/bindings/serial/ingenic,uart.yaml | 2 +- Documentation/devicetree/bindings/serial/rs485.yaml | 2 +- Documentation/devicetree/bindings/serial/serial.yaml | 2 +- Documentation/devicetree/bindings/serial/st,stm32-uart.yaml | 2 +- Documentation/devicetree/bindings/serio/ps2-gpio.yaml | 2 +- Documentation/devicetree/bindings/soc/mediatek/mtk-svs.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,smem.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom,spm.yaml | 2 +- Documentation/devicetree/bindings/soc/qcom/qcom-stats.yaml | 2 +- Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml | 2 +- Documentation/devicetree/bindings/soc/ti/sci-pm-domain.yaml | 2 +- Documentation/devicetree/bindings/sound/audio-graph-port.yaml | 2 +- Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 +- Documentation/devicetree/bindings/sound/ingenic,aic.yaml | 2 +- Documentation/devicetree/bindings/sound/ingenic,codec.yaml | 2 +- Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-rx-macro.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-tx-macro.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-va-macro.yaml | 2 +- .../devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml | 2 +- .../devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 2 +- .../devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wcd938x-sdw.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml | 2 +- Documentation/devicetree/bindings/sound/qcom,wsa883x.yaml | 2 +- Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml | 2 +- Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml | 2 +- Documentation/devicetree/bindings/sound/ti,src4xxx.yaml | 2 +- .../devicetree/bindings/soundwire/soundwire-controller.yaml | 2 +- Documentation/devicetree/bindings/spi/aspeed,ast2600-fmc.yaml | 2 +- Documentation/devicetree/bindings/spi/ingenic,spi.yaml | 2 +- Documentation/devicetree/bindings/spi/marvell,mmp2-ssp.yaml | 2 +- Documentation/devicetree/bindings/spi/omap-spi.yaml | 2 +- Documentation/devicetree/bindings/spi/spi-controller.yaml | 2 +- Documentation/devicetree/bindings/spi/spi-gpio.yaml | 2 +- Documentation/devicetree/bindings/spi/st,stm32-qspi.yaml | 2 +- Documentation/devicetree/bindings/spi/st,stm32-spi.yaml | 2 +- .../devicetree/bindings/thermal/fsl,scu-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/imx-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/imx8mm-thermal.yaml | 2 +- Documentation/devicetree/bindings/thermal/sprd-thermal.yaml | 2 +- .../devicetree/bindings/thermal/st,stm32-thermal.yaml | 2 +- .../devicetree/bindings/thermal/thermal-cooling-devices.yaml | 2 +- Documentation/devicetree/bindings/thermal/thermal-idle.yaml | 2 +- Documentation/devicetree/bindings/thermal/thermal-sensor.yaml | 2 +- Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 2 +- .../devicetree/bindings/thermal/ti,am654-thermal.yaml | 2 +- .../devicetree/bindings/thermal/ti,j72xx-thermal.yaml | 2 +- Documentation/devicetree/bindings/timer/ingenic,sysost.yaml | 2 +- Documentation/devicetree/bindings/timer/ingenic,tcu.yaml | 2 +- Documentation/devicetree/bindings/timer/mrvl,mmp-timer.yaml | 2 +- Documentation/devicetree/bindings/timer/st,stm32-timer.yaml | 2 +- Documentation/devicetree/bindings/usb/analogix,anx7411.yaml | 2 +- Documentation/devicetree/bindings/usb/cdns,usb3.yaml | 2 +- Documentation/devicetree/bindings/usb/dwc2.yaml | 2 +- Documentation/devicetree/bindings/usb/faraday,fotg210.yaml | 2 +- Documentation/devicetree/bindings/usb/ingenic,musb.yaml | 2 +- .../devicetree/bindings/usb/marvell,pxau2o-ehci.yaml | 2 +- Documentation/devicetree/bindings/usb/maxim,max33359.yaml | 2 +- .../devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml | 2 +- Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 2 +- Documentation/devicetree/bindings/usb/nxp,isp1760.yaml | 2 +- Documentation/devicetree/bindings/usb/realtek,rts5411.yaml | 2 +- Documentation/devicetree/bindings/usb/richtek,rt1719.yaml | 2 +- Documentation/devicetree/bindings/usb/st,stusb160x.yaml | 2 +- Documentation/devicetree/bindings/usb/ti,j721e-usb.yaml | 2 +- Documentation/devicetree/bindings/usb/ti,tps6598x.yaml | 2 +- Documentation/devicetree/bindings/usb/ti,usb8041.yaml | 2 +- Documentation/devicetree/bindings/usb/usb-device.yaml | 2 +- Documentation/devicetree/bindings/usb/willsemi,wusb3801.yaml | 2 +- Documentation/devicetree/bindings/virtio/virtio-device.yaml | 2 +- Documentation/devicetree/bindings/watchdog/fsl,scu-wdt.yaml | 2 +- Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.yaml | 2 +- Documentation/devicetree/bindings/watchdog/watchdog.yaml | 2 +- 472 files changed, 474 insertions(+), 474 deletions(-) -- 2.34.1

8 26

[PATCH 0/2] ASoC: codec: lpass-va: add npl clock support
by Srinivas Kandagatla 18 Nov '22

18 Nov '22

New versions of VA Macro has soundwire integrated, so handle the soundwire npl clock correctly in the codec driver and add related bindings. Srinivas Kandagatla (2): ASoC: dt-bindings: lpass-va: add npl clock for new VA macro ASoC: codecs: va-macro: add npl clk .../bindings/sound/qcom,lpass-va-macro.yaml | 72 ++++++++++++++++--- sound/soc/codecs/lpass-va-macro.c | 41 +++++++++++ 2 files changed, 105 insertions(+), 8 deletions(-) -- 2.25.1

2 6

[PATCH] ASoC: amd: acp: Fix possible UAF in acp_dma_open
by Gaosheng Cui 18 Nov '22

18 Nov '22

Smatch report warning as follows: sound/soc/amd/acp/acp-platform.c:199 acp_dma_open() warn: '&stream->list' not removed from list If snd_pcm_hw_constraint_integer() fails in acp_dma_open(), stream will be freed, but stream->list will not be removed from adata->stream_list, then list traversal may cause UAF. Fix by removeing it from adata->stream_list before free(). Fixes: 7929985cfe36 ("ASoC: amd: acp: Initialize list to store acp_stream during pcm_open") Signed-off-by: Gaosheng Cui <cuigaosheng1(a)huawei.com> --- sound/soc/amd/acp/acp-platform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c index 85a81add4ef9..275e0428eec4 100644 --- a/sound/soc/amd/acp/acp-platform.c +++ b/sound/soc/amd/acp/acp-platform.c @@ -196,6 +196,9 @@ static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_subs ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); if (ret < 0) { dev_err(component->dev, "set integer constraint failed\n"); + spin_lock_irq(&adata->acp_lock); + list_del(&stream->list); + spin_unlock_irq(&adata->acp_lock); kfree(stream); return ret; } -- 2.25.1

3 2

Revert "ucm2: add profile for the Librem 5"
by GitHub pull_request - opened 17 Nov '22

17 Nov '22

alsa-project/alsa-ucm-conf pull request #243 was opened from craftyguy: This reverts commit 998849d9510754960d808e20dad4c440adaf87ef. The oem (Purism) is working on some big improvements to this config, which I knew of when I submitted the patch this reverts, however I didn't realize until now that their changes would break config. It's probably best to just revert this so it doesn't make it into a release and wait for the oem to submit their improved ucm upstream. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/243 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/243.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2 0/4] Minor SoundWire clean ups
by Charles Keepax 17 Nov '22

17 Nov '22

Just some minor tidy ups and preparation for starting to upstream some Cirrus SoundWire devices. The first three patches are pretty trivial, the last patch which moves the remaining core over to using the no_pm functions could probably use some careful review. Changes since v1: - Update commit message on the debugfs to more explicitly mention the PM runtime reference, rather than implying the PM would turn on/off each time. - Added some reviewed by's Thanks, Charles Charles Keepax (3): soundwire: Provide build stubs for common functions soundwire: debugfs: Switch to sdw_read_no_pm soundwire: stream: Move remaining register accesses over to no_pm Simon Trimmer (1): soundwire: bus: export sdw_nwrite_no_pm and sdw_nread_no_pm functions drivers/soundwire/bus.c | 10 ++-- drivers/soundwire/debugfs.c | 11 +++- drivers/soundwire/stream.c | 30 +++++------ include/linux/soundwire/sdw.h | 94 +++++++++++++++++++++++++++++++---- 4 files changed, 114 insertions(+), 31 deletions(-) -- 2.30.2

2 6

[PATCH 1/2] ASoC: codecs: wsa883x: Shutdown on error path
by Krzysztof Kozlowski 17 Nov '22

17 Nov '22

If probe fails, toggle shutdown via GPIO to save power and reverse probe actions. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/wsa883x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c index 77a7dd3cf495..4ad8b875eb8f 100644 --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -1415,6 +1415,7 @@ static int wsa883x_probe(struct sdw_slave *pdev, wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config); if (IS_ERR(wsa883x->regmap)) { + gpiod_direction_output(wsa883x->sd_n, 1); dev_err(&pdev->dev, "regmap_init failed\n"); ret = PTR_ERR(wsa883x->regmap); goto err; -- 2.34.1

2 2

[PATCH 0/4] ADD SOF support for rembrandt platform
by V sujith kumar Reddy 17 Nov '22

17 Nov '22

This series consists of 1.Make ACP core code generic for newer SOC transition 2.Add support for Rembrandt plaform 3.Adding amd HS functionality to the sof core 4.increase SRAM inbox and outbox size to 1024 Ajit Kumar Pandey (1): ASoC: SOF: amd: Make ACP core code generic for newer SOC transition V sujith kumar Reddy (3): ASoC: SOF: amd: Add support for Rembrandt plaform. ASoC: SOF: Adding amd HS functionality to the sof core ASoC: SOF: amd: increase SRAM inbox and outbox size to 1024 include/sound/sof/dai.h | 2 + sound/soc/sof/amd/Kconfig | 10 ++ sound/soc/sof/amd/Makefile | 4 +- sound/soc/sof/amd/acp-common.c | 111 +++++++++++++++++ sound/soc/sof/amd/acp-dsp-offset.h | 33 +++-- sound/soc/sof/amd/acp-ipc.c | 49 ++++++-- sound/soc/sof/amd/acp-loader.c | 20 +++- sound/soc/sof/amd/acp-pcm.c | 3 +- sound/soc/sof/amd/acp-stream.c | 7 +- sound/soc/sof/amd/acp.c | 52 +++++--- sound/soc/sof/amd/acp.h | 38 ++++-- sound/soc/sof/amd/pci-rmb.c | 186 +++++++++++++++++++++++++++++ sound/soc/sof/amd/pci-rn.c | 11 ++ sound/soc/sof/amd/rembrandt.c | 134 +++++++++++++++++++++ sound/soc/sof/amd/renoir.c | 101 ++-------------- sound/soc/sof/ipc3-pcm.c | 9 ++ sound/soc/sof/ipc3-topology.c | 33 +++++ sound/soc/sof/topology.c | 1 + 18 files changed, 653 insertions(+), 151 deletions(-) create mode 100644 sound/soc/sof/amd/acp-common.c create mode 100644 sound/soc/sof/amd/pci-rmb.c create mode 100644 sound/soc/sof/amd/rembrandt.c -- 2.25.1

5 12

[PATCH linux-next] slimbus: core: Use device_match_of_node()
by ye.xingchen＠zte.com.cn 17 Nov '22

17 Nov '22

From: ye xingchen <ye.xingchen(a)zte.com.cn> Replace the open-code with device_match_of_node(). Signed-off-by: ye xingchen <ye.xingchen(a)zte.com.cn> --- drivers/slimbus/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 219483b79c09..9cafd33e7ddb 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -389,7 +389,7 @@ static int of_slim_match_dev(struct device *dev, void *data) struct device_node *np = data; struct slim_device *sbdev = to_slim_device(dev); - return (sbdev->dev.of_node == np); + return device_match_of_node(&sbdev->dev, np); } static struct slim_device *of_find_slim_device(struct slim_controller *ctrl, -- 2.25.1

1 0

[PATCH] ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions
by shumingf＠realtek.com 17 Nov '22

17 Nov '22

From: Shuming Fan <shumingf(a)realtek.com> Due to the hardware behavior, it takes some time for CBJ detection/impedance sensing/de-bounce. The ClockStop_NotFinished flag will be raised until these functions are completed. In ClockStopMode0 mode case, the SdW controller might check this flag from D3 to D0 when the jack detection interrupt happened. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt711-sdca-sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c index 4120842fe699..88a8392a58ed 100644 --- a/sound/soc/codecs/rt711-sdca-sdw.c +++ b/sound/soc/codecs/rt711-sdca-sdw.c @@ -230,7 +230,7 @@ static int rt711_sdca_read_prop(struct sdw_slave *slave) } /* set the timeout values */ - prop->clk_stop_timeout = 20; + prop->clk_stop_timeout = 700; /* wake-up event */ prop->wake_capable = 1; -- 2.38.1

4 3

[PATCH 0/2] ASoC: Add a driver for the Iron Device SMA1303 Amp
by Kiseok Jo 16 Nov '22

16 Nov '22

This adds basic audio support for the Iron Device SMA1303 amplifier. Kiseok Jo (2): ASoC: sma1303: Add driver for Iron Device SMA1303 Amp ASoC: dt-bindings: sma1303: Iron Device SMA1303 Amp .../bindings/sound/irondevice,sma1303.yaml | 40 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + sound/soc/codecs/Kconfig | 7 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sma1303.c | 2119 +++++++++++++++++ sound/soc/codecs/sma1303.h | 609 +++++ 6 files changed, 2779 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/irondevice,sma1303.yaml create mode 100644 sound/soc/codecs/sma1303.c create mode 100644 sound/soc/codecs/sma1303.h -- 2.30.2

4 5

[PATCH 1/2] ASoC: amd: ps: update macros with ps platform naming convention
by Syed Saba Kareem 16 Nov '22

16 Nov '22

Update macros using ps platform naming convention. Signed-off-by: Syed Saba Kareem <Syed.SabaKareem(a)amd.com> --- sound/soc/amd/ps/acp63.h | 8 ++++---- sound/soc/amd/ps/pci-ps.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h index 85f869c2229f..a90ba3b20dc7 100644 --- a/sound/soc/amd/ps/acp63.h +++ b/sound/soc/amd/ps/acp63.h @@ -8,10 +8,10 @@ #include <sound/acp63_chip_offset_byte.h> #define ACP_DEVICE_ID 0x15E2 -#define ACP6x_REG_START 0x1240000 -#define ACP6x_REG_END 0x1250200 -#define ACP6x_DEVS 3 -#define ACP6x_PDM_MODE 1 +#define ACP63_REG_START 0x1240000 +#define ACP63_REG_END 0x1250200 +#define ACP63_DEVS 3 +#define ACP63_PDM_MODE 1 #define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK 0x00010001 #define ACP_PGFSM_CNTL_POWER_ON_MASK 1 diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c index 08c4b9bef055..98dddd1a0cf4 100644 --- a/sound/soc/amd/ps/pci-ps.c +++ b/sound/soc/amd/ps/pci-ps.c @@ -21,7 +21,7 @@ struct acp63_dev_data { void __iomem *acp63_base; struct resource *res; bool acp63_audio_mode; - struct platform_device *pdev[ACP6x_DEVS]; + struct platform_device *pdev[ACP63_DEVS]; }; static int acp63_power_on(void __iomem *acp_base) @@ -143,7 +143,7 @@ static int snd_acp63_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { struct acp63_dev_data *adata; - struct platform_device_info pdevinfo[ACP6x_DEVS]; + struct platform_device_info pdevinfo[ACP63_DEVS]; int index, ret; int val = 0x00; struct acpi_device *adev; @@ -219,8 +219,8 @@ static int snd_acp63_probe(struct pci_dev *pci, adata->res->name = "acp_iomem"; adata->res->flags = IORESOURCE_MEM; adata->res->start = addr; - adata->res->end = addr + (ACP6x_REG_END - ACP6x_REG_START); - adata->acp63_audio_mode = ACP6x_PDM_MODE; + adata->res->end = addr + (ACP63_REG_END - ACP63_REG_START); + adata->acp63_audio_mode = ACP63_PDM_MODE; memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo[0].name = "acp_ps_pdm_dma"; @@ -237,7 +237,7 @@ static int snd_acp63_probe(struct pci_dev *pci, pdevinfo[2].id = 0; pdevinfo[2].parent = &pci->dev; - for (index = 0; index < ACP6x_DEVS; index++) { + for (index = 0; index < ACP63_DEVS; index++) { adata->pdev[index] = platform_device_register_full(&pdevinfo[index]); @@ -312,8 +312,8 @@ static void snd_acp63_remove(struct pci_dev *pci) int ret, index; adata = pci_get_drvdata(pci); - if (adata->acp63_audio_mode == ACP6x_PDM_MODE) { - for (index = 0; index < ACP6x_DEVS; index++) + if (adata->acp63_audio_mode == ACP63_PDM_MODE) { + for (index = 0; index < ACP63_DEVS; index++) platform_device_unregister(adata->pdev[index]); } ret = acp63_deinit(adata->acp63_base, &pci->dev); -- 2.25.1

2 2

[PATCH] ASoC: max98373: Add checks for devm_kcalloc
by Jiasheng Jiang 16 Nov '22

16 Nov '22

As the devm_kcalloc may return NULL pointer, it should be better to check the return value in order to avoid NULL poineter dereference. Fixes: 349dd23931d1 ("ASoC: max98373: don't access volatile registers in bias level off") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/codecs/max98373-i2c.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/max98373-i2c.c b/sound/soc/codecs/max98373-i2c.c index 3e04c7f0cce4..ec0905df65d1 100644 --- a/sound/soc/codecs/max98373-i2c.c +++ b/sound/soc/codecs/max98373-i2c.c @@ -549,6 +549,10 @@ static int max98373_i2c_probe(struct i2c_client *i2c) max98373->cache = devm_kcalloc(&i2c->dev, max98373->cache_num, sizeof(*max98373->cache), GFP_KERNEL); + if (!max98373->cache) { + ret = -ENOMEM; + return ret; + } for (i = 0; i < max98373->cache_num; i++) max98373->cache[i].reg = max98373_i2c_cache_reg[i]; -- 2.25.1

2 1

[PATCH] ASoC: rt1318: Add RT1318 SDCA vendor-specific driver
by shumingf＠realtek.com 16 Nov '22

16 Nov '22

From: Shuming Fan <shumingf(a)realtek.com> This is the initial amplifier driver for rt1318 SDCA version. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/rt1318-sdw.c | 884 ++++++++++++++++++++++++++++++++++ sound/soc/codecs/rt1318-sdw.h | 101 ++++ 4 files changed, 993 insertions(+) create mode 100644 sound/soc/codecs/rt1318-sdw.c create mode 100644 sound/soc/codecs/rt1318-sdw.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 7a13e750751a..6b3726a1ff45 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -199,6 +199,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_RT715_SDCA_SDW imply SND_SOC_RT1308_SDW imply SND_SOC_RT1316_SDW + imply SND_SOC_RT1318_SDW imply SND_SOC_RT9120 imply SND_SOC_SDW_MOCKUP imply SND_SOC_SGTL5000 @@ -1311,6 +1312,11 @@ config SND_SOC_RT1316_SDW depends on SOUNDWIRE select REGMAP_SOUNDWIRE +config SND_SOC_RT1318_SDW + tristate "Realtek RT1318 Codec - SDW" + depends on SOUNDWIRE + select REGMAP_SOUNDWIRE + config SND_SOC_RT5514 tristate depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 9170ee1447dd..71d3ce5867e4 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -196,6 +196,7 @@ snd-soc-rt1305-objs := rt1305.o snd-soc-rt1308-objs := rt1308.o snd-soc-rt1308-sdw-objs := rt1308-sdw.o snd-soc-rt1316-sdw-objs := rt1316-sdw.o +snd-soc-rt1318-sdw-objs := rt1318-sdw.o snd-soc-rt274-objs := rt274.o snd-soc-rt286-objs := rt286.o snd-soc-rt298-objs := rt298.o @@ -551,6 +552,7 @@ obj-$(CONFIG_SND_SOC_RT1305) += snd-soc-rt1305.o obj-$(CONFIG_SND_SOC_RT1308) += snd-soc-rt1308.o obj-$(CONFIG_SND_SOC_RT1308_SDW) += snd-soc-rt1308-sdw.o obj-$(CONFIG_SND_SOC_RT1316_SDW) += snd-soc-rt1316-sdw.o +obj-$(CONFIG_SND_SOC_RT1318_SDW) += snd-soc-rt1318-sdw.o obj-$(CONFIG_SND_SOC_RT274) += snd-soc-rt274.o obj-$(CONFIG_SND_SOC_RT286) += snd-soc-rt286.o obj-$(CONFIG_SND_SOC_RT298) += snd-soc-rt298.o diff --git a/sound/soc/codecs/rt1318-sdw.c b/sound/soc/codecs/rt1318-sdw.c new file mode 100644 index 000000000000..f85f5ab2c6d0 --- /dev/null +++ b/sound/soc/codecs/rt1318-sdw.c @@ -0,0 +1,884 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// rt1318-sdw.c -- rt1318 SDCA ALSA SoC amplifier audio driver +// +// Copyright(c) 2022 Realtek Semiconductor Corp. +// +// +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/pm_runtime.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/regmap.h> +#include <linux/dmi.h> +#include <linux/firmware.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc-dapm.h> +#include <sound/initval.h> +#include "rt1318-sdw.h" + +static const struct reg_sequence rt1318_blind_write[] = { + { 0xc001, 0x43 }, + { 0xc003, 0xa2 }, + { 0xc004, 0x44 }, + { 0xc005, 0x44 }, + { 0xc006, 0x33 }, + { 0xc007, 0x64 }, + { 0xc320, 0x20 }, + { 0xf203, 0x18 }, + { 0xf211, 0x00 }, + { 0xf212, 0x26 }, + { 0xf20d, 0x17 }, + { 0xf214, 0x06 }, + { 0xf20e, 0x00 }, + { 0xf223, 0x7f }, + { 0xf224, 0xdb }, + { 0xf225, 0xee }, + { 0xf226, 0x3f }, + { 0xf227, 0x0f }, + { 0xf21a, 0x78 }, + { 0xf242, 0x3c }, + { 0xc321, 0x0b }, + { 0xc200, 0xd8 }, + { 0xc201, 0x27 }, + { 0xc202, 0x0f }, + { 0xf800, 0x20 }, + { 0xdf00, 0x10 }, + { 0xdf5f, 0x01 }, + { 0xdf60, 0xa7 }, + { 0xc400, 0x0e }, + { 0xc401, 0x43 }, + { 0xc402, 0xe0 }, + { 0xc403, 0x00 }, + { 0xc404, 0x4c }, + { 0xc407, 0x02 }, + { 0xc408, 0x3f }, + { 0xc300, 0x01 }, + { 0xc206, 0x78 }, + { 0xc203, 0x84 }, + { 0xc120, 0xc0 }, + { 0xc121, 0x03 }, + { 0xe000, 0x88 }, + { 0xc321, 0x09 }, + { 0xc322, 0x01 }, + { 0xe706, 0x0f }, + { 0xe707, 0x30 }, + { 0xe806, 0x0f }, + { 0xe807, 0x30 }, + { 0xed00, 0xb0 }, + { 0xce04, 0x02 }, + { 0xce05, 0x63 }, + { 0xce06, 0x68 }, + { 0xce07, 0x07 }, + { 0xcf04, 0x02 }, + { 0xcf05, 0x63 }, + { 0xcf06, 0x68 }, + { 0xcf07, 0x07 }, + { 0xce60, 0xe3 }, + { 0xc130, 0x51 }, + { 0xf102, 0x00 }, + { 0xf103, 0x00 }, + { 0xf104, 0xf5 }, + { 0xf105, 0x06 }, + { 0xf109, 0x9b }, + { 0xf10a, 0x0b }, + { 0xf10b, 0x4c }, + { 0xf10b, 0x5c }, + { 0xf102, 0x00 }, + { 0xf103, 0x00 }, + { 0xf104, 0xf5 }, + { 0xf105, 0x0b }, + { 0xf109, 0x03 }, + { 0xf10a, 0x0b }, + { 0xf10b, 0x4c }, + { 0xf10b, 0x5c }, + { 0xf102, 0x00 }, + { 0xf103, 0x00 }, + { 0xf104, 0xf5 }, + { 0xf105, 0x0c }, + { 0xf109, 0x7f }, + { 0xf10a, 0x0b }, + { 0xf10b, 0x4c }, + { 0xf10b, 0x5c }, + + { 0xe604, 0x00 }, + { 0xdb00, 0x0c }, + { 0xdd00, 0x0c }, + { 0xdc19, 0x00 }, + { 0xdc1a, 0xff }, + { 0xdc1b, 0xff }, + { 0xdc1c, 0xff }, + { 0xdc1d, 0x00 }, + { 0xdc1e, 0x00 }, + { 0xdc1f, 0x00 }, + { 0xdc20, 0xff }, + { 0xde19, 0x00 }, + { 0xde1a, 0xff }, + { 0xde1b, 0xff }, + { 0xde1c, 0xff }, + { 0xde1d, 0x00 }, + { 0xde1e, 0x00 }, + { 0xde1f, 0x00 }, + { 0xde20, 0xff }, + { 0xdb32, 0x00 }, + { 0xdd32, 0x00 }, + { 0xdb33, 0x0a }, + { 0xdd33, 0x0a }, + { 0xdb34, 0x1a }, + { 0xdd34, 0x1a }, + { 0xdb17, 0xef }, + { 0xdd17, 0xef }, + { 0xdba7, 0x00 }, + { 0xdba8, 0x64 }, + { 0xdda7, 0x00 }, + { 0xdda8, 0x64 }, + { 0xdb19, 0x40 }, + { 0xdd19, 0x40 }, + { 0xdb00, 0x4c }, + { 0xdb01, 0x79 }, + { 0xdd01, 0x79 }, + { 0xdb04, 0x05 }, + { 0xdb05, 0x03 }, + { 0xdd04, 0x05 }, + { 0xdd05, 0x03 }, + { 0xdbbb, 0x09 }, + { 0xdbbc, 0x30 }, + { 0xdbbd, 0xf0 }, + { 0xdbbe, 0xf1 }, + { 0xddbb, 0x09 }, + { 0xddbc, 0x30 }, + { 0xddbd, 0xf0 }, + { 0xddbe, 0xf1 }, + { 0xdb01, 0x79 }, + { 0xdd01, 0x79 }, + { 0xdc52, 0xef }, + { 0xde52, 0xef }, + { 0x2f55, 0x22 }, +}; + +static const struct reg_default rt1318_reg_defaults[] = { + { 0x3000, 0x00 }, + { 0x3004, 0x01 }, + { 0x3005, 0x23 }, + { 0x3202, 0x00 }, + { 0x3203, 0x01 }, + { 0x3206, 0x00 }, + { 0xc000, 0x00 }, + { 0xc001, 0x43 }, + { 0xc003, 0x22 }, + { 0xc004, 0x44 }, + { 0xc005, 0x44 }, + { 0xc006, 0x33 }, + { 0xc007, 0x64 }, + { 0xc008, 0x05 }, + { 0xc00a, 0xfc }, + { 0xc00b, 0x0f }, + { 0xc00c, 0x0e }, + { 0xc00d, 0xef }, + { 0xc00e, 0xe5 }, + { 0xc00f, 0xff }, + { 0xc120, 0xc0 }, + { 0xc121, 0x00 }, + { 0xc122, 0x00 }, + { 0xc123, 0x14 }, + { 0xc125, 0x00 }, + { 0xc200, 0x00 }, + { 0xc201, 0x00 }, + { 0xc202, 0x00 }, + { 0xc203, 0x04 }, + { 0xc204, 0x00 }, + { 0xc205, 0x00 }, + { 0xc206, 0x68 }, + { 0xc207, 0x70 }, + { 0xc208, 0x00 }, + { 0xc20a, 0x00 }, + { 0xc20b, 0x01 }, + { 0xc20c, 0x7f }, + { 0xc20d, 0x01 }, + { 0xc20e, 0x7f }, + { 0xc300, 0x00 }, + { 0xc301, 0x00 }, + { 0xc303, 0x80 }, + { 0xc320, 0x00 }, + { 0xc321, 0x09 }, + { 0xc322, 0x02 }, + { 0xc410, 0x04 }, + { 0xc430, 0x00 }, + { 0xc431, 0x00 }, + { 0xca00, 0x10 }, + { 0xca01, 0x00 }, + { 0xca02, 0x0b }, + { 0xca10, 0x10 }, + { 0xca11, 0x00 }, + { 0xca12, 0x0b }, + { 0xdd93, 0x00 }, + { 0xdd94, 0x64 }, + { 0xe300, 0xa0 }, + { 0xed00, 0x80 }, + { 0xed01, 0x0f }, + { 0xed02, 0xff }, + { 0xed03, 0x00 }, + { 0xed04, 0x00 }, + { 0xed05, 0x0f }, + { 0xed06, 0xff }, + { 0xf010, 0x10 }, + { 0xf011, 0xec }, + { 0xf012, 0x68 }, + { 0xf013, 0x21 }, + { 0xf800, 0x00 }, + { 0xf801, 0x12 }, + { 0xf802, 0xe0 }, + { 0xf803, 0x2f }, + { 0xf804, 0x00 }, + { 0xf805, 0x00 }, + { 0xf806, 0x07 }, + { 0xf807, 0xff }, + { SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_UDMPU21, RT1318_SDCA_CTL_UDMPU_CLUSTER, 0), 0x00 }, + { SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_FU21, RT1318_SDCA_CTL_FU_MUTE, CH_L), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_FU21, RT1318_SDCA_CTL_FU_MUTE, CH_R), 0x01 }, + { SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_PDE23, RT1318_SDCA_CTL_REQ_POWER_STATE, 0), 0x03 }, + { SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_CS21, RT1318_SDCA_CTL_SAMPLE_FREQ_INDEX, 0), 0x09 }, +}; + +static bool rt1318_readable_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case 0x2f55: + case 0x3000: + case 0x3004 ... 0x3005: + case 0x3202 ... 0x3203: + case 0x3206: + case 0xc000 ... 0xc00f: + case 0xc120 ... 0xc125: + case 0xc200 ... 0xc20e: + case 0xc300 ... 0xc303: + case 0xc320 ... 0xc322: + case 0xc410: + case 0xc430 ... 0xc431: + case 0xca00 ... 0xca02: + case 0xca10 ... 0xca12: + case 0xcb00 ... 0xcb0b: + case 0xcc00 ... 0xcce5: + case 0xcd00 ... 0xcde5: + case 0xce00 ... 0xce6a: + case 0xcf00 ... 0xcf53: + case 0xd000 ... 0xd0cc: + case 0xd100 ... 0xd1b9: + case 0xdb00 ... 0xdc53: + case 0xdd00 ... 0xde53: + case 0xdf00 ... 0xdf6b: + case 0xe300: + case 0xeb00 ... 0xebcc: + case 0xec00 ... 0xecb9: + case 0xed00 ... 0xed06: + case 0xf010 ... 0xf014: + case 0xf800 ... 0xf807: + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_UDMPU21, RT1318_SDCA_CTL_UDMPU_CLUSTER, 0): + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_FU21, RT1318_SDCA_CTL_FU_MUTE, CH_L): + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_FU21, RT1318_SDCA_CTL_FU_MUTE, CH_R): + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_PDE23, RT1318_SDCA_CTL_REQ_POWER_STATE, 0): + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_CS21, RT1318_SDCA_CTL_SAMPLE_FREQ_INDEX, 0): + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_SAPU, RT1318_SDCA_CTL_SAPU_PROTECTION_MODE, 0): + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_SAPU, RT1318_SDCA_CTL_SAPU_PROTECTION_STATUS, 0): + return true; + default: + return false; + } +} + +static bool rt1318_volatile_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case 0x2f55: + case 0x3000 ... 0x3001: + case 0xc000: + case 0xc301: + case 0xc410: + case 0xc430 ... 0xc431: + case 0xdb06: + case 0xdb12: + case 0xdb1d ... 0xdb1f: + case 0xdb35: + case 0xdb37: + case 0xdb8a ... 0xdb92: + case 0xdbc5 ... 0xdbc8: + case 0xdc2b ... 0xdc49: + case 0xdd0b: + case 0xdd12: + case 0xdd1d ... 0xdd1f: + case 0xdd35: + case 0xdd8a ... 0xdd92: + case 0xddc5 ... 0xddc8: + case 0xde2b ... 0xde44: + case 0xdf4a ... 0xdf55: + case 0xe224 ... 0xe23b: + case 0xea01: + case 0xebc5: + case 0xebc8: + case 0xebcb ... 0xebcc: + case 0xed03 ... 0xed06: + case 0xf010 ... 0xf014: + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_SAPU, RT1318_SDCA_CTL_SAPU_PROTECTION_MODE, 0): + case SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_SAPU, RT1318_SDCA_CTL_SAPU_PROTECTION_STATUS, 0): + return true; + default: + return false; + } +} + +static const struct regmap_config rt1318_sdw_regmap = { + .reg_bits = 32, + .val_bits = 8, + .readable_reg = rt1318_readable_register, + .volatile_reg = rt1318_volatile_register, + .max_register = 0x41081488, + .reg_defaults = rt1318_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(rt1318_reg_defaults), + .cache_type = REGCACHE_RBTREE, + .use_single_read = true, + .use_single_write = true, +}; + +static int rt1318_read_prop(struct sdw_slave *slave) +{ + struct sdw_slave_prop *prop = &slave->prop; + int nval; + int i, j; + u32 bit; + unsigned long addr; + struct sdw_dpn_prop *dpn; + + prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY; + prop->quirks = SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY; + prop->is_sdca = true; + + prop->paging_support = true; + + /* first we need to allocate memory for set bits in port lists */ + prop->source_ports = BIT(2); + prop->sink_ports = BIT(1); + + nval = hweight32(prop->source_ports); + prop->src_dpn_prop = devm_kcalloc(&slave->dev, nval, + sizeof(*prop->src_dpn_prop), GFP_KERNEL); + if (!prop->src_dpn_prop) + return -ENOMEM; + + i = 0; + dpn = prop->src_dpn_prop; + addr = prop->source_ports; + for_each_set_bit(bit, &addr, 32) { + dpn[i].num = bit; + dpn[i].type = SDW_DPN_FULL; + dpn[i].simple_ch_prep_sm = true; + dpn[i].ch_prep_timeout = 10; + i++; + } + + /* do this again for sink now */ + nval = hweight32(prop->sink_ports); + prop->sink_dpn_prop = devm_kcalloc(&slave->dev, nval, + sizeof(*prop->sink_dpn_prop), GFP_KERNEL); + if (!prop->sink_dpn_prop) + return -ENOMEM; + + j = 0; + dpn = prop->sink_dpn_prop; + addr = prop->sink_ports; + for_each_set_bit(bit, &addr, 32) { + dpn[j].num = bit; + dpn[j].type = SDW_DPN_FULL; + dpn[j].simple_ch_prep_sm = true; + dpn[j].ch_prep_timeout = 10; + j++; + } + + /* set the timeout values */ + prop->clk_stop_timeout = 20; + + return 0; +} + +static int rt1318_io_init(struct device *dev, struct sdw_slave *slave) +{ + struct rt1318_sdw_priv *rt1318 = dev_get_drvdata(dev); + + if (rt1318->hw_init) + return 0; + + if (rt1318->first_hw_init) { + regcache_cache_only(rt1318->regmap, false); + regcache_cache_bypass(rt1318->regmap, true); + } else { + /* + * PM runtime is only enabled when a Slave reports as Attached + */ + + /* set autosuspend parameters */ + pm_runtime_set_autosuspend_delay(&slave->dev, 3000); + pm_runtime_use_autosuspend(&slave->dev); + + /* update count of parent 'active' children */ + pm_runtime_set_active(&slave->dev); + + /* make sure the device does not suspend immediately */ + pm_runtime_mark_last_busy(&slave->dev); + + pm_runtime_enable(&slave->dev); + } + + pm_runtime_get_noresume(&slave->dev); + + /* blind write */ + regmap_multi_reg_write(rt1318->regmap, rt1318_blind_write, + ARRAY_SIZE(rt1318_blind_write)); + + if (rt1318->first_hw_init) { + regcache_cache_bypass(rt1318->regmap, false); + regcache_mark_dirty(rt1318->regmap); + } + + /* Mark Slave initialization complete */ + rt1318->first_hw_init = true; + rt1318->hw_init = true; + + pm_runtime_mark_last_busy(&slave->dev); + pm_runtime_put_autosuspend(&slave->dev); + + dev_dbg(&slave->dev, "%s hw_init complete\n", __func__); + return 0; +} + +static int rt1318_update_status(struct sdw_slave *slave, + enum sdw_slave_status status) +{ + struct rt1318_sdw_priv *rt1318 = dev_get_drvdata(&slave->dev); + + /* Update the status */ + rt1318->status = status; + + if (status == SDW_SLAVE_UNATTACHED) + rt1318->hw_init = false; + + /* + * Perform initialization only if slave status is present and + * hw_init flag is false + */ + if (rt1318->hw_init || rt1318->status != SDW_SLAVE_ATTACHED) + return 0; + + /* perform I/O transfers required for Slave initialization */ + return rt1318_io_init(&slave->dev, slave); +} + +static int rt1318_classd_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + struct rt1318_sdw_priv *rt1318 = snd_soc_component_get_drvdata(component); + unsigned char ps0 = 0x0, ps3 = 0x3; + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + regmap_write(rt1318->regmap, + SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_PDE23, + RT1318_SDCA_CTL_REQ_POWER_STATE, 0), + ps0); + break; + case SND_SOC_DAPM_PRE_PMD: + regmap_write(rt1318->regmap, + SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_PDE23, + RT1318_SDCA_CTL_REQ_POWER_STATE, 0), + ps3); + break; + + default: + break; + } + + return 0; +} + +static const char * const rt1318_rx_data_ch_select[] = { + "L,R", + "L,L", + "L,R", + "L,L+R", + "R,L", + "R,R", + "R,L+R", + "L+R,L", + "L+R,R", + "L+R,L+R", +}; + +static SOC_ENUM_SINGLE_DECL(rt1318_rx_data_ch_enum, + SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_UDMPU21, RT1318_SDCA_CTL_UDMPU_CLUSTER, 0), 0, + rt1318_rx_data_ch_select); + +static const struct snd_kcontrol_new rt1318_snd_controls[] = { + + /* UDMPU Cluster Selection */ + SOC_ENUM("RX Channel Select", rt1318_rx_data_ch_enum), +}; + +static const struct snd_kcontrol_new rt1318_sto_dac = + SOC_DAPM_DOUBLE_R("Switch", + SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_FU21, RT1318_SDCA_CTL_FU_MUTE, CH_L), + SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_FU21, RT1318_SDCA_CTL_FU_MUTE, CH_R), + 0, 1, 1); + +static const struct snd_soc_dapm_widget rt1318_dapm_widgets[] = { + /* Audio Interface */ + SND_SOC_DAPM_AIF_IN("DP1RX", "DP1 Playback", 0, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("DP2TX", "DP2 Capture", 0, SND_SOC_NOPM, 0, 0), + + /* Digital Interface */ + SND_SOC_DAPM_SWITCH("DAC", SND_SOC_NOPM, 0, 0, &rt1318_sto_dac), + + /* Output */ + SND_SOC_DAPM_PGA_E("CLASS D", SND_SOC_NOPM, 0, 0, NULL, 0, + rt1318_classd_event, SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + SND_SOC_DAPM_OUTPUT("SPOL"), + SND_SOC_DAPM_OUTPUT("SPOR"), + /* Input */ + SND_SOC_DAPM_PGA("FB Data", SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_SIGGEN("FB Gen"), +}; + +static const struct snd_soc_dapm_route rt1318_dapm_routes[] = { + { "DAC", "Switch", "DP1RX" }, + { "CLASS D", NULL, "DAC" }, + { "SPOL", NULL, "CLASS D" }, + { "SPOR", NULL, "CLASS D" }, + + { "FB Data", NULL, "FB Gen" }, + { "DP2TX", NULL, "FB Data" }, +}; + +static int rt1318_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, + int direction) +{ + struct sdw_stream_data *stream; + + if (!sdw_stream) + return 0; + + stream = kzalloc(sizeof(*stream), GFP_KERNEL); + if (!stream) + return -ENOMEM; + + stream->sdw_stream = sdw_stream; + + /* Use tx_mask or rx_mask to configure stream tag and set dma_data */ + if (direction == SNDRV_PCM_STREAM_PLAYBACK) + dai->playback_dma_data = stream; + else + dai->capture_dma_data = stream; + + return 0; +} + +static void rt1318_sdw_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct sdw_stream_data *stream; + + stream = snd_soc_dai_get_dma_data(dai, substream); + snd_soc_dai_set_dma_data(dai, substream, NULL); + kfree(stream); +} + +static int rt1318_sdw_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct rt1318_sdw_priv *rt1318 = + snd_soc_component_get_drvdata(component); + struct sdw_stream_config stream_config; + struct sdw_port_config port_config; + enum sdw_data_direction direction; + struct sdw_stream_data *stream; + int retval, port, num_channels, ch_mask; + unsigned int sampling_rate; + + dev_dbg(dai->dev, "%s %s", __func__, dai->name); + stream = snd_soc_dai_get_dma_data(dai, substream); + + if (!stream) + return -EINVAL; + + if (!rt1318->sdw_slave) + return -EINVAL; + + /* SoundWire specific configuration */ + /* port 1 for playback */ + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + direction = SDW_DATA_DIR_RX; + port = 1; + } else { + direction = SDW_DATA_DIR_TX; + port = 2; + } + + num_channels = params_channels(params); + ch_mask = (1 << num_channels) - 1; + + stream_config.frame_rate = params_rate(params); + stream_config.ch_count = num_channels; + stream_config.bps = snd_pcm_format_width(params_format(params)); + stream_config.direction = direction; + + port_config.ch_mask = ch_mask; + port_config.num = port; + + retval = sdw_stream_add_slave(rt1318->sdw_slave, &stream_config, + &port_config, 1, stream->sdw_stream); + if (retval) { + dev_err(dai->dev, "Unable to configure port\n"); + return retval; + } + + /* sampling rate configuration */ + switch (params_rate(params)) { + case 16000: + sampling_rate = RT1318_SDCA_RATE_16000HZ; + break; + case 32000: + sampling_rate = RT1318_SDCA_RATE_32000HZ; + break; + case 44100: + sampling_rate = RT1318_SDCA_RATE_44100HZ; + break; + case 48000: + sampling_rate = RT1318_SDCA_RATE_48000HZ; + break; + case 96000: + sampling_rate = RT1318_SDCA_RATE_96000HZ; + break; + case 192000: + sampling_rate = RT1318_SDCA_RATE_192000HZ; + break; + default: + dev_err(component->dev, "Rate %d is not supported\n", + params_rate(params)); + return -EINVAL; + } + + /* set sampling frequency */ + regmap_write(rt1318->regmap, + SDW_SDCA_CTL(FUNC_NUM_SMART_AMP, RT1318_SDCA_ENT_CS21, RT1318_SDCA_CTL_SAMPLE_FREQ_INDEX, 0), + sampling_rate); + + return 0; +} + +static int rt1318_sdw_pcm_hw_free(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = dai->component; + struct rt1318_sdw_priv *rt1318 = + snd_soc_component_get_drvdata(component); + struct sdw_stream_data *stream = + snd_soc_dai_get_dma_data(dai, substream); + + if (!rt1318->sdw_slave) + return -EINVAL; + + sdw_stream_remove_slave(rt1318->sdw_slave, stream->sdw_stream); + return 0; +} + +/* + * slave_ops: callbacks for get_clock_stop_mode, clock_stop and + * port_prep are not defined for now + */ +static struct sdw_slave_ops rt1318_slave_ops = { + .read_prop = rt1318_read_prop, + .update_status = rt1318_update_status, +}; + +static int rt1318_sdw_component_probe(struct snd_soc_component *component) +{ + int ret; + struct rt1318_sdw_priv *rt1318 = snd_soc_component_get_drvdata(component); + + rt1318->component = component; + + ret = pm_runtime_resume(component->dev); + dev_dbg(&rt1318->sdw_slave->dev, "%s pm_runtime_resume, ret=%d", __func__, ret); + if (ret < 0 && ret != -EACCES) + return ret; + + return 0; +} + +static const struct snd_soc_component_driver soc_component_sdw_rt1318 = { + .probe = rt1318_sdw_component_probe, + .controls = rt1318_snd_controls, + .num_controls = ARRAY_SIZE(rt1318_snd_controls), + .dapm_widgets = rt1318_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt1318_dapm_widgets), + .dapm_routes = rt1318_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt1318_dapm_routes), + .endianness = 1, +}; + +static const struct snd_soc_dai_ops rt1318_aif_dai_ops = { + .hw_params = rt1318_sdw_hw_params, + .hw_free = rt1318_sdw_pcm_hw_free, + .set_stream = rt1318_set_sdw_stream, + .shutdown = rt1318_sdw_shutdown, +}; + +#define RT1318_STEREO_RATES (SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000) +#define RT1318_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \ + SNDRV_PCM_FMTBIT_S32_LE) + +static struct snd_soc_dai_driver rt1318_sdw_dai[] = { + { + .name = "rt1318-aif", + .playback = { + .stream_name = "DP1 Playback", + .channels_min = 1, + .channels_max = 2, + .rates = RT1318_STEREO_RATES, + .formats = RT1318_FORMATS, + }, + .capture = { + .stream_name = "DP2 Capture", + .channels_min = 1, + .channels_max = 2, + .rates = RT1318_STEREO_RATES, + .formats = RT1318_FORMATS, + }, + .ops = &rt1318_aif_dai_ops, + }, +}; + +static int rt1318_sdw_init(struct device *dev, struct regmap *regmap, + struct sdw_slave *slave) +{ + struct rt1318_sdw_priv *rt1318; + int ret; + + rt1318 = devm_kzalloc(dev, sizeof(*rt1318), GFP_KERNEL); + if (!rt1318) + return -ENOMEM; + + dev_set_drvdata(dev, rt1318); + rt1318->sdw_slave = slave; + rt1318->regmap = regmap; + + /* + * Mark hw_init to false + * HW init will be performed when device reports present + */ + rt1318->hw_init = false; + rt1318->first_hw_init = false; + + ret = devm_snd_soc_register_component(dev, + &soc_component_sdw_rt1318, + rt1318_sdw_dai, + ARRAY_SIZE(rt1318_sdw_dai)); + + dev_dbg(&slave->dev, "%s\n", __func__); + + return ret; +} + +static int rt1318_sdw_probe(struct sdw_slave *slave, + const struct sdw_device_id *id) +{ + struct regmap *regmap; + + /* Regmap Initialization */ + regmap = devm_regmap_init_sdw(slave, &rt1318_sdw_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + return rt1318_sdw_init(&slave->dev, regmap, slave); +} + +static int rt1318_sdw_remove(struct sdw_slave *slave) +{ + struct rt1318_sdw_priv *rt1318 = dev_get_drvdata(&slave->dev); + + if (rt1318->first_hw_init) + pm_runtime_disable(&slave->dev); + + return 0; +} + +static const struct sdw_device_id rt1318_id[] = { + SDW_SLAVE_ENTRY_EXT(0x025d, 0x1318, 0x3, 0x1, 0), + {}, +}; +MODULE_DEVICE_TABLE(sdw, rt1318_id); + +static int __maybe_unused rt1318_dev_suspend(struct device *dev) +{ + struct rt1318_sdw_priv *rt1318 = dev_get_drvdata(dev); + + if (!rt1318->hw_init) + return 0; + + regcache_cache_only(rt1318->regmap, true); + return 0; +} + +#define RT1318_PROBE_TIMEOUT 5000 + +static int __maybe_unused rt1318_dev_resume(struct device *dev) +{ + struct sdw_slave *slave = dev_to_sdw_dev(dev); + struct rt1318_sdw_priv *rt1318 = dev_get_drvdata(dev); + unsigned long time; + + if (!rt1318->first_hw_init) + return 0; + + if (!slave->unattach_request) + goto regmap_sync; + + time = wait_for_completion_timeout(&slave->initialization_complete, + msecs_to_jiffies(RT1318_PROBE_TIMEOUT)); + if (!time) { + dev_err(&slave->dev, "Initialization not complete, timed out\n"); + return -ETIMEDOUT; + } + +regmap_sync: + slave->unattach_request = 0; + regcache_cache_only(rt1318->regmap, false); + regcache_sync(rt1318->regmap); + + return 0; +} + +static const struct dev_pm_ops rt1318_pm = { + SET_SYSTEM_SLEEP_PM_OPS(rt1318_dev_suspend, rt1318_dev_resume) + SET_RUNTIME_PM_OPS(rt1318_dev_suspend, rt1318_dev_resume, NULL) +}; + +static struct sdw_driver rt1318_sdw_driver = { + .driver = { + .name = "rt1318-sdca", + .owner = THIS_MODULE, + .pm = &rt1318_pm, + }, + .probe = rt1318_sdw_probe, + .remove = rt1318_sdw_remove, + .ops = &rt1318_slave_ops, + .id_table = rt1318_id, +}; +module_sdw_driver(rt1318_sdw_driver); + +MODULE_DESCRIPTION("ASoC RT1318 driver SDCA SDW"); +MODULE_AUTHOR("Shuming Fan <shumingf(a)realtek.com>"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/rt1318-sdw.h b/sound/soc/codecs/rt1318-sdw.h new file mode 100644 index 000000000000..4d7ac9c4bd8d --- /dev/null +++ b/sound/soc/codecs/rt1318-sdw.h @@ -0,0 +1,101 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * rt1318-sdw.h -- RT1318 SDCA ALSA SoC audio driver header + * + * Copyright(c) 2022 Realtek Semiconductor Corp. + */ + +#ifndef __RT1318_SDW_H__ +#define __RT1318_SDW_H__ + +#include <linux/regmap.h> +#include <linux/soundwire/sdw.h> +#include <linux/soundwire/sdw_type.h> +#include <linux/soundwire/sdw_registers.h> +#include <sound/soc.h> + +/* imp-defined registers */ +#define RT1318_SAPU_SM 0x3203 + +#define R1318_TCON 0xc203 +#define R1318_TCON_RELATED_1 0xc206 + +#define R1318_SPK_TEMPERATRUE_PROTECTION_0 0xdb00 +#define R1318_SPK_TEMPERATRUE_PROTECTION_L_4 0xdb08 +#define R1318_SPK_TEMPERATRUE_PROTECTION_R_4 0xdd08 + +#define R1318_SPK_TEMPERATRUE_PROTECTION_L_6 0xdb12 +#define R1318_SPK_TEMPERATRUE_PROTECTION_R_6 0xdd12 + +#define RT1318_INIT_RECIPROCAL_REG_L_24 0xdbb5 +#define RT1318_INIT_RECIPROCAL_REG_L_23_16 0xdbb6 +#define RT1318_INIT_RECIPROCAL_REG_L_15_8 0xdbb7 +#define RT1318_INIT_RECIPROCAL_REG_L_7_0 0xdbb8 +#define RT1318_INIT_RECIPROCAL_REG_R_24 0xddb5 +#define RT1318_INIT_RECIPROCAL_REG_R_23_16 0xddb6 +#define RT1318_INIT_RECIPROCAL_REG_R_15_8 0xddb7 +#define RT1318_INIT_RECIPROCAL_REG_R_7_0 0xddb8 + +#define RT1318_INIT_R0_RECIPROCAL_SYN_L_24 0xdbc5 +#define RT1318_INIT_R0_RECIPROCAL_SYN_L_23_16 0xdbc6 +#define RT1318_INIT_R0_RECIPROCAL_SYN_L_15_8 0xdbc7 +#define RT1318_INIT_R0_RECIPROCAL_SYN_L_7_0 0xdbc8 +#define RT1318_INIT_R0_RECIPROCAL_SYN_R_24 0xddc5 +#define RT1318_INIT_R0_RECIPROCAL_SYN_R_23_16 0xddc6 +#define RT1318_INIT_R0_RECIPROCAL_SYN_R_15_8 0xddc7 +#define RT1318_INIT_R0_RECIPROCAL_SYN_R_7_0 0xddc8 + +#define RT1318_R0_COMPARE_FLAG_L 0xdb35 +#define RT1318_R0_COMPARE_FLAG_R 0xdd35 + +#define RT1318_STP_INITIAL_RS_TEMP_H 0xdd93 +#define RT1318_STP_INITIAL_RS_TEMP_L 0xdd94 + +/* RT1318 SDCA Control - function number */ +#define FUNC_NUM_SMART_AMP 0x04 + +/* RT1318 SDCA entity */ +#define RT1318_SDCA_ENT_PDE23 0x31 +#define RT1318_SDCA_ENT_XU24 0x24 +#define RT1318_SDCA_ENT_FU21 0x03 +#define RT1318_SDCA_ENT_UDMPU21 0x02 +#define RT1318_SDCA_ENT_CS21 0x21 +#define RT1318_SDCA_ENT_SAPU 0x29 + +/* RT1318 SDCA control */ +#define RT1318_SDCA_CTL_SAMPLE_FREQ_INDEX 0x10 +#define RT1318_SDCA_CTL_REQ_POWER_STATE 0x01 +#define RT1318_SDCA_CTL_FU_MUTE 0x01 +#define RT1318_SDCA_CTL_FU_VOLUME 0x02 +#define RT1318_SDCA_CTL_UDMPU_CLUSTER 0x10 +#define RT1318_SDCA_CTL_SAPU_PROTECTION_MODE 0x10 +#define RT1318_SDCA_CTL_SAPU_PROTECTION_STATUS 0x11 + +/* RT1318 SDCA channel */ +#define CH_L 0x01 +#define CH_R 0x02 + +/* sample frequency index */ +#define RT1318_SDCA_RATE_16000HZ 0x04 +#define RT1318_SDCA_RATE_32000HZ 0x07 +#define RT1318_SDCA_RATE_44100HZ 0x08 +#define RT1318_SDCA_RATE_48000HZ 0x09 +#define RT1318_SDCA_RATE_96000HZ 0x0b +#define RT1318_SDCA_RATE_192000HZ 0x0d + + +struct rt1318_sdw_priv { + struct snd_soc_component *component; + struct regmap *regmap; + struct sdw_slave *sdw_slave; + enum sdw_slave_status status; + struct sdw_bus_params params; + bool hw_init; + bool first_hw_init; +}; + +struct sdw_stream_data { + struct sdw_stream_runtime *sdw_stream; +}; + +#endif /* __RT1318_SDW_H__ */ -- 2.38.1

2 1

[PATCH v1 0/2] Adds the combination of headset codec ALC5682I-VD + amp rt1019p
by Ajye Huang 16 Nov '22

16 Nov '22

v1: - machine driver: - Adds the combination of headset codec ALC5682I-VD + amp rt1019p. - Remove the duplicate code in machine driver. Ajye Huang (2): ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p ASoC: Intel: sof rt5682: remove the duplicate codes sound/soc/intel/boards/sof_rt5682.c | 7 +------ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) -- 2.25.1

4 6

[PATCH] ALSA: pcm: avoid nused-but-set-variable warning
by Kuninori Morimoto 16 Nov '22

16 Nov '22

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> It will indicate below warning if W=1 was added and CONFIG_SND_DEBUG was not set. This patch adds __maybe_unused and avoid it. ${LINUX}/sound/core/pcm_native.c: In function 'constrain_mask_params': ${LINUX}/sound/core/pcm_native.c:291:25: error: variable 'old_mask' set but not used [-Werror=unused-but-set-variable] 291 | struct snd_mask old_mask; | ^~~~~~~~ ${LINUX}/sound/core/pcm_native.c: In function 'constrain_interval_params': ${LINUX}/sound/core/pcm_native.c:327:29: error: variable 'old_interval' set but not used [-Werror=unused-but-set-variable] 327 | struct snd_interval old_interval; | ^~~~~~~~~~~~ ${LINUX}/sound/core/pcm_native.c: In function 'constrain_params_by_rules': ${LINUX}/sound/core/pcm_native.c:368:29: error: variable 'old_interval' set but not used [-Werror=unused-but-set-variable] 368 | struct snd_interval old_interval; | ^~~~~~~~~~~~ ${LINUX}/sound/core/pcm_native.c:367:25: error: variable 'old_mask' set but not used [-Werror=unused-but-set-variable] 367 | struct snd_mask old_mask; | ^~~~~~~~ ${LINUX}/sound/core/pcm_native.c: In function 'snd_pcm_hw_params_choose': ${LINUX}/sound/core/pcm_native.c:652:29: error: variable 'old_interval' set but not used [-Werror=unused-but-set-variable] 652 | struct snd_interval old_interval; | ^~~~~~~~~~~~ ${LINUX}/sound/core/pcm_native.c:651:25: error: variable 'old_mask' set but not used [-Werror=unused-but-set-variable] 651 | struct snd_mask old_mask; | ^~~~~~~~ cc1: all warnings being treated as errors make[3]: *** [${LINUX}/scripts/Makefile.build:250: sound/core/pcm_native.o] error 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/core/pcm_native.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 33769ca78cc8..ba6e44d02faa 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -288,7 +288,7 @@ static int constrain_mask_params(struct snd_pcm_substream *substream, &substream->runtime->hw_constraints; struct snd_mask *m; unsigned int k; - struct snd_mask old_mask; + struct snd_mask old_mask __maybe_unused; int changed; for (k = SNDRV_PCM_HW_PARAM_FIRST_MASK; k <= SNDRV_PCM_HW_PARAM_LAST_MASK; k++) { @@ -324,7 +324,7 @@ static int constrain_interval_params(struct snd_pcm_substream *substream, &substream->runtime->hw_constraints; struct snd_interval *i; unsigned int k; - struct snd_interval old_interval; + struct snd_interval old_interval __maybe_unused; int changed; for (k = SNDRV_PCM_HW_PARAM_FIRST_INTERVAL; k <= SNDRV_PCM_HW_PARAM_LAST_INTERVAL; k++) { @@ -364,8 +364,8 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream, unsigned int stamp; struct snd_pcm_hw_rule *r; unsigned int d; - struct snd_mask old_mask; - struct snd_interval old_interval; + struct snd_mask old_mask __maybe_unused; + struct snd_interval old_interval __maybe_unused; bool again; int changed, err = 0; @@ -648,8 +648,8 @@ static int snd_pcm_hw_params_choose(struct snd_pcm_substream *pcm, -1 }; const int *v; - struct snd_mask old_mask; - struct snd_interval old_interval; + struct snd_mask old_mask __maybe_unused; + struct snd_interval old_interval __maybe_unused; int changed; for (v = vars; *v != -1; v++) { -- 2.25.1

3 2

bug in the ALSA driver 'snd_usb_audio'
by GitHub issues - opened 16 Nov '22

16 Nov '22

alsa-project/alsa-lib issue #284 was opened from Konfekt: Hello, `journalctl -p err` showed the message ``` pulseaudio[15806]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. ``` Hopefully this bug tracker reaches the ALSA developers? Here's more output: ```sh Nov 15 10:28:58 notebook bluetoothd[1340]: src/profile.c:ext_io_disconnected() Unable to get io data for Hands-Free Voice gateway: getpeername: Transport endpoint is not connected (107) Nov 15 10:28:58 notebook kernel: Bluetooth: hci0: SCO packet for unknown connection handle 6 Nov 15 10:28:58 notebook kernel: Bluetooth: hci0: SCO packet for unknown connection handle 6 Nov 15 10:28:48 notebook pulseaudio[15806]: mSBC decoding error (-2) Nov 15 10:14:35 notebook pulseaudio[15806]: Playback too far ahead (4591), drop source 1168 Nov 15 10:14:35 notebook pulseaudio[15806]: Doing resync Nov 15 10:12:28 notebook pulseaudio[15806]: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Nov 15 10:12:28 notebook pulseaudio[15806]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. Nov 15 10:12:28 notebook pulseaudio[15806]: ALSA woke us up to write new data to the device, but there was actually nothing to write. Nov 15 10:12:26 notebook pulseaudio[15806]: Playback too far ahead (4613), drop source 1176 Nov 15 10:12:26 notebook pulseaudio[15806]: Doing resync Nov 15 09:33:13 notebook pulseaudio[15806]: Playback too far ahead (2931), drop source 744 Nov 15 09:33:13 notebook pulseaudio[15806]: Doing resync Nov 15 09:32:29 notebook bluetoothd[1340]: src/profile.c:ext_io_disconnected() Unable to get io data for Hands-Free Voice gateway: getpeername: Transport endpoint is not connected (107) Nov 15 09:32:24 notebook bluetoothd[1340]: src/profile.c:ext_io_disconnected() Unable to get io data for Hands-Free Voice gateway: getpeername: Transport endpoint is not connected (107) ``` Curiously my bluetooth headset switches off in Zoom after around five minutes and can't be reenabled. In the hope that this error message gives a hint. Attached further alsa-infos. [alsa-info.txt.yOxa5XAE9C.txt](https://github.com/alsa-project/alsa-lib/file… Issue URL : https://github.com/alsa-project/alsa-lib/issues/284 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

ucm2: sof-soundwire: add basic settings for RT1318 SDCA device
by GitHub pull_request - opened 16 Nov '22

16 Nov '22

alsa-project/alsa-ucm-conf pull request #242 was opened from shumingfan: Add support for rt1318 amplifier Signed-off-by: Shuming Fan <shumingf(a)realtek.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/242 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/242.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

S/PDIF no output (Realtek® ALC4080)
by GitHub issues - reopened 16 Nov '22

16 Nov '22

alsa-project/alsa-ucm-conf issue #241 was reopened from uragan1987: http://alsa-project.org/db/?f=2f67942734d0a5123454a73ae0dcfabf508dd7f5 Bus 001 Device 003: ID 0db0:6cc9 Micro Star International USB Audio MPG-Z590-GAMING-PLUS No output on S/PDIF Is there a easy fix? Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/241 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book Pro 360
by Takashi Iwai 15 Nov '22

15 Nov '22

Samsung Galaxy Book Pro 360 (13" 2021 NP930QBD-ke1US) with codec SSID 144d:c1a6 requires the same workaround for enabling the speaker amp like other Samsung models with ALC298 codec. Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1205100 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0abf485c0192..e5c036385666 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9437,6 +9437,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc1a3, "Samsung Galaxy Book Pro (NP935XDB-KC1SE)", ALC298_FIXUP_SAMSUNG_AMP), + SND_PCI_QUIRK(0x144d, 0xc1a6, "Samsung Galaxy Book Pro 360 (NP930QBD)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8), SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP), -- 2.35.3

1 0

[PATCH] ALSA: hda/realtek: fix speakers for Samsung Galaxy Book Pro
by Emil Flink 15 Nov '22

15 Nov '22

The Samsung Galaxy Book Pro seems to have the same issue as a few other Samsung laptops, detailed in kernel bug report 207423. Sound from headphone jack works, but not the built-in speakers. alsa-info: http://alsa-project.org/db/?f=b40ba609dc6ae28dc84ad404a0d8a4bbcd8bea6d Signed-off-by: Emil Flink <emil.flink(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e18499dd14f0..0abf485c0192 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9436,6 +9436,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc189, "Samsung Galaxy Flex Book (NT950QCG-X716)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc18a, "Samsung Galaxy Book Ion (NP930XCJ-K01US)", ALC298_FIXUP_SAMSUNG_AMP), + SND_PCI_QUIRK(0x144d, 0xc1a3, "Samsung Galaxy Book Pro (NP935XDB-KC1SE)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8), SND_PCI_QUIRK(0x144d, 0xc812, "Samsung Notebook Pen S (NT950SBE-X58)", ALC298_FIXUP_SAMSUNG_AMP), SND_PCI_QUIRK(0x144d, 0xc830, "Samsung Galaxy Book Ion (NT950XCJ-X716A)", ALC298_FIXUP_SAMSUNG_AMP), -- 2.38.1

2 1

HDA ALC1220 DualCodec no optical out
by GitHub issues - edited 15 Nov '22

15 Nov '22

alsa-project/alsa-ucm-conf issue #239 was edited from Almoped: With current pipewire and alsa-ucm 1.2.8 I am unable to select profiles which has iec958 output, actually I am unable to select any card profile at all in pavucontrol. This is possibly because all the electrical output jacks are disconnected and optical out does not have jackdetect. Or maybe DualCodecs/HiFi.conf does not configure optical out. If I remove alsa/ucm2/HDA/DualCodecs/HiFi.conf it uses alsa-card-profile/mixer/profile-sets/default.conf, goes on a probing mission I get a working optical out and the possibility to select an array of other card profiles in pavucontrol. Can anyone recommend a better way to solve this? I've attached pactl list cards output with working and nonworking optical out. [pactl_no_optical.txt](https://github.com/alsa-project/alsa-ucm-conf/files/9… [pactl_working_optical.txt](https://github.com/alsa-project/alsa-ucm-conf/fi… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/239 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] Asoc: core: fix wrong size kzalloc for rtd's components member
by lishqchn 15 Nov '22

15 Nov '22

The actual space for struct snd_soc_component has been allocated by snd_soc_register_component, here rtd's components are pointers to components, I replace the base size from *component to component. Signed-off-by: lishqchn <lishqchn(a)qq.com> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a6d6d10cd471..d21e0284b2aa 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -459,7 +459,7 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( */ rtd = devm_kzalloc(dev, sizeof(*rtd) + - sizeof(*component) * (dai_link->num_cpus + + sizeof(component) * (dai_link->num_cpus + dai_link->num_codecs + dai_link->num_platforms), GFP_KERNEL); -- 2.25.1

3 3

[PATCH] ASoC: codecs: tx-macro: add dmic support via tx macro
by Srinivas Kandagatla 15 Nov '22

15 Nov '22

DMIC Paths into LPASS digital codec can go via tx-macro or va-macro codec, add support to tx-macro path as va-macro path is already supported. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/lpass-tx-macro.c | 149 +++++++++++++++++++++++++++++- 1 file changed, 148 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index ee15cf6b98bb..2ef62d6edc30 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -46,6 +46,7 @@ #define CDC_TX_TOP_CSR_SWR_AMIC1_CTL (0x00D4) #define CDC_TX_INP_MUX_ADC_MUXn_CFG0(n) (0x0100 + 0x8 * n) #define CDC_TX_MACRO_SWR_MIC_MUX_SEL_MASK GENMASK(3, 0) +#define CDC_TX_MACRO_DMIC_MUX_SEL_MASK GENMASK(7, 4) #define CDC_TX_INP_MUX_ADC_MUX0_CFG0 (0x0100) #define CDC_TX_INP_MUX_ADC_MUXn_CFG1(n) (0x0104 + 0x8 * n) #define CDC_TX_INP_MUX_ADC_MUX0_CFG1 (0x0104) @@ -774,7 +775,10 @@ static int tx_macro_put_dec_enum(struct snd_kcontrol *kcontrol, } if (val != 0) { - if (val < 5) { + if (widget->shift) { /* MSM DMIC */ + snd_soc_component_write_field(component, mic_sel_reg, + CDC_TXn_ADC_DMIC_SEL_MASK, 1); + } else if (val < 5) { snd_soc_component_write_field(component, mic_sel_reg, CDC_TXn_ADC_DMIC_SEL_MASK, 0); } else { @@ -1272,6 +1276,52 @@ static const struct snd_kcontrol_new tx_smic6_mux = SOC_DAPM_ENUM_EXT("tx_smic6" static const struct snd_kcontrol_new tx_smic7_mux = SOC_DAPM_ENUM_EXT("tx_smic7", tx_smic7_enum, snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const char * const dmic_mux_text[] = { + "ZERO", "DMIC0", "DMIC1", "DMIC2", "DMIC3", + "DMIC4", "DMIC5", "DMIC6", "DMIC7" +}; + +static SOC_ENUM_SINGLE_DECL(tx_dmic0_enum, CDC_TX_INP_MUX_ADC_MUX0_CFG0, + 4, dmic_mux_text); + +static SOC_ENUM_SINGLE_DECL(tx_dmic1_enum, CDC_TX_INP_MUX_ADC_MUX1_CFG0, + 4, dmic_mux_text); + +static SOC_ENUM_SINGLE_DECL(tx_dmic2_enum, CDC_TX_INP_MUX_ADC_MUX2_CFG0, + 4, dmic_mux_text); + +static SOC_ENUM_SINGLE_DECL(tx_dmic3_enum, CDC_TX_INP_MUX_ADC_MUX3_CFG0, + 4, dmic_mux_text); + +static SOC_ENUM_SINGLE_DECL(tx_dmic4_enum, CDC_TX_INP_MUX_ADC_MUX4_CFG0, + 4, dmic_mux_text); + +static SOC_ENUM_SINGLE_DECL(tx_dmic5_enum, CDC_TX_INP_MUX_ADC_MUX5_CFG0, + 4, dmic_mux_text); + +static SOC_ENUM_SINGLE_DECL(tx_dmic6_enum, CDC_TX_INP_MUX_ADC_MUX6_CFG0, + 4, dmic_mux_text); + +static SOC_ENUM_SINGLE_DECL(tx_dmic7_enum, CDC_TX_INP_MUX_ADC_MUX7_CFG0, + 4, dmic_mux_text); + +static const struct snd_kcontrol_new tx_dmic0_mux = SOC_DAPM_ENUM_EXT("tx_dmic0", tx_dmic0_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const struct snd_kcontrol_new tx_dmic1_mux = SOC_DAPM_ENUM_EXT("tx_dmic1", tx_dmic1_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const struct snd_kcontrol_new tx_dmic2_mux = SOC_DAPM_ENUM_EXT("tx_dmic2", tx_dmic2_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const struct snd_kcontrol_new tx_dmic3_mux = SOC_DAPM_ENUM_EXT("tx_dmic3", tx_dmic3_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const struct snd_kcontrol_new tx_dmic4_mux = SOC_DAPM_ENUM_EXT("tx_dmic4", tx_dmic4_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const struct snd_kcontrol_new tx_dmic5_mux = SOC_DAPM_ENUM_EXT("tx_dmic5", tx_dmic5_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const struct snd_kcontrol_new tx_dmic6_mux = SOC_DAPM_ENUM_EXT("tx_dmic6", tx_dmic6_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); +static const struct snd_kcontrol_new tx_dmic7_mux = SOC_DAPM_ENUM_EXT("tx_dmic7", tx_dmic7_enum, + snd_soc_dapm_get_enum_double, tx_macro_put_dec_enum); + static const char * const dec_mode_mux_text[] = { "ADC_DEFAULT", "ADC_LOW_PWR", "ADC_HIGH_PERF", }; @@ -1380,6 +1430,15 @@ static const struct snd_soc_dapm_widget tx_macro_dapm_widgets[] = { SND_SOC_DAPM_MUX("TX SMIC MUX6", SND_SOC_NOPM, 0, 0, &tx_smic6_mux), SND_SOC_DAPM_MUX("TX SMIC MUX7", SND_SOC_NOPM, 0, 0, &tx_smic7_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX0", SND_SOC_NOPM, 4, 0, &tx_dmic0_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX1", SND_SOC_NOPM, 4, 0, &tx_dmic1_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX2", SND_SOC_NOPM, 4, 0, &tx_dmic2_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX3", SND_SOC_NOPM, 4, 0, &tx_dmic3_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX4", SND_SOC_NOPM, 4, 0, &tx_dmic4_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX5", SND_SOC_NOPM, 4, 0, &tx_dmic5_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX6", SND_SOC_NOPM, 4, 0, &tx_dmic6_mux), + SND_SOC_DAPM_MUX("TX DMIC MUX7", SND_SOC_NOPM, 4, 0, &tx_dmic7_mux), + SND_SOC_DAPM_INPUT("TX SWR_ADC0"), SND_SOC_DAPM_INPUT("TX SWR_ADC1"), SND_SOC_DAPM_INPUT("TX SWR_ADC2"), @@ -1392,6 +1451,14 @@ static const struct snd_soc_dapm_widget tx_macro_dapm_widgets[] = { SND_SOC_DAPM_INPUT("TX SWR_DMIC5"), SND_SOC_DAPM_INPUT("TX SWR_DMIC6"), SND_SOC_DAPM_INPUT("TX SWR_DMIC7"), + SND_SOC_DAPM_INPUT("TX DMIC0"), + SND_SOC_DAPM_INPUT("TX DMIC1"), + SND_SOC_DAPM_INPUT("TX DMIC2"), + SND_SOC_DAPM_INPUT("TX DMIC3"), + SND_SOC_DAPM_INPUT("TX DMIC4"), + SND_SOC_DAPM_INPUT("TX DMIC5"), + SND_SOC_DAPM_INPUT("TX DMIC6"), + SND_SOC_DAPM_INPUT("TX DMIC7"), SND_SOC_DAPM_MUX_E("TX DEC0 MUX", SND_SOC_NOPM, TX_MACRO_DEC0, 0, @@ -1495,6 +1562,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX DEC6 MUX", NULL, "TX_MCLK"}, {"TX DEC7 MUX", NULL, "TX_MCLK"}, + {"TX DEC0 MUX", "MSM_DMIC", "TX DMIC MUX0"}, + {"TX DMIC MUX0", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX0", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX0", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX0", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX0", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX0", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX0", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX0", "DMIC7", "TX DMIC7"}, + {"TX DEC0 MUX", "SWR_MIC", "TX SMIC MUX0"}, {"TX SMIC MUX0", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX0", "ADC0", "TX SWR_ADC0"}, @@ -1510,6 +1587,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX0", "SWR_DMIC6", "TX SWR_DMIC6"}, {"TX SMIC MUX0", "SWR_DMIC7", "TX SWR_DMIC7"}, + {"TX DEC1 MUX", "MSM_DMIC", "TX DMIC MUX1"}, + {"TX DMIC MUX1", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX1", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX1", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX1", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX1", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX1", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX1", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX1", "DMIC7", "TX DMIC7"}, + {"TX DEC1 MUX", "SWR_MIC", "TX SMIC MUX1"}, {"TX SMIC MUX1", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX1", "ADC0", "TX SWR_ADC0"}, @@ -1525,6 +1612,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX1", "SWR_DMIC6", "TX SWR_DMIC6"}, {"TX SMIC MUX1", "SWR_DMIC7", "TX SWR_DMIC7"}, + {"TX DEC2 MUX", "MSM_DMIC", "TX DMIC MUX2"}, + {"TX DMIC MUX2", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX2", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX2", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX2", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX2", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX2", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX2", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX2", "DMIC7", "TX DMIC7"}, + {"TX DEC2 MUX", "SWR_MIC", "TX SMIC MUX2"}, {"TX SMIC MUX2", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX2", "ADC0", "TX SWR_ADC0"}, @@ -1540,6 +1637,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX2", "SWR_DMIC6", "TX SWR_DMIC6"}, {"TX SMIC MUX2", "SWR_DMIC7", "TX SWR_DMIC7"}, + {"TX DEC3 MUX", "MSM_DMIC", "TX DMIC MUX3"}, + {"TX DMIC MUX3", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX3", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX3", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX3", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX3", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX3", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX3", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX3", "DMIC7", "TX DMIC7"}, + {"TX DEC3 MUX", "SWR_MIC", "TX SMIC MUX3"}, {"TX SMIC MUX3", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX3", "ADC0", "TX SWR_ADC0"}, @@ -1555,6 +1662,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX3", "SWR_DMIC6", "TX SWR_DMIC6"}, {"TX SMIC MUX3", "SWR_DMIC7", "TX SWR_DMIC7"}, + {"TX DEC4 MUX", "MSM_DMIC", "TX DMIC MUX4"}, + {"TX DMIC MUX4", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX4", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX4", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX4", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX4", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX4", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX4", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX4", "DMIC7", "TX DMIC7"}, + {"TX DEC4 MUX", "SWR_MIC", "TX SMIC MUX4"}, {"TX SMIC MUX4", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX4", "ADC0", "TX SWR_ADC0"}, @@ -1570,6 +1687,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX4", "SWR_DMIC6", "TX SWR_DMIC6"}, {"TX SMIC MUX4", "SWR_DMIC7", "TX SWR_DMIC7"}, + {"TX DEC5 MUX", "MSM_DMIC", "TX DMIC MUX5"}, + {"TX DMIC MUX5", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX5", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX5", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX5", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX5", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX5", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX5", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX5", "DMIC7", "TX DMIC7"}, + {"TX DEC5 MUX", "SWR_MIC", "TX SMIC MUX5"}, {"TX SMIC MUX5", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX5", "ADC0", "TX SWR_ADC0"}, @@ -1585,6 +1712,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX5", "SWR_DMIC6", "TX SWR_DMIC6"}, {"TX SMIC MUX5", "SWR_DMIC7", "TX SWR_DMIC7"}, + {"TX DEC6 MUX", "MSM_DMIC", "TX DMIC MUX6"}, + {"TX DMIC MUX6", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX6", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX6", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX6", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX6", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX6", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX6", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX6", "DMIC7", "TX DMIC7"}, + {"TX DEC6 MUX", "SWR_MIC", "TX SMIC MUX6"}, {"TX SMIC MUX6", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX6", "ADC0", "TX SWR_ADC0"}, @@ -1600,6 +1737,16 @@ static const struct snd_soc_dapm_route tx_audio_map[] = { {"TX SMIC MUX6", "SWR_DMIC6", "TX SWR_DMIC6"}, {"TX SMIC MUX6", "SWR_DMIC7", "TX SWR_DMIC7"}, + {"TX DEC7 MUX", "MSM_DMIC", "TX DMIC MUX7"}, + {"TX DMIC MUX7", "DMIC0", "TX DMIC0"}, + {"TX DMIC MUX7", "DMIC1", "TX DMIC1"}, + {"TX DMIC MUX7", "DMIC2", "TX DMIC2"}, + {"TX DMIC MUX7", "DMIC3", "TX DMIC3"}, + {"TX DMIC MUX7", "DMIC4", "TX DMIC4"}, + {"TX DMIC MUX7", "DMIC5", "TX DMIC5"}, + {"TX DMIC MUX7", "DMIC6", "TX DMIC6"}, + {"TX DMIC MUX7", "DMIC7", "TX DMIC7"}, + {"TX DEC7 MUX", "SWR_MIC", "TX SMIC MUX7"}, {"TX SMIC MUX7", NULL, "TX_SWR_CLK"}, {"TX SMIC MUX7", "ADC0", "TX SWR_ADC0"}, -- 2.25.1

2 1

[PATCH] arm64: dts: SC7280: Remove unused sleep pin control nodes
by Srinivasa Rao Mandadapu 15 Nov '22

15 Nov '22

Remove Unused and redundant sleep pin control entries in herobrine device tree variants. Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam(a)quicinc.com> --- .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 8 ----- .../dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi | 20 ----------- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 20 ----------- arch/arm64/boot/dts/qcom/sc7280.dtsi | 40 ---------------------- 4 files changed, 88 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi index cf34334..1ca11a1 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi @@ -148,10 +148,6 @@ hp_i2c: &i2c2 { bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -161,10 +157,6 @@ hp_i2c: &i2c2 { bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi index c72e53a..ae25520 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-wcd9385.dtsi @@ -167,10 +167,6 @@ bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -180,10 +176,6 @@ bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; @@ -194,30 +186,18 @@ bias-disable; }; -&lpass_rx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_rx_swr_data { drive-strength = <2>; slew-rate = <1>; bias-bus-hold; }; -&lpass_rx_swr_data_sleep { - bias-pull-down; -}; - &lpass_tx_swr_clk { drive-strength = <2>; slew-rate = <1>; bias-disable; }; -&lpass_tx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_tx_swr_data { drive-strength = <2>; slew-rate = <1>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index 8ca2281..f7efb99 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -576,10 +576,6 @@ bias-disable; }; -&lpass_dmic01_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic01_data { bias-pull-down; }; @@ -589,10 +585,6 @@ bias-disable; }; -&lpass_dmic23_clk_sleep { - drive-strength = <2>; -}; - &lpass_dmic23_data { bias-pull-down; }; @@ -603,30 +595,18 @@ bias-disable; }; -&lpass_rx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_rx_swr_data { drive-strength = <2>; slew-rate = <1>; bias-bus-hold; }; -&lpass_rx_swr_data_sleep { - bias-pull-down; -}; - &lpass_tx_swr_clk { drive-strength = <2>; slew-rate = <1>; bias-disable; }; -&lpass_tx_swr_clk_sleep { - bias-pull-down; -}; - &lpass_tx_swr_data { drive-strength = <2>; slew-rate = <1>; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 448879d..4970864 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2483,80 +2483,40 @@ function = "dmic1_clk"; }; - lpass_dmic01_clk_sleep: dmic01-clk-sleep-state { - pins = "gpio6"; - function = "dmic1_clk"; - }; - lpass_dmic01_data: dmic01-data-state { pins = "gpio7"; function = "dmic1_data"; }; - lpass_dmic01_data_sleep: dmic01-data-sleep-state { - pins = "gpio7"; - function = "dmic1_data"; - }; - lpass_dmic23_clk: dmic23-clk-state { pins = "gpio8"; function = "dmic2_clk"; }; - lpass_dmic23_clk_sleep: dmic23-clk-sleep-state { - pins = "gpio8"; - function = "dmic2_clk"; - }; - lpass_dmic23_data: dmic23-data-state { pins = "gpio9"; function = "dmic2_data"; }; - lpass_dmic23_data_sleep: dmic23-data-sleep-state { - pins = "gpio9"; - function = "dmic2_data"; - }; - lpass_rx_swr_clk: rx-swr-clk-state { pins = "gpio3"; function = "swr_rx_clk"; }; - lpass_rx_swr_clk_sleep: rx-swr-clk-sleep-state { - pins = "gpio3"; - function = "swr_rx_clk"; - }; - lpass_rx_swr_data: rx-swr-data-state { pins = "gpio4", "gpio5"; function = "swr_rx_data"; }; - lpass_rx_swr_data_sleep: rx-swr-data-sleep-state { - pins = "gpio4", "gpio5"; - function = "swr_rx_data"; - }; - lpass_tx_swr_clk: tx-swr-clk-state { pins = "gpio0"; function = "swr_tx_clk"; }; - lpass_tx_swr_clk_sleep: tx-swr-clk-sleep-state { - pins = "gpio0"; - function = "swr_tx_clk"; - }; - lpass_tx_swr_data: tx-swr-data-state { pins = "gpio1", "gpio2", "gpio14"; function = "swr_tx_data"; }; - - lpass_tx_swr_data_sleep: tx-swr-data-sleep-state { - pins = "gpio1", "gpio2", "gpio14"; - function = "swr_tx_data"; - }; }; gpu: gpu@3d00000 { -- 2.7.4

2 1

Thanks to [PATCH V4 5/6] ASoC: dt-bindings: Add schema for "awinic, aw883xx"
by wangweidong.a＠awinic.com 15 Nov '22

15 Nov '22

Hi Krzysztof Kozlowski: Thank you for your advice, I will change these questions > Add a DT schema for describing Awinic AW883xx audio amplifiers. They > are controlled using I2C. > > Signed-off-by: Weidong Wang <wangweidong.a(a)awinic.com> > --- > .../bindings/sound/awinic,aw883xx.yaml | 62 +++++++++++++++++++ > 1 file changed, 62 insertions(+) > create mode 100644 > Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml > > diff --git > a/Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml > b/Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml > new file mode 100644 > index 000000000000..04cdcf25a6d4 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/awinic,aw883xx.yaml > @@ -0,0 +1,62 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/sound/awinic,aw883xx.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Awinic AW883xx Smart Audio Amplifier > + > +maintainers: > + - Stephan Gerhold <stephan(a)gerhold.net> > + > +description: > + The Awinic AW883XX is an I2S/TDM input, high efficiency > + digital Smart K audio amplifier with an integrated 10.25V > + smart boost convert. > + > +allOf: > + - $ref: name-prefix.yaml# > + > +properties: > + compatible: > + const: awinic,aw883xx_smartpa > + > + reg: > + description: > + The I2C address of the device for I2C > What happened here? This was not present before. Drop description. I will delete this description in patch v5 > + maxItems: 1 > + > + reset-gpios: > + description: > + Reset pin of aw883xx chip > The same case. Drop description. > I commented only for irq-gpios that they need description. I will delete this description in patch v5 > + maxItems: 1 > + > + sound-channel: > + description: > + Number of sound channels of the aw883xx chip > Your description does not explain me much. Number of supported sound channels is usually fixed in the hardware, thus coming from compatible. > Therefore this might mean something else... but anyway your driver does not use it really, so just drop it. I will delete this description in patch v5

2 1

Discuss [PATCH V4 6/6] ASoC:codecs:aw883xx corresponds to the modified Makefile and Kconfig
by wangweidong.a＠awinic.com 15 Nov '22

15 Nov '22

Hi Krzysztof Kozlowski Thank you very much for your advice, but there is still a problem I would like to discuss with you > From: Weidong Wang <wangweidong.a(a)awinic.com> > > Modified the Makefile and Kconfig to compile aw883xx > > Signed-off-by: Weidong Wang <wangweidong.a(a)awinic.com> > --- > sound/soc/codecs/Kconfig | 10 ++++++++++ sound/soc/codecs/Makefile > | 7 +++++++ > 2 files changed, 17 insertions(+) > 1. Where is patch 5? What does this mean? Did you not receive patch V4 5/6? > 2. Subject: missing spaces. I would add this space at patch v5 > 3. This should be squashed with previous. There is no point to have commits adding dead code, therefore this one as a separate commit does not make sense. I will change this issue on patch v5 Best regards, Weidong Wang

2 1

[PATCH 00/10] ASoC: dt-bindings: Rework Qualcomm APR/GPR Sound nodes for SM8450
by Krzysztof Kozlowski 15 Nov '22

15 Nov '22

Adding sound support for Qualcomm SM8450 SoC (and later for SC8280XP) brought some changes to APR/GPR services bindings. These bindings are part of qcom,apr.yaml: apr-or-gpr-device-node <- qcom,apr.yaml apr-gpr-service@[0-9] <- qcom,apr.yaml service-specific-components <- /schemas/sound/qcom,q6*.yaml The schema for services (apr-gpr-service@[0-9]) already grows considerably and is still quite not specific. It allows several incorrect combinations, like adding a clock-controller to a APM device. Restricting it would complicate the schema even more. Bringing new support for sound on Qualcomm SM8450 and SC8280XP SoC would grow it as well. Refactor the bindings before extending them for Qualcomm SM8450 SoC. Best regards, Krzysztof Krzysztof Kozlowski (10): ASoC: dt-bindings: qcom,apr: Add GLINK channel name for SM8450 ASoC: dt-bindings: qcom,apr: Split services to shared schema ASoC: dt-bindings: qcom,q6afe: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Split to separate schema ASoC: dt-bindings: qcom,q6adm: Split to separate schema ASoC: dt-bindings: qcom,q6asm: Split to separate schema ASoC: dt-bindings: qcom,q6prm: Split to separate schema ASoC: dt-bindings: qcom,q6core: Split to separate schema ASoC: dt-bindings: qcom,q6apm-lpass-dais: Split to separate schema ASoC: dt-bindings: qcom,q6apm: Add SM8450 bedais node .../bindings/soc/qcom/qcom,apr-services.yaml | 54 ++++++++ .../bindings/soc/qcom/qcom,apr.yaml | 119 ++---------------- .../bindings/sound/qcom,q6adm-routing.yaml | 22 +--- .../devicetree/bindings/sound/qcom,q6adm.yaml | 51 ++++++++ .../devicetree/bindings/sound/qcom,q6afe.yaml | 69 ++++++++++ .../bindings/sound/qcom,q6apm-dai.yaml | 19 +-- .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 32 +++++ .../devicetree/bindings/sound/qcom,q6apm.yaml | 67 ++++++++++ .../bindings/sound/qcom,q6asm-dais.yaml | 48 +++---- .../devicetree/bindings/sound/qcom,q6asm.yaml | 68 ++++++++++ .../bindings/sound/qcom,q6core.yaml | 39 ++++++ .../sound/qcom,q6dsp-lpass-clocks.yaml | 40 +----- .../sound/qcom,q6dsp-lpass-ports.yaml | 57 ++------- .../devicetree/bindings/sound/qcom,q6prm.yaml | 50 ++++++++ MAINTAINERS | 2 +- 15 files changed, 477 insertions(+), 260 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6adm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6afe.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm-lpass-dais.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6asm.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6core.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6prm.yaml -- 2.34.1

3 22

S/PDIF no output (Realtek® ALC4080)
by GitHub issues - opened 15 Nov '22

15 Nov '22

alsa-project/alsa-ucm-conf issue #241 was opened from uragan1987: http://alsa-project.org/db/?f=2f67942734d0a5123454a73ae0dcfabf508dd7f5 Bus 001 Device 003: ID 0db0:6cc9 Micro Star International USB Audio MPG-Z590-GAMING-PLUS No output on S/PDIF Is there a easy fix? Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/241 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

aplay: Fix parsing of format with WAV_FMT_EXTENSIBLE header
by GitHub pull_request - opened 15 Nov '22

15 Nov '22

alsa-project/alsa-utils pull request #178 was opened from amadeuszslawinski-intel: WAV_FMT_EXTENSIBLE header contains valid bits per sample, which can be different than bits per sample. Make sure it is taken into account when parsing headers and choosing playback format. Request URL : https://github.com/alsa-project/alsa-utils/pull/178 Patch URL : https://github.com/alsa-project/alsa-utils/pull/178.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH] ASoC: pxa: fix null-pointer dereference in filter()
by Zeng Heng 15 Nov '22

15 Nov '22

kasprintf() would return NULL pointer when kmalloc() fail to allocate. Need to check the return pointer before calling strcmp(). Fixes: 7a824e214e25 ("ASoC: mmp: add audio dma support") Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- sound/soc/pxa/mmp-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index 5d520e18e512..99b245e3079a 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c @@ -98,7 +98,7 @@ static bool filter(struct dma_chan *chan, void *param) devname = kasprintf(GFP_KERNEL, "%s.%d", dma_data->dma_res->name, dma_data->ssp_id); - if ((strcmp(dev_name(chan->device->dev), devname) == 0) && + if (devname && (strcmp(dev_name(chan->device->dev), devname) == 0) && (chan->chan_id == dma_data->dma_res->start)) { found = true; } -- 2.25.1

2 1

[PATCH] ASoC: sunxi: use devm_platform_get_and_ioremap_resource()
by ye.xingchen＠zte.com.cn 15 Nov '22

15 Nov '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Convert platform_get_resource(), devm_ioremap_resource() to a single call to devm_platform_get_and_ioremap_resource(), as this is exactly what this function does. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> --- sound/soc/sunxi/sun50i-dmic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c index 62509cb02995..069c993acb31 100644 --- a/sound/soc/sunxi/sun50i-dmic.c +++ b/sound/soc/sunxi/sun50i-dmic.c @@ -317,8 +317,7 @@ static int sun50i_dmic_probe(struct platform_device *pdev) return -ENOMEM; /* Get the addresses */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(&pdev->dev, res); + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(base)) return dev_err_probe(&pdev->dev, PTR_ERR(base), "get resource failed.\n"); -- 2.25.1

3 2

[PATCH] ASoC: codecs: Remove a useless include
by Christophe JAILLET 15 Nov '22

15 Nov '22

<linux/gcd.h> is not needed for these drivers. Remove the corresponding #include. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/codecs/adau1372.c | 1 - sound/soc/codecs/adau1373.c | 1 - sound/soc/codecs/adau17x1.c | 1 - 3 files changed, 3 deletions(-) diff --git a/sound/soc/codecs/adau1372.c b/sound/soc/codecs/adau1372.c index a9f89e8565ec..fbb6bf6fb3cc 100644 --- a/sound/soc/codecs/adau1372.c +++ b/sound/soc/codecs/adau1372.c @@ -8,7 +8,6 @@ #include <linux/clk.h> #include <linux/delay.h> -#include <linux/gcd.h> #include <linux/gpio/consumer.h> #include <linux/init.h> #include <linux/module.h> diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index 7f832d00ab17..37e178e8a1d0 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c @@ -12,7 +12,6 @@ #include <linux/pm.h> #include <linux/i2c.h> #include <linux/slab.h> -#include <linux/gcd.h> #include <sound/core.h> #include <sound/pcm.h> diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c index c0f44ecef606..634d4dbca5ec 100644 --- a/sound/soc/codecs/adau17x1.c +++ b/sound/soc/codecs/adau17x1.c @@ -16,7 +16,6 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/tlv.h> -#include <linux/gcd.h> #include <linux/i2c.h> #include <linux/spi/spi.h> #include <linux/regmap.h> -- 2.34.1

2 1

[PATCH 1/4] ASoC: SOF: amd: Fix for reading position updates from stream box.
by V sujith kumar Reddy 15 Nov '22

15 Nov '22

By default the position updates are read from dsp box when streambox size is not defined.if the streambox size is defined to some value then position updates can be read from the streambox. Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy(a)amd.com> --- sound/soc/sof/amd/acp-common.c | 1 + sound/soc/sof/amd/acp-ipc.c | 30 +++++++++++++++++++++++++++++- sound/soc/sof/amd/acp.h | 4 ++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp-common.c b/sound/soc/sof/amd/acp-common.c index 27b95187356e..150e042e4039 100644 --- a/sound/soc/sof/amd/acp-common.c +++ b/sound/soc/sof/amd/acp-common.c @@ -76,6 +76,7 @@ struct snd_sof_dsp_ops sof_acp_common_ops = { /*IPC */ .send_msg = acp_sof_ipc_send_msg, .ipc_msg_data = acp_sof_ipc_msg_data, + .set_stream_data_offset = acp_set_stream_data_offset, .get_mailbox_offset = acp_sof_ipc_get_mailbox_offset, .get_window_offset = acp_sof_ipc_get_window_offset, .irq_thread = acp_sof_ipc_irq_thread, diff --git a/sound/soc/sof/amd/acp-ipc.c b/sound/soc/sof/amd/acp-ipc.c index dd030566e372..dd6e53c63407 100644 --- a/sound/soc/sof/amd/acp-ipc.c +++ b/sound/soc/sof/amd/acp-ipc.c @@ -192,13 +192,41 @@ int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_pcm_substream *sub { unsigned int offset = sdev->dsp_box.offset; - if (!substream || !sdev->stream_box.size) + if (!substream || !sdev->stream_box.size) { acp_mailbox_read(sdev, offset, p, sz); + } else { + struct acp_dsp_stream *stream = substream->runtime->private_data; + + if (!stream) + return -ESTRPIPE; + + acp_mailbox_read(sdev, stream->posn_offset, p, sz); + } return 0; } EXPORT_SYMBOL_NS(acp_sof_ipc_msg_data, SND_SOC_SOF_AMD_COMMON); +int acp_set_stream_data_offset(struct snd_sof_dev *sdev, + struct snd_pcm_substream *substream, + size_t posn_offset) +{ + struct acp_dsp_stream *stream = substream->runtime->private_data; + + /* check for unaligned offset or overflow */ + if (posn_offset > sdev->stream_box.size || + posn_offset % sizeof(struct sof_ipc_stream_posn) != 0) + return -EINVAL; + + stream->posn_offset = sdev->stream_box.offset + posn_offset; + + dev_dbg(sdev->dev, "pcm: stream dir %d, posn mailbox offset is %zu", + substream->stream, stream->posn_offset); + + return 0; +} +EXPORT_SYMBOL_NS(acp_set_stream_data_offset, SND_SOC_SOF_AMD_COMMON); + int acp_sof_ipc_get_mailbox_offset(struct snd_sof_dev *sdev) { const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index dd3c072d0172..1529c6d9bf9b 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -138,6 +138,7 @@ struct acp_dsp_stream { int stream_tag; int active; unsigned int reg_offset; + size_t posn_offset; }; struct sof_amd_acp_desc { @@ -199,6 +200,9 @@ int acp_dsp_block_read(struct snd_sof_dev *sdev, enum snd_sof_fw_blk_type blk_ty irqreturn_t acp_sof_ipc_irq_thread(int irq, void *context); int acp_sof_ipc_msg_data(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream, void *p, size_t sz); +int acp_set_stream_data_offset(struct snd_sof_dev *sdev, + struct snd_pcm_substream *substream, + size_t posn_offset); int acp_sof_ipc_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg); int acp_sof_ipc_get_mailbox_offset(struct snd_sof_dev *sdev); -- 2.25.1

1 3

[PATCH] ASoC: fsl_sai: Enable transmitter when generating MCLK
by Marek Vasut 15 Nov '22

15 Nov '22

For SAI to generate MCLK on external SoC pad, the transmitter must be enabled as well. With transmitter disabled, no clock are generated. Enable the transmitter using the TERE bit. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Shengjiu Wang <shengjiu.wang(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> To: alsa-devel(a)alsa-project.org --- sound/soc/fsl/fsl_sai.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 1c9be8a5dcb13..98c62027e5799 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -503,6 +503,10 @@ static int fsl_sai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq) /* SAI is in master mode at this point, so enable MCLK */ regmap_update_bits(sai->regmap, FSL_SAI_MCTL, FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN); + + /* Transmitter must be enabled to generate MCLK on pad */ + regmap_update_bits(sai->regmap, FSL_SAI_xCSR(1, ofs), + FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE); } return 0; @@ -1445,6 +1449,11 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->soc_data->max_register >= FSL_SAI_MCTL) { regmap_update_bits(sai->regmap, FSL_SAI_MCTL, FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN); + + /* Transmitter must be enabled to generate MCLK on pad */ + regmap_update_bits(sai->regmap, + FSL_SAI_xCSR(1, sai->soc_data->reg_offset), + FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE); } ret = pm_runtime_put_sync(dev); -- 2.35.1

2 6

ucm2: [Digidesign MBox3] Added default SplitPCMPeriodTime and reordered
by GitHub pull_request - opened 15 Nov '22

15 Nov '22

alsa-project/alsa-ucm-conf pull request #240 was opened from ManuLinares: Added default SplitPCMPeriodTime of 500 (0.5ms): to solve latency issues https://github.com/alsa-project/alsa-ucm-conf/issues/238 Reordered configs: to make pulseaudio select the correct default card profile, input and ourputs (pavucontrol) Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/240 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/240.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 00/14] ARM: remove unused davinci board & drivers
by Arnd Bergmann 14 Nov '22

14 Nov '22

From: Arnd Bergmann <arnd(a)arndb.de> As part of removing all board files that were previously marked as unused, I looked through the davinci platform and recursively removed everything that has now become unused. In particular, this is for all dm3xx support, in addition to the dm64xx support removed previously. The remaining support is now for da8xx using devicetree only, which means a lot of the da8xx specific device support can also go away. As with the previous series, I can keep patches together in the soc tree, or subsystem maintainers can pick them up individually through their subsystems, whichever they prefer. Arnd Bergmann (14): ARM: davinci: remove unused board support ARM: davinci: drop DAVINCI_DMxxx references ARM: davinci: clean up platform support clk: remove davinci dm3xx drivers usb: musb: remove unused davinci support mfd: remove dm355evm_msp driver input: remove davinci keyboard driver rtc: remove davinci rtc driver ASoC: remove unused davinci support mfd: remove davinci voicecodec driver pata: remove palmchip bk3710 driver irqchip: remove davinci aintc driver staging: media: remove davinci vpfe_capture driver media: davinci: remove vpbe support Cc: Sekhar Nori <nsekhar(a)ti.com> Cc: Bartosz Golaszewski <brgl(a)bgdev.pl> Cc: Russell King <linux(a)armlinux.org.uk> Cc: Mauro Carvalho Chehab <mchehab(a)kernel.org> Cc: Damien Le Moal <damien.lemoal(a)opensource.wdc.com> Cc: Sergey Shtylyov <s.shtylyov(a)omp.ru> Cc: David Lechner <david(a)lechnology.com> Cc: Michael Turquette <mturquette(a)baylibre.com> Cc: Stephen Boyd <sboyd(a)kernel.org> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Marc Zyngier <maz(a)kernel.org> Cc: "Lad, Prabhakar" <prabhakar.csengg(a)gmail.com> Cc: Lee Jones <lee(a)kernel.org> Cc: Alessandro Zummo <a.zummo(a)towertech.it> Cc: Alexandre Belloni <alexandre.belloni(a)bootlin.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Bin Liu <b-liu(a)ti.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)gmail.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> Cc: Yang Yingliang <yangyingliang(a)huawei.com> Cc: linux-media(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-ide(a)vger.kernel.org Cc: linux-clk(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-rtc(a)vger.kernel.org Cc: linux-staging(a)lists.linux.dev Cc: linux-usb(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org .../admin-guide/media/davinci-vpbe.rst | 65 - .../admin-guide/media/platform-cardlist.rst | 1 - .../admin-guide/media/v4l-drivers.rst | 1 - .../media/drivers/davinci-vpbe-devel.rst | 39 - .../driver-api/media/drivers/index.rst | 1 - MAINTAINERS | 1 - arch/arm/Kconfig.debug | 16 +- arch/arm/mach-davinci/Kconfig | 142 -- arch/arm/mach-davinci/Makefile | 18 +- arch/arm/mach-davinci/board-da830-evm.c | 690 ------ arch/arm/mach-davinci/board-da850-evm.c | 1550 -------------- arch/arm/mach-davinci/board-dm355-evm.c | 444 ---- arch/arm/mach-davinci/board-dm355-leopard.c | 278 --- arch/arm/mach-davinci/board-dm365-evm.c | 855 -------- arch/arm/mach-davinci/board-mityomapl138.c | 638 ------ arch/arm/mach-davinci/board-omapl138-hawk.c | 451 ---- arch/arm/mach-davinci/common.h | 7 +- arch/arm/mach-davinci/cputype.h | 53 - arch/arm/mach-davinci/da830.c | 274 --- arch/arm/mach-davinci/da850.c | 400 +--- arch/arm/mach-davinci/da8xx.h | 95 +- arch/arm/mach-davinci/davinci.h | 136 -- arch/arm/mach-davinci/devices-da8xx.c | 1094 ---------- arch/arm/mach-davinci/devices.c | 303 --- arch/arm/mach-davinci/dm355.c | 832 ------- arch/arm/mach-davinci/dm365.c | 1094 ---------- arch/arm/mach-davinci/mux.c | 15 - arch/arm/mach-davinci/serial.c | 92 - arch/arm/mach-davinci/serial.h | 15 - arch/arm/mach-davinci/usb-da8xx.c | 146 -- arch/arm/mach-davinci/usb.c | 87 - drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/pata_bk3710.c | 380 ---- drivers/clk/davinci/Makefile | 4 - drivers/clk/davinci/pll-dm355.c | 77 - drivers/clk/davinci/pll-dm365.c | 146 -- drivers/clk/davinci/pll.c | 8 - drivers/clk/davinci/pll.h | 5 - drivers/clk/davinci/psc-dm355.c | 89 - drivers/clk/davinci/psc-dm365.c | 111 - drivers/clk/davinci/psc.c | 6 - drivers/clk/davinci/psc.h | 7 - drivers/input/keyboard/Kconfig | 10 - drivers/input/keyboard/Makefile | 1 - drivers/input/keyboard/davinci_keyscan.c | 315 --- drivers/input/misc/Kconfig | 11 - drivers/input/misc/Makefile | 1 - drivers/input/misc/dm355evm_keys.c | 238 --- drivers/irqchip/Kconfig | 5 - drivers/irqchip/Makefile | 1 - drivers/irqchip/irq-davinci-aintc.c | 163 -- drivers/media/platform/ti/davinci/Kconfig | 16 - drivers/media/platform/ti/davinci/Makefile | 3 - drivers/media/platform/ti/davinci/vpbe.c | 840 -------- .../media/platform/ti/davinci/vpbe_display.c | 1510 ------------- drivers/media/platform/ti/davinci/vpbe_osd.c | 1582 -------------- .../media/platform/ti/davinci/vpbe_osd_regs.h | 352 --- drivers/media/platform/ti/davinci/vpbe_venc.c | 676 ------ .../platform/ti/davinci/vpbe_venc_regs.h | 165 -- drivers/media/platform/ti/davinci/vpss.c | 529 ----- drivers/mfd/Kconfig | 13 - drivers/mfd/Makefile | 3 - drivers/mfd/davinci_voicecodec.c | 136 -- drivers/mfd/dm355evm_msp.c | 454 ---- drivers/rtc/Kconfig | 16 - drivers/rtc/Makefile | 2 - drivers/rtc/rtc-davinci.c | 512 ----- drivers/rtc/rtc-dm355evm.c | 151 -- drivers/staging/media/Kconfig | 1 - drivers/staging/media/Makefile | 1 - .../media/deprecated/vpfe_capture/Kconfig | 58 - .../media/deprecated/vpfe_capture/Makefile | 4 - .../media/deprecated/vpfe_capture/TODO | 7 - .../deprecated/vpfe_capture/ccdc_hw_device.h | 80 - .../deprecated/vpfe_capture/dm355_ccdc.c | 934 -------- .../deprecated/vpfe_capture/dm355_ccdc.h | 308 --- .../deprecated/vpfe_capture/dm355_ccdc_regs.h | 297 --- .../deprecated/vpfe_capture/dm644x_ccdc.c | 879 -------- .../deprecated/vpfe_capture/dm644x_ccdc.h | 171 -- .../vpfe_capture/dm644x_ccdc_regs.h | 140 -- .../media/deprecated/vpfe_capture/isif.c | 1127 ---------- .../media/deprecated/vpfe_capture/isif.h | 518 ----- .../media/deprecated/vpfe_capture/isif_regs.h | 256 --- .../deprecated/vpfe_capture/vpfe_capture.c | 1902 ----------------- drivers/usb/musb/Kconfig | 12 - drivers/usb/musb/Makefile | 2 - drivers/usb/musb/cppi_dma.c | 1547 -------------- drivers/usb/musb/davinci.c | 606 ------ drivers/usb/musb/davinci.h | 103 - include/linux/clk/davinci.h | 9 - include/linux/mfd/dm355evm_msp.h | 79 - include/media/davinci/vpbe.h | 184 -- include/media/davinci/vpbe_display.h | 122 -- include/media/davinci/vpbe_osd.h | 382 ---- include/media/davinci/vpbe_types.h | 74 - include/media/davinci/vpbe_venc.h | 37 - include/media/davinci/vpfe_capture.h | 177 -- include/media/davinci/vpss.h | 111 - sound/soc/ti/Kconfig | 40 - sound/soc/ti/Makefile | 2 - sound/soc/ti/davinci-evm.c | 267 +-- sound/soc/ti/davinci-vcif.c | 247 --- 103 files changed, 17 insertions(+), 29049 deletions(-) delete mode 100644 Documentation/admin-guide/media/davinci-vpbe.rst delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst delete mode 100644 arch/arm/mach-davinci/board-da830-evm.c delete mode 100644 arch/arm/mach-davinci/board-da850-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-evm.c delete mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c delete mode 100644 arch/arm/mach-davinci/board-dm365-evm.c delete mode 100644 arch/arm/mach-davinci/board-mityomapl138.c delete mode 100644 arch/arm/mach-davinci/board-omapl138-hawk.c delete mode 100644 arch/arm/mach-davinci/davinci.h delete mode 100644 arch/arm/mach-davinci/devices.c delete mode 100644 arch/arm/mach-davinci/dm355.c delete mode 100644 arch/arm/mach-davinci/dm365.c delete mode 100644 arch/arm/mach-davinci/serial.c delete mode 100644 arch/arm/mach-davinci/usb-da8xx.c delete mode 100644 arch/arm/mach-davinci/usb.c delete mode 100644 drivers/ata/pata_bk3710.c delete mode 100644 drivers/clk/davinci/pll-dm355.c delete mode 100644 drivers/clk/davinci/pll-dm365.c delete mode 100644 drivers/clk/davinci/psc-dm355.c delete mode 100644 drivers/clk/davinci/psc-dm365.c delete mode 100644 drivers/input/keyboard/davinci_keyscan.c delete mode 100644 drivers/input/misc/dm355evm_keys.c delete mode 100644 drivers/irqchip/irq-davinci-aintc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_display.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc.c delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc_regs.h delete mode 100644 drivers/media/platform/ti/davinci/vpss.c delete mode 100644 drivers/mfd/davinci_voicecodec.c delete mode 100644 drivers/mfd/dm355evm_msp.c delete mode 100644 drivers/rtc/rtc-davinci.c delete mode 100644 drivers/rtc/rtc-dm355evm.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.c delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif_regs.h delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c delete mode 100644 drivers/usb/musb/cppi_dma.c delete mode 100644 drivers/usb/musb/davinci.c delete mode 100644 drivers/usb/musb/davinci.h delete mode 100644 include/linux/mfd/dm355evm_msp.h delete mode 100644 include/media/davinci/vpbe.h delete mode 100644 include/media/davinci/vpbe_display.h delete mode 100644 include/media/davinci/vpbe_osd.h delete mode 100644 include/media/davinci/vpbe_types.h delete mode 100644 include/media/davinci/vpbe_venc.h delete mode 100644 include/media/davinci/vpfe_capture.h delete mode 100644 include/media/davinci/vpss.h delete mode 100644 sound/soc/ti/davinci-vcif.c -- 2.29.2

5 5