Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3ff5502 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos 



Patch from Ben Dooks

The s3c2410 gpio functions have a pair of bugs where
the code is using the pin function definitions instead
of the pin gpio numbers.

Also remove the changelog

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d384ea69

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -18,9 +18,6 @@ 
 * You should have received a copy of the GNU General Public License

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 * Changelog

 *	15-Jan-2006  LCVR  Splitted from gpio.c

 */

 */





#include <linux/kernel.h>

#include <linux/kernel.h>
@@ -47,7 +44,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, 




	config &= 0xff;

	config &= 0xff;





	pin -= S3C2410_GPG8_EINT16;

	pin -= S3C2410_GPG8;

	reg += pin & ~3;

	reg += pin & ~3;





	local_irq_save(flags);

	local_irq_save(flags);
@@ -75,7 +72,7 @@ EXPORT_SYMBOL(s3c2410_gpio_irqfilter); 




int s3c2410_gpio_getirq(unsigned int pin)

int s3c2410_gpio_getirq(unsigned int pin)

{

{

	if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15_EINT23)

	if (pin < S3C2410_GPF0 || pin > S3C2410_GPG15)

		return -1;	/* not valid interrupts */

		return -1;	/* not valid interrupts */





	if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7)

	if (pin < S3C2410_GPG0 && pin > S3C2410_GPF7)