diff options
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/atmel.h | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-nand-pxa3xx.h | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 6a293b7fff3b..cea9f70133c5 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h | |||
| @@ -71,6 +71,10 @@ struct atmel_nand_data { | |||
| 71 | u8 on_flash_bbt; /* bbt on flash */ | 71 | u8 on_flash_bbt; /* bbt on flash */ |
| 72 | struct mtd_partition *parts; | 72 | struct mtd_partition *parts; |
| 73 | unsigned int num_parts; | 73 | unsigned int num_parts; |
| 74 | bool has_dma; /* support dma transfer */ | ||
| 75 | |||
| 76 | /* default is false, only for at32ap7000 chip is true */ | ||
| 77 | bool need_reset_workaround; | ||
| 74 | }; | 78 | }; |
| 75 | 79 | ||
| 76 | /* Serial */ | 80 | /* Serial */ |
diff --git a/include/linux/platform_data/mtd-nand-pxa3xx.h b/include/linux/platform_data/mtd-nand-pxa3xx.h index c42f39f20195..ffb801998e5d 100644 --- a/include/linux/platform_data/mtd-nand-pxa3xx.h +++ b/include/linux/platform_data/mtd-nand-pxa3xx.h | |||
| @@ -16,19 +16,6 @@ struct pxa3xx_nand_timing { | |||
| 16 | unsigned int tAR; /* ND_ALE low to ND_nRE low delay */ | 16 | unsigned int tAR; /* ND_ALE low to ND_nRE low delay */ |
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | struct pxa3xx_nand_cmdset { | ||
| 20 | uint16_t read1; | ||
| 21 | uint16_t read2; | ||
| 22 | uint16_t program; | ||
| 23 | uint16_t read_status; | ||
| 24 | uint16_t read_id; | ||
| 25 | uint16_t erase; | ||
| 26 | uint16_t reset; | ||
| 27 | uint16_t lock; | ||
| 28 | uint16_t unlock; | ||
| 29 | uint16_t lock_status; | ||
| 30 | }; | ||
| 31 | |||
| 32 | struct pxa3xx_nand_flash { | 19 | struct pxa3xx_nand_flash { |
| 33 | char *name; | 20 | char *name; |
| 34 | uint32_t chip_id; | 21 | uint32_t chip_id; |
