diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-22 22:51:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-22 22:51:32 +0100 |
| commit | cea221116aa305dbf43625513a1210b89116262b (patch) | |
| tree | f9dbc5ccf72b7003104e6b61e09a82153cbb69aa /board/davinci/sonata/sonata.c | |
| parent | 68a41f2e98b6866d679698cf2b5e81b3627a2d75 (diff) | |
| parent | 9d34d0a0c12266d80e7b3ab3cbdafc3d81a01832 (diff) | |
| download | u-boot-imx-cea221116aa305dbf43625513a1210b89116262b.zip u-boot-imx-cea221116aa305dbf43625513a1210b89116262b.tar.gz u-boot-imx-cea221116aa305dbf43625513a1210b89116262b.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/davinci/sonata/sonata.c')
| -rw-r--r-- | board/davinci/sonata/sonata.c | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/board/davinci/sonata/sonata.c b/board/davinci/sonata/sonata.c index 6de9356..d56b443 100644 --- a/board/davinci/sonata/sonata.c +++ b/board/davinci/sonata/sonata.c @@ -26,7 +26,6 @@ #include <common.h> #include <asm/arch/hardware.h> -#include <asm/arch/emac_defs.h> #include "../common/psc.h" #include "../common/misc.h" @@ -40,16 +39,13 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR; - /* Workaround for TMS320DM6446 errata 1.3.22 */ - REG(PSC_SILVER_BULLET) = 0; + /* Configure AEMIF pins (although this should be configured at boot time + * with pull-up/pull-down resistors) */ + REG(PINMUX0) = 0x00000c1f; + + davinci_errata_workarounds(); /* Power on required peripherals */ - lpsc_on(DAVINCI_LPSC_EMAC); - lpsc_on(DAVINCI_LPSC_EMAC_WRAPPER); - lpsc_on(DAVINCI_LPSC_MDIO); - lpsc_on(DAVINCI_LPSC_I2C); - lpsc_on(DAVINCI_LPSC_UART0); - lpsc_on(DAVINCI_LPSC_TIMER1); lpsc_on(DAVINCI_LPSC_GPIO); #if !defined(CONFIG_SYS_USE_DSPLINK) @@ -57,24 +53,11 @@ int board_init(void) dsp_on(); #endif /* CONFIG_SYS_USE_DSPLINK */ - /* Bringup UART0 out of reset */ - REG(UART0_PWREMU_MGMT) = 0x0000e003; - - /* Enable GIO3.3V cells used for EMAC */ - REG(VDD3P3V_PWDN) = 0; - - /* Enable UART0 MUX lines */ - REG(PINMUX1) |= 1; - - /* Enable EMAC and AEMIF pins */ - REG(PINMUX0) = 0x80000c1f; - - /* Enable I2C pin Mux */ - REG(PINMUX1) |= (1 << 7); - - /* Set the Bus Priority Register to appropriate value */ - REG(VBPR) = 0x20; + davinci_enable_uart0(); + davinci_enable_emac(); + davinci_enable_i2c(); + lpsc_on(DAVINCI_LPSC_TIMER1); timer_init(); return(0); |