mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 20:51:47 +00:00
c67d0f2926
This isolates the custom S3C24xx GPIO definition table to <linux/platform_data/gpio-samsung-s3x24xx.h> as this is used in a few different places in the kernel, removing the need to depend on the implicit inclusion of <mach/gpio.h> from <linux/gpio.h> and thus getting rid of a few nasty cross-dependencies. We also delete the nifty CONFIG_S3C24XX_GPIO_EXTRA stuff. The biggest this can ever be for the S3C24XX is CONFIG_S3C24XX_GPIO_EXTRA = 128, and then for CPU_S3C2443 or CPU_S3C2416 32*12 GPIOs are added, so 32*12+128 = 512 is the absolute roof value on this platform. So we set the size of ARCH_NR_GPIO to this and the GPIOs array will fit any S3C24XX platform, as per pattern from other archs. ChangeLog v2->v3: - Move the movement of the S3C64XX gpio.h file out of this patch and into the follow-up patch where it belongs. ChangeLog v1->v2: - Added an #ifdef ARCH_S3C24XX around the header inclusion in drivers/gpio/gpio-samsung.c as we would otherwise have colliding definitions when compiling S3C64XX. - Rename inclusion guard in the header file. Cc: Tomasz Figa <tomasz.figa@gmail.com> Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: linux-samsung-soc@vger.kernel.org Acked-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
78 lines
1.8 KiB
C
78 lines
1.8 KiB
C
/* linux/arch/arm/mach-s3c2440/s3c2440.c
|
|
*
|
|
* Copyright (c) 2004-2006 Simtec Electronics
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
*
|
|
* Samsung S3C2440 Mobile CPU support
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/list.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/serial_core.h>
|
|
#include <linux/device.h>
|
|
#include <linux/syscore_ops.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/platform_data/gpio-samsung-s3c24xx.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/irq.h>
|
|
|
|
#include <plat/devs.h>
|
|
#include <plat/cpu.h>
|
|
#include <plat/pm.h>
|
|
|
|
#include <plat/gpio-core.h>
|
|
#include <plat/gpio-cfg.h>
|
|
#include <plat/gpio-cfg-helpers.h>
|
|
|
|
#include "common.h"
|
|
|
|
static struct device s3c2440_dev = {
|
|
.bus = &s3c2440_subsys,
|
|
};
|
|
|
|
int __init s3c2440_init(void)
|
|
{
|
|
printk("S3C2440: Initialising architecture\n");
|
|
|
|
/* change irq for watchdog */
|
|
|
|
s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
|
|
s3c_device_wdt.resource[1].end = IRQ_S3C2440_WDT;
|
|
|
|
/* register suspend/resume handlers */
|
|
|
|
#ifdef CONFIG_PM
|
|
register_syscore_ops(&s3c2410_pm_syscore_ops);
|
|
register_syscore_ops(&s3c24xx_irq_syscore_ops);
|
|
#endif
|
|
register_syscore_ops(&s3c244x_pm_syscore_ops);
|
|
|
|
/* register our system device for everything else */
|
|
|
|
return device_register(&s3c2440_dev);
|
|
}
|
|
|
|
void __init s3c2440_map_io(void)
|
|
{
|
|
s3c244x_map_io();
|
|
|
|
s3c24xx_gpiocfg_default.set_pull = s3c24xx_gpio_setpull_1up;
|
|
s3c24xx_gpiocfg_default.get_pull = s3c24xx_gpio_getpull_1up;
|
|
}
|