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 v6 6/8] ARM: Integrator/CP: Use physmap driver instead of integrator-flash
Date: Tue, 17 May 2011 14:11:15 +0100 [thread overview]
Message-ID: <1305637877-24436-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1305637877-24436-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
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 6/8] ARM: Integrator/CP: Use physmap driver instead of integrator-flash
Date: Tue, 17 May 2011 14:11:15 +0100 [thread overview]
Message-ID: <1305637877-24436-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1305637877-24436-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-05-17 13:11 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-17 13:11 [PATCH v6 0/8] Switch ARM platforms from integrator-flash to physmap Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-17 13:11 ` [PATCH v6 1/8] MTD: Add integrator-flash feature " Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-19 11:14 ` Artem Bityutskiy
2011-05-19 11:14 ` Artem Bityutskiy
2011-05-31 19:11 ` Sergei Shtylyov
2011-05-31 19:11 ` Sergei Shtylyov
2011-05-31 21:44 ` Marc Zyngier
2011-05-31 21:44 ` Marc Zyngier
2011-06-01 2:20 ` Mike Frysinger
2011-06-01 2:20 ` Mike Frysinger
2011-06-01 7:42 ` Artem Bityutskiy
2011-06-01 7:42 ` Artem Bityutskiy
2011-06-01 16:32 ` Sergei Shtylyov
2011-06-01 16:32 ` Sergei Shtylyov
2011-06-01 7:49 ` Marc Zyngier
2011-06-01 7:49 ` Marc Zyngier
2011-06-01 9:43 ` Artem Bityutskiy
2011-06-01 9:43 ` Artem Bityutskiy
2011-06-01 16:28 ` Sergei Shtylyov
2011-06-01 16:28 ` Sergei Shtylyov
2011-05-17 13:11 ` [PATCH v6 2/8] ARM: Realview: Use physmap driver instead of integrator-flash Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-17 13:11 ` [PATCH v6 3/8] ARM: Versatile: " Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-17 13:11 ` [PATCH v6 4/8] ARM: VExpress: " Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-17 13:11 ` [PATCH v6 5/8] ARM: Integrator/AP: " Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier [this message]
2011-05-17 13:11 ` [PATCH v6 6/8] ARM: Integrator/CP: " Marc Zyngier
2011-05-17 13:11 ` [PATCH v6 7/8] MTD: Remove integrator-flash Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-19 11:14 ` Artem Bityutskiy
2011-05-19 11:14 ` Artem Bityutskiy
2011-05-17 13:11 ` [PATCH v6 8/8] MTD: physmap: let set_vpp() pass a platform_device instead of a map_info Marc Zyngier
2011-05-17 13:11 ` Marc Zyngier
2011-05-19 11:17 ` Artem Bityutskiy
2011-05-19 11:17 ` Artem Bityutskiy
2011-05-19 17:37 ` Jean-Christophe PLAGNIOL-VILLARD
2011-05-19 17:37 ` Jean-Christophe PLAGNIOL-VILLARD
2011-05-19 11:19 ` [PATCH v6 0/8] Switch ARM platforms from integrator-flash to physmap Artem Bityutskiy
2011-05-19 11:19 ` Artem Bityutskiy
2011-05-19 12:53 ` Marc Zyngier
2011-05-19 12:53 ` Marc Zyngier
2011-05-20 21:28 ` Russell King - ARM Linux
2011-05-20 21:28 ` Russell King - ARM Linux
2011-05-23 15:01 ` Artem Bityutskiy
2011-05-23 15:01 ` Artem Bityutskiy
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=1305637877-24436-7-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: link
Be 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.