Merge with /home/m8/git/u-boot

diff --git a/CHANGELOG b/CHANGELOG
index 6f5d847022101d35269df71d1a5b191796810603..ac3be077d14a6c39a3aff439695ecd6bad1e7abb 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Change port configuration for O2DNT (CODEC1 on PSC1).
+
 * Fix register for PCI async mode on PPC440EP
   Patch by Youngchul Bang, 08 Dec 2005
 

diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index d7d27e51af14ec4faf6dfc122c0336c4670a61ba..5c05a745dbb82b4555cd46783a1db95b6e44b76e 100644 (file)
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -238,7 +238,7 @@
  * GPIO configuration
  */
 /*#define CFG_GPS_PORT_CONFIG  0x10002004 */
-#define CFG_GPS_PORT_CONFIG    0x00002004      /* no CAN */
+#define CFG_GPS_PORT_CONFIG    0x00002006      /* no CAN */
 
 /*
  * Miscellaneous configurable options