leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: 6909/1: VExpress: Use physmap driver instead of integrator-flash

Browse Source 
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Marc Zyngier 2011-05-18 10:51:51 +01:00 committed by Russell King
parent 68c0e38caf
commit 0f71fd492d
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-vexpress/v2m.c
View File

@ -13,11 +13,11 @@
#include <linux/sysdev.h>
#include <linux/usb/isp1760.h>
#include <linux/clkdev.h>
#include <linux/mtd/physmap.h>
#include <asm/mach-types.h>
#include <asm/sizes.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <asm/hardware/arm_timer.h>
@ -206,27 +206,13 @@ static struct platform_device v2m_usb_device = {
.dev.platform_data = &v2m_usb_config,
};
static int v2m_flash_init(void)
{
writel(0, MMIO_P2V(V2M_SYS_FLASH));
return 0;
}
static void v2m_flash_exit(void)
{
writel(0, MMIO_P2V(V2M_SYS_FLASH));
}
static void v2m_flash_set_vpp(int on)
static void v2m_flash_set_vpp(struct map_info *map, int on)
{
writel(on != 0, MMIO_P2V(V2M_SYS_FLASH));
}
static struct flash_platform_data v2m_flash_data = {
.map_name = "cfi_probe",
static struct physmap_flash_data v2m_flash_data = {
.width = 4,
.init = v2m_flash_init,
.exit = v2m_flash_exit,
.set_vpp = v2m_flash_set_vpp,
};
@ -243,7 +229,7 @@ static struct resource v2m_flash_resources[] = {
};
static struct platform_device v2m_flash_device = {
.name = "armflash",
.name = "physmap-flash",
.id = -1,
.resource = v2m_flash_resources,
.num_resources = ARRAY_SIZE(v2m_flash_resources),