From patchwork Sat Aug 12 11:00:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Code Kipper X-Patchwork-Id: 9897001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D55BD603F9 for ; Sat, 12 Aug 2017 11:04:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5A6128C7A for ; Sat, 12 Aug 2017 11:04:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA66728857; Sat, 12 Aug 2017 11:04:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2439E28AC1 for ; Sat, 12 Aug 2017 11:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1ATArN60q2Vac3cKiUsyGOoC1iCLnFxqDNLuByOLAdc=; b=MkJONSbjwd6Xb9FB6Wsne4B2Cr +FPUqx+TM8Pm1WbfYQsIBxaAGMOLYr5+cD8y5Oehhm8WxSGN91Bu/7LYGGE4xhyzQpvX3Sgf4Usqn Kda7RRa6z8lblCKKKG/5E1GT82bY6mlJVG1X/kyGLIK5mbiHJF08sS4F/3l2M2XudynTKxnMXbsH1 KePawlMXf8S6HInWoMDkg/tm/7m/D5cZgiFsBktZwfCLXf2qqkX+05UzoK6bq3iT3CYjTBVT5kB7T 2K0ayb5WbAvA4h/RtqVsTGVPWowIu5aeV8PDJ9jwI8Z6ZSpa4St1EdkAxDJaUwugPaiFXKh5taUp5 ExoLRV0A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dgUCh-0001GA-OE; Sat, 12 Aug 2017 11:03:39 +0000 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dgUAc-00086R-FB for linux-arm-kernel@lists.infradead.org; Sat, 12 Aug 2017 11:01:40 +0000 Received: by mail-lf0-x242.google.com with SMTP id y15so3706551lfd.5 for ; Sat, 12 Aug 2017 04:01: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; bh=mbowA+tt4zti2gKVVHcjIoqd0/s/dHBOLHuAvvWmsVg=; b=VLYoH8SGrHeNi8M+VXjt3ZTbfV7Pp6qJRvRvqA/A51U9XTKChvD55sAExAdg72TN1m RlMqxanhcM6sjDWUZHnWVCc1yc68ylN2LRPlrUWrwXN63tz0tBlAhRWt7LLlJYkrKj93 b4jFFmYWPSXr0eDk9VZA5y7VtELZnn8mm+lZoxOVMxpEuBVQqy13gpeXkcYQYAG4nvcj 40ZzpgyQ9Jw3g5ZKc6vzxc4BDCWAprxAbItoqqg3Oic+E6MOwRzG9uAlgn+aSvpGYRct fcAlahZc+X/B6sq2c5ucBuprGsBZS4o/SuKxFPj7prBFfUR1grJ76qaoHJzNAUYjjhNW N9fg== 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=mbowA+tt4zti2gKVVHcjIoqd0/s/dHBOLHuAvvWmsVg=; b=kUXCL/o/ONT/yvEzAR5gFrVnSGysS/nbj+gOnEyKkOyBcK9qBtpKGKr2Cm/I4S/csv bQs0YfZErXFsYnjn/LyJ+DIP8Jcj5ymoccC/LCfhL+hAm7jtUa+ZrJe0toVk4UbnoHty HOg8XH+/IFkAVb6jcGlkfqpU/Uf2g0zBg8hhH9pjRYdiqF1miKbI7SJ6HHOu08JmCJpM h3Rrgg2oEiWWWon4vEcA2asukxE8DgQCEZYSTk327A/1q7vSE2GNMizCry8Ig+Xu6gne uibnnx9vF+xiMdprHNq5YMVVus8T5LmahdogV3tM73WUOdcPMX16nywhzARvRmDKFx5v PMyw== X-Gm-Message-State: AHYfb5gI13fOXwydkC0qyRErz6XUdzCo96ebWoG4Z99ArU7zoHJuz+DL sxjP8GHSxYoXoQ== X-Received: by 10.46.82.9 with SMTP id g9mr6148297ljb.178.1502535671247; Sat, 12 Aug 2017 04:01:11 -0700 (PDT) Received: from localhost.localdomain (c80-217-9-219.bredband.comhem.se. [80.217.9.219]) by smtp.gmail.com with ESMTPSA id h22sm432402ljb.41.2017.08.12.04.01.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Aug 2017 04:01:10 -0700 (PDT) From: codekipper@gmail.com To: maxime.ripard@free-electrons.com Subject: [PATCH v3 05/11] ASoC: sun4i-i2s: Add regfields for word size select and sample resolution Date: Sat, 12 Aug 2017 13:00:53 +0200 Message-Id: <20170812110059.5115-6-codekipper@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170812110059.5115-1-codekipper@gmail.com> References: <20170812110059.5115-1-codekipper@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170812_040131_010605_7ADE547D X-CRM114-Status: GOOD ( 14.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Marcus Cooper , lgirdwood@gmail.com, linux-kernel@vger.kernel.org, be17068@iperbole.bo.it, linux-sunxi@googlegroups.com, broonie@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marcus Cooper On newer SoCs the location of the slot width select and sample resolution are different and also there is a bigger range of support. For the current supported rates then an offset is required. Signed-off-by: Marcus Cooper Reviewed-by: Chen-Yu Tsai --- sound/soc/sunxi/sun4i-i2s.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index a65dcb013247..482fe0c65c1f 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -98,6 +98,9 @@ * @sun4i_i2s_regmap: regmap config to use. * @mclk_offset: Value by which mclkdiv needs to be adjusted. * @bclk_offset: Value by which bclkdiv needs to be adjusted. + * @fmt_offset: Value by which wss and sr needs to be adjusted. + * @field_fmt_wss: regmap field to set word select size. + * @field_fmt_sr: regmap field to set sample resolution. * @field_txchanmap: location of the tx channel mapping register. * @field_rxchanmap: location of the rx channel mapping register. * @field_txchansel: location of the tx channel select bit fields. @@ -109,8 +112,11 @@ struct sun4i_i2s_quirks { const struct regmap_config *sun4i_i2s_regmap; unsigned int mclk_offset; unsigned int bclk_offset; + unsigned int fmt_offset; /* Register fields for i2s */ + struct reg_field field_fmt_wss; + struct reg_field field_fmt_sr; struct reg_field field_txchanmap; struct reg_field field_rxchanmap; struct reg_field field_txchansel; @@ -129,6 +135,8 @@ struct sun4i_i2s { struct snd_dmaengine_dai_dma_data playback_dma_data; /* Register fields for i2s */ + struct regmap_field *field_fmt_wss; + struct regmap_field *field_fmt_sr; struct regmap_field *field_txchanmap; struct regmap_field *field_rxchanmap; struct regmap_field *field_txchansel; @@ -314,9 +322,10 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG, - SUN4I_I2S_FMT0_WSS_MASK | SUN4I_I2S_FMT0_SR_MASK, - SUN4I_I2S_FMT0_WSS(wss) | SUN4I_I2S_FMT0_SR(sr)); + regmap_field_write(i2s->field_fmt_wss, + wss + i2s->variant->fmt_offset); + regmap_field_write(i2s->field_fmt_sr, + sr + i2s->variant->fmt_offset); return sun4i_i2s_set_clk_rate(i2s, params_rate(params), params_width(params)); @@ -701,6 +710,8 @@ static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = { .has_reset = false, .reg_offset_txdata = SUN4I_I2S_FIFO_TX_REG, .sun4i_i2s_regmap = &sun4i_i2s_regmap_config, + .field_fmt_wss = REG_FIELD(SUN4I_I2S_FMT0_REG, 2, 3), + .field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 5), .field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31), .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31), .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2), @@ -711,6 +722,8 @@ static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = { .has_reset = true, .reg_offset_txdata = SUN4I_I2S_FIFO_TX_REG, .sun4i_i2s_regmap = &sun4i_i2s_regmap_config, + .field_fmt_wss = REG_FIELD(SUN4I_I2S_FMT0_REG, 2, 3), + .field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 5), .field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31), .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31), .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2), @@ -748,6 +761,20 @@ static int sun4i_i2s_init_regmap_fields(struct device *dev, ret = PTR_ERR_OR_ZERO(i2s->field_rxchansel); } + if (!ret) { + i2s->field_fmt_wss = + devm_regmap_field_alloc(dev, i2s->regmap, + i2s->variant->field_fmt_wss); + ret = PTR_ERR_OR_ZERO(i2s->field_fmt_wss); + } + + if (!ret) { + i2s->field_fmt_sr = + devm_regmap_field_alloc(dev, i2s->regmap, + i2s->variant->field_fmt_sr); + ret = PTR_ERR_OR_ZERO(i2s->field_fmt_sr); + } + return ret; }