mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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:
parent
30631cb82d
commit
c1558b55c5
1 changed files with 6 additions and 5 deletions
|
@ -18,6 +18,7 @@
|
|||
#include <linux/gpio.h>
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/nand.h>
|
||||
#include <linux/mtd/onenand.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/io.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,
|
||||
.nr_parts = ARRAY_SIZE(nhk8815_onenand_partitions),
|
||||
};
|
||||
|
@ -156,7 +157,7 @@ static struct resource nhk8815_onenand_resource[] = {
|
|||
};
|
||||
|
||||
static struct platform_device nhk8815_onenand_device = {
|
||||
.name = "onenand",
|
||||
.name = "onenand-flash",
|
||||
.id = -1,
|
||||
.dev = {
|
||||
.platform_data = &nhk8815_onenand_data,
|
||||
|
@ -167,10 +168,10 @@ static struct platform_device nhk8815_onenand_device = {
|
|||
|
||||
static void __init nhk8815_onenand_init(void)
|
||||
{
|
||||
#ifdef CONFIG_ONENAND
|
||||
#ifdef CONFIG_MTD_ONENAND
|
||||
/* Set up SMCS0 for OneNand */
|
||||
writel(0x000030db, FSMC_BCR0);
|
||||
writel(0x02100551, FSMC_BTR0);
|
||||
writel(0x000030db, FSMC_BCR(0));
|
||||
writel(0x02100551, FSMC_BTR(0));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue