Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wandboard: Add support for the MX6QP variant

Browse Source 
Add support for the latest MX6QP wandboard variant.

Based on Richard Hu's work from Technexion's U-Boot tree.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
master
Fabio Estevam 7 years ago committed by Stefano Babic
parent c0f432c377
commit e1f0715f64
4 changed files with 132 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      arch/arm/include/asm/arch-mx6/imx-regs.h
  2. 125
      board/wandboard/spl.c
  3. 6
      board/wandboard/wandboard.c
  4. 2
      include/configs/wandboard.h

3
arch/arm/include/asm/arch-mx6/imx-regs.h
Unescape View File

@ -346,6 +346,9 @@
#define IOMUXC_SNVS_BASE_ADDR (AIPS3_ARB_BASE_ADDR + 0x90000)
#define SNVS_GPR_BASE_ADDR (AIPS3_ARB_BASE_ADDR + 0x94000)
#endif
#define NOC_DDR_BASE_ADDR (GPV0_BASE_ADDR + 0xB0000)
/* Only for i.MX6SX */
#define LCDIF2_BASE_ADDR (AIPS3_ARB_BASE_ADDR + 0x24000)
#define MX6SX_LCDIF1_BASE_ADDR (AIPS3_ARB_BASE_ADDR + 0x20000)

125
board/wandboard/spl.c
Unescape View File

