From patchwork Sun May 24 02:13:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Welling X-Patchwork-Id: 6470931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 26795C0020 for ; Sun, 24 May 2015 02:18:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F54520605 for ; Sun, 24 May 2015 02:18:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3E8A205DE for ; Sun, 24 May 2015 02:18:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YwLRX-000605-4y; Sun, 24 May 2015 02:15:11 +0000 Received: from mail-ie0-x232.google.com ([2607:f8b0:4001:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YwLQr-0005Wv-EZ for linux-arm-kernel@lists.infradead.org; Sun, 24 May 2015 02:14:35 +0000 Received: by iepj10 with SMTP id j10so54074893iep.3 for ; Sat, 23 May 2015 19:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=so3Z/fXCY6IwaLJ9rGI2wcs0Ta2sgyhRRXYmw++7omA=; b=bCX9U1tFpY7sHCK4ytDT+a831GnAccHsNfLH8tAUdBWkFu9PVHeuN93UmGDB6Iamb/ sF5pvhodtEWcpSsnRD2Yn9dZdJ9iPkQR5vsmsf4d8abHHJ12GjMnNY7rrprtdyF1d964 j5eeVawNetXlwthjCcD2Jrtd2bz9wgJXHtDpTnsYsTvmBQL+apld9DstiB9SLOemqLW/ K4spCwCLsZJC4ttnB+xLT69Fv+o4FfDAZhU3l1Zb/Ie0Y0f82UrG3MMbJC7aRyV7C/cb u1cC61z+AN9iRl4RE1ANhsvMr5nsNknme7KvzOVmDkSaGZXko7ilcDoxf41G2j9RSKmW 6UoQ== X-Received: by 10.50.164.138 with SMTP id yq10mr14941557igb.29.1432433648223; Sat, 23 May 2015 19:14:08 -0700 (PDT) Received: from localhost.localdomain (74-84-113-14.client.mchsi.com. [74.84.113.14]) by mx.google.com with ESMTPSA id d15sm2847465igo.8.2015.05.23.19.14.06 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 23 May 2015 19:14:07 -0700 (PDT) From: Michael Welling To: broonie@kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] spi: omap2-mcspi: Fix GPIO chip select support Date: Sat, 23 May 2015 21:13:44 -0500 Message-Id: <1432433625-23407-4-git-send-email-mwelling@ieee.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1432433625-23407-1-git-send-email-mwelling@ieee.org> References: <20150522122544.GL21391@sirena.org.uk> <1432433625-23407-1-git-send-email-mwelling@ieee.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150523_191429_554678_26EB8A55 X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.4 (/) Cc: Michael Welling X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The OMAP2_MCSPI_CHCONF_FORCE must be toggled even when using GPIO chip selects. This patch conditionally calls the omap2_mcspi_set_cs function to do so when using GPIO chip selects. Signed-off-by: Michael Welling --- drivers/spi/spi-omap2-mcspi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 502db29..c4e21ad 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1108,6 +1108,9 @@ static int omap2_mcspi_work_one(struct omap2_mcspi *mcspi, omap2_mcspi_set_enable(spi, 0); + if (gpio_is_valid(spi->cs_gpio)) + omap2_mcspi_set_cs(spi, spi->mode & SPI_CS_HIGH); + if (par_override || (t->speed_hz != spi->max_speed_hz) || (t->bits_per_word != spi->bits_per_word)) { @@ -1192,6 +1195,9 @@ out: omap2_mcspi_set_enable(spi, 0); + if (gpio_is_valid(spi->cs_gpio)) + omap2_mcspi_set_cs(spi, !(spi->mode & SPI_CS_HIGH)); + if (mcspi->fifo_depth > 0 && t) omap2_mcspi_set_fifo(spi, t, 0);