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

Commit 1486a740 authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'for_2.6.40/gpio-move' of... 

Merge branch 'for_2.6.40/gpio-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
parents bc786cce e5cdb13f

arch/arm/plat-omap/Makefile

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



# Common support

obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \

obj-y := common.o sram.o clock.o devices.o dma.o mux.o \

	 usb.o fb.o io.o counter_32k.o

obj-m :=

obj-n :=

arch/arm/plat-omap/include/plat/gpio.h

+103 −0
Original line number Diff line number Diff line
@@ -52,6 +52,109 @@ 


#define OMAP34XX_NR_GPIOS		6



/*

 * OMAP1510 GPIO registers

 */

#define OMAP1510_GPIO_DATA_INPUT	0x00

#define OMAP1510_GPIO_DATA_OUTPUT	0x04

#define OMAP1510_GPIO_DIR_CONTROL	0x08

#define OMAP1510_GPIO_INT_CONTROL	0x0c

#define OMAP1510_GPIO_INT_MASK		0x10

#define OMAP1510_GPIO_INT_STATUS	0x14

#define OMAP1510_GPIO_PIN_CONTROL	0x18



#define OMAP1510_IH_GPIO_BASE		64



/*

 * OMAP1610 specific GPIO registers

 */

#define OMAP1610_GPIO_REVISION		0x0000

#define OMAP1610_GPIO_SYSCONFIG		0x0010

#define OMAP1610_GPIO_SYSSTATUS		0x0014

#define OMAP1610_GPIO_IRQSTATUS1	0x0018

#define OMAP1610_GPIO_IRQENABLE1	0x001c

#define OMAP1610_GPIO_WAKEUPENABLE	0x0028

#define OMAP1610_GPIO_DATAIN		0x002c

#define OMAP1610_GPIO_DATAOUT		0x0030

#define OMAP1610_GPIO_DIRECTION		0x0034

#define OMAP1610_GPIO_EDGE_CTRL1	0x0038

#define OMAP1610_GPIO_EDGE_CTRL2	0x003c

#define OMAP1610_GPIO_CLEAR_IRQENABLE1	0x009c

#define OMAP1610_GPIO_CLEAR_WAKEUPENA	0x00a8

#define OMAP1610_GPIO_CLEAR_DATAOUT	0x00b0

#define OMAP1610_GPIO_SET_IRQENABLE1	0x00dc

#define OMAP1610_GPIO_SET_WAKEUPENA	0x00e8

#define OMAP1610_GPIO_SET_DATAOUT	0x00f0



/*

 * OMAP7XX specific GPIO registers

 */

#define OMAP7XX_GPIO_DATA_INPUT		0x00

#define OMAP7XX_GPIO_DATA_OUTPUT	0x04

#define OMAP7XX_GPIO_DIR_CONTROL	0x08

#define OMAP7XX_GPIO_INT_CONTROL	0x0c

#define OMAP7XX_GPIO_INT_MASK		0x10

#define OMAP7XX_GPIO_INT_STATUS		0x14



/*

 * omap2+ specific GPIO registers

 */

#define OMAP24XX_GPIO_REVISION		0x0000

#define OMAP24XX_GPIO_IRQSTATUS1	0x0018

#define OMAP24XX_GPIO_IRQSTATUS2	0x0028

#define OMAP24XX_GPIO_IRQENABLE2	0x002c

#define OMAP24XX_GPIO_IRQENABLE1	0x001c

#define OMAP24XX_GPIO_WAKE_EN		0x0020

#define OMAP24XX_GPIO_CTRL		0x0030

#define OMAP24XX_GPIO_OE		0x0034

#define OMAP24XX_GPIO_DATAIN		0x0038

#define OMAP24XX_GPIO_DATAOUT		0x003c

#define OMAP24XX_GPIO_LEVELDETECT0	0x0040

#define OMAP24XX_GPIO_LEVELDETECT1	0x0044

#define OMAP24XX_GPIO_RISINGDETECT	0x0048

#define OMAP24XX_GPIO_FALLINGDETECT	0x004c

#define OMAP24XX_GPIO_DEBOUNCE_EN	0x0050

#define OMAP24XX_GPIO_DEBOUNCE_VAL	0x0054

#define OMAP24XX_GPIO_CLEARIRQENABLE1	0x0060

#define OMAP24XX_GPIO_SETIRQENABLE1	0x0064

#define OMAP24XX_GPIO_CLEARWKUENA	0x0080

#define OMAP24XX_GPIO_SETWKUENA		0x0084

#define OMAP24XX_GPIO_CLEARDATAOUT	0x0090

#define OMAP24XX_GPIO_SETDATAOUT	0x0094



#define OMAP4_GPIO_REVISION		0x0000

#define OMAP4_GPIO_EOI			0x0020

#define OMAP4_GPIO_IRQSTATUSRAW0	0x0024

