diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2009-06-06 08:09:55 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-06-17 06:06:28 -0400 |
commit | 51e02b02e650183ff1277bcbad6a01d6ea0e9edb (patch) | |
tree | 413dfa5c93e2d01a42309f1cee6d6bf26d871962 /arch/mips/Makefile | |
parent | eeb09e6545bf68222798ccf3f355560a9e406435 (diff) |
MIPS: Alchemy: Rewrite GPIO support.
The current in-kernel Alchemy GPIO support is far too inflexible for
all my use cases. To address this, the following changes are made:
* create generic functions which deal with manipulating the on-chip
GPIO1/2 blocks. Such functions are universally useful.
* Macros for GPIO2 shared interrupt management and block control.
* support for both built-in CONFIG_GPIOLIB and fast, inlined GPIO macros.
If CONFIG_GPIOLIB is not enabled, provide linux gpio framework
compatibility by directly inlining the GPIO1/2 functions. GPIO access
is limited to on-chip ones and they can be accessed as documented in
the datasheets (GPIO0-31 and 200-215).
If CONFIG_GPIOLIB is selected, two (2) gpio_chip-s, one for GPIO1 and
one for GPIO2, are registered. GPIOs can still be accessed by using
the numberspace established in the databooks.
However this is not yet flexible enough for my uses: My Alchemy
systems have a documented "external" gpio interface (fixed, different
numberspace) and can support a variety of baseboards, some of which
are equipped with I2C gpio expanders. I want to be able to provide
the default 16 GPIOs of the CPU board numbered as 0..15 and also
support gpio expanders, if present, starting as gpio16.
To achieve this, a new Kconfig symbol for Alchemy is introduced,
CONFIG_ALCHEMY_GPIO_INDIRECT, which boards can enable to signal
that they don't want the Alchemy numberspace exposed to the outside
world, but instead want to provide their own. Boards are now respon-
sible for providing the linux gpio interface glue code (either in a
custom gpio.h header (in board include directory) or with gpio_chips).
To make the board-specific inlined gpio functions work, the MIPS
Makefile must be changed so that the mach-au1x00/gpio.h header is
included _after_ the board headers, by moving the inclusion of
the mach-au1x00/ to the end of the header list.
See arch/mips/include/asm/mach-au1x00/gpio.h for more info.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Makefile')
-rw-r--r-- | arch/mips/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 52a350974496..e5ccc3490d6a 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -183,7 +183,6 @@ load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 | |||
183 | # Common Alchemy Au1x00 stuff | 183 | # Common Alchemy Au1x00 stuff |
184 | # | 184 | # |
185 | core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/ | 185 | core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/ |
186 | cflags-$(CONFIG_SOC_AU1X00) += -I$(srctree)/arch/mips/include/asm/mach-au1x00 | ||
187 | 186 | ||
188 | # | 187 | # |
189 | # AMD Alchemy Pb1000 eval board | 188 | # AMD Alchemy Pb1000 eval board |
@@ -281,6 +280,10 @@ load-$(CONFIG_MIPS_MTX1) += 0xffffffff80100000 | |||
281 | libs-$(CONFIG_MIPS_XXS1500) += arch/mips/alchemy/xxs1500/ | 280 | libs-$(CONFIG_MIPS_XXS1500) += arch/mips/alchemy/xxs1500/ |
282 | load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 | 281 | load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 |
283 | 282 | ||
283 | # must be last for Alchemy systems for GPIO to work properly | ||
284 | cflags-$(CONFIG_SOC_AU1X00) += -I$(srctree)/arch/mips/include/asm/mach-au1x00 | ||
285 | |||
286 | |||
284 | # | 287 | # |
285 | # Cobalt Server | 288 | # Cobalt Server |
286 | # | 289 | # |