@ -32,6 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define IMX6DQ_DRIVE_STRENGTH 0x30
#define IMX6SDL_DRIVE_STRENGTH 0x28
#define IMX6QP_DRIVE_STRENGTH 0x28
/* configure MX6Q/DUAL mmdc DDR io registers */
static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = {
@ -63,6 +64,36 @@ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = {
.dram_dqm7 = IMX6DQ_DRIVE_STRENGTH,
};
/* configure MX6QP mmdc DDR io registers */
static struct mx6dq_iomux_ddr_regs mx6qp_ddr_ioregs = {
.dram_sdclk_0 = IMX6QP_DRIVE_STRENGTH,
.dram_sdclk_1 = IMX6QP_DRIVE_STRENGTH,
.dram_cas = IMX6QP_DRIVE_STRENGTH,
.dram_ras = IMX6QP_DRIVE_STRENGTH,
.dram_reset = IMX6QP_DRIVE_STRENGTH,
.dram_sdcke0 = IMX6QP_DRIVE_STRENGTH,
.dram_sdcke1 = IMX6QP_DRIVE_STRENGTH,
.dram_sdba2 = 0x00000000,
.dram_sdodt0 = IMX6QP_DRIVE_STRENGTH,
.dram_sdodt1 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs0 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs1 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs2 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs3 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs4 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs5 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs6 = IMX6QP_DRIVE_STRENGTH,
.dram_sdqs7 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm0 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm1 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm2 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm3 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm4 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm5 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm6 = IMX6QP_DRIVE_STRENGTH,
.dram_dqm7 = IMX6QP_DRIVE_STRENGTH,
};
/* configure MX6Q/DUAL mmdc GRP io registers */
static struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = {
.grp_ddr_type = 0x000c0000,
@ -81,6 +112,24 @@ static struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = {
.grp_b7ds = IMX6DQ_DRIVE_STRENGTH,
};
/* configure MX6QP mmdc GRP io registers */
static struct mx6dq_iomux_grp_regs mx6qp_grp_ioregs = {
.grp_ddr_type = 0x000c0000,
.grp_ddrmode_ctl = 0x00020000,
.grp_ddrpke = 0x00000000,
.grp_addds = IMX6QP_DRIVE_STRENGTH,
.grp_ctlds = IMX6QP_DRIVE_STRENGTH,
.grp_ddrmode = 0x00020000,
.grp_b0ds = IMX6QP_DRIVE_STRENGTH,
.grp_b1ds = IMX6QP_DRIVE_STRENGTH,
.grp_b2ds = IMX6QP_DRIVE_STRENGTH,
.grp_b3ds = IMX6QP_DRIVE_STRENGTH,
.grp_b4ds = IMX6QP_DRIVE_STRENGTH,
.grp_b5ds = IMX6QP_DRIVE_STRENGTH,
.grp_b6ds = IMX6QP_DRIVE_STRENGTH,
.grp_b7ds = IMX6QP_DRIVE_STRENGTH,
};
/* configure MX6SOLO/DUALLITE mmdc DDR io registers */
struct mx6sdl_iomux_ddr_regs mx6sdl_ddr_ioregs = {
.dram_sdclk_0 = IMX6SDL_DRIVE_STRENGTH,
@ -260,15 +309,87 @@ static void ccgr_init(void)
writel(0x00C03F3F, &ccm->CCGR0);
writel(0x0030FC03, &ccm->CCGR1);
writel(0x0FFFC000, &ccm->CCGR2);
writel(0x3FF00000, &ccm->CCGR3);
writel(0x3FF03000, &ccm->CCGR3);
writel(0x00FFF300, &ccm->CCGR4);
writel(0x0F0000C3, &ccm->CCGR5);
writel(0x000003FF, &ccm->CCGR6);
}
static void spl_dram_init_imx6qp_lpddr3(void)
{
/* MMDC0_MDSCR set the Configuration request bit during MMDC set up */
writel(0x00008000, MMDC_P0_BASE_ADDR + 0x01c);
/* Calibrations - ZQ */
writel(0xa1390003, MMDC_P0_BASE_ADDR + 0x800);
/* write leveling */
writel(0x00060004, MMDC_P0_BASE_ADDR + 0x80c);
writel(0x000B0004, MMDC_P0_BASE_ADDR + 0x810);
writel(0x00000004, MMDC_P1_BASE_ADDR + 0x80c);
writel(0x00000000, MMDC_P1_BASE_ADDR + 0x810);
/*
* DQS gating, read delay, write delay calibration values
* based on calibration compare of 0x00ffff00
*/
writel(0x03040314, MMDC_P0_BASE_ADDR + 0x83c);
writel(0x03080300, MMDC_P0_BASE_ADDR + 0x840);
writel(0x03000310, MMDC_P1_BASE_ADDR + 0x83c);
writel(0x0268023C, MMDC_P1_BASE_ADDR + 0x840);
writel(0x4034363A, MMDC_P0_BASE_ADDR + 0x848);
writel(0x36302C3C, MMDC_P1_BASE_ADDR + 0x848);
writel(0x3E3E4046, MMDC_P0_BASE_ADDR + 0x850);
writel(0x483A4844, MMDC_P1_BASE_ADDR + 0x850);
writel(0x33333333, MMDC_P0_BASE_ADDR + 0x81c);
writel(0x33333333, MMDC_P0_BASE_ADDR + 0x820);
writel(0x33333333, MMDC_P0_BASE_ADDR + 0x824);
writel(0x33333333, MMDC_P0_BASE_ADDR + 0x828);
writel(0x33333333, MMDC_P1_BASE_ADDR + 0x81c);
writel(0x33333333, MMDC_P1_BASE_ADDR + 0x820);
writel(0x33333333, MMDC_P1_BASE_ADDR + 0x824);
writel(0x33333333, MMDC_P1_BASE_ADDR + 0x828);
writel(0x24912489, MMDC_P0_BASE_ADDR + 0x8c0);
writel(0x24914452, MMDC_P1_BASE_ADDR + 0x8c0);
writel(0x00000800, MMDC_P0_BASE_ADDR + 0x8b8);
writel(0x00000800, MMDC_P1_BASE_ADDR + 0x8b8);
/* MMDC init: in DDR3, 64-bit mode, only MMDC0 is initiated */
writel(0x00020036, MMDC_P0_BASE_ADDR + 0x004);
writel(0x09444040, MMDC_P0_BASE_ADDR + 0x008);
writel(0x898E79A4, MMDC_P0_BASE_ADDR + 0x00c);
writel(0xDB538F64, MMDC_P0_BASE_ADDR + 0x010);
writel(0x01FF00DD, MMDC_P0_BASE_ADDR + 0x014);
writel(0x00011740, MMDC_P0_BASE_ADDR + 0x018);
writel(0x00008000, MMDC_P0_BASE_ADDR + 0x01c);
writel(0x000026D2, MMDC_P0_BASE_ADDR + 0x02c);
writel(0x008E1023, MMDC_P0_BASE_ADDR + 0x030);
writel(0x00000047, MMDC_P0_BASE_ADDR + 0x040);
writel(0x14420000, MMDC_P0_BASE_ADDR + 0x400);
writel(0x841A0000, MMDC_P0_BASE_ADDR + 0x000);
writel(0x00400c58, MMDC_P0_BASE_ADDR + 0x890);
/* add NOC DDR configuration */
writel(0x00000000, NOC_DDR_BASE_ADDR + 0x008);
writel(0x2871C39B, NOC_DDR_BASE_ADDR + 0x00c);
writel(0x000005B4, NOC_DDR_BASE_ADDR + 0x038);
writel(0x00000040, NOC_DDR_BASE_ADDR + 0x014);
writel(0x00000020, NOC_DDR_BASE_ADDR + 0x028);
writel(0x00000020, NOC_DDR_BASE_ADDR + 0x02c);
writel(0x02088032, MMDC_P0_BASE_ADDR + 0x01c);
writel(0x00008033, MMDC_P0_BASE_ADDR + 0x01c);
writel(0x00048031, MMDC_P0_BASE_ADDR + 0x01c);
writel(0x19308030, MMDC_P0_BASE_ADDR + 0x01c);
writel(0x04008040, MMDC_P0_BASE_ADDR + 0x01c);
writel(0x00007800, MMDC_P0_BASE_ADDR + 0x020);
writel(0x00022227, MMDC_P0_BASE_ADDR + 0x818);
writel(0x00022227, MMDC_P1_BASE_ADDR + 0x818);
writel(0x00025576, MMDC_P0_BASE_ADDR + 0x004);
writel(0x00011006, MMDC_P0_BASE_ADDR + 0x404);
writel(0x00000000, MMDC_P0_BASE_ADDR + 0x01c);
}
static void spl_dram_init(void)
{
if (is_cpu_type(MXC_CPU_MX6SOLO)) {
if (is_mx6dqp()) {
mx6dq_dram_iocfg(64, &mx6qp_ddr_ioregs, &mx6qp_grp_ioregs);
spl_dram_init_imx6qp_lpddr3();
} else if (is_cpu_type(MXC_CPU_MX6SOLO)) {
mx6sdl_dram_iocfg(32, &mx6sdl_ddr_ioregs, &mx6sdl_grp_ioregs);
mx6_dram_cfg(&mem_s, &mx6s_512m_mmdc_calib, &h5tq2g63dfr);
} else if (is_cpu_type(MXC_CPU_MX6DL)) {

6
board/wandboard/wandboard.c
Unescape View File

@ -512,7 +512,9 @@ int board_late_init(void)
#endif
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
if (is_mx6dq())
if (is_mx6dqp())
env_set("board_rev", "MX6QP");
else if (is_mx6dq())
env_set("board_rev", "MX6Q");
else
env_set("board_rev", "MX6DL");
@ -534,7 +536,7 @@ int board_init(void)
#if defined(CONFIG_VIDEO_IPUV3)
setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
if (is_mx6dq()) {
if (is_mx6dq() || is_mx6dqp()) {
setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c2_pad_info);
setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c3_pad_info);
} else {

2
include/configs/wandboard.h
Unescape View File

@ -109,6 +109,8 @@
"fi; " \
"fi\0" \
"findfdt="\
"if test $board_name = D1 && test $board_rev = MX6QP ; then " \
"setenv fdtfile imx6qp-wandboard-revd1.dtb; fi; " \
"if test $board_name = D1 && test $board_rev = MX6Q ; then " \
"setenv fdtfile imx6q-wandboard-revd1.dtb; fi; " \
"if test $board_name = D1 && test $board_rev = MX6DL ; then " \

Write Preview
Loading…
Cancel
Save