linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-s3c2410 / mach-smdk2440.c

diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c
index d661c6b..f431572 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2440.c
@@ -53,8 +53,7 @@
 #include "clock.h"
 #include "devs.h"
 #include "cpu.h"
-
-#include "common-smdk.h"
+#include "pm.h"
 
 static struct map_desc smdk2440_iodesc[] __initdata = {
        /* ISA IO Space map (memory space selected by A24) */
@@ -86,7 +85,7 @@ static struct map_desc smdk2440_iodesc[] __initdata = {
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
 #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
 
-static struct s3c2410_uartcfg smdk2440_uartcfgs[] __initdata = {
+static struct s3c2410_uartcfg smdk2440_uartcfgs[] = {
        [0] = {
                .hwport      = 0,
                .flags       = 0,
@@ -198,9 +197,21 @@ static void __init smdk2440_map_io(void)
 
 static void __init smdk2440_machine_init(void)
 {
+       /* Configure the LEDs (even if we have no LED support)*/
+
+       s3c2410_gpio_cfgpin(S3C2410_GPF4, S3C2410_GPF4_OUTP);
+       s3c2410_gpio_cfgpin(S3C2410_GPF5, S3C2410_GPF5_OUTP);
+       s3c2410_gpio_cfgpin(S3C2410_GPF6, S3C2410_GPF6_OUTP);
+       s3c2410_gpio_cfgpin(S3C2410_GPF7, S3C2410_GPF7_OUTP);
+
+       s3c2410_gpio_setpin(S3C2410_GPF4, 0);
+       s3c2410_gpio_setpin(S3C2410_GPF5, 0);
+       s3c2410_gpio_setpin(S3C2410_GPF6, 0);
+       s3c2410_gpio_setpin(S3C2410_GPF7, 0);
+
        s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg);
 
-       smdk_machine_init();
+       s3c2410_pm_init();
 }
 
 MACHINE_START(S3C2440, "SMDK2440")