diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-05-15 23:44:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-06-12 20:39:48 +0200 |
| commit | bd36fdc146654f9de4e2ad346126e6bd2990fb19 (patch) | |
| tree | 97a6bf3fe3c4882062272c9cc3dd9d76933a5d54 | |
| parent | f79043681ff44bae435c06f830e51e1546db7e19 (diff) | |
| download | u-boot-imx-bd36fdc146654f9de4e2ad346126e6bd2990fb19.zip u-boot-imx-bd36fdc146654f9de4e2ad346126e6bd2990fb19.tar.gz u-boot-imx-bd36fdc146654f9de4e2ad346126e6bd2990fb19.tar.bz2 | |
davinci: fix dm644x buglets
Fix two buglets in the dm644x support: don't set two must-be-zero
bits in the UART management register; and only include the I2C hooks
if the I2C driver is being included.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
| -rw-r--r-- | cpu/arm926ejs/davinci/dm644x.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/arm926ejs/davinci/dm644x.c b/cpu/arm926ejs/davinci/dm644x.c index df382bd..bb105b5 100644 --- a/cpu/arm926ejs/davinci/dm644x.c +++ b/cpu/arm926ejs/davinci/dm644x.c @@ -41,7 +41,7 @@ void davinci_enable_uart0(void) lpsc_on(DAVINCI_LPSC_UART0); /* Bringup UART0 out of reset */ - REG(UART0_PWREMU_MGMT) = 0x0000e003; + REG(UART0_PWREMU_MGMT) = 0x00006001; /* Enable UART0 MUX lines */ REG(PINMUX1) |= PINMUX1_UART0; @@ -62,6 +62,7 @@ void davinci_enable_emac(void) } #endif +#ifdef CONFIG_DRIVER_DAVINCI_I2C void davinci_enable_i2c(void) { lpsc_on(DAVINCI_LPSC_I2C); @@ -69,6 +70,7 @@ void davinci_enable_i2c(void) /* Enable I2C pin Mux */ REG(PINMUX1) |= PINMUX1_I2C; } +#endif void davinci_errata_workarounds(void) { |