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

ARM Nomadik: use new OneNand name and pdata 

This enables the onenand with the new platform device name.
Moreover, it fixes a related typo that doesn't deserve a
separate patch.

Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Alessandro Rubini 2009-09-20 23:28:24 +02:00 committed by David Woodhouse
parent 30631cb82d
commit c1558b55c5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-nomadik/board-nhk8815.c
View File

@ -18,6 +18,7 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h> #include <linux/mtd/nand.h>
#include <linux/mtd/onenand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/sizes.h> #include <asm/sizes.h>
@ -142,7 +143,7 @@ static struct mtd_partition nhk8815_onenand_partitions[] = {
} }
}; };
static struct flash_platform_data nhk8815_onenand_data = { static struct onenand_platform_data nhk8815_onenand_data = {
.parts = nhk8815_onenand_partitions, .parts = nhk8815_onenand_partitions,
.nr_parts = ARRAY_SIZE(nhk8815_onenand_partitions), .nr_parts = ARRAY_SIZE(nhk8815_onenand_partitions),
}; };
@ -156,7 +157,7 @@ static struct resource nhk8815_onenand_resource[] = {
}; };
static struct platform_device nhk8815_onenand_device = { static struct platform_device nhk8815_onenand_device = {
.name = "onenand", .name = "onenand-flash",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &nhk8815_onenand_data, .platform_data = &nhk8815_onenand_data,
@ -167,10 +168,10 @@ static struct platform_device nhk8815_onenand_device = {
static void __init nhk8815_onenand_init(void) static void __init nhk8815_onenand_init(void)
{ {
#ifdef CONFIG_ONENAND #ifdef CONFIG_MTD_ONENAND
/* Set up SMCS0 for OneNand */ /* Set up SMCS0 for OneNand */
writel(0x000030db, FSMC_BCR0); writel(0x000030db, FSMC_BCR(0));
writel(0x02100551, FSMC_BTR0); writel(0x02100551, FSMC_BTR(0));
#endif #endif
} }