lkml.org 
[lkml]   [2020]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/25] ASoC: sun8i-codec: Enable all supported PCM formats
    Date
    Now that the DAI clock setup is correct for all hardware-supported PCM
    formats, we can enable them in the driver. With the appropriate support
    in the CPU DAI driver, this allows userspace to access the additional
    formats.

    Since this codec is connected to the CPU via a DAI, not directly, we do
    not care if the CPU DAI is using 3-byte or 4-byte formats, so we can
    support them both.

    Signed-off-by: Samuel Holland <samuel@sholland.org>
    ---
    sound/soc/sunxi/sun8i-codec.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
    index d8ce84533ddb..032a3f714dbb 100644
    --- a/sound/soc/sunxi/sun8i-codec.c
    +++ b/sound/soc/sunxi/sun8i-codec.c
    @@ -91,16 +91,23 @@
    #define SUN8I_AIF1CLK_CTRL_AIF1_CLK_INV_MASK GENMASK(14, 13)
    #define SUN8I_AIF1CLK_CTRL_AIF1_BCLK_DIV_MASK GENMASK(12, 9)
    #define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_DIV_MASK GENMASK(8, 6)
    #define SUN8I_AIF1CLK_CTRL_AIF1_WORD_SIZ_MASK GENMASK(5, 4)
    #define SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT_MASK GENMASK(3, 2)

    #define SUN8I_CODEC_PASSTHROUGH_SAMPLE_RATE 48000

    +#define SUN8I_CODEC_PCM_FORMATS (SNDRV_PCM_FMTBIT_S8 |\
    + SNDRV_PCM_FMTBIT_S16_LE |\
    + SNDRV_PCM_FMTBIT_S20_LE |\
    + SNDRV_PCM_FMTBIT_S24_LE |\
    + SNDRV_PCM_FMTBIT_S20_3LE|\
    + SNDRV_PCM_FMTBIT_S24_3LE)
    +
    #define SUN8I_CODEC_PCM_RATES (SNDRV_PCM_RATE_8000_48000|\
    SNDRV_PCM_RATE_88200 |\
    SNDRV_PCM_RATE_96000 |\
    SNDRV_PCM_RATE_176400 |\
    SNDRV_PCM_RATE_192000 |\
    SNDRV_PCM_RATE_KNOT)

    enum {
    @@ -531,26 +538,26 @@ static struct snd_soc_dai_driver sun8i_codec_dais[] = {
    .id = AIF1,
    .ops = &sun8i_codec_dai_ops,
    /* capture capabilities */
    .capture = {
    .stream_name = "AIF1 Capture",
    .channels_min = 1,
    .channels_max = 2,
    .rates = SUN8I_CODEC_PCM_RATES,
    - .formats = SNDRV_PCM_FMTBIT_S16_LE,
    + .formats = SUN8I_CODEC_PCM_FORMATS,
    .sig_bits = 24,
    },
    /* playback capabilities */
    .playback = {
    .stream_name = "AIF1 Playback",
    .channels_min = 1,
    .channels_max = 2,
    .rates = SUN8I_CODEC_PCM_RATES,
    - .formats = SNDRV_PCM_FMTBIT_S16_LE,
    + .formats = SUN8I_CODEC_PCM_FORMATS,
    },
    .symmetric_rates = true,
    .symmetric_channels = true,
    .symmetric_samplebits = true,
    },
    };

    static int sun8i_codec_aif_event(struct snd_soc_dapm_widget *w,
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-10-01 04:12    [W:6.220 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site