#define OMAP4_GPIO_IRQSTATUSRAW1	0x0028

#define OMAP4_GPIO_IRQSTATUS0		0x002c

#define OMAP4_GPIO_IRQSTATUS1		0x0030

#define OMAP4_GPIO_IRQSTATUSSET0	0x0034

#define OMAP4_GPIO_IRQSTATUSSET1	0x0038

#define OMAP4_GPIO_IRQSTATUSCLR0	0x003c

#define OMAP4_GPIO_IRQSTATUSCLR1	0x0040

#define OMAP4_GPIO_IRQWAKEN0		0x0044

#define OMAP4_GPIO_IRQWAKEN1		0x0048

#define OMAP4_GPIO_IRQENABLE1		0x011c

#define OMAP4_GPIO_WAKE_EN		0x0120

#define OMAP4_GPIO_IRQSTATUS2		0x0128

#define OMAP4_GPIO_IRQENABLE2		0x012c

#define OMAP4_GPIO_CTRL			0x0130

#define OMAP4_GPIO_OE			0x0134

#define OMAP4_GPIO_DATAIN		0x0138

#define OMAP4_GPIO_DATAOUT		0x013c

#define OMAP4_GPIO_LEVELDETECT0		0x0140

#define OMAP4_GPIO_LEVELDETECT1		0x0144

#define OMAP4_GPIO_RISINGDETECT		0x0148

#define OMAP4_GPIO_FALLINGDETECT	0x014c

#define OMAP4_GPIO_DEBOUNCENABLE	0x0150

#define OMAP4_GPIO_DEBOUNCINGTIME	0x0154

#define OMAP4_GPIO_CLEARIRQENABLE1	0x0160

#define OMAP4_GPIO_SETIRQENABLE1	0x0164

#define OMAP4_GPIO_CLEARWKUENA		0x0180

#define OMAP4_GPIO_SETWKUENA		0x0184

#define OMAP4_GPIO_CLEARDATAOUT		0x0190

#define OMAP4_GPIO_SETDATAOUT		0x0194



#define OMAP_MPUIO(nr)		(OMAP_MAX_GPIO_LINES + (nr))

#define OMAP_GPIO_IS_MPUIO(nr)	((nr) >= OMAP_MAX_GPIO_LINES)

drivers/gpio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_GPIO_MAX732X) += max732x.o 
obj-$(CONFIG_GPIO_MC33880)	+= mc33880.o

obj-$(CONFIG_GPIO_MCP23S08)	+= mcp23s08.o

obj-$(CONFIG_GPIO_74X164)	+= 74x164.o

obj-$(CONFIG_ARCH_OMAP)         += gpio-omap.o

obj-$(CONFIG_GPIO_PCA953X)	+= pca953x.o

obj-$(CONFIG_GPIO_PCF857X)	+= pcf857x.o

obj-$(CONFIG_GPIO_PCH)		+= pch_gpio.o

arch/arm/plat-omap/gpio.c→drivers/gpio/gpio-omap.c

+0 −105
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/plat-omap/gpio.c

 *

 * Support functions for OMAP GPIO

 *

 * Copyright (C) 2003-2005 Nokia Corporation
@@ -30,109 +28,6 @@ 
#include <mach/gpio.h>

#include <asm/mach/irq.h>



/*

 * OMAP1510 GPIO registers

 */

#define OMAP1510_GPIO_DATA_INPUT	0x00

#define OMAP1510_GPIO_DATA_OUTPUT	0x04

#define OMAP1510_GPIO_DIR_CONTROL	0x08

#define OMAP1510_GPIO_INT_CONTROL	0x0c

#define OMAP1510_GPIO_INT_MASK		0x10

#define OMAP1510_GPIO_INT_STATUS	0x14

#define OMAP1510_GPIO_PIN_CONTROL	0x18



#define OMAP1510_IH_GPIO_BASE		64



/*

 * OMAP1610 specific GPIO registers

 */

#define OMAP1610_GPIO_REVISION		0x0000

#define OMAP1610_GPIO_SYSCONFIG		0x0010

#define OMAP1610_GPIO_SYSSTATUS		0x0014

#define OMAP1610_GPIO_IRQSTATUS1	0x0018

#define OMAP1610_GPIO_IRQENABLE1	0x001c

#define OMAP1610_GPIO_WAKEUPENABLE	0x0028

#define OMAP1610_GPIO_DATAIN		0x002c

#define OMAP1610_GPIO_DATAOUT		0x0030

#define OMAP1610_GPIO_DIRECTION		0x0034

#define OMAP1610_GPIO_EDGE_CTRL1	0x0038

#define OMAP1610_GPIO_EDGE_CTRL2	0x003c

#define OMAP1610_GPIO_CLEAR_IRQENABLE1	0x009c

