Merge branch 'master' of git://git.denx.de/u-boot-nds32

[u-boot] / drivers / mtd / spi / macronix.c

diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c
index 5268c661ea301fd9380a1f15390932dca170cda8..70435eb5a3a55d37f178bb6a4feb9bdf1c5a4dde 100644 (file)
--- a/drivers/mtd/spi/macronix.c
+++ b/drivers/mtd/spi/macronix.c
@@ -10,23 +10,7 @@
  * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -79,45 +63,6 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
        },
 };
 
-static int macronix_write_status(struct spi_flash *flash, u8 sr)
-{
-       u8 cmd;
-       int ret;
-
-       ret = spi_flash_cmd_write_enable(flash);
-       if (ret < 0) {
-               debug("SF: enabling write failed\n");
-               return ret;
-       }
-
-       cmd = CMD_WRITE_STATUS;
-       ret = spi_flash_cmd_write(flash->spi, &cmd, 1, &sr, 1);
-       if (ret) {
-               debug("SF: fail to write status register\n");
-               return ret;
-       }
-
-       ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-       if (ret < 0) {
-               debug("SF: write status register timed out\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-static int macronix_unlock(struct spi_flash *flash)
-{
-       int ret;
-
-       /* Enable status register writing and clear BP# bits */
-       ret = macronix_write_status(flash, 0);
-       if (ret)
-               debug("SF: fail to disable write protection\n");
-
-       return ret;
-}
-
 struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
 {
        const struct macronix_spi_flash_params *params;
@@ -136,24 +81,18 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
                return NULL;
        }
 
-       flash = malloc(sizeof(*flash));
+       flash = spi_flash_alloc_base(spi, params->name);
        if (!flash) {
                debug("SF: Failed to allocate memory\n");
                return NULL;
        }
 
-       flash->spi = spi;
-       flash->name = params->name;
-
-       flash->write = spi_flash_cmd_write_multi;
-       flash->erase = spi_flash_cmd_erase;
-       flash->read = spi_flash_cmd_read_fast;
        flash->page_size = 256;
        flash->sector_size = 256 * 16 * 16;
        flash->size = flash->sector_size * params->nr_blocks;
 
        /* Clear BP# bits for read-only flash */
-       macronix_unlock(flash);
+       spi_flash_cmd_write_status(flash, 0);
 
        return flash;
 }