nand: mxc: Prepare to add support for i.MX5
Subsystems (5)
PATCH v3 1/4 nand: mxc: Prepare to add support for i.MX5
Add some abstraction to NFC defitnitions so that some parts of the current code can also be used for future i.MX5 code.
Clean up a few things by the way.
---
Changes in v3:
- Separate code reformatting from behavioral changes.
Changes in v2:
- Fix warning for unused tmp variable in board_nand_init() for NFC V1.
drivers/mtd/nand/mxc_nand.c | 92 +++++++++++++++++++++--------------------- include/fsl_nfc.h | 72 ++++++++++++--------------------- nand_spl/nand_boot_fsl_nfc.c | 47 +++++++++++---------- 3 files changed, 97 insertions(+), 114 deletions(-)
drivers/mtd/nand/mxc_nand.c +46 -46
@@ -150,7 +150,7 @@ static uint32_t *mxc_nand_memcpy32(uint32_t *dest, uint32_t *source, size_t size/* * This function polls the NANDFC to wait for the basic operation to -* complete by checking the INT bit of config2 register. +* complete by checking the INT bit. */ static void wait_op_done (struct mxc_nand_host *host,int max_retries,uint16_t param)
@@ -158,10 +158,10 @@ static void wait_op_done(struct mxc_nand_host *host, int max_retries,uint32_t tmp;while (max_retries-- >0 ) { -if (readw (&host->regs->config2) &NFC_INT ) { - tmp =readw (&host->regs->config2); - tmp &= ~NFC_INT ; -writew (tmp, &host->regs->config2); + tmp =readnfc (&host->regs->config2); +if (tmp &NFC_V1_V2_CONFIG2_INT ) { + tmp &= ~NFC_V1_V2_CONFIG2_INT ; +writenfc (tmp, &host->regs->config2);break ; }udelay (1 );
@@ -180,8 +180,8 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd) {MTDDEBUG (MTD_DEBUG_LEVEL3 ,"send_cmd(host, 0x%x)\n" , cmd); -writew (cmd, &host->regs->flash_cmd); -writew (NFC_CMD , &host->regs->config2); +writenfc (cmd, &host->regs->flash_cmd); +writenfc (NFC_CMD , &host->regs->operation);/* Wait for operation to complete */ wait_op_done (host,TROP_US_DELAY , cmd);
@@ -196,8 +196,8 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr) {MTDDEBUG (MTD_DEBUG_LEVEL3 ,"send_addr(host, 0x%x)\n" , addr); -writew (addr, &host->regs->flash_addr); -writew (NFC_ADDR , &host->regs->config2); +writenfc (addr, &host->regs->flash_addr); +writenfc (NFC_ADDR , &host->regs->operation);/* Wait for operation to complete */ wait_op_done (host,TROP_US_DELAY , addr);
@@ -229,19 +229,19 @@ static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id, } } -writew (buf_id, &host->regs->buf_addr); +writenfc (buf_id, &host->regs->buf_addr);/* Configure spare or page+spare access */ if (!host->pagesize_2k) { -uint16_t config1 =readw (&host->regs->config1); +uint16_t config1 =readnfc (&host->regs->config1);if (spare_only) - config1 |=NFC_SP_EN ; + config1 |=NFC_CONFIG1_SP_EN ;else - config1 &= ~NFC_SP_EN ; -writew (config1, &host->regs->config1); + config1 &= ~NFC_CONFIG1_SP_EN ; +writenfc (config1, &host->regs->config1); } -writew (NFC_INPUT , &host->regs->config2); +writenfc (NFC_INPUT , &host->regs->operation);/* Wait for operation to complete */ wait_op_done (host,TROP_US_DELAY , spare_only);
@@ -256,19 +256,19 @@ static void send_read_page(struct mxc_nand_host *host, uint8_t buf_id, {MTDDEBUG (MTD_DEBUG_LEVEL3 ,"send_read_page (%d)\n" , spare_only); -writew (buf_id, &host->regs->buf_addr); +writenfc (buf_id, &host->regs->buf_addr);/* Configure spare or page+spare access */ if (!host->pagesize_2k) { -uint32_t config1 =readw (&host->regs->config1); +uint32_t config1 =readnfc (&host->regs->config1);if (spare_only) - config1 |=NFC_SP_EN ; + config1 |=NFC_CONFIG1_SP_EN ;else - config1 &= ~NFC_SP_EN ; -writew (config1, &host->regs->config1); + config1 &= ~NFC_CONFIG1_SP_EN ; +writenfc (config1, &host->regs->config1); } -writew (NFC_OUTPUT , &host->regs->config2); +writenfc (NFC_OUTPUT , &host->regs->operation);/* Wait for operation to complete */ wait_op_done (host,TROP_US_DELAY , spare_only);
@@ -296,14 +296,14 @@ static void send_read_id(struct mxc_nand_host *host)uint16_t tmp;/* NANDFC buffer 0 is used for device ID output */ -writew (0x0 , &host->regs->buf_addr); +writenfc (0x0 , &host->regs->buf_addr);/* Read ID into main buffer */ - tmp =readw (&host->regs->config1); - tmp &= ~NFC_SP_EN ; -writew (tmp, &host->regs->config1); + tmp =readnfc (&host->regs->config1); + tmp &= ~NFC_CONFIG1_SP_EN ; +writenfc (tmp, &host->regs->config1); -writew (NFC_ID , &host->regs->config2); +writenfc (NFC_ID , &host->regs->operation);/* Wait for operation to complete */ wait_op_done (host,TROP_US_DELAY ,0 );
@@ -323,14 +323,14 @@ static uint16_t get_dev_status(struct mxc_nand_host *host)/* store the main area1 first word, later do recovery */ store =readl (main_buf);/* NANDFC buffer 1 is used for device status */ -writew (1 , &host->regs->buf_addr); +writenfc (1 , &host->regs->buf_addr);/* Read status into main buffer */ - tmp =readw (&host->regs->config1); - tmp &= ~NFC_SP_EN ; -writew (tmp, &host->regs->config1); + tmp =readnfc (&host->regs->config1); + tmp &= ~NFC_CONFIG1_SP_EN ; +writenfc (tmp, &host->regs->config1); -writew (NFC_STATUS , &host->regs->config2); +writenfc (NFC_STATUS , &host->regs->operation);/* Wait for operation to complete */ wait_op_done (host,TROP_US_DELAY ,0 );
@@ -359,13 +359,13 @@ static void _mxc_nand_enable_hwecc(struct mtd_info *mtd, int on) {struct nand_chip *nand_chip = mtd->priv;struct mxc_nand_host *host = nand_chip->priv; -uint16_t tmp =readw (&host->regs->config1); +uint16_t tmp =readnfc (&host->regs->config1);if (on) - tmp |=NFC_ECC_EN ; + tmp |=NFC_V1_V2_CONFIG1_ECC_EN ;else - tmp &= ~NFC_ECC_EN ; -writew (tmp, &host->regs->config1); + tmp &= ~NFC_V1_V2_CONFIG1_ECC_EN ; +writenfc (tmp, &host->regs->config1); }#ifdef CONFIG_MXC_NAND_HWECC
@@ -698,7 +698,7 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,* additional correction. 2-Bit errors cannot be corrected by * HW ECC, so we need to return failure */ -uint16_t ecc_status =readw (&host->regs->ecc_status_result); +uint16_t ecc_status =readnfc (&host->regs->ecc_status_result);if (((ecc_status &0x3 ) ==2 ) || ((ecc_status >>2 ) ==2 )) { MTDDEBUG(MTD_DEBUG_LEVEL0,
@@ -1241,24 +1241,24 @@ int board_nand_init(struct nand_chip *this)#endif #ifdef MXC_NFC_V2_1 - tmp =readw (&host->regs->config1); - tmp |=NFC_ONE_CYCLE ; - tmp |=NFC_4_8N_ECC ; -writew (tmp, &host->regs->config1); + tmp =readnfc (&host->regs->config1); + tmp |=NFC_V2_CONFIG1_ONE_CYCLE ; + tmp |=NFC_V2_CONFIG1_ECC_MODE_4 ; +writenfc (tmp, &host->regs->config1);if (host->pagesize_2k) -writew (64 /2 , &host->regs->spare_area_size); +writenfc (64 /2 , &host->regs->spare_area_size);else -writew (16 /2 , &host->regs->spare_area_size); +writenfc (16 /2 , &host->regs->spare_area_size);#endif /* * preset operation * Unlock the internal RAM Buffer */ -writew (0x2 , &host->regs->config); +writenfc (0x2 , &host->regs->config);/* Blocks to be unlocked */ -writew (0x0 , &host->regs->unlockstart_blkaddr); +writenfc (0x0 , &host->regs->unlockstart_blkaddr);/* Originally (Freescale LTIB 2.6.21) 0x4000 was written to the * unlockend_blkaddr, but the magic 0x4000 does not always work * when writing more than some 32 megabytes (on 2k page nands)
@@ -1270,10 +1270,10 @@ int board_nand_init(struct nand_chip *this)* This might be NAND chip specific and the i.MX31 datasheet is * extremely vague about the semantics of this register. */ -writew (0xFFFF , &host->regs->unlockend_blkaddr); +writenfc (0xFFFF , &host->regs->unlockend_blkaddr);/* Unlock Block Command for given address range */ -writew (0x4 , &host->regs->wrprot); +writenfc (0x4 , &host->regs->wrprot);return 0 ; }
include/fsl_nfc.h +26 -46
84 lines not on this page · raw message
nand_spl/nand_boot_fsl_nfc.c +25 -22
104 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v3 2/4 nand: mxc: Add support for i.MX5
---
Changes in v3:
- Separate code reformatting from behavioral changes.
Changes in v2: None
arch/arm/include/asm/arch-mx5/imx-regs.h | 9 +++ drivers/mtd/nand/mxc_nand.c | 129 +++++++++++++++++++++++++++--- include/fsl_nfc.h | 79 +++++++++++++++++- nand_spl/nand_boot_fsl_nfc.c | 67 +++++++++++++++- 4 files changed, 269 insertions(+), 15 deletions(-)
arch/arm/include/asm/arch-mx5/imx-regs.h +9 -0
@@ -224,6 +224,15 @@#define CS0_32M_CS1_32M_CS2_32M_CS3_32M 3/* +* SRC register definitions +*/ +#if defined(CONFIG_MX51 ) +#define SRC_SBMR_NF16B (1 << 2) +#elif defined(CONFIG_MX53 ) +#define SRC_SBMR_NF16B (1 << 13) +#endif + +/* * CSPI register definitions */ #define MXC_ECSPI
drivers/mtd/nand/mxc_nand.c +118 -11
275 lines not on this page · raw message
include/fsl_nfc.h +77 -2
133 lines not on this page · raw message
nand_spl/nand_boot_fsl_nfc.c +65 -2
109 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v3 3/4 imx: mx5: lowlevel_init: Simplify code
In reply to Benoît ThébaudeauDon't use several instructions to build constant values.
---
Changes in v3:
- New patch.
Changes in v2: None
arch/arm/cpu/armv7/mx5/lowlevel_init.S | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/cpu/armv7/mx5/lowlevel_init.S +2 -6
@@ -309,8 +309,7 @@ setup_pll_func: ldr r0, =CCM_BASE_ADDR ldr r1, =0x00015154 str r1, [r0, #CLKCTL_CBCMR] - ldr r1, =0x02888945 - orr r1, r1, #(1 << 16) + ldr r1, =0x02898945 str r1, [r0, #CLKCTL_CBCDR] /* make sure change is effective */ 1: ldr r1, [r0, #CLKCTL_CDHIPR]
@@ -321,10 +320,7 @@ setup_pll_func: /* Switch peripheral to PLL2 */ ldr r0, =CCM_BASE_ADDR - ldr r1, =0x00808145 - orr r1, r1, #(2 << 10) - orr r1, r1, #(0 << 16) - orr r1, r1, #(1 << 19) + ldr r1, =0x00888945 str r1, [r0, #CLKCTL_CBCDR] ldr r1, =0x00016154
Signature · 1 line
1.7.10.4
PATCH v3 3/4 imx: mx5: lowlevel_init: Simplify code
Quoted 29 lines · Beno?t Th?baudeau
Don't use several instructions to build constant values.
Signed-off-by Beno?t Th?baudeau <[email protected]>---
Changes in v3:
- New patch.Changes in v2: None
arch/arm/cpu/armv7/mx5/lowlevel_init.S | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)arch/arm/cpu/armv7/mx5/lowlevel_init.S +1
-2@@ -309,8 +309,7 @@ setup_pll_func: ldr r0, =CCM_BASE_ADDR ldr r1, =0x00015154 str r1, [r0, #CLKCTL_CBCMR] - ldr r1, =0x02888945 - orr r1, r1, #(1 << 16) + ldr r1, =0x02898945 str r1, [r0, #CLKCTL_CBCDR] /* make sure change is effective */ 1: ldr r1, [r0, #CLKCTL_CDHIPR]@@ -321,10 +320,7 @@ setup_pll_func:
arch/arm/cpu/armv7/mx5/lowlevel_init.S setup_pll_func: · line 326
Quoted 10 lines
arch/arm/cpu/armv7/mx5/lowlevel_init.S +1
-4/* Switch peripheral to PLL2 */ ldr r0, =CCM_BASE_ADDR - ldr r1, =0x00808145 - orr r1, r1, #(2 << 10) - orr r1, r1, #(0 << 16) - orr r1, r1, #(1 << 19) + ldr r1, =0x00888945 str r1, [r0, #CLKCTL_CBCDR] ldr r1, =0x00016154
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v3 4/4 imx: mx53ard: Add support for NAND Flash
In reply to Benoît ThébaudeauAdd 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.
---
Changes in v3:
- New patch.
Changes in v2: None
board/freescale/mx53ard/mx53ard.c | 18 ++++++++++++++++++ include/configs/mx53ard.h | 10 ++++++++++ 2 files changed, 28 insertions(+)
board/freescale/mx53ard/mx53ard.c +18 -0
@@ -58,6 +58,23 @@ 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 ) +{ +mxc_request_iomux (MX53_PIN_NANDF_CLE ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX53_PIN_NANDF_ALE ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX53_PIN_NANDF_CS0 ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX53_PIN_NANDF_RE_B ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX53_PIN_NANDF_WE_B ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX53_PIN_NANDF_WP_B ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX53_PIN_NANDF_RB0 ,IOMUX_CONFIG_ALT0 ); +} +#else +static void setup_iomux_nand (void ) +{ +} +#endif +static void setup_iomux_uart (void ) {/* UART1 RXD */
@@ -277,6 +294,7 @@ static void weim_cs1_settings(void)int board_early_init_f (void ) { +setup_iomux_nand ();setup_iomux_uart ();return 0 ; }
include/configs/mx53ard.h +10 -0
@@ -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
Signature · 1 line
1.7.10.4