summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100
diff options
context:
space:
mode:
authorRussell King2005-10-29 17:08:31 +0200
committerRussell King2005-10-29 17:08:31 +0200
commit14e66f767f5e8d023e098b475dc24ddc9a5dbdfd (patch)
tree11d0835775cb00a164b2e3d4b23f282a002277cd /arch/arm/mach-sa1100
parent[ARM] Fix MTD device/partition destruction (diff)
downloadkernel-qcow2-linux-14e66f767f5e8d023e098b475dc24ddc9a5dbdfd.tar.gz
kernel-qcow2-linux-14e66f767f5e8d023e098b475dc24ddc9a5dbdfd.tar.xz
kernel-qcow2-linux-14e66f767f5e8d023e098b475dc24ddc9a5dbdfd.zip
[ARM] Allow MTD device name to be passed via platform data
Allow SA1100 devices to pass the name of the flash device to the SA1100 map driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r--arch/arm/mach-sa1100/generic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index 93619497779c..f94b0fbcdcc8 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -23,6 +23,7 @@
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/mach/map.h>
+#include <asm/mach/flash.h>
#include <asm/irq.h>
#include "generic.h"
@@ -283,6 +284,7 @@ static struct platform_device sa11x0mtd_device = {
void sa11x0_set_flash_data(struct flash_platform_data *flash,
struct resource *res, int nr)
{
+ flash->name = "sa1100";
sa11x0mtd_device.dev.platform_data = flash;
sa11x0mtd_device.resource = res;
sa11x0mtd_device.num_resources = nr;