m68knommu: introduce macros to simplify ColdFire GPIO table initialization

We have very large tables in the ColdFire CPU GPIO setup code that essentially
boil down to 2 distinct types of GPIO pin initiaization. Using 2 macros we can
reduce these large tables to at most a dozen lines of setup code, and in quite
a few cases a single table entry.

Introduce these 2 macros into the existing mcfgpio.h header.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Steven King <sfking@fdwdc.com>

1 files changed, 54 insertions, 0 deletions

diff --git a/arch/m68k/include/asm/mcfgpio.h b/arch/m68k/include/asm/mcfgpio.h
index ee5e4ccce89e..1bc877b45554 100644
--- a/arch/m68k/include/asm/mcfgpio.h
+++ b/arch/m68k/include/asm/mcfgpio.h
@@ -37,4 +37,58 @@ void mcf_gpio_set_value_fast(struct gpio_chip *, unsigned, int);
 int mcf_gpio_request(struct gpio_chip *, unsigned);
 void mcf_gpio_free(struct gpio_chip *, unsigned);
 
+/*
+ *      Define macros to ease the pain of setting up the GPIO tables. There
+ *      are two cases we need to deal with here, they cover all currently
+ *      available ColdFire GPIO hardware. There are of course minor differences
+ *      in the layout and number of bits in each ColdFire part, but the macros
+ *      take all that in.
+ *
+ *      Firstly is the conventional GPIO registers where we toggle individual
+ *      bits in a register, preserving the other bits in the register. For
+ *      lack of a better term I have called this the slow method.
+ */
+#define MCFGPS(mlabel, mbase, mngpio, mpddr, mpodr, mppdr)                  \
+        {                                                                   \
+                .gpio_chip                      = {                         \
+                        .label                  = #mlabel,                  \
+                        .request                = mcf_gpio_request,         \
+                        .free                   = mcf_gpio_free,            \
+                        .direction_input        = mcf_gpio_direction_input, \
+                        .direction_output       = mcf_gpio_direction_output,\
+                        .get                    = mcf_gpio_get_value,       \
+                        .set                    = mcf_gpio_set_value,       \
+                        .base                   = mbase,                    \
+                        .ngpio                  = mngpio,                   \
+                },                                                          \
+                .pddr           = (void __iomem *) mpddr,                   \
+                .podr           = (void __iomem *) mpodr,                   \
+                .ppdr           = (void __iomem *) mppdr,                   \
+        }
+
+/*
+ *      Secondly is the faster case, where we have set and clear registers
+ *      that allow us to set or clear a bit with a single write, not having
+ *      to worry about preserving other bits.
+ */
+#define MCFGPF(mlabel, mbase, mngpio)                                       \
+        {                                                                   \
+                .gpio_chip                      = {                         \
+                        .label                  = #mlabel,                  \
+                        .request                = mcf_gpio_request,         \
+                        .free                   = mcf_gpio_free,            \
+                        .direction_input        = mcf_gpio_direction_input, \
+                        .direction_output       = mcf_gpio_direction_output,\
+                        .get                    = mcf_gpio_get_value,       \
+                        .set                    = mcf_gpio_set_value_fast,  \
+                        .base                   = mbase,                    \
+                        .ngpio                  = mngpio,                   \
+                },                                                          \
+                .pddr           = (void __iomem *) MCFGPIO_PDDR_##mlabel,   \
+                .podr           = (void __iomem *) MCFGPIO_PODR_##mlabel,   \
+                .ppdr           = (void __iomem *) MCFGPIO_PPDSDR_##mlabel, \
+                .setr           = (void __iomem *) MCFGPIO_PPDSDR_##mlabel, \
+                .clrr           = (void __iomem *) MCFGPIO_PCLRR_##mlabel,  \
+        }
+
 #endif