diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-08-19 13:30:08 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-08-21 18:14:08 -0400 |
commit | a3d9358406b7529373ccafbf6d264f811884959c (patch) | |
tree | a02aaa2d1f033ccd86a95d02be13158a118c0255 /arch/arm/mach-s5p64x0/gpiolib.c | |
parent | c06af3cc6a27991187fd513765fed943684d41bf (diff) |
ARM: S5P64X0: Use soc_is_s5p64x0() to distinguish cpu at runtime
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0/gpiolib.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/gpiolib.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s5p64x0/gpiolib.c b/arch/arm/mach-s5p64x0/gpiolib.c index e7fb3b004e77..700dac6c43f3 100644 --- a/arch/arm/mach-s5p64x0/gpiolib.c +++ b/arch/arm/mach-s5p64x0/gpiolib.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <mach/regs-gpio.h> | 19 | #include <mach/regs-gpio.h> |
20 | #include <mach/regs-clock.h> | 20 | #include <mach/regs-clock.h> |
21 | 21 | ||
22 | #include <plat/cpu.h> | ||
22 | #include <plat/gpio-core.h> | 23 | #include <plat/gpio-core.h> |
23 | #include <plat/gpio-cfg.h> | 24 | #include <plat/gpio-cfg.h> |
24 | #include <plat/gpio-cfg-helpers.h> | 25 | #include <plat/gpio-cfg-helpers.h> |
@@ -473,14 +474,10 @@ static void __init s5p64x0_gpio_add_rbank_4bit2(struct s3c_gpio_chip *chip, | |||
473 | 474 | ||
474 | static int __init s5p64x0_gpiolib_init(void) | 475 | static int __init s5p64x0_gpiolib_init(void) |
475 | { | 476 | { |
476 | unsigned int chipid; | ||
477 | |||
478 | chipid = __raw_readl(S5P64X0_SYS_ID); | ||
479 | |||
480 | s5p64x0_gpiolib_set_cfg(s5p64x0_gpio_cfgs, | 477 | s5p64x0_gpiolib_set_cfg(s5p64x0_gpio_cfgs, |
481 | ARRAY_SIZE(s5p64x0_gpio_cfgs)); | 478 | ARRAY_SIZE(s5p64x0_gpio_cfgs)); |
482 | 479 | ||
483 | if ((chipid & 0xff000) == 0x50000) { | 480 | if (soc_is_s5p6450()) { |
484 | samsung_gpiolib_add_2bit_chips(s5p6450_gpio_2bit, | 481 | samsung_gpiolib_add_2bit_chips(s5p6450_gpio_2bit, |
485 | ARRAY_SIZE(s5p6450_gpio_2bit)); | 482 | ARRAY_SIZE(s5p6450_gpio_2bit)); |
486 | 483 | ||