Merge branch 'master' of ../work into next

[platform/kernel/u-boot.git] / board / netstal / hcu4 / hcu4.c

diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c
index 42c7c16..8efbc23 100644 (file)
--- a/board/netstal/hcu4/hcu4.c
+++ b/board/netstal/hcu4/hcu4.c
@@ -58,12 +58,12 @@ int board_early_init_f (void)
         *      IRQ 17-24 RESERVED/UNUSED
         *      IRQ 31 (EXT IRQ 6) (unused)
         */
-       mtdcr(uicsr, 0xFFFFFFFF); /* clear all ints */
-       mtdcr(uicer, 0x00000000); /* disable all ints */
-       mtdcr(uiccr, 0x00000000); /* set all to be non-critical */
-       mtdcr(uicpr, 0xFFFFE000); /* set int polarities */
-       mtdcr(uictr, 0x00000000); /* set int trigger levels */
-       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, 0xFFFFE000); /* set int polarities */
+       mtdcr(UIC0TR, 0x00000000); /* set int trigger levels */
+       mtdcr(UIC0SR, 0xFFFFFFFF); /* clear all ints */
 
        mtdcr(CPC0_CR1, CPC0_CR1_VALUE);
        mtdcr(CPC0_ECR, 0x60606000);
@@ -92,7 +92,7 @@ int checkboard (void)
        u16 index      = boardVersReg & 0x0f;
 
        /* Cannot be done in board_early_init */
-       mtdcr(cntrl0,  CPC0_CR0_VALUE);
+       mtdcr(CPC0_CR0,  CPC0_CR0_VALUE);
 
        /* Force /RTS to active. The board it not wired quite
         *  correctly to use cts/rtc flow control, so just force the
@@ -134,7 +134,7 @@ u32 hcu_get_slot(void)
  */
 u32 get_serial_number(void)
 {
-       u32 serial = in_be32((u32 *)CFG_FLASH_BASE);
+       u32 serial = in_be32((u32 *)CONFIG_SYS_FLASH_BASE);
 
        if (serial == 0xffffffff)
                return 0;
@@ -154,7 +154,7 @@ int misc_init_r(void)
        return 0;
 }
 
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        long dram_size = 0;
        u16 boardVersReg = in_be16((u16 *)HCU_MACH_VERSIONS_REGISTER);
@@ -174,17 +174,6 @@ long int initdram(int board_type)
        return dram_size;
 }
 
-#if defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
-{
-       return 0;       /* No hotkeys supported */
-}
-#endif /* CONFIG_POST */
-
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 void ft_board_setup(void *blob, bd_t *bd)
 {