iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: fsl-quadspi: Access multiple chips simultaneously

Browse Source 
Add supports for simultaneous access to multiple chips. Need to lock
the mutex before any quad spi operations and unlock the mutex after
operations complete.

Signed-off-by: Han Xu <b45815@freescale.com>
[Brian: reworked err path in fsl_qspi_prep()]
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Han Xu
2015-05-13 14:40:57 -05:00
committed by Brian Norris
parent 0eb8618bd0
commit 392d39cfca
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/mtd/spi-nor/fsl-quadspi.c
View File

@@ -26,6 +26,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/spi-nor.h> #include <linux/mtd/spi-nor.h>
#include <linux/mutex.h>
/* The registers */ /* The registers */
#define QUADSPI_MCR 0x00 #define QUADSPI_MCR 0x00
@@ -233,6 +234,7 @@ struct fsl_qspi {
u32 clk_rate; u32 clk_rate;
unsigned int chip_base_addr; /* We may support two chips. */ unsigned int chip_base_addr; /* We may support two chips. */
bool has_second_chip; bool has_second_chip;
struct mutex lock;
}; };
static inline int is_vybrid_qspi(struct fsl_qspi *q) static inline int is_vybrid_qspi(struct fsl_qspi *q)
@@ -761,18 +763,24 @@ static int fsl_qspi_prep(struct spi_nor *nor, enum spi_nor_ops ops)
struct fsl_qspi *q = nor->priv; struct fsl_qspi *q = nor->priv;
int ret; int ret;
mutex_lock(&q->lock);
ret = clk_enable(q->clk_en); ret = clk_enable(q->clk_en);
if (ret) if (ret)
return ret; goto err_mutex;
ret = clk_enable(q->clk); ret = clk_enable(q->clk);
if (ret) { if (ret)
clk_disable(q->clk_en); goto err_clk;
return ret;
}
fsl_qspi_set_base_addr(q, nor); fsl_qspi_set_base_addr(q, nor);
return 0; return 0;
err_clk:
clk_disable(q->clk_en);
err_mutex:
mutex_unlock(&q->lock);
return ret;
} }
static void fsl_qspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops) static void fsl_qspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops)
@@ -781,6 +789,7 @@ static void fsl_qspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops)
clk_disable(q->clk); clk_disable(q->clk);
clk_disable(q->clk_en); clk_disable(q->clk_en);
mutex_unlock(&q->lock);
} }
static int fsl_qspi_probe(struct platform_device *pdev) static int fsl_qspi_probe(struct platform_device *pdev)
@@ -864,6 +873,8 @@ static int fsl_qspi_probe(struct platform_device *pdev)
if (of_get_property(np, "fsl,qspi-has-second-chip", NULL)) if (of_get_property(np, "fsl,qspi-has-second-chip", NULL))
q->has_second_chip = true; q->has_second_chip = true;
mutex_init(&q->lock);
/* iterate the subnodes. */ /* iterate the subnodes. */
for_each_available_child_of_node(dev->of_node, np) { for_each_available_child_of_node(dev->of_node, np) {
char modalias[40]; char modalias[40];
@@ -892,24 +903,24 @@ static int fsl_qspi_probe(struct platform_device *pdev)
ret = of_modalias_node(np, modalias, sizeof(modalias)); ret = of_modalias_node(np, modalias, sizeof(modalias));
if (ret < 0) if (ret < 0)
goto irq_failed; goto mutex_failed;
ret = of_property_read_u32(np, "spi-max-frequency", ret = of_property_read_u32(np, "spi-max-frequency",
&q->clk_rate); &q->clk_rate);
if (ret < 0) if (ret < 0)
goto irq_failed; goto mutex_failed;
/* set the chip address for READID */ /* set the chip address for READID */
fsl_qspi_set_base_addr(q, nor); fsl_qspi_set_base_addr(q, nor);
ret = spi_nor_scan(nor, modalias, SPI_NOR_QUAD); ret = spi_nor_scan(nor, modalias, SPI_NOR_QUAD);
if (ret) if (ret)
goto irq_failed; goto mutex_failed;
ppdata.of_node = np; ppdata.of_node = np;
ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0); ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
if (ret) if (ret)
goto irq_failed; goto mutex_failed;
/* Set the correct NOR size now. */ /* Set the correct NOR size now. */
if (q->nor_size == 0) { if (q->nor_size == 0) {
@@ -950,6 +961,8 @@ last_init_failed:
i *= 2; i *= 2;
mtd_device_unregister(&q->mtd[i]); mtd_device_unregister(&q->mtd[i]);
} }
mutex_failed:
mutex_destroy(&q->lock);
irq_failed: irq_failed:
clk_disable_unprepare(q->clk); clk_disable_unprepare(q->clk);
clk_failed: clk_failed:
@@ -973,6 +986,7 @@ static int fsl_qspi_remove(struct platform_device *pdev)
writel(QUADSPI_MCR_MDIS_MASK, q->iobase + QUADSPI_MCR); writel(QUADSPI_MCR_MDIS_MASK, q->iobase + QUADSPI_MCR);
writel(0x0, q->iobase + QUADSPI_RSER); writel(0x0, q->iobase + QUADSPI_RSER);
mutex_destroy(&q->lock);
clk_unprepare(q->clk); clk_unprepare(q->clk);
clk_unprepare(q->clk_en); clk_unprepare(q->clk_en);
return 0; return 0;