Skip to content

Commit

Permalink
[ARM] 3806/2: S3C2412: Fix GPIO VA when only S3C2412 selected
Browse files Browse the repository at this point in the history
The s3c24xx_va_gpio2 variable is only used
when the S3C2412 and another cpu-type is
being used in the kernel. This patch ensures
it is not set when it is not being used.

Fixes bug report by Thomas Gleixner.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ben Dooks authored and Russell King committed Sep 25, 2006
1 parent 0033a2f commit 50dedf1
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion arch/arm/mach-s3c2410/s3c2412.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@

#ifndef CONFIG_CPU_S3C2412_ONLY
void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;

static inline void s3c2412_init_gpio2(void)
{
s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
}
#else
#define s3c2412_init_gpio2() do { } while(0)
#endif

/* Initial IO mappings */
Expand Down Expand Up @@ -110,7 +117,7 @@ void __init s3c2412_map_io(struct map_desc *mach_desc, int mach_size)
{
/* move base of IO */

s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
s3c2412_init_gpio2();

/* set our idle function */

Expand Down

0 comments on commit 50dedf1

Please sign in to comment.