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-altera.c
diff --git
a/drivers/spi/spi-altera.c
b/drivers/spi/spi-altera.c
index
5d7deaf
..
5b5709a
100644
(file)
--- a/
drivers/spi/spi-altera.c
+++ b/
drivers/spi/spi-altera.c
@@
-13,7
+13,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/module.h>
@@
-200,7
+199,6
@@
static irqreturn_t altera_spi_irq(int irq, void *dev)
static int altera_spi_probe(struct platform_device *pdev)
{
static int altera_spi_probe(struct platform_device *pdev)
{
- struct altera_spi_platform_data *platp = dev_get_platdata(&pdev->dev);
struct altera_spi *hw;
struct spi_master *master;
struct resource *res;
struct altera_spi *hw;
struct spi_master *master;
struct resource *res;
@@
-214,6
+212,8
@@
static int altera_spi_probe(struct platform_device *pdev)
master->bus_num = pdev->id;
master->num_chipselect = 16;
master->mode_bits = SPI_CS_HIGH;
master->bus_num = pdev->id;
master->num_chipselect = 16;
master->mode_bits = SPI_CS_HIGH;
+ master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 16);
+ master->dev.of_node = pdev->dev.of_node;
hw = spi_master_get_devdata(master);
platform_set_drvdata(pdev, hw);
hw = spi_master_get_devdata(master);
platform_set_drvdata(pdev, hw);
@@
-245,9
+245,6
@@
static int altera_spi_probe(struct platform_device *pdev)
if (err)
goto exit;
}
if (err)
goto exit;
}
- /* find platform data */
- if (!platp)
- hw->bitbang.master->dev.of_node = pdev->dev.of_node;
/* register our spi controller */
err = spi_bitbang_start(&hw->bitbang);
/* register our spi controller */
err = spi_bitbang_start(&hw->bitbang);