From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin <sashal@kernel.org>, steven.eckhoff.opensource@gmail.com, alsa-devel@alsa-project.org, Charles Keepax <ckeepax@opensource.cirrus.com>, tiwai@suse.com, lgirdwood@gmail.com, Mark Brown <broonie@kernel.org> Subject: [PATCH AUTOSEL 5.4 33/55] ASoC: tscs454: Add endianness flag in snd_soc_component_driver Date: Mon, 30 May 2022 09:46:39 -0400 [thread overview] Message-ID: <20220530134701.1935933-33-sashal@kernel.org> (raw) In-Reply-To: <20220530134701.1935933-1-sashal@kernel.org> From: Charles Keepax <ckeepax@opensource.cirrus.com> [ Upstream commit ff69ec96b87dccb3a29edef8cec5d4fefbbc2055 ] The endianness flag is used on the CODEC side to specify an ambivalence to endian, typically because it is lost over the hardware link. This device receives audio over an I2S DAI and as such should have endianness applied. A fixup is also required to use the width directly rather than relying on the format in hw_params, now both little and big endian would be supported. It is worth noting this changes the behaviour of S24_LE to use a word length of 24 rather than 32. This would appear to be a correction since the fact S24_LE is stored as 32 bits should not be presented over the bus. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220504170905.332415-26-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/soc/codecs/tscs454.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tscs454.c b/sound/soc/codecs/tscs454.c index c3587af9985c..3d981441b8d1 100644 --- a/sound/soc/codecs/tscs454.c +++ b/sound/soc/codecs/tscs454.c @@ -3128,18 +3128,17 @@ static int set_aif_sample_format(struct snd_soc_component *component, unsigned int width; int ret; - switch (format) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (snd_pcm_format_width(format)) { + case 16: width = FV_WL_16; break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: width = FV_WL_20; break; - case SNDRV_PCM_FORMAT_S24_3LE: + case 24: width = FV_WL_24; break; - case SNDRV_PCM_FORMAT_S24_LE: - case SNDRV_PCM_FORMAT_S32_LE: + case 32: width = FV_WL_32; break; default: @@ -3337,6 +3336,7 @@ static const struct snd_soc_component_driver soc_component_dev_tscs454 = { .num_dapm_routes = ARRAY_SIZE(tscs454_intercon), .controls = tscs454_snd_controls, .num_controls = ARRAY_SIZE(tscs454_snd_controls), + .endianness = 1, }; #define TSCS454_RATES SNDRV_PCM_RATE_8000_96000 -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Charles Keepax <ckeepax@opensource.cirrus.com>, Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>, steven.eckhoff.opensource@gmail.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 33/55] ASoC: tscs454: Add endianness flag in snd_soc_component_driver Date: Mon, 30 May 2022 09:46:39 -0400 [thread overview] Message-ID: <20220530134701.1935933-33-sashal@kernel.org> (raw) In-Reply-To: <20220530134701.1935933-1-sashal@kernel.org> From: Charles Keepax <ckeepax@opensource.cirrus.com> [ Upstream commit ff69ec96b87dccb3a29edef8cec5d4fefbbc2055 ] The endianness flag is used on the CODEC side to specify an ambivalence to endian, typically because it is lost over the hardware link. This device receives audio over an I2S DAI and as such should have endianness applied. A fixup is also required to use the width directly rather than relying on the format in hw_params, now both little and big endian would be supported. It is worth noting this changes the behaviour of S24_LE to use a word length of 24 rather than 32. This would appear to be a correction since the fact S24_LE is stored as 32 bits should not be presented over the bus. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220504170905.332415-26-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/soc/codecs/tscs454.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tscs454.c b/sound/soc/codecs/tscs454.c index c3587af9985c..3d981441b8d1 100644 --- a/sound/soc/codecs/tscs454.c +++ b/sound/soc/codecs/tscs454.c @@ -3128,18 +3128,17 @@ static int set_aif_sample_format(struct snd_soc_component *component, unsigned int width; int ret; - switch (format) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (snd_pcm_format_width(format)) { + case 16: width = FV_WL_16; break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: width = FV_WL_20; break; - case SNDRV_PCM_FORMAT_S24_3LE: + case 24: width = FV_WL_24; break; - case SNDRV_PCM_FORMAT_S24_LE: - case SNDRV_PCM_FORMAT_S32_LE: + case 32: width = FV_WL_32; break; default: @@ -3337,6 +3336,7 @@ static const struct snd_soc_component_driver soc_component_dev_tscs454 = { .num_dapm_routes = ARRAY_SIZE(tscs454_intercon), .controls = tscs454_snd_controls, .num_controls = ARRAY_SIZE(tscs454_snd_controls), + .endianness = 1, }; #define TSCS454_RATES SNDRV_PCM_RATE_8000_96000 -- 2.35.1
next prev parent reply other threads:[~2022-05-30 13:49 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-30 13:46 [PATCH AUTOSEL 5.4 01/55] drm/virtio: fix NULL pointer dereference in virtio_gpu_conn_get_modes Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 02/55] mwifiex: add mutex lock for call in mwifiex_dfs_chan_sw_work_queue Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 03/55] b43legacy: Fix assigning negative value to unsigned variable Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 04/55] b43: " Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 05/55] ipw2x00: Fix potential NULL dereference in libipw_xmit() Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 06/55] ipv6: fix locking issues with loops over idev->addr_list Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 07/55] fbcon: Consistently protect deferred_takeover with console_lock() Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 08/55] ACPICA: Avoid cache flush inside virtual machines Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 09/55] drm/komeda: return early if drm_universal_plane_init() fails Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 10/55] ALSA: jack: Access input_dev under mutex Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 11/55] spi: spi-rspi: Remove setting {src,dst}_{addr,addr_width} based on DMA direction Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 12/55] tools/power turbostat: fix ICX DRAM power numbers Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 13/55] drm/amd/pm: fix double free in si_parse_power_table() Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 14/55] ath9k: fix QCA9561 PA bias level Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 15/55] media: venus: hfi: avoid null dereference in deinit Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 16/55] media: pci: cx23885: Fix the error handling in cx23885_initdev() Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 17/55] media: cx25821: Fix the warning when removing the module Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 18/55] md/bitmap: don't set sb values if can't pass sanity check Sasha Levin 2022-06-01 21:36 ` John Stoffel 2022-06-05 13:27 ` Sasha Levin 2022-06-05 14:01 ` John Stoffel 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 19/55] mmc: jz4740: Apply DMA engine limits to maximum segment size Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 20/55] drm/sun4i: Add support for D1 TCONs Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 21/55] scsi: megaraid: Fix error check return value of register_chrdev() Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 22/55] arm64/sme: Add ID_AA64SMFR0_EL1 to __read_sysreg_by_encoding() Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 23/55] drm/plane: Move range check for format_count earlier Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 24/55] drm/amd/pm: fix the compile warning Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 25/55] arm64: compat: Do not treat syscall number as ESR_ELx for a bad syscall Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 26/55] drm: msm: fix error check return value of irq_of_parse_and_map() Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 27/55] ipv6: Don't send rs packets to the interface of ARPHRD_TUNNEL Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 28/55] net/mlx5: fs, delete the FTE when there are no rules attached to it Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 29/55] ASoC: dapm: Don't fold register value changes into notifications Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 30/55] mlxsw: spectrum_dcb: Do not warn about priority changes Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 31/55] drm/amdgpu/ucode: Remove firmware load type check in amdgpu_ucode_free_bo Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 32/55] HID: bigben: fix slab-out-of-bounds Write in bigben_probe Sasha Levin 2022-05-30 13:46 ` Sasha Levin [this message] 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 33/55] ASoC: tscs454: Add endianness flag in snd_soc_component_driver Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 34/55] net: remove two BUG() from skb_checksum_help() Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 35/55] s390/preempt: disable __preempt_count_add() optimization for PROFILE_ALL_BRANCHES Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 36/55] spi: stm32-qspi: Fix wait_cmd timeout in APM mode Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 37/55] dma-debug: change allocation mode from GFP_NOWAIT to GFP_ATIOMIC Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 38/55] ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 39/55] ipmi:ssif: Check for NULL msg when handling events and messages Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 40/55] ipmi: Fix pr_fmt to avoid compilation issues Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 41/55] rtlwifi: Use pr_warn instead of WARN_ONCE Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 42/55] media: coda: limit frame interval enumeration to supported encoder frame sizes Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 43/55] media: cec-adap.c: fix is_configuring state Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 44/55] openrisc: start CPU timer early in boot Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 45/55] nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 46/55] ASoC: rt5645: Fix errorenous cleanup order Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 47/55] nbd: Fix hung on disconnect request if socket is closed before Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 48/55] net: phy: micrel: Allow probing without .driver_data Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 49/55] media: exynos4-is: Fix compile warning Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 50/55] ASoC: max98357a: remove dependency on GPIOLIB Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 51/55] ARM: 9201/1: spectre-bhb: rely on linker to emit cross-section literal loads Sasha Levin 2022-05-30 13:46 ` Sasha Levin 2022-05-30 13:52 ` Ard Biesheuvel 2022-05-30 13:52 ` Ard Biesheuvel 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 52/55] hwmon: Make chip parameter for with_info API mandatory Sasha Levin 2022-05-30 14:29 ` Guenter Roeck 2022-05-30 13:46 ` [PATCH AUTOSEL 5.4 53/55] rxrpc: Return an error to sendmsg if call failed Sasha Levin 2022-05-30 13:47 ` [PATCH AUTOSEL 5.4 54/55] eth: tg3: silence the GCC 12 array-bounds warning Sasha Levin 2022-05-30 13:47 ` [PATCH AUTOSEL 5.4 55/55] selftests/bpf: fix btf_dump/btf_dump due to recent clang change Sasha Levin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220530134701.1935933-33-sashal@kernel.org \ --to=sashal@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=ckeepax@opensource.cirrus.com \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=stable@vger.kernel.org \ --cc=steven.eckhoff.opensource@gmail.com \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.