Merge with /home/sr/git/u-boot/4xx-sdram

[oweals/u-boot.git] / board / smdk2410 / smdk2410.c

diff --git a/board/smdk2410/smdk2410.c b/board/smdk2410/smdk2410.c
index 7f983ef5b891b18882d03579a2061ead0360ae26..802348d23693f8ef25a4fe1299f3908848eb2df3 100644 (file)
--- a/board/smdk2410/smdk2410.c
+++ b/board/smdk2410/smdk2410.c
@@ -28,7 +28,7 @@
 #include <common.h>
 #include <s3c2410.h>
 
-/* ------------------------------------------------------------------------- */
+DECLARE_GLOBAL_DATA_PTR;
 
 #define FCLK_SPEED 1
 
@@ -67,42 +67,43 @@ static inline void delay (unsigned long loops)
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
+       S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
+       S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
 
        /* to reduce PLL lock time, adjust the LOCKTIME register */
-       rLOCKTIME = 0xFFFFFF;
+       clk_power->LOCKTIME = 0xFFFFFF;
 
        /* configure MPLL */
-       rMPLLCON = ((M_MDIV << 12) + (M_PDIV << 4) + M_SDIV);
+       clk_power->MPLLCON = ((M_MDIV << 12) + (M_PDIV << 4) + M_SDIV);
 
        /* some delay between MPLL and UPLL */
        delay (4000);
 
        /* configure UPLL */
-       rUPLLCON = ((U_M_MDIV << 12) + (U_M_PDIV << 4) + U_M_SDIV);
+       clk_power->UPLLCON = ((U_M_MDIV << 12) + (U_M_PDIV << 4) + U_M_SDIV);
 
        /* some delay between MPLL and UPLL */
        delay (8000);
 
        /* set up the I/O ports */
-       rGPACON = 0x007FFFFF;
-       rGPBCON = 0x00044555;
-       rGPBUP = 0x000007FF;
-       rGPCCON = 0xAAAAAAAA;
-       rGPCUP = 0x0000FFFF;
-       rGPDCON = 0xAAAAAAAA;
-       rGPDUP = 0x0000FFFF;
-       rGPECON = 0xAAAAAAAA;
-       rGPEUP = 0x0000FFFF;
-       rGPFCON = 0x000055AA;
-       rGPFUP = 0x000000FF;
-       rGPGCON = 0xFF95FFBA;
-       rGPGUP = 0x0000FFFF;
-       rGPHCON = 0x002AFAAA;
-       rGPHUP = 0x000007FF;
+       gpio->GPACON = 0x007FFFFF;
+       gpio->GPBCON = 0x00044555;
+       gpio->GPBUP = 0x000007FF;
+       gpio->GPCCON = 0xAAAAAAAA;
+       gpio->GPCUP = 0x0000FFFF;
+       gpio->GPDCON = 0xAAAAAAAA;
+       gpio->GPDUP = 0x0000FFFF;
+       gpio->GPECON = 0xAAAAAAAA;
+       gpio->GPEUP = 0x0000FFFF;
+       gpio->GPFCON = 0x000055AA;
+       gpio->GPFUP = 0x000000FF;
+       gpio->GPGCON = 0xFF95FFBA;
+       gpio->GPGUP = 0x0000FFFF;
+       gpio->GPHCON = 0x002AFAAA;
+       gpio->GPHUP = 0x000007FF;
 
        /* arch number of SMDK2410-Board */
-       gd->bd->bi_arch_number = 193;
+       gd->bd->bi_arch_number = MACH_TYPE_SMDK2410;
 
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x30000100;
@@ -115,8 +116,6 @@ int board_init (void)
 
 int dram_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;