summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/coldfire.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-03-05 22:17:17 +1000
committerGreg Ungerer <gerg@uclinux.org>2011-03-15 21:01:53 +1000
commit254eef7464f0704290af4b91021f512eb4c98d59 (patch)
tree4bc61d36dbb146eed72b166f7f75c06d7384adea /arch/m68k/include/asm/coldfire.h
parentf2ba710d17ae221e21a7cccddbbf5257fd93e9fa (diff)
downloadop-kernel-dev-254eef7464f0704290af4b91021f512eb4c98d59.zip
op-kernel-dev-254eef7464f0704290af4b91021f512eb4c98d59.tar.gz
m68knommu: remove kludge seting of MCF_IPSBAR for ColdFire 54xx
The ColdFire 54xx family shares the same interrupt controller used on the 523x, 527x and 528x ColdFire parts, but it isn't offset relative to the IPSBAR register. The 54xx doesn't have an IPSBAR register. By including the base address of the peripheral registers in the register definitions (MCFICM_INTC0 and MCFICM_INTC1 in this case) we can avoid having to define a fake IPSBAR for the 54xx. And this makes the register address definitions of these more consistent, the majority of the other register address defines include the peripheral base address already. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/coldfire.h')
-rw-r--r--arch/m68k/include/asm/coldfire.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h
index d70cf0f..9167645 100644
--- a/arch/m68k/include/asm/coldfire.h
+++ b/arch/m68k/include/asm/coldfire.h
@@ -31,9 +31,7 @@
* This is generally setup by the boards start up code.
*/
#define MCF_MBAR 0x10000000
-#if defined(CONFIG_M54xx)
-#define MCF_IPSBAR MCF_MBAR
-#elif defined(CONFIG_M520x)
+#if defined(CONFIG_M520x)
#define MCF_IPSBAR 0xFC000000
#else
#define MCF_IPSBAR 0x40000000
OpenPOWER on IntegriCloud