812c4e40c2
Currently the {set,get}_pull callbacks of the s3c24xx_gpiocfg_default structure
are initalized via s3c_gpio_{get,set}pull_1up. This results in a linker
error when only CONFIG_CPU_S3C2442 is selected:
arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f4): undefined reference to
`s3c_gpio_getpull_1up'
arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f8): undefined reference to
`s3c_gpio_setpull_1up'
The s3c2442 has pulldowns instead of pullups compared to the s3c2440.
The method of controlling them is the same though.
So this patch modifies the existing s3c_gpio_{get,set}pull_1up helper functions
to take an additional parameter deciding whether the pin has a pullup or pulldown.
The s3c_gpio_{get,set}pull_1{down,up} functions then wrap that functions passing
either S3C_GPIO_PULL_UP or S3C_GPIO_PULL_DOWN.
Furthermore this patch sets up the s3c24xx_gpiocfg_default.{get,set}_pull fields
in the s3c244{0,2}_map_io function to the new pulldown helper functions.
Based on patch from "Lars-Peter Clausen" <lars@metafoo.de>
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
65 lines
1.5 KiB
C
65 lines
1.5 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/sysdev.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.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/s3c244x.h>
|
|
|
|
#include <plat/gpio-core.h>
|
|
#include <plat/gpio-cfg.h>
|
|
#include <plat/gpio-cfg-helpers.h>
|
|
|
|
static struct sys_device s3c2440_sysdev = {
|
|
.cls = &s3c2440_sysclass,
|
|
};
|
|
|
|
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 our system device for everything else */
|
|
|
|
return sysdev_register(&s3c2440_sysdev);
|
|
}
|
|
|
|
void __init s3c2440_map_io(void)
|
|
{
|
|
s3c244x_map_io();
|
|
|
|
s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1up;
|
|
s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1up;
|
|
}
|