mtd: spinand: toshiba: Rename function name to change suffix and prefix (8Gbit)

[u-boot.git] / drivers / mtd / nand / spi / toshiba.c

diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c
index c4beefa61764272adfa9a0a681fa35c4c454a350..213b66fc893a116f0278d8078bf8993f40003490 100644 (file)
--- a/drivers/mtd/nand/spi/toshiba.c
+++ b/drivers/mtd/nand/spi/toshiba.c
@@ -29,7 +29,7 @@ static SPINAND_OP_VARIANTS(write_cache_variants,
 static SPINAND_OP_VARIANTS(update_cache_variants,
                SPINAND_PROG_LOAD(false, 0, NULL, 0));
 
-static int tc58cxgxsx_ooblayout_ecc(struct mtd_info *mtd, int section,
+static int tx58cxgxsxraix_ooblayout_ecc(struct mtd_info *mtd, int section,
                                     struct mtd_oob_region *region)
 {
        if (section > 0)
@@ -41,7 +41,7 @@ static int tc58cxgxsx_ooblayout_ecc(struct mtd_info *mtd, int section,
        return 0;
 }
 
-static int tc58cxgxsx_ooblayout_free(struct mtd_info *mtd, int section,
+static int tx58cxgxsxraix_ooblayout_free(struct mtd_info *mtd, int section,
                                      struct mtd_oob_region *region)
 {
        if (section > 0)
@@ -54,12 +54,12 @@ static int tc58cxgxsx_ooblayout_free(struct mtd_info *mtd, int section,
        return 0;
 }
 
-static const struct mtd_ooblayout_ops tc58cxgxsx_ooblayout = {
-       .ecc = tc58cxgxsx_ooblayout_ecc,
-       .rfree = tc58cxgxsx_ooblayout_free,
+static const struct mtd_ooblayout_ops tx58cxgxsxraix_ooblayout = {
+       .ecc = tx58cxgxsxraix_ooblayout_ecc,
+       .rfree = tx58cxgxsxraix_ooblayout_free,
 };
 
-static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand,
+static int tx58cxgxsxraix_ecc_get_status(struct spinand_device *spinand,
                                      u8 status)
 {
        struct nand_device *nand = spinand_to_nand(spinand);
@@ -99,75 +99,75 @@ static int tc58cxgxsx_ecc_get_status(struct spinand_device *spinand,
 
 static const struct spinand_info toshiba_spinand_table[] = {
        /* 3.3V 1Gb */
-       SPINAND_INFO("TC58CVG0S3", 0xC2,
+       SPINAND_INFO("TC58CVG0S3HRAIG", 0xC2,
                     NAND_MEMORG(1, 2048, 128, 64, 1024, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
                                              &update_cache_variants),
                     0,
-                    SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
-                                    tc58cxgxsx_ecc_get_status)),
+                    SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
+                                    tx58cxgxsxraix_ecc_get_status)),
        /* 3.3V 2Gb */
-       SPINAND_INFO("TC58CVG1S3", 0xCB,
+       SPINAND_INFO("TC58CVG1S3HRAIG", 0xCB,
                     NAND_MEMORG(1, 2048, 128, 64, 2048, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
                                              &update_cache_variants),
                     0,
-                    SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
-                                    tc58cxgxsx_ecc_get_status)),
+                    SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
+                                    tx58cxgxsxraix_ecc_get_status)),
        /* 3.3V 4Gb */
-       SPINAND_INFO("TC58CVG2S0", 0xCD,
+       SPINAND_INFO("TC58CVG2S0HRAIG", 0xCD,
                     NAND_MEMORG(1, 4096, 256, 64, 2048, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
                                              &update_cache_variants),
                     0,
-                    SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
-                                    tc58cxgxsx_ecc_get_status)),
+                    SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
+                                    tx58cxgxsxraix_ecc_get_status)),
        /* 3.3V 4Gb */
-       SPINAND_INFO("TC58CVG2S0", 0xED,
+       SPINAND_INFO("TC58CVG2S0HRAIJ", 0xED,
                     NAND_MEMORG(1, 4096, 256, 64, 2048, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
                                              &update_cache_variants),
                     0,
-                    SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
-                                    tc58cxgxsx_ecc_get_status)),
+                    SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
+                                    tx58cxgxsxraix_ecc_get_status)),
        /* 1.8V 1Gb */
-       SPINAND_INFO("TC58CYG0S3", 0xB2,
+       SPINAND_INFO("TC58CYG0S3HRAIG", 0xB2,
                     NAND_MEMORG(1, 2048, 128, 64, 1024, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
                                              &update_cache_variants),
                     0,
-                    SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
-                                    tc58cxgxsx_ecc_get_status)),
+                    SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
+                                    tx58cxgxsxraix_ecc_get_status)),
        /* 1.8V 2Gb */
-       SPINAND_INFO("TC58CYG1S3", 0xBB,
+       SPINAND_INFO("TC58CYG1S3HRAIG", 0xBB,
                     NAND_MEMORG(1, 2048, 128, 64, 2048, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
                                              &update_cache_variants),
                     0,
-                    SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
-                                    tc58cxgxsx_ecc_get_status)),
+                    SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
+                                    tx58cxgxsxraix_ecc_get_status)),
        /* 1.8V 4Gb */
-       SPINAND_INFO("TC58CYG2S0", 0xBD,
+       SPINAND_INFO("TC58CYG2S0HRAIG", 0xBD,
                     NAND_MEMORG(1, 4096, 256, 64, 2048, 1, 1, 1),
                     NAND_ECCREQ(8, 512),
                     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
                                              &write_cache_variants,
                                              &update_cache_variants),
                     0,
-                    SPINAND_ECCINFO(&tc58cxgxsx_ooblayout,
-                                    tc58cxgxsx_ecc_get_status)),
+                    SPINAND_ECCINFO(&tx58cxgxsxraix_ooblayout,
+                                    tx58cxgxsxraix_ecc_get_status)),
 };
 
 static int toshiba_spinand_detect(struct spinand_device *spinand)