From e76e18fc411121c5271c609b99fec5b4d74fcb60 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Mon, 21 Jan 2013 15:18:21 -0800 Subject: [PATCH] --- yaml --- r: 355299 b: refs/heads/master c: c896ba8883b689fa78e24d881d1387f65f9d3805 h: refs/heads/master i: 355297: 37b8cf63334bfa91fb42deaacd468e97a3c5d370 355295: 93bb78670f51975a4ca980df6db5881f0e0930c4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2412/gpio.c | 62 ------------------- .../arm/mach-s3c24xx/include/mach/hardware.h | 6 -- 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 trunk/arch/arm/mach-s3c2412/gpio.c diff --git a/[refs] b/[refs] index e12563d204b9..bc8479aa46c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82c1871245fc6626a0e2f127b4fd202698541c40 +refs/heads/master: c896ba8883b689fa78e24d881d1387f65f9d3805 diff --git a/trunk/arch/arm/mach-s3c2412/gpio.c b/trunk/arch/arm/mach-s3c2412/gpio.c deleted file mode 100644 index 4526f6ba31a8..000000000000 --- a/trunk/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 - * - * 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 -#include -#include -#include -#include - -#include -#include - -#include -#include - -#include - -int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) -{ - struct samsung_gpio_chip *chip = samsung_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); diff --git a/trunk/arch/arm/mach-s3c24xx/include/mach/hardware.h b/trunk/arch/arm/mach-s3c24xx/include/mach/hardware.h index aef5631eac58..a6cc14a092fc 100644 --- a/trunk/arch/arm/mach-s3c24xx/include/mach/hardware.h +++ b/trunk/arch/arm/mach-s3c24xx/include/mach/hardware.h @@ -23,12 +23,6 @@ extern int s3c2440_set_dsc(unsigned int pin, unsigned int value); #endif /* CONFIG_CPU_S3C2440 */ -#ifdef CONFIG_CPU_S3C2412 - -extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state); - -#endif /* CONFIG_CPU_S3C2412 */ - #endif /* __ASSEMBLY__ */ #include