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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,FROM_EXCESS_BASE64,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 B2671C0650F for ; Wed, 14 Aug 2019 07:57:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 864A2205C9 for ; Wed, 14 Aug 2019 07:57:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sTJKvS20" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 864A2205C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siol.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=TWayNADYhuOhSKkCqhH/x2J+b1nxhuNZtMpUfDfWSbc=; b=sTJKvS20Sy7q71 P6EpwhQR+NhGUyafVL8XKFVLC122h+8Hp5WQ7iZjBnmnCeEZkLqF88/JsonLAjbLFf7qJXzG/C/gn ksr1rgmeYLA8pH0BaNswIH5vEuQfnqXxH6VL2cuSxpFhfFtYcct8x3oOftq9c6OXK1QsA1YAXpOcN 2w2Nna8zFGvR7kSyE7YgBeuHjATM3zGuyEGIgZBmy0xC6DN2bzcFcEQX1Lz97u9sPYQ5lp6cg3b6e E/n1coRw0aVwuO8IXIkhfOAMYcmVy5LbgTnzpB4R6OkH1SmqN16sc065zxGdR3vvl6/HtjzdG6uH8 sE8icY+x/Rp1llYKsdxw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxo9p-0007Uc-JA; Wed, 14 Aug 2019 07:57:21 +0000 Received: from mailoutvs34.siol.net ([185.57.226.225] helo=mail.siol.net) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxo9l-0007TR-EQ for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2019 07:57:19 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTP id 7965752410F; Wed, 14 Aug 2019 09:57:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at psrvmta10.zcs-production.pri Received: from mail.siol.net ([127.0.0.1]) by localhost (psrvmta10.zcs-production.pri [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id bAnz3fg4eXxG; Wed, 14 Aug 2019 09:57:05 +0200 (CEST) Received: from mail.siol.net (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTPS id C9244524113; Wed, 14 Aug 2019 09:57:05 +0200 (CEST) Received: from jernej-laptop.localnet (89-212-178-211.dynamic.t-2.net [89.212.178.211]) (Authenticated sender: jernej.skrabec@siol.net) by mail.siol.net (Postfix) with ESMTPA id 6A438524109; Wed, 14 Aug 2019 09:57:03 +0200 (CEST) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: codekipper@gmail.com Subject: Re: [PATCH v5 11/15] ASoC: sun4i-i2s: Add support for H6 I2S Date: Wed, 14 Aug 2019 09:57:02 +0200 Message-ID: <13079463.kjevBeenX1@jernej-laptop> In-Reply-To: <20190814060854.26345-12-codekipper@gmail.com> References: <20190814060854.26345-1-codekipper@gmail.com> <20190814060854.26345-12-codekipper@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190814_005717_649391_A55EF511 X-CRM114-Status: GOOD ( 14.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, wens@csie.org, lgirdwood@gmail.com, be17068@iperbole.bo.it, linux-sunxi@googlegroups.com, broonie@kernel.org, maxime.ripard@free-electrons.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi! Dne sreda, 14. avgust 2019 ob 08:08:50 CEST je codekipper@gmail.com napisal(a): > From: Jernej Skrabec > > H6 I2S is very similar to that in H3, except it supports up to 16 > channels. > > Signed-off-by: Jernej Skrabec Your Signed-off-by is missing here and on all other patches made originally by me. Best regards, Jernej > --- > sound/soc/sunxi/sun4i-i2s.c | 148 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 148 insertions(+) > > diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c > index 6de3cb41aaf6..a8d98696fe7c 100644 > --- a/sound/soc/sunxi/sun4i-i2s.c > +++ b/sound/soc/sunxi/sun4i-i2s.c > @@ -121,6 +121,21 @@ > #define SUN8I_I2S_RX_CHAN_SEL_REG 0x54 > #define SUN8I_I2S_RX_CHAN_MAP_REG 0x58 > > +/* Defines required for sun50i-h6 support */ > +#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK GENMASK(21, 20) > +#define SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset) ((offset) << 20) > +#define SUN50I_H6_I2S_TX_CHAN_SEL_MASK GENMASK(19, 16) > +#define SUN50I_H6_I2S_TX_CHAN_SEL(chan) ((chan - 1) << 16) > +#define SUN50I_H6_I2S_TX_CHAN_EN_MASK GENMASK(15, 0) > +#define SUN50I_H6_I2S_TX_CHAN_EN(num_chan) (((1 << num_chan) - 1)) > + > +#define SUN50I_H6_I2S_TX_CHAN_MAP0_REG 0x44 > +#define SUN50I_H6_I2S_TX_CHAN_MAP1_REG 0x48 > + > +#define SUN50I_H6_I2S_RX_CHAN_SEL_REG 0x64 > +#define SUN50I_H6_I2S_RX_CHAN_MAP0_REG 0x68 > +#define SUN50I_H6_I2S_RX_CHAN_MAP1_REG 0x6C > + > struct sun4i_i2s; > > /** > @@ -440,6 +455,25 @@ static void sun8i_i2s_set_rxchanoffset(const struct > sun4i_i2s *i2s) SUN8I_I2S_TX_CHAN_OFFSET(i2s->offset)); > } > > +static void sun50i_h6_i2s_set_txchanoffset(const struct sun4i_i2s *i2s, int > output) +{ > + if (output >= 0 && output < 4) { > + regmap_update_bits(i2s->regmap, > + SUN8I_I2S_TX_CHAN_SEL_REG + (output * 4), > + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK, > + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(i2s->offset)); > + } > + > +} > + > +static void sun50i_h6_i2s_set_rxchanoffset(const struct sun4i_i2s *i2s) > +{ > + regmap_update_bits(i2s->regmap, > + SUN50I_H6_I2S_RX_CHAN_SEL_REG, > + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK, > + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(i2s- >offset)); > +} > + > static void sun8i_i2s_set_txchanen(const struct sun4i_i2s *i2s, int output, > int channel) > { > @@ -459,6 +493,26 @@ static void sun8i_i2s_set_rxchanen(const struct > sun4i_i2s *i2s, int channel) SUN8I_I2S_TX_CHAN_EN(channel)); > } > > + > +static void sun50i_h6_i2s_set_txchanen(const struct sun4i_i2s *i2s, int > output, + int channel) > +{ > + if (output >= 0 && output < 4) { > + regmap_update_bits(i2s->regmap, > + SUN8I_I2S_TX_CHAN_SEL_REG + (output * 4), > + SUN50I_H6_I2S_TX_CHAN_EN_MASK, > + SUN50I_H6_I2S_TX_CHAN_EN(channel)); > + } > +} > + > +static void sun50i_h6_i2s_set_rxchanen(const struct sun4i_i2s *i2s, int > channel) +{ > + regmap_update_bits(i2s->regmap, > + SUN50I_H6_I2S_RX_CHAN_SEL_REG, > + SUN50I_H6_I2S_TX_CHAN_EN_MASK, > + SUN50I_H6_I2S_TX_CHAN_EN(channel)); > +} > + > static void sun4i_i2s_set_txchansel(const struct sun4i_i2s *i2s, int > output, int channel) > { > @@ -495,6 +549,25 @@ static void sun8i_i2s_set_rxchansel(const struct > sun4i_i2s *i2s, int channel) SUN8I_I2S_TX_CHAN_SEL(channel)); > } > > +static void sun50i_h6_i2s_set_txchansel(const struct sun4i_i2s *i2s, int > output, + int channel) > +{ > + if (output >= 0 && output < 4) { > + regmap_update_bits(i2s->regmap, > + SUN8I_I2S_TX_CHAN_SEL_REG + (output * 4), > + SUN50I_H6_I2S_TX_CHAN_SEL_MASK, > + SUN50I_H6_I2S_TX_CHAN_SEL(channel)); > + } > +} > + > +static void sun50i_h6_i2s_set_rxchansel(const struct sun4i_i2s *i2s, int > channel) +{ > + regmap_update_bits(i2s->regmap, > + SUN50I_H6_I2S_RX_CHAN_SEL_REG, > + SUN50I_H6_I2S_TX_CHAN_SEL_MASK, > + SUN50I_H6_I2S_TX_CHAN_SEL(channel)); > +} > + > static void sun4i_i2s_set_txchanmap(const struct sun4i_i2s *i2s, int > output, int channel) > { > @@ -520,6 +593,20 @@ static void sun8i_i2s_set_rxchanmap(const struct > sun4i_i2s *i2s, int channel) regmap_write(i2s->regmap, > SUN8I_I2S_RX_CHAN_MAP_REG, channel); > } > > +static void sun50i_h6_i2s_set_txchanmap(const struct sun4i_i2s *i2s, int > output, + int channel) > +{ > + if (output >= 0 && output < 4) { > + regmap_write(i2s->regmap, > + SUN50I_H6_I2S_TX_CHAN_MAP1_REG + (output * 8), channel); > + } > +} > + > +static void sun50i_h6_i2s_set_rxchanmap(const struct sun4i_i2s *i2s, int > channel) +{ > + regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, channel); > +} > + > static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params, > struct snd_soc_dai *dai) > @@ -996,6 +1083,22 @@ static const struct reg_default > sun8i_i2s_reg_defaults[] = { { SUN8I_I2S_RX_CHAN_MAP_REG, 0x00000000 }, > }; > > +static const struct reg_default sun50i_i2s_reg_defaults[] = { > + { SUN4I_I2S_CTRL_REG, 0x00060000 }, > + { SUN4I_I2S_FMT0_REG, 0x00000033 }, > + { SUN4I_I2S_FMT1_REG, 0x00000030 }, > + { SUN4I_I2S_FIFO_CTRL_REG, 0x000400f0 }, > + { SUN4I_I2S_DMA_INT_CTRL_REG, 0x00000000 }, > + { SUN4I_I2S_CLK_DIV_REG, 0x00000000 }, > + { SUN8I_I2S_CHAN_CFG_REG, 0x00000000 }, > + { SUN8I_I2S_TX_CHAN_SEL_REG, 0x00000000 }, > + { SUN50I_H6_I2S_TX_CHAN_MAP0_REG, 0x00000000 }, > + { SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x00000000 }, > + { SUN50I_H6_I2S_RX_CHAN_SEL_REG, 0x00000000 }, > + { SUN50I_H6_I2S_RX_CHAN_MAP0_REG, 0x00000000 }, > + { SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x00000000 }, > +}; > + > static const struct regmap_config sun4i_i2s_regmap_config = { > .reg_bits = 32, > .reg_stride = 4, > @@ -1023,6 +1126,19 @@ static const struct regmap_config > sun8i_i2s_regmap_config = { .volatile_reg = sun8i_i2s_volatile_reg, > }; > > +static const struct regmap_config sun50i_i2s_regmap_config = { > + .reg_bits = 32, > + .reg_stride = 4, > + .val_bits = 32, > + .max_register = SUN50I_H6_I2S_RX_CHAN_MAP1_REG, > + .cache_type = REGCACHE_FLAT, > + .reg_defaults = sun50i_i2s_reg_defaults, > + .num_reg_defaults = ARRAY_SIZE(sun50i_i2s_reg_defaults), > + .writeable_reg = sun4i_i2s_wr_reg, > + .readable_reg = sun8i_i2s_rd_reg, > + .volatile_reg = sun8i_i2s_volatile_reg, > +}; > + > static int sun4i_i2s_runtime_resume(struct device *dev) > { > struct sun4i_i2s *i2s = dev_get_drvdata(dev); > @@ -1197,6 +1313,34 @@ static const struct sun4i_i2s_quirks > sun50i_a64_codec_i2s_quirks = { .set_rxchanmap = sun4i_i2s_set_rxchanmap, > }; > > +static const struct sun4i_i2s_quirks sun50i_h6_i2s_quirks = { > + .has_reset = true, > + .reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG, > + .sun4i_i2s_regmap = &sun50i_i2s_regmap_config, > + .has_fmt_set_lrck_period = true, > + .has_chcfg = true, > + .has_chsel_tx_chen = true, > + .has_chsel_offset = true, > + .field_clkdiv_mclk_en = REG_FIELD(SUN4I_I2S_CLK_DIV_REG, 8, 8), > + .field_fmt_wss = REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 2), > + .field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 6), > + .field_fmt_bclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 7, 7), > + .field_fmt_lrclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 19, 19), > + .field_fmt_mode = REG_FIELD(SUN4I_I2S_CTRL_REG, 4, 5), > + .field_fmt_sext = REG_FIELD(SUN4I_I2S_FMT1_REG, 4, 5), > + .get_sr = sun8i_i2s_get_sr_wss, > + .get_wss = sun8i_i2s_get_sr_wss, > + .set_format = sun8i_i2s_set_format, > + .set_txchanoffset = sun50i_h6_i2s_set_txchanoffset, > + .set_rxchanoffset = sun50i_h6_i2s_set_rxchanoffset, > + .set_txchanen = sun50i_h6_i2s_set_txchanen, > + .set_rxchanen = sun50i_h6_i2s_set_rxchanen, > + .set_txchansel = sun50i_h6_i2s_set_txchansel, > + .set_rxchansel = sun50i_h6_i2s_set_rxchansel, > + .set_txchanmap = sun50i_h6_i2s_set_txchanmap, > + .set_rxchanmap = sun50i_h6_i2s_set_rxchanmap, > +}; > + > static int sun4i_i2s_init_regmap_fields(struct device *dev, > struct sun4i_i2s *i2s) > { > @@ -1389,6 +1533,10 @@ static const struct of_device_id sun4i_i2s_match[] = > { .compatible = "allwinner,sun50i-a64-codec-i2s", > .data = &sun50i_a64_codec_i2s_quirks, > }, > + { > + .compatible = "allwinner,sun50i-h6-i2s", > + .data = &sun50i_h6_i2s_quirks, > + }, > {} > }; > MODULE_DEVICE_TABLE(of, sun4i_i2s_match); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel