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

[PATCH] ASoC: amd: yc: Add DMI entries to support Victus by HP Laptop 16-e1xxx (8A22)
by gbrohammer＠outlook.com 17 Mar '23

17 Mar '23

From: Ge-org Brohammer <gbrohammer(a)outlook.com> This model requires an additional detection quirk to enable the internal microphone. Tried to use git send-email this time. Signed-off-by: Ge-org Brohammer <gbrohammer(a)outlook.com> --- 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 4a69ce702360..0acdf0156f07 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -269,6 +269,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_BOARD_NAME, "8A43"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "HP"), + DMI_MATCH(DMI_BOARD_NAME, "8A22"), + } + }, {} }; -- 2.37.2

2 1

[PATCH v2] ASoC: dt-bindings: adi,adau17x1: fix indentation and example
by Krzysztof Kozlowski 17 Mar '23

17 Mar '23

Fix errors in binding indentation and example: adi,adau17x1.yaml:8:2: [warning] wrong indentation: expected 2 but found 1 (indentation) adi,adau17x1.example.dts:29.3-30.1 syntax error Fixes: 87771c940258 ("ASoC: dt-bindings: adi,adau17x1: Convert to DT schema") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Changes since v1: 1. Fix typo in subject 2. Add fixes tag - commit SHA from ASoC next branch --- Documentation/devicetree/bindings/sound/adi,adau17x1.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml b/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml index 45955f38b6fd..8ef1e7f6ec91 100644 --- a/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml +++ b/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml @@ -4,8 +4,7 @@ $id: http://devicetree.org/schemas/sound/adi,adau17x1.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: - Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781 Codec +title: Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781 Codec maintainers: - Lars-Peter Clausen <lars(a)metafoo.de> @@ -50,3 +49,4 @@ examples: clock-names = "mclk"; clocks = <&audio_clock>; }; + }; -- 2.34.1

2 1

[PATCH 0/2] ASoC: SOF: ipc4: upport multiple configs for BE DAIs
by Peter Ujfalusi 17 Mar '23

17 Mar '23

Hi, Backend DAIs may support multiple audio formats. Modify pipeline setup to select a suitable configuration based on topology and frontend DAI runtime configuration. The prime use case is BT offload support where we need the abality to select different configuration on the BE side. Regards, Peter -- Kai Vehmanen (2): ASoC: SOF: ipc4-pcm: support multiple configs for BE DAIs ASoC: SOF: ipc4-topology: use common helper function in copier prepare sound/soc/sof/ipc4-pcm.c | 66 ++++++++++++++++++++++--- sound/soc/sof/ipc4-topology.c | 92 ++++++++++++++++++++++++++--------- 2 files changed, 128 insertions(+), 30 deletions(-) -- 2.39.2

2 3

[PATCH] ASoC: amd: yc: Add DMI entries to support Victus by HP Laptop 16-e1xxx (8A22)
by Ge-org Brohammer 17 Mar '23

17 Mar '23

This model requires an additional detection quirk to enable the internal microphone. Signed-off-by: Ge-org Brohammer <gbrohammer(a)outlook.com> --- 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 4a69ce702360..0acdf0156f07 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -269,6 +269,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_BOARD_NAME, "8A43"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "HP"), + DMI_MATCH(DMI_BOARD_NAME, "8A22"), + } + }, {} }; -- 2.37.2

2 2

[PATCH V6 0/8] Add SoundWire support for AMD platforms
by Vijendar Mukunda 17 Mar '23

17 Mar '23

