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

Commit 40ca061b authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 7841/1: sa1100: remove complex GPIO interface 



The SA1100 was implementing its own variants of gpio_get_value()
and gpio_set_value() and only selectively falling back to
gpiolib for extended (EGPIO) handling. However the driver in
gpio/gpio-sa1100.c already handles the same functionality for
these lines, yet remain unused.

The only upside would be things like a timing-critical hotpath
on bit-banged GPIO, but that kind of things does not seem to
happen on these GPIOs, so it is not worth having the extra
complexity.

Tested with some buttons on the Compaq iPAQ H3630.

Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9a48aa4c

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -692,7 +692,6 @@ config ARCH_SA1100 
	select GENERIC_CLOCKEVENTS

	select HAVE_IDE

	select ISA

	select NEED_MACH_GPIO_H

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

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

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-sa1100/include/mach/gpio.h

 *

 * SA1100 GPIO wrappers for arch-neutral GPIO calls

 *

 * Written by Philipp Zabel <philipp.zabel@gmail.com>

 *

 * 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

 *

 */



#ifndef __ASM_ARCH_SA1100_GPIO_H

#define __ASM_ARCH_SA1100_GPIO_H



#include <linux/io.h>

#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm-generic/gpio.h>



#define __ARM_GPIOLIB_COMPLEX



static inline int gpio_get_value(unsigned gpio)

{

	if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX))

		return GPLR & GPIO_GPIO(gpio);

	else

		return __gpio_get_value(gpio);

}



static inline void gpio_set_value(unsigned gpio, int value)

{

	if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX))

		if (value)

			GPSR = GPIO_GPIO(gpio);

		else

			GPCR = GPIO_GPIO(gpio);

	else

		__gpio_set_value(gpio, value);

}



#define gpio_cansleep	__gpio_cansleep



#endif

arch/arm/mach-sa1100/include/mach/h3xxx.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#ifndef _INCLUDE_H3XXX_H_

#define _INCLUDE_H3XXX_H_



#include "hardware.h" /* Gives GPIO_MAX */



/* Physical memory regions corresponding to chip selects */

#define H3600_EGPIO_PHYS	(SA1100_CS5_PHYS + 0x01000000)

#define H3600_BANK_2_PHYS	SA1100_CS2_PHYS

drivers/gpio/gpio-sa1100.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/module.h>



#include <linux/io.h>

#include <mach/hardware.h>

#include <mach/irqs.h>