From: Russ Gorby <russ.gorby@intel.com>
To: Greg@vger.kernel.org, Kroah-Hartman@vger.kernel.org,
<gregkh@suse.de>,
Vasiliy@vger.kernel.org, Kulikov@vger.kernel.org,
<segoon@openwall.com>,
Alan@vger.kernel.org, Cox@vger.kernel.org, <alan@linux.intel.com>,
Russ@vger.kernel.org, Gorby@vger.kernel.org,
<richardx.r.gorby@intel.com>,
linux-kernel@vger.kernel.org
Cc: suhail.ahmed@intel.com
Subject: [PATCH 5/7] serial: ifx6x60: probe routine needs to call spi_setup
Date: Wed, 5 Jan 2011 16:05:11 -0800 [thread overview]
Message-ID: <1294272313-15899-6-git-send-email-russ.gorby@intel.com> (raw)
In-Reply-To: <[PATCH 0/7] IFX6X60 patchset: 01/05/2011>
The probe routine should call spi_setup() to configure
the SPI bus so it can properly communicate with the device.
E.g. the device operates in SPI mode 1.
Called spi_setup to configure SPI mode, max_speed_hz, and bpw
Signed-off-by: Russ Gorby <russ.gorby@intel.com>
---
drivers/serial/ifx6x60.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/ifx6x60.c b/drivers/serial/ifx6x60.c
index b54a990..6dfb47a 100644
--- a/drivers/serial/ifx6x60.c
+++ b/drivers/serial/ifx6x60.c
@@ -67,6 +67,7 @@
#define IFX_SPI_MORE_MASK 0x10
#define IFX_SPI_MORE_BIT 12 /* bit position in u16 */
#define IFX_SPI_CTS_BIT 13 /* bit position in u16 */
+#define IFX_SPI_MODE SPI_MODE_1
#define IFX_SPI_TTY_ID 0
#define IFX_SPI_TIMEOUT_SEC 2
#define IFX_SPI_HEADER_0 (-1)
@@ -984,10 +985,18 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
ifx_dev->spi_timer.function = ifx_spi_timeout;
ifx_dev->spi_timer.data = (unsigned long)ifx_dev;
ifx_dev->is_6160 = pl_data->is_6160;
+ /* initialize spi mode, etc */
if (ifx_dev->is_6160)
spi->max_speed_hz = 12500000;
else
spi->max_speed_hz = 25000000;
+ spi->mode = IFX_SPI_MODE | (SPI_LOOP & spi->mode);
+ spi->bits_per_word = spi_bpw;
+ ret = spi_setup(spi);
+ if (ret) {
+ dev_err(&spi->dev, "SPI setup wasn't successful %d", ret);
+ return -ENODEV;
+ }
/* ensure SPI protocol flags are initialized to enable transfer */
ifx_dev->spi_more = 0;
--
1.7.2.3
next prev parent reply other threads:[~2011-01-06 0:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <[PATCH 0/7] IFX6X60 patchset: 01/05/2011>
2011-01-06 0:05 ` [PATCH 0/7] IFX6X60 patchset: 01/05/2011 Russ Gorby
2011-01-06 0:14 ` Greg KH
2011-01-06 0:33 ` Gorby, Russ
2011-01-06 3:19 ` Greg KH
2011-01-06 0:05 ` [PATCH 1/7] serial: ifx6x60: fixed call to tty_port_init Russ Gorby
2011-01-06 0:24 ` Alan Cox
2011-01-06 0:05 ` [PATCH 2/7] serial: ifx6x60: dma_alloc_coherent must use parent dev Russ Gorby
2011-01-06 0:05 ` [PATCH 3/7] serial: ifx6x60: changed internal bpw from boolean to int Russ Gorby
2011-01-06 0:25 ` Alan Cox
2011-01-06 0:05 ` [PATCH 4/7] serial: ifx6x60: set SPI max_speed_hz based on platform type Russ Gorby
2011-01-06 0:27 ` Alan Cox
2011-01-06 21:30 ` Gorby, Russ
2011-01-10 14:05 ` Alan Cox
2011-01-06 0:05 ` Russ Gorby [this message]
2011-01-06 0:05 ` [PATCH 6/7] serial: ifx6x60: fix modem names to ones recognized by firmware Russ Gorby
2011-01-06 0:29 ` Alan Cox
2011-01-06 0:05 ` [PATCH 7/7] serial: ifx6x60: minor cleanup Russ Gorby
2011-01-06 0:29 ` Alan Cox
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=1294272313-15899-6-git-send-email-russ.gorby@intel.com \
--to=russ.gorby@intel.com \
--cc=Alan@vger.kernel.org \
--cc=Cox@vger.kernel.org \
--cc=Gorby@vger.kernel.org \
--cc=Greg@vger.kernel.org \
--cc=Kroah-Hartman@vger.kernel.org \
--cc=Kulikov@vger.kernel.org \
--cc=Russ@vger.kernel.org \
--cc=Vasiliy@vger.kernel.org \
--cc=alan@linux.intel.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=richardx.r.gorby@intel.com \
--cc=segoon@openwall.com \
--cc=suhail.ahmed@intel.com \
/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
all inboxes | Powered by JetHome®