From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/8] ARM: aaec2000: Use physmap driver instead of integrator-flash
Date: Wed, 5 Jan 2011 14:06:39 +0000 [thread overview]
Message-ID: <1294236400-22477-8-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1294236400-22477-1-git-send-email-marc.zyngier@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Nicolas Bellido <ml@acolin.be>
---
arch/arm/mach-aaec2000/core.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c
index 3ef6833..100707c 100644
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c
@@ -21,12 +21,12 @@
#include <linux/signal.h>
#include <linux/clk.h>
#include <linux/gfp.h>
+#include <linux/mtd/physmap.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/sizes.h>
-#include <asm/mach/flash.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
@@ -260,8 +260,7 @@ void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd)
memcpy(&mach_clcd_panel, &clcd->panel, sizeof(struct clcd_panel));
}
-static struct flash_platform_data aaec2000_flash_data = {
- .map_name = "cfi_probe",
+static struct physmap_flash_data aaec2000_flash_data = {
.width = 4,
};
@@ -272,7 +271,7 @@ static struct resource aaec2000_flash_resource = {
};
static struct platform_device aaec2000_flash_device = {
- .name = "armflash",
+ .name = "physmap-flash",
.id = 0,
.dev = {
.platform_data = &aaec2000_flash_data,
--
1.7.0.4
next prev parent reply other threads:[~2011-01-05 14:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 14:06 [PATCH 0/8] Switch ARM platforms from integrator-flash to physmap Marc Zyngier
2011-01-05 14:06 ` [PATCH 1/8] MTD: Add integrator-flash feature " Marc Zyngier
2011-01-05 14:06 ` [PATCH 2/8] ARM: Realview: Use physmap driver instead of integrator-flash Marc Zyngier
2011-01-05 14:06 ` [PATCH 3/8] ARM: Versatile: " Marc Zyngier
2011-01-05 14:06 ` [PATCH 4/8] ARM: VExpress: " Marc Zyngier
2011-01-05 14:06 ` [PATCH 5/8] ARM: Integrator/AP: " Marc Zyngier
2011-01-05 14:06 ` [PATCH 6/8] ARM: Integrator/CP: " Marc Zyngier
2011-01-05 14:06 ` Marc Zyngier [this message]
2011-01-05 14:06 ` [PATCH 8/8] MTD: Remove integrator-flash Marc Zyngier
-- strict thread matches above, loose matches on Subject: below --
2011-01-31 10:10 [PATCH v3 0/8] Switch ARM platforms from integrator-flash to physmap Marc Zyngier
2011-01-31 10:10 ` [PATCH 7/8] ARM: aaec2000: Use physmap driver instead of integrator-flash Marc Zyngier
2011-01-31 10:29 ` Russell King - ARM Linux
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=1294236400-22477-8-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).