mach-ux500: gpio: Moved the NOMADIK_NR_GPIO

Move the NOMADIK_NR_GPIO to the right
location.

Fix warnings generated by this change.

ST-Ericsson Linux next: ER 340134
ST-Ericsson ID: 340139
ST-Ericsson FOSS-OUT ID: Trivial

Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I5b69d4a4662b707d815a867b2b5be19e4675d010
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24082
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>

8 files changed, 8 insertions, 7 deletions

diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c
index 6f30598fc74..912f884a09e 100644
--- a/arch/arm/mach-ux500/board-mop500-u8500uib.c
+++ b/arch/arm/mach-ux500/board-mop500-u8500uib.c
@@ -17,7 +17,7 @@
 #include <../drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h>
 
 #include <asm/mach-types.h>
-#include <mach/gpio.h>
+#include <linux/gpio.h>
 #include <mach/irqs.h>
 
 #include "board-mop500.h"
diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index d9a247b3506..0f0062c4b97 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 <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <mach/devices.h>
diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
index 0f0ce48774e..a6805094d6a 100644
--- a/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -13,12 +13,12 @@
 #include <linux/platform_device.h>
 #include <linux/amba/bus.h>
 #include <linux/pm.h>
+#include <linux/gpio.h>
 
 #include <video/mcde_display.h>
 #include <video/mcde_display-av8100.h>
 #include <video/mcde_fb.h>
 
-#include <plat/gpio.h>
 extern struct dev_power_domain ux500_dev_power_domain;
 
 #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 b91f296b452..0242501650f 100644
--- a/arch/arm/mach-ux500/include/mach/gpio.h
+++ b/arch/arm/mach-ux500/include/mach/gpio.h
@@ -6,6 +6,7 @@
  * room for a couple of GPIO expanders.
  */
 #define ARCH_NR_GPIOS	355
+#define NOMADIK_NR_GPIO	288
 
 #include <plat/gpio.h>
 
diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
index 52e1e4aad25..4c7d188cbc0 100644
--- a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
+++ b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
@@ -10,6 +10,7 @@
 
 /* Number of AB8500 irqs is taken from header file */
 #include <linux/mfd/ab8500.h>
+#include <linux/gpio.h>
 
 #define IRQ_LOCALTIMER			29
 #define IRQ_LOCALWDOG			30
@@ -26,7 +27,6 @@
 #define DBX500_NR_INTERNAL_IRQS		160
 
 /* After chip-specific IRQ numbers we have the GPIO ones */
-#define NOMADIK_NR_GPIO			288
 #define NOMADIK_GPIO_TO_IRQ(gpio)	((gpio) + DBX500_NR_INTERNAL_IRQS)
 #define NOMADIK_IRQ_TO_GPIO(irq)	((irq) - DBX500_NR_INTERNAL_IRQS)
 #define IRQ_GPIO_END			NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO)
diff --git a/arch/arm/mach-ux500/include/mach/msp.h b/arch/arm/mach-ux500/include/mach/msp.h
index aecca3a59a3..ce6ec08e08d 100644
--- a/arch/arm/mach-ux500/include/mach/msp.h
+++ b/arch/arm/mach-ux500/include/mach/msp.h
@@ -16,7 +16,7 @@
 #include <linux/irqreturn.h>
 #include <linux/bitops.h>
 #include <plat/ste_dma40.h>
-#include <mach/gpio.h>
+#include <linux/gpio.h>
 #include <linux/spi/stm_msp.h>
 
 /* Generic config struct. Use the actual values defined below for global
diff --git a/arch/arm/mach-ux500/pm/cpuidle.c b/arch/arm/mach-ux500/pm/cpuidle.c
index 5783d0ce0e3..f4390141fcd 100644
--- a/arch/arm/mach-ux500/pm/cpuidle.c
+++ b/arch/arm/mach-ux500/pm/cpuidle.c
@@ -16,7 +16,7 @@
 #include <linux/tick.h>
 #include <linux/clockchips.h>
 
-#include <plat/gpio.h>
+#include <linux/gpio.h>
 
 #include <mach/prcmu-fw-api.h>
 
diff --git a/arch/arm/mach-ux500/pm/cpuidle_dbg.c b/arch/arm/mach-ux500/pm/cpuidle_dbg.c
index 1db7020a93c..8857184f85e 100644
--- a/arch/arm/mach-ux500/pm/cpuidle_dbg.c
+++ b/arch/arm/mach-ux500/pm/cpuidle_dbg.c
@@ -21,7 +21,7 @@
 #include <linux/seq_file.h>
 #include <linux/amba/serial.h>
 
-#include <plat/gpio.h>
+#include <linux/gpio.h>
 #include <asm/hardware/gic.h>
 
 #include "cpuidle.h"