From 3f5c2bd87016d34fe9bd4c006772ad0974e7f8e7 Mon Sep 17 00:00:00 2001
From: "Wu, Qiming" <qi-ming.wu@intel.com>
Date: Fri, 23 Mar 2018 03:29:36 +0100
Subject: [PATCH] Merge pull request #274 in SW_PON/linux from
feature/DRVLIB_SW-563-verify-spi-nand-flash-filesystem-on-falcon_mountain-haps
to xrx500
* commit '13aecfe1c3fa2b2b05e1857a3430a041b5f641b5':
Use compatible string to determine qspi flash type
Change ltq spinand compatible string
---
drivers/mtd/ltq-spinand/ltq_spinand.c | 2 +-
drivers/spi/spi-cadence-qspi.c | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/ltq-spinand/ltq_spinand.c b/drivers/mtd/ltq-spinand/ltq_spinand.c
index f511f785d..6d00119ed 100644
--- a/drivers/mtd/ltq-spinand/ltq_spinand.c
+++ b/drivers/mtd/ltq-spinand/ltq_spinand.c
@@ -1586,7 +1586,7 @@ static int spinand_remove(struct spi_device *spi)
}
static const struct of_device_id ltq_spinand_dt[] = {
- { .compatible = "lantiq,ltq_spinand", },
+ { .compatible = "lantiq,spinand", },
{}
};
diff --git a/drivers/spi/spi-cadence-qspi.c b/drivers/spi/spi-cadence-qspi.c
index 2ca0657c7..f29ce09c5 100644
--- a/drivers/spi/spi-cadence-qspi.c
+++ b/drivers/spi/spi-cadence-qspi.c
@@ -267,12 +267,16 @@ static int cadence_qspi_of_get_pdata(struct platform_device *pdev)
return -ENXIO;
}
f_pdata = &(pdata->f_pdata[cs]);
- if (of_property_read_u32(nc, "flash-type", &prop)) {
- dev_err(&pdev->dev, "couldn't determine flash-type\n");
- return -ENXIO;
- }
- pr_debug("[%s]cs=%d flash-type=%d\n", __func__, cs, prop);
- f_pdata->flash_type = prop;
+
+ /* use compatible string to determine flash type */
+ if (of_device_is_compatible(nc, "lantiq,spinand"))
+ f_pdata->flash_type = QSPI_FLASH_TYPE_NAND;
+ else
+ f_pdata->flash_type = QSPI_FLASH_TYPE_NOR;
+
+ pr_debug("[%s]cs=%d flash-type=%d\n", __func__, cs,
+ f_pdata->flash_type);
+
if (of_property_read_u32(nc, "spi-rx-bus-width", &prop)) {
dev_err(&pdev->dev, "couldn't determine quad\n");
return -ENXIO;
--
GitLab