Skip to content

Commit

Permalink
mtd: fsmc: Move ALE, CLE defines to their respective platform
Browse files Browse the repository at this point in the history
Address Latch Enable (ALE) and Command Latch Enable (CLE) defines are
platform specific and were wrongly put in driver specific fsmc.h file.
Move such defines to their respective platform.

Also instead of relying on fsmc driver, pass ALE, CLE offsets explicitly
from individual platform.

Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Shiraz Hashim authored and David Woodhouse committed Mar 26, 2012
1 parent b2acc92 commit 02bfc4e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-u300/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1574,6 +1574,8 @@ static struct fsmc_nand_platform_data nand_platform_data = {
.nr_partitions = ARRAY_SIZE(u300_partitions),
.options = NAND_SKIP_BBTSCAN,
.width = FSMC_NAND_BW8,
.ale_off = PLAT_NAND_ALE,
.cle_off = PLAT_NAND_CLE,
};

static struct platform_device nand_device = {
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/mach-u300/include/mach/u300-regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
/* NFIF */
#define U300_NAND_IF_PHYS_BASE 0x9f800000

/* ALE, CLE offset for FSMC NAND */
#define PLAT_NAND_CLE (1 << 16)
#define PLAT_NAND_ALE (1 << 17)


/* AHB Peripherals */
#define U300_AHB_PER_PHYS_BASE 0xa0000000
#define U300_AHB_PER_VIRT_BASE 0xff010000
Expand Down
13 changes: 0 additions & 13 deletions include/linux/mtd/fsmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,6 @@
#define FSMC_NAND_BW8 1
#define FSMC_NAND_BW16 2

/*
* The placement of the Command Latch Enable (CLE) and
* Address Latch Enable (ALE) is twisted around in the
* SPEAR310 implementation.
*/
#if defined(CONFIG_MACH_SPEAR310)
#define PLAT_NAND_CLE (1 << 17)
#define PLAT_NAND_ALE (1 << 16)
#else
#define PLAT_NAND_CLE (1 << 16)
#define PLAT_NAND_ALE (1 << 17)
#endif

#define FSMC_MAX_NOR_BANKS 4
#define FSMC_MAX_NAND_BANKS 4

Expand Down

0 comments on commit 02bfc4e

Please sign in to comment.