diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 16:38:43 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 16:38:43 +0900 |
| commit | be6bb8cc8d2bd033a1f89983f2f13bdb3548a08f (patch) | |
| tree | 2b7f76cc2154e5589a605f97a663c8afe4f6016f /arch/arm/mach-s5p64x0/gpiolib.c | |
| parent | d03c35939d2a447093e60133156217d6512aa9e3 (diff) | |
| parent | b02b5da4d15d7f7a250888d003121e1b5b69d00b (diff) | |
| download | talos-obmc-linux-be6bb8cc8d2bd033a1f89983f2f13bdb3548a08f.tar.gz talos-obmc-linux-be6bb8cc8d2bd033a1f89983f2f13bdb3548a08f.zip | |
Merge branch 'next/topic-cpuid-rev' into next/topic-add-exynos4212
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 @@ #include <mach/regs-gpio.h> #include <mach/regs-clock.h> +#include <plat/cpu.h> #include <plat/gpio-core.h> #include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> @@ -473,14 +474,10 @@ static void __init s5p64x0_gpio_add_rbank_4bit2(struct s3c_gpio_chip *chip, static int __init s5p64x0_gpiolib_init(void) { - unsigned int chipid; - - chipid = __raw_readl(S5P64X0_SYS_ID); - s5p64x0_gpiolib_set_cfg(s5p64x0_gpio_cfgs, ARRAY_SIZE(s5p64x0_gpio_cfgs)); - if ((chipid & 0xff000) == 0x50000) { + if (soc_is_s5p6450()) { samsung_gpiolib_add_2bit_chips(s5p6450_gpio_2bit, ARRAY_SIZE(s5p6450_gpio_2bit)); |
