Skip to contentSkip to conversation

davinci: fix dm644x buglets

PATCH New David Brownell 1 participant 1 message Apr 18, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 4/5 davinci: fix dm644x buglets

From: David Brownell <[email protected]>

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.

---
 cpu/arm926ejs/davinci/dm644x.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
cpu/arm926ejs/davinci/dm644x.c +3 -1
@@ -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)
 {