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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 37D0CC43463 for ; Sun, 20 Sep 2020 18:08:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2D9C207EA for ; Sun, 20 Sep 2020 18:08:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QFSnlyxo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbgITSIX (ORCPT ); Sun, 20 Sep 2020 14:08:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726392AbgITSIN (ORCPT ); Sun, 20 Sep 2020 14:08:13 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEB60C0613CF; Sun, 20 Sep 2020 11:08:12 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id a9so10343677wmm.2; Sun, 20 Sep 2020 11:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=51B2jgI3bIHgfxjPvcPjrMNGsbUxZmYa6XvJWzsGsIQ=; b=QFSnlyxo/BfaH6nGwNsyBOoNJJPkVC6KB4pYE9ln1WStuM68Y/Zgl835QNGA5hvkb3 wX3kQNze2x9xqbnTNX1OPyRxPEaVlYhKemqwLGDnty6CTE6jPDymYeRMWzRRT6XTr9zr aZh/Oz68hJCuUMYWDpT6x33/7smLG48wgdLIo19ZvBCUnaBbWf9WE9A6Bo0i/N01fUY2 56acwaA6VTX9X8XJ4C5C4IAbtsH2OKu3YpJMgJrhZ/o+FE41kSFzq8Iq/ol05ZxnGqRD 9LTgDTKmxqjwg7Xj3kAXmc4TOTnGTtgSjl2i0CO1i32ouybBW17v9YphPUk2IKe9QrA8 OhmQ== 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:mime-version:content-transfer-encoding; bh=51B2jgI3bIHgfxjPvcPjrMNGsbUxZmYa6XvJWzsGsIQ=; b=iUaHsIcKJj2mdMIG3TQXjfnyCXj7WtWET8TdaQSLzt3DrNTgmz/QcbS8oLTAVwIsl+ qDCF7oMalP45bpi2v6SnpZrT7zB8TkXmo5xUWaqgkMSA+tVw/LRZw8W9n4O0CTGc+lp6 sHnGzzRNsyvyTIFy8niFpxV2OXSxeLBKdgvIeZmnMAIhvwyOHPNYRoEEl2PXHyUHzAju t3dW+783A3cgKRAdbWnPpE0Bt2Sov6+cG5kFIO/0YYMKfI7zFAFcsZJOQBwNiPkwXlJM BzumKkwFDk2WfrH4lgPoIUjqpdSg0BkN8G9PPG8zbj8SRJZqAJjSY8U7G/sIwGlT8Le+ i1uA== X-Gm-Message-State: AOAM530qp0iEPJm+CxBnEf8SVOa+A8G/XB/pDDvmyQiwMawM0qTxL+eq dQTY5g65GcnVSdtIl/T2kPo= X-Google-Smtp-Source: ABdhPJxLTAqnrKH83UX+0zEXiX9MEMj+lyBH2GQJTV8GInqcH9Tjm7nAU0fXa7iu3uJJ+a8yX97ZFQ== X-Received: by 2002:a1c:2c85:: with SMTP id s127mr27265752wms.31.1600625291490; Sun, 20 Sep 2020 11:08:11 -0700 (PDT) Received: from clement-Latitude-7490.numericable.fr (213-245-241-245.rev.numericable.fr. [213.245.241.245]) by smtp.gmail.com with ESMTPSA id 18sm15142782wmj.28.2020.09.20.11.08.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2020 11:08:10 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Cc: Jaroslav Kysela , Takashi Iwai , Marcus Cooper , Jernej Skrabec , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v3 04/19] ASoC: sun4i-i2s: Set sign extend sample Date: Sun, 20 Sep 2020 20:07:43 +0200 Message-Id: <20200920180758.592217-5-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200920180758.592217-1-peron.clem@gmail.com> References: <20200920180758.592217-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marcus Cooper On the newer SoCs such as the H3 and A64 this is set by default to transfer a 0 after each sample in each slot. However the A10 and A20 SoCs that this driver was developed on had a default setting where it padded the audio gain with zeros. This isn't a problem while we have only support for 16bit audio but with larger sample resolution rates in the pipeline then SEXT bits should be cleared so that they also pad at the LSB. Without this the audio gets distorted. Set sign extend sample for all the sunxi generations even if they are not affected. This will keep consistency and avoid relying on default. Signed-off-by: Marcus Cooper Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 246d4a45edae..57a68222f99a 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -48,6 +48,9 @@ #define SUN4I_I2S_FMT0_FMT_I2S (0 << 0) #define SUN4I_I2S_FMT1_REG 0x08 +#define SUN4I_I2S_FMT1_REG_SEXT_MASK BIT(8) +#define SUN4I_I2S_FMT1_REG_SEXT(sext) ((sext) << 8) + #define SUN4I_I2S_FIFO_TX_REG 0x0c #define SUN4I_I2S_FIFO_RX_REG 0x10 @@ -105,6 +108,9 @@ #define SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED (1 << 7) #define SUN8I_I2S_FMT0_BCLK_POLARITY_NORMAL (0 << 7) +#define SUN8I_I2S_FMT1_REG_SEXT_MASK GENMASK(5, 4) +#define SUN8I_I2S_FMT1_REG_SEXT(sext) ((sext) << 4) + #define SUN8I_I2S_INT_STA_REG 0x0c #define SUN8I_I2S_FIFO_TX_REG 0x20 @@ -656,6 +662,7 @@ static int sun4i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, } regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, SUN4I_I2S_CTRL_MODE_MASK, val); + return 0; } @@ -758,6 +765,11 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT, val); + /* Set sign extension to pad out LSB with 0 */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT1_REG, + SUN8I_I2S_FMT1_REG_SEXT_MASK, + SUN8I_I2S_FMT1_REG_SEXT(0)); + return 0; } @@ -854,6 +866,11 @@ static int sun50i_h6_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT, val); + /* Set sign extension to pad out LSB with 0 */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT1_REG, + SUN8I_I2S_FMT1_REG_SEXT_MASK, + SUN8I_I2S_FMT1_REG_SEXT(0)); + return 0; } -- 2.25.1