[PATCH] ARM: imx: use register defines in imxcfg files instead of plain numbers
Uwe Kleine-König
u.kleine-koenig at pengutronix.de
Wed Jul 5 12:23:28 PDT 2017
This makes the imxcfg files more readable and also makes it possible to
share more assignments between machines that just differ by the used
SoC. (Though I have to admit that in the cases converted here it just
more easily allows to see that the RAM config differs more than probably
necessary.)
This change is intended to have no effect on the built artifacts.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
.../flash-header-fs700-m60-6q-micron.imxcfg | 183 ++++++++--------
.../flash-header-fs700-m60-6q-nanya.imxcfg | 199 +++++++++---------
.../dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg | 121 +++++------
.../flash-header-eltec-hipercam.imxcfg | 185 +++++++++--------
arch/arm/boards/embedsky-e9/flash-header-e9.imxcfg | 169 +++++++--------
.../flash-header-embest-riotboard.imxcfg | 122 +++++------
.../flash-header-mx6-sabrelite.imxcfg | 183 ++++++++--------
arch/arm/boards/gk802/flash-header.imxcfg | 184 ++++++++--------
arch/arm/boards/guf-santaro/flash-header.imxcfg | 211 +++++++++----------
.../karo-tx6x/flash-header-tx6dl-512m.imxcfg | 201 +++++++++---------
.../boards/karo-tx6x/flash-header-tx6q-1g.imxcfg | 229 ++++++++++----------
.../boards/karo-tx6x/flash-header-tx6qp-2g.imxcfg | 231 +++++++++++----------
.../phytec-som-imx6/flash-header-phytec-pcaaxl3.h | 175 ++++++++--------
.../phytec-som-imx6/flash-header-phytec-pcm058.h | 179 ++++++++--------
.../phytec-som-imx6/flash-header-phytec-pcm058dl.h | 179 ++++++++--------
.../phytec-som-imx6/flash-header-phytec-pfla02.h | 179 ++++++++--------
.../phytec-som-imx6/flash-header-phytec-pfla02dl.h | 179 ++++++++--------
arch/arm/boards/tqma6x/flash-header-tqma6dl.imxcfg | 176 ++++++++--------
arch/arm/boards/tqma6x/flash-header-tqma6q.imxcfg | 183 ++++++++--------
arch/arm/boards/udoo/flash-header-mx6-udoo.imxcfg | 174 ++++++++--------
.../variscite-mx6/flash-header-variscite.imxcfg | 170 +++++++--------
.../zii-imx6q-rdu2/flash-header-imx6q-rdu2.imxcfg | 169 +++++++--------
.../zii-imx6q-rdu2/flash-header-imx6qp-rdu2.imxcfg | 213 +++++++++----------
arch/arm/mach-imx/include/mach/imx6-ddr-regs.h | 2 +
24 files changed, 2135 insertions(+), 2061 deletions(-)
diff --git a/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-micron.imxcfg b/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-micron.imxcfg
index 835d0c7d4ce4..2be0210dd686 100644
--- a/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-micron.imxcfg
+++ b/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-micron.imxcfg
@@ -2,96 +2,99 @@ loadaddr 0x27800000
soc imx6
dcdofs 0x400
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e056c 0x00020030
-wm 32 0x020e0578 0x00020030
-wm 32 0x020e057c 0x00020030
-wm 32 0x020e0588 0x00020030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0594 0x00020030
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e059c 0x00003030
-wm 32 0x020e05a0 0x00003030
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-wm 32 0x020e05c4 0x00020030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e0798 0x000c0000
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b0018 0x00081740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b000c 0x555a7974
-wm 32 0x021b0010 0xdb538f64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x005a1023
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x831a0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00428031
-wm 32 0x021b001c 0x00428039
-wm 32 0x021b001c 0x19308030
-wm 32 0x021b001c 0x19308038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0800 0xa1380003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00022227
-wm 32 0x021b4818 0x00022227
-wm 32 0x021b083c 0x434b0350
-wm 32 0x021b0840 0x034c0359
-wm 32 0x021b483c 0x434b0350
-wm 32 0x021b4840 0x03650348
-wm 32 0x021b0848 0x4436383b
-wm 32 0x021b4848 0x39393341
-wm 32 0x021b0850 0x35373933
-wm 32 0x021b4850 0x48254a36
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b480c 0x00440044
-wm 32 0x021b4810 0x00440044
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b001c 0x00000000
-wm 32 0x021b0404 0x00011006
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MDMISC 0x00081740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDCFG0 0x555a7974
+wm 32 MX6_MMDC_P0_MDCFG1 0xdb538f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x005a1023
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x831a0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00428031
+wm 32 MX6_MMDC_P0_MDSCR 0x00428039
+wm 32 MX6_MMDC_P0_MDSCR 0x19308030
+wm 32 MX6_MMDC_P0_MDSCR 0x19308038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x434b0350
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x034c0359
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x434b0350
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03650348
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4436383b
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x39393341
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x35373933
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x48254a36
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00440044
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x00440044
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
wm 32 0x020c4068 0x00c03f3f
wm 32 0x020c406c 0x0030fc03
wm 32 0x020c4070 0x0fffc000
diff --git a/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-nanya.imxcfg b/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-nanya.imxcfg
index e5bc762b48c5..fb34903e2733 100644
--- a/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-nanya.imxcfg
+++ b/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6q-nanya.imxcfg
@@ -2,101 +2,104 @@ loadaddr 0x27800000
soc imx6
dcdofs 0x400
-wm 32 0x020e0798 0x000C0000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0588 0x00000030
-wm 32 0x020e0594 0x00000030
-wm 32 0x020e056c 0x00000030
-wm 32 0x020e0578 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e057c 0x00000030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000030
-wm 32 0x020e05a0 0x00000030
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000028
-wm 32 0x020e0524 0x00000028
-wm 32 0x020e051c 0x00000028
-wm 32 0x020e0518 0x00000028
-wm 32 0x020e050c 0x00000028
-wm 32 0x020e05b8 0x00000028
-wm 32 0x020e05c0 0x00000028
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00000028
-wm 32 0x020e0788 0x00000028
-wm 32 0x020e0794 0x00000028
-wm 32 0x020e079c 0x00000028
-wm 32 0x020e07a0 0x00000028
-wm 32 0x020e07a4 0x00000028
-wm 32 0x020e07a8 0x00000028
-wm 32 0x020e0748 0x00000028
-wm 32 0x020e05ac 0x00000028
-wm 32 0x020e05b4 0x00000028
-wm 32 0x020e0528 0x00000028
-wm 32 0x020e0520 0x00000028
-wm 32 0x020e0514 0x00000028
-wm 32 0x020e0510 0x00000028
-wm 32 0x020e05bc 0x00000028
-wm 32 0x020e05c4 0x00000028
-
-wm 32 0x021b0800 0xA1390003
-wm 32 0x021b080c 0x001F001F
-wm 32 0x021b0810 0x001F001F
-wm 32 0x021b480c 0x001F001F
-wm 32 0x021b4810 0x001F001F
-
-wm 32 0x021b083c 0x43260335
-wm 32 0x021b0840 0x031A030B
-wm 32 0x021b483c 0x4323033B
-wm 32 0x021b4840 0x0323026F
-
-wm 32 0x021b0848 0x483D4545
-wm 32 0x021b4848 0x44433E48
-
-wm 32 0x021b0850 0x41444840
-wm 32 0x021b4850 0x4835483E
-
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
-
-wm 32 0x021b000c 0x8A8F7955
-wm 32 0x021b0010 0xFF328F64
-wm 32 0x021b0014 0x01FF00DB
-
-wm 32 0x021b0018 0x00001740
-wm 32 0x021b001c 0x00008000
-
-wm 32 0x021b002c 0x000026D2
-
-wm 32 0x021b0030 0x008F1023
-wm 32 0x021b0040 0x00000047
-wm 32 0x021b0000 0x841A0000
-
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x04008040
-
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_GRP_B4DS 0x00000028
+wm 32 MX6_IOM_GRP_B5DS 0x00000028
+wm 32 MX6_IOM_GRP_B6DS 0x00000028
+wm 32 MX6_IOM_GRP_B7DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_IOM_DRAM_DQM4 0x00000028
+wm 32 MX6_IOM_DRAM_DQM5 0x00000028
+wm 32 MX6_IOM_DRAM_DQM6 0x00000028
+wm 32 MX6_IOM_DRAM_DQM7 0x00000028
+
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xA1390003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001F001F
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001F001F
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001F001F
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001F001F
+
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x43260335
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x031A030B
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x4323033B
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x0323026F
+
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x483D4545
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x44433E48
+
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x41444840
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x4835483E
+
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+
+wm 32 MX6_MMDC_P0_MDCFG0 0x8A8F7955
+wm 32 MX6_MMDC_P0_MDCFG1 0xFF328F64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DB
+
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+
+wm 32 MX6_MMDC_P0_MDRWD 0x000026D2
+
+wm 32 MX6_MMDC_P0_MDOR 0x008F1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000047
+wm 32 MX6_MMDC_P0_MDCTL 0x841A0000
+
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg b/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg
index 25cef4ac162c..42e98d65d32e 100644
--- a/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg
+++ b/arch/arm/boards/dfi-fs700-m60/flash-header-fs700-m60-6s.imxcfg
@@ -2,62 +2,65 @@ loadaddr 0x17800000
soc imx6
dcdofs 0x400
-wm 32 0x020e0774 0x000c0000
-wm 32 0x020e0754 0x00000000
-wm 32 0x020e04ac 0x00000030
-wm 32 0x020e04b0 0x00000030
-wm 32 0x020e0464 0x00000030
-wm 32 0x020e0490 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0494 0x00000030
-wm 32 0x020e04a0 0x00000000
-wm 32 0x020e04b4 0x00000030
-wm 32 0x020e04b8 0x00000030
-wm 32 0x020e076c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e04bc 0x00000028
-wm 32 0x020e04c0 0x00000028
-wm 32 0x020e04c4 0x00000028
-wm 32 0x020e04c8 0x00000028
-wm 32 0x020e0760 0x00020000
-wm 32 0x020e0764 0x00000028
-wm 32 0x020e0770 0x00000028
-wm 32 0x020e0778 0x00000028
-wm 32 0x020e077c 0x00000028
-wm 32 0x020e0470 0x00000028
-wm 32 0x020e0474 0x00000028
-wm 32 0x020e0478 0x00000028
-wm 32 0x020e047c 0x00000028
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b083c 0x421c0216
-wm 32 0x021b0840 0x017b017a
-wm 32 0x021b0848 0x4b4a4e4c
-wm 32 0x021b0850 0x3f3f3334
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b0004 0x00020025
-wm 32 0x021b0008 0x00333030
-wm 32 0x021b000c 0x676b5313
-wm 32 0x021b0010 0xb66e8b63
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b0018 0x00001740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x006b1023
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x84190000
-wm 32 0x021b001c 0x04008032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x05208030
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b0004 0x00025565
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6dl-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x421c0216
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x017b017a
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4b4a4e4c
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3f3f3334
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00020025
+wm 32 MX6_MMDC_P0_MDOTC 0x00333030
+wm 32 MX6_MMDC_P0_MDCFG0 0x676b5313
+wm 32 MX6_MMDC_P0_MDCFG1 0xb66e8b63
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x006b1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x84190000
+wm 32 MX6_MMDC_P0_MDSCR 0x04008032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x05208030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025565
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/eltec-hipercam/flash-header-eltec-hipercam.imxcfg b/arch/arm/boards/eltec-hipercam/flash-header-eltec-hipercam.imxcfg
index 90f7e0199ec0..f04adf86a43b 100644
--- a/arch/arm/boards/eltec-hipercam/flash-header-eltec-hipercam.imxcfg
+++ b/arch/arm/boards/eltec-hipercam/flash-header-eltec-hipercam.imxcfg
@@ -2,97 +2,100 @@ soc imx6
loadaddr 0x10000000
dcdofs 0x400
-wm 32 0x020e04bc 0x00000030
-wm 32 0x020e04c0 0x00000030
-wm 32 0x020e04c4 0x00000030
-wm 32 0x020e04c8 0x00000030
-wm 32 0x020e04cc 0x00000030
-wm 32 0x020e04d0 0x00000030
-wm 32 0x020e04d4 0x00000030
-wm 32 0x020e04d8 0x00000030
-wm 32 0x020e0764 0x00000030
-wm 32 0x020e0770 0x00000030
-wm 32 0x020e0778 0x00000030
-wm 32 0x020e077c 0x00000030
-wm 32 0x020e0780 0x00000030
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e076c 0x00000030
-wm 32 0x020e0470 0x00020030
-wm 32 0x020e0474 0x00020030
-wm 32 0x020e0478 0x00020030
-wm 32 0x020e047c 0x00020030
-wm 32 0x020e0480 0x00020030
-wm 32 0x020e0484 0x00020030
-wm 32 0x020e0488 0x00020030
-wm 32 0x020e048c 0x00020030
-wm 32 0x020e0464 0x00020030
-wm 32 0x020e0490 0x00020030
-wm 32 0x020e04ac 0x00020030
-wm 32 0x020e04b0 0x00020030
-wm 32 0x020e0494 0x00020030
-wm 32 0x020e04a4 0x00003000
-wm 32 0x020e04a8 0x00003000
-wm 32 0x020e04b4 0x00003030
-wm 32 0x020e04b8 0x00003030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0760 0x00020000
-wm 32 0x020e0754 0x00000000
-wm 32 0x020e04a0 0x00000000
-wm 32 0x020e0774 0x000c0000
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b0018 0x00081740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b0004 0x0002002d
-wm 32 0x021b000c 0x8c435323
-wm 32 0x021b0010 0xb66e8d63
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x00431023
-wm 32 0x021b0008 0x00333030
-wm 32 0x021b0004 0x0002556d
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0xc4190000
-wm 32 0x021b001c 0x04008032
-wm 32 0x021b001c 0x0400803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x00048039
-wm 32 0x021b001c 0x13208030
-wm 32 0x021b001c 0x13208038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b4800 0xa1390003
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00022227
-wm 32 0x021b4818 0x00022227
-wm 32 0x021b083c 0x42350231
-wm 32 0x021b483c 0x42350231
-wm 32 0x021b0840 0x021a0218
-wm 32 0x021b4840 0x021a0218
-wm 32 0x021b0848 0x4b4b4e49
-wm 32 0x021b4848 0x4b4b4e49
-wm 32 0x021b0850 0x3f3f3035
-wm 32 0x021b4850 0x3f3f3035
-wm 32 0x021b080c 0x0040003c
-wm 32 0x021b0810 0x0032003e
-wm 32 0x021b480c 0x0040003c
-wm 32 0x021b4810 0x0032003e
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b001c 0x00000000
-wm 32 0x021b0404 0x00011006
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6dl-ddr-regs.h>
+
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MDMISC 0x00081740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDPDC 0x0002002d
+wm 32 MX6_MMDC_P0_MDCFG0 0x8c435323
+wm 32 MX6_MMDC_P0_MDCFG1 0xb66e8d63
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x00431023
+wm 32 MX6_MMDC_P0_MDOTC 0x00333030
+wm 32 MX6_MMDC_P0_MDPDC 0x0002556d
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0xc4190000
+wm 32 MX6_MMDC_P0_MDSCR 0x04008032
+wm 32 MX6_MMDC_P0_MDSCR 0x0400803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x00048039
+wm 32 MX6_MMDC_P0_MDSCR 0x13208030
+wm 32 MX6_MMDC_P0_MDSCR 0x13208038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x42350231
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x42350231
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x021a0218
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x021a0218
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4b4b4e49
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x4b4b4e49
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3f3f3035
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x3f3f3035
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x0040003c
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x0032003e
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x0040003c
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x0032003e
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
wm 32 0x020c4068 0x00c03f3f
wm 32 0x020c406c 0x0030fc03
wm 32 0x020c4070 0x0fffc000
diff --git a/arch/arm/boards/embedsky-e9/flash-header-e9.imxcfg b/arch/arm/boards/embedsky-e9/flash-header-e9.imxcfg
index 52edefd77a79..1139312da6b4 100644
--- a/arch/arm/boards/embedsky-e9/flash-header-e9.imxcfg
+++ b/arch/arm/boards/embedsky-e9/flash-header-e9.imxcfg
@@ -2,86 +2,89 @@ loadaddr 0x27800000
soc imx6
dcdofs 0x400
-wm 32 0x020e0798 0x000c0000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0588 0x00000030
-wm 32 0x020e0594 0x00000030
-wm 32 0x020e056c 0x00000030
-wm 32 0x020e0578 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e057c 0x00000030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000030
-wm 32 0x020e05a0 0x00000030
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e05a8 0x00000018
-wm 32 0x020e05b0 0x00000018
-wm 32 0x020e0524 0x00000018
-wm 32 0x020e051c 0x00000018
-wm 32 0x020e0518 0x00000018
-wm 32 0x020e050c 0x00000018
-wm 32 0x020e05b8 0x00000018
-wm 32 0x020e05c0 0x00000018
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00000018
-wm 32 0x020e0788 0x00000018
-wm 32 0x020e0794 0x00000018
-wm 32 0x020e079c 0x00000018
-wm 32 0x020e07a0 0x00000018
-wm 32 0x020e07a4 0x00000018
-wm 32 0x020e07a8 0x00000018
-wm 32 0x020e0748 0x00000018
-wm 32 0x020e05ac 0x00000018
-wm 32 0x020e05b4 0x00000018
-wm 32 0x020e0528 0x00000018
-wm 32 0x020e0520 0x00000018
-wm 32 0x020e0514 0x00000018
-wm 32 0x020e0510 0x00000018
-wm 32 0x020e05bc 0x00000018
-wm 32 0x020e05c4 0x00000018
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b480c 0x001f001f
-wm 32 0x021b4810 0x001f001f
-wm 32 0x021b083c 0x4333033f
-wm 32 0x021b0840 0x032c031d
-wm 32 0x021b483c 0x43200332
-wm 32 0x021b4840 0x031a026a
-wm 32 0x021b0848 0x4d464746
-wm 32 0x021b4848 0x47453f4d
-wm 32 0x021b0850 0x3e434440
-wm 32 0x021b4850 0x47384839
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b000c 0x8a8f7955
-wm 32 0x021b0010 0xff328f64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b0018 0x00001740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x008f1023
-wm 32 0x021b0040 0x00000047
-wm 32 0x021b0000 0x841a0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000018
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000018
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000018
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000018
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000018
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000018
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000018
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000018
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000018
+wm 32 MX6_IOM_GRP_B1DS 0x00000018
+wm 32 MX6_IOM_GRP_B2DS 0x00000018
+wm 32 MX6_IOM_GRP_B3DS 0x00000018
+wm 32 MX6_IOM_GRP_B4DS 0x00000018
+wm 32 MX6_IOM_GRP_B5DS 0x00000018
+wm 32 MX6_IOM_GRP_B6DS 0x00000018
+wm 32 MX6_IOM_GRP_B7DS 0x00000018
+wm 32 MX6_IOM_DRAM_DQM0 0x00000018
+wm 32 MX6_IOM_DRAM_DQM1 0x00000018
+wm 32 MX6_IOM_DRAM_DQM2 0x00000018
+wm 32 MX6_IOM_DRAM_DQM3 0x00000018
+wm 32 MX6_IOM_DRAM_DQM4 0x00000018
+wm 32 MX6_IOM_DRAM_DQM5 0x00000018
+wm 32 MX6_IOM_DRAM_DQM6 0x00000018
+wm 32 MX6_IOM_DRAM_DQM7 0x00000018
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x4333033f
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x032c031d
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x43200332
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x031a026a
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4d464746
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x47453f4d
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3e434440
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x47384839
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDCFG0 0x8a8f7955
+wm 32 MX6_MMDC_P0_MDCFG1 0xff328f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x008f1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000047
+wm 32 MX6_MMDC_P0_MDCTL 0x841a0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/embest-riotboard/flash-header-embest-riotboard.imxcfg b/arch/arm/boards/embest-riotboard/flash-header-embest-riotboard.imxcfg
index 04e162b8f1af..c9a8098f6d78 100644
--- a/arch/arm/boards/embest-riotboard/flash-header-embest-riotboard.imxcfg
+++ b/arch/arm/boards/embest-riotboard/flash-header-embest-riotboard.imxcfg
@@ -1,62 +1,66 @@
loadaddr 0x20000000
soc imx6
dcdofs 0x400
-wm 32 0x020e0774 0x000c0000
-wm 32 0x020e0754 0x00000000
-wm 32 0x020e04ac 0x00000030
-wm 32 0x020e04b0 0x00000030
-wm 32 0x020e0464 0x00000030
-wm 32 0x020e0490 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0494 0x00000030
-wm 32 0x020e04a0 0x00000000
-wm 32 0x020e04b4 0x00000030
-wm 32 0x020e04b8 0x00000030
-wm 32 0x020e076c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e04bc 0x00000028
-wm 32 0x020e04c0 0x00000028
-wm 32 0x020e04c4 0x00000028
-wm 32 0x020e04c8 0x00000028
-wm 32 0x020e0760 0x00020000
-wm 32 0x020e0764 0x00000028
-wm 32 0x020e0770 0x00000028
-wm 32 0x020e0778 0x00000028
-wm 32 0x020e077c 0x00000028
-wm 32 0x020e0470 0x00000028
-wm 32 0x020e0474 0x00000028
-wm 32 0x020e0478 0x00000028
-wm 32 0x020e047c 0x00000028
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b083c 0x421c0216
-wm 32 0x021b0840 0x017b017a
-wm 32 0x021b0848 0x4b4a4e4c
-wm 32 0x021b0850 0x3f3f3334
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b0004 0x00020025
-wm 32 0x021b0008 0x00333030
-wm 32 0x021b000c 0x676b5313
-wm 32 0x021b0010 0xb66e8b63
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b0018 0x00001740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x006b1023
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x84190000
-wm 32 0x021b001c 0x04008032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x05208030
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b0004 0x00025565
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6dl-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x421c0216
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x017b017a
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4b4a4e4c
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3f3f3334
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00020025
+wm 32 MX6_MMDC_P0_MDOTC 0x00333030
+wm 32 MX6_MMDC_P0_MDCFG0 0x676b5313
+wm 32 MX6_MMDC_P0_MDCFG1 0xb66e8b63
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x006b1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x84190000
+wm 32 MX6_MMDC_P0_MDSCR 0x04008032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x05208030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025565
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/flash-header-mx6-sabrelite.imxcfg b/arch/arm/boards/freescale-mx6-sabrelite/flash-header-mx6-sabrelite.imxcfg
index 60a39fe87025..3ce8562f516d 100644
--- a/arch/arm/boards/freescale-mx6-sabrelite/flash-header-mx6-sabrelite.imxcfg
+++ b/arch/arm/boards/freescale-mx6-sabrelite/flash-header-mx6-sabrelite.imxcfg
@@ -2,96 +2,99 @@ soc imx6
loadaddr 0x20000000
dcdofs 0x400
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05c4 0x00020030
-wm 32 0x020e056c 0x00020030
-wm 32 0x020e0578 0x00020030
-wm 32 0x020e0588 0x00020030
-wm 32 0x020e0594 0x00020030
-wm 32 0x020e057c 0x00020030
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00003030
-wm 32 0x020e05a0 0x00003030
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0798 0x000c0000
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b0018 0x00081740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b000c 0x555a7975
-wm 32 0x021b0010 0xff538e64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x005b0e21
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x831a0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00428031
-wm 32 0x021b001c 0x00428039
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x09408038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0800 0xa1380003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00022227
-wm 32 0x021b4818 0x00022227
-wm 32 0x021b083c 0x434b0350
-wm 32 0x021b0840 0x034c0359
-wm 32 0x021b483c 0x434b0350
-wm 32 0x021b4840 0x03650348
-wm 32 0x021b0848 0x4436383b
-wm 32 0x021b4848 0x39393341
-wm 32 0x021b0850 0x35373933
-wm 32 0x021b4850 0x48254A36
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b480c 0x00440044
-wm 32 0x021b4810 0x00440044
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b001c 0x00000000
-wm 32 0x021b0404 0x00011006
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MDMISC 0x00081740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDCFG0 0x555a7975
+wm 32 MX6_MMDC_P0_MDCFG1 0xff538e64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x005b0e21
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x831a0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00428031
+wm 32 MX6_MMDC_P0_MDSCR 0x00428039
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x09408038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x434b0350
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x034c0359
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x434b0350
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03650348
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4436383b
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x39393341
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x35373933
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x48254A36
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00440044
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x00440044
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
wm 32 0x020c4068 0x00c03f3f
wm 32 0x020c406c 0x0030fc03
wm 32 0x020c4070 0x0fffc000
diff --git a/arch/arm/boards/gk802/flash-header.imxcfg b/arch/arm/boards/gk802/flash-header.imxcfg
index 9638b02bdaf2..f26fe77b0363 100644
--- a/arch/arm/boards/gk802/flash-header.imxcfg
+++ b/arch/arm/boards/gk802/flash-header.imxcfg
@@ -1,96 +1,100 @@
loadaddr 0x10000000
soc imx6
dcdofs 0x400
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05c4 0x00020030
-wm 32 0x020e056c 0x00020030
-wm 32 0x020e0578 0x00020030
-wm 32 0x020e0588 0x00020030
-wm 32 0x020e0594 0x00020030
-wm 32 0x020e057c 0x00020030
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00003030
-wm 32 0x020e05a0 0x00003030
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0798 0x000c0000
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b0018 0x00081740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b000c 0x555a7975
-wm 32 0x021b0010 0xff538e64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x005b0e21
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x831a0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00428031
-wm 32 0x021b001c 0x00428039
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x09408038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0800 0xa1380003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00000007
-wm 32 0x021b4818 0x00000007
-wm 32 0x021b083c 0x427b030a
-wm 32 0x021b0840 0x02740269
-wm 32 0x021b483c 0x43100313
-wm 32 0x021b4840 0x027d024d
-wm 32 0x021b0848 0x46384240
-wm 32 0x021b4848 0x4442414a
-wm 32 0x021b0850 0x45444645
-wm 32 0x021b4850 0x4a354946
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b480c 0x00440044
-wm 32 0x021b4810 0x00440044
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b001c 0x00000000
-wm 32 0x021b0404 0x00011006
+
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MDMISC 0x00081740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDCFG0 0x555a7975
+wm 32 MX6_MMDC_P0_MDCFG1 0xff538e64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x005b0e21
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x831a0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00428031
+wm 32 MX6_MMDC_P0_MDSCR 0x00428039
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x09408038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00000007
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00000007
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x427b030a
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x02740269
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x43100313
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x027d024d
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x46384240
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x4442414a
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x45444645
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x4a354946
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00440044
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x00440044
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
wm 32 0x020e0010 0xf00000ff
wm 32 0x020e0018 0x007f007f
wm 32 0x020e001c 0x007f007f
diff --git a/arch/arm/boards/guf-santaro/flash-header.imxcfg b/arch/arm/boards/guf-santaro/flash-header.imxcfg
index 510cae3c8830..2e85e13ba936 100644
--- a/arch/arm/boards/guf-santaro/flash-header.imxcfg
+++ b/arch/arm/boards/guf-santaro/flash-header.imxcfg
@@ -2,108 +2,111 @@ loadaddr 0x10000000
soc imx6
dcdofs 0x400
-wm 32 0x020e0798 0x000c0000
-wm 32 0x020e0758 0x00000000
-
-wm 32 0x020e0588 0x00000030
-wm 32 0x020e0594 0x00000030
-
-wm 32 0x020e056c 0x00000030
-wm 32 0x020e0578 0x00000030
-wm 32 0x020e074c 0x00000030
-
-wm 32 0x020e057c 0x00000030
-
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000030
-wm 32 0x020e05a0 0x00000030
-wm 32 0x020e078c 0x00000030
-
-wm 32 0x020e0750 0x00020000
-
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-
-wm 32 0x020e0774 0x00020000
-
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
-
-wm 32 0x020e05ac 0x00000030
-wm 32 0x020e05b4 0x00000030
-wm 32 0x020e0528 0x00000030
-wm 32 0x020e0520 0x00000030
-wm 32 0x020e0514 0x00000030
-wm 32 0x020e0510 0x00000030
-wm 32 0x020e05bc 0x00000030
-wm 32 0x020e05c4 0x00000030
-
-wm 32 0x021b0800 0xa1390003
-
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b480c 0x001f001f
-wm 32 0x021b4810 0x001f001f
-
-wm 32 0x021b083c 0x4333033f
-wm 32 0x021b0840 0x032c031d
-wm 32 0x021b483c 0x43200332
-wm 32 0x021b4840 0x031a026a
-wm 32 0x021b0848 0x4d464746
-wm 32 0x021b4848 0x47453f4d
-wm 32 0x021b0850 0x3e434440
-wm 32 0x021b4850 0x47384839
-
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b000c 0x555a7975
-wm 32 0x021b0010 0xff538f64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b0018 0x00001740
-
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x005a1023
-wm 32 0x021b0040 0x00000027
-
-wm 32 0x021b0000 0x831a0000
-
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x04008040
-
-wm 32 0x021b0020 0x00005800
-
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+
+wm 32 MX6_IOM_DRAM_DQM0 0x00000030
+wm 32 MX6_IOM_DRAM_DQM1 0x00000030
+wm 32 MX6_IOM_DRAM_DQM2 0x00000030
+wm 32 MX6_IOM_DRAM_DQM3 0x00000030
+wm 32 MX6_IOM_DRAM_DQM4 0x00000030
+wm 32 MX6_IOM_DRAM_DQM5 0x00000030
+wm 32 MX6_IOM_DRAM_DQM6 0x00000030
+wm 32 MX6_IOM_DRAM_DQM7 0x00000030
+
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001f001f
+
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x4333033f
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x032c031d
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x43200332
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x031a026a
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4d464746
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x47453f4d
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3e434440
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x47384839
+
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDCFG0 0x555a7975
+wm 32 MX6_MMDC_P0_MDCFG1 0xff538f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x005a1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+
+wm 32 MX6_MMDC_P0_MDCTL 0x831a0000
+
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/karo-tx6x/flash-header-tx6dl-512m.imxcfg b/arch/arm/boards/karo-tx6x/flash-header-tx6dl-512m.imxcfg
index dd1ae6e5e9a1..c58ef4e35a58 100644
--- a/arch/arm/boards/karo-tx6x/flash-header-tx6dl-512m.imxcfg
+++ b/arch/arm/boards/karo-tx6x/flash-header-tx6dl-512m.imxcfg
@@ -2,6 +2,9 @@ soc imx6
loadaddr 0x20000000
dcdofs 0x400
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6dl-ddr-regs.h>
+
wm 32 0x020e0158 0x00000016
wm 32 0x020e0174 0x00000011
wm 32 0x020e0528 0x0000f079
@@ -30,107 +33,107 @@ wm 32 0x020e0314 0x00000001
wm 32 0x020e0318 0x00000001
wm 32 0x020e08f8 0x00000003
wm 32 0x020e027c 0x00000000
-wm 32 0x020e0470 0x00020030
-wm 32 0x020e0474 0x00020030
-wm 32 0x020e0478 0x00020030
-wm 32 0x020e047c 0x00020030
-wm 32 0x020e0424 0x00020200
-wm 32 0x020e0428 0x00020200
-wm 32 0x020e0444 0x00020200
-wm 32 0x020e0448 0x00020200
-wm 32 0x020e044c 0x00020200
-wm 32 0x020e0450 0x00020200
-wm 32 0x020e0454 0x00020200
-wm 32 0x020e0458 0x00020200
-wm 32 0x020e045c 0x00020200
-wm 32 0x020e0460 0x00020200
-wm 32 0x020e042c 0x00020200
-wm 32 0x020e0430 0x00020200
-wm 32 0x020e0434 0x00020200
-wm 32 0x020e0438 0x00020200
-wm 32 0x020e043c 0x00020200
-wm 32 0x020e0440 0x00020200
-wm 32 0x020e0464 0x00020030
-wm 32 0x020e0490 0x00020030
-wm 32 0x020e04ac 0x00020030
-wm 32 0x020e04b0 0x00020030
-wm 32 0x020e0494 0x00020030
-wm 32 0x020e04a4 0x00003000
-wm 32 0x020e04a8 0x00003000
-wm 32 0x020e0498 0x00000000
-wm 32 0x020e049c 0x00000000
-wm 32 0x020e04a0 0x00000000
-wm 32 0x020e04b4 0x00003030
-wm 32 0x020e04b8 0x00003030
-wm 32 0x020e0784 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_ADDR00 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR01 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR02 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR03 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR04 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR05 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR06 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR07 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR08 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR09 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR10 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR11 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR12 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR13 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR14 0x00020200
+wm 32 MX6_IOM_DRAM_ADDR15 0x00020200
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDBA0 0x00000000
+wm 32 MX6_IOM_DRAM_SDBA1 0x00000000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
wm 32 0x020e0788 0x00000030
wm 32 0x020e0794 0x00000030
wm 32 0x020e079c 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0754 0x00000000
-wm 32 0x020e0760 0x00020000
-wm 32 0x020e078c 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
wm 32 0x020e0798 0x000c0000
wm 32 0x020e0758 0x00002000
-wm 32 0x020e075c 0x00000000
-wm 32 0x021b001c 0x04008010
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xa1390001
-wm 32 0x021b080c 0x001e001e
-wm 32 0x021b0810 0x001e001e
-wm 32 0x021b083c 0x42490244
-wm 32 0x021b0840 0x022f0238
-wm 32 0x021b0848 0x40404040
-wm 32 0x021b0850 0x40404040
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b0018 0x00000742
-check 32 while_all_bits_clear 0x021b0018 0x00000002
-wm 32 0x021b001c 0x00008000
-check 32 while_any_bit_clear 0x021b001c 0x00004000
-wm 32 0x021b0000 0x83190000
-check 32 while_any_bit_clear 0x021b0018 0x40000000
-wm 32 0x021b000c 0x3f435333
-wm 32 0x021b0010 0xb66e8a63
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x00431023
-wm 32 0x021b0008 0x1b333030
-wm 32 0x021b0004 0x0002006d
-wm 32 0x021b0040 0x00000017
-wm 32 0x021b001c 0x05208030
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x00408032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b0020 0x0000c000
-wm 32 0x021b001c 0x00008020
-wm 32 0x021b0818 0x00022222
-wm 32 0x021b0890 0x00000003
-wm 32 0x021b0404 0x00000001
-wm 32 0x021b001c 0x04008010
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xa1390001
-check 32 while_all_bits_clear 0x021b0800 0x00010000
-wm 32 0x021b0800 0xa1380000
-wm 32 0x021b001c 0x00048033
-wm 32 0x020e04bc 0x00000030
-wm 32 0x020e04c0 0x00000030
-wm 32 0x020e04c4 0x00000030
-wm 32 0x020e04c8 0x00000030
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b0860 0x00000030
-check 32 while_all_bits_clear 0x021b0860 0x0000001f
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b0864 0x00000030
-check 32 while_all_bits_clear 0x021b0864 0x0000001f
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b0800 0xa138002b
-wm 32 0x021b0020 0x00001800
-wm 32 0x021b0404 0x00001000
-wm 32 0x021b0004 0x0002556d
-wm 32 0x021b001c 0x00000000
-check 32 while_all_bits_clear 0x021b001c 0x00004000
+wm 32 MX6_IOM_GRP_DDRHYS 0x00000000
+wm 32 MX6_MMDC_P0_MDSCR 0x04008010
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390001
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001e001e
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001e001e
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x42490244
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x022f0238
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x40404040
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x40404040
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDMISC 0x00000742
+check 32 while_all_bits_clear MX6_MMDC_P0_MDMISC 0x00000002
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+check 32 while_any_bit_clear MX6_MMDC_P0_MDSCR 0x00004000
+wm 32 MX6_MMDC_P0_MDCTL 0x83190000
+check 32 while_any_bit_clear MX6_MMDC_P0_MDMISC 0x40000000
+wm 32 MX6_MMDC_P0_MDCFG0 0x3f435333
+wm 32 MX6_MMDC_P0_MDCFG1 0xb66e8a63
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x00431023
+wm 32 MX6_MMDC_P0_MDOTC 0x1b333030
+wm 32 MX6_MMDC_P0_MDPDC 0x0002006d
+wm 32 MX6_MMDC_P0_MDASP 0x00000017
+wm 32 MX6_MMDC_P0_MDSCR 0x05208030
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x00408032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDREF 0x0000c000
+wm 32 MX6_MMDC_P0_MDSCR 0x00008020
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022222
+wm 32 MX6_MMDC_P0_MPPDCMPR2 0x00000003
+wm 32 MX6_MMDC_P0_MAPSR 0x00000001
+wm 32 MX6_MMDC_P0_MDSCR 0x04008010
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390001
+check 32 while_all_bits_clear MX6_MMDC_P0_MPZQHWCTRL 0x00010000
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1380000
+wm 32 MX6_MMDC_P0_MDSCR 0x00048033
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P0_MPRDDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P0_MPRDDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P0_MPWRDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P0_MPWRDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa138002b
+wm 32 MX6_MMDC_P0_MDREF 0x00001800
+wm 32 MX6_MMDC_P0_MAPSR 0x00001000
+wm 32 MX6_MMDC_P0_MDPDC 0x0002556d
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+check 32 while_all_bits_clear MX6_MMDC_P0_MDSCR 0x00004000
diff --git a/arch/arm/boards/karo-tx6x/flash-header-tx6q-1g.imxcfg b/arch/arm/boards/karo-tx6x/flash-header-tx6q-1g.imxcfg
index be4efe3c706e..56cb3292a9ce 100644
--- a/arch/arm/boards/karo-tx6x/flash-header-tx6q-1g.imxcfg
+++ b/arch/arm/boards/karo-tx6x/flash-header-tx6q-1g.imxcfg
@@ -2,6 +2,9 @@ soc imx6
loadaddr 0x20000000
dcdofs 0x400
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
wm 32 0x020e00a4 0x00000016
wm 32 0x020e00c4 0x00000011
wm 32 0x020e03b8 0x0000f079
@@ -30,14 +33,14 @@ wm 32 0x020e02c0 0x00000001
wm 32 0x020e02c4 0x00000001
wm 32 0x020e091c 0x00000003
wm 32 0x020e02ec 0x00000000
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05c4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
wm 32 0x020e052c 0x00020200
wm 32 0x020e0530 0x00020200
wm 32 0x020e0534 0x00020200
@@ -54,32 +57,32 @@ wm 32 0x020e055c 0x00020200
wm 32 0x020e0560 0x00020200
wm 32 0x020e0564 0x00020200
wm 32 0x020e0568 0x00020200
-wm 32 0x020e056c 0x00020030
-wm 32 0x020e0578 0x00020030
-wm 32 0x020e0588 0x00020030
-wm 32 0x020e0594 0x00020030
-wm 32 0x020e057c 0x00020030
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
wm 32 0x020e0580 0x00000000
wm 32 0x020e0584 0x00000000
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00003030
-wm 32 0x020e05a0 0x00003030
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0798 0x000c0000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
wm 32 0x020e0768 0x00002000
wm 32 0x020e0770 0x00000000
wm 32 0x020e0754 0x00000200
@@ -90,85 +93,85 @@ wm 32 0x020e076c 0x00000200
wm 32 0x020e0778 0x00000200
wm 32 0x020e077c 0x00000200
wm 32 0x020e0780 0x00000200
-wm 32 0x021b001c 0x04008010
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xa1390001
-wm 32 0x021b080c 0x001e001e
-wm 32 0x021b0810 0x001e001e
-wm 32 0x021b480c 0x001e001e
-wm 32 0x021b4810 0x001e001e
-wm 32 0x021b083c 0x43430349
-wm 32 0x021b0840 0x03330334
-wm 32 0x021b483c 0x434b0351
-wm 32 0x021b4840 0x033d030e
-wm 32 0x021b0848 0x40404040
-wm 32 0x021b0850 0x40404040
-wm 32 0x021b4848 0x40404040
-wm 32 0x021b4850 0x40404040
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0018 0x00000742
-check 32 while_all_bits_clear 0x021b0018 0x00000002
-wm 32 0x021b001c 0x00008000
-check 32 while_any_bit_clear 0x021b001c 0x00004000
-wm 32 0x021b0000 0x831a0000
-check 32 while_any_bit_clear 0x021b0018 0x40000000
-wm 32 0x021b000c 0x545a79a4
-wm 32 0x021b0010 0xff538e64
-wm 32 0x021b0014 0x01ff00dd
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x005a1023
-wm 32 0x021b0008 0x24444040
-wm 32 0x021b0004 0x00020076
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b001c 0x09308030
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x00488032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b0020 0x0000c000
-wm 32 0x021b001c 0x00008020
-wm 32 0x021b0818 0x00022222
-wm 32 0x021b4818 0x00022222
-wm 32 0x021b0890 0x00000003
-wm 32 0x021b0404 0x00000001
-wm 32 0x021b001c 0x04008010
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xa1390001
-check 32 while_all_bits_clear 0x021b0800 0x00010000
-wm 32 0x021b0800 0xa1380000
-wm 32 0x021b001c 0x00048033
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b0860 0x00000030
-wm 32 0x021b4860 0x00000030
-check 32 while_all_bits_clear 0x021b0860 0x0000001f
-check 32 while_all_bits_clear 0x021b4860 0x0000001f
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b0864 0x00000030
-check 32 while_all_bits_clear 0x021b0864 0x0000001f
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b4864 0x00000030
-check 32 while_all_bits_clear 0x021b4864 0x0000001f
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b0800 0xa138002b
-wm 32 0x021b0020 0x00001800
-wm 32 0x021b0404 0x00001000
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b001c 0x00000000
-check 32 while_all_bits_clear 0x021b001c 0x00004000
+wm 32 MX6_MMDC_P0_MDSCR 0x04008010
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390001
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001e001e
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001e001e
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001e001e
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001e001e
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x43430349
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x03330334
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x434b0351
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x033d030e
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x40404040
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x40404040
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x40404040
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x40404040
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDMISC 0x00000742
+check 32 while_all_bits_clear MX6_MMDC_P0_MDMISC 0x00000002
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+check 32 while_any_bit_clear MX6_MMDC_P0_MDSCR 0x00004000
+wm 32 MX6_MMDC_P0_MDCTL 0x831a0000
+check 32 while_any_bit_clear MX6_MMDC_P0_MDMISC 0x40000000
+wm 32 MX6_MMDC_P0_MDCFG0 0x545a79a4
+wm 32 MX6_MMDC_P0_MDCFG1 0xff538e64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00dd
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x005a1023
+wm 32 MX6_MMDC_P0_MDOTC 0x24444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00020076
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDSCR 0x09308030
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x00488032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDREF 0x0000c000
+wm 32 MX6_MMDC_P0_MDSCR 0x00008020
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022222
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022222
+wm 32 MX6_MMDC_P0_MPPDCMPR2 0x00000003
+wm 32 MX6_MMDC_P0_MAPSR 0x00000001
+wm 32 MX6_MMDC_P0_MDSCR 0x04008010
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390001
+check 32 while_all_bits_clear MX6_MMDC_P0_MPZQHWCTRL 0x00010000
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1380000
+wm 32 MX6_MMDC_P0_MDSCR 0x00048033
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P0_MPRDDLHWCTL 0x00000030
+wm 32 MX6_MMDC_P1_MPRDDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P0_MPRDDLHWCTL 0x0000001f
+check 32 while_all_bits_clear MX6_MMDC_P1_MPRDDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P0_MPWRDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P0_MPWRDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P1_MPWRDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P1_MPWRDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa138002b
+wm 32 MX6_MMDC_P0_MDREF 0x00001800
+wm 32 MX6_MMDC_P0_MAPSR 0x00001000
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+check 32 while_all_bits_clear MX6_MMDC_P0_MDSCR 0x00004000
diff --git a/arch/arm/boards/karo-tx6x/flash-header-tx6qp-2g.imxcfg b/arch/arm/boards/karo-tx6x/flash-header-tx6qp-2g.imxcfg
index 455aab92ca6b..4eaca00fc78e 100644
--- a/arch/arm/boards/karo-tx6x/flash-header-tx6qp-2g.imxcfg
+++ b/arch/arm/boards/karo-tx6x/flash-header-tx6qp-2g.imxcfg
@@ -2,6 +2,9 @@ soc imx6
loadaddr 0x20000000
dcdofs 0x400
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
wm 32 0x020e00a4 0x00000016
wm 32 0x020e00c4 0x00000011
wm 32 0x020e03b8 0x0000f079
@@ -39,14 +42,14 @@ wm 32 0x020e02c0 0x00000001
wm 32 0x020e02c4 0x00000001
wm 32 0x020e091c 0x00000003
wm 32 0x020e02ec 0x00000000
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05c4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
wm 32 0x020e052c 0x00020200
wm 32 0x020e0530 0x00020200
wm 32 0x020e0534 0x00020200
@@ -63,32 +66,32 @@ wm 32 0x020e055c 0x00020200
wm 32 0x020e0560 0x00020200
wm 32 0x020e0564 0x00020200
wm 32 0x020e0568 0x00020200
-wm 32 0x020e056c 0x00020030
-wm 32 0x020e0578 0x00020030
-wm 32 0x020e0588 0x00020030
-wm 32 0x020e0594 0x00020030
-wm 32 0x020e057c 0x00020030
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
wm 32 0x020e0580 0x00000000
wm 32 0x020e0584 0x00000000
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00003030
-wm 32 0x020e05a0 0x00003030
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0798 0x000c0000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
wm 32 0x020e0768 0x00002000
wm 32 0x020e0770 0x00000000
wm 32 0x020e0754 0x00000200
@@ -99,85 +102,85 @@ wm 32 0x020e076c 0x00000200
wm 32 0x020e0778 0x00000200
wm 32 0x020e077c 0x00000200
wm 32 0x020e0780 0x00000200
-wm 32 0x021b001c 0x04008010
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xa1390001
-wm 32 0x021b080c 0x001e001e
-wm 32 0x021b0810 0x001e001e
-wm 32 0x021b480c 0x001e001e
-wm 32 0x021b4810 0x001e001e
-wm 32 0x021b083c 0x43430349
-wm 32 0x021b0840 0x03330334
-wm 32 0x021b483c 0x434b0351
-wm 32 0x021b4840 0x033d030e
-wm 32 0x021b0848 0x40404040
-wm 32 0x021b0850 0x40404040
-wm 32 0x021b4848 0x40404040
-wm 32 0x021b4850 0x40404040
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0018 0x00000742
-check 32 while_all_bits_clear 0x021b0018 0x00000002
-wm 32 0x021b001c 0x00008000
-check 32 while_any_bit_clear 0x021b001c 0x00004000
-wm 32 0x021b0000 0x841a0000
-check 32 while_any_bit_clear 0x021b0018 0x40000000
-wm 32 0x021b000c 0x898f78f4
-wm 32 0x021b0010 0xff328e64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x008f1023
-wm 32 0x021b0008 0x24444040
-wm 32 0x021b0004 0x00020076
-wm 32 0x021b0040 0x00000047
-wm 32 0x021b001c 0x09308030
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x00488032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b0020 0x0000c000
-wm 32 0x021b001c 0x00008020
-wm 32 0x021b0818 0x00022222
-wm 32 0x021b4818 0x00022222
-wm 32 0x021b0890 0x00000003
-set_bits 32 0x021b0400 0x02000000
-wm 32 0x021b0404 0x00000001
-wm 32 0x021b001c 0x04008010
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xa1390001
-check 32 while_all_bits_clear 0x021b0800 0x00010000
-wm 32 0x021b0800 0xa1380000
-wm 32 0x021b001c 0x00048033
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b0860 0x00000030
-wm 32 0x021b4860 0x00000030
-check 32 while_all_bits_clear 0x021b0860 0x0000001f
-check 32 while_all_bits_clear 0x021b4860 0x0000001f
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b0864 0x00000030
-check 32 while_all_bits_clear 0x021b0864 0x0000001f
-wm 32 0x021b001c 0x04008050
-wm 32 0x021b4864 0x00000030
-check 32 while_all_bits_clear 0x021b4864 0x0000001f
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b0800 0xa138002b
-wm 32 0x021b0020 0x00001800
-wm 32 0x021b0404 0x00001000
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b001c 0x00000000
-check 32 while_all_bits_clear 0x021b001c 0x00004000
+wm 32 MX6_MMDC_P0_MDSCR 0x04008010
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390001
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001e001e
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001e001e
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001e001e
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001e001e
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x43430349
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x03330334
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x434b0351
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x033d030e
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x40404040
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x40404040
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x40404040
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x40404040
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDMISC 0x00000742
+check 32 while_all_bits_clear MX6_MMDC_P0_MDMISC 0x00000002
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+check 32 while_any_bit_clear MX6_MMDC_P0_MDSCR 0x00004000
+wm 32 MX6_MMDC_P0_MDCTL 0x841a0000
+check 32 while_any_bit_clear MX6_MMDC_P0_MDMISC 0x40000000
+wm 32 MX6_MMDC_P0_MDCFG0 0x898f78f4
+wm 32 MX6_MMDC_P0_MDCFG1 0xff328e64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x008f1023
+wm 32 MX6_MMDC_P0_MDOTC 0x24444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00020076
+wm 32 MX6_MMDC_P0_MDASP 0x00000047
+wm 32 MX6_MMDC_P0_MDSCR 0x09308030
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x00488032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDREF 0x0000c000
+wm 32 MX6_MMDC_P0_MDSCR 0x00008020
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022222
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022222
+wm 32 MX6_MMDC_P0_MPPDCMPR2 0x00000003
+set_bits 32 MX6_MMDC_P0_MAARCR 0x02000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00000001
+wm 32 MX6_MMDC_P0_MDSCR 0x04008010
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390001
+check 32 while_all_bits_clear MX6_MMDC_P0_MPZQHWCTRL 0x00010000
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1380000
+wm 32 MX6_MMDC_P0_MDSCR 0x00048033
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P0_MPRDDLHWCTL 0x00000030
+wm 32 MX6_MMDC_P1_MPRDDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P0_MPRDDLHWCTL 0x0000001f
+check 32 while_all_bits_clear MX6_MMDC_P1_MPRDDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P0_MPWRDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P0_MPWRDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x04008050
+wm 32 MX6_MMDC_P1_MPWRDLHWCTL 0x00000030
+check 32 while_all_bits_clear MX6_MMDC_P1_MPWRDLHWCTL 0x0000001f
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa138002b
+wm 32 MX6_MMDC_P0_MDREF 0x00001800
+wm 32 MX6_MMDC_P0_MAPSR 0x00001000
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+check 32 while_all_bits_clear MX6_MMDC_P0_MDSCR 0x00004000
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
index ebcc1ddf9410..06ba308fb8d2 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcaaxl3.h
@@ -2,96 +2,99 @@ soc imx6
loadaddr 0x10000000
dcdofs 0x400
-wm 32 0x020e05a8 0x00000028
-wm 32 0x020e05b0 0x00000028
-wm 32 0x020e0524 0x00000028
-wm 32 0x020e051c 0x00000028
-wm 32 0x020e0518 0x00000028
-wm 32 0x020e050c 0x00000028
-wm 32 0x020e05b8 0x00000028
-wm 32 0x020e05c0 0x00000028
-wm 32 0x020e05ac 0x00000028
-wm 32 0x020e05b4 0x00000028
-wm 32 0x020e0528 0x00000028
-wm 32 0x020e0520 0x00000028
-wm 32 0x020e0514 0x00000028
-wm 32 0x020e0510 0x00000028
-wm 32 0x020e05bc 0x00000028
-wm 32 0x020e05c4 0x00000028
-wm 32 0x020e056c 0x00000028
-wm 32 0x020e0578 0x00000028
-wm 32 0x020e0588 0x00000028
-wm 32 0x020e0594 0x00000028
-wm 32 0x020e057c 0x00000028
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000028
-wm 32 0x020e05a0 0x00000028
-wm 32 0x020e0784 0x00000028
-wm 32 0x020e0788 0x00000028
-wm 32 0x020e0794 0x00000028
-wm 32 0x020e079c 0x00000028
-wm 32 0x020e07a0 0x00000028
-wm 32 0x020e07a4 0x00000028
-wm 32 0x020e07a8 0x00000028
-wm 32 0x020e0748 0x00000028
-wm 32 0x020e074c 0x00000028
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e078c 0x00000028
-wm 32 0x020e0798 0x000c0000
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b0018 0x00091740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b0010 0xff328f64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b0004 0x00025576
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_IOM_DRAM_DQM4 0x00000028
+wm 32 MX6_IOM_DRAM_DQM5 0x00000028
+wm 32 MX6_IOM_DRAM_DQM6 0x00000028
+wm 32 MX6_IOM_DRAM_DQM7 0x00000028
+wm 32 MX6_IOM_DRAM_CAS 0x00000028
+wm 32 MX6_IOM_DRAM_RAS 0x00000028
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000028
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000028
+wm 32 MX6_IOM_DRAM_RESET 0x00000028
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000028
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000028
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_GRP_B4DS 0x00000028
+wm 32 MX6_IOM_GRP_B5DS 0x00000028
+wm 32 MX6_IOM_GRP_B6DS 0x00000028
+wm 32 MX6_IOM_GRP_B7DS 0x00000028
+wm 32 MX6_IOM_GRP_ADDDS 0x00000028
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000028
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MDMISC 0x00091740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDCFG1 0xff328f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
SETUP_MDCFG0
SETUP_MDOR_MDASP_MDCTL
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x00048039
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x09408038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b0020 0x00007800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b083c 0x4350035e
-wm 32 0x021b0840 0x035c0358
-wm 32 0x021b483c 0x436e0376
-wm 32 0x021b4840 0x03770352
-wm 32 0x021b0848 0x3c333436
-wm 32 0x021b4848 0x35332f3b
-wm 32 0x021b0850 0x37363e39
-wm 32 0x021b4850 0x432f433d
-wm 32 0x021b080c 0x0013001b
-wm 32 0x021b0810 0x003b0034
-wm 32 0x021b480c 0x0037004b
-wm 32 0x021b4810 0x004b0055
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b001c 0x00000000
-wm 32 0x021b0404 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x00048039
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x09408038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MDREF 0x00007800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x4350035e
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x035c0358
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x436e0376
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03770352
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x3c333436
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x35332f3b
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x37363e39
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x432f433d
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x0013001b
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x003b0034
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x0037004b
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x004b0055
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
wm 32 0x020e0010 0xf00000ff
wm 32 0x020e0018 0x007f007f
wm 32 0x020e001c 0x007f007f
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h
index 7cdf45ccea2f..8b83aeae63c0 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058.h
@@ -2,100 +2,103 @@ soc imx6
loadaddr 0x10000000
dcdofs 0x400
-wm 32 0x020e0798 0x000C0000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0588 0x00000030
-wm 32 0x020e0594 0x00000030
-wm 32 0x020e056c 0x00000030
-wm 32 0x020e0578 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e057c 0x00000030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000030
-wm 32 0x020e05a0 0x00000030
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e05a8 0x00000028
-wm 32 0x020e05b0 0x00000028
-wm 32 0x020e0524 0x00000028
-wm 32 0x020e051c 0x00000028
-wm 32 0x020e0518 0x00000028
-wm 32 0x020e050c 0x00000028
-wm 32 0x020e05b8 0x00000028
-wm 32 0x020e05c0 0x00000028
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00000028
-wm 32 0x020e0788 0x00000028
-wm 32 0x020e0794 0x00000028
-wm 32 0x020e079c 0x00000028
-wm 32 0x020e07a0 0x00000028
-wm 32 0x020e07a4 0x00000028
-wm 32 0x020e07a8 0x00000028
-wm 32 0x020e0748 0x00000028
-wm 32 0x020e05ac 0x00000028
-wm 32 0x020e05b4 0x00000028
-wm 32 0x020e0528 0x00000028
-wm 32 0x020e0520 0x00000028
-wm 32 0x020e0514 0x00000028
-wm 32 0x020e0510 0x00000028
-wm 32 0x020e05bc 0x00000028
-wm 32 0x020e05c4 0x00000028
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b080c 0x00140014
-wm 32 0x021b0810 0x00230018
-wm 32 0x021b480c 0x000A001E
-wm 32 0x021b4810 0x000A0015
-wm 32 0x021b083c 0x43080314
-wm 32 0x021b0840 0x02680300
-wm 32 0x021b483c 0x430C0318
-wm 32 0x021b4840 0x03000254
-wm 32 0x021b0848 0x3A323234
-wm 32 0x021b4848 0x3E3C3242
-wm 32 0x021b0850 0x2A2E3632
-wm 32 0x021b4850 0x3C323E34
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_GRP_B4DS 0x00000028
+wm 32 MX6_IOM_GRP_B5DS 0x00000028
+wm 32 MX6_IOM_GRP_B6DS 0x00000028
+wm 32 MX6_IOM_GRP_B7DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_IOM_DRAM_DQM4 0x00000028
+wm 32 MX6_IOM_DRAM_DQM5 0x00000028
+wm 32 MX6_IOM_DRAM_DQM6 0x00000028
+wm 32 MX6_IOM_DRAM_DQM7 0x00000028
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x00140014
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x00230018
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x000A001E
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x000A0015
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x43080314
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x02680300
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x430C0318
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03000254
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x3A323234
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x3E3C3242
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x2A2E3632
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x3C323E34
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
SETUP_MDCFG0
-wm 32 0x021b0010 0xFF328F64
-wm 32 0x021b0014 0x01FF00DB
-wm 32 0x021b0018 0x00011740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x003F1023
+wm 32 MX6_MMDC_P0_MDCFG1 0xFF328F64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DB
+wm 32 MX6_MMDC_P0_MDMISC 0x00011740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x003F1023
SETUP_MDASP_MDCTL
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x00048039
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x09408038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0020 0x00007800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x00048039
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x09408038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MDREF 0x00007800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
wm 32 0x020e0010 0xf00000ff
wm 32 0x020e0018 0x007F007F
wm 32 0x020e001c 0x007F007F
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h
index a6e4578cb17d..da4708e4e395 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pcm058dl.h
@@ -2,97 +2,100 @@ soc imx6
loadaddr 0x10000000
dcdofs 0x400
-wm 32 0x020e0774 0x000C0000
-wm 32 0x020e0754 0x00000000
-wm 32 0x020e04ac 0x00000030
-wm 32 0x020e04b0 0x00000030
-wm 32 0x020e0464 0x00000030
-wm 32 0x020e0490 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0494 0x00000030
-wm 32 0x020e04a0 0x00000000
-wm 32 0x020e04b4 0x00000030
-wm 32 0x020e04b8 0x00000030
-wm 32 0x020e04a4 0x00003000
-wm 32 0x020e04a8 0x00003000
-wm 32 0x020e076c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e04bc 0x00000028
-wm 32 0x020e04c0 0x00000028
-wm 32 0x020e04c4 0x00000028
-wm 32 0x020e04c8 0x00000028
-wm 32 0x020e04cc 0x00000028
-wm 32 0x020e04d0 0x00000028
-wm 32 0x020e04d4 0x00000028
-wm 32 0x020e04d8 0x00000028
-wm 32 0x020e0760 0x00020000
-wm 32 0x020e0764 0x00000028
-wm 32 0x020e0770 0x00000028
-wm 32 0x020e0778 0x00000028
-wm 32 0x020e077c 0x00000028
-wm 32 0x020e0780 0x00000028
-wm 32 0x020e0784 0x00000028
-wm 32 0x020e078c 0x00000028
-wm 32 0x020e0748 0x00000028
-wm 32 0x020e0470 0x00000028
-wm 32 0x020e0474 0x00000028
-wm 32 0x020e0478 0x00000028
-wm 32 0x020e047c 0x00000028
-wm 32 0x020e0480 0x00000028
-wm 32 0x020e0484 0x00000028
-wm 32 0x020e0488 0x00000028
-wm 32 0x020e048c 0x00000028
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b080c 0x0019001C
-wm 32 0x021b0810 0x00140019
-wm 32 0x021b480c 0x00030003
-wm 32 0x021b4810 0x00030010
-wm 32 0x021b083c 0x42140210
-wm 32 0x021b0840 0x02040208
-wm 32 0x021b483c 0x42040208
-wm 32 0x021b4840 0x01680178
-wm 32 0x021b0848 0x40423E3E
-wm 32 0x021b4848 0x4242443E
-wm 32 0x021b0850 0x2C2C2A30
-wm 32 0x021b4850 0x2E2A3228
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0008 0x09444040
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6dl-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_GRP_B4DS 0x00000028
+wm 32 MX6_IOM_GRP_B5DS 0x00000028
+wm 32 MX6_IOM_GRP_B6DS 0x00000028
+wm 32 MX6_IOM_GRP_B7DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_IOM_DRAM_DQM4 0x00000028
+wm 32 MX6_IOM_DRAM_DQM5 0x00000028
+wm 32 MX6_IOM_DRAM_DQM6 0x00000028
+wm 32 MX6_IOM_DRAM_DQM7 0x00000028
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x0019001C
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x00140019
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00030003
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x00030010
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x42140210
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x02040208
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x42040208
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x01680178
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x40423E3E
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x4242443E
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x2C2C2A30
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x2E2A3228
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
SETUP_MDCFG0
-wm 32 0x021b0010 0xff538f64
-wm 32 0x021b0014 0x01ff0124
-wm 32 0x021b0018 0x00091740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x003F1023
+wm 32 MX6_MMDC_P0_MDCFG1 0xff538f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff0124
+wm 32 MX6_MMDC_P0_MDMISC 0x00091740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x003F1023
SETUP_MDASP_MDCTL
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00428031
-wm 32 0x021b001c 0x00428039
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x09408038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0020 0x00007800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00428031
+wm 32 MX6_MMDC_P0_MDSCR 0x00428039
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x09408038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MDREF 0x00007800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
index 507b9c6236dc..c5ed9b759f47 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02.h
@@ -2,100 +2,103 @@ soc imx6
loadaddr 0x10000000
dcdofs 0x400
-wm 32 0x020e0798 0x000C0000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0588 0x00000030
-wm 32 0x020e0594 0x00000030
-wm 32 0x020e056c 0x00000030
-wm 32 0x020e0578 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e057c 0x00000030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000030
-wm 32 0x020e05a0 0x00000030
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e05a8 0x00000028
-wm 32 0x020e05b0 0x00000028
-wm 32 0x020e0524 0x00000028
-wm 32 0x020e051c 0x00000028
-wm 32 0x020e0518 0x00000028
-wm 32 0x020e050c 0x00000028
-wm 32 0x020e05b8 0x00000028
-wm 32 0x020e05c0 0x00000028
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00000028
-wm 32 0x020e0788 0x00000028
-wm 32 0x020e0794 0x00000028
-wm 32 0x020e079c 0x00000028
-wm 32 0x020e07a0 0x00000028
-wm 32 0x020e07a4 0x00000028
-wm 32 0x020e07a8 0x00000028
-wm 32 0x020e0748 0x00000028
-wm 32 0x020e05ac 0x00000028
-wm 32 0x020e05b4 0x00000028
-wm 32 0x020e0528 0x00000028
-wm 32 0x020e0520 0x00000028
-wm 32 0x020e0514 0x00000028
-wm 32 0x020e0510 0x00000028
-wm 32 0x020e05bc 0x00000028
-wm 32 0x020e05c4 0x00000028
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b080c 0x00110011
-wm 32 0x021b0810 0x00240024
-wm 32 0x021b480c 0x00260038
-wm 32 0x021b4810 0x002C0038
-wm 32 0x021b083c 0x03400350
-wm 32 0x021b0840 0x03440340
-wm 32 0x021b483c 0x034C0354
-wm 32 0x021b4840 0x035C033C
-wm 32 0x021b0848 0x322A2A2A
-wm 32 0x021b4848 0x302C2834
-wm 32 0x021b0850 0x34303834
-wm 32 0x021b4850 0x422A3E36
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0008 0x09444040
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_GRP_B4DS 0x00000028
+wm 32 MX6_IOM_GRP_B5DS 0x00000028
+wm 32 MX6_IOM_GRP_B6DS 0x00000028
+wm 32 MX6_IOM_GRP_B7DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_IOM_DRAM_DQM4 0x00000028
+wm 32 MX6_IOM_DRAM_DQM5 0x00000028
+wm 32 MX6_IOM_DRAM_DQM6 0x00000028
+wm 32 MX6_IOM_DRAM_DQM7 0x00000028
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x00110011
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x00240024
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00260038
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x002C0038
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x03400350
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x03440340
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x034C0354
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x035C033C
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x322A2A2A
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x302C2834
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x34303834
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x422A3E36
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
SETUP_MDCFG0
-wm 32 0x021b0010 0xff538f64
-wm 32 0x021b0014 0x01ff0124
-wm 32 0x021b0018 0x00091740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x003F1023
+wm 32 MX6_MMDC_P0_MDCFG1 0xff538f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff0124
+wm 32 MX6_MMDC_P0_MDMISC 0x00091740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x003F1023
SETUP_MDASP_MDCTL
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x00048039
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x09408038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0020 0x00007800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x00048039
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x09408038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MDREF 0x00007800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
wm 32 0x020e0010 0xf00000ff
wm 32 0x020e0018 0x007F007F
wm 32 0x020e001c 0x007F007F
diff --git a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
index 6cdf429cb160..405529ddf8ea 100644
--- a/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
+++ b/arch/arm/boards/phytec-som-imx6/flash-header-phytec-pfla02dl.h
@@ -2,97 +2,100 @@ soc imx6
loadaddr 0x10000000
dcdofs 0x400
-wm 32 0x020e0774 0x000C0000
-wm 32 0x020e0754 0x00000000
-wm 32 0x020e04ac 0x00000030
-wm 32 0x020e04b0 0x00000030
-wm 32 0x020e0464 0x00000030
-wm 32 0x020e0490 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0494 0x00000030
-wm 32 0x020e04a0 0x00000000
-wm 32 0x020e04b4 0x00000030
-wm 32 0x020e04b8 0x00000030
-wm 32 0x020e04a4 0x00003000
-wm 32 0x020e04a8 0x00003000
-wm 32 0x020e076c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e04bc 0x00000028
-wm 32 0x020e04c0 0x00000028
-wm 32 0x020e04c4 0x00000028
-wm 32 0x020e04c8 0x00000028
-wm 32 0x020e04cc 0x00000028
-wm 32 0x020e04d0 0x00000028
-wm 32 0x020e04d4 0x00000028
-wm 32 0x020e04d8 0x00000028
-wm 32 0x020e0760 0x00020000
-wm 32 0x020e0764 0x00000028
-wm 32 0x020e0770 0x00000028
-wm 32 0x020e0778 0x00000028
-wm 32 0x020e077c 0x00000028
-wm 32 0x020e0780 0x00000028
-wm 32 0x020e0784 0x00000028
-wm 32 0x020e078c 0x00000028
-wm 32 0x020e0748 0x00000028
-wm 32 0x020e0470 0x00000028
-wm 32 0x020e0474 0x00000028
-wm 32 0x020e0478 0x00000028
-wm 32 0x020e047c 0x00000028
-wm 32 0x020e0480 0x00000028
-wm 32 0x020e0484 0x00000028
-wm 32 0x020e0488 0x00000028
-wm 32 0x020e048c 0x00000028
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b080c 0x00110011
-wm 32 0x021b0810 0x00240024
-wm 32 0x021b480c 0x00260038
-wm 32 0x021b4810 0x002C0038
-wm 32 0x021b083c 0x02480248
-wm 32 0x021b0840 0x022f022d
-wm 32 0x021b483c 0x02540258
-wm 32 0x021b4840 0x0236021e
-wm 32 0x021b0848 0x332f3033
-wm 32 0x021b4848 0x302d2c35
-wm 32 0x021b0850 0x3030362a
-wm 32 0x021b4850 0x3423372d
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0008 0x09444040
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6dl-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_GRP_B4DS 0x00000028
+wm 32 MX6_IOM_GRP_B5DS 0x00000028
+wm 32 MX6_IOM_GRP_B6DS 0x00000028
+wm 32 MX6_IOM_GRP_B7DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_IOM_DRAM_DQM4 0x00000028
+wm 32 MX6_IOM_DRAM_DQM5 0x00000028
+wm 32 MX6_IOM_DRAM_DQM6 0x00000028
+wm 32 MX6_IOM_DRAM_DQM7 0x00000028
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x00110011
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x00240024
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00260038
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x002C0038
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x02480248
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x022f022d
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x02540258
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x0236021e
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x332f3033
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x302d2c35
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3030362a
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x3423372d
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
SETUP_MDCFG0
-wm 32 0x021b0010 0xff538f64
-wm 32 0x021b0014 0x01ff0124
-wm 32 0x021b0018 0x00091740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x003F1023
+wm 32 MX6_MMDC_P0_MDCFG1 0xff538f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff0124
+wm 32 MX6_MMDC_P0_MDMISC 0x00091740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x003F1023
SETUP_MDASP_MDCTL
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00428031
-wm 32 0x021b001c 0x00428039
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x09408038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0020 0x00007800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00428031
+wm 32 MX6_MMDC_P0_MDSCR 0x00428039
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x09408038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MDREF 0x00007800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/tqma6x/flash-header-tqma6dl.imxcfg b/arch/arm/boards/tqma6x/flash-header-tqma6dl.imxcfg
index 614b7a3da0e7..192ebda743fd 100644
--- a/arch/arm/boards/tqma6x/flash-header-tqma6dl.imxcfg
+++ b/arch/arm/boards/tqma6x/flash-header-tqma6dl.imxcfg
@@ -1,92 +1,96 @@
soc imx6
loadaddr 0x20000000
dcdofs 0x400
-wm 32 0x020e04bc 0x00000030
-wm 32 0x020e04c0 0x00000030
-wm 32 0x020e04c4 0x00000030
-wm 32 0x020e04c8 0x00000030
-wm 32 0x020e04cc 0x00000030
-wm 32 0x020e04d0 0x00000030
-wm 32 0x020e04d4 0x00000030
-wm 32 0x020e04d8 0x00000030
-wm 32 0x020e0764 0x00000030
-wm 32 0x020e0770 0x00000030
-wm 32 0x020e0778 0x00000030
-wm 32 0x020e077c 0x00000030
-wm 32 0x020e0780 0x00000030
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e076c 0x00000030
-wm 32 0x020e0470 0x00020030
-wm 32 0x020e0474 0x00020030
-wm 32 0x020e0478 0x00020030
-wm 32 0x020e047c 0x00020030
-wm 32 0x020e0480 0x00020030
-wm 32 0x020e0484 0x00020030
-wm 32 0x020e0488 0x00020030
-wm 32 0x020e048c 0x00020030
-wm 32 0x020e0464 0x00020030
-wm 32 0x020e0490 0x00020030
-wm 32 0x020e04ac 0x00020030
-wm 32 0x020e04b0 0x00020030
-wm 32 0x020e0494 0x000e0030
-wm 32 0x020e04a4 0x00003000
-wm 32 0x020e04a8 0x00003000
-wm 32 0x020e04b4 0x00003030
-wm 32 0x020e04b8 0x00003030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0760 0x00020000
-wm 32 0x020e0754 0x00000000
-wm 32 0x020e04a0 0x00000000
-wm 32 0x020e0774 0x000C0000
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b0018 0x00081740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b0004 0x0002002D
-wm 32 0x021b000c 0x40435323
-wm 32 0x021b0010 0xB66E8D63
-wm 32 0x021b0014 0x01FF00DB
-wm 32 0x021b002c 0x000026D2
-wm 32 0x021b0030 0x00431023
-wm 32 0x021b0008 0x00333030
-wm 32 0x021b0004 0x0002556D
-wm 32 0x021b0040 0x00000017
-wm 32 0x021b0000 0x83190000
-wm 32 0x021b001c 0x04008032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x13208030
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xA1390003
-wm 32 0x021b4800 0xA1390003
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00022227
-wm 32 0x021b4818 0x00022227
-wm 32 0x021b083c 0x42350231
-wm 32 0x021b483c 0x42350231
-wm 32 0x021b0840 0x021A0218
-wm 32 0x021b4840 0x021A0218
-wm 32 0x021b0848 0x4B4B4E49
-wm 32 0x021b4848 0x4B4B4E49
-wm 32 0x021b0850 0x3F3F3035
-wm 32 0x021b4850 0x3F3F3035
-wm 32 0x021b080c 0x0040003C
-wm 32 0x021b0810 0x0032003E
-wm 32 0x021b480c 0x0040003C
-wm 32 0x021b4810 0x0032003E
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b001c 0x00000000
-wm 32 0x021b0404 0x00011006
+
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6dl-ddr-regs.h>
+
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x000e0030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MDMISC 0x00081740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDPDC 0x0002002D
+wm 32 MX6_MMDC_P0_MDCFG0 0x40435323
+wm 32 MX6_MMDC_P0_MDCFG1 0xB66E8D63
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DB
+wm 32 MX6_MMDC_P0_MDRWD 0x000026D2
+wm 32 MX6_MMDC_P0_MDOR 0x00431023
+wm 32 MX6_MMDC_P0_MDOTC 0x00333030
+wm 32 MX6_MMDC_P0_MDPDC 0x0002556D
+wm 32 MX6_MMDC_P0_MDASP 0x00000017
+wm 32 MX6_MMDC_P0_MDCTL 0x83190000
+wm 32 MX6_MMDC_P0_MDSCR 0x04008032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x13208030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xA1390003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xA1390003
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x42350231
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x42350231
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x021A0218
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x021A0218
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4B4B4E49
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x4B4B4E49
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3F3F3035
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x3F3F3035
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x0040003C
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x0032003E
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x0040003C
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x0032003E
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
wm 32 0x020C4068 0x00C03F3F
wm 32 0x020C406c 0x0030FC03
wm 32 0x020C4070 0x0FFFC000
diff --git a/arch/arm/boards/tqma6x/flash-header-tqma6q.imxcfg b/arch/arm/boards/tqma6x/flash-header-tqma6q.imxcfg
index 43197766456f..1fd75a24b2bc 100644
--- a/arch/arm/boards/tqma6x/flash-header-tqma6q.imxcfg
+++ b/arch/arm/boards/tqma6x/flash-header-tqma6q.imxcfg
@@ -2,96 +2,99 @@ soc imx6
loadaddr 0x20000000
dcdofs 0x400
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05c4 0x00020030
-wm 32 0x020e056c 0x00020030
-wm 32 0x020e0578 0x00020030
-wm 32 0x020e0588 0x00020030
-wm 32 0x020e0594 0x00020030
-wm 32 0x020e057c 0x00020030
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00003030
-wm 32 0x020e05a0 0x00003030
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0798 0x000c0000
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b0018 0x00081740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b000c 0x555a7974
-wm 32 0x021b0010 0xdb538f64
-wm 32 0x021b0014 0x01ff00db
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x005a1023
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x831a0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x0408803a
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x0000803b
-wm 32 0x021b001c 0x00428031
-wm 32 0x021b001c 0x00428039
-wm 32 0x021b001c 0x19308030
-wm 32 0x021b001c 0x19308038
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b001c 0x04008048
-wm 32 0x021b0800 0xa1380003
-wm 32 0x021b4800 0xa1380003
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00022227
-wm 32 0x021b4818 0x00022227
-wm 32 0x021b083c 0x434b0350
-wm 32 0x021b0840 0x034c0359
-wm 32 0x021b483c 0x434b0350
-wm 32 0x021b4840 0x03650348
-wm 32 0x021b0848 0x4436383b
-wm 32 0x021b4848 0x39393341
-wm 32 0x021b0850 0x35373933
-wm 32 0x021b4850 0x48254a36
-wm 32 0x021b080c 0x001f001f
-wm 32 0x021b0810 0x001f001f
-wm 32 0x021b480c 0x00440044
-wm 32 0x021b4810 0x00440044
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b001c 0x00000000
-wm 32 0x021b0404 0x00011006
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MDMISC 0x00081740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDCFG0 0x555a7974
+wm 32 MX6_MMDC_P0_MDCFG1 0xdb538f64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01ff00db
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x005a1023
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x831a0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x0408803a
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x0000803b
+wm 32 MX6_MMDC_P0_MDSCR 0x00428031
+wm 32 MX6_MMDC_P0_MDSCR 0x00428039
+wm 32 MX6_MMDC_P0_MDSCR 0x19308030
+wm 32 MX6_MMDC_P0_MDSCR 0x19308038
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x04008048
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xa1380003
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x434b0350
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x034c0359
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x434b0350
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03650348
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4436383b
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x39393341
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x35373933
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x48254a36
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001f001f
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001f001f
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00440044
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x00440044
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
wm 32 0x020c4068 0x00c03f3f
wm 32 0x020c406c 0x0030fc03
wm 32 0x020c4070 0x0fffc000
diff --git a/arch/arm/boards/udoo/flash-header-mx6-udoo.imxcfg b/arch/arm/boards/udoo/flash-header-mx6-udoo.imxcfg
index b142f59aab83..a0647a71a8cc 100644
--- a/arch/arm/boards/udoo/flash-header-mx6-udoo.imxcfg
+++ b/arch/arm/boards/udoo/flash-header-mx6-udoo.imxcfg
@@ -2,103 +2,105 @@ soc imx6
loadaddr 0x20000000
dcdofs 0x400
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
/* MX6_IOM_DRAM_SDQS0 -> MX6_IOM_DRAM_SDQS7 */
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
/********************************************/
/* MX6_IOM_DRAM_DQM0 -> MX6_IOM_DRAM_DQM7 */
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05c4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
/******************************************/
-wm 32 0x020e056c 0x00020030 /* MX6_IOM_DRAM_CAS */
-wm 32 0x020e0578 0x00020030 /* MX6_IOM_DRAM_RAS */
-wm 32 0x020e0588 0x00020030 /* MX6_IOM_DRAM_SDCLK_0 */
-wm 32 0x020e0594 0x00020030 /* MX6_IOM_DRAM_SDCLK_1 */
-wm 32 0x020e057c 0x00020030 /* MX6_IOM_DRAM_RESET */
-wm 32 0x020e0590 0x00003000
-wm 32 0x020e0598 0x00003000
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00003030
-wm 32 0x020e05a0 0x00003030
+wm 32 MX6_IOM_DRAM_CAS 0x00020030 /* MX6_IOM_DRAM_CAS */
+wm 32 MX6_IOM_DRAM_RAS 0x00020030 /* MX6_IOM_DRAM_RAS */
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030 /* MX6_IOM_DRAM_SDCLK_0 */
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030 /* MX6_IOM_DRAM_SDCLK_1 */
+wm 32 MX6_IOM_DRAM_RESET 0x00020030 /* MX6_IOM_DRAM_RESET */
+wm 32 MX6_IOM_DRAM_SDCKE0 0x00003000
+wm 32 MX6_IOM_DRAM_SDCKE1 0x00003000
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00003030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00003030
/* MX6_IOM_GRP_B0DS -> MX6_IOM_GRP_B7DS */
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
/***************************************/
-wm 32 0x020e074c 0x00000030 /* MX6_IOM_GRP_ADDDS */
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e078c 0x00000030 /* MX6_IOM_GRP_CTLDS */
-wm 32 0x020e0798 0x000c0000
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030 /* MX6_IOM_GRP_ADDDS */
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030 /* MX6_IOM_GRP_CTLDS */
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000c0000
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b000c 0x54597955
-wm 32 0x021b0010 0xFF328F64
-wm 32 0x021b0014 0x01FF00DB
-wm 32 0x021b0018 0x00001740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026D2
-wm 32 0x021b0030 0x00591023
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x831A0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0800 0xA1380003
-wm 32 0x021b4800 0xA1380003
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b083c 0x43510360
-wm 32 0x021b0840 0x0342033F
-wm 32 0x021b483c 0x033F033F
-wm 32 0x021b4840 0x03290266
-wm 32 0x021b0848 0x4B3E4141
-wm 32 0x021b4848 0x47413B4A
-wm 32 0x021b0850 0x42404843
-wm 32 0x021b4850 0x4C3F4C45
-wm 32 0x021b080c 0x00350035
-wm 32 0x021b0810 0x001F001F
-wm 32 0x021b480c 0x00010001
-wm 32 0x021b4810 0x00010001
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDCFG0 0x54597955
+wm 32 MX6_MMDC_P0_MDCFG1 0xFF328F64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DB
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026D2
+wm 32 MX6_MMDC_P0_MDOR 0x00591023
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x831A0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xA1380003
+wm 32 MX6_MMDC_P1_MPZQHWCTRL 0xA1380003
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x43510360
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x0342033F
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x033F033F
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03290266
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4B3E4141
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x47413B4A
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x42404843
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x4C3F4C45
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x00350035
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001F001F
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x00010001
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x00010001
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/variscite-mx6/flash-header-variscite.imxcfg b/arch/arm/boards/variscite-mx6/flash-header-variscite.imxcfg
index ed2105792e33..2c82f2316f93 100644
--- a/arch/arm/boards/variscite-mx6/flash-header-variscite.imxcfg
+++ b/arch/arm/boards/variscite-mx6/flash-header-variscite.imxcfg
@@ -1,86 +1,90 @@
loadaddr 0x10000000
soc imx6
dcdofs 0x400
-wm 32 0x020e0798 0x000C0000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0588 0x00000030
-wm 32 0x020e0594 0x00000030
-wm 32 0x020e056c 0x00000030
-wm 32 0x020e0578 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e057c 0x00000030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000030
-wm 32 0x020e05a0 0x00000030
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e05a8 0x00000030
-wm 32 0x020e05b0 0x00000030
-wm 32 0x020e0524 0x00000030
-wm 32 0x020e051c 0x00000030
-wm 32 0x020e0518 0x00000030
-wm 32 0x020e050c 0x00000030
-wm 32 0x020e05b8 0x00000030
-wm 32 0x020e05c0 0x00000030
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00000030
-wm 32 0x020e0788 0x00000030
-wm 32 0x020e0794 0x00000030
-wm 32 0x020e079c 0x00000030
-wm 32 0x020e07a0 0x00000030
-wm 32 0x020e07a4 0x00000030
-wm 32 0x020e07a8 0x00000030
-wm 32 0x020e0748 0x00000030
-wm 32 0x020e05ac 0x00000030
-wm 32 0x020e05b4 0x00000030
-wm 32 0x020e0528 0x00000030
-wm 32 0x020e0520 0x00000030
-wm 32 0x020e0514 0x00000030
-wm 32 0x020e0510 0x00000030
-wm 32 0x020e05bc 0x00000030
-wm 32 0x020e05c4 0x00000030
-wm 32 0x021b0800 0xA1390003
-wm 32 0x021b080c 0x001F001F
-wm 32 0x021b0810 0x001F001F
-wm 32 0x021b480c 0x001F001F
-wm 32 0x021b4810 0x001F001F
-wm 32 0x021b083c 0x4333033F
-wm 32 0x021b0840 0x032C031D
-wm 32 0x021b483c 0x43200332
-wm 32 0x021b4840 0x031A026A
-wm 32 0x021b0848 0x4D464746
-wm 32 0x021b4848 0x47453F4D
-wm 32 0x021b0850 0x3E434440
-wm 32 0x021b4850 0x47384839
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b000c 0x555A7975
-wm 32 0x021b0010 0xFF538F64
-wm 32 0x021b0014 0x01FF00DB
-wm 32 0x021b0018 0x00001740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026D2
-wm 32 0x021b0030 0x005A1023
-wm 32 0x021b0040 0x00000027
-wm 32 0x021b0000 0x831A0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000030
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000030
+wm 32 MX6_IOM_GRP_B1DS 0x00000030
+wm 32 MX6_IOM_GRP_B2DS 0x00000030
+wm 32 MX6_IOM_GRP_B3DS 0x00000030
+wm 32 MX6_IOM_GRP_B4DS 0x00000030
+wm 32 MX6_IOM_GRP_B5DS 0x00000030
+wm 32 MX6_IOM_GRP_B6DS 0x00000030
+wm 32 MX6_IOM_GRP_B7DS 0x00000030
+wm 32 MX6_IOM_DRAM_DQM0 0x00000030
+wm 32 MX6_IOM_DRAM_DQM1 0x00000030
+wm 32 MX6_IOM_DRAM_DQM2 0x00000030
+wm 32 MX6_IOM_DRAM_DQM3 0x00000030
+wm 32 MX6_IOM_DRAM_DQM4 0x00000030
+wm 32 MX6_IOM_DRAM_DQM5 0x00000030
+wm 32 MX6_IOM_DRAM_DQM6 0x00000030
+wm 32 MX6_IOM_DRAM_DQM7 0x00000030
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xA1390003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001F001F
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001F001F
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001F001F
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001F001F
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x4333033F
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x032C031D
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x43200332
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x031A026A
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x4D464746
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x47453F4D
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3E434440
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x47384839
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDCFG0 0x555A7975
+wm 32 MX6_MMDC_P0_MDCFG1 0xFF538F64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DB
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026D2
+wm 32 MX6_MMDC_P0_MDOR 0x005A1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000027
+wm 32 MX6_MMDC_P0_MDCTL 0x831A0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6q-rdu2.imxcfg b/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6q-rdu2.imxcfg
index e37db503b408..3ab35e430497 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6q-rdu2.imxcfg
+++ b/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6q-rdu2.imxcfg
@@ -2,86 +2,89 @@ loadaddr 0x10000000
soc imx6
dcdofs 0x400
-wm 32 0x020e0798 0x000C0000
-wm 32 0x020e0758 0x00000000
-wm 32 0x020e0588 0x00000030
-wm 32 0x020e0594 0x00000030
-wm 32 0x020e056c 0x00000030
-wm 32 0x020e0578 0x00000030
-wm 32 0x020e074c 0x00000030
-wm 32 0x020e057c 0x00000030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00000030
-wm 32 0x020e05a0 0x00000030
-wm 32 0x020e078c 0x00000030
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e05a8 0x00000028
-wm 32 0x020e05b0 0x00000028
-wm 32 0x020e0524 0x00000028
-wm 32 0x020e051c 0x00000028
-wm 32 0x020e0518 0x00000028
-wm 32 0x020e050c 0x00000028
-wm 32 0x020e05b8 0x00000028
-wm 32 0x020e05c0 0x00000028
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00000028
-wm 32 0x020e0788 0x00000028
-wm 32 0x020e0794 0x00000028
-wm 32 0x020e079c 0x00000028
-wm 32 0x020e07a0 0x00000028
-wm 32 0x020e07a4 0x00000028
-wm 32 0x020e07a8 0x00000028
-wm 32 0x020e0748 0x00000028
-wm 32 0x020e05ac 0x00000028
-wm 32 0x020e05b4 0x00000028
-wm 32 0x020e0528 0x00000028
-wm 32 0x020e0520 0x00000028
-wm 32 0x020e0514 0x00000028
-wm 32 0x020e0510 0x00000028
-wm 32 0x020e05bc 0x00000028
-wm 32 0x020e05c4 0x00000028
-wm 32 0x021b0800 0xa1390003
-wm 32 0x021b080c 0x001F001F
-wm 32 0x021b0810 0x001F001F
-wm 32 0x021b480c 0x001F001F
-wm 32 0x021b4810 0x001F001F
-wm 32 0x021b083c 0x43260335
-wm 32 0x021b0840 0x031A030B
-wm 32 0x021b483c 0x4323033B
-wm 32 0x021b4840 0x0323026F
-wm 32 0x021b0848 0x483D4545
-wm 32 0x021b4848 0x44433E48
-wm 32 0x021b0850 0x41444840
-wm 32 0x021b4850 0x4835483E
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b000c 0x8A8F7955
-wm 32 0x021b0010 0xFF328F64
-wm 32 0x021b0014 0x01FF00DB
-wm 32 0x021b0018 0x00001740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026d2
-wm 32 0x021b0030 0x008F1023
-wm 32 0x021b0040 0x00000047
-wm 32 0x021b0000 0x841A0000
-wm 32 0x021b001c 0x04088032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x09408030
-wm 32 0x021b001c 0x04008040
-wm 32 0x021b0020 0x00005800
-wm 32 0x021b0818 0x00011117
-wm 32 0x021b4818 0x00011117
-wm 32 0x021b0004 0x00025576
-wm 32 0x021b0404 0x00011006
-wm 32 0x021b001c 0x00000000
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00000030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00000030
+wm 32 MX6_IOM_DRAM_CAS 0x00000030
+wm 32 MX6_IOM_DRAM_RAS 0x00000030
+wm 32 MX6_IOM_GRP_ADDDS 0x00000030
+wm 32 MX6_IOM_DRAM_RESET 0x00000030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00000030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00000030
+wm 32 MX6_IOM_GRP_CTLDS 0x00000030
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS1 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS2 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS3 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS4 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS5 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS6 0x00000028
+wm 32 MX6_IOM_DRAM_SDQS7 0x00000028
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00000028
+wm 32 MX6_IOM_GRP_B1DS 0x00000028
+wm 32 MX6_IOM_GRP_B2DS 0x00000028
+wm 32 MX6_IOM_GRP_B3DS 0x00000028
+wm 32 MX6_IOM_GRP_B4DS 0x00000028
+wm 32 MX6_IOM_GRP_B5DS 0x00000028
+wm 32 MX6_IOM_GRP_B6DS 0x00000028
+wm 32 MX6_IOM_GRP_B7DS 0x00000028
+wm 32 MX6_IOM_DRAM_DQM0 0x00000028
+wm 32 MX6_IOM_DRAM_DQM1 0x00000028
+wm 32 MX6_IOM_DRAM_DQM2 0x00000028
+wm 32 MX6_IOM_DRAM_DQM3 0x00000028
+wm 32 MX6_IOM_DRAM_DQM4 0x00000028
+wm 32 MX6_IOM_DRAM_DQM5 0x00000028
+wm 32 MX6_IOM_DRAM_DQM6 0x00000028
+wm 32 MX6_IOM_DRAM_DQM7 0x00000028
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xa1390003
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x001F001F
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x001F001F
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001F001F
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001F001F
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x43260335
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x031A030B
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x4323033B
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x0323026F
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x483D4545
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x44433E48
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x41444840
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x4835483E
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDCFG0 0x8A8F7955
+wm 32 MX6_MMDC_P0_MDCFG1 0xFF328F64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DB
+wm 32 MX6_MMDC_P0_MDMISC 0x00001740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026d2
+wm 32 MX6_MMDC_P0_MDOR 0x008F1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000047
+wm 32 MX6_MMDC_P0_MDCTL 0x841A0000
+wm 32 MX6_MMDC_P0_MDSCR 0x04088032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x09408030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
+wm 32 MX6_MMDC_P0_MDREF 0x00005800
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00011117
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6qp-rdu2.imxcfg b/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6qp-rdu2.imxcfg
index 03e764b3b366..e99ab19fdf9c 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6qp-rdu2.imxcfg
+++ b/arch/arm/boards/zii-imx6q-rdu2/flash-header-imx6qp-rdu2.imxcfg
@@ -2,31 +2,34 @@ loadaddr 0x10000000
soc imx6
dcdofs 0x400
-wm 32 0x020e0798 0x000C0000
-wm 32 0x020e0758 0x00000000
-
-wm 32 0x020e0588 0x00020030
-wm 32 0x020e0594 0x00020030
-
-wm 32 0x020e056c 0x00020030
-wm 32 0x020e0578 0x00020030
-wm 32 0x020e074c 0x00020030
-
-wm 32 0x020e057c 0x00020030
-wm 32 0x020e058c 0x00000000
-wm 32 0x020e059c 0x00020030
-wm 32 0x020e05a0 0x00020030
-wm 32 0x020e078c 0x00020030
-
-wm 32 0x020e0750 0x00020000
-wm 32 0x020e05a8 0x00020030
-wm 32 0x020e05b0 0x00020030
-wm 32 0x020e0524 0x00020030
-wm 32 0x020e051c 0x00020030
-wm 32 0x020e0518 0x00020030
-wm 32 0x020e050c 0x00020030
-wm 32 0x020e05b8 0x00020030
-wm 32 0x020e05c0 0x00020030
+#include <mach/imx6-ddr-regs.h>
+#include <mach/imx6q-ddr-regs.h>
+
+wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
+wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
+
+wm 32 MX6_IOM_DRAM_SDCLK_0 0x00020030
+wm 32 MX6_IOM_DRAM_SDCLK_1 0x00020030
+
+wm 32 MX6_IOM_DRAM_CAS 0x00020030
+wm 32 MX6_IOM_DRAM_RAS 0x00020030
+wm 32 MX6_IOM_GRP_ADDDS 0x00020030
+
+wm 32 MX6_IOM_DRAM_RESET 0x00020030
+wm 32 MX6_IOM_DRAM_SDBA2 0x00000000
+wm 32 MX6_IOM_DRAM_SDODT0 0x00020030
+wm 32 MX6_IOM_DRAM_SDODT1 0x00020030
+wm 32 MX6_IOM_GRP_CTLDS 0x00020030
+
+wm 32 MX6_IOM_DDRMODE_CTL 0x00020000
+wm 32 MX6_IOM_DRAM_SDQS0 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS1 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS2 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS3 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS4 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS5 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS6 0x00020030
+wm 32 MX6_IOM_DRAM_SDQS7 0x00020030
wm 32 0x020e0534 0x00018200
wm 32 0x020e0538 0x00008000
@@ -37,75 +40,75 @@ wm 32 0x020e0548 0x00018200
wm 32 0x020e054c 0x00018200
wm 32 0x020e0550 0x00018200
-wm 32 0x020e0774 0x00020000
-wm 32 0x020e0784 0x00020030
-wm 32 0x020e0788 0x00020030
-wm 32 0x020e0794 0x00020030
-wm 32 0x020e079c 0x00020030
-wm 32 0x020e07a0 0x00020030
-wm 32 0x020e07a4 0x00020030
-wm 32 0x020e07a8 0x00020030
-wm 32 0x020e0748 0x00020030
-
-wm 32 0x020e05ac 0x00020030
-wm 32 0x020e05b4 0x00020030
-wm 32 0x020e0528 0x00020030
-wm 32 0x020e0520 0x00020030
-wm 32 0x020e0514 0x00020030
-wm 32 0x020e0510 0x00020030
-wm 32 0x020e05bc 0x00020030
-wm 32 0x020e05c4 0x00020030
-
-wm 32 0x021b001c 0x00008000
-
-wm 32 0x021b0800 0xA1390003
-
-wm 32 0x021b080c 0x002A001F
-wm 32 0x021b0810 0x002F002A
-wm 32 0x021b480c 0x001F0031
-wm 32 0x021b4810 0x001B0022
-
-wm 32 0x021b083c 0x433C0354
-wm 32 0x021b0840 0x03380330
-wm 32 0x021b483c 0x43440358
-wm 32 0x021b4840 0x03340300
-
-wm 32 0x021b0848 0x483A4040
-wm 32 0x021b4848 0x3E383648
-
-wm 32 0x021b0850 0x3C424048
-wm 32 0x021b4850 0x4C425042
-
-wm 32 0x021b081c 0x33333333
-wm 32 0x021b0820 0x33333333
-wm 32 0x021b0824 0x33333333
-wm 32 0x021b0828 0x33333333
-wm 32 0x021b481c 0x33333333
-wm 32 0x021b4820 0x33333333
-wm 32 0x021b4824 0x33333333
-wm 32 0x021b4828 0x33333333
-
-wm 32 0x021b08c0 0x24912489
-wm 32 0x021b48c0 0x24914452
-
-wm 32 0x021b08b8 0x00000800
-wm 32 0x021b48b8 0x00000800
-
-wm 32 0x021b0004 0x00020036
-wm 32 0x021b0008 0x09444040
-wm 32 0x021b000c 0x898E7955
-wm 32 0x021b0010 0xFF328F64
-wm 32 0x021b0014 0x01FF00DB
-
-wm 32 0x021b0018 0x00011740
-wm 32 0x021b001c 0x00008000
-wm 32 0x021b002c 0x000026D2
-wm 32 0x021b0030 0x008E1023
-wm 32 0x021b0040 0x00000047
-
-wm 32 0x021b0400 0x14420000
-wm 32 0x021b0000 0x841A0000
-wm 32 0x021b0890 0x00400c58
+wm 32 MX6_IOM_GRP_DDRMODE 0x00020000
+wm 32 MX6_IOM_GRP_B0DS 0x00020030
+wm 32 MX6_IOM_GRP_B1DS 0x00020030
+wm 32 MX6_IOM_GRP_B2DS 0x00020030
+wm 32 MX6_IOM_GRP_B3DS 0x00020030
+wm 32 MX6_IOM_GRP_B4DS 0x00020030
+wm 32 MX6_IOM_GRP_B5DS 0x00020030
+wm 32 MX6_IOM_GRP_B6DS 0x00020030
+wm 32 MX6_IOM_GRP_B7DS 0x00020030
+
+wm 32 MX6_IOM_DRAM_DQM0 0x00020030
+wm 32 MX6_IOM_DRAM_DQM1 0x00020030
+wm 32 MX6_IOM_DRAM_DQM2 0x00020030
+wm 32 MX6_IOM_DRAM_DQM3 0x00020030
+wm 32 MX6_IOM_DRAM_DQM4 0x00020030
+wm 32 MX6_IOM_DRAM_DQM5 0x00020030
+wm 32 MX6_IOM_DRAM_DQM6 0x00020030
+wm 32 MX6_IOM_DRAM_DQM7 0x00020030
+
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+
+wm 32 MX6_MMDC_P0_MPZQHWCTRL 0xA1390003
+
+wm 32 MX6_MMDC_P0_MPWLDECTRL0 0x002A001F
+wm 32 MX6_MMDC_P0_MPWLDECTRL1 0x002F002A
+wm 32 MX6_MMDC_P1_MPWLDECTRL0 0x001F0031
+wm 32 MX6_MMDC_P1_MPWLDECTRL1 0x001B0022
+
+wm 32 MX6_MMDC_P0_MPDGCTRL0 0x433C0354
+wm 32 MX6_MMDC_P0_MPDGCTRL1 0x03380330
+wm 32 MX6_MMDC_P1_MPDGCTRL0 0x43440358
+wm 32 MX6_MMDC_P1_MPDGCTRL1 0x03340300
+
+wm 32 MX6_MMDC_P0_MPRDDLCTL 0x483A4040
+wm 32 MX6_MMDC_P1_MPRDDLCTL 0x3E383648
+
+wm 32 MX6_MMDC_P0_MPWRDLCTL 0x3C424048
+wm 32 MX6_MMDC_P1_MPWRDLCTL 0x4C425042
+
+wm 32 MX6_MMDC_P0_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P0_MPRDDQBY3DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY0DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY1DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY2DL 0x33333333
+wm 32 MX6_MMDC_P1_MPRDDQBY3DL 0x33333333
+
+wm 32 MX6_MMDC_P0_MPDCCR 0x24912489
+wm 32 MX6_MMDC_P1_MPDCCR 0x24914452
+
+wm 32 MX6_MMDC_P0_MPMUR0 0x00000800
+wm 32 MX6_MMDC_P1_MPMUR0 0x00000800
+
+wm 32 MX6_MMDC_P0_MDPDC 0x00020036
+wm 32 MX6_MMDC_P0_MDOTC 0x09444040
+wm 32 MX6_MMDC_P0_MDCFG0 0x898E7955
+wm 32 MX6_MMDC_P0_MDCFG1 0xFF328F64
+wm 32 MX6_MMDC_P0_MDCFG2 0x01FF00DB
+
+wm 32 MX6_MMDC_P0_MDMISC 0x00011740
+wm 32 MX6_MMDC_P0_MDSCR 0x00008000
+wm 32 MX6_MMDC_P0_MDRWD 0x000026D2
+wm 32 MX6_MMDC_P0_MDOR 0x008E1023
+wm 32 MX6_MMDC_P0_MDASP 0x00000047
+
+wm 32 MX6_MMDC_P0_MAARCR 0x14420000
+wm 32 MX6_MMDC_P0_MDCTL 0x841A0000
+wm 32 MX6_MMDC_P0_MPPDCMPR2 0x00400c58
wm 32 0x00bb0008 0x00000000
wm 32 0x00bb000c 0x2891E41A
@@ -114,19 +117,19 @@ wm 32 0x00bb0014 0x00000040
wm 32 0x00bb0028 0x00000020
wm 32 0x00bb002c 0x00000020
-wm 32 0x021b001c 0x02088032
-wm 32 0x021b001c 0x00008033
-wm 32 0x021b001c 0x00048031
-wm 32 0x021b001c 0x19408030
-wm 32 0x021b001c 0x04008040
+wm 32 MX6_MMDC_P0_MDSCR 0x02088032
+wm 32 MX6_MMDC_P0_MDSCR 0x00008033
+wm 32 MX6_MMDC_P0_MDSCR 0x00048031
+wm 32 MX6_MMDC_P0_MDSCR 0x19408030
+wm 32 MX6_MMDC_P0_MDSCR 0x04008040
-wm 32 0x021b0020 0x00007800
+wm 32 MX6_MMDC_P0_MDREF 0x00007800
-wm 32 0x021b0818 0x00022227
-wm 32 0x021b4818 0x00022227
+wm 32 MX6_MMDC_P0_MPODTCTRL 0x00022227
+wm 32 MX6_MMDC_P1_MPODTCTRL 0x00022227
-wm 32 0x021b0004 0x00025576
+wm 32 MX6_MMDC_P0_MDPDC 0x00025576
-wm 32 0x021b0404 0x00011006
+wm 32 MX6_MMDC_P0_MAPSR 0x00011006
-wm 32 0x021b001c 0x00000000
+wm 32 MX6_MMDC_P0_MDSCR 0x00000000
diff --git a/arch/arm/mach-imx/include/mach/imx6-ddr-regs.h b/arch/arm/mach-imx/include/mach/imx6-ddr-regs.h
index fd1de8e074fa..39b3b55bb283 100644
--- a/arch/arm/mach-imx/include/mach/imx6-ddr-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx6-ddr-regs.h
@@ -42,6 +42,7 @@
#define MX6_MMDC_P0_MPWRDLHWCTL 0x021b0864
#define MX6_MMDC_P0_MPPDCMPR2 0x021b0890
#define MX6_MMDC_P0_MPMUR0 0x021b08b8
+#define MX6_MMDC_P0_MPDCCR 0x021b08c0
#define MX6_MMDC_P1_MDCTL 0x021b4000
#define MX6_MMDC_P1_MDPDC 0x021b4004
@@ -72,3 +73,4 @@
#define MX6_MMDC_P1_MPWRDLHWCTL 0x021b4864
#define MX6_MMDC_P1_MPPDCMPR2 0x021b4890
#define MX6_MMDC_P1_MPMUR0 0x021b48b8
+#define MX6_MMDC_P1_MPDCCR 0x021b48c0
--
2.11.0
More information about the barebox
mailing list