Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu arch updates from Greg Ungerer: "Most of it is a cleanup of the ColdFire hardware header files. We have had a few occurrances of bugs caused by inconsistent definitions of peripheral addresses. These patches make them all consistent, and also clean out a bunch of old crap. Overall we remove about 1000 lines." * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (27 commits) m68knommu: fix inconsistent formating in ColdFire 5407 definitions m68knommu: fix inconsistent formating in ColdFire 5307 definitions m68knommu: fix inconsistent formating in ColdFire 527x definitions m68knommu: fix inconsistent formating in ColdFire 5272 definitions m68knommu: fix inconsistent formating in ColdFire 523x definitions m68knommu: clean up ColdFire 54xx General Timer definitions m68knommu: clean up Pin Assignment definitions for the 54xx ColdFire CPU m68knommu: fix multi-function pin setup for FEC module on ColdFire 523x m68knommu: move ColdFire slice timer address defiens to 54xx header m68knommu: use read/write IO access functions in ColdFire m532x setup code m68knommu: modify ColdFire 532x GPIO register definitions to be consistent m68knommu: remove a lot of unsed definitions for 532x ColdFire m68knommu: use definitions for the ColdFire 528x FEC multi-function pins m68knommu: remove address offsets relative to IPSBAR for ColdFire 527x m68knommu: remove unused ColdFire 5282 register definitions m68knommu: fix wrong register offsets used for ColdFire 5272 multi-function pins m68knommu: make ColdFire 5249 MBAR2 register definitions absolute addresses m68knommu: make remaining ColdFire 5272 register definitions absolute addresses m68knommu: make ColdFire Park and Assignment register definitions absolute addresses m68knommu: make ColdFire Chip Select register definitions absolute addresses ...
Showing
- arch/m68k/include/asm/cacheflush_no.h 8 additions, 11 deletionsarch/m68k/include/asm/cacheflush_no.h
- arch/m68k/include/asm/m5206sim.h 49 additions, 49 deletionsarch/m68k/include/asm/m5206sim.h
- arch/m68k/include/asm/m523xsim.h 16 additions, 8 deletionsarch/m68k/include/asm/m523xsim.h
- arch/m68k/include/asm/m5249sim.h 49 additions, 49 deletionsarch/m68k/include/asm/m5249sim.h
- arch/m68k/include/asm/m525xsim.h 35 additions, 35 deletionsarch/m68k/include/asm/m525xsim.h
- arch/m68k/include/asm/m5272sim.h 50 additions, 49 deletionsarch/m68k/include/asm/m5272sim.h
- arch/m68k/include/asm/m527xsim.h 50 additions, 34 deletionsarch/m68k/include/asm/m527xsim.h
- arch/m68k/include/asm/m528xsim.h 1 addition, 50 deletionsarch/m68k/include/asm/m528xsim.h
- arch/m68k/include/asm/m5307sim.h 68 additions, 68 deletionsarch/m68k/include/asm/m5307sim.h
- arch/m68k/include/asm/m532xsim.h 75 additions, 1114 deletionsarch/m68k/include/asm/m532xsim.h
- arch/m68k/include/asm/m5407sim.h 55 additions, 55 deletionsarch/m68k/include/asm/m5407sim.h
- arch/m68k/include/asm/m54xxgpt.h 20 additions, 20 deletionsarch/m68k/include/asm/m54xxgpt.h
- arch/m68k/include/asm/m54xxsim.h 20 additions, 7 deletionsarch/m68k/include/asm/m54xxsim.h
- arch/m68k/include/asm/mcfslt.h 0 additions, 7 deletionsarch/m68k/include/asm/mcfslt.h
- arch/m68k/include/asm/nettel.h 3 additions, 6 deletionsarch/m68k/include/asm/nettel.h
- arch/m68k/platform/68VZ328/Makefile 1 addition, 7 deletionsarch/m68k/platform/68VZ328/Makefile
- arch/m68k/platform/coldfire/device.c 2 additions, 2 deletionsarch/m68k/platform/coldfire/device.c
- arch/m68k/platform/coldfire/head.S 1 addition, 1 deletionarch/m68k/platform/coldfire/head.S
- arch/m68k/platform/coldfire/intc-5249.c 5 additions, 5 deletionsarch/m68k/platform/coldfire/intc-5249.c
- arch/m68k/platform/coldfire/intc-5272.c 10 additions, 10 deletionsarch/m68k/platform/coldfire/intc-5272.c
Loading
Please register or sign in to comment