From 46cc1df722270adc0ca577b0724a4722d52543cf Mon Sep 17 00:00:00 2001 From: Erik Ahlén Date: Tue, 13 Dec 2011 10:24:11 +0100 Subject: Renamed mx2/imx27 to mxc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renamed all functions, enums, structs and defines from mx2/imx27 to mxc. This is in preparation of adding support for mx35 NFC(v2). Change-Id: I92ad23f0cfab605215bbf0d5846c5c288423facf Signed-off-by: Erik Ahlén Reviewed-on: http://openocd.zylin.com/267 Tested-by: jenkins Reviewed-by: Øyvind Harboe --- src/flash/nand/mx2.h | 120 +++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'src/flash/nand/mx2.h') diff --git a/src/flash/nand/mx2.h b/src/flash/nand/mx2.h index 1a85bc75..411d70ef 100644 --- a/src/flash/nand/mx2.h +++ b/src/flash/nand/mx2.h @@ -21,88 +21,88 @@ ***************************************************************************/ /* - * Freescale iMX2* OpenOCD NAND Flash controller support. - * based on Freescale iMX3* OpenOCD NAND Flash controller support. + * Freescale iMX OpenOCD NAND Flash controller support. + * based on Freescale iMX2* and iMX3* OpenOCD NAND Flash controller support. * * Many thanks to Ben Dooks for writing s3c24xx driver. */ -#define MX2_NF_BASE_ADDR 0xd8000000 -#define MX2_NF_BUFSIZ (MX2_NF_BASE_ADDR + 0xe00) -#define MX2_NF_BUFADDR (MX2_NF_BASE_ADDR + 0xe04) -#define MX2_NF_FADDR (MX2_NF_BASE_ADDR + 0xe06) -#define MX2_NF_FCMD (MX2_NF_BASE_ADDR + 0xe08) -#define MX2_NF_BUFCFG (MX2_NF_BASE_ADDR + 0xe0a) -#define MX2_NF_ECCSTATUS (MX2_NF_BASE_ADDR + 0xe0c) -#define MX2_NF_ECCMAINPOS (MX2_NF_BASE_ADDR + 0xe0e) -#define MX2_NF_ECCSPAREPOS (MX2_NF_BASE_ADDR + 0xe10) -#define MX2_NF_FWP (MX2_NF_BASE_ADDR + 0xe12) -#define MX2_NF_LOCKSTART (MX2_NF_BASE_ADDR + 0xe14) -#define MX2_NF_LOCKEND (MX2_NF_BASE_ADDR + 0xe16) -#define MX2_NF_FWPSTATUS (MX2_NF_BASE_ADDR + 0xe18) +#define MXC_NF_BASE_ADDR 0xd8000000 +#define MXC_NF_BUFSIZ (MXC_NF_BASE_ADDR + 0xe00) +#define MXC_NF_BUFADDR (MXC_NF_BASE_ADDR + 0xe04) +#define MXC_NF_FADDR (MXC_NF_BASE_ADDR + 0xe06) +#define MXC_NF_FCMD (MXC_NF_BASE_ADDR + 0xe08) +#define MXC_NF_BUFCFG (MXC_NF_BASE_ADDR + 0xe0a) +#define MXC_NF_ECCSTATUS (MXC_NF_BASE_ADDR + 0xe0c) +#define MXC_NF_ECCMAINPOS (MXC_NF_BASE_ADDR + 0xe0e) +#define MXC_NF_ECCSPAREPOS (MXC_NF_BASE_ADDR + 0xe10) +#define MXC_NF_FWP (MXC_NF_BASE_ADDR + 0xe12) +#define MXC_NF_LOCKSTART (MXC_NF_BASE_ADDR + 0xe14) +#define MXC_NF_LOCKEND (MXC_NF_BASE_ADDR + 0xe16) +#define MXC_NF_FWPSTATUS (MXC_NF_BASE_ADDR + 0xe18) /* * all bits not marked as self-clearing bit */ -#define MX2_NF_CFG1 (MX2_NF_BASE_ADDR + 0xe1a) -#define MX2_NF_CFG2 (MX2_NF_BASE_ADDR + 0xe1c) +#define MXC_NF_CFG1 (MXC_NF_BASE_ADDR + 0xe1a) +#define MXC_NF_CFG2 (MXC_NF_BASE_ADDR + 0xe1c) -#define MX2_NF_MAIN_BUFFER0 (MX2_NF_BASE_ADDR + 0x0000) -#define MX2_NF_MAIN_BUFFER1 (MX2_NF_BASE_ADDR + 0x0200) -#define MX2_NF_MAIN_BUFFER2 (MX2_NF_BASE_ADDR + 0x0400) -#define MX2_NF_MAIN_BUFFER3 (MX2_NF_BASE_ADDR + 0x0600) -#define MX2_NF_SPARE_BUFFER0 (MX2_NF_BASE_ADDR + 0x0800) -#define MX2_NF_SPARE_BUFFER1 (MX2_NF_BASE_ADDR + 0x0810) -#define MX2_NF_SPARE_BUFFER2 (MX2_NF_BASE_ADDR + 0x0820) -#define MX2_NF_SPARE_BUFFER3 (MX2_NF_BASE_ADDR + 0x0830) -#define MX2_NF_MAIN_BUFFER_LEN 512 -#define MX2_NF_SPARE_BUFFER_LEN 16 -#define MX2_NF_LAST_BUFFER_ADDR ((MX2_NF_SPARE_BUFFER3) + \ - MX2_NF_SPARE_BUFFER_LEN - 2) +#define MXC_NF_MAIN_BUFFER0 (MXC_NF_BASE_ADDR + 0x0000) +#define MXC_NF_MAIN_BUFFER1 (MXC_NF_BASE_ADDR + 0x0200) +#define MXC_NF_MAIN_BUFFER2 (MXC_NF_BASE_ADDR + 0x0400) +#define MXC_NF_MAIN_BUFFER3 (MXC_NF_BASE_ADDR + 0x0600) +#define MXC_NF_SPARE_BUFFER0 (MXC_NF_BASE_ADDR + 0x0800) +#define MXC_NF_SPARE_BUFFER1 (MXC_NF_BASE_ADDR + 0x0810) +#define MXC_NF_SPARE_BUFFER2 (MXC_NF_BASE_ADDR + 0x0820) +#define MXC_NF_SPARE_BUFFER3 (MXC_NF_BASE_ADDR + 0x0830) +#define MXC_NF_MAIN_BUFFER_LEN 512 +#define MXC_NF_SPARE_BUFFER_LEN 16 +#define MXC_NF_LAST_BUFFER_ADDR ((MXC_NF_SPARE_BUFFER3) + \ + MXC_NF_SPARE_BUFFER_LEN - 2) -/* bits in MX2_NF_CFG1 register */ -#define MX2_NF_BIT_SPARE_ONLY_EN (1<<2) -#define MX2_NF_BIT_ECC_EN (1<<3) -#define MX2_NF_BIT_INT_DIS (1<<4) -#define MX2_NF_BIT_BE_EN (1<<5) -#define MX2_NF_BIT_RESET_EN (1<<6) -#define MX2_NF_BIT_FORCE_CE (1<<7) +/* bits in MXC_NF_CFG1 register */ +#define MXC_NF_BIT_SPARE_ONLY_EN (1<<2) +#define MXC_NF_BIT_ECC_EN (1<<3) +#define MXC_NF_BIT_INT_DIS (1<<4) +#define MXC_NF_BIT_BE_EN (1<<5) +#define MXC_NF_BIT_RESET_EN (1<<6) +#define MXC_NF_BIT_FORCE_CE (1<<7) -/* bits in MX2_NF_CFG2 register */ +/* bits in MXC_NF_CFG2 register */ /*Flash Command Input*/ -#define MX2_NF_BIT_OP_FCI (1<<0) +#define MXC_NF_BIT_OP_FCI (1<<0) /* * Flash Address Input */ -#define MX2_NF_BIT_OP_FAI (1<<1) +#define MXC_NF_BIT_OP_FAI (1<<1) /* * Flash Data Input */ -#define MX2_NF_BIT_OP_FDI (1<<2) +#define MXC_NF_BIT_OP_FDI (1<<2) /* see "enum mx_dataout_type" below */ -#define MX2_NF_BIT_DATAOUT_TYPE(x) ((x)<<3) -#define MX2_NF_BIT_OP_DONE (1<<15) +#define MXC_NF_BIT_DATAOUT_TYPE(x) ((x)<<3) +#define MXC_NF_BIT_OP_DONE (1<<15) -#define MX2_CCM_CGR2 0x53f80028 -#define MX2_GPR 0x43fac008 -/*#define MX2_PCSR 0x53f8000c*/ -#define MX2_FMCR 0x10027814 -#define MX2_FMCR_NF_16BIT_SEL (1<<4) -#define MX2_FMCR_NF_FMS (1<<5) +#define MXC_CCM_CGR2 0x53f80028 +#define MXC_GPR 0x43fac008 +/*#define MXC_PCSR 0x53f8000c*/ +#define MXC_FMCR 0x10027814 +#define MXC_FMCR_NF_16BIT_SEL (1<<4) +#define MXC_FMCR_NF_FMS (1<<5) -enum mx_dataout_type { - MX2_NF_DATAOUT_PAGE = 1, - MX2_NF_DATAOUT_NANDID = 2, - MX2_NF_DATAOUT_NANDSTATUS = 4, +enum mxc_dataout_type { + MXC_NF_DATAOUT_PAGE = 1, + MXC_NF_DATAOUT_NANDID = 2, + MXC_NF_DATAOUT_NANDSTATUS = 4, }; -enum mx_nf_finalize_action { - MX2_NF_FIN_NONE, - MX2_NF_FIN_DATAOUT, +enum mxc_nf_finalize_action { + MXC_NF_FIN_NONE, + MXC_NF_FIN_DATAOUT, }; -struct mx2_nf_flags { +struct mxc_nf_flags { unsigned host_little_endian:1; unsigned target_little_endian:1; unsigned nand_readonly:1; @@ -110,8 +110,8 @@ struct mx2_nf_flags { unsigned hw_ecc_enabled:1; }; -struct mx2_nf_controller { - enum mx_dataout_type optype; - enum mx_nf_finalize_action fin; - struct mx2_nf_flags flags; +struct mxc_nf_controller { + enum mxc_dataout_type optype; + enum mxc_nf_finalize_action fin; + struct mxc_nf_flags flags; }; -- cgit v1.2.3-18-g5258