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

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

ARM: 7104/1: plat-pxa: 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: Eric Miao <eric.y.miao@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 354bf801

arch/arm/mach-mmp/aspenite.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>

#include <linux/interrupt.h>

#include <linux/gpio.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-mmp/brownstone.c

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

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/max8649.h>

#include <linux/regulator/fixed.h>

arch/arm/mach-mmp/gplugd.c

+1 −1
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
 */



#include <linux/init.h>

#include <linux/gpio.h>



#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <mach/gpio.h>

#include <mach/pxa168.h>

#include <mach/mfp-pxa168.h>

#include <mach/mfp-gplugd.h>

arch/arm/mach-mmp/include/mach/gpio-pxa.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_GPIO_PXA_H

#define __ASM_MACH_GPIO_PXA_H



#include <mach/addr-map.h>

#include <mach/irqs.h>



#define GPIO_REGS_VIRT	(APB_VIRT_BASE + 0x19000)



#define BANK_OFF(n)	(((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))

#define GPIO_REG(x)	(*((volatile u32 *)(GPIO_REGS_VIRT + (x))))



#define NR_BUILTIN_GPIO		IRQ_GPIO_NUM



#define gpio_to_bank(gpio)	((gpio) >> 5)



/* NOTE: these macros are defined here to make optimization of

 * gpio_{get,set}_value() to work when 'gpio' is a constant.

 * Usage of these macros otherwise is no longer recommended,

 * use generic GPIO API whenever possible.

 */

#define GPIO_bit(gpio)	(1 << ((gpio) & 0x1f))



#define GPLR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x00)

#define GPDR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x0c)

#define GPSR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x18)

#define GPCR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x24)



#include <plat/gpio-pxa.h>



#endif /* __ASM_MACH_GPIO_PXA_H */

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

+0 −23
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_GPIO_H

#define __ASM_MACH_GPIO_H



#include <mach/addr-map.h>

#include <mach/irqs.h>

#include <asm-generic/gpio.h>



#define GPIO_REGS_VIRT	(APB_VIRT_BASE + 0x19000)



#define BANK_OFF(n)	(((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))

#define GPIO_REG(x)	(*((volatile u32 *)(GPIO_REGS_VIRT + (x))))



#define NR_BUILTIN_GPIO		IRQ_GPIO_NUM



#define gpio_to_bank(gpio)	((gpio) >> 5)

#define gpio_to_irq(gpio)	(IRQ_GPIO_START + (gpio))

#define irq_to_gpio(irq)	((irq) - IRQ_GPIO_START)





#define __gpio_is_inverted(gpio)	(0)

#define __gpio_is_occupied(gpio)	(0)



/* NOTE: these macros are defined here to make optimization of

 * gpio_{get,set}_value() to work when 'gpio' is a constant.

 * Usage of these macros otherwise is no longer recommended,

 * use generic GPIO API whenever possible.

 */

#define GPIO_bit(gpio)	(1 << ((gpio) & 0x1f))



#define GPLR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x00)

#define GPDR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x0c)

#define GPSR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x18)

#define GPCR(x)		GPIO_REG(BANK_OFF(gpio_to_bank(x)) + 0x24)



#include <plat/gpio.h>

#endif /* __ASM_MACH_GPIO_H */