| 83ca60094e5e907b8b43c60b4c29b1119604cbb8 |
|
06-May-2012 |
Steven King <sfking@fdwdc.com> |
m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m
Enable Coldfire QSPI support when SPI_COLDFIRE_QSPI is built as a module.
This version of the patch combines changes to the config files and device.c
and uses IF_ENABLED (thanks to Sam Ravnborg for the suggestion).
Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| d894b89bf74322845f776bde4d72b70b58926886 |
|
19-Feb-2012 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: factor some common ColdFire cpu reset code
A number of the early ColdFire cores use the same code to reset the CPU.
Currently that is duplicated in each of the sub-arch files. Pull out this
common code and use a single copy of it for all CPU types that use it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| 440f6ffc061a84e81386a093c07af8a429c18702 |
|
24-Dec-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: move old ColdFire timers init from CPU init to timers code
The original ColdFire timer interrupt setup is used by most of the users
of the original ColdFire timer code. But the code is currently duplicated
in each of the ColdFire CPU specific init files. Move it to the timers
code that it is really part of. It is strait forward to make it conditional
on also having the original interrupt engine that it needs.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| fa1fc24662d57170259948314b0759376eb75777 |
|
23-Dec-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: merge common ColdFire QSPI platform setup code
The ColdFire QSPI is common to quite a few ColdFire CPUs. No need to duplicate
its platform setup code for every CPU family member that has it. Merge all the
setup code into a single shared file.
This also results in few platforms no longer needing any local platform
setup code. In those cases remove the empty devices array and initcall
code as well.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| 2424f549020b6f87ea3b6e89fd7bd26ddf1f717b |
|
23-Dec-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: make 5249 QSPI platform addressing consistent
If we make all QSPI (SPI protocol) addressing consistent across all ColdFire
family members then we will be able to remove the duplicated plaform data
and code and use a single setup for all.
So modify the ColdFire 5249 QSPI addressing so that:
. base addresses are absolute (not relative to MBAR peripheral register)
. use a common name for IRQs used
. move chip select definitions (CS) to appropriate header
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| 55148f6f886a1b77dba1a5c3169208606827b9db |
|
23-Dec-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: merge common ColdFire UART IRQ setup
Some ColdFire CPU UART hardware modules can configure the IRQ they use.
Currently the same setup code is duplicated in the init code for each of
these ColdFire CPUs. Merge all this code to a single instance.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| 0d2fe946474196e586e492d9e9b381e184c774ea |
|
23-Dec-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: merge common ColdFire UART platform setup code
The ColdFire UART is common to all ColdFire CPU's. No need to duplicate
its platform setup code for every CPU family member. Merge all the setup
code into a single shared file.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| 43d94b7f929aa293e8d4845d0b7f754b534d4575 |
|
23-Dec-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: simplify the 5249 UART setup code
Simplify the UART setup code so that it no longer loops for each UART
present. Just make it do all the work it needs in a single function.
This will make the code easier to share when we move to a single set
of platform data for ColdFire UARTs.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| e8f69e545e51b9f2870d64082db533557b8d0d09 |
|
23-Dec-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: make 5249 UART platform addressing consistent
If we make all UART addressing consistent across all ColdFire family members
then we will be able to remove the duplicated plaform data and use a single
setup for all.
So modify the ColdFire 5249 UART addressing so that:
. UARTs are numbered from 0 up
. base addresses are absolute (not relative to MBAR peripheral register)
. use a common name for IRQs used
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| 35aefb2645d1ae7576699b2d7b66d6c9503113fc |
|
23-Jan-2012 |
Greg Ungerer <gerg@uclinux.org> |
m68knommu: modify timer init code to make it consistent with m68k code
With a few small changes we can make the m68knommu timer init code the
same as the m68k code. By using the mach_sched_init function pointer
and reworking the current timer initializers to keep track of the common
m68k timer_interrupt() handler we end up with almost identical code for
m68knommu.
This will allow us to more easily merge the mmu and non-mmu m68k time.c
in future patches.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
/arch/m68k/platform/5249/config.c
|
| 66d857b08b8c3ed5c72c361f863cce77d2a978d7 |
|
22-Mar-2011 |
Greg Ungerer <gerg@uclinux.org> |
m68k: merge m68k and m68knommu arch directories
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>
/arch/m68k/platform/5249/config.c
|