Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02bfc4eb authored by Shiraz Hashim's avatar Shiraz Hashim Committed by David Woodhouse
Browse files

mtd: fsmc: Move ALE, CLE defines to their respective platform 



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: default avatarShiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b2acc92e

arch/arm/mach-u300/core.c

+2 −0
Original line number Diff line number Diff line
@@ -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 = {

arch/arm/mach-u300/include/mach/u300-regs.h

+5 −0
Original line number Diff line number Diff line
@@ -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

include/linux/mtd/fsmc.h

+0 −13
Original line number Diff line number Diff line
@@ -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