Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f07e762e authored by Marc Zyngier's avatar Marc Zyngier Committed by Russell King
Browse files

ARM: 6908/1: Integrator/AP: Use physmap driver instead of integrator-flash 



Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0f71fd49

arch/arm/mach-integrator/integrator_ap.c

+6 −7
Original line number Diff line number Diff line
@@ -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,