Merge branch 'depends/rmk/gpio' into next/fixes

This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
author: Arnd Bergmann <arnd@arndb.de> 2011-10-31 17:44:18 -0400
committer: Arnd Bergmann <arnd@arndb.de> 2011-10-31 17:44:18 -0400
commit: 43872fa788060eef91ae437957e0a5e39f1c56fd (patch)
tree: dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/mach-ux500
parent: 91fed558d0f33c74477569f50ed883fe6d430f1f (diff)
parent: f55be1bf52aad524dc1bf556ae26c90262c87825 (diff)
9 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index f26fd76f72b4..15b23e4bd488 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -6,10 +6,10 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/gpio.h>
 #include <asm/mach-types.h>
 #include <plat/pincfg.h>
+#include <plat/gpio-nomadik.h>
 #include <mach/hardware.h>
 #include "pins-db8500.h"
diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c
index 8ce46c0fdfd5..feb5744d98b7 100644
--- a/arch/arm/mach-ux500/board-mop500-u8500uib.c
+++ b/arch/arm/mach-ux500/board-mop500-u8500uib.c
@@ -4,7 +4,7 @@
 * Board data for the U8500 UIB, also known as the New UIB
 * License terms: GNU General Public License (GPL), version 2
 */
+#include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
@@ -13,7 +13,6 @@
 #include <linux/mfd/tc3589x.h>
 #include <linux/input/matrix_keypad.h>
-#include <mach/gpio.h>
 #include <mach/irqs.h>
 #include "board-mop500.h"
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index cd54abaccd96..537ab63c1dc9 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -37,6 +37,7 @@
 #include <plat/i2c.h>
 #include <plat/ste_dma40.h>
 #include <plat/pincfg.h>
+#include <plat/gpio-nomadik.h>
 #include <mach/hardware.h>
 #include <mach/setup.h>
diff --git a/arch/arm/mach-ux500/board-u5500-sdi.c b/arch/arm/mach-ux500/board-u5500-sdi.c
index 739fb4c5b160..63c3f8058ffc 100644
--- a/arch/arm/mach-ux500/board-u5500-sdi.c
+++ b/arch/arm/mach-ux500/board-u5500-sdi.c
@@ -7,9 +7,9 @@
 #include <linux/amba/mmci.h>
 #include <linux/mmc/host.h>
-#include <linux/gpio.h>
 #include <plat/pincfg.h>
+#include <plat/gpio-nomadik.h>
 #include <mach/db5500-regs.h>
 #include <plat/ste_dma40.h>
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index e58f0f562426..2d9e191bd30a 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -8,7 +8,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/amba/bus.h>
-#include <linux/gpio.h>
 #include <linux/irq.h>
 #include <linux/i2c.h>
@@ -17,6 +16,7 @@
 #include <plat/pincfg.h>
 #include <plat/i2c.h>
+#include <plat/gpio-nomadik.h>
 #include <mach/hardware.h>
 #include <mach/devices.h>
diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index 22705d246fc7..9de1af008094 100644
--- a/arch/arm/mach-ux500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -13,7 +13,7 @@
 #include <asm/mach/map.h>
 #include <asm/pmu.h>
-#include <plat/gpio.h>
+#include <plat/gpio-nomadik.h>
 #include <mach/hardware.h>
 #include <mach/devices.h>
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 4598b06c8c55..13e8890a8b8a 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -14,12 +14,12 @@
 #include <linux/amba/bus.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <asm/mach/map.h>
 #include <asm/pmu.h>
+#include <plat/gpio-nomadik.h>
 #include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/devices.h>
diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
index 13a4ce046ae5..c563e5418d80 100644
--- a/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/amba/bus.h>
-#include <plat/gpio.h>
+#include <plat/gpio-nomadik.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h
index 3c4cd31ad9f7..7389df911b1a 100644
--- a/arch/arm/mach-ux500/include/mach/gpio.h
+++ b/arch/arm/mach-ux500/include/mach/gpio.h
@@ -7,6 +7,4 @@
 */
 #define ARCH_NR_GPIOS   350
