File tree Expand file tree Collapse file tree 2 files changed +3
-8
lines changed Expand file tree Collapse file tree 2 files changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -2888,9 +2888,6 @@ static void spi_nor_init_flags(struct spi_nor *nor)
2888
2888
nor -> flags |= SNOR_F_HAS_SR_BP3_BIT6 ;
2889
2889
}
2890
2890
2891
- if (flags & NO_CHIP_ERASE )
2892
- nor -> flags |= SNOR_F_NO_OP_CHIP_ERASE ;
2893
-
2894
2891
if (flags & SPI_NOR_RWW && nor -> params -> n_banks > 1 &&
2895
2892
!nor -> controller_ops )
2896
2893
nor -> flags |= SNOR_F_RWW ;
Original file line number Diff line number Diff line change @@ -489,7 +489,6 @@ struct spi_nor_id {
489
489
* Usually these will power-up in a write-protected
490
490
* state.
491
491
* SPI_NOR_NO_ERASE: no erase command needed.
492
- * NO_CHIP_ERASE: chip does not support chip erase.
493
492
* SPI_NOR_NO_FR: can't do fastread.
494
493
* SPI_NOR_QUAD_PP: flash supports Quad Input Page Program.
495
494
* SPI_NOR_RWW: flash supports reads while write.
@@ -539,10 +538,9 @@ struct flash_info {
539
538
#define SPI_NOR_BP3_SR_BIT6 BIT(4)
540
539
#define SPI_NOR_SWP_IS_VOLATILE BIT(5)
541
540
#define SPI_NOR_NO_ERASE BIT(6)
542
- #define NO_CHIP_ERASE BIT(7)
543
- #define SPI_NOR_NO_FR BIT(8)
544
- #define SPI_NOR_QUAD_PP BIT(9)
545
- #define SPI_NOR_RWW BIT(10)
541
+ #define SPI_NOR_NO_FR BIT(7)
542
+ #define SPI_NOR_QUAD_PP BIT(8)
543
+ #define SPI_NOR_RWW BIT(9)
546
544
547
545
u8 no_sfdp_flags ;
548
546
#define SPI_NOR_SKIP_SFDP BIT(0)
You can’t perform that action at this time.
0 commit comments