hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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:52 +01:00 committed by Russell King
parent 0f71fd492d
commit f07e762e4f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-integrator/integrator_ap.c
View File

@ -31,6 +31,7 @@
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/mtd/physmap.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/platform.h> #include <mach/platform.h>
@ -43,7 +44,6 @@
#include <mach/lm.h> #include <mach/lm.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/flash.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.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_CSR1 (VA_EBI_BASE + INTEGRATOR_EBI_CSR1_OFFSET)
#define EBI_LOCK (VA_EBI_BASE + INTEGRATOR_EBI_LOCK_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; u32 tmp;
@ -247,7 +247,7 @@ static int ap_flash_init(void)
return 0; return 0;
} }
static void ap_flash_exit(void) static void ap_flash_exit(struct platform_device *dev)
{ {
u32 tmp; 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; void __iomem *reg = on ? SC_CTRLS : SC_CTRLC;
writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg); writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg);
} }
static struct flash_platform_data ap_flash_data = { static struct physmap_flash_data ap_flash_data = {
.map_name = "cfi_probe",
.width = 4, .width = 4,
.init = ap_flash_init, .init = ap_flash_init,
.exit = ap_flash_exit, .exit = ap_flash_exit,
@ -285,7 +284,7 @@ static struct resource cfi_flash_resource = {
}; };
static struct platform_device cfi_flash_device = { static struct platform_device cfi_flash_device = {
.name = "armflash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &ap_flash_data, .platform_data = &ap_flash_data,