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 5/8] ARM: Integrator/AP: Use physmap driver instead of integrator-flash
Date: Mon, 16 May 2011 15:59:34 +0100 [thread overview]
Message-ID: <1305557977-16871-6-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1305557977-16871-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: David Woodhouse <dwmw2@infradead.org>
---
arch/arm/mach-integrator/integrator_ap.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 980803f..11bd49e 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -31,6 +31,7 @@
#include <linux/clockchips.h>
#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/mtd/physmap.h>
#include <mach/hardware.h>
#include <mach/platform.h>
@@ -43,7 +44,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>
@@ -230,7 +230,7 @@ device_initcall(irq_init_sysfs);
#define EBI_CSR1 (VA_EBI_BASE + INTEGRATOR_EBI_CSR1_OFFSET)
#define EBI_LOCK (VA_EBI_BASE + INTEGRATOR_EBI_LOCK_OFFSET)
-static int ap_flash_init(void)
+static int ap_flash_init(struct platform_device *dev)
{
u32 tmp;
@@ -247,7 +247,7 @@ static int ap_flash_init(void)
return 0;
}
-static void ap_flash_exit(void)
+static void ap_flash_exit(struct platform_device *dev)
{
u32 tmp;
@@ -263,15 +263,14 @@ static void ap_flash_exit(void)
}
}
-static void ap_flash_set_vpp(int on)
+static void ap_flash_set_vpp(struct map_info *map, int on)
{
void __iomem *reg = on ? SC_CTRLS : SC_CTRLC;
writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg);
}
-static struct flash_platform_data ap_flash_data = {
- .map_name = "cfi_probe",
+static struct physmap_flash_data ap_flash_data = {
.width = 4,
.init = ap_flash_init,
.exit = ap_flash_exit,
@@ -285,7 +284,7 @@ static struct resource cfi_flash_resource = {
};
static struct platform_device cfi_flash_device = {
- .name = "armflash",
+ .name = "physmap-flash",
.id = 0,
.dev = {
.platform_data = &ap_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 v5 5/8] ARM: Integrator/AP: Use physmap driver instead of integrator-flash
Date: Mon, 16 May 2011 15:59:34 +0100 [thread overview]
Message-ID: <1305557977-16871-6-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1305557977-16871-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: David Woodhouse <dwmw2@infradead.org>
---
arch/arm/mach-integrator/integrator_ap.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 980803f..11bd49e 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -31,6 +31,7 @@
#include <linux/clockchips.h>
#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/mtd/physmap.h>
#include <mach/hardware.h>
#include <mach/platform.h>
@@ -43,7 +44,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>
@@ -230,7 +230,7 @@ device_initcall(irq_init_sysfs);
#define EBI_CSR1 (VA_EBI_BASE + INTEGRATOR_EBI_CSR1_OFFSET)
#define EBI_LOCK (VA_EBI_BASE + INTEGRATOR_EBI_LOCK_OFFSET)
-static int ap_flash_init(void)
+static int ap_flash_init(struct platform_device *dev)
{
u32 tmp;
@@ -247,7 +247,7 @@ static int ap_flash_init(void)
return 0;
}
-static void ap_flash_exit(void)
+static void ap_flash_exit(struct platform_device *dev)
{
u32 tmp;
@@ -263,15 +263,14 @@ static void ap_flash_exit(void)
}
}
-static void ap_flash_set_vpp(int on)
+static void ap_flash_set_vpp(struct map_info *map, int on)
{
void __iomem *reg = on ? SC_CTRLS : SC_CTRLC;
writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg);
}
-static struct flash_platform_data ap_flash_data = {
- .map_name = "cfi_probe",
+static struct physmap_flash_data ap_flash_data = {
.width = 4,
.init = ap_flash_init,
.exit = ap_flash_exit,
@@ -285,7 +284,7 @@ static struct resource cfi_flash_resource = {
};
static struct platform_device cfi_flash_device = {
- .name = "armflash",
+ .name = "physmap-flash",
.id = 0,
.dev = {
.platform_data = &ap_flash_data,
--
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 ` [PATCH v5 1/8] MTD: Add integrator-flash feature " Marc Zyngier
2011-05-16 14:59 ` 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 ` Marc Zyngier [this message]
2011-05-16 14:59 ` [PATCH v5 5/8] ARM: Integrator/AP: " 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-6-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.