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,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 4C7F7C56202 for ; Mon, 26 Oct 2020 18:52:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DFA6621D41 for ; Mon, 26 Oct 2020 18:52:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sUC/U5WI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1790534AbgJZSw4 (ORCPT ); Mon, 26 Oct 2020 14:52:56 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39450 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1790489AbgJZSws (ORCPT ); Mon, 26 Oct 2020 14:52:48 -0400 Received: by mail-wm1-f65.google.com with SMTP id d3so13582962wma.4; Mon, 26 Oct 2020 11:52:46 -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=MGhLXOjm45U8bNXIcJPRY/YaLTbLI7QRwvkZmrc47Z8=; b=sUC/U5WIBYjTY2N6BJ8IxbVUKcDZ1uVcFc0LE7cCq8BGzmcUkYGl19Y42VprwkBl/d 9MqPyvzZkVZZPVVPWflLTftyIjF3cJ22lP7lkTraW4IeobtIN43b9ATcXo3ZfR3wjads IQ8XTlQPHa2kUeNEONGdSt6IWFuOKfP+IQmhiRnC0PdgfjNtb6CXR4g4/k/tnEEvZsWm iN6gn0Veqe+xhOiPqjo79Yiz4KtQxJxgwt7N5NCTxXvNCJxcUv02dpS57DUIUSpZuZ8U LenYBGunrRSmW9KM+OKMLrtc9Kf7buwuMhpwVqzS5G198tE6KtPvq+eIztvUCYotJs2P OjRA== 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=MGhLXOjm45U8bNXIcJPRY/YaLTbLI7QRwvkZmrc47Z8=; b=lZ+WZ814lYQzrQDupfr6MYhsjOxboknQSumimaSrA3DPSlsm5Q2uuXhoqfFn70VoV5 6WbyotmIBazq0s31YiUczZIjDFMV81vJbr2+BGyU8UtEipbRCXTAvSCm3iCCwCR2wN7y JqfSqCbH6XRWV9mQTFuVqweZWuhf3z4p3nMZdUxsaA3b1t0JPXe54dSL/T1xqRdwyvjs xMkD4Fa840D3Y9IjyoVdr3e8YrnLlWAlNXeaqLW99iOcmpb9r67YwMieOCnfmwPc7OP+ 8jm8bghsaxHupdl9VBUBNJdoRpJk9dudaIaoG9n1GhFieWZWL3k9zob/AxmsGjoAc8P9 G3DA== X-Gm-Message-State: AOAM533ww4v05UZhZhk9QBW19BMw76e76Emln+W8Bgkipo4+nDfmidbo PkUmvXSbMKxNB1UheP9HAIA= X-Google-Smtp-Source: ABdhPJyPL1eqf4xRFCG28r9vdborcvUUscw06icgjn7+DjqPALr8r6PnCg3nuaqlgSQgGczPDVFp/A== X-Received: by 2002:a1c:2901:: with SMTP id p1mr18056623wmp.170.1603738365449; Mon, 26 Oct 2020 11:52:45 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id f7sm24885193wrx.64.2020.10.26.11.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 11:52:44 -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 v8 02/14] ASoC: sun4i-i2s: Add support for H6 I2S Date: Mon, 26 Oct 2020 19:52:27 +0100 Message-Id: <20201026185239.379417-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026185239.379417-1-peron.clem@gmail.com> References: <20201026185239.379417-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: 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 Reviewed-by: Chen-Yu Tsai Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 222 ++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 6c10f810b114..5bec7fbd0b30 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; /** @@ -470,6 +485,60 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, + unsigned int channels, unsigned int slots, + unsigned int slot_width) +{ + unsigned int lrck_period; + + /* Map the channels for playback and capture */ + regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP0_REG, 0xFEDCBA98); + regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210); + regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP0_REG, 0xFEDCBA98); + 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 = slot_width * slots; + break; + + case SND_SOC_DAIFMT_I2S: + lrck_period = slot_width; + break; + + default: + return -EINVAL; + } + + 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) @@ -702,6 +771,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_h6_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); @@ -982,6 +1153,22 @@ static const struct reg_default sun8i_i2s_reg_defaults[] = { { SUN8I_I2S_RX_CHAN_MAP_REG, 0x00000000 }, }; +static const struct reg_default sun50i_h6_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, @@ -1009,6 +1196,19 @@ static const struct regmap_config sun8i_i2s_regmap_config = { .volatile_reg = sun8i_i2s_volatile_reg, }; +static const struct regmap_config sun50i_h6_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_h6_i2s_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(sun50i_h6_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); @@ -1167,6 +1367,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_h6_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_h6_i2s_set_chan_cfg, + .set_fmt = sun50i_h6_i2s_set_soc_fmt, +}; + static int sun4i_i2s_init_regmap_fields(struct device *dev, struct sun4i_i2s *i2s) { @@ -1336,6 +1554,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.25.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=-12.5 required=3.0 tests=BAYES_00, 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,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 9B742C2D0A3 for ; Mon, 26 Oct 2020 18:54:41 +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 BCB2B2085B for ; Mon, 26 Oct 2020 18:54:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="Vt4v2OgS"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sUC/U5WI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCB2B2085B 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 338C916B6; Mon, 26 Oct 2020 19:53:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 338C916B6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1603738479; bh=0TPVbMs+FGs2sv2OZBMwV6l1Am/ku/nHccctuz0nBgs=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Vt4v2OgSlo+cMVQ8iuSnXh3JQGZWngV2H1m0sPXDaRX/9SC+BenWT+C8M40M0jPGT bVZTh6HpdpkCvrUKMvcvK9SPHI1jZ1tAb9PXnutdvLEceLpWmuuOx1f7ozpA/4iBRp KvSgXxySycD24bB1SeymMNuoCaIxuhOsFcM3N7oo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 316F8F804BC; Mon, 26 Oct 2020 19:52:56 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D4D53F804BB; Mon, 26 Oct 2020 19:52:53 +0100 (CET) Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 D3F0BF801D5 for ; Mon, 26 Oct 2020 19:52:46 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D3F0BF801D5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sUC/U5WI" Received: by mail-wm1-x344.google.com with SMTP id h22so2483257wmb.0 for ; Mon, 26 Oct 2020 11:52:46 -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=MGhLXOjm45U8bNXIcJPRY/YaLTbLI7QRwvkZmrc47Z8=; b=sUC/U5WIBYjTY2N6BJ8IxbVUKcDZ1uVcFc0LE7cCq8BGzmcUkYGl19Y42VprwkBl/d 9MqPyvzZkVZZPVVPWflLTftyIjF3cJ22lP7lkTraW4IeobtIN43b9ATcXo3ZfR3wjads IQ8XTlQPHa2kUeNEONGdSt6IWFuOKfP+IQmhiRnC0PdgfjNtb6CXR4g4/k/tnEEvZsWm iN6gn0Veqe+xhOiPqjo79Yiz4KtQxJxgwt7N5NCTxXvNCJxcUv02dpS57DUIUSpZuZ8U LenYBGunrRSmW9KM+OKMLrtc9Kf7buwuMhpwVqzS5G198tE6KtPvq+eIztvUCYotJs2P OjRA== 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=MGhLXOjm45U8bNXIcJPRY/YaLTbLI7QRwvkZmrc47Z8=; b=sJzgYvdRXcq3nGo6d9ie2x1xP+lRNnV+xauhVcvWUXe182QZHUKv0hcVVdGhpEH5yu bqMGV9I6lMZ29WcUwpYHnw3AcfERjbgHP25ryLgUDL2m2fWkRya72U2giJ/r2c9r6Op4 3ZtWCeelGDdUUnn9I9EXNRJdmR9taaY3Wq2uKPC/k5TslvFeKF8zhOAfcXpoPGUUEMI/ vIaXnlJlvdmJixSIIVnf/wqwm40zK77IRT8JqzHR5mRqbRA4fr4SF9tI7r85bC9L2ncA VEkbX3IJ03SIem5kB7CIZp1fDHPCVtGehSc5YerUm2ErkCrqa3K7XcDCMW7RG50dFa8l sElg== X-Gm-Message-State: AOAM530jHiLqHXjnM+7vKk9Z41xw3QxXtwaNiWZ8RSkaxQMogdiJQeZv +RxUVujQnODFBRQVONY1jKc= X-Google-Smtp-Source: ABdhPJyPL1eqf4xRFCG28r9vdborcvUUscw06icgjn7+DjqPALr8r6PnCg3nuaqlgSQgGczPDVFp/A== X-Received: by 2002:a1c:2901:: with SMTP id p1mr18056623wmp.170.1603738365449; Mon, 26 Oct 2020 11:52:45 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id f7sm24885193wrx.64.2020.10.26.11.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 11:52:44 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v8 02/14] ASoC: sun4i-i2s: Add support for H6 I2S Date: Mon, 26 Oct 2020 19:52:27 +0100 Message-Id: <20201026185239.379417-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026185239.379417-1-peron.clem@gmail.com> References: <20201026185239.379417-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, Jernej Skrabec , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Marcus Cooper , linux-sunxi@googlegroups.com, =?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 Reviewed-by: Chen-Yu Tsai Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 222 ++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 6c10f810b114..5bec7fbd0b30 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; /** @@ -470,6 +485,60 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, + unsigned int channels, unsigned int slots, + unsigned int slot_width) +{ + unsigned int lrck_period; + + /* Map the channels for playback and capture */ + regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP0_REG, 0xFEDCBA98); + regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210); + regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP0_REG, 0xFEDCBA98); + 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 = slot_width * slots; + break; + + case SND_SOC_DAIFMT_I2S: + lrck_period = slot_width; + break; + + default: + return -EINVAL; + } + + 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) @@ -702,6 +771,108 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s, return 0; } +static int sun50i_h6_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); @@ -982,6 +1153,22 @@ static const struct reg_default sun8i_i2s_reg_defaults[] = { { SUN8I_I2S_RX_CHAN_MAP_REG, 0x00000000 }, }; +static const struct reg_default sun50i_h6_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, @@ -1009,6 +1196,19 @@ static const struct regmap_config sun8i_i2s_regmap_config = { .volatile_reg = sun8i_i2s_volatile_reg, }; +static const struct regmap_config sun50i_h6_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_h6_i2s_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(sun50i_h6_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); @@ -1167,6 +1367,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_h6_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_h6_i2s_set_chan_cfg, + .set_fmt = sun50i_h6_i2s_set_soc_fmt, +}; + static int sun4i_i2s_init_regmap_fields(struct device *dev, struct sun4i_i2s *i2s) { @@ -1336,6 +1554,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.25.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=-12.5 required=3.0 tests=BAYES_00, 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,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 2ECAEC5517A for ; Mon, 26 Oct 2020 18:55:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 938022168B for ; Mon, 26 Oct 2020 18:55:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="W3CAV+oT"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sUC/U5WI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 938022168B 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+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=merlin.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=IwyGpqMfx0QOMW780Z86dePWkVziV98Ho6rQQZfqtQA=; b=W3CAV+oTKfxxj+lJmkW8pIVBd rkmcvtGGNoUeKBIGg75jze5lVoJ7LyafP66lBhHPloUXF5L2sR4lPrcp7RHecQ/2xCdR25JOi0L8d Ra5jybraAvgsHKlHPYV5UtRWSGA7GbXNzlI96l1EXQH11D7i/SzA6neB5aLY4xHPqDxyNRrVqfxwg l3dPk1V6Tjki7Ba/DYgl+T6tvjQMGx+xQAbr0o5W/kZnA7mTo18VGvOwyiec+DGPTI6MnnhG/TMCb 09gQYW7T5Ad0M0ya4d+nS57cn71+P/qVdg7w3szQK4XZit1oBkQOttdU7OR+lFoaxpO5ZgxnFWPJK IltQ7Jovw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX7cH-0007Ar-RQ; Mon, 26 Oct 2020 18:53:13 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX7bq-0006ym-Ej for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 18:52:50 +0000 Received: by mail-wm1-x343.google.com with SMTP id c16so13574823wmd.2 for ; Mon, 26 Oct 2020 11:52:46 -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=MGhLXOjm45U8bNXIcJPRY/YaLTbLI7QRwvkZmrc47Z8=; b=sUC/U5WIBYjTY2N6BJ8IxbVUKcDZ1uVcFc0LE7cCq8BGzmcUkYGl19Y42VprwkBl/d 9MqPyvzZkVZZPVVPWflLTftyIjF3cJ22lP7lkTraW4IeobtIN43b9ATcXo3ZfR3wjads IQ8XTlQPHa2kUeNEONGdSt6IWFuOKfP+IQmhiRnC0PdgfjNtb6CXR4g4/k/tnEEvZsWm iN6gn0Veqe+xhOiPqjo79Yiz4KtQxJxgwt7N5NCTxXvNCJxcUv02dpS57DUIUSpZuZ8U LenYBGunrRSmW9KM+OKMLrtc9Kf7buwuMhpwVqzS5G198tE6KtPvq+eIztvUCYotJs2P OjRA== 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=MGhLXOjm45U8bNXIcJPRY/YaLTbLI7QRwvkZmrc47Z8=; b=dn2SmhcUgS905n50ozuKFZ9BH+faaCyBPN1SYT4OLqPIQC30k1F6g3KHckvy0MUlcF 8MRN+0WzDCI9+ssg7F2zMpxVz0LkyOaBPr6ngeRSoyQZ8810936oXeXou5lkVvi/i+kD 6CpAKG6w1jm8wY+m4LT4vHkhqnRqHdhjuR4SKKz5dx1bcNPmN/wsbl3Jjt+sXvGstyTH RyFtNgAv3TdkykwJTaa/8qPXZb5+LcUa9TiOpXen2T9w8mLiH5mSvv3ZvgNPiFu7cfUs +d8MuIHIiovByyQPv+cnx6FgVHmkEXMIe83GbgFVXiHakQsFx4fguR86zaOPprrKMcu/ x4gA== X-Gm-Message-State: AOAM530m1zx81jPqhMwKExwIzYJka+WZ5MMvYLswaFH9kC8rm5OIdOTs tjs0BK83I4u1BqQg/JAkjoR54PihDadsFg== X-Google-Smtp-Source: ABdhPJyPL1eqf4xRFCG28r9vdborcvUUscw06icgjn7+DjqPALr8r6PnCg3nuaqlgSQgGczPDVFp/A== X-Received: by 2002:a1c:2901:: with SMTP id p1mr18056623wmp.170.1603738365449; Mon, 26 Oct 2020 11:52:45 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id f7sm24885193wrx.64.2020.10.26.11.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 11:52:44 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v8 02/14] ASoC: sun4i-i2s: Add support for H6 I2S Date: Mon, 26 Oct 2020 19:52:27 +0100 Message-Id: <20201026185239.379417-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026185239.379417-1-peron.clem@gmail.com> References: <20201026185239.379417-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-20201026_145246_551246_DF8CAE50 X-CRM114-Status: GOOD ( 22.09 ) 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, Jernej Skrabec , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Jaroslav Kysela , Marcus Cooper , linux-sunxi@googlegroups.com, =?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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogSmVybmVqIFNrcmFiZWMgPGplcm5lai5za3JhYmVjQHNpb2wubmV0PgoKSDYgSTJTIGlz IHZlcnkgc2ltaWxhciB0byB0aGF0IGluIEgzLCBleGNlcHQgaXQgc3VwcG9ydHMgdXAgdG8gMTYK Y2hhbm5lbHMuCgpTaWduZWQtb2ZmLWJ5OiBKZXJuZWogU2tyYWJlYyA8amVybmVqLnNrcmFiZWNA c2lvbC5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1hcmN1cyBDb29wZXIgPGNvZGVraXBwZXJAZ21haWwu Y29tPgpSZXZpZXdlZC1ieTogQ2hlbi1ZdSBUc2FpIDx3ZW5zQGNzaWUub3JnPgpTaWduZWQtb2Zm LWJ5OiBDbMOpbWVudCBQw6lyb24gPHBlcm9uLmNsZW1AZ21haWwuY29tPgotLS0KIHNvdW5kL3Nv Yy9zdW54aS9zdW40aS1pMnMuYyB8IDIyMiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIDEgZmlsZSBjaGFuZ2VkLCAyMjIgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL3Nv dW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYyBiL3NvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYwpp bmRleCA2YzEwZjgxMGIxMTQuLjViZWM3ZmJkMGIzMCAxMDA2NDQKLS0tIGEvc291bmQvc29jL3N1 bnhpL3N1bjRpLWkycy5jCisrKyBiL3NvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYwpAQCAtMTI0 LDYgKzEyNCwyMSBAQAogI2RlZmluZSBTVU44SV9JMlNfUlhfQ0hBTl9TRUxfUkVHCTB4NTQKICNk ZWZpbmUgU1VOOElfSTJTX1JYX0NIQU5fTUFQX1JFRwkweDU4CiAKKy8qIERlZmluZXMgcmVxdWly ZWQgZm9yIHN1bjUwaS1oNiBzdXBwb3J0ICovCisjZGVmaW5lIFNVTjUwSV9INl9JMlNfVFhfQ0hB Tl9TRUxfT0ZGU0VUX01BU0sJR0VOTUFTSygyMSwgMjApCisjZGVmaW5lIFNVTjUwSV9INl9JMlNf VFhfQ0hBTl9TRUxfT0ZGU0VUKG9mZnNldCkJKChvZmZzZXQpIDw8IDIwKQorI2RlZmluZSBTVU41 MElfSDZfSTJTX1RYX0NIQU5fU0VMX01BU0sJCUdFTk1BU0soMTksIDE2KQorI2RlZmluZSBTVU41 MElfSDZfSTJTX1RYX0NIQU5fU0VMKGNoYW4pCQkoKGNoYW4gLSAxKSA8PCAxNikKKyNkZWZpbmUg U1VONTBJX0g2X0kyU19UWF9DSEFOX0VOX01BU0sJCUdFTk1BU0soMTUsIDApCisjZGVmaW5lIFNV TjUwSV9INl9JMlNfVFhfQ0hBTl9FTihudW1fY2hhbikJKCgoMSA8PCBudW1fY2hhbikgLSAxKSkK KworI2RlZmluZSBTVU41MElfSDZfSTJTX1RYX0NIQU5fTUFQMF9SRUcJMHg0NAorI2RlZmluZSBT VU41MElfSDZfSTJTX1RYX0NIQU5fTUFQMV9SRUcJMHg0OAorCisjZGVmaW5lIFNVTjUwSV9INl9J MlNfUlhfQ0hBTl9TRUxfUkVHCTB4NjQKKyNkZWZpbmUgU1VONTBJX0g2X0kyU19SWF9DSEFOX01B UDBfUkVHCTB4NjgKKyNkZWZpbmUgU1VONTBJX0g2X0kyU19SWF9DSEFOX01BUDFfUkVHCTB4NkMK Kwogc3RydWN0IHN1bjRpX2kyczsKIAogLyoqCkBAIC00NzAsNiArNDg1LDYwIEBAIHN0YXRpYyBp bnQgc3VuOGlfaTJzX3NldF9jaGFuX2NmZyhjb25zdCBzdHJ1Y3Qgc3VuNGlfaTJzICppMnMsCiAJ cmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgc3VuNTBpX2g2X2kyc19zZXRfY2hhbl9jZmcoY29u c3Qgc3RydWN0IHN1bjRpX2kycyAqaTJzLAorCQkJCSAgICAgIHVuc2lnbmVkIGludCBjaGFubmVs cywgdW5zaWduZWQgaW50IHNsb3RzLAorCQkJCSAgICAgIHVuc2lnbmVkIGludCBzbG90X3dpZHRo KQoreworCXVuc2lnbmVkIGludCBscmNrX3BlcmlvZDsKKworCS8qIE1hcCB0aGUgY2hhbm5lbHMg Zm9yIHBsYXliYWNrIGFuZCBjYXB0dXJlICovCisJcmVnbWFwX3dyaXRlKGkycy0+cmVnbWFwLCBT VU41MElfSDZfSTJTX1RYX0NIQU5fTUFQMF9SRUcsIDB4RkVEQ0JBOTgpOworCXJlZ21hcF93cml0 ZShpMnMtPnJlZ21hcCwgU1VONTBJX0g2X0kyU19UWF9DSEFOX01BUDFfUkVHLCAweDc2NTQzMjEw KTsKKwlyZWdtYXBfd3JpdGUoaTJzLT5yZWdtYXAsIFNVTjUwSV9INl9JMlNfUlhfQ0hBTl9NQVAw X1JFRywgMHhGRURDQkE5OCk7CisJcmVnbWFwX3dyaXRlKGkycy0+cmVnbWFwLCBTVU41MElfSDZf STJTX1JYX0NIQU5fTUFQMV9SRUcsIDB4NzY1NDMyMTApOworCisJLyogQ29uZmlndXJlIHRoZSBj aGFubmVscyAqLworCXJlZ21hcF91cGRhdGVfYml0cyhpMnMtPnJlZ21hcCwgU1VOOElfSTJTX1RY X0NIQU5fU0VMX1JFRywKKwkJCSAgIFNVTjUwSV9INl9JMlNfVFhfQ0hBTl9TRUxfTUFTSywKKwkJ CSAgIFNVTjUwSV9INl9JMlNfVFhfQ0hBTl9TRUwoY2hhbm5lbHMpKTsKKwlyZWdtYXBfdXBkYXRl X2JpdHMoaTJzLT5yZWdtYXAsIFNVTjUwSV9INl9JMlNfUlhfQ0hBTl9TRUxfUkVHLAorCQkJICAg U1VONTBJX0g2X0kyU19UWF9DSEFOX1NFTF9NQVNLLAorCQkJICAgU1VONTBJX0g2X0kyU19UWF9D SEFOX1NFTChjaGFubmVscykpOworCisJcmVnbWFwX3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFwLCBT VU44SV9JMlNfQ0hBTl9DRkdfUkVHLAorCQkJICAgU1VOOElfSTJTX0NIQU5fQ0ZHX1RYX1NMT1Rf TlVNX01BU0ssCisJCQkgICBTVU44SV9JMlNfQ0hBTl9DRkdfVFhfU0xPVF9OVU0oY2hhbm5lbHMp KTsKKwlyZWdtYXBfdXBkYXRlX2JpdHMoaTJzLT5yZWdtYXAsIFNVTjhJX0kyU19DSEFOX0NGR19S RUcsCisJCQkgICBTVU44SV9JMlNfQ0hBTl9DRkdfUlhfU0xPVF9OVU1fTUFTSywKKwkJCSAgIFNV TjhJX0kyU19DSEFOX0NGR19SWF9TTE9UX05VTShjaGFubmVscykpOworCisJc3dpdGNoIChpMnMt PmZvcm1hdCAmIFNORF9TT0NfREFJRk1UX0ZPUk1BVF9NQVNLKSB7CisJY2FzZSBTTkRfU09DX0RB SUZNVF9EU1BfQToKKwljYXNlIFNORF9TT0NfREFJRk1UX0RTUF9COgorCWNhc2UgU05EX1NPQ19E QUlGTVRfTEVGVF9KOgorCWNhc2UgU05EX1NPQ19EQUlGTVRfUklHSFRfSjoKKwkJbHJja19wZXJp b2QgPSBzbG90X3dpZHRoICogc2xvdHM7CisJCWJyZWFrOworCisJY2FzZSBTTkRfU09DX0RBSUZN VF9JMlM6CisJCWxyY2tfcGVyaW9kID0gc2xvdF93aWR0aDsKKwkJYnJlYWs7CisKKwlkZWZhdWx0 OgorCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlyZWdtYXBfdXBkYXRlX2JpdHMoaTJzLT5yZWdt YXAsIFNVTjRJX0kyU19GTVQwX1JFRywKKwkJCSAgIFNVTjhJX0kyU19GTVQwX0xSQ0tfUEVSSU9E X01BU0ssCisJCQkgICBTVU44SV9JMlNfRk1UMF9MUkNLX1BFUklPRChscmNrX3BlcmlvZCkpOwor CisJcmVnbWFwX3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFwLCBTVU44SV9JMlNfVFhfQ0hBTl9TRUxf UkVHLAorCQkJICAgU1VONTBJX0g2X0kyU19UWF9DSEFOX0VOX01BU0ssCisJCQkgICBTVU41MElf SDZfSTJTX1RYX0NIQU5fRU4oY2hhbm5lbHMpKTsKKworCXJldHVybiAwOworfQorCiBzdGF0aWMg aW50IHN1bjRpX2kyc19od19wYXJhbXMoc3RydWN0IHNuZF9wY21fc3Vic3RyZWFtICpzdWJzdHJl YW0sCiAJCQkgICAgICAgc3RydWN0IHNuZF9wY21faHdfcGFyYW1zICpwYXJhbXMsCiAJCQkgICAg ICAgc3RydWN0IHNuZF9zb2NfZGFpICpkYWkpCkBAIC03MDIsNiArNzcxLDEwOCBAQCBzdGF0aWMg aW50IHN1bjhpX2kyc19zZXRfc29jX2ZtdChjb25zdCBzdHJ1Y3Qgc3VuNGlfaTJzICppMnMsCiAJ cmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgc3VuNTBpX2g2X2kyc19zZXRfc29jX2ZtdChjb25z dCBzdHJ1Y3Qgc3VuNGlfaTJzICppMnMsCisJCQkJICAgICB1bnNpZ25lZCBpbnQgZm10KQorewor CXUzMiBtb2RlLCB2YWw7CisJdTggb2Zmc2V0OworCisJLyoKKwkgKiBEQUkgY2xvY2sgcG9sYXJp dHkKKwkgKgorCSAqIFRoZSBzZXR1cCBmb3IgTFJDSyBjb250cmFkaWN0cyB0aGUgZGF0YXNoZWV0 LCBidXQgdW5kZXIgYQorCSAqIHNjb3BlIGl0J3MgY2xlYXIgdGhhdCB0aGUgTFJDSyBwb2xhcml0 eSBpcyByZXZlcnNlZAorCSAqIGNvbXBhcmVkIHRvIHRoZSBleHBlY3RlZCBwb2xhcml0eSBvbiB0 aGUgYnVzLgorCSAqLworCXN3aXRjaCAoZm10ICYgU05EX1NPQ19EQUlGTVRfSU5WX01BU0spIHsK KwljYXNlIFNORF9TT0NfREFJRk1UX0lCX0lGOgorCQkvKiBJbnZlcnQgYm90aCBjbG9ja3MgKi8K KwkJdmFsID0gU1VOOElfSTJTX0ZNVDBfQkNMS19QT0xBUklUWV9JTlZFUlRFRDsKKwkJYnJlYWs7 CisJY2FzZSBTTkRfU09DX0RBSUZNVF9JQl9ORjoKKwkJLyogSW52ZXJ0IGJpdCBjbG9jayAqLwor CQl2YWwgPSBTVU44SV9JMlNfRk1UMF9CQ0xLX1BPTEFSSVRZX0lOVkVSVEVEIHwKKwkJICAgICAg U1VOOElfSTJTX0ZNVDBfTFJDTEtfUE9MQVJJVFlfSU5WRVJURUQ7CisJCWJyZWFrOworCWNhc2Ug U05EX1NPQ19EQUlGTVRfTkJfSUY6CisJCS8qIEludmVydCBmcmFtZSBjbG9jayAqLworCQl2YWwg PSAwOworCQlicmVhazsKKwljYXNlIFNORF9TT0NfREFJRk1UX05CX05GOgorCQl2YWwgPSBTVU44 SV9JMlNfRk1UMF9MUkNMS19QT0xBUklUWV9JTlZFUlRFRDsKKwkJYnJlYWs7CisJZGVmYXVsdDoK KwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJcmVnbWFwX3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFw LCBTVU40SV9JMlNfRk1UMF9SRUcsCisJCQkgICBTVU44SV9JMlNfRk1UMF9MUkNMS19QT0xBUklU WV9NQVNLIHwKKwkJCSAgIFNVTjhJX0kyU19GTVQwX0JDTEtfUE9MQVJJVFlfTUFTSywKKwkJCSAg IHZhbCk7CisKKwkvKiBEQUkgTW9kZSAqLworCXN3aXRjaCAoZm10ICYgU05EX1NPQ19EQUlGTVRf Rk9STUFUX01BU0spIHsKKwljYXNlIFNORF9TT0NfREFJRk1UX0RTUF9BOgorCQltb2RlID0gU1VO OElfSTJTX0NUUkxfTU9ERV9QQ007CisJCW9mZnNldCA9IDE7CisJCWJyZWFrOworCisJY2FzZSBT TkRfU09DX0RBSUZNVF9EU1BfQjoKKwkJbW9kZSA9IFNVTjhJX0kyU19DVFJMX01PREVfUENNOwor CQlvZmZzZXQgPSAwOworCQlicmVhazsKKworCWNhc2UgU05EX1NPQ19EQUlGTVRfSTJTOgorCQlt b2RlID0gU1VOOElfSTJTX0NUUkxfTU9ERV9MRUZUOworCQlvZmZzZXQgPSAxOworCQlicmVhazsK KworCWNhc2UgU05EX1NPQ19EQUlGTVRfTEVGVF9KOgorCQltb2RlID0gU1VOOElfSTJTX0NUUkxf TU9ERV9MRUZUOworCQlvZmZzZXQgPSAwOworCQlicmVhazsKKworCWNhc2UgU05EX1NPQ19EQUlG TVRfUklHSFRfSjoKKwkJbW9kZSA9IFNVTjhJX0kyU19DVFJMX01PREVfUklHSFQ7CisJCW9mZnNl dCA9IDA7CisJCWJyZWFrOworCisJZGVmYXVsdDoKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJ cmVnbWFwX3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFwLCBTVU40SV9JMlNfQ1RSTF9SRUcsCisJCQkg ICBTVU44SV9JMlNfQ1RSTF9NT0RFX01BU0ssIG1vZGUpOworCXJlZ21hcF91cGRhdGVfYml0cyhp MnMtPnJlZ21hcCwgU1VOOElfSTJTX1RYX0NIQU5fU0VMX1JFRywKKwkJCSAgIFNVTjUwSV9INl9J MlNfVFhfQ0hBTl9TRUxfT0ZGU0VUX01BU0ssCisJCQkgICBTVU41MElfSDZfSTJTX1RYX0NIQU5f U0VMX09GRlNFVChvZmZzZXQpKTsKKwlyZWdtYXBfdXBkYXRlX2JpdHMoaTJzLT5yZWdtYXAsIFNV TjUwSV9INl9JMlNfUlhfQ0hBTl9TRUxfUkVHLAorCQkJICAgU1VONTBJX0g2X0kyU19UWF9DSEFO X1NFTF9PRkZTRVRfTUFTSywKKwkJCSAgIFNVTjUwSV9INl9JMlNfVFhfQ0hBTl9TRUxfT0ZGU0VU KG9mZnNldCkpOworCisJLyogREFJIGNsb2NrIG1hc3RlciBtYXNrcyAqLworCXN3aXRjaCAoZm10 ICYgU05EX1NPQ19EQUlGTVRfTUFTVEVSX01BU0spIHsKKwljYXNlIFNORF9TT0NfREFJRk1UX0NC U19DRlM6CisJCS8qIEJDTEsgYW5kIExSQ0xLIG1hc3RlciAqLworCQl2YWwgPSBTVU44SV9JMlNf Q1RSTF9CQ0xLX09VVCB8CVNVTjhJX0kyU19DVFJMX0xSQ0tfT1VUOworCQlicmVhazsKKworCWNh c2UgU05EX1NPQ19EQUlGTVRfQ0JNX0NGTToKKwkJLyogQkNMSyBhbmQgTFJDTEsgc2xhdmUgKi8K KwkJdmFsID0gMDsKKwkJYnJlYWs7CisKKwlkZWZhdWx0OgorCQlyZXR1cm4gLUVJTlZBTDsKKwl9 CisKKwlyZWdtYXBfdXBkYXRlX2JpdHMoaTJzLT5yZWdtYXAsIFNVTjRJX0kyU19DVFJMX1JFRywK KwkJCSAgIFNVTjhJX0kyU19DVFJMX0JDTEtfT1VUIHwgU1VOOElfSTJTX0NUUkxfTFJDS19PVVQs CisJCQkgICB2YWwpOworCisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyBpbnQgc3VuNGlfaTJzX3Nl dF9mbXQoc3RydWN0IHNuZF9zb2NfZGFpICpkYWksIHVuc2lnbmVkIGludCBmbXQpCiB7CiAJc3Ry dWN0IHN1bjRpX2kycyAqaTJzID0gc25kX3NvY19kYWlfZ2V0X2RydmRhdGEoZGFpKTsKQEAgLTk4 Miw2ICsxMTUzLDIyIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcmVnX2RlZmF1bHQgc3VuOGlfaTJz X3JlZ19kZWZhdWx0c1tdID0gewogCXsgU1VOOElfSTJTX1JYX0NIQU5fTUFQX1JFRywgMHgwMDAw MDAwMCB9LAogfTsKIAorc3RhdGljIGNvbnN0IHN0cnVjdCByZWdfZGVmYXVsdCBzdW41MGlfaDZf aTJzX3JlZ19kZWZhdWx0c1tdID0geworCXsgU1VONElfSTJTX0NUUkxfUkVHLCAweDAwMDYwMDAw IH0sCisJeyBTVU40SV9JMlNfRk1UMF9SRUcsIDB4MDAwMDAwMzMgfSwKKwl7IFNVTjRJX0kyU19G TVQxX1JFRywgMHgwMDAwMDAzMCB9LAorCXsgU1VONElfSTJTX0ZJRk9fQ1RSTF9SRUcsIDB4MDAw NDAwZjAgfSwKKwl7IFNVTjRJX0kyU19ETUFfSU5UX0NUUkxfUkVHLCAweDAwMDAwMDAwIH0sCisJ eyBTVU40SV9JMlNfQ0xLX0RJVl9SRUcsIDB4MDAwMDAwMDAgfSwKKwl7IFNVTjhJX0kyU19DSEFO X0NGR19SRUcsIDB4MDAwMDAwMDAgfSwKKwl7IFNVTjhJX0kyU19UWF9DSEFOX1NFTF9SRUcsIDB4 MDAwMDAwMDAgfSwKKwl7IFNVTjUwSV9INl9JMlNfVFhfQ0hBTl9NQVAwX1JFRywgMHgwMDAwMDAw MCB9LAorCXsgU1VONTBJX0g2X0kyU19UWF9DSEFOX01BUDFfUkVHLCAweDAwMDAwMDAwIH0sCisJ eyBTVU41MElfSDZfSTJTX1JYX0NIQU5fU0VMX1JFRywgMHgwMDAwMDAwMCB9LAorCXsgU1VONTBJ X0g2X0kyU19SWF9DSEFOX01BUDBfUkVHLCAweDAwMDAwMDAwIH0sCisJeyBTVU41MElfSDZfSTJT X1JYX0NIQU5fTUFQMV9SRUcsIDB4MDAwMDAwMDAgfSwKK307CisKIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgcmVnbWFwX2NvbmZpZyBzdW40aV9pMnNfcmVnbWFwX2NvbmZpZyA9IHsKIAkucmVnX2JpdHMJ PSAzMiwKIAkucmVnX3N0cmlkZQk9IDQsCkBAIC0xMDA5LDYgKzExOTYsMTkgQEAgc3RhdGljIGNv bnN0IHN0cnVjdCByZWdtYXBfY29uZmlnIHN1bjhpX2kyc19yZWdtYXBfY29uZmlnID0gewogCS52 b2xhdGlsZV9yZWcJPSBzdW44aV9pMnNfdm9sYXRpbGVfcmVnLAogfTsKIAorc3RhdGljIGNvbnN0 IHN0cnVjdCByZWdtYXBfY29uZmlnIHN1bjUwaV9oNl9pMnNfcmVnbWFwX2NvbmZpZyA9IHsKKwku cmVnX2JpdHMJPSAzMiwKKwkucmVnX3N0cmlkZQk9IDQsCisJLnZhbF9iaXRzCT0gMzIsCisJLm1h eF9yZWdpc3Rlcgk9IFNVTjUwSV9INl9JMlNfUlhfQ0hBTl9NQVAxX1JFRywKKwkuY2FjaGVfdHlw ZQk9IFJFR0NBQ0hFX0ZMQVQsCisJLnJlZ19kZWZhdWx0cwk9IHN1bjUwaV9oNl9pMnNfcmVnX2Rl ZmF1bHRzLAorCS5udW1fcmVnX2RlZmF1bHRzCT0gQVJSQVlfU0laRShzdW41MGlfaDZfaTJzX3Jl Z19kZWZhdWx0cyksCisJLndyaXRlYWJsZV9yZWcJPSBzdW40aV9pMnNfd3JfcmVnLAorCS5yZWFk YWJsZV9yZWcJPSBzdW44aV9pMnNfcmRfcmVnLAorCS52b2xhdGlsZV9yZWcJPSBzdW44aV9pMnNf dm9sYXRpbGVfcmVnLAorfTsKKwogc3RhdGljIGludCBzdW40aV9pMnNfcnVudGltZV9yZXN1bWUo c3RydWN0IGRldmljZSAqZGV2KQogewogCXN0cnVjdCBzdW40aV9pMnMgKmkycyA9IGRldl9nZXRf ZHJ2ZGF0YShkZXYpOwpAQCAtMTE2Nyw2ICsxMzY3LDI0IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg c3VuNGlfaTJzX3F1aXJrcyBzdW41MGlfYTY0X2NvZGVjX2kyc19xdWlya3MgPSB7CiAJLnNldF9m bXQJCT0gc3VuNGlfaTJzX3NldF9zb2NfZm10LAogfTsKIAorc3RhdGljIGNvbnN0IHN0cnVjdCBz dW40aV9pMnNfcXVpcmtzIHN1bjUwaV9oNl9pMnNfcXVpcmtzID0geworCS5oYXNfcmVzZXQJCT0g dHJ1ZSwKKwkucmVnX29mZnNldF90eGRhdGEJPSBTVU44SV9JMlNfRklGT19UWF9SRUcsCisJLnN1 bjRpX2kyc19yZWdtYXAJPSAmc3VuNTBpX2g2X2kyc19yZWdtYXBfY29uZmlnLAorCS5maWVsZF9j bGtkaXZfbWNsa19lbgk9IFJFR19GSUVMRChTVU40SV9JMlNfQ0xLX0RJVl9SRUcsIDgsIDgpLAor CS5maWVsZF9mbXRfd3NzCQk9IFJFR19GSUVMRChTVU40SV9JMlNfRk1UMF9SRUcsIDAsIDIpLAor CS5maWVsZF9mbXRfc3IJCT0gUkVHX0ZJRUxEKFNVTjRJX0kyU19GTVQwX1JFRywgNCwgNiksCisJ LmJjbGtfZGl2aWRlcnMJCT0gc3VuOGlfaTJzX2Nsa19kaXYsCisJLm51bV9iY2xrX2RpdmlkZXJz CT0gQVJSQVlfU0laRShzdW44aV9pMnNfY2xrX2RpdiksCisJLm1jbGtfZGl2aWRlcnMJCT0gc3Vu OGlfaTJzX2Nsa19kaXYsCisJLm51bV9tY2xrX2RpdmlkZXJzCT0gQVJSQVlfU0laRShzdW44aV9p MnNfY2xrX2RpdiksCisJLmdldF9iY2xrX3BhcmVudF9yYXRlCT0gc3VuOGlfaTJzX2dldF9iY2xr X3BhcmVudF9yYXRlLAorCS5nZXRfc3IJCQk9IHN1bjhpX2kyc19nZXRfc3Jfd3NzLAorCS5nZXRf d3NzCQk9IHN1bjhpX2kyc19nZXRfc3Jfd3NzLAorCS5zZXRfY2hhbl9jZmcJCT0gc3VuNTBpX2g2 X2kyc19zZXRfY2hhbl9jZmcsCisJLnNldF9mbXQJCT0gc3VuNTBpX2g2X2kyc19zZXRfc29jX2Zt dCwKK307CisKIHN0YXRpYyBpbnQgc3VuNGlfaTJzX2luaXRfcmVnbWFwX2ZpZWxkcyhzdHJ1Y3Qg ZGV2aWNlICpkZXYsCiAJCQkJCXN0cnVjdCBzdW40aV9pMnMgKmkycykKIHsKQEAgLTEzMzYsNiAr MTU1NCwxMCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9pZCBzdW40aV9pMnNfbWF0 Y2hbXSA9IHsKIAkJLmNvbXBhdGlibGUgPSAiYWxsd2lubmVyLHN1bjUwaS1hNjQtY29kZWMtaTJz IiwKIAkJLmRhdGEgPSAmc3VuNTBpX2E2NF9jb2RlY19pMnNfcXVpcmtzLAogCX0sCisJeworCQku Y29tcGF0aWJsZSA9ICJhbGx3aW5uZXIsc3VuNTBpLWg2LWkycyIsCisJCS5kYXRhID0gJnN1bjUw aV9oNl9pMnNfcXVpcmtzLAorCX0sCiAJe30KIH07CiBNT0RVTEVfREVWSUNFX1RBQkxFKG9mLCBz dW40aV9pMnNfbWF0Y2gpOwotLSAKMi4yNS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgt YXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=