Prepare v2013.07-rc2

[karo-tx-uboot.git] / include / spi_flash.h

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 2671ab55398aed94c97a2893a44b1b6dac06a1a9..e80785f55ef578ac989ceef262391bb602abdcec 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -25,6 +25,7 @@
 
 #include <spi.h>
 #include <linux/types.h>
+#include <linux/compiler.h>
 
 struct spi_flash {
        struct spi_slave *spi;
@@ -37,7 +38,18 @@ struct spi_flash {
        u32             page_size;
        /* Erase (sector) size */
        u32             sector_size;
+#ifdef CONFIG_SPI_FLASH_BAR
+       /* Bank read cmd */
+       u8              bank_read_cmd;
+       /* Bank write cmd */
+       u8              bank_write_cmd;
+       /* Current flash bank */
+       u8              bank_curr;
+#endif
+       /* Poll cmd - for flash erase/program */
+       u8              poll_cmd;
 
+       void *memory_map;       /* Address of read-only SPI flash access */
        int             (*read)(struct spi_flash *flash, u32 offset,
                                size_t len, void *buf);
        int             (*write)(struct spi_flash *flash, u32 offset,
@@ -46,6 +58,44 @@ struct spi_flash {
                                size_t len);
 };
 
+/**
+ * spi_flash_do_alloc - Allocate a new spi flash structure
+ *
+ * The structure is allocated and cleared with default values for
+ * read, write and erase, which the caller can modify. The caller must set
+ * up size, page_size and sector_size.
+ *
+ * Use the helper macro spi_flash_alloc() to call this.
+ *
+ * @offset: Offset of struct spi_slave within slave structure
+ * @size: Size of slave structure
+ * @spi: SPI slave
+ * @name: Name of SPI flash device
+ */
+void *spi_flash_do_alloc(int offset, int size, struct spi_slave *spi,
+                        const char *name);
+
+/**
+ * spi_flash_alloc - Allocate a new SPI flash structure
+ *
+ * @_struct: Name of structure to allocate (e.g. struct ramtron_spi_fram). This
+ *     structure must contain a member 'struct spi_flash *flash'.
+ * @spi: SPI slave
+ * @name: Name of SPI flash device
+ */
+#define spi_flash_alloc(_struct, spi, name) \
+       spi_flash_do_alloc(offsetof(_struct, flash), sizeof(_struct), \
+                               spi, name)
+
+/**
+ * spi_flash_alloc_base - Allocate a new SPI flash structure with no private data
+ *
+ * @spi: SPI slave
+ * @name: Name of SPI flash device
+ */
+#define spi_flash_alloc_base(spi, name) \
+       spi_flash_do_alloc(0, sizeof(struct spi_flash), spi, name)
+
 struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
                unsigned int max_hz, unsigned int spi_mode);
 void spi_flash_free(struct spi_flash *flash);
@@ -68,4 +118,6 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset,
        return flash->erase(flash, offset, len);
 }
 
+void spi_boot(void) __noreturn;
+
 #endif /* _SPI_FLASH_H_ */