developer | d82d9fc | 2022-06-23 19:03:51 +0800 | [diff] [blame] | 1 | From b242e30661dac5c1c127999600029cd5b3f6b458 Mon Sep 17 00:00:00 2001 |
| 2 | From: "SkyLake.Huang" <skylake.huang@mediatek.com> |
| 3 | Date: Thu, 23 Jun 2022 18:40:59 +0800 |
| 4 | Subject: [PATCH] drivers: mtd: spi-nor: Add calibration support for spi-nor |
| 5 | |
| 6 | Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com> |
| 7 | --- |
| 8 | drivers/mtd/spi-nor/spi-nor.c | 17 +++++++++++++++++ |
| 9 | 1 file changed, 17 insertions(+) |
| 10 | |
developer | d82d9fc | 2022-06-23 19:03:51 +0800 | [diff] [blame] | 11 | --- a/drivers/mtd/spi-nor/spi-nor.c |
| 12 | +++ b/drivers/mtd/spi-nor/spi-nor.c |
developer | 2460ee7 | 2023-02-07 18:16:20 +0800 | [diff] [blame] | 13 | @@ -4897,6 +4897,35 @@ static void spi_nor_debugfs_init(struct |
developer | d82d9fc | 2022-06-23 19:03:51 +0800 | [diff] [blame] | 14 | info->id_len, info->id); |
| 15 | } |
| 16 | |
| 17 | +static int spi_nor_cal_read(void *priv, u32 *addr, int addrlen, u8 *buf, int readlen) |
| 18 | +{ |
| 19 | + int ret; |
| 20 | + struct spi_nor *nor = (struct spi_nor *)priv; |
| 21 | + |
| 22 | + nor->reg_proto = SNOR_PROTO_1_1_1; |
| 23 | + nor->read_proto = SNOR_PROTO_1_1_1; |
| 24 | + nor->read_opcode = SPINOR_OP_READ; |
| 25 | + nor->addr_width = 3; |
| 26 | + nor->read_dummy = 0; |
| 27 | + |
| 28 | + return spi_nor_read_raw(nor, *addr, readlen, buf); |
| 29 | +} |
| 30 | + |
developer | 2460ee7 | 2023-02-07 18:16:20 +0800 | [diff] [blame] | 31 | +static int spi_nor_cal_read_4B(void *priv, u32 *addr, int addrlen, u8 *buf, |
| 32 | + int readlen) |
| 33 | +{ |
| 34 | + int ret; |
| 35 | + struct spi_nor *nor = (struct spi_nor *)priv; |
| 36 | + |
| 37 | + nor->reg_proto = SNOR_PROTO_1_1_1; |
| 38 | + nor->read_proto = SNOR_PROTO_1_1_1; |
| 39 | + nor->read_opcode = SPINOR_OP_READ_4B; |
| 40 | + nor->addr_width = 4; |
| 41 | + nor->read_dummy = 0; |
| 42 | + |
| 43 | + return spi_nor_read_raw(nor, *addr, readlen, buf); |
| 44 | +} |
| 45 | + |
developer | d82d9fc | 2022-06-23 19:03:51 +0800 | [diff] [blame] | 46 | static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor, |
| 47 | const char *name) |
| 48 | { |
developer | 2460ee7 | 2023-02-07 18:16:20 +0800 | [diff] [blame] | 49 | @@ -4971,6 +5000,17 @@ int spi_nor_scan(struct spi_nor *nor, co |
developer | d82d9fc | 2022-06-23 19:03:51 +0800 | [diff] [blame] | 50 | if (!nor->bouncebuf) |
| 51 | return -ENOMEM; |
| 52 | |
developer | 2460ee7 | 2023-02-07 18:16:20 +0800 | [diff] [blame] | 53 | + if(nor->spimem) { |
| 54 | + ret = spi_mem_do_calibration(nor->spimem, |
| 55 | + spi_nor_cal_read, nor); |
| 56 | + if (ret) { |
| 57 | + ret = spi_mem_do_calibration(nor->spimem, |
| 58 | + spi_nor_cal_read_4B, nor); |
| 59 | + if (ret) |
| 60 | + return ret; |
| 61 | + } |
| 62 | + } |
developer | d82d9fc | 2022-06-23 19:03:51 +0800 | [diff] [blame] | 63 | + |
| 64 | info = spi_nor_get_flash_info(nor, name); |
| 65 | if (IS_ERR(info)) |
| 66 | return PTR_ERR(info); |