diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-10-21 00:29:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-10-21 00:29:32 +0200 |
| commit | 07dd6eb040a4a09110b2cc084b51893f234c1b57 (patch) | |
| tree | 77a40d1bbd28109634d4fd57b62f9a6691fd4a20 /board | |
| parent | b407f1a4b60fceeae04e23d38f2fae153266652c (diff) | |
| parent | da3aad55cbde80ab6e301aafa82a2c411aa53eff (diff) | |
| download | u-boot-imx-07dd6eb040a4a09110b2cc084b51893f234c1b57.zip u-boot-imx-07dd6eb040a4a09110b2cc084b51893f234c1b57.tar.gz u-boot-imx-07dd6eb040a4a09110b2cc084b51893f234c1b57.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group
Diffstat (limited to 'board')
| -rw-r--r-- | board/tqm8xx/tqm8xx.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/board/tqm8xx/tqm8xx.c b/board/tqm8xx/tqm8xx.c index 6b206f8..cebdcc0 100644 --- a/board/tqm8xx/tqm8xx.c +++ b/board/tqm8xx/tqm8xx.c @@ -354,6 +354,8 @@ long int initdram (int board_type) udelay (10000); #ifdef CONFIG_CAN_DRIVER + /* UPM initialization for CAN @ CLKOUT <= 66 MHz */ + /* Initialize OR3 / BR3 */ memctl->memc_or3 = CFG_OR3_CAN; memctl->memc_br3 = CFG_BR3_CAN; @@ -362,7 +364,7 @@ long int initdram (int board_type) memctl->memc_mbmr = MBMR_GPL_B4DIS; /* GPL_B4 ouput line Disable */ /* Initialize UPMB for CAN: single read */ - memctl->memc_mdr = 0xFFFFC004; + memctl->memc_mdr = 0xFFFFCC04; memctl->memc_mcr = 0x0100 | UPMB; memctl->memc_mdr = 0x0FFFD004; @@ -374,23 +376,23 @@ long int initdram (int board_type) memctl->memc_mdr = 0x3FFFC004; memctl->memc_mcr = 0x0103 | UPMB; - memctl->memc_mdr = 0xFFFFDC05; + memctl->memc_mdr = 0xFFFFDC07; memctl->memc_mcr = 0x0104 | UPMB; /* Initialize UPMB for CAN: single write */ - memctl->memc_mdr = 0xFFFCC004; + memctl->memc_mdr = 0xFFFCCC04; memctl->memc_mcr = 0x0118 | UPMB; - memctl->memc_mdr = 0xCFFCD004; + memctl->memc_mdr = 0xCFFCDC04; memctl->memc_mcr = 0x0119 | UPMB; - memctl->memc_mdr = 0x0FFCC000; + memctl->memc_mdr = 0x3FFCC000; memctl->memc_mcr = 0x011A | UPMB; - memctl->memc_mdr = 0x7FFCC004; + memctl->memc_mdr = 0xFFFCC004; memctl->memc_mcr = 0x011B | UPMB; - memctl->memc_mdr = 0xFFFDCC05; + memctl->memc_mdr = 0xFFFDC405; memctl->memc_mcr = 0x011C | UPMB; #endif /* CONFIG_CAN_DRIVER */ |