From patchwork Tue Dec 19 17:00:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10123821 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9F613603B5 for ; Tue, 19 Dec 2017 17:04:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 841DC289FF for ; Tue, 19 Dec 2017 17:04:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 790662905C; Tue, 19 Dec 2017 17:04:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95323289FF for ; Tue, 19 Dec 2017 17:04:54 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 57D4D26775A; Tue, 19 Dec 2017 18:01:36 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5675B267741; Tue, 19 Dec 2017 18:01:33 +0100 (CET) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by alsa0.perex.cz (Postfix) with ESMTP id E6F1C267701 for ; Tue, 19 Dec 2017 18:01:23 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id o2so10773288pgc.8 for ; Tue, 19 Dec 2017 09:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RAgZW0uX1Gh6l1o3z2w2iRL35Eg3NOtktUPRveW1JzI=; b=EBcA4VfGuIEgeA8IsOhhcU4n+JJ7G8zGDLJiB2WTVCtm8sU81gVEU28cqGNiM4zXqt 2Dlt3kJBVU0g6s3/Qye1VcnMSXz0HpExGJZALA4YeE09gYqHAHcrpaPFHLd22vZhi/mo wSSHPqSxEsdau89zzJKD6vIoxD1zXUp30Kua2gmZUK2Zjsm/SkoY07eR3kgn0sTNjuPh +h8JtLcOqN22xvKyTsEesU47ZtGqAuITQmNtF/JJAJEDcQleczlM5dx+jELly6O797B6 hplCKWlpoIbTaU87b6c4UEsuoFEbEUrNEIxBjkWDtePuTbxCmiJ92Z2FyY4H0UGm0ljd xbZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RAgZW0uX1Gh6l1o3z2w2iRL35Eg3NOtktUPRveW1JzI=; b=bDaXzaxfM5BsxHheosRx9s19zezQwmoImJBf0qNLVIqG/OOXTZ8LiWobh2iebdx4/O uSYlN12bHY3VvN3hLFj69FMGS2/3McMCAjlV2v1VfGt4sZzE1Mh73AEk0XEwx3KXBzgS l6wQPfXHV0ot6hL4+rZfhLfYN6JN9HykU9gMjSHS+jnjU+aamiQ2ebdCVeWzvvtNMXhb kZ9tK3MA46fhgpFN17Z8iTGehGQ/1+srMjDu4maeP+MTLlK8W+6hFiypub3u6abQFMne aaW0Ud0NOERtnwUONR7WxS0Y9SB4QQMPCuEW9jZhhK8OPHejQsRn08HFIUcKuGL8cpcb C/CQ== X-Gm-Message-State: AKGB3mLinp1MqUXsWWqm3shT0cWhhDYG/1oBaCDYtxlhL0EF+7tXOAz7 dCfhB0UyMnVY1hYlv3FHYH8= X-Google-Smtp-Source: ACJfBov11mEPVp/n5mrpaSLjvB8GSpAxu0MPEGU3OJZsRpf+zm8vELeOinjSHrqw8Z/XamdG5j+Drw== X-Received: by 10.98.72.69 with SMTP id v66mr3868875pfa.135.1513702881377; Tue, 19 Dec 2017 09:01:21 -0800 (PST) Received: from Asurada-CZ80.localdomain (c-73-231-2-134.hsd1.ca.comcast.net. [73.231.2.134]) by smtp.gmail.com with ESMTPSA id q9sm34490181pfl.116.2017.12.19.09.01.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Dec 2017 09:01:20 -0800 (PST) From: Nicolin Chen To: timur@tabi.org, broonie@kernel.org Date: Tue, 19 Dec 2017 09:00:17 -0800 Message-Id: <1513702819-42310-14-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513702819-42310-1-git-send-email-nicoleotsuka@gmail.com> References: <1513702819-42310-1-git-send-email-nicoleotsuka@gmail.com> Cc: mail@maciej.szmigiero.name, kernel@pengutronix.de, lgirdwood@gmail.com, alsa-devel@alsa-project.org, caleb@crome.org, linux-kernel@vger.kernel.org, arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] [PATCH v1 13/15] ASoC: fsl_ssi: Remove cpu_dai_drv from fsl_ssi structure X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The cpu_dai_drv is only used for symmetric_rates. So this patch replaces it with a synchronous boolean flag. Signed-off-by: Nicolin Chen --- sound/soc/fsl/fsl_ssi.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 898f837..7d6149d 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -208,11 +208,11 @@ struct fsl_ssi_soc_data { * * @regs: Pointer to the regmap registers * @irq: IRQ of this SSI - * @cpu_dai_drv: CPU DAI driver for this device * * @dai_fmt: DAI configuration this device is currently used with * @streams: Mask of current active streams: BIT(TX) and BIT(RX) * @i2s_net: I2S and Network mode configurations of SCR register + * @synchronous: Use synchronous mode - both of TX and RX use STCK and SFCK * @use_dma: DMA is used or FIQ with stream filter * @use_dual_fifo: DMA with support for dual FIFO mode * @has_ipg_clk_name: If "ipg" is in the clock name list of device tree @@ -253,11 +253,11 @@ struct fsl_ssi_soc_data { struct fsl_ssi { struct regmap *regs; int irq; - struct snd_soc_dai_driver cpu_dai_drv; unsigned int dai_fmt; u8 streams; u8 i2s_net; + bool synchronous; bool use_dma; bool use_dual_fifo; bool has_ipg_clk_name; @@ -663,7 +663,6 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, bool tx2, tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(dai); struct regmap *regs = ssi->regs; - int synchronous = ssi->cpu_dai_drv.symmetric_rates, ret; u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i; unsigned long clkrate, baudrate, tmprate; unsigned int slots = params_channels(hw_params); @@ -671,6 +670,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, u64 sub, savesub = 100000; unsigned int freq; bool baudclk_is_used; + int ret; /* Override slots and slot_width if being specifically set... */ if (ssi->slots) @@ -749,7 +749,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, mask = SSI_SxCCR_PM_MASK | SSI_SxCCR_DIV2 | SSI_SxCCR_PSR; /* STCCR is used for RX in synchronous mode */ - tx2 = tx || synchronous; + tx2 = tx || ssi->synchronous; regmap_update_bits(regs, REG_SSI_SxCCR(tx2), mask, stccr); if (!baudclk_is_used) { @@ -797,7 +797,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, * that should set separate configurations for STCCR and SRCCR * despite running in the synchronous mode. */ - if (enabled && ssi->cpu_dai_drv.symmetric_rates) + if (enabled && ssi->synchronous) return 0; if (fsl_ssi_is_i2s_master(ssi)) { @@ -829,7 +829,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, } /* In synchronous mode, the SSI uses STCCR for capture */ - tx2 = tx || ssi->cpu_dai_drv.symmetric_rates; + tx2 = tx || ssi->synchronous; regmap_update_bits(regs, REG_SSI_SxCCR(tx2), SSI_SxCCR_WL_MASK, wl); return 0; @@ -954,7 +954,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi *ssi, unsigned int fmt) srcr = strcr; /* Set SYN mode and clear RXDIR bit when using SYN or AC97 mode */ - if (ssi->cpu_dai_drv.symmetric_rates || fsl_ssi_is_ac97(ssi)) { + if (ssi->synchronous || fsl_ssi_is_ac97(ssi)) { srcr &= ~SSI_SRCR_RXDIR; scr |= SSI_SCR_SYN; } @@ -1352,6 +1352,7 @@ static void fsl_ssi_imx_clean(struct platform_device *pdev, struct fsl_ssi *ssi) static int fsl_ssi_probe(struct platform_device *pdev) { + struct snd_soc_dai_driver *cpu_dai_drv; struct fsl_ssi *ssi; int ret = 0; struct device_node *np = pdev->dev.of_node; @@ -1386,14 +1387,12 @@ static int fsl_ssi_probe(struct platform_device *pdev) ssi->use_dma = !of_property_read_bool(np, "fsl,fiq-stream-filter"); if (fsl_ssi_is_ac97(ssi)) { - memcpy(&ssi->cpu_dai_drv, &fsl_ssi_ac97_dai, - sizeof(fsl_ssi_ac97_dai)); + cpu_dai_drv = &fsl_ssi_ac97_dai; fsl_ac97_data = ssi; } else { - memcpy(&ssi->cpu_dai_drv, &fsl_ssi_dai_template, - sizeof(fsl_ssi_dai_template)); + cpu_dai_drv = &fsl_ssi_dai_template; } - ssi->cpu_dai_drv.name = dev_name(dev); + cpu_dai_drv->name = dev_name(dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); iomem = devm_ioremap_resource(dev, res); @@ -1431,11 +1430,12 @@ static int fsl_ssi_probe(struct platform_device *pdev) /* Set software limitations for synchronous mode */ if (!of_find_property(np, "fsl,ssi-asynchronous", NULL)) { if (!fsl_ssi_is_ac97(ssi)) { - ssi->cpu_dai_drv.symmetric_rates = 1; - ssi->cpu_dai_drv.symmetric_samplebits = 1; + cpu_dai_drv->symmetric_rates = 1; + cpu_dai_drv->symmetric_samplebits = 1; + ssi->synchronous = true; } - ssi->cpu_dai_drv.symmetric_channels = 1; + cpu_dai_drv->symmetric_channels = 1; } /* Fetch FIFO depth; Set to 8 for older DT without this property */ @@ -1490,7 +1490,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) } ret = devm_snd_soc_register_component(dev, &fsl_ssi_component, - &ssi->cpu_dai_drv, 1); + cpu_dai_drv, 1); if (ret) { dev_err(dev, "failed to register DAI: %d\n", ret); goto error_asoc_register;