diff options
author | Aubrey Li <aubrey.adi@gmail.com> | 2007-03-19 23:01:15 +0800 |
---|---|---|
committer | Aubrey Li <aubrey.adi@gmail.com> | 2007-03-19 23:01:15 +0800 |
commit | a20e7106928a284a6d14c066c54b72e552075b06 (patch) | |
tree | e3dde666da99073732b97778e030d1beb0e75c09 /board | |
parent | a6154fd1cfd020f6da8527e0365b1020a11a71d0 (diff) | |
parent | cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 (diff) | |
download | u-boot-imx-a20e7106928a284a6d14c066c54b72e552075b06.zip u-boot-imx-a20e7106928a284a6d14c066c54b72e552075b06.tar.gz u-boot-imx-a20e7106928a284a6d14c066c54b72e552075b06.tar.bz2 |
Merge http://www.denx.de/git/u-boot
Diffstat (limited to 'board')
-rw-r--r-- | board/amcc/sequoia/sequoia.c | 4 | ||||
-rw-r--r-- | board/esd/plu405/plu405.c | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index b2b82c7..daaffe0 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -336,6 +336,10 @@ int misc_init_r(void) } #endif /* CONFIG_440EPX */ + mfsdr(SDR0_SRST1, reg); /* enable security/kasumi engines */ + reg &= ~(SDR0_SRST1_CRYP0 | SDR0_SRST1_KASU0); + mtsdr(SDR0_SRST1, reg); + /* * Clear PLB4A0_ACR[WRP] * This fix will make the MAL burst disabling patch for the Linux diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index 37b92fb..59171f8 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -215,12 +215,6 @@ int checkboard (void) } putc ('\n'); - - /* - * Disable sleep mode in LXT971 - */ - lxt971_no_sleep(); - return 0; } @@ -292,3 +286,14 @@ void board_auto_update_show(int au_active) } } #endif + +void reset_phy(void) +{ +#ifdef CONFIG_LXT971_NO_SLEEP + + /* + * Disable sleep mode in LXT971 + */ + lxt971_no_sleep(); +#endif +} |