This patch helps gettimg m25p80 probed through dt.
To get the id of the exact flash type supported for dt case,
data->type is getting parsed from dt entry.
Signed-off-by: Sourav Poddar <sourav.pod...@ti.com>
---
drivers/mtd/devices/m25p80.c | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 33098bf..cbfb9b3 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -855,6 +855,13 @@ static const struct spi_device_id m25p_ids[] = {
};
MODULE_DEVICE_TABLE(spi, m25p_ids);
+#ifdef CONFIG_OF
+static const struct of_device_id m25p_dt_ids[] = {
+ { .compatible = "m25p80", },
+ { /* sentinel */ }
+};
+#endif
+
static const struct spi_device_id *jedec_probe(struct spi_device *spi)
{
int tmp;
@@ -909,6 +916,7 @@ static int m25p_probe(struct spi_device *spi)
unsigned i;
struct mtd_part_parser_data ppdata;
struct device_node __maybe_unused *np = spi->dev.of_node;
+ int len;
#ifdef CONFIG_MTD_OF_PARTS
if (!of_device_is_available(np))
@@ -920,7 +928,18 @@ static int m25p_probe(struct spi_device *spi)
* a chip ID, try the JEDEC id commands; they'll work for most
* newer chips, even if we don't recognize the particular chip.
*/
- data = spi->dev.platform_data;
+ if (!np) {
+ data = spi->dev.platform_data;
+ } else {
+ data = devm_kzalloc(&spi->dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->type = (char *) of_get_property(np, "type", &len);
+ if (!data->type || strlen(data->type) > len)
+ return -ENODEV;
+ }
+
if (data && data->type) {
const struct spi_device_id *plat_id;
@@ -1098,6 +1117,7 @@ static struct spi_driver m25p80_driver = {
.driver = {
.name = "m25p80",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(m25p_dt_ids),
},
.id_table = m25p_ids,
.probe = m25p_probe,
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
