From patchwork Thu Jan 18 11:23:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10172919 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 7546B60230 for ; Thu, 18 Jan 2018 11:24:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64BAB2684F for ; Thu, 18 Jan 2018 11:24:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 591CA269A3; Thu, 18 Jan 2018 11:24:29 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D5A0C2684F for ; Thu, 18 Jan 2018 11:24:28 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=TMawKdDAeKKhYMdvzldBA8ENxlSe4/6LQokkYWhIwMo=; b=H+D haqb9n/SAnY77cCE8L0DpcbB/ZAM2hlep933XkK9sbNqXJeTznE4j5vCnuWxJsOQukFHsgFxv/tPF Avvlklgk/kIvjlIqqu5CRakIU9W+nFudedV3/8iGQ3rj+vbG3O0WXsDmwBQUFD1+VjktnLI5zr5Yc a7f0W9D/0fXtuR1l2pFjydlGnZlHjAgGXDyrtRVR8DlIbnhPWzGPa+UHYkO+bDbZDebeB1OiOXTwi 981uU52SnpKn5tY6n0ilYsHanYZH0oyZwwbTOTnplKQAl6qr6zmEdEdazK8sWaz+rsMYUDL4t7VEv 1pEjArTtbtnw2cs+90gH7YrMO8Zn0MQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ec8J1-0004xr-Ka; Thu, 18 Jan 2018 11:24:27 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ec8Ir-0004le-Uf for linux-arm-kernel@bombadil.infradead.org; Thu, 18 Jan 2018 11:24:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; 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=0iXr4v8B9KIS1pU7GsUCplC35K03xLhfodhp6Sdq5ls=; b=djVK0DzbU4D0G0WQn8XFPfakn8 UjAk4Dbp+Hfsoybeo/woTngKFtW0LtdfcK1gIU8ulxOEe+OZmFzmcn0jyRGx6/VbPQbp7WzoIFkn0 oudTOvrEtV/3nUOb509yVVAKLUADoLH6pkSq6udWQiWTiaALDQomwuyYa1lGbhlb/ceiTWoj0+mNp pn/hd6/t1mMpVMD5JQD3t4aEoHfPm0F2ZNhwzBkNygBFanPVQCyZn3Ptg6r3SUR0rh3KaXWFF7WWj jmCqT5K7xgg1jvVkFayq15cN3HV/aTsWErTPWvuD2QTBb8sJzcgMbSVFNAqK/S3Mmc96Dd93q7a6R MLLWI6LQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ec8Ip-0007fJ-2Z for linux-arm-kernel@lists.infradead.org; Thu, 18 Jan 2018 11:24:15 +0000 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=0iXr4v8B9KIS1pU7GsUCplC35K03xLhfodhp6Sdq5ls=; b=HToCykZmucMY PmVKK6o1PTrxTCe986go/+0D/yYO39DJNoNbvgRFOrbnBvOwttwr6rvHwSnoKDyqR4sa1AlAwosJi CjJO0D+kbAaFm+asj7B/r4tIerHDQ8wfpmeGkGqKrqoIc8GbkFJVdHtBnwC4W36YX2qPwHjLQv0wc sQEY4=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ec8IC-0007KV-R7; Thu, 18 Jan 2018 11:23:36 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1ec8IC-0003tZ-Bb; Thu, 18 Jan 2018 11:23:36 +0000 From: Mark Brown To: Maxime Chevallier Subject: Applied "spi: a3700: Allow to enable or disable FIFO mode" to the spi tree In-Reply-To: <1516205728-3256-4-git-send-email-maxime.chevallier@smile.fr> Message-Id: Date: Thu, 18 Jan 2018 11:23:36 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gregory.clement@free-electrons.com, broonie@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: a3700: Allow to enable or disable FIFO mode has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.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 a456c9320d997fdb26bfab496dd9e37f155cc788 Mon Sep 17 00:00:00 2001 From: Maxime Chevallier Date: Wed, 17 Jan 2018 17:15:27 +0100 Subject: [PATCH] spi: a3700: Allow to enable or disable FIFO mode The armada 3700 SPI controller allows to make transfers without using the 32 bytes RFIFO and WFIFO. This commit enable switching between FIFO and non-FIFO mode, which is necessary to implement full-duplex transfers. Signed-off-by: Maxime Chevallier Signed-off-by: Mark Brown --- drivers/spi/spi-armada-3700.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c index 07f227e3c834..97938c6d6267 100644 --- a/drivers/spi/spi-armada-3700.c +++ b/drivers/spi/spi-armada-3700.c @@ -185,12 +185,15 @@ static int a3700_spi_pin_mode_set(struct a3700_spi *a3700_spi, return 0; } -static void a3700_spi_fifo_mode_set(struct a3700_spi *a3700_spi) +static void a3700_spi_fifo_mode_set(struct a3700_spi *a3700_spi, bool enable) { u32 val; val = spireg_read(a3700_spi, A3700_SPI_IF_CFG_REG); - val |= A3700_SPI_FIFO_MODE; + if (enable) + val |= A3700_SPI_FIFO_MODE; + else + val &= ~A3700_SPI_FIFO_MODE; spireg_write(a3700_spi, A3700_SPI_IF_CFG_REG, val); } @@ -291,7 +294,7 @@ static int a3700_spi_init(struct a3700_spi *a3700_spi) a3700_spi_deactivate_cs(a3700_spi, i); /* Enable FIFO mode */ - a3700_spi_fifo_mode_set(a3700_spi); + a3700_spi_fifo_mode_set(a3700_spi, true); /* Set SPI mode */ a3700_spi_mode_set(a3700_spi, master->mode_bits);