Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2751023imj; Mon, 18 Feb 2019 11:30:02 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia07kPtm880Fs3CytMtkgKlYau9d1/vXnHNBDtm++AIMT662rBMMwSJLM04HW7j08tRwNNc X-Received: by 2002:a63:ce:: with SMTP id 197mr20023544pga.212.1550518202455; Mon, 18 Feb 2019 11:30:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550518202; cv=none; d=google.com; s=arc-20160816; b=CUJePw4Vdo7aqngDDbfEYxsJy6gyNZE7FfbLJfGNLG4LE6pZIucU2HJsddNQpwcOdn kWGwarFkIrL6jcEtjRtmA011xKBP5ov3jCAbxKOsbm/hemrOO1hjwOI0slPOo3XRS5lR w91GVY+WcH/x/zx4lNR4mtjZ3FY1NpfX8PXStABKEStOwIhaBJa9RP/YdvIqsuYyni+m FCprAiCyGhQFXz7HFXtXqmkcXk/dEeac7cHQVvWHQ9vF/lpswArsOm62/pOAz3bCvM9y 8wLc3P4tdXiHOatQHUT6ERXjRyI+JLfPmjE4RaYiZ6srYw6N4q1PfZfpyDMDxFYkgRse nE/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:message-id:in-reply-to:subject:cc:to :from:dkim-signature; bh=FZw/nIU94/BV3+eC5ofCCRLmhZpkDi3wgLtrY44XoZg=; b=NUTQf7tCyWLCH0houOJ5ETOKZ7EzoqkU/cluzsNifCymWYGHfATQtaLIz6LYKICTQ4 3nZnhi7QH5zqx/9oYqcvWJgb0UKboFnAj9dhoy4QdSfMfzRP0KYe6Mz0e01MnJ/PzxjS 0hvZobj8peyiAEyer3Mful+kOnP+5/KEwjHYAXBlygik45M1ofybYtoGQA1d6FJx8CI2 5tK6AhCk/XL96IIZG6NObMJ/A51eXx8BDrRCRv/UUMFpYq8qvUb9bk5bLSj/8y+qazDZ UXQi2mQsOCoCtqZ2yK9YcV7onk34zuQ/xKsMAJDyf9HGZByr/ZVxa9unF2xyMOALBx8R SIMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=eAq5EE7n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j22si13311874pfi.252.2019.02.18.11.29.46; Mon, 18 Feb 2019 11:30:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=eAq5EE7n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727874AbfBRSwt (ORCPT + 99 others); Mon, 18 Feb 2019 13:52:49 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:47304 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726258AbfBRSwm (ORCPT ); Mon, 18 Feb 2019 13:52:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=FZw/nIU94/BV3+eC5ofCCRLmhZpkDi3wgLtrY44XoZg=; b=eAq5EE7nZDud dmbtKTP1W+FrhG20c9ohfE4oa6bD5yAHrN0JBTwxHx97nBtVmTi8AO2UD3Jnx1H+yKXBpuz+imKw1 4lnCgsi4vhARZYile/e2oR305VU0eIZu+Sc0shpsvE9qN/5URKsDTvyntOjdl65QmG6Xy7sQFHVHP yuFVA=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gvo1q-0001jC-MV; Mon, 18 Feb 2019 18:52:34 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 163961128008; Mon, 18 Feb 2019 18:52:34 +0000 (GMT) From: Mark Brown To: Viorel Suman Cc: Mark Brown , Timur Tabi , Nicolin Chen , Xiubo Li , Fabio Estevam , "alsa-devel@alsa-project.org" , "linux-kernel@vger.kernel.org" , Takashi Iwai , Liam Girdwood , Viorel Suman , Mark Brown , dl-linux-imx , "linuxppc-dev@lists.ozlabs.org" , alsa-devel@alsa-project.org Subject: Applied "ASoC: fsl_spdif: fix sysclk_df type" to the asoc tree In-Reply-To: <1550503474-18865-1-git-send-email-viorel.suman@nxp.com> X-Patchwork-Hint: ignore Message-Id: <20190218185234.163961128008@debutante.sirena.org.uk> Date: Mon, 18 Feb 2019 18:52:34 +0000 (GMT) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch ASoC: fsl_spdif: fix sysclk_df type has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 2231609a2c0a4807c017822ecb5834bbb7f59fb9 Mon Sep 17 00:00:00 2001 From: Viorel Suman Date: Mon, 18 Feb 2019 15:25:00 +0000 Subject: [PATCH] ASoC: fsl_spdif: fix sysclk_df type According to RM SPDIF STC SYSCLK_DF field is 9-bit wide, values being in 0..511 range. Use a proper type to handle sysclk_df. Signed-off-by: Viorel Suman Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_spdif.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index a26686e7281c..4842e6df9a2d 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -96,7 +96,7 @@ struct fsl_spdif_priv { bool dpll_locked; u32 txrate[SPDIF_TXRATE_MAX]; u8 txclk_df[SPDIF_TXRATE_MAX]; - u8 sysclk_df[SPDIF_TXRATE_MAX]; + u16 sysclk_df[SPDIF_TXRATE_MAX]; u8 txclk_src[SPDIF_TXRATE_MAX]; u8 rxclk_src; struct clk *txclk[SPDIF_TXRATE_MAX]; @@ -376,7 +376,8 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, struct platform_device *pdev = spdif_priv->pdev; unsigned long csfs = 0; u32 stc, mask, rate; - u8 clk, txclk_df, sysclk_df; + u16 sysclk_df; + u8 clk, txclk_df; int ret; switch (sample_rate) { @@ -1109,8 +1110,9 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv, static const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 }; bool is_sysclk = clk_is_match(clk, spdif_priv->sysclk); u64 rate_ideal, rate_actual, sub; - u32 sysclk_dfmin, sysclk_dfmax; - u32 txclk_df, sysclk_df, arate; + u32 arate; + u16 sysclk_dfmin, sysclk_dfmax, sysclk_df; + u8 txclk_df; /* The sysclk has an extra divisor [2, 512] */ sysclk_dfmin = is_sysclk ? 2 : 1; -- 2.20.1