diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2006-03-20 22:02:39 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-21 23:06:22 +0100 |
| commit | da956fd6b84f61bc98a18a63cdbd8190ec7b8cd0 (patch) | |
| tree | 9d4728d936017ad37a69aa811f1aa453ac9e7f54 /arch/arm/mach-s3c2410/mach-osiris.c | |
| parent | [ARM] 3374/1: ep93xx: gpio interrupt support (diff) | |
| download | linux-da956fd6b84f61bc98a18a63cdbd8190ec7b8cd0.tar.xz linux-da956fd6b84f61bc98a18a63cdbd8190ec7b8cd0.zip | |
[ARM] 3375/1: S3C2440 - fix osiris machine build
Patch from Ben Dooks
Fix the build of arch/arm/mach-s3c2410/mach-osiris.c
and fix the warnings from sparse.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-osiris.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-osiris.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-osiris.c b/arch/arm/mach-s3c2410/mach-osiris.c index 72083e645e77..ae0787557751 100644 --- a/arch/arm/mach-s3c2410/mach-osiris.c +++ b/arch/arm/mach-s3c2410/mach-osiris.c @@ -123,7 +123,7 @@ static int external_map[] = { 2 }; static int chip0_map[] = { 0 }; static int chip1_map[] = { 1 }; -struct mtd_partition osiris_default_nand_part[] = { +static struct mtd_partition osiris_default_nand_part[] = { [0] = { .name = "Boot Agent", .size = SZ_16K, @@ -249,8 +249,10 @@ static struct s3c24xx_board osiris_board __initdata = { .clocks_count = ARRAY_SIZE(osiris_clocks) }; -void __init osiris_map_io(void) +static void __init osiris_map_io(void) { + unsigned long flags; + /* initialise the clocks */ s3c24xx_dclk0.parent = NULL; @@ -272,7 +274,10 @@ void __init osiris_map_io(void) s3c24xx_set_board(&osiris_board); /* fix bus configuration (nBE settings wrong on ABLE pre v2.20) */ + + local_irq_save(flags); __raw_writel(__raw_readl(S3C2410_BWSCON) | S3C2410_BWSCON_ST1 | S3C2410_BWSCON_ST2 | S3C2410_BWSCON_ST3 | S3C2410_BWSCON_ST4 | S3C2410_BWSCON_ST5, S3C2410_BWSCON); + local_irq_restore(flags); /* write-protect line to the NAND */ s3c2410_gpio_setpin(S3C2410_GPA0, 1); @@ -280,7 +285,6 @@ void __init osiris_map_io(void) MACHINE_START(OSIRIS, "Simtec-OSIRIS") /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ - .phys_ram = S3C2410_SDRAM_PA, .phys_io = S3C2410_PA_UART, .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, .boot_params = S3C2410_SDRAM_PA + 0x100, |