-#define MXC_NF_BUFSIZ (mxc_nf_info->mxc_base_addr + 0xe00)
-#define MXC_NF_BUFADDR (mxc_nf_info->mxc_base_addr + 0xe04)
-#define MXC_NF_FADDR (mxc_nf_info->mxc_base_addr + 0xe06)
-#define MXC_NF_FCMD (mxc_nf_info->mxc_base_addr + 0xe08)
-#define MXC_NF_BUFCFG (mxc_nf_info->mxc_base_addr + 0xe0a)
-#define MXC_NF_ECCSTATUS (mxc_nf_info->mxc_base_addr + 0xe0c)
-#define MXC_NF_ECCMAINPOS (mxc_nf_info->mxc_base_addr + 0xe0e)
-#define MXC_NF_ECCSPAREPOS (mxc_nf_info->mxc_base_addr + 0xe10)
-#define MXC_NF_FWP (mxc_nf_info->mxc_base_addr + 0xe12)
-#define MXC_NF_LOCKSTART (mxc_nf_info->mxc_base_addr + 0xe14)
-#define MXC_NF_LOCKEND (mxc_nf_info->mxc_base_addr + 0xe16)
-#define MXC_NF_FWPSTATUS (mxc_nf_info->mxc_base_addr + 0xe18)
+#define MXC_NF_BUFSIZ (mxc_nf_info->mxc_regs_addr + 0x00)
+#define MXC_NF_BUFADDR (mxc_nf_info->mxc_regs_addr + 0x04)
+#define MXC_NF_FADDR (mxc_nf_info->mxc_regs_addr + 0x06)
+#define MXC_NF_FCMD (mxc_nf_info->mxc_regs_addr + 0x08)
+#define MXC_NF_BUFCFG (mxc_nf_info->mxc_regs_addr + 0x0a)
+#define MXC_NF_ECCSTATUS (mxc_nf_info->mxc_regs_addr + 0x0c)
+#define MXC_NF_ECCMAINPOS (mxc_nf_info->mxc_regs_addr + 0x0e)
+#define MXC_NF_ECCSPAREPOS (mxc_nf_info->mxc_regs_addr + 0x10)
+#define MXC_NF_FWP (mxc_nf_info->mxc_regs_addr + 0x12)
+#define MXC_NF_V1_UNLOCKSTART (mxc_nf_info->mxc_regs_addr + 0x14)
+#define MXC_NF_V1_UNLOCKEND (mxc_nf_info->mxc_regs_addr + 0x16)
+#define MXC_NF_V2_UNLOCKSTART0 (mxc_nf_info->mxc_regs_addr + 0x20)
+#define MXC_NF_V2_UNLOCKSTART1 (mxc_nf_info->mxc_regs_addr + 0x24)
+#define MXC_NF_V2_UNLOCKSTART2 (mxc_nf_info->mxc_regs_addr + 0x28)
+#define MXC_NF_V2_UNLOCKSTART3 (mxc_nf_info->mxc_regs_addr + 0x2c)
+#define MXC_NF_V2_UNLOCKEND0 (mxc_nf_info->mxc_regs_addr + 0x22)
+#define MXC_NF_V2_UNLOCKEND1 (mxc_nf_info->mxc_regs_addr + 0x26)
+#define MXC_NF_V2_UNLOCKEND2 (mxc_nf_info->mxc_regs_addr + 0x2a)
+#define MXC_NF_V2_UNLOCKEND3 (mxc_nf_info->mxc_regs_addr + 0x2e)
+#define MXC_NF_FWPSTATUS (mxc_nf_info->mxc_regs_addr + 0x18)