Merge tag 'rproc-v4.9' of git://github.com/andersson/remoteproc

[cascardo/linux.git] / drivers / gpio / gpio-lpc32xx.c

diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index fc5f197..92b3ae2 100644 (file)
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -25,7 +25,6 @@
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/platform_data/gpio-lpc32xx.h>
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
@@ -68,6 +67,20 @@
 #define GPI3_PIN_IN_SEL(x, y)                  (((x) >> (y)) & 1)
 #define GPO3_PIN_IN_SEL(x, y)                  (((x) >> (y)) & 1)
 
+#define LPC32XX_GPIO_P0_MAX    8
+#define LPC32XX_GPIO_P1_MAX    24
+#define LPC32XX_GPIO_P2_MAX    13
+#define LPC32XX_GPIO_P3_MAX    6
+#define LPC32XX_GPI_P3_MAX     29
+#define LPC32XX_GPO_P3_MAX     24
+
+#define LPC32XX_GPIO_P0_GRP    0
+#define LPC32XX_GPIO_P1_GRP    (LPC32XX_GPIO_P0_GRP + LPC32XX_GPIO_P0_MAX)
+#define LPC32XX_GPIO_P2_GRP    (LPC32XX_GPIO_P1_GRP + LPC32XX_GPIO_P1_MAX)
+#define LPC32XX_GPIO_P3_GRP    (LPC32XX_GPIO_P2_GRP + LPC32XX_GPIO_P2_MAX)
+#define LPC32XX_GPI_P3_GRP     (LPC32XX_GPIO_P3_GRP + LPC32XX_GPIO_P3_MAX)
+#define LPC32XX_GPO_P3_GRP     (LPC32XX_GPI_P3_GRP + LPC32XX_GPI_P3_MAX)
+
 struct gpio_regs {
        void __iomem *inp_state;
        void __iomem *outp_state;