summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-21 09:34:16 +0800
committerMark Brown <broonie@linaro.org>2014-02-23 12:28:28 +0900
commitcb64ca54076243b1d88b0a8430504d0a4cf3a5fa (patch)
tree235b3fcd5043ac5950ec042c9b86a1d32cb1072b
parent81b045fe72f957ad24ab97f999ea8ca14359d941 (diff)
spi: qup: Convert ot let spi core handle checking transfer speed
Set master->max_speed_hz then spi core will handle checking transfer speed. So we can remove the same checking in this driver. Also remove checking spi->chip_select in spi_qup_setup(), the checking is done by spi core. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Ivan T. Ivanov <iivanov@mm-sol.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-qup.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 5edc56f5c887..dec339d51fc8 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -134,7 +134,6 @@ struct spi_qup {
struct clk *cclk; /* core clock */
struct clk *iclk; /* interface clock */
int irq;
- u32 max_speed_hz;
spinlock_t lock;
int in_fifo_sz;
@@ -517,18 +516,6 @@ static int spi_qup_setup(struct spi_device *spi)
struct spi_qup *controller = spi_master_get_devdata(spi->master);
struct spi_qup_device *chip = spi_get_ctldata(spi);
- if (spi->chip_select >= spi->master->num_chipselect) {
- dev_err(controller->dev, "invalid chip_select %d\n",
- spi->chip_select);
- return -EINVAL;
- }
-
- if (spi->max_speed_hz > controller->max_speed_hz) {
- dev_err(controller->dev, "invalid max_speed_hz %d\n",
- spi->max_speed_hz);
- return -EINVAL;
- }
-
if (!chip) {
/* First setup */
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
@@ -629,6 +616,7 @@ static int spi_qup_probe(struct platform_device *pdev)
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;
master->num_chipselect = SPI_NUM_CHIPSELECTS;
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
+ master->max_speed_hz = max_freq;
master->setup = spi_qup_setup;
master->cleanup = spi_qup_cleanup;
master->set_cs = spi_qup_set_cs;
@@ -645,7 +633,6 @@ static int spi_qup_probe(struct platform_device *pdev)
controller->iclk = iclk;
controller->cclk = cclk;
controller->irq = irq;
- controller->max_speed_hz = max_freq;
spin_lock_init(&controller->lock);
init_completion(&controller->done);