summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of ↵Linus Torvalds2009-09-1786-2309/+5202
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (53 commits) m68knommu: Make PAGE_SIZE available to assembly files. m68knommu: fix ColdFire definition of CLOCK_TICK_RATE m68knommu: set multi-function pins for ethernet when enabled m68knommu: remove special interrupt handling code for ne2k support m68knommu: relax IO_SPACE_LIMIT setting m68knommu: remove ColdFire direct interrupt register access m68knommu: create a speciailized ColdFire 5272 interrupt controller m68knommu: add support for second interrupt controller of ColdFire 5249 m68knommu: clean up old ColdFire timer irq setup m68knommu: map ColdFire interrupts to correct masking bits m68knommu: clean up ColdFire 532x CPU timer setup m68knommu: simplify ColdFire "timers" clock initialization m68knommu: support code to mask external interrupts on old ColdFire CPU's m68knommu: merge old ColdFire interrupt controller masking macros m68knommu: remove duplicate ColdFire mcf_autovector() code m68knommu: move ColdFire INTC definitions to new include file m68knommu: mask off all interrupts in ColdFire intc-simr controller m68knommu: remove timer device interrupt setup for ColdFire 532x m68knommu: remove interrupt masking from ColdFire pit timer m68knommu: remove unecessary interrupt level setting in ColdFire 520x setup ...
| * m68knommu: Make PAGE_SIZE available to assembly files.Tim Abbott2009-09-161-1/+3
| | | | | | | | | | Signed-off-by: Tim Abbott <tabbott@ksplice.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: fix ColdFire definition of CLOCK_TICK_RATEPhilippe De Muyter2009-09-161-2/+15
| | | | | | | | | | | | | | | | | | The good definition of CLOCK_TICK_RATE for coldfires has been lost in the merge of m68k and m68knommu include files. Restore it. Culprit : commit ebafc17468d58bd903c886175ca84a4edc69ae1d Signed-off-by: Philippe De Muyter <phdm@macqel.be> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: set multi-function pins for ethernet when enabledGreg Ungerer2009-09-161-0/+15
| | | | | | | | | | | | | | | | | | | | The ethernet pins on the 532x ColdFire CPU family are multi-function pins. We need to enable them as ethernet pins when using the FEC ethernet driver. Bug report, and older patch, from timothee@manaud.net. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove special interrupt handling code for ne2k supportGreg Ungerer2009-09-161-83/+0
| | | | | | | | | | | | | | | | The improved interrupt support for ColdFire CPU cores means we no longer need all the interrupt setup and ack hacks to support the NE2000 driver on ColdFire platforms. Remove all that code. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: relax IO_SPACE_LIMIT settingGreg Ungerer2009-09-161-1/+1
| | | | | | | | | | | | | | | | There is really no limit to the addresses which can be used by the in*() and out*() family of IO space calls in m68k non-MMU environments. So don't impose an artificial address limit, allow the full 32bit range. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove ColdFire direct interrupt register accessGreg Ungerer2009-09-162-72/+11
| | | | | | | | | | | | | | | | Now that the ColdFire 5272 has full interrupt controller functionality we can remove all the interrupt masking and acking code from the FEC ethernet driver. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: create a speciailized ColdFire 5272 interrupt controllerGreg Ungerer2009-09-164-5/+174
| | | | | | | | | | | | | | | | The ColdFire 5272 CPU has a very different interrupt controller than any of the other ColdFire parts. It needs its own controller code to correctly setup and ack interrupts. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: add support for second interrupt controller of ColdFire 5249Greg Ungerer2009-09-163-3/+78
| | | | | | | | | | | | | | | | | | The ColdFire 5249 CPU has a second (compleletly different) interrupt controller. It is the only ColdFire CPU that has this type. It controlls GPIO interrupts amongst a number of interrupts from other internal peripherals. Add support code for it. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: clean up old ColdFire timer irq setupGreg Ungerer2009-09-161-7/+2
| | | | | | | | | | | | | | | | The recent changes to the old ColdFire interrupt controller code means we no longer need to manually unmask the timer interrupt. That is now done in the interrupt controller code proper. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: map ColdFire interrupts to correct masking bitsGreg Ungerer2009-09-167-39/+90
| | | | | | | | | | | | | | | | | | The older simple ColdFire interrupt controller has no one-to-one mapping of interrupt numbers to bits in the interrupt mask register. Create a mapping array that each ColdFire CPU type can populate with its available interrupts and the bits that each use in the interrupt mask register. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: clean up ColdFire 532x CPU timer setupGreg Ungerer2009-09-162-16/+6
| | | | | | | | | | | | | | | | | | The newer ColdFire 532x family of CPU's uses the old timer, but has a newer interrupt controller. It doesn't need the special timer setup that was required when using the older interrupt controller. Remove the dead timer irq and level setting code, and define the hard coded vector. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: simplify ColdFire "timers" clock initializationGreg Ungerer2009-09-1612-127/+97
| | | | | | | | | | | | | | | | | | The ColdFire "timers" clock setup can be simplified. There is really no need for the flexible per-platform setup code. The clock interrupt can be hard defined per CPU platform (in CPU include files). This makes the actual timer code simpler. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: support code to mask external interrupts on old ColdFire CPU'sGreg Ungerer2009-09-161-0/+4
| | | | | | | | | | | | | | | | The external interrupts used on the old Coldfire parts with the old style interrupt controller can be properly mask/unmasked in the interrupt handling code. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: merge old ColdFire interrupt controller masking macrosGreg Ungerer2009-09-1611-140/+109
| | | | | | | | | | | | | | | | | | | | Currently the code that supports setting the old style ColdFire interrupt controller mask registers is macros in the include files of each of the CPU types. Merge all these into a set of real masking functions in the old Coldfire interrupt controller code proper. All the macros are basically the same (excepting a register size difference on really early parts). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove duplicate ColdFire mcf_autovector() codeGreg Ungerer2009-09-167-83/+27
| | | | | | | | | | | | | | | | | | Each of the ColdFire CPU platform code that used the old style interrupt controller had its own copy of the mcf_autovector() function. They are all the same, remove them all and create a single function in the common coldfire/intc.c code. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: move ColdFire INTC definitions to new include fileGreg Ungerer2009-09-162-73/+114
| | | | | | | | | | | | | | | | Create an mcfintc.h include file with the definitions for the old style ColdFire interrupt controller. They are only needed on CPU's that use this old controller - so isolate them on their own. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: mask off all interrupts in ColdFire intc-simr controllerGreg Ungerer2009-09-162-33/+5
| | | | | | | | | | | | | | | | The ColdFire intc-simr interrupt controller should mask off all interrupt sources at init time. Doing it here instead of separately in each platform setup. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove timer device interrupt setup for ColdFire 532xGreg Ungerer2009-09-161-14/+0
| | | | | | | | | | | | | | | | With fully implemented interrupt controller code we don't need to do the custom interrupt setup for the timer device of the ColdFire 532x. Remove that code. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove interrupt masking from ColdFire pit timerGreg Ungerer2009-09-163-26/+0
| | | | | | | | | | | | | | | | With proper interrupt controller code in place there is no need for devices like the timers to have custom interrupt masking code. Remove it (and the defines that go along with it). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove unecessary interrupt level setting in ColdFire 520x setupGreg Ungerer2009-09-161-9/+0
| | | | | | | | | | | | | | | | | | The new code for the interrupt controller in the ColdFire 520x takes care of all the interrupt controller setup. No manual config of the level registers (ICR) is required by the platform device setup code. So remove it. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove the common interrupt controller structureGreg Ungerer2009-09-161-25/+0
| | | | | | | | | | | | | | | | Each different m68knommu CPU interrupt controller type has its own interrupt controller data structures now. Remove the old, and now not used, common irq structs and init code from here. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: complete interrupt controller code for the 68360 CPUGreg Ungerer2009-09-161-15/+29
| | | | | | | | | | | | | | | | Define the interrupt controller structures along with the interrupt controller code for the 68360 CPU. This brings the interrupt setup and control into one place for this CPU family. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: complete interrupt controller code for the 68328 CPU'sGreg Ungerer2009-09-161-32/+40
| | | | | | | | | | | | | | | | Define the interrupt controller structures along with the interrupt controller code for the 68328 CPU family. This brings the interrupt setup and control into one place for this CPU family. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: use common interrupt controller code for older ColdFire CPU'sGreg Ungerer2009-09-164-28/+63
| | | | | | | | | | | | | | | | | | The old ColdFire CPU's (5206, 5307, 5407, 5249 etc) use a simple interrupt controller. Use common setup code for them. This addition means that all ColdFire CPU's now have some specific type of interrupt controller code. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: clean up ColdFire 532x interrupt setupGreg Ungerer2009-09-161-18/+0
| | | | | | | | | | | | | | | | With the common intc-simr interrupt controller code in place the ColdFire 532x family startup code can be greatly simplified. Remove all the interrupt masking code, and the per-device interrupt config here. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: general interrupt controller for ColdFire 532x partsGreg Ungerer2009-09-165-18/+44
| | | | | | | | | | | | | | | | | | The ColdFire 532x family of parts uses 2 of the same INTC interrupt controlers used in the ColdFire 520x family. So modify the code to support both parts. The extra code for the second INTC controler in the case of the 520x is easily optimized away to nothing. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: clean up ColdFire 523x interrupt setupGreg Ungerer2009-09-161-63/+0
| | | | | | | | | | | | | | | | With the common intc-2 interrupt controller code in place the ColdFire 523x family startup code can be greatly simplified. Remove all the interrupt masking code, and the per-device interrupt config here. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: clean up ColdFire 528x interrupt setupGreg Ungerer2009-09-161-49/+2
| | | | | | | | | | | | | | | | With the common intc-2 interrupt controller code in place the ColdFire 528x family startup code can be greatly simplified. Remove all the interrupt masking code, and the per-device interrupt config here. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: clean up ColdFire 527x interrupt setupGreg Ungerer2009-09-161-49/+0
| | | | | | | | | | | | | | | | With the common intc-2 interrupt controller code in place the ColdFire 527x family startup code can be greatly simplified. Remove all the interrupt masking code, and the per-device interrupt config here. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: general interrupt controller for ColdFire many 52xx partsGreg Ungerer2009-09-163-4/+98
| | | | | | | | | | | | | | | | | | | | | | | | Create general interrupt controller code for the many ColdFire version 2 cores that use the two region INTC interrupt controller. This includes the 523x family, 5270, 5271, 5274, 5275, and the 528x families. This code does proper masking and unmasking of interrupts. With this in place some of the driver hacks in place to support ColdFire interrupts can finally go away. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: remove per device interrupt mask setting for ColdFire 520xGreg Ungerer2009-09-161-21/+0
| | | | | | | | | | | | | | With general interrupt controller code in place we don't need specific unmasking code for the internal ColdFire 520x UARTs or ethernet (FEC). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: use general interrupt controller for ColdFire 520x familyGreg Ungerer2009-09-164-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create general interrupt controller code for the ColdFire 520x family, that does proper masking and unmasking of interrupts. With this in place some of the driver hacks in place to support ColdFire interrupts can finally go away. Within the ColdFire family there is a variety of different interrupt controllers in use. Some are used on multiple parts, some on only one. There is quite some differences in some varients, so much so that common code for all ColdFire parts would be impossible. This commit introduces code to support one of the newer interrupt controllers in the ColdFire 5208 and 5207 parts. It has very simple mask and unmask operations, so is one of the easiest to support. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68k: clean up comment delimiters in dma.hGreg Ungerer2009-09-161-27/+27
| | | | | | | | | | | | Change C99 style comments to traditional K&R style. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68k: merge mmu and non-mmu versions of dma.hGreg Ungerer2009-09-163-513/+489
| | | | | | | | | | | | | | | | The non-mmu version of dma.h contains a lot of ColdFire specific DMA support, but also all of the base m68k support. So use the non-mmu version of dma.h for all. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68k: merge the mmu and non-mmu versions of checksum.hGreg Ungerer2009-09-164-293/+171
| | | | | | | | | | | | | | The mmu and non-mmu versions of checksum.h are mostly the same, merge them. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68k: merge mmu and non-mmu versions of irq.hGreg Ungerer2009-09-163-155/+132
| | | | | | | | | | | | | | It is reasonably strait forward to merge the mmu and non-mmu versions of irq.h. Most of the defines and structs are not needed on non-mmu. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68k: merge mmu and non-mmu versions of processor.hGreg Ungerer2009-09-163-276/+168
| | | | | | | | | | | | | | | | The mmu and non-mmu versions of processor.h have a lot of common code. This is a strait forward merge. start_thread() could be improved, but that is not quite as strait forward, leaving for a follow on change. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68knommu: convert to asm-generic/hardirq.hChristoph Hellwig2009-09-162-14/+1
| | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * m68k: remove unused elia.h include fileGreg Ungerer2009-09-161-41/+0
| | | | | | | | Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * arch/m68knommu/kernel/time.c: Remove unnecessary semicolonsJoe Perches2009-09-161-1/+1
| | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support misc files.sfking@fdwdc.com2009-09-102-5/+5
| | | | | | | | | | | | | | The definition of MCFSIM_PADDR and MCFSIM_PADAT now has MCF_BAR already added in. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 5407.sfking@fdwdc.com2009-09-103-3/+58
| | | | | | | | | | | | | | Add support for the 5407. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 532x.sfking@fdwdc.com2009-09-104-73/+424
| | | | | | | | | | | | | | Add support for the 532x. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 5307.sfking@fdwdc.com2009-09-103-3/+59
| | | | | | | | | | | | | | Add support for the 5307. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 528x.sfking@fdwdc.com2009-09-103-1/+590
| | | | | | | | | | | | | | Add support for the 528x. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 5272.sfking@fdwdc.com2009-09-103-10/+97
| | | | | | | | | | | | | | Add support for the 5272. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 527x.sfking@fdwdc.com2009-09-103-1/+777
| | | | | | | | | | | | | | Add support for the 5271 & 5275. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 5249.sfking@fdwdc.com2009-09-103-10/+80
| | | | | | | | | | | | | | Add support for the 5249. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * generic GPIO support for the Freescale Coldfire 523x.sfking@fdwdc.com2009-09-103-1/+361
| | | | | | | | | | | | | | Add support for the 523x. Signed-off-by: Steven King <sfking@fdwdc.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 16:59:00 +0100