From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2E02C282CE for ; Tue, 4 Jun 2019 09:12:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7480C24CB3 for ; Tue, 4 Jun 2019 09:12:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="XLsvONrF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727013AbfFDJML (ORCPT ); Tue, 4 Jun 2019 05:12:11 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:33645 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726877AbfFDJML (ORCPT ); Tue, 4 Jun 2019 05:12:11 -0400 Received: by mail-pl1-f194.google.com with SMTP id g21so8106435plq.0 for ; Tue, 04 Jun 2019 02:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PkvAy0HG/cZzH7p73LTDgLYGpVT1MehWvYFfFdnT2Fc=; b=XLsvONrFeGHoW3EfQRkoyPM7lWU3JuUCXY3/sd7tNiIwxHShI/cMEKKFLrma4d6TQ3 fpgQ+RtwMent0S3STZcQk5dhjKKKDFKirRchZ0nxX+tawmlWqJZMILnadviSRkJMxLth gfA6mrJ6r3qG+GBkDg9Yl9yjjJtsvmkyYNNqc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PkvAy0HG/cZzH7p73LTDgLYGpVT1MehWvYFfFdnT2Fc=; b=LWYbzuOnFeV1ypm0iHW8g6pvgJHpbAacXkpHTScCFT/TVqNmO1FeMhycWnztKNIDxU k1+I7vGXXKh15mlZvgLlatgaO+337EeKgqBA0gr/2pEUBhRmGnaBTov4EbqRrDJr+gcq g13gYhlMZaK/bF+Ht+kAAQaxrnSIH/eStxtrALJnYzj4v5un+qdzkxIUU6Pr3PmPgorS abmDcz0Ie6GYjTahFaVpcdzNbF2/gDMzCsvLyIgzgsUkmFnpjhiTYUJi8Q4DxBiNOEoq 7o6Oj3xGDsC59OevT37a0UKkMe9bGfYTxpISyG/v/ndc80fo8d9d+vgN+txVYfI86B+V +9HQ== X-Gm-Message-State: APjAAAXnFKHDkHH2pgeDFbkwJmzYsT51vZgS2gUIM9Ck34xhkma1Vdez RmBwbABTZXNTGSwttsPkU9CJZPyjeQs= X-Google-Smtp-Source: APXvYqxDyY0ozrmSHzomFvWje7xUaWGpFIWh42pUXi1Mg8hI3/M46iMnwG1Ys2iAiNUMGp3qdug8tg== X-Received: by 2002:a17:902:9f93:: with SMTP id g19mr20221589plq.223.1559639530118; Tue, 04 Jun 2019 02:12:10 -0700 (PDT) Received: from localhost ([2401:fa00:1:10:845f:e35d:e30c:4b47]) by smtp.gmail.com with ESMTPSA id x21sm773591pfi.91.2019.06.04.02.12.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 02:12:09 -0700 (PDT) From: Yu-Hsuan Hsu To: linux-kernel@vger.kernel.org Cc: Jaroslav Kysela , Takashi Iwai , Jon Hunter , Yu-Hsuan Hsu , Pierre-Louis Bossart , alsa-devel@alsa-project.org, Liam Girdwood , Mark Brown , dgreid@chromium.org, cychiang@chromium.org Subject: [PATCH v2] ASoC: max98090: remove 24-bit format support if RJ is 0 Date: Tue, 4 Jun 2019 17:11:50 +0800 Message-Id: <20190604091150.154384-1-yuhsuan@chromium.org> X-Mailer: git-send-email 2.22.0.rc1.311.g5d7573a151-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The supported formats are S16_LE and S24_LE now. However, by datasheet of max98090, S24_LE is only supported when it is in the right justified mode. We should remove 24-bit format if it is not in that mode to avoid triggering error. Signed-off-by: Yu-Hsuan Hsu --- sound/soc/codecs/max98090.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 7619ea31ab50..a6c2cb89767c 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -1909,6 +1909,21 @@ static int max98090_configure_dmic(struct max98090_priv *max98090, return 0; } +static int max98090_dai_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct snd_soc_component *component = codec_dai->component; + struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component); + unsigned int fmt = max98090->dai_fmt; + + /* Remove 24-bit format support if it is not in right justified mode. */ + if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) != SND_SOC_DAIFMT_RIGHT_J) { + runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE; + snd_pcm_hw_constraint_msbits(substream->runtime, 0, 16, 16); + } + return 0; +} + static int max98090_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -2316,6 +2331,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect); #define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE) static const struct snd_soc_dai_ops max98090_dai_ops = { + .startup = max98090_dai_startup, .set_sysclk = max98090_dai_set_sysclk, .set_fmt = max98090_dai_set_fmt, .set_tdm_slot = max98090_set_tdm_slot, -- 2.22.0.rc1.311.g5d7573a151-goog