diff options
| author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2013-04-11 09:35:39 +0000 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 07:55:04 +0200 | 
| commit | 68fbc0e68604a3e58c6980e3d934e9741e561174 (patch) | |
| tree | 3c98ab6b0a94950a4282b1526052c713aa11b749 | |
| parent | e78b14080112af75cb287e5a6eac28f728d036ed (diff) | |
| download | olio-uboot-2014.01-68fbc0e68604a3e58c6980e3d934e9741e561174.tar.xz olio-uboot-2014.01-68fbc0e68604a3e58c6980e3d934e9741e561174.zip | |
imx: mx53ard: Add support for NAND Flash
Add support for the Samsung K9LAG08U0M NAND Flash (2-GiB MLC NAND Flash, 2-kiB
pages, 256-kiB blocks, 30-ns R/W cycles, 1 CS) on mx53ard.
eNFC_CLK_ROOT is set up with a cycle time of 37.5 ns (400 MHz / 3 / 5) for this
board, which satisfies the 30-ns NF R/W cycle requirement.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
| -rw-r--r-- | board/freescale/mx53ard/mx53ard.c | 66 | ||||
| -rw-r--r-- | include/configs/mx53ard.h | 10 | 
2 files changed, 76 insertions, 0 deletions
| diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c index 2fc8570f2..8d433a3d8 100644 --- a/board/freescale/mx53ard/mx53ard.c +++ b/board/freescale/mx53ard/mx53ard.c @@ -58,6 +58,71 @@ void dram_init_banksize(void)  	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;  } +#ifdef CONFIG_NAND_MXC +static void setup_iomux_nand(void) +{ +	u32 i, reg; +	#define M4IF_GENP_WEIM_MM_MASK		0x00000001 +	#define WEIM_GCR2_MUX16_BYP_GRANT_MASK	0x00001000 + +	reg = __raw_readl(M4IF_BASE_ADDR + 0xc); +	reg &= ~M4IF_GENP_WEIM_MM_MASK; +	__raw_writel(reg, M4IF_BASE_ADDR + 0xc); +	for (i = 0x4; i < 0x94; i += 0x18) { +		reg = __raw_readl(WEIM_BASE_ADDR + i); +		reg &= ~WEIM_GCR2_MUX16_BYP_GRANT_MASK; +		__raw_writel(reg, WEIM_BASE_ADDR + i); +	} + +	mxc_request_iomux(MX53_PIN_NANDF_CS0, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_CS0, PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_NANDF_CS1, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_CS1, PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_NANDF_RB0, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_RB0, PAD_CTL_PKE_ENABLE | +					PAD_CTL_PUE_PULL | PAD_CTL_100K_PU); +	mxc_request_iomux(MX53_PIN_NANDF_CLE, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_CLE, PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_NANDF_ALE, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_ALE, PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_NANDF_WP_B, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_WP_B, PAD_CTL_PKE_ENABLE | +					PAD_CTL_PUE_PULL | PAD_CTL_100K_PU); +	mxc_request_iomux(MX53_PIN_NANDF_RE_B, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_RE_B, PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_NANDF_WE_B, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_NANDF_WE_B, PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA0, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA0, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA1, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA1, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA2, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA2, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA3, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA3, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA4, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA4, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA5, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA5, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA6, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA6, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +	mxc_request_iomux(MX53_PIN_EIM_DA7, IOMUX_CONFIG_ALT0); +	mxc_iomux_set_pad(MX53_PIN_EIM_DA7, PAD_CTL_PKE_ENABLE | +					PAD_CTL_100K_PU | PAD_CTL_DRV_HIGH); +} +#else +static void setup_iomux_nand(void) +{ +} +#endif +  static void setup_iomux_uart(void)  {  	/* UART1 RXD */ @@ -277,6 +342,7 @@ static void weim_cs1_settings(void)  int board_early_init_f(void)  { +	setup_iomux_nand();  	setup_iomux_uart();  	return 0;  } diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 62cb42bc4..148f7a200 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -41,6 +41,16 @@  #define CONFIG_BOARD_EARLY_INIT_F  #define CONFIG_MXC_GPIO +#define CONFIG_SYS_MAX_NAND_DEVICE	1 +#define CONFIG_SYS_NAND_BASE		NFC_BASE_ADDR_AXI +#define CONFIG_NAND_MXC +#define CONFIG_MXC_NAND_REGS_BASE	NFC_BASE_ADDR_AXI +#define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR +#define CONFIG_SYS_NAND_LARGEPAGE +#define CONFIG_MXC_NAND_HWECC +#define CONFIG_SYS_NAND_USE_FLASH_BBT +#define CONFIG_CMD_NAND +  #define CONFIG_MXC_UART  #define CONFIG_MXC_UART_BASE	UART1_BASE |