aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/onenand/onenand_base.c5
-rw-r--r--include/linux/mtd/onenand.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 65acb85830d3..daf298948b9b 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1966,13 +1966,12 @@ static int onenand_probe(struct mtd_info *mtd)
1966 /* The data buffer size is equal to page size */ 1966 /* The data buffer size is equal to page size */
1967 mtd->writesize = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE); 1967 mtd->writesize = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE);
1968 mtd->oobsize = mtd->writesize >> 5; 1968 mtd->oobsize = mtd->writesize >> 5;
1969 /* Pagers per block is always 64 in OneNAND */ 1969 /* Pages per a block are always 64 in OneNAND */
1970 mtd->erasesize = mtd->writesize << 6; 1970 mtd->erasesize = mtd->writesize << 6;
1971 1971
1972 this->erase_shift = ffs(mtd->erasesize) - 1; 1972 this->erase_shift = ffs(mtd->erasesize) - 1;
1973 this->page_shift = ffs(mtd->writesize) - 1; 1973 this->page_shift = ffs(mtd->writesize) - 1;
1974 this->ppb_shift = (this->erase_shift - this->page_shift); 1974 this->page_mask = (1 << (this->erase_shift - this->page_shift)) - 1;
1975 this->page_mask = (mtd->erasesize / mtd->writesize) - 1;
1976 1975
1977 /* REVIST: Multichip handling */ 1976 /* REVIST: Multichip handling */
1978 1977
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index 60b3534de74d..a5e6c4bf7af3 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -63,7 +63,6 @@ struct onenand_bufferram {
63 * partly be set to inform onenand_scan about 63 * partly be set to inform onenand_scan about
64 * @erase_shift: [INTERN] number of address bits in a block 64 * @erase_shift: [INTERN] number of address bits in a block
65 * @page_shift: [INTERN] number of address bits in a page 65 * @page_shift: [INTERN] number of address bits in a page
66 * @ppb_shift: [INTERN] number of address bits in a pages per block
67 * @page_mask: [INTERN] a page per block mask 66 * @page_mask: [INTERN] a page per block mask
68 * @bufferram_index: [INTERN] BufferRAM index 67 * @bufferram_index: [INTERN] BufferRAM index
69 * @bufferram: [INTERN] BufferRAM info 68 * @bufferram: [INTERN] BufferRAM info
@@ -103,7 +102,6 @@ struct onenand_chip {
103 102
104 unsigned int erase_shift; 103 unsigned int erase_shift;
105 unsigned int page_shift; 104 unsigned int page_shift;
106 unsigned int ppb_shift; /* Pages per block shift */
107 unsigned int page_mask; 105 unsigned int page_mask;
108 106
109 unsigned int bufferram_index; 107 unsigned int bufferram_index;