Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / drivers / mtd / spi / sf_probe.c

diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index daa1d5b..73297e1 100644 (file)
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * SPI flash probing
  *
  * Copyright (C) 2008 Atmel Corporation
  * Copyright (C) 2010 Reinhard Meyer, EMK Elektronik
  * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -41,11 +40,9 @@ static int spi_flash_probe_slave(struct spi_flash *flash)
                return ret;
        }
 
-       ret = spi_flash_scan(flash);
-       if (ret) {
-               ret = -EINVAL;
+       ret = spi_nor_scan(flash);
+       if (ret)
                goto err_read_id;
-       }
 
 #ifdef CONFIG_SPI_FLASH_MTD
        ret = spi_flash_mtd_register(flash);
@@ -57,10 +54,16 @@ err_read_id:
 }
 
 #ifndef CONFIG_DM_SPI_FLASH
-static struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus)
+struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs,
+                                 unsigned int max_hz, unsigned int spi_mode)
 {
+       struct spi_slave *bus;
        struct spi_flash *flash;
 
+       bus = spi_setup_slave(busnum, cs, max_hz, spi_mode);
+       if (!bus)
+               return NULL;
+
        /* Allocate space if needed (not used by sf-uclass */
        flash = calloc(1, sizeof(*flash));
        if (!flash) {
@@ -78,30 +81,6 @@ static struct spi_flash *spi_flash_probe_tail(struct spi_slave *bus)
        return flash;
 }
 
-struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs,
-               unsigned int max_hz, unsigned int spi_mode)
-{
-       struct spi_slave *bus;
-
-       bus = spi_setup_slave(busnum, cs, max_hz, spi_mode);
-       if (!bus)
-               return NULL;
-       return spi_flash_probe_tail(bus);
-}
-
-#ifdef CONFIG_OF_SPI_FLASH
-struct spi_flash *spi_flash_probe_fdt(const void *blob, int slave_node,
-                                     int spi_node)
-{
-       struct spi_slave *bus;
-
-       bus = spi_setup_slave_fdt(blob, slave_node, spi_node);
-       if (!bus)
-               return NULL;
-       return spi_flash_probe_tail(bus);
-}
-#endif
-
 void spi_flash_free(struct spi_flash *flash)
 {
 #ifdef CONFIG_SPI_FLASH_MTD
@@ -117,32 +96,45 @@ static int spi_flash_std_read(struct udevice *dev, u32 offset, size_t len,
                              void *buf)
 {
        struct spi_flash *flash = dev_get_uclass_priv(dev);
+       struct mtd_info *mtd = &flash->mtd;
+       size_t retlen;
 
-       return spi_flash_cmd_read_ops(flash, offset, len, buf);
+       return log_ret(mtd->_read(mtd, offset, len, &retlen, buf));
 }
 
 static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len,
-                       const void *buf)
+                              const void *buf)
+{
+       struct spi_flash *flash = dev_get_uclass_priv(dev);
+       struct mtd_info *mtd = &flash->mtd;
+       size_t retlen;
+
+       return mtd->_write(mtd, offset, len, &retlen, buf);
+}
+
+static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len)
 {
        struct spi_flash *flash = dev_get_uclass_priv(dev);
+       struct mtd_info *mtd = &flash->mtd;
+       struct erase_info instr;
 
-#if defined(CONFIG_SPI_FLASH_SST)
-       if (flash->flags & SNOR_F_SST_WR) {
-               if (flash->spi->mode & SPI_TX_BYTE)
-                       return sst_write_bp(flash, offset, len, buf);
-               else
-                       return sst_write_wp(flash, offset, len, buf);
+       if (offset % mtd->erasesize || len % mtd->erasesize) {
+               printf("SF: Erase offset/length not multiple of erase size\n");
+               return -EINVAL;
        }
-#endif
 
-       return spi_flash_cmd_write_ops(flash, offset, len, buf);
+       memset(&instr, 0, sizeof(instr));
+       instr.addr = offset;
+       instr.len = len;
+
+       return mtd->_erase(mtd, &instr);
 }
 
-static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len)
+static int spi_flash_std_get_sw_write_prot(struct udevice *dev)
 {
        struct spi_flash *flash = dev_get_uclass_priv(dev);
 
-       return spi_flash_cmd_erase_ops(flash, offset, len);
+       return spi_flash_cmd_get_sw_write_prot(flash);
 }
 
 static int spi_flash_std_probe(struct udevice *dev)
@@ -158,14 +150,23 @@ static int spi_flash_std_probe(struct udevice *dev)
        return spi_flash_probe_slave(flash);
 }
 
+static int spi_flash_std_remove(struct udevice *dev)
+{
+#ifdef CONFIG_SPI_FLASH_MTD
+       spi_flash_mtd_unregister();
+#endif
+       return 0;
+}
+
 static const struct dm_spi_flash_ops spi_flash_std_ops = {
        .read = spi_flash_std_read,
        .write = spi_flash_std_write,
        .erase = spi_flash_std_erase,
+       .get_sw_write_prot = spi_flash_std_get_sw_write_prot,
 };
 
 static const struct udevice_id spi_flash_std_ids[] = {
-       { .compatible = "spi-flash" },
+       { .compatible = "jedec,spi-nor" },
        { }
 };
 
@@ -174,6 +175,7 @@ U_BOOT_DRIVER(spi_flash_std) = {
        .id             = UCLASS_SPI_FLASH,
        .of_match       = spi_flash_std_ids,
        .probe          = spi_flash_std_probe,
+       .remove         = spi_flash_std_remove,
        .priv_auto_alloc_size = sizeof(struct spi_flash),
        .ops            = &spi_flash_std_ops,
 };