Merge branch 'master' of git://git.denx.de/u-boot-marvell

[u-boot] / board / evb64260 / mpsc.c

diff --git a/board/evb64260/mpsc.c b/board/evb64260/mpsc.c
index 9e8bfe01c4ef6c3a176dc99bf9299ee3d010677e..f3dc20b2949e307f490ccf739c91297e13c23f6e 100644 (file)
--- a/board/evb64260/mpsc.c
+++ b/board/evb64260/mpsc.c
@@ -88,7 +88,7 @@ static void galsdma_enable_rx(void);
 
 
 /* GT64240A errata: cant read MPSC/BRG registers... so make mirrors in ram for read/modify write */
-#define MIRROR_HACK ((struct _tag_mirror_hack *)&(gd->mirror_hack))
+#define MIRROR_HACK ((struct _tag_mirror_hack *)&(gd->mirror_hack[0]))
 
 #define GT_REG_WRITE_MIRROR_G(a,d) {MIRROR_HACK->a ## _M = d; GT_REG_WRITE(a,d);}
 #define GTREGREAD_MIRROR_G(a) (MIRROR_HACK->a ## _M)
@@ -259,7 +259,7 @@ char mpsc_getchar (void)
 int
 mpsc_test_char(void)
 {
-       volatile unsigned int *p=&rx_desc_base[rx_desc_index*8];
+       volatile unsigned int *p = &rx_desc_base[rx_desc_index*8];
 
        INVALIDATE_DCACHE(&p[1], &p[2]);
 
@@ -390,7 +390,7 @@ galbrg_set_baudrate(int channel, int rate)
 
 #if defined(CONFIG_ZUMA_V2) || defined(CONFIG_P3G4)
        /* from tclk */
-       clock = (CFG_BUS_HZ/(16*rate)) - 1;
+       clock = (CONFIG_SYS_BUS_CLK/(16*rate)) - 1;
 #else
        clock = (3686400/(16*rate)) - 1;
 #endif