From: "Teresa Gámez" <t.gamez@phytec.de>
To: barebox@lists.infradead.org
Subject: [PATCHv3 3/4] omap3_spi: Set the correct CS number for AM33xx
Date: Wed, 19 Jun 2013 09:09:44 +0200 [thread overview]
Message-ID: <1371625785-27704-3-git-send-email-t.gamez@phytec.de> (raw)
In-Reply-To: <1371625785-27704-1-git-send-email-t.gamez@phytec.de>
Changed the number of CS for AM33xx boards to 2.
Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
changes since v3:
- splitted the former "omap3_spi: Add CS check for AM335x"
patch into two
- Set correct number of CS here
drivers/spi/omap3_spi.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 508e2d9..1a92565 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -359,16 +359,24 @@ static int omap3_spi_probe(struct device_d *dev)
* McSPI3 has 2 CS (bus 3, cs 0 - 1)
* McSPI4 has 1 CS (bus 4, cs 0)
*
+ * AM335x McSPI has 2 busses with 2 chip selects:
+ * McSPI0 has 2 CS (bus 0, cs 0 - 1)
+ * McSPI1 has 2 CS (bus 1, cs 0 - 1)
+ *
* The board code has to make sure that it does not use
* invalid buses or chip selects.
*/
master->bus_num = dev->id;
- master->num_chipselect = 4;
+
+ if (IS_ENABLED(CONFIG_ARCH_OMAP3))
+ master->num_chipselect = 4;
+ else
+ master->num_chipselect = 2;
master->setup = omap3_spi_setup;
master->transfer = omap3_spi_transfer;
- omap3_master->regs = dev_request_mem_region(dev, 0);;
+ omap3_master->regs = dev_request_mem_region(dev, 0);
spi_reset(master);
--
1.7.0.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-06-19 7:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 7:09 [PATCHv3 1/4] ARM: OMAP: AM33xx: Add muxing function for spi0 Teresa Gámez
2013-06-19 7:09 ` [PATCHv3 2/4] omap3_spi: Remove CS check in driver Teresa Gámez
2013-06-19 7:09 ` Teresa Gámez [this message]
2013-06-19 7:09 ` [PATCHv3 4/4] ARM: OMAP: pcm051: Add spi flash support Teresa Gámez
2013-06-19 19:51 ` [PATCHv3 1/4] ARM: OMAP: AM33xx: Add muxing function for spi0 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=1371625785-27704-3-git-send-email-t.gamez@phytec.de \
--to=t.gamez@phytec.de \
--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