muas3001: update BR4 settings

Also set up the port pins for using I2C.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c
index 0ec451fbd5515a2827dd7cc00582b164e8446711..157c72d1546359e4a3e57524cf59924efddbaaa3 100644 (file)
--- a/board/muas3001/muas3001.c
+++ b/board/muas3001/muas3001.c
@@ -163,8 +163,13 @@ const iop_conf_t iop_conf_tab[4][32] = {
        /* PD18 */ { 0,          0,   0,   0,   0,   0 }, /* PD18            */
        /* PD17 */ { 0,          0,   0,   0,   0,   0 }, /* PD17            */
        /* PD16 */ { 0,          0,   0,   0,   0,   0 }, /* PD16            */
-       /* PD15 */ { 1,          1,   1,   0,   0,   0 }, /* I2C SDA         */
-       /* PD14 */ { 1,          1,   1,   0,   0,   0 }, /* I2C SCL         */
+#if defined(CONFIG_HARD_I2C)
+       /* PD15 */ { 1,          1,   1,   0,   1,   0 }, /* I2C SDA         */
+       /* PD14 */ { 1,          1,   1,   0,   1,   0 }, /* I2C SCL         */
+#else
+       /* PD15 */ { 1,          0,   0,   0,   1,   1 }, /* PD15            */
+       /* PD14 */ { 1,          0,   0,   1,   1,   1 }, /* PD14            */
+#endif
        /* PD13 */ { 0,          0,   0,   0,   0,   0 }, /* PD13            */
        /* PD12 */ { 0,          0,   0,   0,   0,   0 }, /* PD12            */
        /* PD11 */ { 0,          0,   0,   0,   0,   0 }, /* PD11            */

diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index bc085b8b786fd9230a3be9ea0bdf3377e647d31c..a13648b6efe251fb41556fd20876b13da825918b 100644 (file)
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -395,7 +395,7 @@
 #define CFG_IO_SIZE    1
 
 #define CFG_BR4_PRELIM ((CFG_IO_BASE & BRx_BA_MSK) |\
-                        BRx_PS_32 | BRx_MS_GPCM_L | BRx_V)
+                        BRx_PS_16 | BRx_MS_GPCM_L | BRx_V)
 
 #define CFG_OR4_PRELIM (0xfff80020)