Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0f6232801cee4f45dbdb0cec45f71172c9b617ca

Authored by Jagannadha Sutradharudu Teki
1 parent f4f51a8ff8
Exists in master and in 53 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

sf: probe: Add support for flag status polling 

From Micron, 512MB onwards, flash requires to poll flag status
instead of read status- hence added E_FSR flag on spectific
flash parts.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

Showing 2 changed files with 12 additions and 5 deletions Side-by-side Diff

drivers/mtd/spi/spi_flash_probe.c
Diff comments   View file @ 0f62328
... ... @@ -94,10 +94,10 @@
94 94 {"N25Q128A", 0x20bb18, 0x0, 64 * 1024, 256, SECT_4K},
95 95 {"N25Q256", 0x20ba19, 0x0, 64 * 1024, 512, SECT_4K},
96 96 {"N25Q256A", 0x20bb19, 0x0, 64 * 1024, 512, SECT_4K},
97   - {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, SECT_4K},
98   - {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, SECT_4K},
99   - {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, SECT_4K},
100   - {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, SECT_4K},
  97 + {"N25Q512", 0x20ba20, 0x0, 64 * 1024, 1024, E_FSR | SECT_4K},
  98 + {"N25Q512A", 0x20bb20, 0x0, 64 * 1024, 1024, E_FSR | SECT_4K},
  99 + {"N25Q1024", 0x20ba21, 0x0, 64 * 1024, 2048, E_FSR | SECT_4K},
  100 + {"N25Q1024A", 0x20bb21, 0x0, 64 * 1024, 2048, E_FSR | SECT_4K},
101 101 #endif
102 102 #ifdef CONFIG_SPI_FLASH_SST /* SST */
103 103 {"SST25VF040B", 0xbf258d, 0x0, 64 * 1024, 8, SECT_4K | SST_WP},
... ... @@ -187,7 +187,6 @@
187 187  
188 188 flash->spi = spi;
189 189 flash->name = params->name;
190   - flash->poll_cmd = CMD_READ_STATUS;
191 190  
192 191 /* Assign spi_flash ops */
193 192 flash->write = spi_flash_cmd_write_multi;
... ... @@ -214,6 +213,13 @@
214 213 flash->erase_cmd = CMD_ERASE_64K;
215 214 flash->erase_size = flash->sector_size;
216 215 }
  216 +
  217 + /* Poll cmd seclection */
  218 + flash->poll_cmd = CMD_READ_STATUS;
  219 +#ifdef CONFIG_SPI_FLASH_STMICRO
  220 + if (params->flags & E_FSR)
  221 + flash->poll_cmd = CMD_FLAG_STATUS;
  222 +#endif
217 223  
218 224 /* Flash powers up read-only, so clear BP# bits */
219 225 #if defined(CONFIG_SPI_FLASH_ATMEL) || \
... ... @@ -20,6 +20,7 @@
20 20 /* SECT flags */
21 21 #define SECT_4K (1 << 1)
22 22 #define SECT_32K (1 << 2)
  23 +#define E_FSR (1 << 3)
23 24  
24 25 /* SST specific macros */
25 26 #ifdef CONFIG_SPI_FLASH_SST