-#include <plat/gpio.h>
 #endif /* __ASM_ARCH_GPIO_H */
author	Arnd Bergmann <arnd@arndb.de>	2011-10-31 17:44:18 -0400
committer	Arnd Bergmann <arnd@arndb.de>	2011-10-31 17:44:18 -0400
commit	43872fa788060eef91ae437957e0a5e39f1c56fd (patch)
tree	dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/mach-ux500
parent	91fed558d0f33c74477569f50ed883fe6d430f1f (diff)
parent	f55be1bf52aad524dc1bf556ae26c90262c87825 (diff)

diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index f26fd76f72b4..15b23e4bd488 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -6,10 +6,10 @@
6		6
7	#include <linux/kernel.h>	7	#include <linux/kernel.h>
8	#include <linux/init.h>	8	#include <linux/init.h>
9	#include <linux/gpio.h>
10		9
11	#include <asm/mach-types.h>	10	#include <asm/mach-types.h>
12	#include <plat/pincfg.h>	11	#include <plat/pincfg.h>
		12	#include <plat/gpio-nomadik.h>
13	#include <mach/hardware.h>	13	#include <mach/hardware.h>
14		14
15	#include "pins-db8500.h"	15	#include "pins-db8500.h"


diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c index 8ce46c0fdfd5..feb5744d98b7 100644 --- a/arch/arm/mach-ux500/board-mop500-u8500uib.c +++ b/arch/arm/mach-ux500/board-mop500-u8500uib.c
@@ -4,7 +4,7 @@
4	* Board data for the U8500 UIB, also known as the New UIB	4	* Board data for the U8500 UIB, also known as the New UIB
5	* License terms: GNU General Public License (GPL), version 2	5	* License terms: GNU General Public License (GPL), version 2
6	*/	6	*/
7		7	#include <linux/gpio.h>
8	#include <linux/kernel.h>	8	#include <linux/kernel.h>
9	#include <linux/init.h>	9	#include <linux/init.h>
10	#include <linux/i2c.h>	10	#include <linux/i2c.h>
@@ -13,7 +13,6 @@
13	#include <linux/mfd/tc3589x.h>	13	#include <linux/mfd/tc3589x.h>
14	#include <linux/input/matrix_keypad.h>	14	#include <linux/input/matrix_keypad.h>
15		15
16	#include <mach/gpio.h>
17	#include <mach/irqs.h>	16	#include <mach/irqs.h>
18		17
19	#include "board-mop500.h"	18	#include "board-mop500.h"


diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index cd54abaccd96..537ab63c1dc9 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c
@@ -37,6 +37,7 @@
37	#include <plat/i2c.h>	37	#include <plat/i2c.h>
38	#include <plat/ste_dma40.h>	38	#include <plat/ste_dma40.h>
39	#include <plat/pincfg.h>	39	#include <plat/pincfg.h>
		40	#include <plat/gpio-nomadik.h>
40		41
41	#include <mach/hardware.h>	42	#include <mach/hardware.h>
42	#include <mach/setup.h>	43	#include <mach/setup.h>


diff --git a/arch/arm/mach-ux500/board-u5500-sdi.c b/arch/arm/mach-ux500/board-u5500-sdi.c index 739fb4c5b160..63c3f8058ffc 100644 --- a/arch/arm/mach-ux500/board-u5500-sdi.c +++ b/arch/arm/mach-ux500/board-u5500-sdi.c
@@ -7,9 +7,9 @@
7		7
8	#include <linux/amba/mmci.h>	8	#include <linux/amba/mmci.h>
9	#include <linux/mmc/host.h>	9	#include <linux/mmc/host.h>
10	#include <linux/gpio.h>
11		10
12	#include <plat/pincfg.h>	11	#include <plat/pincfg.h>
		12	#include <plat/gpio-nomadik.h>
