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.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT 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 70E78C352BE for ; Sat, 18 Apr 2020 22:47:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 EF38721D6C for ; Sat, 18 Apr 2020 22:47:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="lI7nVG1L"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a32N8wG+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF38721D6C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 59797846; Sun, 19 Apr 2020 00:46:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 59797846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1587250055; bh=CH6NU2YIggBc2lkNGMGqWGtiabxsX41aZtr85Il799g=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lI7nVG1L5CAjdX7Q6H0G+02ZRcpZhJRXf7k74sVfWHUxkDilzi+Pmyj1BXr8am96f oETe27104C2GQplTjWpKhQ4I/8fz3k5w/y/fu5SlxtA8P2jKu924Iw3RRfE1PERb0L uFzPYHd0ZbmJr1sbb3sf4S/nsnps9rOL2I9DvO4M= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 519FFF802A0; Sun, 19 Apr 2020 00:44:56 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 77E5DF80290; Sun, 19 Apr 2020 00:44:50 +0200 (CEST) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 940D8F8013D for ; Sun, 19 Apr 2020 00:44:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 940D8F8013D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a32N8wG+" Received: by mail-wr1-x443.google.com with SMTP id d17so7376049wrg.11 for ; Sat, 18 Apr 2020 15:44:43 -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=V/lpQn53gdEXltFH79q8XmCEGM5dgBCWmNxBGwbhAXM=; b=a32N8wG+5ag2ojOmPuOJuQCoAn95+wI5FWPfKNwqexGw5oJHYjBzAYCAcaUiJxbLw1 0sAvD55q1CeCgoSC0vr0nzEoZJabsdGT7/cZcBHMmv3+SIDBaz2NNLEz0aBndWXj6x83 NBgD53VlrrUkn3Y327+eoK4kY6ogRVfgJ13Ru3z7m34MKjy+6Cl9BgW3MgJnxBIi2M9E ee66jGJMmh7utL/sVXaPVcYpxwaooGbcPhugt6gnkJwuJ1RgtfgHHYG5j5qfLL85ZMrW MlfWD7V/fsrpQd5gA5B/wDlbXhOKT5MEwewIbiPf0dZPpInOxgXO5ybtYhtkEEPdOLTU 8gIg== 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=V/lpQn53gdEXltFH79q8XmCEGM5dgBCWmNxBGwbhAXM=; b=pTIHHnbTa8/KT8lz5r3YekcoyUd99bSvP+2DDeA302XPwdc2ZktzuiipsvOfDezM4k wEHdlmmGRtNQFFLrvqjtyV7ZaNfsVqMoRqDmvUzWcr/KIRvZvfetFLZpcP67MQFHeIeQ TRx1gAGPdJSqR0JaNTy66lbpOc/BRutDk/C7ObLbxF/WYMlENCii2dHBTOoJOxWsMqvM KWqqJe8dEM2MeGgRAMIz7kElUCRYG04CTPVbYtGMme8o+ReefMNNHoa9sWZaoXU/Ujjj Hdm+csnrfRJpW1A975pXAtCahgZE8J1EqVJjtwZVCvttBoF10ux/Ms5XkSAstFoNKBl/ Sd4w== X-Gm-Message-State: AGi0PuaqVprLypiXXD3Iby7cwDzL+BSgVoJfZesqUOgaMVxjX0bQg6MS BaOBar4qrvzfE+n7B9G6uEk= X-Google-Smtp-Source: APiQypLlVNnXTzRiABRJC2v2Bpj0arub7fRlTwhNbvCex+zLQNQMa3j6U5tCAAZUhV7wZxXu/1/MEw== X-Received: by 2002:a5d:51c6:: with SMTP id n6mr10827370wrv.314.1587249883078; Sat, 18 Apr 2020 15:44:43 -0700 (PDT) Received: from localhost.localdomain (91-167-199-67.subs.proxad.net. [91.167.199.67]) by smtp.gmail.com with ESMTPSA id t16sm13371559wmi.27.2020.04.18.15.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:44:42 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 3/7] ASoC: sun4i-i2s: Add support for H6 I2S Date: Sun, 19 Apr 2020 00:44:31 +0200 Message-Id: <20200418224435.23672-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418224435.23672-1-peron.clem@gmail.com> References: <20200418224435.23672-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Jernej Skrabec , linux-kernel@vger.kernel.org, Marcus Cooper , =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Jernej Skrabec H6 I2S is very similar to that in H3, except it supports up to 16 channels. Signed-off-by: Jernej Skrabec Signed-off-by: Marcus Cooper Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 227 ++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 4198a5410bf9..a23c9f2a3f8c 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -124,6 +124,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; /** @@ -469,6 +484,65 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, + const struct snd_pcm_hw_params *params) +{ + unsigned int channels = params_channels(params); + unsigned int slots = channels; + unsigned int lrck_period; + + if (i2s->slots) + slots = i2s->slots; + + /* Map the channels for playback and capture */ + regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210); + regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210); + + /* Configure the channels */ + regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG, + SUN50I_H6_I2S_TX_CHAN_SEL_MASK, + SUN50I_H6_I2S_TX_CHAN_SEL(channels)); + 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(channels)); + + regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG, + SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK, + SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(channels)); + regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG, + SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK, + SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(channels)); + + switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: + case SND_SOC_DAIFMT_LEFT_J: + case SND_SOC_DAIFMT_RIGHT_J: + lrck_period = params_physical_width(params) * slots; + break; + + case SND_SOC_DAIFMT_I2S: + lrck_period = params_physical_width(params); + break; + + default: + return -EINVAL; + } + + if (i2s->slot_width) + lrck_period = i2s->slot_width; + + regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG, + SUN8I_I2S_FMT0_LRCK_PERIOD_MASK, + SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period)); + + regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG, + SUN50I_H6_I2S_TX_CHAN_EN_MASK, + SUN50I_H6_I2S_TX_CHAN_EN(channels)); + + return 0; +} + static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -694,6 +768,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, + unsigned int fmt) +{ + u32 mode, val; + u8 offset; + + /* + * DAI clock polarity + * + * The setup for LRCK contradicts the datasheet, but under a + * scope it's clear that the LRCK polarity is reversed + * compared to the expected polarity on the bus. + */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_IB_IF: + /* Invert both clocks */ + val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED; + break; + case SND_SOC_DAIFMT_IB_NF: + /* Invert bit clock */ + val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED | + SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED; + break; + case SND_SOC_DAIFMT_NB_IF: + /* Invert frame clock */ + val = 0; + break; + case SND_SOC_DAIFMT_NB_NF: + val = SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED; + break; + default: + return -EINVAL; + } + + regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG, + SUN8I_I2S_FMT0_LRCLK_POLARITY_MASK | + SUN8I_I2S_FMT0_BCLK_POLARITY_MASK, + val); + + /* DAI Mode */ + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + mode = SUN8I_I2S_CTRL_MODE_PCM; + offset = 1; + break; + + case SND_SOC_DAIFMT_DSP_B: + mode = SUN8I_I2S_CTRL_MODE_PCM; + offset = 0; + break; + + case SND_SOC_DAIFMT_I2S: + mode = SUN8I_I2S_CTRL_MODE_LEFT; + offset = 1; + break; + + case SND_SOC_DAIFMT_LEFT_J: + mode = SUN8I_I2S_CTRL_MODE_LEFT; + offset = 0; + break; + + case SND_SOC_DAIFMT_RIGHT_J: + mode = SUN8I_I2S_CTRL_MODE_RIGHT; + offset = 0; + break; + + default: + return -EINVAL; + } + + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN8I_I2S_CTRL_MODE_MASK, mode); + regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG, + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK, + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset)); + 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(offset)); + + /* DAI clock master masks */ + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* BCLK and LRCLK master */ + val = SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT; + break; + + case SND_SOC_DAIFMT_CBM_CFM: + /* BCLK and LRCLK slave */ + val = 0; + break; + + default: + return -EINVAL; + } + + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT, + val); + + return 0; +} + static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); @@ -974,6 +1150,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, @@ -1001,6 +1193,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); @@ -1159,6 +1364,24 @@ static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = { .set_fmt = sun4i_i2s_set_soc_fmt, }; +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, + .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), + .bclk_dividers = sun8i_i2s_clk_div, + .num_bclk_dividers = ARRAY_SIZE(sun8i_i2s_clk_div), + .mclk_dividers = sun8i_i2s_clk_div, + .num_mclk_dividers = ARRAY_SIZE(sun8i_i2s_clk_div), + .get_bclk_parent_rate = sun8i_i2s_get_bclk_parent_rate, + .get_sr = sun8i_i2s_get_sr_wss, + .get_wss = sun8i_i2s_get_sr_wss, + .set_chan_cfg = sun50i_i2s_set_chan_cfg, + .set_fmt = sun50i_i2s_set_soc_fmt, +}; + static int sun4i_i2s_init_regmap_fields(struct device *dev, struct sun4i_i2s *i2s) { @@ -1328,6 +1551,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); -- 2.20.1 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.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,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 A984DC2BA19 for ; Sat, 18 Apr 2020 22:45:48 +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 421DB21974 for ; Sat, 18 Apr 2020 22:45:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TJTd2Zh0"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a32N8wG+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 421DB21974 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=M2rvEg/wFlsWLs2qWeg4LDFVZ0dWzRYE50WCJeAaxdE=; b=TJTd2Zh0ylOKLG 2LEJJ0x5ttVDYbmdCDWygA/R4zPXNGWeUIbNjin8yB1Ui41hQuokScjDB+JxvGyfiU60XX3YMAtZy 9mQNPCGmokoTymj9ncI3kW0tXU1i1kBvsA3lvaPMfQHgucBV84gonPK0510gz7Njk0Ves6umizBIf PWBKJziRoY5RM0zrx1vXrgK13CYJmmHXAZf06R9EgZS/U89J4T7P4AWx8SDCDatYESEuRtAJWdyHa fiu/LoXp+yXArLgtFUfXSDxaxbF7xjO0tD7dq0DtkKY01DaB33Ucy4rpM/Xaa+XqRQWtqQAw+7Kyn 6wTm4pxXE990nDMY4b+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jPwDX-0002Eq-Qq; Sat, 18 Apr 2020 22:45:43 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jPwCa-0007S8-Bs for linux-arm-kernel@lists.infradead.org; Sat, 18 Apr 2020 22:44:46 +0000 Received: by mail-wr1-x441.google.com with SMTP id k1so7427887wrx.4 for ; Sat, 18 Apr 2020 15:44:44 -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=V/lpQn53gdEXltFH79q8XmCEGM5dgBCWmNxBGwbhAXM=; b=a32N8wG+5ag2ojOmPuOJuQCoAn95+wI5FWPfKNwqexGw5oJHYjBzAYCAcaUiJxbLw1 0sAvD55q1CeCgoSC0vr0nzEoZJabsdGT7/cZcBHMmv3+SIDBaz2NNLEz0aBndWXj6x83 NBgD53VlrrUkn3Y327+eoK4kY6ogRVfgJ13Ru3z7m34MKjy+6Cl9BgW3MgJnxBIi2M9E ee66jGJMmh7utL/sVXaPVcYpxwaooGbcPhugt6gnkJwuJ1RgtfgHHYG5j5qfLL85ZMrW MlfWD7V/fsrpQd5gA5B/wDlbXhOKT5MEwewIbiPf0dZPpInOxgXO5ybtYhtkEEPdOLTU 8gIg== 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=V/lpQn53gdEXltFH79q8XmCEGM5dgBCWmNxBGwbhAXM=; b=SljooKem+hpz3wRimwn33nHBNZNIl5pqIops6W4fpLXQfKZdCgVGUVNGP7A8xpva2G ZgEMztIfTrmsdmx6g9XZ2MJL8Pcb5/dl8Zz5DW6gviLJaFXAwh+qMPGF6cEuiokNiD7R xE8xeOBmvLQ1uwM4yXxZC0OB2bh2O1VUeuPr1yL09I28PSyTFD369l0IFtKZcRflqx8U OfLoKNW76UZOzo7d26deWzBTySon7SzxV/Jrhkl4fevjujzwQmgqHQb0a9hZv4HMp84k +biseqmwfDBtTzw5trNoBW5xCFqtlDINr6GazaZEvZUZltV9vDBrZtUPXV4SCjSKHaG8 LWwg== X-Gm-Message-State: AGi0PuZUbUlzpcw0QoS7b7OcS8SDuBl9Pprl3fMFPtMDRgBdt7oTQ7CK bafU4C36gYzrPXRt5xP0DfI= X-Google-Smtp-Source: APiQypLlVNnXTzRiABRJC2v2Bpj0arub7fRlTwhNbvCex+zLQNQMa3j6U5tCAAZUhV7wZxXu/1/MEw== X-Received: by 2002:a5d:51c6:: with SMTP id n6mr10827370wrv.314.1587249883078; Sat, 18 Apr 2020 15:44:43 -0700 (PDT) Received: from localhost.localdomain (91-167-199-67.subs.proxad.net. [91.167.199.67]) by smtp.gmail.com with ESMTPSA id t16sm13371559wmi.27.2020.04.18.15.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:44:42 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 3/7] ASoC: sun4i-i2s: Add support for H6 I2S Date: Sun, 19 Apr 2020 00:44:31 +0200 Message-Id: <20200418224435.23672-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418224435.23672-1-peron.clem@gmail.com> References: <20200418224435.23672-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200418_154444_438606_41B5A336 X-CRM114-Status: GOOD ( 16.84 ) 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: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Jernej Skrabec , linux-kernel@vger.kernel.org, Marcus Cooper , =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogSmVybmVqIFNrcmFiZWMgPGplcm5lai5za3JhYmVjQHNpb2wubmV0PgoKSDYgSTJTIGlz IHZlcnkgc2ltaWxhciB0byB0aGF0IGluIEgzLCBleGNlcHQgaXQgc3VwcG9ydHMgdXAgdG8gMTYK Y2hhbm5lbHMuCgpTaWduZWQtb2ZmLWJ5OiBKZXJuZWogU2tyYWJlYyA8amVybmVqLnNrcmFiZWNA c2lvbC5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1hcmN1cyBDb29wZXIgPGNvZGVraXBwZXJAZ21haWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBDbMOpbWVudCBQw6lyb24gPHBlcm9uLmNsZW1AZ21haWwuY29t PgotLS0KIHNvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYyB8IDIyNyArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAyMjcgaW5zZXJ0aW9ucygrKQoK ZGlmZiAtLWdpdCBhL3NvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYyBiL3NvdW5kL3NvYy9zdW54 aS9zdW40aS1pMnMuYwppbmRleCA0MTk4YTU0MTBiZjkuLmEyM2M5ZjJhM2Y4YyAxMDA2NDQKLS0t IGEvc291bmQvc29jL3N1bnhpL3N1bjRpLWkycy5jCisrKyBiL3NvdW5kL3NvYy9zdW54aS9zdW40 aS1pMnMuYwpAQCAtMTI0LDYgKzEyNCwyMSBAQAogI2RlZmluZSBTVU44SV9JMlNfUlhfQ0hBTl9T RUxfUkVHCTB4NTQKICNkZWZpbmUgU1VOOElfSTJTX1JYX0NIQU5fTUFQX1JFRwkweDU4CiAKKy8q IERlZmluZXMgcmVxdWlyZWQgZm9yIHN1bjUwaS1oNiBzdXBwb3J0ICovCisjZGVmaW5lIFNVTjUw SV9INl9JMlNfVFhfQ0hBTl9TRUxfT0ZGU0VUX01BU0sJR0VOTUFTSygyMSwgMjApCisjZGVmaW5l IFNVTjUwSV9INl9JMlNfVFhfQ0hBTl9TRUxfT0ZGU0VUKG9mZnNldCkJKChvZmZzZXQpIDw8IDIw KQorI2RlZmluZSBTVU41MElfSDZfSTJTX1RYX0NIQU5fU0VMX01BU0sJCUdFTk1BU0soMTksIDE2 KQorI2RlZmluZSBTVU41MElfSDZfSTJTX1RYX0NIQU5fU0VMKGNoYW4pCQkoKGNoYW4gLSAxKSA8 PCAxNikKKyNkZWZpbmUgU1VONTBJX0g2X0kyU19UWF9DSEFOX0VOX01BU0sJCUdFTk1BU0soMTUs IDApCisjZGVmaW5lIFNVTjUwSV9INl9JMlNfVFhfQ0hBTl9FTihudW1fY2hhbikJKCgoMSA8PCBu dW1fY2hhbikgLSAxKSkKKworI2RlZmluZSBTVU41MElfSDZfSTJTX1RYX0NIQU5fTUFQMF9SRUcJ MHg0NAorI2RlZmluZSBTVU41MElfSDZfSTJTX1RYX0NIQU5fTUFQMV9SRUcJMHg0OAorCisjZGVm aW5lIFNVTjUwSV9INl9JMlNfUlhfQ0hBTl9TRUxfUkVHCTB4NjQKKyNkZWZpbmUgU1VONTBJX0g2 X0kyU19SWF9DSEFOX01BUDBfUkVHCTB4NjgKKyNkZWZpbmUgU1VONTBJX0g2X0kyU19SWF9DSEFO X01BUDFfUkVHCTB4NkMKKwogc3RydWN0IHN1bjRpX2kyczsKIAogLyoqCkBAIC00NjksNiArNDg0 LDY1IEBAIHN0YXRpYyBpbnQgc3VuOGlfaTJzX3NldF9jaGFuX2NmZyhjb25zdCBzdHJ1Y3Qgc3Vu NGlfaTJzICppMnMsCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgc3VuNTBpX2kyc19zZXRf Y2hhbl9jZmcoY29uc3Qgc3RydWN0IHN1bjRpX2kycyAqaTJzLAorCQkJCSAgIGNvbnN0IHN0cnVj dCBzbmRfcGNtX2h3X3BhcmFtcyAqcGFyYW1zKQoreworCXVuc2lnbmVkIGludCBjaGFubmVscyA9 IHBhcmFtc19jaGFubmVscyhwYXJhbXMpOworCXVuc2lnbmVkIGludCBzbG90cyA9IGNoYW5uZWxz OworCXVuc2lnbmVkIGludCBscmNrX3BlcmlvZDsKKworCWlmIChpMnMtPnNsb3RzKQorCQlzbG90 cyA9IGkycy0+c2xvdHM7CisKKwkvKiBNYXAgdGhlIGNoYW5uZWxzIGZvciBwbGF5YmFjayBhbmQg Y2FwdHVyZSAqLworCXJlZ21hcF93cml0ZShpMnMtPnJlZ21hcCwgU1VONTBJX0g2X0kyU19UWF9D SEFOX01BUDFfUkVHLCAweDc2NTQzMjEwKTsKKwlyZWdtYXBfd3JpdGUoaTJzLT5yZWdtYXAsIFNV TjUwSV9INl9JMlNfUlhfQ0hBTl9NQVAxX1JFRywgMHg3NjU0MzIxMCk7CisKKwkvKiBDb25maWd1 cmUgdGhlIGNoYW5uZWxzICovCisJcmVnbWFwX3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFwLCBTVU44 SV9JMlNfVFhfQ0hBTl9TRUxfUkVHLAorCQkJICAgU1VONTBJX0g2X0kyU19UWF9DSEFOX1NFTF9N QVNLLAorCQkJICAgU1VONTBJX0g2X0kyU19UWF9DSEFOX1NFTChjaGFubmVscykpOworCXJlZ21h cF91cGRhdGVfYml0cyhpMnMtPnJlZ21hcCwgU1VONTBJX0g2X0kyU19SWF9DSEFOX1NFTF9SRUcs CisJCQkgICBTVU41MElfSDZfSTJTX1RYX0NIQU5fU0VMX01BU0ssCisJCQkgICBTVU41MElfSDZf STJTX1RYX0NIQU5fU0VMKGNoYW5uZWxzKSk7CisKKwlyZWdtYXBfdXBkYXRlX2JpdHMoaTJzLT5y ZWdtYXAsIFNVTjhJX0kyU19DSEFOX0NGR19SRUcsCisJCQkgICBTVU44SV9JMlNfQ0hBTl9DRkdf VFhfU0xPVF9OVU1fTUFTSywKKwkJCSAgIFNVTjhJX0kyU19DSEFOX0NGR19UWF9TTE9UX05VTShj aGFubmVscykpOworCXJlZ21hcF91cGRhdGVfYml0cyhpMnMtPnJlZ21hcCwgU1VOOElfSTJTX0NI QU5fQ0ZHX1JFRywKKwkJCSAgIFNVTjhJX0kyU19DSEFOX0NGR19SWF9TTE9UX05VTV9NQVNLLAor CQkJICAgU1VOOElfSTJTX0NIQU5fQ0ZHX1JYX1NMT1RfTlVNKGNoYW5uZWxzKSk7CisKKwlzd2l0 Y2ggKGkycy0+Zm9ybWF0ICYgU05EX1NPQ19EQUlGTVRfRk9STUFUX01BU0spIHsKKwljYXNlIFNO RF9TT0NfREFJRk1UX0RTUF9BOgorCWNhc2UgU05EX1NPQ19EQUlGTVRfRFNQX0I6CisJY2FzZSBT TkRfU09DX0RBSUZNVF9MRUZUX0o6CisJY2FzZSBTTkRfU09DX0RBSUZNVF9SSUdIVF9KOgorCQls cmNrX3BlcmlvZCA9IHBhcmFtc19waHlzaWNhbF93aWR0aChwYXJhbXMpICogc2xvdHM7CisJCWJy ZWFrOworCisJY2FzZSBTTkRfU09DX0RBSUZNVF9JMlM6CisJCWxyY2tfcGVyaW9kID0gcGFyYW1z X3BoeXNpY2FsX3dpZHRoKHBhcmFtcyk7CisJCWJyZWFrOworCisJZGVmYXVsdDoKKwkJcmV0dXJu IC1FSU5WQUw7CisJfQorCisJaWYgKGkycy0+c2xvdF93aWR0aCkKKwkJbHJja19wZXJpb2QgPSBp MnMtPnNsb3Rfd2lkdGg7CisKKwlyZWdtYXBfdXBkYXRlX2JpdHMoaTJzLT5yZWdtYXAsIFNVTjRJ X0kyU19GTVQwX1JFRywKKwkJCSAgIFNVTjhJX0kyU19GTVQwX0xSQ0tfUEVSSU9EX01BU0ssCisJ CQkgICBTVU44SV9JMlNfRk1UMF9MUkNLX1BFUklPRChscmNrX3BlcmlvZCkpOworCisJcmVnbWFw X3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFwLCBTVU44SV9JMlNfVFhfQ0hBTl9TRUxfUkVHLAorCQkJ ICAgU1VONTBJX0g2X0kyU19UWF9DSEFOX0VOX01BU0ssCisJCQkgICBTVU41MElfSDZfSTJTX1RY X0NIQU5fRU4oY2hhbm5lbHMpKTsKKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IHN1bjRp X2kyc19od19wYXJhbXMoc3RydWN0IHNuZF9wY21fc3Vic3RyZWFtICpzdWJzdHJlYW0sCiAJCQkg ICAgICAgc3RydWN0IHNuZF9wY21faHdfcGFyYW1zICpwYXJhbXMsCiAJCQkgICAgICAgc3RydWN0 IHNuZF9zb2NfZGFpICpkYWkpCkBAIC02OTQsNiArNzY4LDEwOCBAQCBzdGF0aWMgaW50IHN1bjhp X2kyc19zZXRfc29jX2ZtdChjb25zdCBzdHJ1Y3Qgc3VuNGlfaTJzICppMnMsCiAJcmV0dXJuIDA7 CiB9CiAKK3N0YXRpYyBpbnQgc3VuNTBpX2kyc19zZXRfc29jX2ZtdChjb25zdCBzdHJ1Y3Qgc3Vu NGlfaTJzICppMnMsCisJCQkJIHVuc2lnbmVkIGludCBmbXQpCit7CisJdTMyIG1vZGUsIHZhbDsK Kwl1OCBvZmZzZXQ7CisKKwkvKgorCSAqIERBSSBjbG9jayBwb2xhcml0eQorCSAqCisJICogVGhl IHNldHVwIGZvciBMUkNLIGNvbnRyYWRpY3RzIHRoZSBkYXRhc2hlZXQsIGJ1dCB1bmRlciBhCisJ ICogc2NvcGUgaXQncyBjbGVhciB0aGF0IHRoZSBMUkNLIHBvbGFyaXR5IGlzIHJldmVyc2VkCisJ ICogY29tcGFyZWQgdG8gdGhlIGV4cGVjdGVkIHBvbGFyaXR5IG9uIHRoZSBidXMuCisJICovCisJ c3dpdGNoIChmbXQgJiBTTkRfU09DX0RBSUZNVF9JTlZfTUFTSykgeworCWNhc2UgU05EX1NPQ19E QUlGTVRfSUJfSUY6CisJCS8qIEludmVydCBib3RoIGNsb2NrcyAqLworCQl2YWwgPSBTVU44SV9J MlNfRk1UMF9CQ0xLX1BPTEFSSVRZX0lOVkVSVEVEOworCQlicmVhazsKKwljYXNlIFNORF9TT0Nf REFJRk1UX0lCX05GOgorCQkvKiBJbnZlcnQgYml0IGNsb2NrICovCisJCXZhbCA9IFNVTjhJX0ky U19GTVQwX0JDTEtfUE9MQVJJVFlfSU5WRVJURUQgfAorCQkgICAgICBTVU44SV9JMlNfRk1UMF9M UkNMS19QT0xBUklUWV9JTlZFUlRFRDsKKwkJYnJlYWs7CisJY2FzZSBTTkRfU09DX0RBSUZNVF9O Ql9JRjoKKwkJLyogSW52ZXJ0IGZyYW1lIGNsb2NrICovCisJCXZhbCA9IDA7CisJCWJyZWFrOwor CWNhc2UgU05EX1NPQ19EQUlGTVRfTkJfTkY6CisJCXZhbCA9IFNVTjhJX0kyU19GTVQwX0xSQ0xL X1BPTEFSSVRZX0lOVkVSVEVEOworCQlicmVhazsKKwlkZWZhdWx0OgorCQlyZXR1cm4gLUVJTlZB TDsKKwl9CisKKwlyZWdtYXBfdXBkYXRlX2JpdHMoaTJzLT5yZWdtYXAsIFNVTjRJX0kyU19GTVQw X1JFRywKKwkJCSAgIFNVTjhJX0kyU19GTVQwX0xSQ0xLX1BPTEFSSVRZX01BU0sgfAorCQkJICAg U1VOOElfSTJTX0ZNVDBfQkNMS19QT0xBUklUWV9NQVNLLAorCQkJICAgdmFsKTsKKworCS8qIERB SSBNb2RlICovCisJc3dpdGNoIChmbXQgJiBTTkRfU09DX0RBSUZNVF9GT1JNQVRfTUFTSykgewor CWNhc2UgU05EX1NPQ19EQUlGTVRfRFNQX0E6CisJCW1vZGUgPSBTVU44SV9JMlNfQ1RSTF9NT0RF X1BDTTsKKwkJb2Zmc2V0ID0gMTsKKwkJYnJlYWs7CisKKwljYXNlIFNORF9TT0NfREFJRk1UX0RT UF9COgorCQltb2RlID0gU1VOOElfSTJTX0NUUkxfTU9ERV9QQ007CisJCW9mZnNldCA9IDA7CisJ CWJyZWFrOworCisJY2FzZSBTTkRfU09DX0RBSUZNVF9JMlM6CisJCW1vZGUgPSBTVU44SV9JMlNf Q1RSTF9NT0RFX0xFRlQ7CisJCW9mZnNldCA9IDE7CisJCWJyZWFrOworCisJY2FzZSBTTkRfU09D X0RBSUZNVF9MRUZUX0o6CisJCW1vZGUgPSBTVU44SV9JMlNfQ1RSTF9NT0RFX0xFRlQ7CisJCW9m ZnNldCA9IDA7CisJCWJyZWFrOworCisJY2FzZSBTTkRfU09DX0RBSUZNVF9SSUdIVF9KOgorCQlt b2RlID0gU1VOOElfSTJTX0NUUkxfTU9ERV9SSUdIVDsKKwkJb2Zmc2V0ID0gMDsKKwkJYnJlYWs7 CisKKwlkZWZhdWx0OgorCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlyZWdtYXBfdXBkYXRlX2Jp dHMoaTJzLT5yZWdtYXAsIFNVTjRJX0kyU19DVFJMX1JFRywKKwkJCSAgIFNVTjhJX0kyU19DVFJM X01PREVfTUFTSywgbW9kZSk7CisJcmVnbWFwX3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFwLCBTVU44 SV9JMlNfVFhfQ0hBTl9TRUxfUkVHLAorCQkJICAgU1VONTBJX0g2X0kyU19UWF9DSEFOX1NFTF9P RkZTRVRfTUFTSywKKwkJCSAgIFNVTjUwSV9INl9JMlNfVFhfQ0hBTl9TRUxfT0ZGU0VUKG9mZnNl dCkpOworCXJlZ21hcF91cGRhdGVfYml0cyhpMnMtPnJlZ21hcCwgU1VONTBJX0g2X0kyU19SWF9D SEFOX1NFTF9SRUcsCisJCQkgICBTVU41MElfSDZfSTJTX1RYX0NIQU5fU0VMX09GRlNFVF9NQVNL LAorCQkJICAgU1VONTBJX0g2X0kyU19UWF9DSEFOX1NFTF9PRkZTRVQob2Zmc2V0KSk7CisKKwkv KiBEQUkgY2xvY2sgbWFzdGVyIG1hc2tzICovCisJc3dpdGNoIChmbXQgJiBTTkRfU09DX0RBSUZN VF9NQVNURVJfTUFTSykgeworCWNhc2UgU05EX1NPQ19EQUlGTVRfQ0JTX0NGUzoKKwkJLyogQkNM SyBhbmQgTFJDTEsgbWFzdGVyICovCisJCXZhbCA9IFNVTjhJX0kyU19DVFJMX0JDTEtfT1VUIHwJ U1VOOElfSTJTX0NUUkxfTFJDS19PVVQ7CisJCWJyZWFrOworCisJY2FzZSBTTkRfU09DX0RBSUZN VF9DQk1fQ0ZNOgorCQkvKiBCQ0xLIGFuZCBMUkNMSyBzbGF2ZSAqLworCQl2YWwgPSAwOworCQli cmVhazsKKworCWRlZmF1bHQ6CisJCXJldHVybiAtRUlOVkFMOworCX0KKworCXJlZ21hcF91cGRh dGVfYml0cyhpMnMtPnJlZ21hcCwgU1VONElfSTJTX0NUUkxfUkVHLAorCQkJICAgU1VOOElfSTJT X0NUUkxfQkNMS19PVVQgfCBTVU44SV9JMlNfQ1RSTF9MUkNLX09VVCwKKwkJCSAgIHZhbCk7CisK KwlyZXR1cm4gMDsKK30KKwogc3RhdGljIGludCBzdW40aV9pMnNfc2V0X2ZtdChzdHJ1Y3Qgc25k X3NvY19kYWkgKmRhaSwgdW5zaWduZWQgaW50IGZtdCkKIHsKIAlzdHJ1Y3Qgc3VuNGlfaTJzICpp MnMgPSBzbmRfc29jX2RhaV9nZXRfZHJ2ZGF0YShkYWkpOwpAQCAtOTc0LDYgKzExNTAsMjIgQEAg c3RhdGljIGNvbnN0IHN0cnVjdCByZWdfZGVmYXVsdCBzdW44aV9pMnNfcmVnX2RlZmF1bHRzW10g PSB7CiAJeyBTVU44SV9JMlNfUlhfQ0hBTl9NQVBfUkVHLCAweDAwMDAwMDAwIH0sCiB9OwogCitz dGF0aWMgY29uc3Qgc3RydWN0IHJlZ19kZWZhdWx0IHN1bjUwaV9pMnNfcmVnX2RlZmF1bHRzW10g PSB7CisJeyBTVU40SV9JMlNfQ1RSTF9SRUcsIDB4MDAwNjAwMDAgfSwKKwl7IFNVTjRJX0kyU19G TVQwX1JFRywgMHgwMDAwMDAzMyB9LAorCXsgU1VONElfSTJTX0ZNVDFfUkVHLCAweDAwMDAwMDMw IH0sCisJeyBTVU40SV9JMlNfRklGT19DVFJMX1JFRywgMHgwMDA0MDBmMCB9LAorCXsgU1VONElf STJTX0RNQV9JTlRfQ1RSTF9SRUcsIDB4MDAwMDAwMDAgfSwKKwl7IFNVTjRJX0kyU19DTEtfRElW X1JFRywgMHgwMDAwMDAwMCB9LAorCXsgU1VOOElfSTJTX0NIQU5fQ0ZHX1JFRywgMHgwMDAwMDAw MCB9LAorCXsgU1VOOElfSTJTX1RYX0NIQU5fU0VMX1JFRywgMHgwMDAwMDAwMCB9LAorCXsgU1VO NTBJX0g2X0kyU19UWF9DSEFOX01BUDBfUkVHLCAweDAwMDAwMDAwIH0sCisJeyBTVU41MElfSDZf STJTX1RYX0NIQU5fTUFQMV9SRUcsIDB4MDAwMDAwMDAgfSwKKwl7IFNVTjUwSV9INl9JMlNfUlhf Q0hBTl9TRUxfUkVHLCAweDAwMDAwMDAwIH0sCisJeyBTVU41MElfSDZfSTJTX1JYX0NIQU5fTUFQ MF9SRUcsIDB4MDAwMDAwMDAgfSwKKwl7IFNVTjUwSV9INl9JMlNfUlhfQ0hBTl9NQVAxX1JFRywg MHgwMDAwMDAwMCB9LAorfTsKKwogc3RhdGljIGNvbnN0IHN0cnVjdCByZWdtYXBfY29uZmlnIHN1 bjRpX2kyc19yZWdtYXBfY29uZmlnID0gewogCS5yZWdfYml0cwk9IDMyLAogCS5yZWdfc3RyaWRl CT0gNCwKQEAgLTEwMDEsNiArMTE5MywxOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHJlZ21hcF9j b25maWcgc3VuOGlfaTJzX3JlZ21hcF9jb25maWcgPSB7CiAJLnZvbGF0aWxlX3JlZwk9IHN1bjhp X2kyc192b2xhdGlsZV9yZWcsCiB9OwogCitzdGF0aWMgY29uc3Qgc3RydWN0IHJlZ21hcF9jb25m aWcgc3VuNTBpX2kyc19yZWdtYXBfY29uZmlnID0geworCS5yZWdfYml0cwk9IDMyLAorCS5yZWdf c3RyaWRlCT0gNCwKKwkudmFsX2JpdHMJPSAzMiwKKwkubWF4X3JlZ2lzdGVyCT0gU1VONTBJX0g2 X0kyU19SWF9DSEFOX01BUDFfUkVHLAorCS5jYWNoZV90eXBlCT0gUkVHQ0FDSEVfRkxBVCwKKwku cmVnX2RlZmF1bHRzCT0gc3VuNTBpX2kyc19yZWdfZGVmYXVsdHMsCisJLm51bV9yZWdfZGVmYXVs dHMJPSBBUlJBWV9TSVpFKHN1bjUwaV9pMnNfcmVnX2RlZmF1bHRzKSwKKwkud3JpdGVhYmxlX3Jl Zwk9IHN1bjRpX2kyc193cl9yZWcsCisJLnJlYWRhYmxlX3JlZwk9IHN1bjhpX2kyc19yZF9yZWcs CisJLnZvbGF0aWxlX3JlZwk9IHN1bjhpX2kyc192b2xhdGlsZV9yZWcsCit9OworCiBzdGF0aWMg aW50IHN1bjRpX2kyc19ydW50aW1lX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7CiAJc3Ry dWN0IHN1bjRpX2kycyAqaTJzID0gZGV2X2dldF9kcnZkYXRhKGRldik7CkBAIC0xMTU5LDYgKzEz NjQsMjQgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBzdW40aV9pMnNfcXVpcmtzIHN1bjUwaV9hNjRf Y29kZWNfaTJzX3F1aXJrcyA9IHsKIAkuc2V0X2ZtdAkJPSBzdW40aV9pMnNfc2V0X3NvY19mbXQs CiB9OwogCitzdGF0aWMgY29uc3Qgc3RydWN0IHN1bjRpX2kyc19xdWlya3Mgc3VuNTBpX2g2X2ky c19xdWlya3MgPSB7CisJLmhhc19yZXNldAkJPSB0cnVlLAorCS5yZWdfb2Zmc2V0X3R4ZGF0YQk9 IFNVTjhJX0kyU19GSUZPX1RYX1JFRywKKwkuc3VuNGlfaTJzX3JlZ21hcAk9ICZzdW41MGlfaTJz X3JlZ21hcF9jb25maWcsCisJLmZpZWxkX2Nsa2Rpdl9tY2xrX2VuCT0gUkVHX0ZJRUxEKFNVTjRJ X0kyU19DTEtfRElWX1JFRywgOCwgOCksCisJLmZpZWxkX2ZtdF93c3MJCT0gUkVHX0ZJRUxEKFNV TjRJX0kyU19GTVQwX1JFRywgMCwgMiksCisJLmZpZWxkX2ZtdF9zcgkJPSBSRUdfRklFTEQoU1VO NElfSTJTX0ZNVDBfUkVHLCA0LCA2KSwKKwkuYmNsa19kaXZpZGVycwkJPSBzdW44aV9pMnNfY2xr X2RpdiwKKwkubnVtX2JjbGtfZGl2aWRlcnMJPSBBUlJBWV9TSVpFKHN1bjhpX2kyc19jbGtfZGl2 KSwKKwkubWNsa19kaXZpZGVycwkJPSBzdW44aV9pMnNfY2xrX2RpdiwKKwkubnVtX21jbGtfZGl2 aWRlcnMJPSBBUlJBWV9TSVpFKHN1bjhpX2kyc19jbGtfZGl2KSwKKwkuZ2V0X2JjbGtfcGFyZW50 X3JhdGUJPSBzdW44aV9pMnNfZ2V0X2JjbGtfcGFyZW50X3JhdGUsCisJLmdldF9zcgkJCT0gc3Vu OGlfaTJzX2dldF9zcl93c3MsCisJLmdldF93c3MJCT0gc3VuOGlfaTJzX2dldF9zcl93c3MsCisJ LnNldF9jaGFuX2NmZwkJPSBzdW41MGlfaTJzX3NldF9jaGFuX2NmZywKKwkuc2V0X2ZtdAkJPSBz dW41MGlfaTJzX3NldF9zb2NfZm10LAorfTsKKwogc3RhdGljIGludCBzdW40aV9pMnNfaW5pdF9y ZWdtYXBfZmllbGRzKHN0cnVjdCBkZXZpY2UgKmRldiwKIAkJCQkJc3RydWN0IHN1bjRpX2kycyAq aTJzKQogewpAQCAtMTMyOCw2ICsxNTUxLDEwIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2 aWNlX2lkIHN1bjRpX2kyc19tYXRjaFtdID0gewogCQkuY29tcGF0aWJsZSA9ICJhbGx3aW5uZXIs c3VuNTBpLWE2NC1jb2RlYy1pMnMiLAogCQkuZGF0YSA9ICZzdW41MGlfYTY0X2NvZGVjX2kyc19x dWlya3MsCiAJfSwKKwl7CisJCS5jb21wYXRpYmxlID0gImFsbHdpbm5lcixzdW41MGktaDYtaTJz IiwKKwkJLmRhdGEgPSAmc3VuNTBpX2g2X2kyc19xdWlya3MsCisJfSwKIAl7fQogfTsKIE1PRFVM RV9ERVZJQ0VfVEFCTEUob2YsIHN1bjRpX2kyc19tYXRjaCk7Ci0tIAoyLjIwLjEKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVs IG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDov L2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== 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=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,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT 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 6CD6BC38A30 for ; Sat, 18 Apr 2020 22:45:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4159921D7E for ; Sat, 18 Apr 2020 22:45:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a32N8wG+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728317AbgDRWop (ORCPT ); Sat, 18 Apr 2020 18:44:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728315AbgDRWoo (ORCPT ); Sat, 18 Apr 2020 18:44:44 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76741C061A0C; Sat, 18 Apr 2020 15:44:44 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id g13so5375469wrb.8; Sat, 18 Apr 2020 15:44:44 -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=V/lpQn53gdEXltFH79q8XmCEGM5dgBCWmNxBGwbhAXM=; b=a32N8wG+5ag2ojOmPuOJuQCoAn95+wI5FWPfKNwqexGw5oJHYjBzAYCAcaUiJxbLw1 0sAvD55q1CeCgoSC0vr0nzEoZJabsdGT7/cZcBHMmv3+SIDBaz2NNLEz0aBndWXj6x83 NBgD53VlrrUkn3Y327+eoK4kY6ogRVfgJ13Ru3z7m34MKjy+6Cl9BgW3MgJnxBIi2M9E ee66jGJMmh7utL/sVXaPVcYpxwaooGbcPhugt6gnkJwuJ1RgtfgHHYG5j5qfLL85ZMrW MlfWD7V/fsrpQd5gA5B/wDlbXhOKT5MEwewIbiPf0dZPpInOxgXO5ybtYhtkEEPdOLTU 8gIg== 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=V/lpQn53gdEXltFH79q8XmCEGM5dgBCWmNxBGwbhAXM=; b=Io9iLfUqPdMZ+/8UWHAPl9J+6vwlnti/Nj+smMfaV1dpxGlry7yOY4d7a71UEqbSHE 3FOyBKF6w/gVmwPv4SnQvWmOXsHw5GHm7/lOnxaBrT0Qd59HNfDiVaIgHDfb8tOFRXsx 3Q5fSpOmsczSbg3LgKhn5w1WllwDK9LPePtDKBmRzdSi0MjSpEmCyUBJPJMjC9Jkk396 sEAlX/phd0sx7mXG91ZxhC+ZWDrP+UFJZ7Gn1BNrg6CRCR2FRgko9GiZK15IwyhT5trn JBPktyUdJDBBCvdkVO9ErCWIo2E6N+cJmVmvOGsqzORCqg119aKEEBr+iJpPPSqQYWAd GghQ== X-Gm-Message-State: AGi0PuaGXlX9LaPPzix5X9nz4NCtJubTY8jeGOhrSHpGpGGZfmmSMmgR p0dkYn0UYBr4GUv+q/z7VW4= X-Google-Smtp-Source: APiQypLlVNnXTzRiABRJC2v2Bpj0arub7fRlTwhNbvCex+zLQNQMa3j6U5tCAAZUhV7wZxXu/1/MEw== X-Received: by 2002:a5d:51c6:: with SMTP id n6mr10827370wrv.314.1587249883078; Sat, 18 Apr 2020 15:44:43 -0700 (PDT) Received: from localhost.localdomain (91-167-199-67.subs.proxad.net. [91.167.199.67]) by smtp.gmail.com with ESMTPSA id t16sm13371559wmi.27.2020.04.18.15.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:44:42 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jernej Skrabec , Marcus Cooper , =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v2 3/7] ASoC: sun4i-i2s: Add support for H6 I2S Date: Sun, 19 Apr 2020 00:44:31 +0200 Message-Id: <20200418224435.23672-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418224435.23672-1-peron.clem@gmail.com> References: <20200418224435.23672-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Jernej Skrabec H6 I2S is very similar to that in H3, except it supports up to 16 channels. Signed-off-by: Jernej Skrabec Signed-off-by: Marcus Cooper Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 227 ++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 4198a5410bf9..a23c9f2a3f8c 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -124,6 +124,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; /** @@ -469,6 +484,65 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, + const struct snd_pcm_hw_params *params) +{ + unsigned int channels = params_channels(params); + unsigned int slots = channels; + unsigned int lrck_period; + + if (i2s->slots) + slots = i2s->slots; + + /* Map the channels for playback and capture */ + regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210); + regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210); + + /* Configure the channels */ + regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG, + SUN50I_H6_I2S_TX_CHAN_SEL_MASK, + SUN50I_H6_I2S_TX_CHAN_SEL(channels)); + 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(channels)); + + regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG, + SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM_MASK, + SUN8I_I2S_CHAN_CFG_TX_SLOT_NUM(channels)); + regmap_update_bits(i2s->regmap, SUN8I_I2S_CHAN_CFG_REG, + SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM_MASK, + SUN8I_I2S_CHAN_CFG_RX_SLOT_NUM(channels)); + + switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: + case SND_SOC_DAIFMT_LEFT_J: + case SND_SOC_DAIFMT_RIGHT_J: + lrck_period = params_physical_width(params) * slots; + break; + + case SND_SOC_DAIFMT_I2S: + lrck_period = params_physical_width(params); + break; + + default: + return -EINVAL; + } + + if (i2s->slot_width) + lrck_period = i2s->slot_width; + + regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG, + SUN8I_I2S_FMT0_LRCK_PERIOD_MASK, + SUN8I_I2S_FMT0_LRCK_PERIOD(lrck_period)); + + regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG, + SUN50I_H6_I2S_TX_CHAN_EN_MASK, + SUN50I_H6_I2S_TX_CHAN_EN(channels)); + + return 0; +} + static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -694,6 +768,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, + unsigned int fmt) +{ + u32 mode, val; + u8 offset; + + /* + * DAI clock polarity + * + * The setup for LRCK contradicts the datasheet, but under a + * scope it's clear that the LRCK polarity is reversed + * compared to the expected polarity on the bus. + */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_IB_IF: + /* Invert both clocks */ + val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED; + break; + case SND_SOC_DAIFMT_IB_NF: + /* Invert bit clock */ + val = SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED | + SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED; + break; + case SND_SOC_DAIFMT_NB_IF: + /* Invert frame clock */ + val = 0; + break; + case SND_SOC_DAIFMT_NB_NF: + val = SUN8I_I2S_FMT0_LRCLK_POLARITY_INVERTED; + break; + default: + return -EINVAL; + } + + regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG, + SUN8I_I2S_FMT0_LRCLK_POLARITY_MASK | + SUN8I_I2S_FMT0_BCLK_POLARITY_MASK, + val); + + /* DAI Mode */ + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + mode = SUN8I_I2S_CTRL_MODE_PCM; + offset = 1; + break; + + case SND_SOC_DAIFMT_DSP_B: + mode = SUN8I_I2S_CTRL_MODE_PCM; + offset = 0; + break; + + case SND_SOC_DAIFMT_I2S: + mode = SUN8I_I2S_CTRL_MODE_LEFT; + offset = 1; + break; + + case SND_SOC_DAIFMT_LEFT_J: + mode = SUN8I_I2S_CTRL_MODE_LEFT; + offset = 0; + break; + + case SND_SOC_DAIFMT_RIGHT_J: + mode = SUN8I_I2S_CTRL_MODE_RIGHT; + offset = 0; + break; + + default: + return -EINVAL; + } + + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN8I_I2S_CTRL_MODE_MASK, mode); + regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG, + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET_MASK, + SUN50I_H6_I2S_TX_CHAN_SEL_OFFSET(offset)); + 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(offset)); + + /* DAI clock master masks */ + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* BCLK and LRCLK master */ + val = SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT; + break; + + case SND_SOC_DAIFMT_CBM_CFM: + /* BCLK and LRCLK slave */ + val = 0; + break; + + default: + return -EINVAL; + } + + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT, + val); + + return 0; +} + static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); @@ -974,6 +1150,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, @@ -1001,6 +1193,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); @@ -1159,6 +1364,24 @@ static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = { .set_fmt = sun4i_i2s_set_soc_fmt, }; +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, + .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), + .bclk_dividers = sun8i_i2s_clk_div, + .num_bclk_dividers = ARRAY_SIZE(sun8i_i2s_clk_div), + .mclk_dividers = sun8i_i2s_clk_div, + .num_mclk_dividers = ARRAY_SIZE(sun8i_i2s_clk_div), + .get_bclk_parent_rate = sun8i_i2s_get_bclk_parent_rate, + .get_sr = sun8i_i2s_get_sr_wss, + .get_wss = sun8i_i2s_get_sr_wss, + .set_chan_cfg = sun50i_i2s_set_chan_cfg, + .set_fmt = sun50i_i2s_set_soc_fmt, +}; + static int sun4i_i2s_init_regmap_fields(struct device *dev, struct sun4i_i2s *i2s) { @@ -1328,6 +1551,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); -- 2.20.1