From patchwork Thu Jun 24 12:12:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 107845 X-Patchwork-Delegate: grant.likely@secretlab.ca Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5OCLJtR000554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 24 Jun 2010 12:21:55 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1ORlQj-0006SV-Qt; Thu, 24 Jun 2010 12:21:17 +0000 Received: from sfi-mx-2.v28.ch3.sourceforge.com ([172.29.28.122] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1ORlQj-0006SP-0z for spi-devel-general@lists.sourceforge.net; Thu, 24 Jun 2010 12:21:17 +0000 Received-SPF: pass (sfi-mx-2.v28.ch3.sourceforge.com: domain of gmail.com designates 74.125.83.175 as permitted sender) client-ip=74.125.83.175; envelope-from=jason77.wang@gmail.com; helo=mail-pv0-f175.google.com; Received: from mail-pv0-f175.google.com ([74.125.83.175]) by sfi-mx-2.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1ORlQh-0000sU-C3 for spi-devel-general@lists.sourceforge.net; Thu, 24 Jun 2010 12:21:16 +0000 Received: by pvg3 with SMTP id 3so1017422pvg.34 for ; Thu, 24 Jun 2010 05:19:45 -0700 (PDT) Received: by 10.115.65.12 with SMTP id s12mr9332497wak.76.1277381572822; Thu, 24 Jun 2010 05:12:52 -0700 (PDT) Received: from localhost ([180.77.194.242]) by mx.google.com with ESMTPS id c22sm9282008wam.18.2010.06.24.05.12.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 24 Jun 2010 05:12:51 -0700 (PDT) From: Jason Wang To: grant.likely@secretlab.ca, roman.tereshonkov@nokia.com, david-b@pacbell.net Date: Thu, 24 Jun 2010 20:12:45 +0800 Message-Id: <1277381565-6305-1-git-send-email-jason77.wang@gmail.com> X-Mailer: git-send-email 1.5.6.5 X-Spam-Score: -0.7 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 DKIM_VERIFIED Domain Keys Identified Mail: signature passes verification 0.0 DKIM_SIGNED Domain Keys Identified Mail: message has a signature 0.8 AWL AWL: From: address is in the auto white-list X-Headers-End: 1ORlQh-0000sU-C3 Cc: spi-devel-general@lists.sourceforge.net, linux-arm-kernel@lists.infradead.org Subject: [spi-devel-general] [PATCH] spi/omap2_mcspi: disable and enable chan between each SPI transfer X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: spi-devel-general-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 24 Jun 2010 12:21:55 +0000 (UTC) diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index b3a94ca..1e3cb7b 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c @@ -408,7 +408,6 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) count -= (word_len <= 8) ? 2 : (word_len <= 16) ? 4 : /* word_len <= 32 */ 8; - omap2_mcspi_set_enable(spi, 1); return count; } } @@ -430,8 +429,10 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) (word_len <= 16) ? 2 : /* word_len <= 32 */ 4; } - omap2_mcspi_set_enable(spi, 1); } + + omap2_mcspi_set_enable(spi, 0); + return count; } @@ -517,8 +518,6 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) goto out; } c = 0; - } else if (c == 0 && tx == NULL) { - omap2_mcspi_set_enable(spi, 0); } *rx++ = __raw_readl(rx_reg); @@ -570,8 +569,6 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) goto out; } c = 0; - } else if (c == 0 && tx == NULL) { - omap2_mcspi_set_enable(spi, 0); } *rx++ = __raw_readl(rx_reg); @@ -623,8 +620,6 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) goto out; } c = 0; - } else if (c == 0 && tx == NULL) { - omap2_mcspi_set_enable(spi, 0); } *rx++ = __raw_readl(rx_reg); @@ -646,7 +641,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) dev_err(&spi->dev, "EOT timed out\n"); } out: - omap2_mcspi_set_enable(spi, 1); + omap2_mcspi_set_enable(spi, 0); return count - c; } @@ -894,7 +889,6 @@ static void omap2_mcspi_work(struct work_struct *work) cs = spi->controller_state; cd = spi->controller_data; - omap2_mcspi_set_enable(spi, 1); list_for_each_entry(t, &m->transfers, transfer_list) { if (t->tx_buf == NULL && t->rx_buf == NULL && t->len) { status = -EINVAL; @@ -931,6 +925,8 @@ static void omap2_mcspi_work(struct work_struct *work) mcspi_write_chconf0(spi, chconf); + omap2_mcspi_set_enable(spi, 1); + if (t->len) { unsigned count;