projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...
[cascardo/linux.git]
/
drivers
/
spi
/
spi-octeon.c
diff --git
a/drivers/spi/spi-octeon.c
b/drivers/spi/spi-octeon.c
index
a514589
..
c5e2f71
100644
(file)
--- a/
drivers/spi/spi-octeon.c
+++ b/
drivers/spi/spi-octeon.c
@@
-11,7
+11,6
@@
#include <linux/spi/spi.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/spi/spi.h>
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/init.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/io.h>
#include <linux/of.h>
@@
-67,8
+66,6
@@
static int octeon_spi_do_transfer(struct octeon_spi *p,
cpol = mode & SPI_CPOL;
speed_hz = xfer->speed_hz ? : spi->max_speed_hz;
cpol = mode & SPI_CPOL;
speed_hz = xfer->speed_hz ? : spi->max_speed_hz;
- if (speed_hz > OCTEON_SPI_MAX_CLOCK_HZ)
- speed_hz = OCTEON_SPI_MAX_CLOCK_HZ;
clkdiv = octeon_get_io_clock_rate() / (2 * speed_hz);
clkdiv = octeon_get_io_clock_rate() / (2 * speed_hz);
@@
-203,8
+200,6
@@
static int octeon_spi_probe(struct platform_device *pdev)
p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start,
resource_size(res_mem));
p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start,
resource_size(res_mem));
- /* Dynamic bus numbering */
- master->bus_num = -1;
master->num_chipselect = 4;
master->mode_bits = SPI_CPHA |
SPI_CPOL |
master->num_chipselect = 4;
master->mode_bits = SPI_CPHA |
SPI_CPOL |
@@
-214,6
+209,7
@@
static int octeon_spi_probe(struct platform_device *pdev)
master->transfer_one_message = octeon_spi_transfer_one_message;
master->bits_per_word_mask = SPI_BPW_MASK(8);
master->transfer_one_message = octeon_spi_transfer_one_message;
master->bits_per_word_mask = SPI_BPW_MASK(8);
+ master->max_speed_hz = OCTEON_SPI_MAX_CLOCK_HZ;
master->dev.of_node = pdev->dev.of_node;
err = devm_spi_register_master(&pdev->dev, master);
master->dev.of_node = pdev->dev.of_node;
err = devm_spi_register_master(&pdev->dev, master);