diff options
| author | Anthony Felice <tony.felice@timesys.com> | 2013-06-21 16:54:43 -0400 |
|---|---|---|
| committer | Anthony Felice <tony.felice@timesys.com> | 2013-06-21 16:54:43 -0400 |
| commit | dfe36ad6396c4bbbd69c3acc3f55540b556c92e0 (patch) | |
| tree | 4e16d8a28ebfcdf7c13bd23176ad70ecfc1d2b22 | |
| parent | aa6377c80b0aa3b58719ae82035e62cb48789b4d (diff) | |
vybrid: Fix for 1.1 silicon (rev G and later)2011.12-mvf-201306211654
| -rw-r--r-- | board/freescale/vybrid_auto/vybrid_auto.c | 27 | ||||
| -rw-r--r-- | include/configs/vybrid_auto.h | 6 |
2 files changed, 20 insertions, 13 deletions
diff --git a/board/freescale/vybrid_auto/vybrid_auto.c b/board/freescale/vybrid_auto/vybrid_auto.c index 1dcbea4aee9..f9342d3bb43 100644 --- a/board/freescale/vybrid_auto/vybrid_auto.c +++ b/board/freescale/vybrid_auto/vybrid_auto.c @@ -46,8 +46,8 @@ struct fsl_esdhc_cfg esdhc_cfg[2] = { void setup_iomux_ddr(void) { -#define DDR_IOMUX 0x000001C0 -#define DDR_IOMUX1 0x000101C0 +#define DDR_IOMUX 0x00000140 +#define DDR_IOMUX1 0x00010140 __raw_writel(DDR_IOMUX, IOMUXC_DDR_A15); __raw_writel(DDR_IOMUX, IOMUXC_DDR_A14); __raw_writel(DDR_IOMUX, IOMUXC_DDR_A13); @@ -94,15 +94,19 @@ void setup_iomux_ddr(void) __raw_writel(DDR_IOMUX, IOMUXC_DDR_WE); __raw_writel(DDR_IOMUX, IOMUXC_DDR_ODT1); __raw_writel(DDR_IOMUX, IOMUXC_DDR_ODT0); + + __raw_writel(DDR_IOMUX, IOMUXC_DDR_DDRBYTE1); + __raw_writel(DDR_IOMUX, IOMUXC_DDR_DDRBYTE0); + } void ddr_phy_init(void) { #define PHY_DQ_TIMING 0x00002613 #define PHY_DQS_TIMING 0x00002615 -#define PHY_CTRL 0x01210080 +#define PHY_CTRL 0x01310080 #define PHY_MASTER_CTRL 0x0001012a -#define PHY_SLAVE_CTRL 0x00012020 +#define PHY_SLAVE_CTRL 0x00012320 /* phy_dq_timing_reg freq set 0 */ __raw_writel(PHY_DQ_TIMING, DDR_PHY000); @@ -134,7 +138,7 @@ void ddr_phy_init(void) __raw_writel(PHY_SLAVE_CTRL, DDR_PHY036); __raw_writel(PHY_SLAVE_CTRL, DDR_PHY052); - __raw_writel(0x00001100, DDR_PHY050); + __raw_writel(0x00001105, DDR_PHY050); } unsigned long ddr_ctrl_init(void) @@ -154,8 +158,8 @@ unsigned long ddr_ctrl_init(void) __raw_writel(0x006DB00C, DDR_CR017); /* tras_max, tmod */ __raw_writel(0x00000403, DDR_CR018); /* tckesr, tcke */ - __raw_writel(0x01000000, DDR_CR020); /* ap, writrp */ - __raw_writel(0x06050101, DDR_CR021); /* trcd_int, tras_lockout + __raw_writel(0x01000403, DDR_CR020); /* ap, writrp */ + __raw_writel(0x06060101, DDR_CR021); /* trcd_int, tras_lockout ccAP */ __raw_writel(0x000B0000, DDR_CR022); /* tdal */ __raw_writel(0x03000200, DDR_CR023); /* bstlen, tmrr, tdll */ @@ -196,8 +200,10 @@ unsigned long ddr_ctrl_init(void) */ __raw_writel(0x00000000, DDR_CR049); /* mr2 */ __raw_writel(0x00000000, DDR_CR051); /* mr3 & mrsingle_data_0 */ + __raw_writel(0x00000000, DDR_CR052); /* mr17 & mr16 */ __raw_writel(0x00000000, DDR_CR057); /* ctrl_raw */ + __raw_writel(0x00000000, DDR_CR058); /* ECC */ @@ -268,13 +274,14 @@ unsigned long ddr_ctrl_init(void) __raw_writel(0x00000B00, DDR_CR126); /* PHY rdlat */ __raw_writel(0x00000000, DDR_CR127); /* dram ck dis */ - __raw_writel(0x00003cc8, DDR_CR131); + __raw_writel(0x00000000, DDR_CR131); __raw_writel(0x00000506, DDR_CR132); /* wrlat, rdlat */ __raw_writel(0x00020000, DDR_CR137); __raw_writel(0x04070303, DDR_CR139); __raw_writel(0x00000000, DDR_CR136); +#if 0 __raw_writel(0x80000301, DDR_CR138); __raw_writel(0x0000000A, DDR_CR140); __raw_writel(0x00000000, DDR_CR141); @@ -289,8 +296,8 @@ unsigned long ddr_ctrl_init(void) __raw_writel(0x00000204, DDR_CR151); __raw_writel(0x00000000, DDR_CR152); __raw_writel(0x00000000, DDR_CR153); - - __raw_writel(0x00000000, DDR_CR154); +#endif + __raw_writel(0x68200000, DDR_CR154); __raw_writel(0x00000202, DDR_CR155); /* pad_ibe, _sel */ __raw_writel(0x00000006, DDR_CR158); /* twr */ __raw_writel(0x00000006, DDR_CR159); /* todth */ diff --git a/include/configs/vybrid_auto.h b/include/configs/vybrid_auto.h index d5ed5943486..441e9d79329 100644 --- a/include/configs/vybrid_auto.h +++ b/include/configs/vybrid_auto.h @@ -41,9 +41,9 @@ * increase in the final file size: 144260 vs. 109536 Bytes. */ -#undef CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#undef CONFIG_SETUP_MEMORY_TAGS -#undef CONFIG_INITRD_TAG +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #undef CONFIG_OF_LIBFDT |