From patchwork Thu Nov 28 16:49:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 180447 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp373508ile; Thu, 28 Nov 2019 08:50:28 -0800 (PST) X-Google-Smtp-Source: APXvYqwh/uqAIjmVrbb4X8GHqkcF3FJNx+Se1o2KJ2k5u5eK4W4UgjXBV5B9UWfVMo+rxfCyet4Q X-Received: by 2002:a17:906:131a:: with SMTP id w26mr7472610ejb.47.1574959828293; Thu, 28 Nov 2019 08:50:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574959828; cv=none; d=google.com; s=arc-20160816; b=XsW4BS/YjRkdYXO6q6lsFvB/p70wFarCxRyiVBSjOqB3yKirFjWEcFNfJe0HVM4Iem rao+vXS8gQpghJ4QqBHxg+Nq/yz95nbL+JjntP8wdYLV2c/kACfN/vNxQlLl23Ov1qPG vwGoe0ep9hXpKdwRhZVopOZfsv3w72H+SamXK612DC9q+U3iNwQyPG8UsBqjOMtz4Grw 6Th4DKT6F9tKA3r5FsKMk17XNnQiaHKe5MJceMIHsbBZRtKrLsVBSluvOF86VjlQ9q6U D/dIatfDWnTtyKuzxvTwpvlfLurxWQEWhY7lr1QbfMTl0uSiNPTbVK5v9EzI8tPXztaa /INQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=zVs3SHcLVbqKmpq6Nb4lGHjdKCb+EPD/oEdMc3bO/jg=; b=CMf2/hTAkCNd2kduPvEtLbwFkMfABnbofE+/E6ttD3Zslr/wGb3/+BRyCWehAryxzQ Tn97Vpvx7JvVfGTcMIo5RvYJhGs+JrvLaUIaDTLwllZHQKDng+OaKxgdy5gzRxKWFm9E 7RsDBjo9l64UZQWDp7dln9eyE3Mi6yGLxeEMlZ7cs+yD7me9fBEx6wR2re1lxH4OAMvs jojb+4SPaQ60o65sqpHNpOq5EWPtn4TX9CDWubQMW/TdsyK1AVX382Z6L4BNoAoa2zjQ 2HhnNv08TTMN5x+TmkuumgZkq2m/cZQDRlucAfBvtH8AYxzh51TP+A6lOI1wsoG1R+J9 dqKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l5Gr5Qjd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g12si1365292edf.14.2019.11.28.08.50.27; Thu, 28 Nov 2019 08:50:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l5Gr5Qjd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726622AbfK1QuY (ORCPT + 27 others); Thu, 28 Nov 2019 11:50:24 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:43174 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbfK1QuT (ORCPT ); Thu, 28 Nov 2019 11:50:19 -0500 Received: by mail-pj1-f65.google.com with SMTP id a10so12094680pju.10 for ; Thu, 28 Nov 2019 08:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zVs3SHcLVbqKmpq6Nb4lGHjdKCb+EPD/oEdMc3bO/jg=; b=l5Gr5Qjd9pVo0HxGFV6G8A0yjVBGoSZqzaCCL7mejIdkqCP3emkRfKj8vLMjNdrpI5 bvYK/b71kLhhQVKEZiOQWGEt7vBsj8dzHZ4K6L1XdXY/KtWmYN0JevpFOi7pDPo80nKm XUlORXTdlW4bLLGIlr0oIyukod20PdmH18UUtPTZCj6rCyxonWYBR4EL+oIhrfooYI2G 9cNOxHLh8rbhaCK5Ek1WiqhGaSM7g9KLuIuUeWE4xtOiN8xNKP0PgNzKpMklVjQJV15q g49ojWGv2xVRuHFFcgdRV5TslE85XMW6WJzfxKEMOl5c1eKidIUWEnBJOB1YP5/VeAuJ WEwA== 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:in-reply-to :references; bh=zVs3SHcLVbqKmpq6Nb4lGHjdKCb+EPD/oEdMc3bO/jg=; b=PPvkvRDG4ejENDgefK3j++P3Z95p0ULQ1KaPdX/zKDx3FI81vpH4yn4KZ3f4mQR2Pm X30F3QK39X1c+/R+ueslfHMdwCLJZKnJGpQTBjwbxRnEDuKBFT669M7REcCe5fA4OpoH aUdHommVW5M0Mlo05wn080mVjL1ajg87S/ZxwkW3DrNyUSQMv0NvwTtgRdS3dtvlBgle l2sQwNSs5kYcxCxSHyoHKkGCuNzcn/4JqzBmuj1ZRebsAalnfvGFxpqZ1CqhsLRMjQBC P/ug9LM3X+oVC5cvJBI/6ni5Ym/u68djzJ2Y2clglZXFR2jUTwf4sfSg5JTAR4xelP7f wEjg== X-Gm-Message-State: APjAAAXpOV2/EdULqH/GrdOVCPtq7HvMbsUzX5xR8Eo5PzPdmd4uSHy+ ERd6giEieP9lKCgecne/itguSA== X-Received: by 2002:a17:902:8bc8:: with SMTP id r8mr10661273plo.189.1574959817142; Thu, 28 Nov 2019 08:50:17 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id a15sm2450343pfh.169.2019.11.28.08.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 08:50:16 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19][PATCH 14/17] ASoC: stm32: i2s: fix 16 bit format support Date: Thu, 28 Nov 2019 09:49:59 -0700 Message-Id: <20191128165002.6234-15-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191128165002.6234-1-mathieu.poirier@linaro.org> References: <20191128165002.6234-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Olivier Moysan commit 0c4c68d6fa1bae74d450e50823c24fcc3cd0b171 upstream I2S supports 16 bits data in 32 channel length. However the expected driver behavior, is to set channel length to 16 bits when data format is 16 bits. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown Cc: stable # 4.19 Signed-off-by: Mathieu Poirier --- sound/soc/stm/stm32_i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 449bb7049a28..004d83091505 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -501,7 +501,7 @@ static int stm32_i2s_configure(struct snd_soc_dai *cpu_dai, switch (format) { case 16: cfgr = I2S_CGFR_DATLEN_SET(I2S_I2SMOD_DATLEN_16); - cfgr_mask = I2S_CGFR_DATLEN_MASK; + cfgr_mask = I2S_CGFR_DATLEN_MASK | I2S_CGFR_CHLEN; break; case 32: cfgr = I2S_CGFR_DATLEN_SET(I2S_I2SMOD_DATLEN_32) |