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

Commit 66791859 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: shmobile: move custom gpio functions to sh-gpio.h 



Move custom shmobile gpio code to a sh-gpio.h to remove the dependency
on mach/gpio.h. shmobile always uses gpiolib, so we can remove
__GPIOLIB_COMPLEX define from mach/gpio.h.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Magnus Damm <magnus.damm@gmail.com>
parent 74595e17

arch/arm/mach-shmobile/board-ap4evb.c

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ 
#include <asm/mach/arch.h>

#include <asm/setup.h>



#include "sh-gpio.h"



/*

 * Address	Interface		BusWidth	note

 * ------------------------------------------------------------------

arch/arm/mach-shmobile/board-armadillo800eva.c

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
#include <sound/sh_fsi.h>

#include <sound/simple_card.h>



#include "sh-gpio.h"



/*

 * CON1		Camera Module

 * CON2		Extension Bus

arch/arm/mach-shmobile/board-g4evm.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include "sh-gpio.h"



/*

 * SDHI

 *

arch/arm/mach-shmobile/board-mackerel.c

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include "sh-gpio.h"



/*

 * Address	Interface		BusWidth	note

 * ------------------------------------------------------------------

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

+1 −62
Original line number Diff line number Diff line 
/*

 * Generic GPIO API and pinmux table support

 *

 * Copyright (c) 2008  Magnus Damm

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#ifndef __ASM_ARCH_GPIO_H

#define __ASM_ARCH_GPIO_H



#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/sh_pfc.h>

#include <linux/io.h>



#ifdef CONFIG_GPIOLIB



static inline int irq_to_gpio(unsigned int irq)

{

	return -ENOSYS;

}



#else



#define __ARM_GPIOLIB_COMPLEX



#endif /* CONFIG_GPIOLIB */



/*

 * FIXME !!

 *

 * current gpio frame work doesn't have

 * the method to control only pull up/down/free.

 * this function should be replaced by correct gpio function

 */

static inline void __init gpio_direction_none(u32 addr)

{

	__raw_writeb(0x00, addr);

}



static inline void __init gpio_request_pullup(u32 addr)

{

	u8 data = __raw_readb(addr);



	data &= 0x0F;

	data |= 0xC0;

	__raw_writeb(data, addr);

}



static inline void __init gpio_request_pulldown(u32 addr)

{

	u8 data = __raw_readb(addr);



	data &= 0x0F;

	data |= 0xA0;



	__raw_writeb(data, addr);

}



#endif /* __ASM_ARCH_GPIO_H */
 
/* empty */