From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 3/8] atmel_spi: after setup the cs need to be disable
Date: Tue, 6 Nov 2012 20:33:31 +0100 [thread overview]
Message-ID: <1352230416-9396-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1352230416-9396-1-git-send-email-plagnioj@jcrosoft.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
drivers/spi/atmel_spi.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index afbca9f..dbf6af8 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -66,6 +66,18 @@ static inline bool atmel_spi_is_v2(void)
return !cpu_is_at91rm9200();
}
+static void atmel_spi_chipselect(struct spi_device *spi, struct atmel_spi *as, int on)
+{
+ struct spi_master *master = &as->master;
+ int cs_pin;
+ int val = ((spi->mode & SPI_CS_HIGH) != 0) == on;
+
+ BUG_ON(spi->chip_select >= master->num_chipselect);
+ cs_pin = as->cs_pins[spi->chip_select];
+
+ gpio_direction_output(cs_pin, val);
+}
+
static int atmel_spi_setup(struct spi_device *spi)
{
struct spi_master *master = spi->master;
@@ -78,7 +90,7 @@ static int atmel_spi_setup(struct spi_device *spi)
if (spi->controller_data) {
csr = (u32)spi->controller_data;
spi_writel(as, CSR0, csr);
- return 0;
+ goto out;
}
dev_dbg(master->dev, "%s mode 0x%08x bits_per_word: %d speed: %d\n",
@@ -140,19 +152,10 @@ static int atmel_spi_setup(struct spi_device *spi)
if (bits > 0)
spi->controller_data = (void *)csr;
- return 0;
-}
-
-static void atmel_spi_chipselect(struct spi_device *spi, struct atmel_spi *as, int on)
-{
- struct spi_master *master = &as->master;
- int cs_pin;
- int val = ((spi->mode & SPI_CS_HIGH) != 0) == on;
-
- BUG_ON(spi->chip_select >= master->num_chipselect);
- cs_pin = as->cs_pins[spi->chip_select];
+out:
+ atmel_spi_chipselect(spi, as, 0);
- gpio_direction_output(cs_pin, val);
+ return 0;
}
static int atmel_spi_xchg(struct atmel_spi *as, u32 tx_val)
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-11-06 19:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-06 19:30 [PATCH 0/8] atmtel: fix spi driver + rm9200 Jean-Christophe PLAGNIOL-VILLARD
2012-11-06 19:33 ` [PATCH 1/8] atmel_spi: use device id as bus num Jean-Christophe PLAGNIOL-VILLARD
2012-11-06 19:33 ` [PATCH 2/8] atmel_spi: split transfert to atmel_spi_do_xfer Jean-Christophe PLAGNIOL-VILLARD
2012-11-13 14:45 ` Thomas Petazzoni
2012-11-06 19:33 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-11-06 19:33 ` [PATCH 4/8] atmel_spi: add sanity check in setup Jean-Christophe PLAGNIOL-VILLARD
2012-11-06 19:33 ` [PATCH 5/8] atmel_spi: fix cs support Jean-Christophe PLAGNIOL-VILLARD
2012-11-06 19:33 ` [PATCH 6/8] atmel_spi: drop setup during transfer Jean-Christophe PLAGNIOL-VILLARD
2012-11-06 19:33 ` [PATCH 7/8] atmel_spi: add cs change support Jean-Christophe PLAGNIOL-VILLARD
2012-11-06 19:33 ` [PATCH 8/8] at91rm9200: fix spi cs support Jean-Christophe PLAGNIOL-VILLARD
2012-11-12 7:36 ` [PATCH 0/8] atmtel: fix spi driver + rm9200 Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352230416-9396-3-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox