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

Commit 45528e38 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

[ARM] 4961/1: gpiolib support for SA-1100 architecture 



This adds gpiolib support for the SA-1100 arch:
 - Move all GPIO API functions from generic.c into gpio.c
 - Convert all gpio functions into gpiolib callbacks.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c353faa4

arch/arm/Kconfig

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

	select GENERIC_TIME

	select HAVE_IDE

	select HAVE_GPIO_LIB

	help

	  Support for StrongARM 11x0 based boards.

arch/arm/mach-sa1100/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



# Common support

obj-y := clock.o generic.o irq.o dma.o time.o #nmi-oopser.o

obj-y := clock.o generic.o gpio.o irq.o dma.o time.o #nmi-oopser.o

obj-m :=

obj-n :=

obj-  :=

arch/arm/mach-sa1100/generic.c

+0 −31
Original line number Diff line number Diff line
@@ -139,37 +139,6 @@ unsigned long long sched_clock(void) 
	return v;

}



int gpio_direction_input(unsigned gpio)

{

	unsigned long flags;



	if (gpio > GPIO_MAX)

		return -EINVAL;



	local_irq_save(flags);

	GPDR &= ~GPIO_GPIO(gpio);

	local_irq_restore(flags);

	return 0;

}



EXPORT_SYMBOL(gpio_direction_input);



int gpio_direction_output(unsigned gpio, int value)

{

	unsigned long flags;



	if (gpio > GPIO_MAX)

		return -EINVAL;



	local_irq_save(flags);

	gpio_set_value(gpio, value);

	GPDR |= GPIO_GPIO(gpio);

	local_irq_restore(flags);

	return 0;

}



EXPORT_SYMBOL(gpio_direction_output);



/*

 * Default power-off for SA1100

 */

arch/arm/mach-sa1100/generic.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ struct sys_timer; 
extern struct sys_timer sa1100_timer;

extern void __init sa1100_map_io(void);

extern void __init sa1100_init_irq(void);

extern void __init sa1100_init_gpio(void);



#define SET_BANK(__nr,__start,__size) \

	mi->bank[__nr].start = (__start), \

arch/arm/mach-sa1100/gpio.c

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-sa1100/gpio.c

 *

 * Generic SA-1100 GPIO handling

 *

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

 */



#include <linux/init.h>

#include <linux/module.h>



#include <asm/gpio.h>

#include <asm/hardware.h>

#include "generic.h"



static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset)

{

	return GPLR & GPIO_GPIO(offset);

}



static void sa1100_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

{

	if (value)

		GPSR = GPIO_GPIO(offset);

	else

		GPCR = GPIO_GPIO(offset);

}



static int sa1100_direction_input(struct gpio_chip *chip, unsigned offset)

{

	unsigned long flags;



	local_irq_save(flags);

	GPDR &= ~GPIO_GPIO(offset);

	local_irq_restore(flags);

	return 0;

}



static int sa1100_direction_output(struct gpio_chip *chip, unsigned offset, int value)

{

	unsigned long flags;



	local_irq_save(flags);

	sa1100_gpio_set(chip, offset, value);

	GPDR |= GPIO_GPIO(offset);

	local_irq_restore(flags);

	return 0;

}



static struct gpio_chip sa1100_gpio_chip = {

	.label			= "gpio",

	.direction_input	= sa1100_direction_input,

	.direction_output	= sa1100_direction_output,

	.set			= sa1100_gpio_set,

	.get			= sa1100_gpio_get,

	.base			= 0,

	.ngpio			= GPIO_MAX + 1,

};



void __init sa1100_init_gpio(void)

{

	gpiochip_add(&sa1100_gpio_chip);

}