From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vps-vb.mhejs.net (vi37-28-154-113.vibiznes.pl [37.28.154.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 09E6F1A07BF for ; Mon, 3 Aug 2015 08:44:30 +1000 (AEST) Message-ID: <55BE9D3B.3090303@maciej.szmigiero.name> Date: Mon, 03 Aug 2015 00:44:11 +0200 From: "Maciej S. Szmigiero" MIME-Version: 1.0 To: "alsa-devel@alsa-project.org" CC: Markus Pargmann , Timur Tabi , Nicolin Chen , Xiubo Li , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linuxppc-dev@lists.ozlabs.org, linux-kernel , Fabio Estevam Subject: [PATCH 6/6 v2] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode References: <55BA364E.1000803@maciej.szmigiero.name> <20150731055843.GX30895@pengutronix.de> <55BB9082.4030206@maciej.szmigiero.name> <20150802185103.GD19600@pengutronix.de> In-Reply-To: <20150802185103.GD19600@pengutronix.de> Content-Type: text/plain; charset=UTF-8 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Adjust set DAI format function in fsl_ssi driver so it doesn't fail and clears RXDIR in AC'97 mode. Changes from v1: fix indentation to be consistent with rest of the driver. Signed-off-by: Maciej Szmigiero --- sound/soc/fsl/fsl_ssi.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 8e5ff5e..1ba63bd 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -900,14 +900,16 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, scr &= ~CCSR_SSI_SCR_SYS_CLK_EN; break; default: - return -EINVAL; + if (!fsl_ssi_is_ac97(ssi_private)) + return -EINVAL; } stcr |= strcr; srcr |= strcr; - if (ssi_private->cpu_dai_drv.symmetric_rates) { - /* Need to clear RXDIR when using SYNC mode */ + if (ssi_private->cpu_dai_drv.symmetric_rates + || fsl_ssi_is_ac97(ssi_private)) { + /* Need to clear RXDIR when using SYNC or AC97 mode */ srcr &= ~CCSR_SSI_SRCR_RXDIR; scr |= CCSR_SSI_SCR_SYN; }