From patchwork Tue Sep 19 13:45:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 112985 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4937195qgf; Tue, 19 Sep 2017 06:46:41 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD6+mKw4ukQ3YgI7vR0shXv370KZPu4N3ygPwiBX5+jrh3Vajta7BJe2L6/r3dQuvifUy0S X-Received: by 10.223.148.165 with SMTP id 34mr1463194wrr.20.1505828801388; Tue, 19 Sep 2017 06:46:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505828801; cv=none; d=google.com; s=arc-20160816; b=BILnKSrtmGtFfurhZVN99F68513rFhH+bbI1h+g8qk3pJVx0Zd93rggh37vrNOjo0X YtFEVgmmXX0B9Sn56D6VM04mW/TAoOoaxCrfb+SO5PGGIAjGljFxsAgmg3sWTmtUqQK2 8rw8Pu6k97dHz3vznLeWetusti6bVz0vC69LPInur1eImolk8pzAV3Dmx1AQ3tYoc6Zn x5Ng0vMD2C7yt4rYwJ0lHGEdTtsAiHGik9up09/NVkn+D82RWKK/9SFqyg1kM+tUGvkQ edykjUtXf4JG3GLlxKofK1QuA9Tu2v1hBAWJ8CLmf8FRHm8uCTnGRg8qwTPUvQwSDSeY zn3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=BA9mhrDbjTiCqo0/qC4FMEIhRTq35BcChPdBw8vOsf0=; b=DPuz8XbifbB6qUL4qOqq+omZSbuWKpkTjDgjAZDnCf6yk3eyvcR4nwEEQrYUwBDhYn bD9q27uCsQHgR83orAJvNNuWky55HuqBbhunSGPtds5diLU5B/At3hqLdzBaOmwmxuFj W45kd9QM+CtEb3TsOlhMTSYSzo2cc0SJe65rvUa3ZIdoVIfg4hSeKgheG5G0uJUkhtmx q1GXpDSzRrqoq/XnAuP5i0j7y5LKzFq5wjWKz0EkMmYtJ8nfU8+LvTLx+KiLNnpm472s hPE1zWrVDb54a3Pf3HjApI+Gc099C60LiidyCmKxrGvotBIjfBL8eiOrMhC5kKkq3Vef 1hUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=QZgpspu+; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 88si7868837wrk.553.2017.09.19.06.46.41; Tue, 19 Sep 2017 06:46:41 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=QZgpspu+; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 21C35267398; Tue, 19 Sep 2017 15:45:53 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0028E267374; Tue, 19 Sep 2017 15:45:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_NEUTRAL autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id A999E26735F for ; Tue, 19 Sep 2017 15:45:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=b5G4XlCT5ifG6o61MARjEz6lX5LJfxsL2SvgeAjaKww=; b=QZgpspu+qegA G01ZlhdWe0N37vgKCwfQ3r8D9QCw57QlUk3/1GvlrUxXXLuPGh6KzNzXOek7A1pWvNq/0RnH81HVO qIt3MimrzaQvVTAXzamAUR4ocZ7E9nUYWTUNxbce0LPtBODCZB9djfEPYgWUWpb9JH8uHdDa/C1rC wD/GQ=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1duIqS-0001My-3c; Tue, 19 Sep 2017 13:45:48 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1duIqR-000862-Ls; Tue, 19 Sep 2017 14:45:47 +0100 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20170822203239.19891-4-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Tue, 19 Sep 2017 14:45:47 +0100 Cc: tiwai@suse.de, alsa-devel@alsa-project.org, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: Intel: cht_bsw_max98090: Fix I2S config + unused code" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: Intel: cht_bsw_max98090: Fix I2S config + unused code has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 948c5e192eaeef5bd8b479135ea83d1f97d78bb8 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 8 Sep 2017 00:13:04 -0500 Subject: [PATCH] ASoC: Intel: cht_bsw_max98090: Fix I2S config + unused code This driver probably never worked, the slots are configured for 2ch 16 bit and the SSP2 as 24 bits, the cpu_dai configured as LEFT_J and the codec_dai as I2S. Signed-off-by: Pierre-Louis Bossart Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.14.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 20755ecc7f9e..455a55af7ad2 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -160,7 +160,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, return ret; } - fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF + fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS; ret = snd_soc_dai_set_fmt(rtd->cpu_dai, fmt); @@ -173,8 +173,8 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, rate->min = rate->max = 48000; channels->min = channels->max = 2; - /* set SSP2 to 24-bit */ - params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); + /* set SSP2 to 16-bit */ + params_set_format(params, SNDRV_PCM_FORMAT_S16_LE); return 0; }