From b1eca242bcc64754c3e31905a18ac93764780044 Mon Sep 17 00:00:00 2001 From: Russ Gorby Date: Mon, 7 Feb 2011 12:02:31 -0800 Subject: [PATCH] --- yaml --- r: 235527 b: refs/heads/master c: 2aff8d90a073e5a07e1ff5a94779d6a21fb72dd2 h: refs/heads/master i: 235525: 6094d9cbe9db0f5b061535c69b61dc977363a6a4 235523: 5f11221e6f62a7348147740603885852d7817c06 235519: eacc39709b9d7d7c441553dea179a2b5b9ee7adc v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/ifx6x60.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8db8c27af610..6190e887db5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b79b440576b80bace7b6fa012a57ed91d763b5f +refs/heads/master: 2aff8d90a073e5a07e1ff5a94779d6a21fb72dd2 diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c index 766f0c3aabcf..59e9cb87b7de 100644 --- a/trunk/drivers/tty/serial/ifx6x60.c +++ b/trunk/drivers/tty/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) @@ -992,7 +993,15 @@ static int ifx_spi_spi_probe(struct spi_device *spi) ifx_dev->modem = pl_data->modem_type; ifx_dev->use_dma = pl_data->use_dma; ifx_dev->max_hz = pl_data->max_hz; + /* initialize spi mode, etc */ spi->max_speed_hz = ifx_dev->max_hz; + 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;