66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
49 lines
1.3 KiB
C
49 lines
1.3 KiB
C
/*
|
|
* Coldfire generic GPIO support
|
|
*
|
|
* (C) Copyright 2009, Steven King <sfking@fdwdc.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/coldfire.h>
|
|
#include <asm/mcfsim.h>
|
|
#include <asm/mcfgpio.h>
|
|
|
|
static struct mcf_gpio_chip mcf_gpio_chips[] = {
|
|
{
|
|
.gpio_chip = {
|
|
.label = "PP",
|
|
.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,
|
|
.ngpio = 16,
|
|
},
|
|
.pddr = (void __iomem *) MCFSIM_PADDR,
|
|
.podr = (void __iomem *) MCFSIM_PADAT,
|
|
.ppdr = (void __iomem *) MCFSIM_PADAT,
|
|
},
|
|
};
|
|
|
|
static int __init mcf_gpio_init(void)
|
|
{
|
|
unsigned i = 0;
|
|
while (i < ARRAY_SIZE(mcf_gpio_chips))
|
|
(void)gpiochip_add((struct gpio_chip *)&mcf_gpio_chips[i++]);
|
|
return 0;
|
|
}
|
|
|
|
core_initcall(mcf_gpio_init);
|