diff options
author | Liu, ShuoX <shuox.liu@intel.com> | 2011-07-08 02:24:31 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-08 15:09:00 -0400 |
commit | 40bfff85ffb5c85ffabcb6d71e64f70799595f89 (patch) | |
tree | 79ea79510d9e1799a282b98012fe511ec57de382 /drivers/spi | |
parent | 22032c7774a9619770a1ca92f4f895d69efff386 (diff) |
spi/dw: Add spi number into spi irq desc
Signed-off-by: ShuoX Liu <shuox.liu@intel.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-dw.c | 4 | ||||
-rw-r--r-- | drivers/spi/spi-dw.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index ece5f69deaaf..857cd30b44bb 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c | |||
@@ -818,9 +818,11 @@ int __devinit dw_spi_add_host(struct dw_spi *dws) | |||
818 | dws->prev_chip = NULL; | 818 | dws->prev_chip = NULL; |
819 | dws->dma_inited = 0; | 819 | dws->dma_inited = 0; |
820 | dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); | 820 | dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); |
821 | snprintf(dws->name, sizeof(dws->name), "dw_spi%d", | ||
822 | dws->bus_num); | ||
821 | 823 | ||
822 | ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, | 824 | ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, |
823 | "dw_spi", dws); | 825 | dws->name, dws); |
824 | if (ret < 0) { | 826 | if (ret < 0) { |
825 | dev_err(&master->dev, "can not get IRQ\n"); | 827 | dev_err(&master->dev, "can not get IRQ\n"); |
826 | goto err_free_master; | 828 | goto err_free_master; |
diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index 7a5e78d2a5cb..8b7b07bf6c3f 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h | |||
@@ -96,6 +96,7 @@ struct dw_spi { | |||
96 | struct spi_device *cur_dev; | 96 | struct spi_device *cur_dev; |
97 | struct device *parent_dev; | 97 | struct device *parent_dev; |
98 | enum dw_ssi_type type; | 98 | enum dw_ssi_type type; |
99 | char name[16]; | ||
99 | 100 | ||
100 | void __iomem *regs; | 101 | void __iomem *regs; |
101 | unsigned long paddr; | 102 | unsigned long paddr; |