diff options
author | Russ Gorby <russ.gorby@intel.com> | 2011-02-07 15:02:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:16:14 -0500 |
commit | f089140ea760b42542389c96f9a54d3076696b2c (patch) | |
tree | 10f96e044b68c9d8108534de6cec42ea7bc68c35 /drivers | |
parent | 5fc324952049b2e6d16a54ef89afee25611ca476 (diff) |
serial: ifx6x60: changed internal bpw from boolean to int
driver should support 32bit SPI transfers. The boolean variable
only allowed 8/16.
Changed to support 8/16/32 for future enabling
of 32 bpw.
Signed-off-by: Russ Gorby <russ.gorby@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/tty/serial/ifx6x60.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index bb2ff206d0ab..9161cabaec37 100644 --- a/drivers/tty/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c | |||
@@ -76,7 +76,7 @@ | |||
76 | static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev); | 76 | static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev); |
77 | 77 | ||
78 | /* local variables */ | 78 | /* local variables */ |
79 | static int spi_b16 = 1; /* 8 or 16 bit word length */ | 79 | static int spi_bpw = 16; /* 8, 16 or 32 bit word length */ |
80 | static struct tty_driver *tty_drv; | 80 | static struct tty_driver *tty_drv; |
81 | static struct ifx_spi_device *saved_ifx_dev; | 81 | static struct ifx_spi_device *saved_ifx_dev; |
82 | static struct lock_class_key ifx_spi_key; | 82 | static struct lock_class_key ifx_spi_key; |
@@ -724,7 +724,7 @@ static void ifx_spi_io(unsigned long data) | |||
724 | ifx_dev->spi_xfer.cs_change = 0; | 724 | ifx_dev->spi_xfer.cs_change = 0; |
725 | ifx_dev->spi_xfer.speed_hz = 12500000; | 725 | ifx_dev->spi_xfer.speed_hz = 12500000; |
726 | /* ifx_dev->spi_xfer.speed_hz = 390625; */ | 726 | /* ifx_dev->spi_xfer.speed_hz = 390625; */ |
727 | ifx_dev->spi_xfer.bits_per_word = spi_b16 ? 16 : 8; | 727 | ifx_dev->spi_xfer.bits_per_word = spi_bpw; |
728 | 728 | ||
729 | ifx_dev->spi_xfer.tx_buf = ifx_dev->tx_buffer; | 729 | ifx_dev->spi_xfer.tx_buf = ifx_dev->tx_buffer; |
730 | ifx_dev->spi_xfer.rx_buf = ifx_dev->rx_buffer; | 730 | ifx_dev->spi_xfer.rx_buf = ifx_dev->rx_buffer; |