From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 6/7] ARM: Integrator/CP: Use physmap driver instead of integrator-flash
Date: Thu, 17 Mar 2011 13:03:47 +0000 [thread overview]
Message-ID: <1300367028-3916-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1300367028-3916-1-git-send-email-marc.zyngier@arm.com>
Tested with an ARM-1136 core tile.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Woodhouse <dwmw2@infradead.org>
---
arch/arm/mach-integrator/integrator_cp.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 9e3ce26..ec9628f 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -22,6 +22,7 @@
#include <linux/io.h>
#include <linux/gfp.h>
#include <linux/clkdev.h>
+#include <linux/mtd/physmap.h>
#include <mach/hardware.h>
#include <mach/platform.h>
@@ -35,7 +36,6 @@
#include <mach/lm.h>
#include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
#include <asm/mach/irq.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
@@ -239,7 +239,7 @@ static struct clk_lookup cp_lookups[] = {
/*
* Flash handling.
*/
-static int intcp_flash_init(void)
+static int intcp_flash_init(struct platform_device *dev)
{
u32 val;
@@ -250,7 +250,7 @@ static int intcp_flash_init(void)
return 0;
}
-static void intcp_flash_exit(void)
+static void intcp_flash_exit(struct platform_device *dev)
{
u32 val;
@@ -259,7 +259,7 @@ static void intcp_flash_exit(void)
writel(val, INTCP_VA_CTRL_BASE + INTCP_FLASHPROG);
}
-static void intcp_flash_set_vpp(int on)
+static void intcp_flash_set_vpp(struct map_info *map, int on)
{
u32 val;
@@ -271,8 +271,7 @@ static void intcp_flash_set_vpp(int on)
writel(val, INTCP_VA_CTRL_BASE + INTCP_FLASHPROG);
}
-static struct flash_platform_data intcp_flash_data = {
- .map_name = "cfi_probe",
+static struct physmap_flash_data intcp_flash_data = {
.width = 4,
.init = intcp_flash_init,
.exit = intcp_flash_exit,
@@ -286,7 +285,7 @@ static struct resource intcp_flash_resource = {
};
static struct platform_device intcp_flash_device = {
- .name = "armflash",
+ .name = "physmap-flash",
.id = 0,
.dev = {
.platform_data = &intcp_flash_data,
--
1.7.0.4
next prev parent reply other threads:[~2011-03-17 13:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 13:03 [PATCH v4 0/7] Switch ARM platforms from integrator-flash to physmap Marc Zyngier
2011-03-17 13:03 ` [PATCH v4 1/7] MTD: Add integrator-flash feature " Marc Zyngier
2011-05-15 7:41 ` Russell King - ARM Linux
2011-05-16 12:52 ` Marc Zyngier
2011-05-16 13:00 ` Russell King - ARM Linux
2011-05-16 13:11 ` Marc Zyngier
2011-03-17 13:03 ` [PATCH v4 2/7] ARM: Realview: Use physmap driver instead of integrator-flash Marc Zyngier
2011-03-17 13:03 ` [PATCH v4 3/7] ARM: Versatile: " Marc Zyngier
2011-03-17 13:03 ` [PATCH v4 4/7] ARM: VExpress: " Marc Zyngier
2011-03-17 13:03 ` [PATCH v4 5/7] ARM: Integrator/AP: " Marc Zyngier
2011-03-17 13:03 ` Marc Zyngier [this message]
2011-03-17 13:03 ` [PATCH v4 7/7] MTD: Remove integrator-flash Marc Zyngier
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=1300367028-3916-7-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).