From: Marc Zyngier <marc.zyngier@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org Cc: David Woodhouse <dwmw2@infradead.org> Subject: [PATCH v5 1/8] MTD: Add integrator-flash feature to physmap Date: Mon, 16 May 2011 15:59:30 +0100 [thread overview] Message-ID: <1305557977-16871-2-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1305557977-16871-1-git-send-email-marc.zyngier@arm.com> In the process of moving platforms away from integrator-flash (aka armflash), add to physmap the few features that make armflash unique: - optionnal probing for the AFS partition type - init() and exit() methods, used by Integrator to control write access to the various onboard programmable components Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: David Woodhouse <dwmw2@infradead.org> --- drivers/mtd/maps/physmap.c | 16 +++++++++++++++- include/linux/mtd/physmap.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 7522df4..49676b7 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -67,6 +67,10 @@ static int physmap_flash_remove(struct platform_device *dev) if (info->mtd[i] != NULL) map_destroy(info->mtd[i]); } + + if (physmap_data->exit) + physmap_data->exit(dev); + return 0; } @@ -77,7 +81,11 @@ static const char *rom_probe_types[] = { "map_rom", NULL }; #ifdef CONFIG_MTD_PARTITIONS -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", +#ifdef CONFIG_MTD_AFS_PARTS + "afs", +#endif + NULL }; #endif static int physmap_flash_probe(struct platform_device *dev) @@ -100,6 +108,12 @@ static int physmap_flash_probe(struct platform_device *dev) goto err_out; } + if (physmap_data->init) { + err = physmap_data->init(dev); + if (err) + goto err_out; + } + platform_set_drvdata(dev, info); for (i = 0; i < dev->num_resources; i++) { diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h index bcfd9f7..d37cca0 100644 --- a/include/linux/mtd/physmap.h +++ b/include/linux/mtd/physmap.h @@ -22,6 +22,8 @@ struct map_info; struct physmap_flash_data { unsigned int width; + int (*init)(struct platform_device *); + void (*exit)(struct platform_device *); void (*set_vpp)(struct map_info *, int); unsigned int nr_parts; unsigned int pfow_base; -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 1/8] MTD: Add integrator-flash feature to physmap Date: Mon, 16 May 2011 15:59:30 +0100 [thread overview] Message-ID: <1305557977-16871-2-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1305557977-16871-1-git-send-email-marc.zyngier@arm.com> In the process of moving platforms away from integrator-flash (aka armflash), add to physmap the few features that make armflash unique: - optionnal probing for the AFS partition type - init() and exit() methods, used by Integrator to control write access to the various onboard programmable components Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: David Woodhouse <dwmw2@infradead.org> --- drivers/mtd/maps/physmap.c | 16 +++++++++++++++- include/linux/mtd/physmap.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 7522df4..49676b7 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -67,6 +67,10 @@ static int physmap_flash_remove(struct platform_device *dev) if (info->mtd[i] != NULL) map_destroy(info->mtd[i]); } + + if (physmap_data->exit) + physmap_data->exit(dev); + return 0; } @@ -77,7 +81,11 @@ static const char *rom_probe_types[] = { "map_rom", NULL }; #ifdef CONFIG_MTD_PARTITIONS -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", +#ifdef CONFIG_MTD_AFS_PARTS + "afs", +#endif + NULL }; #endif static int physmap_flash_probe(struct platform_device *dev) @@ -100,6 +108,12 @@ static int physmap_flash_probe(struct platform_device *dev) goto err_out; } + if (physmap_data->init) { + err = physmap_data->init(dev); + if (err) + goto err_out; + } + platform_set_drvdata(dev, info); for (i = 0; i < dev->num_resources; i++) { diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h index bcfd9f7..d37cca0 100644 --- a/include/linux/mtd/physmap.h +++ b/include/linux/mtd/physmap.h @@ -22,6 +22,8 @@ struct map_info; struct physmap_flash_data { unsigned int width; + int (*init)(struct platform_device *); + void (*exit)(struct platform_device *); void (*set_vpp)(struct map_info *, int); unsigned int nr_parts; unsigned int pfow_base; -- 1.7.0.4
next prev parent reply other threads:[~2011-05-16 14:59 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-05-16 14:59 [PATCH v5 0/8] Switch ARM platforms from integrator-flash to physmap Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier [this message] 2011-05-16 14:59 ` [PATCH v5 1/8] MTD: Add integrator-flash feature " Marc Zyngier 2011-05-17 5:37 ` Artem Bityutskiy 2011-05-17 5:37 ` Artem Bityutskiy 2011-05-17 5:46 ` Artem Bityutskiy 2011-05-17 5:46 ` Artem Bityutskiy 2011-05-17 7:43 ` Russell King - ARM Linux 2011-05-17 7:43 ` Russell King - ARM Linux 2011-05-17 8:13 ` Artem Bityutskiy 2011-05-17 8:13 ` Artem Bityutskiy 2011-05-17 8:16 ` Artem Bityutskiy 2011-05-17 8:16 ` Artem Bityutskiy 2011-05-17 8:49 ` Marc Zyngier 2011-05-17 8:49 ` Marc Zyngier 2011-05-17 9:05 ` Artem Bityutskiy 2011-05-17 9:05 ` Artem Bityutskiy 2011-05-19 11:13 ` Artem Bityutskiy 2011-05-19 11:13 ` Artem Bityutskiy 2011-05-19 19:25 ` Russell King - ARM Linux 2011-05-19 19:25 ` Russell King - ARM Linux 2011-05-24 4:43 ` Mike Frysinger 2011-05-24 4:43 ` Mike Frysinger 2011-05-16 14:59 ` [PATCH v5 2/8] ARM: Realview: Use physmap driver instead of integrator-flash Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 14:59 ` [PATCH v5 3/8] ARM: Versatile: " Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 14:59 ` [PATCH v5 4/8] ARM: VExpress: " Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 14:59 ` [PATCH v5 5/8] ARM: Integrator/AP: " Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 14:59 ` [PATCH v5 6/8] ARM: Integrator/CP: " Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 14:59 ` [PATCH v5 7/8] MTD: Remove integrator-flash Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 14:59 ` [PATCH v5 8/8] MTD: physmap: let set_vpp() pass a platform_device instead of a map_info Marc Zyngier 2011-05-16 14:59 ` Marc Zyngier 2011-05-16 15:06 ` Eric Miao 2011-05-16 15:06 ` Eric Miao 2011-05-16 15:14 ` Marc Zyngier 2011-05-16 15:14 ` Marc Zyngier 2011-05-16 20:56 ` Russell King - ARM Linux 2011-05-16 20:56 ` Russell King - ARM Linux 2011-05-17 8:17 ` Jean-Christophe PLAGNIOL-VILLARD 2011-05-17 8:17 ` Jean-Christophe PLAGNIOL-VILLARD
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1305557977-16871-2-git-send-email-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=dwmw2@infradead.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mtd@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.