github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drivers: rk_nand: fix firmware upgrade fail issue

Browse Source 
After commit 169c390240 ("drivers: rk_nand: support global partition table"),
the partition "rknand_rknand" will not create for firmware upgrade.
This commit will fix this issue and can be compatible with GPT.

Change-Id: I919c1f37358a84bf9fd53830235d0868b6352b80
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
This commit is contained in:
Zhaoyifeng 2017-12-27 09:12:31 +08:00 committed by Tao Huang
parent 1be71d23f0
commit ff0691d978
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/rk_nand/rk_nand_blk.c
View File

@ -584,26 +584,13 @@ static int nand_add_dev(struct nand_blk_ops *nandr, struct nand_part *part)
gd->fops = &nand_blktrans_ops;
if (part->name[0])
if (part->name[0]) {
snprintf(gd->disk_name,
sizeof(gd->disk_name),
"%s_%s",
nandr->name,
part->name);
else
snprintf(gd->disk_name,
sizeof(gd->disk_name),
"%s%d",
nandr->name,
dev->devnum);
set_capacity(gd, dev->size);
gd->private_data = dev;
dev->blkcore_priv = gd;
gd->queue = nandr->rq;
gd->queue->bypass_depth = 1;
if (part->size == rk_ftl_get_capacity()) {
} else {
gd->flags = GENHD_FL_EXT_DEVT;
gd->minors = 255;
snprintf(gd->disk_name,
@ -612,6 +599,12 @@ static int nand_add_dev(struct nand_blk_ops *nandr, struct nand_part *part)
nandr->name,
dev->devnum);
}
set_capacity(gd, dev->size);
gd->private_data = dev;
dev->blkcore_priv = gd;
gd->queue = nandr->rq;
gd->queue->bypass_depth = 1;
if (part->type == PART_NO_ACCESS)
dev->disable_access = 1;
@ -708,7 +701,13 @@ static int nand_blk_register(struct nand_blk_ops *nandr)
nand_add_dev(nandr, &disk_array[i]);
}
} else {
nand_blk_add_whole_disk();
struct nand_part part;
part.offset = 0;
part.size = rk_ftl_get_capacity();
part.type = 0;
part.name[0] = 0;
nand_add_dev(&mytr, &part);
}
rknand_create_procfs();