Skip to content

Commit 3f3c077

Browse files
zhao0116rkhuangtao
authored andcommitted
drivers: rk_nand: add full disk for gpt and recovrey
Add full nand disk device for gpt and recovery. Device path is /dev/block/rknand0 or /dev/rknand0. Change-Id: If6f52e4fd2b32c55ef4795692c40b6a18d066cb0 Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
1 parent 8bc3f8e commit 3f3c077

1 file changed

Lines changed: 9 additions & 16 deletions

File tree

drivers/rk_nand/rk_nand_blk.c

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -632,20 +632,14 @@ static int nand_remove_dev(struct nand_blk_dev *dev)
632632

633633
int nand_blk_add_whole_disk(void)
634634
{
635-
struct nand_part part;
636-
637-
part.offset = 0;
638-
part.size = rk_ftl_get_capacity();
639-
part.type = 0;
640-
memcpy(part.name, "rknand", sizeof("rknand"));
641-
nand_add_dev(&mytr, &part);
642635
return 0;
643636
}
644637

645638
static int nand_blk_register(struct nand_blk_ops *nandr)
646639
{
647640
int i, ret;
648641
u32 part_size;
642+
struct nand_part part;
649643

650644
rk_nand_schedule_enable_config(1);
651645
nandr->quit = 0;
@@ -680,8 +674,15 @@ static int nand_blk_register(struct nand_blk_ops *nandr)
680674
kthread_run(nand_blktrans_thread, (void *)nandr, "rknand");
681675

682676
g_max_part_num = nand_prase_cmdline_part(disk_array);
677+
678+
nandr->last_dev_index = 0;
679+
part.offset = 0;
680+
part.size = rk_ftl_get_capacity();
681+
part.type = 0;
682+
part.name[0] = 0;
683+
nand_add_dev(&mytr, &part);
684+
683685
if (g_max_part_num) {
684-
nandr->last_dev_index = 0;
685686
for (i = 0; i < g_max_part_num; i++) {
686687
part_size = (disk_array[i].offset + disk_array[i].size);
687688
pr_info("%10s: 0x%09llx -- 0x%09llx (%llu MB)\n",
@@ -691,14 +692,6 @@ static int nand_blk_register(struct nand_blk_ops *nandr)
691692
(u64)disk_array[i].size / 2048);
692693
nand_add_dev(nandr, &disk_array[i]);
693694
}
694-
} else {
695-
struct nand_part part;
696-
697-
part.offset = 0;
698-
part.size = rk_ftl_get_capacity();
699-
part.type = 0;
700-
part.name[0] = 0;
701-
nand_add_dev(&mytr, &part);
702695
}
703696

704697
rknand_create_procfs();

0 commit comments

Comments
 (0)