diff options
Diffstat (limited to 'drivers/spi/xilinx_spi.c')
| -rw-r--r-- | drivers/spi/xilinx_spi.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 7adaef62a99..4d2c75df886 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c | |||
| @@ -351,14 +351,12 @@ static irqreturn_t xilinx_spi_irq(int irq, void *dev_id) | |||
| 351 | return IRQ_HANDLED; | 351 | return IRQ_HANDLED; |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | #ifdef CONFIG_OF | ||
| 355 | static const struct of_device_id xilinx_spi_of_match[] = { | 354 | static const struct of_device_id xilinx_spi_of_match[] = { |
| 356 | { .compatible = "xlnx,xps-spi-2.00.a", }, | 355 | { .compatible = "xlnx,xps-spi-2.00.a", }, |
| 357 | { .compatible = "xlnx,xps-spi-2.00.b", }, | 356 | { .compatible = "xlnx,xps-spi-2.00.b", }, |
| 358 | {} | 357 | {} |
| 359 | }; | 358 | }; |
| 360 | MODULE_DEVICE_TABLE(of, xilinx_spi_of_match); | 359 | MODULE_DEVICE_TABLE(of, xilinx_spi_of_match); |
| 361 | #endif | ||
| 362 | 360 | ||
| 363 | struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, | 361 | struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, |
| 364 | u32 irq, s16 bus_num, int num_cs, int little_endian, int bits_per_word) | 362 | u32 irq, s16 bus_num, int num_cs, int little_endian, int bits_per_word) |
| @@ -394,9 +392,7 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, | |||
| 394 | 392 | ||
| 395 | master->bus_num = bus_num; | 393 | master->bus_num = bus_num; |
| 396 | master->num_chipselect = num_cs; | 394 | master->num_chipselect = num_cs; |
| 397 | #ifdef CONFIG_OF | ||
| 398 | master->dev.of_node = dev->of_node; | 395 | master->dev.of_node = dev->of_node; |
| 399 | #endif | ||
| 400 | 396 | ||
| 401 | xspi->mem = *mem; | 397 | xspi->mem = *mem; |
| 402 | xspi->irq = irq; | 398 | xspi->irq = irq; |
| @@ -539,9 +535,7 @@ static struct platform_driver xilinx_spi_driver = { | |||
| 539 | .driver = { | 535 | .driver = { |
| 540 | .name = XILINX_SPI_NAME, | 536 | .name = XILINX_SPI_NAME, |
| 541 | .owner = THIS_MODULE, | 537 | .owner = THIS_MODULE, |
| 542 | #ifdef CONFIG_OF | ||
| 543 | .of_match_table = xilinx_spi_of_match, | 538 | .of_match_table = xilinx_spi_of_match, |
| 544 | #endif | ||
| 545 | }, | 539 | }, |
| 546 | }; | 540 | }; |
| 547 | 541 | ||
