3169663ac5
Make the OS timer registers have IOMEM like properities so they can be passed to readl_relaxed/writel_relaxed() et.al. rather than being straight volatile dereferences. Add linux/io.h includes where required. linux/io.h includes added to arch/arm/mach-sa1100/cpu-sa1100.c, arch/arm/mach-sa1100/jornada720_ssp.c, arch/arm/mach-sa1100/leds-lart.c drivers/input/touchscreen/jornada720_ts.c, drivers/pcmcia/sa1100_shannon.c from Arnd. This fixes these warnings: arch/arm/mach-sa1100/time.c: In function 'sa1100_timer_init': arch/arm/mach-sa1100/time.c:104: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type arch/arm/mach-pxa/time.c: In function 'pxa_timer_init': arch/arm/mach-pxa/time.c:126: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
56 lines
1.5 KiB
C
56 lines
1.5 KiB
C
/*
|
|
* 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
|