Commit ec976d6e authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C24XX: GPIO: Move gpio functions out of <mach/hardware.h> 



Move all the gpio functions out of <mach/hardware.h> as
this file is for defining the generic IO base addresses
for the kernel IO calls.

Make a new header <mach/gpio-fns.h> to take this and
include it via the chain from <linux/gpio.h> which is
what most of these files should be using (and will be
changed as soon as possible).

Note, this does make minor changes to some drivers but
should not mess up any pending merges.

CC: Richard Purdie <rpurdie@rpsys.net>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
CC: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 9f05f6a9

arch/arm/mach-s3c2410/h1940-bluetooth.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/string.h>

#include <linux/ctype.h>

#include <linux/leds.h>

#include <linux/gpio.h>



#include <mach/regs-gpio.h>

#include <mach/hardware.h>

#include <mach/h1940-latch.h>

arch/arm/mach-s3c2410/include/mach/gpio-fns.h

0 → 100644
+103 −0
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/gpio-fns.h

 *

 * Copyright (c) 2003,2009 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * S3C2410 - hardware

 *

 * 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.

*/



/* These functions are in the to-be-removed category and it is strongly

 * encouraged not to use these in new code. They will be marked deprecated

 * very soon.

 *

 * Most of the functionality can be either replaced by the gpiocfg calls

 * for the s3c platform or by the generic GPIOlib API.

*/



/* external functions for GPIO support

 *

 * These allow various different clients to access the same GPIO

 * registers without conflicting. If your driver only owns the entire

 * GPIO register, then it is safe to ioremap/__raw_{read|write} to it.

*/



/* s3c2410_gpio_cfgpin

 *

 * set the configuration of the given pin to the value passed.

 *

 * eg:

 *    s3c2410_gpio_cfgpin(S3C2410_GPA0, S3C2410_GPA0_ADDR0);

 *    s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);

*/



extern void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function);



extern unsigned int s3c2410_gpio_getcfg(unsigned int pin);



/* s3c2410_gpio_getirq

 *

 * turn the given pin number into the corresponding IRQ number

 *

 * returns:

 *	< 0 = no interrupt for this pin

 *	>=0 = interrupt number for the pin

*/



extern int s3c2410_gpio_getirq(unsigned int pin);



#ifdef CONFIG_CPU_S3C2400



extern int s3c2400_gpio_getirq(unsigned int pin);



#endif /* CONFIG_CPU_S3C2400 */



/* s3c2410_gpio_irqfilter

 *

 * set the irq filtering on the given pin

 *

 * on = 0 => disable filtering

 *      1 => enable filtering

 *

 * config = S3C2410_EINTFLT_PCLK or S3C2410_EINTFLT_EXTCLK orred with

 *          width of filter (0 through 63)

 *

 *

*/



extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,

				  unsigned int config);



/* s3c2410_gpio_pullup

 *

 * configure the pull-up control on the given pin

 *

 * to = 1 => disable the pull-up

 *      0 => enable the pull-up

 *

 * eg;

 *

 *   s3c2410_gpio_pullup(S3C2410_GPB0, 0);

 *   s3c2410_gpio_pullup(S3C2410_GPE8, 0);

*/



extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to);



/* s3c2410_gpio_getpull

 *

 * Read the state of the pull-up on a given pin

 *

 * return:

 *	< 0 => error code

 *	  0 => enabled

 *	  1 => disabled

*/



extern int s3c2410_gpio_getpull(unsigned int pin);



extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to);



extern unsigned int s3c2410_gpio_getpin(unsigned int pin);

arch/arm/mach-s3c2410/include/mach/gpio.h

+1 −0
Original line number Diff line number Diff line
@@ -24,5 +24,6 @@ 


#include <asm-generic/gpio.h>

#include <mach/gpio-nrs.h>

#include <mach/gpio-fns.h>



#define S3C_GPIO_END	(S3C2410_GPIO_BANKH + 32)

arch/arm/mach-s3c2410/include/mach/hardware.h

+0 −84
Original line number Diff line number Diff line
@@ -15,90 +15,6 @@ 


#ifndef __ASSEMBLY__



/* external functions for GPIO support

 *

 * These allow various different clients to access the same GPIO

 * registers without conflicting. If your driver only owns the entire

 * GPIO register, then it is safe to ioremap/__raw_{read|write} to it.

*/



/* s3c2410_gpio_cfgpin

 *

 * set the configuration of the given pin to the value passed.

 *

 * eg:

 *    s3c2410_gpio_cfgpin(S3C2410_GPA0, S3C2410_GPA0_ADDR0);

 *    s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);

*/



extern void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function);



extern unsigned int s3c2410_gpio_getcfg(unsigned int pin);



/* s3c2410_gpio_getirq

 *

 * turn the given pin number into the corresponding IRQ number

 *

 * returns:

 *	< 0 = no interrupt for this pin

 *	>=0 = interrupt number for the pin

*/



extern int s3c2410_gpio_getirq(unsigned int pin);



#ifdef CONFIG_CPU_S3C2400



extern int s3c2400_gpio_getirq(unsigned int pin);



#endif /* CONFIG_CPU_S3C2400 */



/* s3c2410_gpio_irqfilter

 *

 * set the irq filtering on the given pin

 *

 * on = 0 => disable filtering

 *      1 => enable filtering

 *

 * config = S3C2410_EINTFLT_PCLK or S3C2410_EINTFLT_EXTCLK orred with

 *          width of filter (0 through 63)

 *

 *

*/



extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,

				  unsigned int config);



/* s3c2410_gpio_pullup

 *

 * configure the pull-up control on the given pin

 *

 * to = 1 => disable the pull-up

 *      0 => enable the pull-up

 *

 * eg;

 *

 *   s3c2410_gpio_pullup(S3C2410_GPB0, 0);

 *   s3c2410_gpio_pullup(S3C2410_GPE8, 0);

*/



extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to);



/* s3c2410_gpio_getpull

 *

 * Read the state of the pull-up on a given pin

 *

 * return:

 *	< 0 => error code

 *	  0 => enabled

 *	  1 => disabled

*/



extern int s3c2410_gpio_getpull(unsigned int pin);



extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to);



extern unsigned int s3c2410_gpio_getpin(unsigned int pin);



extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);



#ifdef CONFIG_CPU_S3C2440

arch/arm/mach-s3c2410/mach-amlm5900.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/list.h>

#include <linux/timer.h>

#include <linux/init.h>

#include <linux/gpio.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/proc_fs.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE