diff options
author | Yong Wang <yong.y.wang@linux.intel.com> | 2010-09-07 03:27:27 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-09-08 12:49:50 -0400 |
commit | cbcc062abb16d39839b3d8d4e3d20360fc21eb58 (patch) | |
tree | 8ce802ede9dd14760e9426a75c2c95c4ce2b9474 /drivers/spi/dw_spi.c | |
parent | 9d8f86b56093d7b06d81d4063d5b9a4cbf887e75 (diff) |
spi/dw_spi: Allow interrupt sharing
Allow interrupt sharing since exclusive interrupt line for
DW SPI controller is not provided on every platform.
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/dw_spi.c')
-rw-r--r-- | drivers/spi/dw_spi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c index d256cb00604c..11fbbf6fb07b 100644 --- a/drivers/spi/dw_spi.c +++ b/drivers/spi/dw_spi.c | |||
@@ -396,6 +396,11 @@ static irqreturn_t interrupt_transfer(struct dw_spi *dws) | |||
396 | static irqreturn_t dw_spi_irq(int irq, void *dev_id) | 396 | static irqreturn_t dw_spi_irq(int irq, void *dev_id) |
397 | { | 397 | { |
398 | struct dw_spi *dws = dev_id; | 398 | struct dw_spi *dws = dev_id; |
399 | u16 irq_status, irq_mask = 0x3f; | ||
400 | |||
401 | irq_status = dw_readw(dws, isr) & irq_mask; | ||
402 | if (!irq_status) | ||
403 | return IRQ_NONE; | ||
399 | 404 | ||
400 | if (!dws->cur_msg) { | 405 | if (!dws->cur_msg) { |
401 | spi_mask_intr(dws, SPI_INT_TXEI); | 406 | spi_mask_intr(dws, SPI_INT_TXEI); |
@@ -883,7 +888,7 @@ int __devinit dw_spi_add_host(struct dw_spi *dws) | |||
883 | dws->dma_inited = 0; | 888 | dws->dma_inited = 0; |
884 | dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); | 889 | dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); |
885 | 890 | ||
886 | ret = request_irq(dws->irq, dw_spi_irq, 0, | 891 | ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, |
887 | "dw_spi", dws); | 892 | "dw_spi", dws); |
888 | if (ret < 0) { | 893 | if (ret < 0) { |
889 | dev_err(&master->dev, "can not get IRQ\n"); | 894 | dev_err(&master->dev, "can not get IRQ\n"); |