]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: pcm3168a: Allow reconfiguration of tdm_slots and slot_width
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Mon, 12 Aug 2019 09:52:26 +0000 (12:52 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 12 Aug 2019 13:08:36 +0000 (14:08 +0100)
When using right_j format and the codec is slave it can support 16bit
format, but only if slot_width == 16, in the same DAI mode the 24 bit
audio can work with 24 or 32 slot_width.

Because of this, the codec and CPU needs to be reconfigured when the sample
format changes.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20190812095226.18870-3-peter.ujfalusi@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/pcm3168a.c

index 75fa8e9ee894d57d8ba1cf79c1b223119bc99c51..50ed86d45c26fd390feb5f11ec2044288cfeb7ad 100644 (file)
@@ -402,18 +402,6 @@ static int pcm3168a_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                return -EINVAL;
        }
 
-       if (io_params->tdm_slots && io_params->tdm_slots != slots) {
-               dev_err(component->dev, "Not matching slots %d vs %d\n",
-                       io_params->tdm_slots, slots);
-               return -EINVAL;
-       }
-
-       if (io_params->slot_width && io_params->slot_width != slot_width) {
-               dev_err(component->dev, "Not matching slot_width %d vs %d\n",
-                       io_params->slot_width, slot_width);
-               return -EINVAL;
-       }
-
        io_params->tdm_slots = slots;
        io_params->slot_width = slot_width;
        /* Ignore the not relevant mask for the DAI/direction */