#define OMAP1610_GPIO_CLEAR_WAKEUPENA	0x00a8

#define OMAP1610_GPIO_CLEAR_DATAOUT	0x00b0

#define OMAP1610_GPIO_SET_IRQENABLE1	0x00dc

#define OMAP1610_GPIO_SET_WAKEUPENA	0x00e8

#define OMAP1610_GPIO_SET_DATAOUT	0x00f0



/*

 * OMAP7XX specific GPIO registers

 */

#define OMAP7XX_GPIO_DATA_INPUT		0x00

#define OMAP7XX_GPIO_DATA_OUTPUT	0x04

#define OMAP7XX_GPIO_DIR_CONTROL	0x08

#define OMAP7XX_GPIO_INT_CONTROL	0x0c

#define OMAP7XX_GPIO_INT_MASK		0x10

#define OMAP7XX_GPIO_INT_STATUS		0x14



/*

 * omap2+ specific GPIO registers

 */

#define OMAP24XX_GPIO_REVISION		0x0000

#define OMAP24XX_GPIO_IRQSTATUS1	0x0018

#define OMAP24XX_GPIO_IRQSTATUS2	0x0028

#define OMAP24XX_GPIO_IRQENABLE2	0x002c

#define OMAP24XX_GPIO_IRQENABLE1	0x001c

#define OMAP24XX_GPIO_WAKE_EN		0x0020

#define OMAP24XX_GPIO_CTRL		0x0030

#define OMAP24XX_GPIO_OE		0x0034

#define OMAP24XX_GPIO_DATAIN		0x0038

#define OMAP24XX_GPIO_DATAOUT		0x003c

#define OMAP24XX_GPIO_LEVELDETECT0	0x0040

#define OMAP24XX_GPIO_LEVELDETECT1	0x0044

#define OMAP24XX_GPIO_RISINGDETECT	0x0048

#define OMAP24XX_GPIO_FALLINGDETECT	0x004c

#define OMAP24XX_GPIO_DEBOUNCE_EN	0x0050

#define OMAP24XX_GPIO_DEBOUNCE_VAL	0x0054

#define OMAP24XX_GPIO_CLEARIRQENABLE1	0x0060

#define OMAP24XX_GPIO_SETIRQENABLE1	0x0064

#define OMAP24XX_GPIO_CLEARWKUENA	0x0080

#define OMAP24XX_GPIO_SETWKUENA		0x0084

#define OMAP24XX_GPIO_CLEARDATAOUT	0x0090

#define OMAP24XX_GPIO_SETDATAOUT	0x0094



#define OMAP4_GPIO_REVISION		0x0000

#define OMAP4_GPIO_EOI			0x0020

#define OMAP4_GPIO_IRQSTATUSRAW0	0x0024

#define OMAP4_GPIO_IRQSTATUSRAW1	0x0028

#define OMAP4_GPIO_IRQSTATUS0		0x002c

#define OMAP4_GPIO_IRQSTATUS1		0x0030

#define OMAP4_GPIO_IRQSTATUSSET0	0x0034

#define OMAP4_GPIO_IRQSTATUSSET1	0x0038

#define OMAP4_GPIO_IRQSTATUSCLR0	0x003c

#define OMAP4_GPIO_IRQSTATUSCLR1	0x0040

#define OMAP4_GPIO_IRQWAKEN0		0x0044

#define OMAP4_GPIO_IRQWAKEN1		0x0048

#define OMAP4_GPIO_IRQENABLE1		0x011c

#define OMAP4_GPIO_WAKE_EN		0x0120

#define OMAP4_GPIO_IRQSTATUS2		0x0128

#define OMAP4_GPIO_IRQENABLE2		0x012c

#define OMAP4_GPIO_CTRL			0x0130

#define OMAP4_GPIO_OE			0x0134

#define OMAP4_GPIO_DATAIN		0x0138

#define OMAP4_GPIO_DATAOUT		0x013c

#define OMAP4_GPIO_LEVELDETECT0		0x0140

#define OMAP4_GPIO_LEVELDETECT1		0x0144

#define OMAP4_GPIO_RISINGDETECT		0x0148

#define OMAP4_GPIO_FALLINGDETECT	0x014c

#define OMAP4_GPIO_DEBOUNCENABLE	0x0150

#define OMAP4_GPIO_DEBOUNCINGTIME	0x0154

#define OMAP4_GPIO_CLEARIRQENABLE1	0x0160

#define OMAP4_GPIO_SETIRQENABLE1	0x0164

#define OMAP4_GPIO_CLEARWKUENA		0x0180

#define OMAP4_GPIO_SETWKUENA		0x0184

#define OMAP4_GPIO_CLEARDATAOUT		0x0190

#define OMAP4_GPIO_SETDATAOUT		0x0194



struct gpio_bank {

	unsigned long pbase;

	void __iomem *base;