Merge branch 'master' into next

[u-boot] / board / gdsys / neo / neo.c

diff --git a/board/gdsys/neo/neo.c b/board/gdsys/neo/neo.c
index 817ce17ff1607c217bc8a1bf6bb75b92541e8d7b..a56c2cc98794d688c0fa9fb2a7f40910c35ceed6 100644 (file)
--- a/board/gdsys/neo/neo.c
+++ b/board/gdsys/neo/neo.c
@@ -31,19 +31,19 @@
 
 int board_early_init_f(void)
 {
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
-       mtdcr(uicer, 0x00000000);       /* disable all ints */
-       mtdcr(uiccr, 0x00000000);       /* set all to be non-critical */
-       mtdcr(uicpr, 0xFFFFFF80);       /* set int polarities */
-       mtdcr(uictr, 0x10000000);       /* set int trigger levels */
-       mtdcr(uicvcr, 0x00000001);      /* set vect base=0,INT0 highest prio */
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
+       mtdcr(UIC0SR, 0xFFFFFFFF);      /* clear all ints */
+       mtdcr(UIC0ER, 0x00000000);      /* disable all ints */
+       mtdcr(UIC0CR, 0x00000000);      /* set all to be non-critical */
+       mtdcr(UIC0PR, 0xFFFFFF80);      /* set int polarities */
+       mtdcr(UIC0TR, 0x10000000);      /* set int trigger levels */
+       mtdcr(UIC0VCR, 0x00000001);     /* set vect base=0,INT0 highest prio */
+       mtdcr(UIC0SR, 0xFFFFFFFF);      /* clear all ints */
 
        /*
         * EBC Configuration Register: set ready timeout to 512 ebc-clks
         * -> ca. 15 us
         */
-       mtebc(epcr, 0xa8400000);        /* ebc always driven */
+       mtebc(EBC0_CFG, 0xa8400000);    /* ebc always driven */
 
        return 0;
 }