spi_flash: Add spi_flash_probe_fdt() to locate SPI by FDT node

[karo-tx-uboot.git] / drivers / mtd / spi / sf_probe.c

diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index 4251b1be192f13bb14e5abbe8db66f397dcc50a3..ca127155b50182dda8ccc0b5c0106702a3f30ea0 100644 (file)
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2010 Reinhard Meyer, EMK Elektronik
  * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc.
  *
- * Licensed under the GPL-2 or later.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * @jedec:             Device jedec ID (0x[1byte_manuf_id][2byte_dev_id])
  * @ext_jedec:         Device ext_jedec ID
  * @sector_size:       Sector size of this device
- * @nr_sectors:        No.of sectors on this device
+ * @nr_sectors:                No.of sectors on this device
  * @flags:             Importent param, for flash specific behaviour
  */
 struct spi_flash_params {
@@ -46,6 +46,7 @@ static const struct spi_flash_params spi_flash_params_table[] = {
        {"AT45DB161D",     0x1f2600, 0x0,       64 * 1024,    32,              SECT_4K},
        {"AT45DB321D",     0x1f2700, 0x0,       64 * 1024,    64,              SECT_4K},
        {"AT45DB641D",     0x1f2800, 0x0,       64 * 1024,   128,              SECT_4K},
+       {"AT25DF321",      0x1f4701, 0x0,       64 * 1024,    64,              SECT_4K},
 #endif
 #ifdef CONFIG_SPI_FLASH_EON            /* EON */
        {"EN25Q32B",       0x1c3016, 0x0,       64 * 1024,    64,                    0},
@@ -139,7 +140,7 @@ static const struct spi_flash_params spi_flash_params_table[] = {
 #endif
        /*
         * Note:
-        * Below paired flash devices has similar spi_flash_params params.
+        * Below paired flash devices has similar spi_flash params.
         * (S25FL129P_64K, S25FL128S_64K)
         * (W25Q80BL, W25Q80BV)
         * (W25Q16CL, W25Q16DV)
@@ -188,6 +189,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi,
        }
        memset(flash, '\0', sizeof(*flash));
 
+       /* Assign spi data */
        flash->spi = spi;
        flash->name = params->name;
        flash->memory_map = spi->memory_map;
@@ -283,16 +285,13 @@ int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash)
 }
 #endif /* CONFIG_OF_CONTROL */
 
-struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
-               unsigned int max_hz, unsigned int spi_mode)
+static struct spi_flash *spi_flash_probe_slave(struct spi_slave *spi)
 {
-       struct spi_slave *spi;
        struct spi_flash *flash = NULL;
        u8 idcode[5];
        int ret;
 
        /* Setup spi_slave */
-       spi = spi_setup_slave(bus, cs, max_hz, spi_mode);
        if (!spi) {
                printf("SF: Failed to set up slave\n");
                return NULL;
@@ -356,6 +355,26 @@ err_claim_bus:
        return NULL;
 }
 
+struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
+               unsigned int max_hz, unsigned int spi_mode)
+{
+       struct spi_slave *spi;
+
+       spi = spi_setup_slave(bus, cs, max_hz, spi_mode);
+       return spi_flash_probe_slave(spi);
+}
+
+#ifdef CONFIG_OF_SPI_FLASH
+struct spi_flash *spi_flash_probe_fdt(const void *blob, int slave_node,
+                                     int spi_node)
+{
+       struct spi_slave *spi;
+
+       spi = spi_setup_slave_fdt(blob, slave_node, spi_node);
+       return spi_flash_probe_slave(spi);
+}
+#endif
+
 void spi_flash_free(struct spi_flash *flash)
 {
        spi_free_slave(flash->spi);