13	#include <mach/db5500-regs.h>	13	#include <mach/db5500-regs.h>
14	#include <plat/ste_dma40.h>	14	#include <plat/ste_dma40.h>
15		15


diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index e58f0f562426..2d9e191bd30a 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c
@@ -8,7 +8,6 @@
8	#include <linux/init.h>	8	#include <linux/init.h>
9	#include <linux/platform_device.h>	9	#include <linux/platform_device.h>
10	#include <linux/amba/bus.h>	10	#include <linux/amba/bus.h>
11	#include <linux/gpio.h>
12	#include <linux/irq.h>	11	#include <linux/irq.h>
13	#include <linux/i2c.h>	12	#include <linux/i2c.h>
14		13
@@ -17,6 +16,7 @@
17		16
18	#include <plat/pincfg.h>	17	#include <plat/pincfg.h>
19	#include <plat/i2c.h>	18	#include <plat/i2c.h>
		19	#include <plat/gpio-nomadik.h>
20		20
21	#include <mach/hardware.h>	21	#include <mach/hardware.h>
22	#include <mach/devices.h>	22	#include <mach/devices.h>


diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c index 22705d246fc7..9de1af008094 100644 --- a/arch/arm/mach-ux500/cpu-db5500.c +++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -13,7 +13,7 @@
13	#include <asm/mach/map.h>	13	#include <asm/mach/map.h>
14	#include <asm/pmu.h>	14	#include <asm/pmu.h>
15		15
16	#include <plat/gpio.h>	16	#include <plat/gpio-nomadik.h>
17		17
18	#include <mach/hardware.h>	18	#include <mach/hardware.h>
19	#include <mach/devices.h>	19	#include <mach/devices.h>


diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 4598b06c8c55..13e8890a8b8a 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -14,12 +14,12 @@
14	#include <linux/amba/bus.h>	14	#include <linux/amba/bus.h>
15	#include <linux/interrupt.h>	15	#include <linux/interrupt.h>
16	#include <linux/irq.h>	16	#include <linux/irq.h>
17	#include <linux/gpio.h>
18	#include <linux/platform_device.h>	17	#include <linux/platform_device.h>
19	#include <linux/io.h>	18	#include <linux/io.h>
20		19
21	#include <asm/mach/map.h>	20	#include <asm/mach/map.h>
22	#include <asm/pmu.h>	21	#include <asm/pmu.h>
		22	#include <plat/gpio-nomadik.h>
23	#include <mach/hardware.h>	23	#include <mach/hardware.h>
24	#include <mach/setup.h>	24	#include <mach/setup.h>
25	#include <mach/devices.h>	25	#include <mach/devices.h>


diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c index 13a4ce046ae5..c563e5418d80 100644 --- a/arch/arm/mach-ux500/devices-common.c +++ b/arch/arm/mach-ux500/devices-common.c
@@ -13,7 +13,7 @@
13	#include <linux/platform_device.h>	13	#include <linux/platform_device.h>
14	#include <linux/amba/bus.h>	14	#include <linux/amba/bus.h>
15		15
16	#include <plat/gpio.h>	16	#include <plat/gpio-nomadik.h>
17		17
18	#include <mach/hardware.h>	18	#include <mach/hardware.h>
19		19


diff --git a/arch/arm/mach-ux500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h index 3c4cd31ad9f7..7389df911b1a 100644 --- a/arch/arm/mach-ux500/include/mach/gpio.h +++ b/arch/arm/mach-ux500/include/mach/gpio.h
@@ -7,6 +7,4 @@
7	*/	7	*/
8	#define ARCH_NR_GPIOS 350	8	#define ARCH_NR_GPIOS 350
9		9
10	#include <plat/gpio.h>
11
12	#endif /* __ASM_ARCH_GPIO_H */	10	#endif /* __ASM_ARCH_GPIO_H */