static int __init init_sbc82xx_flash(void) { volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl; int bigflash; int i; #ifdef CONFIG_SBC8560 mc = ioremap(0xff700000 + 0x5000, sizeof(memctl_cpm2_t)); #else mc = &cpm2_immr->im_memctl; #endif bigflash = 1; if ((mc->memc_br0 & 0x00001800) == 0x00001800) bigflash = 0; init_sbc82xx_one_flash(sbc82xx_flash_map[0], mc->memc_br0, mc->memc_or0); init_sbc82xx_one_flash(sbc82xx_flash_map[1], mc->memc_br6, mc->memc_or6); init_sbc82xx_one_flash(sbc82xx_flash_map[2], mc->memc_br1, mc->memc_or1); #ifdef CONFIG_SBC8560 iounmap((void *) mc); #endif for (i=0; i<3; i++) { int8_t flashcs[3] = { 0, 6, 1 }; int nr_parts; printk(KERN_NOTICE "PowerQUICC II %s (%ld MiB on CS%d", sbc82xx_flash_map[i].name, (sbc82xx_flash_map[i].size >> 20), flashcs[i]); if (!sbc82xx_flash_map[i].phys) { /* We know it can't be at zero. */ printk("): disabled by bootloader.\n"); continue; } printk(" at %08lx)\n", sbc82xx_flash_map[i].phys); sbc82xx_flash_map[i].virt = ioremap(sbc82xx_flash_map[i].phys, sbc82xx_flash_map[i].size); if (!sbc82xx_flash_map[i].virt) { printk("Failed to ioremap\n"); continue; } simple_map_init(&sbc82xx_flash_map[i]); sbcmtd[i] = do_map_probe("cfi_probe", &sbc82xx_flash_map[i]); if (!sbcmtd[i]) continue; sbcmtd[i]->owner = THIS_MODULE; nr_parts = parse_mtd_partitions(sbcmtd[i], part_probes, &sbcmtd_parts[i], 0); if (nr_parts > 0) { <<<<<<< HEAD mtd_device_register(sbcmtd[i], sbcmtd_parts[i], nr_parts); ======= add_mtd_partitions (sbcmtd[i], sbcmtd_parts[i], nr_parts); >>>>>>> 296c66da8a02d52243f45b80521febece5ed498a continue;
int __init init_sbc82xx_flash(void) { volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl; int bigflash; int i; #ifdef CONFIG_SBC8560 mc = ioremap(0xff700000 + 0x5000, sizeof(memctl_cpm2_t)); #else mc = &cpm2_immr->im_memctl; #endif bigflash = 1; if ((mc->memc_br0 & 0x00001800) == 0x00001800) bigflash = 0; init_sbc82xx_one_flash(sbc82xx_flash_map[0], mc->memc_br0, mc->memc_or0); init_sbc82xx_one_flash(sbc82xx_flash_map[1], mc->memc_br6, mc->memc_or6); init_sbc82xx_one_flash(sbc82xx_flash_map[2], mc->memc_br1, mc->memc_or1); #ifdef CONFIG_SBC8560 iounmap((void *) mc); #endif for (i=0; i<3; i++) { int8_t flashcs[3] = { 0, 6, 1 }; int nr_parts; printk(KERN_NOTICE "PowerQUICC II %s (%ld MiB on CS%d", sbc82xx_flash_map[i].name, (sbc82xx_flash_map[i].size >> 20), flashcs[i]); if (!sbc82xx_flash_map[i].phys) { /* We know it can't be at zero. */ printk("): disabled by bootloader.\n"); continue; } printk(" at %08lx)\n", sbc82xx_flash_map[i].phys); sbc82xx_flash_map[i].virt = ioremap(sbc82xx_flash_map[i].phys, sbc82xx_flash_map[i].size); if (!sbc82xx_flash_map[i].virt) { printk("Failed to ioremap\n"); continue; } simple_map_init(&sbc82xx_flash_map[i]); sbcmtd[i] = do_map_probe("cfi_probe", &sbc82xx_flash_map[i]); if (!sbcmtd[i]) continue; sbcmtd[i]->owner = THIS_MODULE; nr_parts = parse_mtd_partitions(sbcmtd[i], part_probes, &sbcmtd_parts[i], 0); if (nr_parts > 0) { add_mtd_partitions (sbcmtd[i], sbcmtd_parts[i], nr_parts); continue; } /* No partitioning detected. Use default */ if (i == 2) { add_mtd_device(sbcmtd[i]); } else if (i == bigflash) { add_mtd_partitions (sbcmtd[i], bigflash_parts, ARRAY_SIZE(bigflash_parts)); } else { add_mtd_partitions (sbcmtd[i], smallflash_parts, ARRAY_SIZE(smallflash_parts)); } } return 0; }
static int __init init_sbc82xx_flash(void) { volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl; int bigflash; int i; #ifdef CONFIG_SBC8560 mc = ioremap(0xff700000 + 0x5000, sizeof(memctl_cpm2_t)); #else mc = &cpm2_immr->im_memctl; #endif bigflash = 1; if ((mc->memc_br0 & 0x00001800) == 0x00001800) bigflash = 0; init_sbc82xx_one_flash(sbc82xx_flash_map[0], mc->memc_br0, mc->memc_or0); init_sbc82xx_one_flash(sbc82xx_flash_map[1], mc->memc_br6, mc->memc_or6); init_sbc82xx_one_flash(sbc82xx_flash_map[2], mc->memc_br1, mc->memc_or1); #ifdef CONFIG_SBC8560 iounmap((void *) mc); #endif for (i=0; i<3; i++) { int8_t flashcs[3] = { 0, 6, 1 }; int nr_parts; struct mtd_partition *defparts; printk(KERN_NOTICE "PowerQUICC II %s (%ld MiB on CS%d", sbc82xx_flash_map[i].name, (sbc82xx_flash_map[i].size >> 20), flashcs[i]); if (!sbc82xx_flash_map[i].phys) { printk("): disabled by bootloader.\n"); continue; } printk(" at %08lx)\n", sbc82xx_flash_map[i].phys); sbc82xx_flash_map[i].virt = ioremap(sbc82xx_flash_map[i].phys, sbc82xx_flash_map[i].size); if (!sbc82xx_flash_map[i].virt) { printk("Failed to ioremap\n"); continue; } simple_map_init(&sbc82xx_flash_map[i]); sbcmtd[i] = do_map_probe("cfi_probe", &sbc82xx_flash_map[i]); if (!sbcmtd[i]) continue; sbcmtd[i]->owner = THIS_MODULE; if (i == 2) { defparts = NULL; nr_parts = 0; } else if (i == bigflash) { defparts = bigflash_parts; nr_parts = ARRAY_SIZE(bigflash_parts); } else { defparts = smallflash_parts; nr_parts = ARRAY_SIZE(smallflash_parts); } mtd_device_parse_register(sbcmtd[i], part_probes, NULL, defparts, nr_parts); } return 0; }