diff options
| author | Liu, ShuoX <shuox.liu@intel.com> | 2011-07-08 14:24:31 +0800 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-08 13:09:00 -0600 |
| commit | 40bfff85ffb5c85ffabcb6d71e64f70799595f89 (patch) | |
| tree | 79ea79510d9e1799a282b98012fe511ec57de382 /drivers/spi | |
| parent | 22032c7774a9619770a1ca92f4f895d69efff386 (diff) | |
| download | op-kernel-dev-40bfff85ffb5c85ffabcb6d71e64f70799595f89.zip op-kernel-dev-40bfff85ffb5c85ffabcb6d71e64f70799595f89.tar.gz | |
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 ece5f69..857cd30 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) dws->prev_chip = NULL; dws->dma_inited = 0; dws->dma_addr = (dma_addr_t)(dws->paddr + 0x60); + snprintf(dws->name, sizeof(dws->name), "dw_spi%d", + dws->bus_num); ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, - "dw_spi", dws); + dws->name, dws); if (ret < 0) { dev_err(&master->dev, "can not get IRQ\n"); goto err_free_master; diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index 7a5e78d..8b7b07b 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -96,6 +96,7 @@ struct dw_spi { struct spi_device *cur_dev; struct device *parent_dev; enum dw_ssi_type type; + char name[16]; void __iomem *regs; unsigned long paddr; |
