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

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

ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics 



The <mach/gpio.h> file is included from upper directories
and deal with generic GPIO and gpiolib stuff. Break out the
platform and driver specific defines and functions into its own
header file.

Cc: Ryan Mallon <rmallon@gmail.com>
Acked-by: default avatarHartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ea5abbd2

arch/arm/mach-ep93xx/core.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <mach/fb.h>

#include <mach/ep93xx_keypad.h>

#include <mach/ep93xx_spi.h>

#include <mach/gpio-ep93xx.h>



#include <asm/mach/map.h>

#include <asm/mach/time.h>

arch/arm/mach-ep93xx/edb93xx.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <mach/hardware.h>

#include <mach/fb.h>

#include <mach/ep93xx_spi.h>

#include <mach/gpio-ep93xx.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-ep93xx/include/mach/gpio.h→arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h

+4 −9
Original line number Diff line number Diff line 
/*

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

 */

/* Include file for the EP93XX GPIO controller machine specifics */



#ifndef __ASM_ARCH_GPIO_H

#define __ASM_ARCH_GPIO_H

#ifndef __GPIO_EP93XX_H

#define __GPIO_EP93XX_H



/* GPIO port A.  */

#define EP93XX_GPIO_LINE_A(x)		((x) + 0)
@@ -99,7 +97,4 @@ 
/* maximum value for irq capable line identifiers */

#define EP93XX_GPIO_LINE_MAX_IRQ	EP93XX_GPIO_LINE_F(7)



#define gpio_to_irq		__gpio_to_irq

#define irq_to_gpio(irq)	((irq) - gpio_to_irq(0))



#endif
 
#endif /* __GPIO_EP93XX_H */

arch/arm/mach-ep93xx/simone.c

+1 −1
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>



#include <mach/hardware.h>

#include <mach/fb.h>

#include <mach/gpio-ep93xx.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-ep93xx/snappercl15.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>

#include <linux/fb.h>
@@ -30,6 +29,7 @@ 


#include <mach/hardware.h>

#include <mach/fb.h>

#include <mach/gpio-ep93xx.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>