Kukjin Kim wrote: > > Cc: Ben Dooks <ben-linux@xxxxxxxxx> > Signed-off-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx> > --- > arch/arm/mach-s3c2400/gpio.c | 42 ------------------------ > arch/arm/mach-s3c2410/gpio.c | 72 ------------------------------------------ > arch/arm/mach-s3c2412/gpio.c | 62 ------------------------------------ > 3 files changed, 0 insertions(+), 176 deletions(-) > delete mode 100644 arch/arm/mach-s3c2400/gpio.c > delete mode 100644 arch/arm/mach-s3c2410/gpio.c > delete mode 100644 arch/arm/mach-s3c2412/gpio.c > As a note, I applied this into my -cleanup branch except s3c2400 stuff because it has been already removed before. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. > diff --git a/arch/arm/mach-s3c2400/gpio.c b/arch/arm/mach-s3c2400/gpio.c > deleted file mode 100644 > index 6c68e78..0000000 > --- a/arch/arm/mach-s3c2400/gpio.c > +++ /dev/null > @@ -1,42 +0,0 @@ > -/* linux/arch/arm/mach-s3c2400/gpio.c > - * > - * Copyright (c) 2006 Lucas Correia Villa Real <lucasvr@xxxxxxxxxxxxx> > - * > - * S3C2400 GPIO support > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, or > - * (at your option) any later version. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -*/ > - > -#include <linux/kernel.h> > -#include <linux/init.h> > -#include <linux/module.h> > -#include <linux/interrupt.h> > -#include <linux/ioport.h> > -#include <linux/io.h> > - > -#include <mach/hardware.h> > -#include <asm/irq.h> > - > -#include <mach/regs-gpio.h> > - > -int s3c2400_gpio_getirq(unsigned int pin) > -{ > - if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE(7)) > - return -EINVAL; /* not valid interrupts */ > - > - return (pin - S3C2410_GPE(0)) + IRQ_EINT0; > -} > - > -EXPORT_SYMBOL(s3c2400_gpio_getirq); > diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c > deleted file mode 100644 > index 9664e01..0000000 > --- a/arch/arm/mach-s3c2410/gpio.c > +++ /dev/null > @@ -1,72 +0,0 @@ > -/* linux/arch/arm/mach-s3c2410/gpio.c > - * > - * Copyright (c) 2004-2006 Simtec Electronics > - * Ben Dooks <ben@xxxxxxxxxxxx> > - * > - * S3C2410 GPIO support > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, or > - * (at your option) any later version. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > - */ > - > -#include <linux/kernel.h> > -#include <linux/init.h> > -#include <linux/module.h> > -#include <linux/interrupt.h> > -#include <linux/ioport.h> > -#include <linux/io.h> > - > -#include <mach/hardware.h> > -#include <mach/gpio-fns.h> > -#include <asm/irq.h> > - > -#include <mach/regs-gpio.h> > - > -int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, > - unsigned int config) > -{ > - void __iomem *reg = S3C24XX_EINFLT0; > - unsigned long flags; > - unsigned long val; > - > - if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15)) > - return -EINVAL; > - > - config &= 0xff; > - > - pin -= S3C2410_GPG(8); > - reg += pin & ~3; > - > - local_irq_save(flags); > - > - /* update filter width and clock source */ > - > - val = __raw_readl(reg); > - val &= ~(0xff << ((pin & 3) * 8)); > - val |= config << ((pin & 3) * 8); > - __raw_writel(val, reg); > - > - /* update filter enable */ > - > - val = __raw_readl(S3C24XX_EXTINT2); > - val &= ~(1 << ((pin * 4) + 3)); > - val |= on << ((pin * 4) + 3); > - __raw_writel(val, S3C24XX_EXTINT2); > - > - local_irq_restore(flags); > - > - return 0; > -} > - > -EXPORT_SYMBOL(s3c2410_gpio_irqfilter); > diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c > deleted file mode 100644 > index 3404a87..0000000 > --- a/arch/arm/mach-s3c2412/gpio.c > +++ /dev/null > @@ -1,62 +0,0 @@ > -/* linux/arch/arm/mach-s3c2412/gpio.c > - * > - * Copyright (c) 2007 Simtec Electronics > - * Ben Dooks <ben@xxxxxxxxxxxx> > - * > - * http://armlinux.simtec.co.uk/. > - * > - * S3C2412/S3C2413 specific GPIO 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/module.h> > -#include <linux/interrupt.h> > -#include <linux/gpio.h> > - > -#include <asm/mach/arch.h> > -#include <asm/mach/map.h> > - > -#include <mach/regs-gpio.h> > -#include <mach/hardware.h> > - > -#include <plat/gpio-core.h> > - > -int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) > -{ > - struct s3c_gpio_chip *chip = s3c_gpiolib_getchip(pin); > - unsigned long offs = pin - chip->chip.base; > - unsigned long flags; > - unsigned long slpcon; > - > - offs *= 2; > - > - if (pin < S3C2410_GPB(0)) > - return -EINVAL; > - > - if (pin >= S3C2410_GPF(0) && > - pin <= S3C2410_GPG(16)) > - return -EINVAL; > - > - if (pin > S3C2410_GPH(16)) > - return -EINVAL; > - > - local_irq_save(flags); > - > - slpcon = __raw_readl(chip->base + 0x0C); > - > - slpcon &= ~(3 << offs); > - slpcon |= state << offs; > - > - __raw_writel(slpcon, chip->base + 0x0C); > - > - local_irq_restore(flags); > - > - return 0; > -} > - > -EXPORT_SYMBOL(s3c2412_gpio_set_sleepcfg); > -- > 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html