aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/lpddr/lpddr_cmds.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-19 20:02:01 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-19 20:02:01 -0400
commit10ce3cc919f50c2043b41ca968b43c26a3672600 (patch)
treeea409366a5208aced495bc0516a08b81fd43222e /drivers/mtd/lpddr/lpddr_cmds.c
parent24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff)
parent5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff)
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/mtd/lpddr/lpddr_cmds.c')
-rw-r--r--drivers/mtd/lpddr/lpddr_cmds.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 1dca31d9a8b3..536bbceaeaad 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -70,19 +70,12 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)
70 mtd->erase = lpddr_erase; 70 mtd->erase = lpddr_erase;
71 mtd->write = lpddr_write_buffers; 71 mtd->write = lpddr_write_buffers;
72 mtd->writev = lpddr_writev; 72 mtd->writev = lpddr_writev;
73 mtd->read_oob = NULL;
74 mtd->write_oob = NULL;
75 mtd->sync = NULL;
76 mtd->lock = lpddr_lock; 73 mtd->lock = lpddr_lock;
77 mtd->unlock = lpddr_unlock; 74 mtd->unlock = lpddr_unlock;
78 mtd->suspend = NULL;
79 mtd->resume = NULL;
80 if (map_is_linear(map)) { 75 if (map_is_linear(map)) {
81 mtd->point = lpddr_point; 76 mtd->point = lpddr_point;
82 mtd->unpoint = lpddr_unpoint; 77 mtd->unpoint = lpddr_unpoint;
83 } 78 }
84 mtd->block_isbad = NULL;
85 mtd->block_markbad = NULL;
86 mtd->size = 1 << lpddr->qinfo->DevSizeShift; 79 mtd->size = 1 << lpddr->qinfo->DevSizeShift;
87 mtd->erasesize = 1 << lpddr->qinfo->UniformBlockSizeShift; 80 mtd->erasesize = 1 << lpddr->qinfo->UniformBlockSizeShift;
88 mtd->writesize = 1 << lpddr->qinfo->BufSizeShift; 81 mtd->writesize = 1 << lpddr->qinfo->BufSizeShift;