summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-09-16 13:13:12 -0400
committerTom Rini <trini@konsulko.com>2019-09-16 13:13:12 -0400
commit0d6160a340cee36813438484dd9f5766c250f22e (patch)
treec38c7736816bc25c19322389a1c2c87d0d7c79bf /include/linux
parenta314ec1bfda3d0db0ce8ae02dde1b06650d82e7f (diff)
parentce704ea11f29b0ee8c195f17370a4048b6be29a9 (diff)
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi
- fix mvebu_a3700_spi clock prescale (Marek BehĂșn) - unmark MXS_SPI, DEPRECATED (Lukasz) - add spi_write_then_read (Jagan) - fix SST26* flash ICs (Eugeniy) - fix soft_spi data abort (Christophe)
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/spi-nor.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 88e80af579..709b49d393 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -91,6 +91,10 @@
#define SPINOR_OP_WRDI 0x04 /* Write disable */
#define SPINOR_OP_AAI_WP 0xad /* Auto address increment word program */
+/* Used for SST26* flashes only. */
+#define SPINOR_OP_READ_BPR 0x72 /* Read block protection register */
+#define SPINOR_OP_WRITE_BPR 0x42 /* Write block protection register */
+
/* Used for S3AN flashes only */
#define SPINOR_OP_XSE 0x50 /* Sector erase */
#define SPINOR_OP_XPP 0x82 /* Page program */