diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:54 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-01 09:43:54 +0200 |
| commit | 60fc3e99b52e7ac3282e80ed4124a9a6d1276b23 (patch) | |
| tree | 85eff24b87bbf4da2d584b7f58a54a2e946595ff /include | |
| parent | 69dccb494a0ee5fececc67f2b7afa7b79368a991 (diff) | |
| parent | 746a5530bee37c8d2ffc75609447641b3f3cb55b (diff) | |
| download | barebox-60fc3e99b52e7ac3282e80ed4124a9a6d1276b23.tar.gz barebox-60fc3e99b52e7ac3282e80ed4124a9a6d1276b23.tar.xz | |
Merge branch 'for-next/mtd'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 4 | ||||
| -rw-r--r-- | include/spi/imx-spi.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index f099406c53..bd2b16dd2a 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -190,6 +190,7 @@ struct spi_nor { * @nor: the spi_nor structure * @name: the chip type name * @mode: the read mode supported by the driver + * @use_large_blocks: prefer large blocks even if 4k blocks are supported * * The drivers can use this fuction to scan the SPI NOR. * In the scanning, it will try to get all the necessary information to @@ -199,6 +200,7 @@ struct spi_nor { * * Return: 0 for success, others for failure. */ -int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode); +int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode, + bool use_large_blocks); #endif diff --git a/include/spi/imx-spi.h b/include/spi/imx-spi.h index 560b092bd2..221c66502f 100644 --- a/include/spi/imx-spi.h +++ b/include/spi/imx-spi.h @@ -61,6 +61,7 @@ #define CSPI_2_3_CTRL 0x08 #define CSPI_2_3_CTRL_ENABLE (1 << 0) #define CSPI_2_3_CTRL_XCH (1 << 2) +#define CSPI_2_3_CTRL_SMC (1 << 3) #define CSPI_2_3_CTRL_MODE(cs) (1 << ((cs) + 4)) #define CSPI_2_3_CTRL_POSTDIV_OFFSET 8 #define CSPI_2_3_CTRL_PREDIV_OFFSET 12 @@ -78,6 +79,7 @@ #define CSPI_2_3_INT_RREN (1 << 3) #define CSPI_2_3_STAT 0x18 -#define CSPI_2_3_STAT_RR (1 << 3) +#define CSPI_2_3_STAT_TF (1 << 2) +#define CSPI_2_3_STAT_RR (1 << 3) #endif /* __SPI_IMX_SPI_H */ |