mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/qspi' into spi-next

This commit is contained in:
Mark Brown 2013-10-25 09:51:36 +01:00
parent 982d628743 dabefd56c6
commit b3d6c80050
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/spi/spi-ti-qspi.c
View File

@ -41,9 +41,6 @@ struct ti_qspi_regs {
struct ti_qspi { struct ti_qspi {
struct completion transfer_complete; struct completion transfer_complete;
/* IRQ synchronization */
spinlock_t lock;
/* list synchronization */ /* list synchronization */
struct mutex list_lock; struct mutex list_lock;
@ -57,7 +54,6 @@ struct ti_qspi {
u32 spi_max_frequency; u32 spi_max_frequency;
u32 cmd; u32 cmd;
u32 dc; u32 dc;
u32 stat;
}; };
#define QSPI_PID (0x0) #define QSPI_PID (0x0)
@ -397,13 +393,12 @@ static irqreturn_t ti_qspi_isr(int irq, void *dev_id)
{ {
struct ti_qspi *qspi = dev_id; struct ti_qspi *qspi = dev_id;
u16 int_stat; u16 int_stat;
u32 stat;
irqreturn_t ret = IRQ_HANDLED; irqreturn_t ret = IRQ_HANDLED;
spin_lock(&qspi->lock);
int_stat = ti_qspi_read(qspi, QSPI_INTR_STATUS_ENABLED_CLEAR); int_stat = ti_qspi_read(qspi, QSPI_INTR_STATUS_ENABLED_CLEAR);
qspi->stat = ti_qspi_read(qspi, QSPI_SPI_STATUS_REG); stat = ti_qspi_read(qspi, QSPI_SPI_STATUS_REG);
if (!int_stat) { if (!int_stat) {
dev_dbg(qspi->dev, "No IRQ triggered\n"); dev_dbg(qspi->dev, "No IRQ triggered\n");
@ -411,33 +406,12 @@ static irqreturn_t ti_qspi_isr(int irq, void *dev_id)
goto out; goto out;
} }
ret = IRQ_WAKE_THREAD;
ti_qspi_write(qspi, QSPI_WC_INT_DISABLE, QSPI_INTR_ENABLE_CLEAR_REG);
ti_qspi_write(qspi, QSPI_WC_INT_DISABLE, ti_qspi_write(qspi, QSPI_WC_INT_DISABLE,
QSPI_INTR_STATUS_ENABLED_CLEAR); QSPI_INTR_STATUS_ENABLED_CLEAR);
if (stat & WC)
out:
spin_unlock(&qspi->lock);
return ret;
}
static irqreturn_t ti_qspi_threaded_isr(int this_irq, void *dev_id)
{
struct ti_qspi *qspi = dev_id;
unsigned long flags;
spin_lock_irqsave(&qspi->lock, flags);
if (qspi->stat & WC)
complete(&qspi->transfer_complete); complete(&qspi->transfer_complete);
out:
spin_unlock_irqrestore(&qspi->lock, flags); return ret;
ti_qspi_write(qspi, QSPI_WC_INT_EN, QSPI_INTR_ENABLE_SET_REG);
return IRQ_HANDLED;
} }
static int ti_qspi_runtime_resume(struct device *dev) static int ti_qspi_runtime_resume(struct device *dev)
@ -472,7 +446,7 @@ static int ti_qspi_probe(struct platform_device *pdev)
if (!master) if (!master)
return -ENOMEM; return -ENOMEM;
master->mode_bits = SPI_CPOL | SPI_CPHA; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD;
master->bus_num = -1; master->bus_num = -1;
master->flags = SPI_MASTER_HALF_DUPLEX; master->flags = SPI_MASTER_HALF_DUPLEX;
@ -499,7 +473,6 @@ static int ti_qspi_probe(struct platform_device *pdev)
return irq; return irq;
} }
spin_lock_init(&qspi->lock);
mutex_init(&qspi->list_lock); mutex_init(&qspi->list_lock);
qspi->base = devm_ioremap_resource(&pdev->dev, r); qspi->base = devm_ioremap_resource(&pdev->dev, r);
@ -508,8 +481,7 @@ static int ti_qspi_probe(struct platform_device *pdev)
goto free_master; goto free_master;
} }
ret = devm_request_threaded_irq(&pdev->dev, irq, ti_qspi_isr, ret = devm_request_irq(&pdev->dev, irq, ti_qspi_isr, 0,
ti_qspi_threaded_isr, 0,
dev_name(&pdev->dev), qspi); dev_name(&pdev->dev), qspi);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n", dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n",
@ -543,12 +515,22 @@ free_master:
return ret; return ret;
} }
static int ti_qspi_remove(struct platform_device *pdev)
{
struct ti_qspi *qspi = platform_get_drvdata(pdev);
ti_qspi_write(qspi, QSPI_WC_INT_DISABLE, QSPI_INTR_ENABLE_CLEAR_REG);
return 0;
}
static const struct dev_pm_ops ti_qspi_pm_ops = { static const struct dev_pm_ops ti_qspi_pm_ops = {
.runtime_resume = ti_qspi_runtime_resume, .runtime_resume = ti_qspi_runtime_resume,
}; };
static struct platform_driver ti_qspi_driver = { static struct platform_driver ti_qspi_driver = {
.probe = ti_qspi_probe, .probe = ti_qspi_probe,
.remove = ti_qspi_remove,
.driver = { .driver = {
.name = "ti,dra7xxx-qspi", .name = "ti,dra7xxx-qspi",
.owner = THIS_MODULE, .owner = THIS_MODULE,