From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/8] ARM: Versatile: Use physmap driver instead of integrator-flash
Date: Mon, 31 Jan 2011 10:10:27 +0000 [thread overview]
Message-ID: <1296468632-30743-4-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1296468632-30743-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>
---
arch/arm/configs/versatile_defconfig | 2 +-
arch/arm/mach-versatile/core.c | 31 ++++---------------------------
2 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index 0ce710f..cdd4d2b 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -32,7 +32,7 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_PHYSMAP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_EEPROM_LEGACY=m
CONFIG_NETDEVICES=y
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 136c32e..22f8a8a 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -32,6 +32,7 @@
#include <linux/io.h>
#include <linux/gfp.h>
#include <linux/clkdev.h>
+#include <linux/mtd/physmap.h>
#include <asm/system.h>
#include <asm/irq.h>
@@ -42,7 +43,6 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
@@ -234,27 +234,7 @@ void __init versatile_map_io(void)
#define VERSATILE_FLASHCTRL (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_FLASH_OFFSET)
-static int versatile_flash_init(void)
-{
- u32 val;
-
- val = __raw_readl(VERSATILE_FLASHCTRL);
- val &= ~VERSATILE_FLASHPROG_FLVPPEN;
- __raw_writel(val, VERSATILE_FLASHCTRL);
-
- return 0;
-}
-
-static void versatile_flash_exit(void)
-{
- u32 val;
-
- val = __raw_readl(VERSATILE_FLASHCTRL);
- val &= ~VERSATILE_FLASHPROG_FLVPPEN;
- __raw_writel(val, VERSATILE_FLASHCTRL);
-}
-
-static void versatile_flash_set_vpp(int on)
+static void versatile_flash_set_vpp(struct map_info *map, int on)
{
u32 val;
@@ -266,11 +246,8 @@ static void versatile_flash_set_vpp(int on)
__raw_writel(val, VERSATILE_FLASHCTRL);
}
-static struct flash_platform_data versatile_flash_data = {
- .map_name = "cfi_probe",
+static struct physmap_flash_data versatile_flash_data = {
.width = 4,
- .init = versatile_flash_init,
- .exit = versatile_flash_exit,
.set_vpp = versatile_flash_set_vpp,
};
@@ -281,7 +258,7 @@ static struct resource versatile_flash_resource = {
};
static struct platform_device versatile_flash_device = {
- .name = "armflash",
+ .name = "physmap-flash",
.id = 0,
.dev = {
.platform_data = &versatile_flash_data,
--
1.7.0.4
next prev parent reply other threads:[~2011-01-31 10:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
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 1/8] MTD: Add integrator-flash feature " Marc Zyngier
2011-01-31 10:10 ` [PATCH 2/8] ARM: Realview: Use physmap driver instead of integrator-flash Marc Zyngier
2011-01-31 10:10 ` Marc Zyngier [this message]
2011-01-31 10:10 ` [PATCH 4/8] ARM: VExpress: " Marc Zyngier
2011-01-31 10:10 ` [PATCH 5/8] ARM: Integrator/AP: " Marc Zyngier
2011-01-31 10:10 ` [PATCH 6/8] ARM: Integrator/CP: " Marc Zyngier
2011-01-31 10:10 ` [PATCH 7/8] ARM: aaec2000: " Marc Zyngier
2011-01-31 10:29 ` Russell King - ARM Linux
2011-01-31 10:10 ` [PATCH 8/8] MTD: Remove integrator-flash Marc Zyngier
2011-01-31 12:37 ` [PATCH v3 0/8] Switch ARM platforms from integrator-flash to physmap Russell King - ARM Linux
2011-01-31 13:20 ` Marc Zyngier
-- strict thread matches above, loose matches on Subject: below --
2011-01-05 14:06 [PATCH " Marc Zyngier
2011-01-05 14:06 ` [PATCH 3/8] ARM: Versatile: Use physmap driver instead of 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=1296468632-30743-4-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).