Update a couple of S3C24XX and S3C2412 files that are still using the GPIO number to register mapping calls to get the s3c_gpio_chip and use the base field from that. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
		
			
				
	
	
		
			96 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			96 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/* linux/arch/arm/plat-s3c24xx/gpio.c
 | 
						|
 *
 | 
						|
 * Copyright (c) 2004-2010 Simtec Electronics
 | 
						|
 *	Ben Dooks <ben@simtec.co.uk>
 | 
						|
 *
 | 
						|
 * S3C24XX 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/gpio.h>
 | 
						|
#include <linux/io.h>
 | 
						|
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <mach/gpio-fns.h>
 | 
						|
#include <asm/irq.h>
 | 
						|
 | 
						|
#include <mach/regs-gpio.h>
 | 
						|
 | 
						|
#include <plat/gpio-core.h>
 | 
						|
 | 
						|
/* gpiolib wrappers until these are totally eliminated */
 | 
						|
 | 
						|
void s3c2410_gpio_pullup(unsigned int pin, unsigned int to)
 | 
						|
{
 | 
						|
	int ret;
 | 
						|
 | 
						|
	WARN_ON(to);	/* should be none of these left */
 | 
						|
 | 
						|
	if (!to) {
 | 
						|
		/* if pull is enabled, try first with up, and if that
 | 
						|
		 * fails, try using down */
 | 
						|
 | 
						|
		ret = s3c_gpio_setpull(pin, S3C_GPIO_PULL_UP);
 | 
						|
		if (ret)
 | 
						|
			s3c_gpio_setpull(pin, S3C_GPIO_PULL_DOWN);
 | 
						|
	} else {
 | 
						|
		s3c_gpio_setpull(pin, S3C_GPIO_PULL_NONE);
 | 
						|
	}
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(s3c2410_gpio_pullup);
 | 
						|
 | 
						|
void s3c2410_gpio_setpin(unsigned int pin, unsigned int to)
 | 
						|
{
 | 
						|
	/* do this via gpiolib until all users removed */
 | 
						|
 | 
						|
	gpio_request(pin, "temporary");
 | 
						|
	gpio_set_value(pin, to);
 | 
						|
	gpio_free(pin);
 | 
						|
}
 | 
						|
 | 
						|
EXPORT_SYMBOL(s3c2410_gpio_setpin);
 | 
						|
 | 
						|
unsigned int s3c2410_gpio_getpin(unsigned int pin)
 | 
						|
{
 | 
						|
	struct s3c_gpio_chip *chip = s3c_gpiolib_getchip(pin);
 | 
						|
	unsigned long offs = pin - chip->chip.base;
 | 
						|
 | 
						|
	return __raw_readl(chip->base + 0x04) & (1<< offs);
 | 
						|
}
 | 
						|
 | 
						|
EXPORT_SYMBOL(s3c2410_gpio_getpin);
 | 
						|
 | 
						|
unsigned int s3c2410_modify_misccr(unsigned int clear, unsigned int change)
 | 
						|
{
 | 
						|
	unsigned long flags;
 | 
						|
	unsigned long misccr;
 | 
						|
 | 
						|
	local_irq_save(flags);
 | 
						|
	misccr = __raw_readl(S3C24XX_MISCCR);
 | 
						|
	misccr &= ~clear;
 | 
						|
	misccr ^= change;
 | 
						|
	__raw_writel(misccr, S3C24XX_MISCCR);
 | 
						|
	local_irq_restore(flags);
 | 
						|
 | 
						|
	return misccr;
 | 
						|
}
 | 
						|
 | 
						|
EXPORT_SYMBOL(s3c2410_modify_misccr);
 |