a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: nomadik: fixup some FSMC merge problems

Browse Source 
Due to a clash between refactoring and due to loss of a header
file that remained in my working tree the Nomadik stopped
compiling after switching to the FSMC driver. This patch fixes
it up.

Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Linus Walleij 2012-10-12 00:23:02 +02:00 committed by Artem Bityutskiy
parent 6d7b42a447
commit db6364a650
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,14 +37,15 @@
#include <plat/mtu.h> #include <plat/mtu.h>
#include <plat/pincfg.h> #include <plat/pincfg.h>
#include <mach/fsmc.h>
#include "cpu-8815.h" #include "cpu-8815.h"
/* Initial value for SRC control register: all timers use MXTAL/8 source */ /* Initial value for SRC control register: all timers use MXTAL/8 source */
#define SRC_CR_INIT_MASK 0x00007fff #define SRC_CR_INIT_MASK 0x00007fff
#define SRC_CR_INIT_VAL 0x2aaa8000 #define SRC_CR_INIT_VAL 0x2aaa8000
#define ALE_OFF 0x1000000
#define CLE_OFF 0x800000
/* These addresses span 16MB, so use three individual pages */ /* These addresses span 16MB, so use three individual pages */
static struct resource nhk8815_nand_resources[] = { static struct resource nhk8815_nand_resources[] = {
{ {
@ -52,6 +53,16 @@ static struct resource nhk8815_nand_resources[] = {
.start = 0x40000000, .start = 0x40000000,
.end = 0x40000000 + SZ_16K - 1, .end = 0x40000000 + SZ_16K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, {
.name = "nand_addr",
.start = 0x40000000 + ALE_OFF,
.end = 0x40000000 +ALE_OFF + SZ_16K - 1,
.flags = IORESOURCE_MEM,
}, {
.name = "nand_cmd",
.start = 0x40000000 + CLE_OFF,
.end = 0x40000000 + CLE_OFF + SZ_16K - 1,
.flags = IORESOURCE_MEM,
}, { }, {
.name = "fsmc_regs", .name = "fsmc_regs",
.start = NOMADIK_FSMC_BASE, .start = NOMADIK_FSMC_BASE,
@ -105,8 +116,6 @@ static struct fsmc_nand_platform_data nhk8815_nand_platform_data = {
.partitions = nhk8815_partitions, .partitions = nhk8815_partitions,
.nr_partitions = ARRAY_SIZE(nhk8815_partitions), .nr_partitions = ARRAY_SIZE(nhk8815_partitions),
.width = FSMC_NAND_BW8, .width = FSMC_NAND_BW8,
.ale_off = 0x1000000,
.cle_off = 0x800000,
}; };
static struct platform_device nhk8815_nand_device = { static struct platform_device nhk8815_nand_device = {
@ -171,6 +180,10 @@ static struct platform_device nhk8815_onenand_device = {
.num_resources = ARRAY_SIZE(nhk8815_onenand_resource), .num_resources = ARRAY_SIZE(nhk8815_onenand_resource),
}; };
/* bus control reg. and bus timing reg. for CS0..CS3 */
#define FSMC_BCR(x) (NOMADIK_FSMC_VA + (x << 3))
#define FSMC_BTR(x) (NOMADIK_FSMC_VA + (x << 3) + 0x04)
static void __init nhk8815_onenand_init(void) static void __init nhk8815_onenand_init(void)
{ {
#ifdef CONFIG_MTD_ONENAND #ifdef CONFIG_MTD_ONENAND