ACP IP(v6.x) block has two SoundWire manager instance support. This patchset adds support for AMD SoundWire manager driver. Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> changes since v5: - replace loops logic with read_poll_timeout() throughout the code. changes since v4: - fix nit-picks in the code. - update naming convention for control word and response buffer vairables. - drop pm_suspend check in prepare callback. - use return statement instead of returning ret variable. changes since v3: - add usleep_range() in command/response implementation. - add usleep_range() in clock stop sequence. - modify usleep_range() values throughout the code. - remove unncessary debug statement from code. - update comment in probe() call. - fix timeout condition checks in the code. - drop "ret" variable in amd_disable_sdw_manager(). changes since v2: - Remove useless variable initializations. - Add helper function to interpret peripheral status. - Move runtime pm sequence to probe_work workqueue. - Use string "SoundWire" instead of "soundwire" in code. - Update comments in interrupt handler and probe sequence. - Rename "sdw_lock" as "acp_sdw_lock". - Remove __func__ from dev_dbg statements. changes since v1: - Drop asoc tree based patches. will send asoc patches as a separate series. - Fixed double space errors. - Use dev instead of pci->dev. - Use SoundWire manager terminology. - Remove amd_sdw_compute_slave_ports() function and use exported sdw_compute_slave_ports() function. - Remove unused variable "num_ports" from amd_manager structure. - Drop startup and shutdown dai callbacks. - Drop reset_page_addr callback. - Use relative address offset to program SoundWire manager registers throughout the code. - Separate wake enable interrupt handling from slave status handling logic. - Use acp_mmio to program ACP common registers. - Use dai_runtime_array implementation in dai_ops. - Refactor port_ops callbacks. - Add comments in port_ops callbacks. - Add retry count logic in irq thread to address faulty case. - Add helper function to interpret command response. - Add generic bandwidth allocation dependency in Kconfig options. - Add comments for AMD SoundWire power modes. - Add missing timeout check in amd_init_sdw_manager callback. - Declare frameshape parameters in probe call. - Handle error case in clock stop sequence. - Add comments in pm_prepare and pm_ops callbacks. Vijendar Mukunda (8): soundwire: export sdw_compute_slave_ports() function soundwire: amd: Add support for AMD Manager driver soundwire: amd: register SoundWire manager dai ops soundwire: amd: enable build for AMD SoundWire manager driver soundwire: amd: add SoundWire manager interrupt handling soundwire: amd: add runtime pm ops for AMD SoundWire manager driver soundwire: amd: handle SoundWire wake enable interrupt soundwire: amd: add pm_prepare callback and pm ops support drivers/soundwire/Kconfig | 10 + drivers/soundwire/Makefile | 4 + drivers/soundwire/amd_manager.c | 1245 +++++++++++++++++ drivers/soundwire/amd_manager.h | 274 ++++ drivers/soundwire/bus.h | 9 + .../soundwire/generic_bandwidth_allocation.c | 12 +- include/linux/soundwire/sdw_amd.h | 109 ++ 7 files changed, 1654 insertions(+), 9 deletions(-) create mode 100644 drivers/soundwire/amd_manager.c create mode 100644 drivers/soundwire/amd_manager.h create mode 100644 include/linux/soundwire/sdw_amd.h -- 2.34.1

4 30

[PATCH 1/2] soundwire: bus: Remove now outdated comments on no_pm IO
by Charles Keepax 17 Mar '23

17 Mar '23

Things have moved more towards end drivers using the no_pm versions of the IO functions. See commits: commit 167790abb90f ("soundwire: export sdw_write/read_no_pm functions") commit 62dc9f3f2fd0 ("soundwire: bus: export sdw_nwrite_no_pm and sdw_nread_no_pm functions") As such this comment is now misleading, so remove it. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- drivers/soundwire/bus.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index b6aca59c31300..3c67266f94834 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -384,9 +384,6 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave, /* * Read/Write IO functions. - * no_pm versions can only be called by the bus, e.g. while enumerating or - * handling suspend-resume sequences. - * all clients need to use the pm versions */ int sdw_nread_no_pm(struct sdw_slave *slave, u32 addr, size_t count, u8 *val) -- 2.30.2

3 6

[PATCH] soundwire: stream: uniquify dev_err() logs
by Bard Liao 17 Mar '23

17 Mar '23

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> There are a couple of duplicate logs which makes harder than needed to follow the error flows. Add __func__ or make the log unique. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/stream.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 2e39587ed1de..dd09855caac9 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1389,7 +1389,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, ret = do_bank_switch(stream); if (ret < 0) { - dev_err(bus->dev, "Bank switch failed: %d\n", ret); + pr_err("%s: do_bank_switch failed: %d\n", __func__, ret); goto restore_params; } @@ -1477,7 +1477,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) /* Program params */ ret = sdw_program_params(bus, false); if (ret < 0) { - dev_err(bus->dev, "Program params failed: %d\n", ret); + dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret); return ret; } @@ -1497,7 +1497,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) ret = do_bank_switch(stream); if (ret < 0) { - dev_err(bus->dev, "Bank switch failed: %d\n", ret); + pr_err("%s: do_bank_switch failed: %d\n", __func__, ret); return ret; } @@ -1567,14 +1567,14 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream) /* Program params */ ret = sdw_program_params(bus, false); if (ret < 0) { - dev_err(bus->dev, "Program params failed: %d\n", ret); + dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret); return ret; } } ret = do_bank_switch(stream); if (ret < 0) { - pr_err("Bank switch failed: %d\n", ret); + pr_err("%s: do_bank_switch failed: %d\n", __func__, ret); return ret; } @@ -1664,7 +1664,7 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream) /* Program params */ ret = sdw_program_params(bus, false); if (ret < 0) { - dev_err(bus->dev, "Program params failed: %d\n", ret); + dev_err(bus->dev, "%s: Program params failed: %d\n", __func__, ret); return ret; } } @@ -1893,7 +1893,8 @@ int sdw_stream_add_master(struct sdw_bus *bus, m_rt = sdw_master_rt_alloc(bus, stream); if (!m_rt) { - dev_err(bus->dev, "Master runtime alloc failed for stream:%s\n", stream->name); + dev_err(bus->dev, "%s: Master runtime alloc failed for stream:%s\n", + __func__, stream->name); ret = -ENOMEM; goto unlock; } @@ -2012,7 +2013,8 @@ int sdw_stream_add_slave(struct sdw_slave *slave, */ m_rt = sdw_master_rt_alloc(slave->bus, stream); if (!m_rt) { - dev_err(&slave->dev, "Master runtime alloc failed for stream:%s\n", stream->name); + dev_err(&slave->dev, "%s: Master runtime alloc failed for stream:%s\n", + __func__, stream->name); ret = -ENOMEM; goto unlock; } -- 2.25.1

3 3

Re: [PATCH v2 8/8] ASoC: cs35l56: Add driver for Cirrus Logic CS35L56
by kernel test robot 17 Mar '23

17 Mar '23

Hi Richard, Thank you for the patch! Yet something to improve: [auto build test ERROR on broonie-sound/for-next] [also build test ERROR on linus/master v6.3-rc2 next-20230316] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Richard-Fitzgerald-via-Alsa-… base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next patch link: https://lore.kernel.org/r/167872265923.26.336497278776737619%40mailman-core… patch subject: [PATCH v2 8/8] ASoC: cs35l56: Add driver for Cirrus Logic CS35L56 config: s390-randconfig-r044-20230313 (https://download.01.org/0day-ci/archive/20230317/202303170422.ZYpOtc4P-lkp@…) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 67409911353323ca5edf2049ef0df54132fa1ca7) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # install s390 cross compiling tool for clang build # apt-get install binutils-s390x-linux-gnu # https://github.com/intel-lab-lkp/linux/commit/5856c94d659f9c9963f5c37762cf2… git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Richard-Fitzgerald-via-Alsa-devel/ASoC-wm_adsp-Use-no_core_startstop-to-prevent-creating-preload-control/20230313-235605 git checkout 5856c94d659f9c9963f5c37762cf201e1f1765e9 # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=s390 olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=s390 SHELL=/bin/bash If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp(a)intel.com> | Link: https://lore.kernel.org/oe-kbuild-all/202303170422.ZYpOtc4P-lkp@intel.com/ All errors (new ones prefixed by >>): s390x-linux-ld: sound/soc/codecs/cs35l56.o: in function `cs35l56_dsp_work': >> sound/soc/codecs/cs35l56.c:887: undefined reference to `sdw_write_no_pm' >> s390x-linux-ld: sound/soc/codecs/cs35l56.c:888: undefined reference to `sdw_read_no_pm' >> s390x-linux-ld: sound/soc/codecs/cs35l56.c:889: undefined reference to `sdw_write_no_pm' s390x-linux-ld: sound/soc/codecs/cs35l56.c:953: undefined reference to `sdw_write_no_pm' s390x-linux-ld: sound/soc/codecs/cs35l56.o: in function `cs35l56_sdw_dai_hw_params': >> sound/soc/codecs/cs35l56.c:710: undefined reference to `sdw_stream_add_slave' s390x-linux-ld: sound/soc/codecs/cs35l56.o: in function `cs35l56_sdw_dai_hw_free': >> sound/soc/codecs/cs35l56.c:729: undefined reference to `sdw_stream_remove_slave' Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for SERIAL_MULTI_INSTANTIATE Depends on [n]: X86_PLATFORM_DEVICES [=n] && I2C [=y] && SPI [=y] && ACPI Selected by [y]: - SND_SOC_CS35L56_I2C [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && I2C [=y] - SND_SOC_CS35L56_SPI [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SPI_MASTER [=y] vim +887 sound/soc/codecs/cs35l56.c 668 669 static int cs35l56_sdw_dai_hw_params(struct snd_pcm_substream *substream, 670 struct snd_pcm_hw_params *params, 671 struct snd_soc_dai *dai) 672 { 673 struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(dai->component); 674 struct sdw_stream_runtime *sdw_stream = snd_soc_dai_get_dma_data(dai, substream); 675 struct sdw_stream_config sconfig; 676 struct sdw_port_config pconfig; 677 int ret; 678 679 dev_dbg(cs35l56->dev, "%s: rate %d\n", __func__, params_rate(params)); 680 681 if (!cs35l56->init_done) 682 return -ENODEV; 683 684 if (!sdw_stream) 685 return -EINVAL; 686 687 memset(&sconfig, 0, sizeof(sconfig)); 688 memset(&pconfig, 0, sizeof(pconfig)); 689 690 sconfig.frame_rate = params_rate(params); 691 sconfig.bps = snd_pcm_format_width(params_format(params)); 692 693 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { 694 sconfig.direction = SDW_DATA_DIR_RX; 695 pconfig.num = CS35L56_SDW1_PLAYBACK_PORT; 696 pconfig.ch_mask = cs35l56->rx_mask; 697 } else { 698 sconfig.direction = SDW_DATA_DIR_TX; 699 pconfig.num = CS35L56_SDW1_CAPTURE_PORT; 700 pconfig.ch_mask = cs35l56->tx_mask; 701 } 702 703 if (pconfig.ch_mask == 0) { 704 sconfig.ch_count = params_channels(params); 705 pconfig.ch_mask = GENMASK(sconfig.ch_count - 1, 0); 706 } else { 707 sconfig.ch_count = hweight32(pconfig.ch_mask); 708 } 709 > 710 ret = sdw_stream_add_slave(cs35l56->sdw_peripheral, &sconfig, &pconfig, 711 1, sdw_stream); 712 if (ret) { 713 dev_err(dai->dev, "Failed to add sdw stream: %d\n", ret); 714 return ret; 715 } 716 717 return 0; 718 } 719 720 static int cs35l56_sdw_dai_hw_free(struct snd_pcm_substream *substream, 721 struct snd_soc_dai *dai) 722 { 723 struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(dai->component); 724 struct sdw_stream_runtime *sdw_stream = snd_soc_dai_get_dma_data(dai, substream); 725 726 if (!cs35l56->sdw_peripheral) 727 return -EINVAL; 728 > 729 sdw_stream_remove_slave(cs35l56->sdw_peripheral, sdw_stream); 730 731 return 0; 732 } 733 734 static int cs35l56_sdw_dai_set_stream(struct snd_soc_dai *dai, 735 void *sdw_stream, int direction) 736 { 737 if (!sdw_stream) 738 return 0; 739 740 snd_soc_dai_dma_data_set(dai, direction, sdw_stream); 741 742 return 0; 743 } 744 745 static const struct snd_soc_dai_ops cs35l56_sdw_dai_ops = { 746 .set_tdm_slot = cs35l56_sdw_dai_set_tdm_slot, 747 .shutdown = cs35l56_sdw_dai_shutdown, 748 .hw_params = cs35l56_sdw_dai_hw_params, 749 .hw_free = cs35l56_sdw_dai_hw_free, 750 .mute_stream = cs35l56_mute_stream, 751 .set_stream = cs35l56_sdw_dai_set_stream, 752 }; 753 754 static struct snd_soc_dai_driver cs35l56_dai[] = { 755 { 756 .name = "cs35l56-asp1", 757 .id = 0, 758 .playback = { 759 .stream_name = "ASP1 Playback", 760 .channels_min = 1, 761 .channels_max = 2, 762 .rates = CS35L56_RATES, 763 .formats = CS35L56_RX_FORMATS, 764 }, 765 .capture = { 766 .stream_name = "ASP1 Capture", 767 .channels_min = 1, 768 .channels_max = 4, 769 .rates = CS35L56_RATES, 770 .formats = CS35L56_TX_FORMATS, 771 }, 772 .ops = &cs35l56_ops, 773 .symmetric_rate = 1, 774 .symmetric_sample_bits = 1, 775 }, 776 { 777 .name = "cs35l56-sdw1", 778 .id = 1, 779 .playback = { 780 .stream_name = "SDW1 Playback", 781 .channels_min = 1, 782 .channels_max = 2, 783 .rates = CS35L56_RATES, 784 .formats = CS35L56_RX_FORMATS, 785 }, 786 .capture = { 787 .stream_name = "SDW1 Capture", 788 .channels_min = 1, 789 .channels_max = 6, 790 .rates = CS35L56_RATES, 791 .formats = CS35L56_TX_FORMATS, 792 }, 793 .symmetric_rate = 1, 794 .ops = &cs35l56_sdw_dai_ops, 795 } 796 }; 797 798 static int cs35l56_wait_for_firmware_boot(struct cs35l56_private *cs35l56) 799 { 800 unsigned int reg; 801 unsigned int val; 802 int ret; 803 804 if (cs35l56->rev < CS35L56_REVID_B0) 805 reg = CS35L56_DSP1_HALO_STATE_A1; 806 else 807 reg = CS35L56_DSP1_HALO_STATE; 808 809 ret = regmap_read_poll_timeout(cs35l56->regmap, reg, 810 val, 811 (val < 0xFFFF) && (val >= CS35L56_HALO_STATE_BOOT_DONE), 812 CS35L56_HALO_STATE_POLL_US, 813 CS35L56_HALO_STATE_TIMEOUT_US); 814 815 if ((ret < 0) && (ret != -ETIMEDOUT)) { 816 dev_err(cs35l56->dev, "Failed to read HALO_STATE: %d\n", ret); 817 return ret; 818 } 819 820 if ((ret == -ETIMEDOUT) || (val != CS35L56_HALO_STATE_BOOT_DONE)) { 821 dev_err(cs35l56->dev, "Firmware boot fail: HALO_STATE=%#x\n", val); 822 return -EIO; 823 } 824 825 return 0; 826 } 827 828 static const struct reg_sequence cs35l56_system_reset_seq[] = { 829 REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_SYSTEM_RESET), 830 }; 831 832 static void cs35l56_system_reset(struct cs35l56_private *cs35l56) 833 { 834 cs35l56->soft_resetting = true; 835 836 /* 837 * Must enter cache-only first so there can't be any more register 838 * accesses other than the controlled system reset sequence below. 839 */ 840 regcache_cache_only(cs35l56->regmap, true); 841 regmap_multi_reg_write_bypassed(cs35l56->regmap, 842 cs35l56_system_reset_seq, 843 ARRAY_SIZE(cs35l56_system_reset_seq)); 844 845 /* On SoundWire the registers won't be accessible until it re-enumerates. */ 846 if (cs35l56->sdw_peripheral) 847 return; 848 849 usleep_range(CS35L56_CONTROL_PORT_READY_US, CS35L56_CONTROL_PORT_READY_US + 400); 850 regcache_cache_only(cs35l56->regmap, false); 851 } 852 853 static void cs35l56_dsp_work(struct work_struct *work) 854 { 855 struct cs35l56_private *cs35l56 = container_of(work, 856 struct cs35l56_private, 857 dsp_work); 858 unsigned int reg; 859 unsigned int val; 860 int ret = 0; 861 862 if (!wait_for_completion_timeout(&cs35l56->init_completion, 863 msecs_to_jiffies(5000))) { 864 dev_err(cs35l56->dev, "%s: init_completion timed out\n", __func__); 865 goto complete; 866 } 867 868 if (!cs35l56->init_done || cs35l56->removing) 869 goto complete; 870 871 cs35l56->dsp.part = devm_kasprintf(cs35l56->dev, GFP_KERNEL, "cs35l56%s-%02x", 872 cs35l56->secured ? "s" : "", cs35l56->rev); 873 874 if (!cs35l56->dsp.part) 875 goto complete; 876 877 pm_runtime_get_sync(cs35l56->dev); 878 879 /* 880 * Disable SoundWire interrupts to prevent race with IRQ work. 881 * Setting sdw_irq_no_unmask prevents the handler re-enabling 882 * the SoundWire interrupt. 883 */ 884 if (cs35l56->sdw_peripheral) { 885 cs35l56->sdw_irq_no_unmask = true; 886 cancel_work_sync(&cs35l56->sdw_irq_work); > 887 sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_MASK_1, 0); > 888 sdw_read_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_STAT_1); > 889 sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_STAT_1, 0xFF); 890 } 891 892 ret = cs35l56_mbox_send(cs35l56, CS35L56_MBOX_CMD_SHUTDOWN); 893 if (ret) { 894 dev_dbg(cs35l56->dev, "%s: CS35L56_MBOX_CMD_SHUTDOWN ret %d\n", __func__, ret); 895 goto err; 896 } 897 898 if (cs35l56->rev < CS35L56_REVID_B0) 899 reg = CS35L56_DSP1_PM_CUR_STATE_A1; 900 else 901 reg = CS35L56_DSP1_PM_CUR_STATE; 902 903 ret = regmap_read_poll_timeout(cs35l56->regmap, reg, 904 val, (val == CS35L56_HALO_STATE_SHUTDOWN), 905 CS35L56_HALO_STATE_POLL_US, 906 CS35L56_HALO_STATE_TIMEOUT_US); 907 if (ret < 0) 908 dev_err(cs35l56->dev, "Failed to poll PM_CUR_STATE to 1 is %d (ret %d)\n", 909 val, ret); 910 911 /* Use wm_adsp to load and apply the firmware patch and coefficient files */ 912 ret = wm_adsp_power_up(&cs35l56->dsp); 913 if (ret) { 914 dev_dbg(cs35l56->dev, "%s: wm_adsp_power_up ret %d\n", __func__, ret); 915 goto err; 916 } 917 918 if (cs35l56->removing) 919 goto err; 920 921 mutex_lock(&cs35l56->irq_lock); 922 923 init_completion(&cs35l56->init_completion); 924 925 cs35l56_system_reset(cs35l56); 926 927 if (cs35l56->sdw_peripheral) { 928 /* 929 * The system-reset causes the CS35L56 to detach from the bus. 930 * Wait for the manager to re-enumerate the CS35L56 and 931 * cs35l56_init() to run again. 932 */ 933 if (!wait_for_completion_timeout(&cs35l56->init_completion, 934 msecs_to_jiffies(5000))) { 935 dev_err(cs35l56->dev, "%s: init_completion timed out (SDW)\n", __func__); 936 goto err_unlock; 937 } 938 } else if (cs35l56_init(cs35l56)) { 939 goto err_unlock; 940 } 941 942 cs35l56->fw_patched = true; 943 944 err_unlock: 945 mutex_unlock(&cs35l56->irq_lock); 946 err: 947 pm_runtime_mark_last_busy(cs35l56->dev); 948 pm_runtime_put_autosuspend(cs35l56->dev); 949 950 /* Re-enable SoundWire interrupts */ 951 if (cs35l56->sdw_peripheral) { 952 cs35l56->sdw_irq_no_unmask = false; 953 sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_MASK_1, 954 CS35L56_SDW_INT_MASK_CODEC_IRQ); 955 } 956 957 complete: 958 complete_all(&cs35l56->dsp_ready_completion); 959 } 960 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests

2 2

[PATCH] ASoC: dt-bindings: adi,adau17x1: fix indentaion and example
by Krzysztof Kozlowski 17 Mar '23

17 Mar '23

Fix errors in binding indentation and example: adi,adau17x1.yaml:8:2: [warning] wrong indentation: expected 2 but found 1 (indentation) adi,adau17x1.example.dts:29.3-30.1 syntax error Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- Documentation/devicetree/bindings/sound/adi,adau17x1.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml b/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml index 45955f38b6fd..8ef1e7f6ec91 100644 --- a/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml +++ b/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml @@ -4,8 +4,7 @@ $id: http://devicetree.org/schemas/sound/adi,adau17x1.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: - Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781 Codec +title: Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781 Codec maintainers: - Lars-Peter Clausen <lars(a)metafoo.de> @@ -50,3 +49,4 @@ examples: clock-names = "mclk"; clocks = <&audio_clock>; }; + }; -- 2.34.1

1 1

[PATCH v2] ASoC: dt-bindings: adi,adau17x1: Convert to DT schema
by Vijaya Anand 17 Mar '23

17 Mar '23

Convert the binding document for adi,adau17x1 from txt to yaml so one could validate dt-entries correctly and any future additions can go into yaml format. Add address and size cells to example to prevent errors regarding reg format. Signed-off-by: Vijaya Anand <sunrockers8(a)gmail.com> Cc: Daniel Baluta <daniel.baluta(a)nxp.com> --- Changes since v1: - added 'Codec' in title to clarify type of devices - put compatible devices in lexographic order - changed description of clocks - changed 'unevaluatedProperties' to 'additionalProperties' - changed node names to be generic --- .../bindings/sound/adi,adau17x1.txt | 32 ------------ .../bindings/sound/adi,adau17x1.yaml | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+), 32 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.yaml diff --git a/Documentation/devicetree/bindings/sound/adi,adau17x1.txt b/Documentation/devicetree/bindings/sound/adi,adau17x1.txt deleted file mode 100644 index 1447dec28125..000000000000 --- a/Documentation/devicetree/bindings/sound/adi,adau17x1.txt +++ /dev/null @@ -1,32 +0,0 @@ -Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781 - -Required properties: - - - compatible: Should contain one of the following: - "adi,adau1361" - "adi,adau1461" - "adi,adau1761" - "adi,adau1961" - "adi,adau1381" - "adi,adau1781" - - - reg: The i2c address. Value depends on the state of ADDR0 - and ADDR1, as wired in hardware. - -Optional properties: - - clock-names: If provided must be "mclk". - - clocks: phandle + clock-specifiers for the clock that provides - the audio master clock for the device. - -Examples: -#include <dt-bindings/sound/adau17x1.h> - - i2c_bus { - adau1361@38 { - compatible = "adi,adau1761"; - reg = <0x38>; - - clock-names = "mclk"; - clocks = <&audio_clock>; - }; - }; diff --git a/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml b/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml new file mode 100644 index 000000000000..8ef1e7f6ec91 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/adi,adau17x1.yaml @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/adi,adau17x1.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: + Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781 Codec + +maintainers: + - Lars-Peter Clausen <lars(a)metafoo.de> + +properties: + compatible: + enum: + - adi,adau1361 + - adi,adau1381 + - adi,adau1461 + - adi,adau1761 + - adi,adau1781 + - adi,adau1961 + + reg: + maxItems: 1 + description: + The i2c address. Value depends on the state of ADDR0 and ADDR1, + as wired in hardware. + + clock-names: + const: mclk + + clocks: + items: + - description: provides the audio master clock for the device. + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + audio-codec@38 { + compatible = "adi,adau1761"; + reg = <0x38>; + clock-names = "mclk"; + clocks = <&audio_clock>; + }; + }; -- 2.37.1 (Apple Git-137.1)

4 7