aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/m5407sim.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-09-14 16:09:59 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-09-27 23:33:52 +1000
commit35142b915bd1307fef4316848a4c5dc5b38836f4 (patch)
treee613209b3d4b7d293ee5b2c43510b9ea81ebc699 /arch/m68k/include/asm/m5407sim.h
parentm68knommu: make ColdFire Chip Select register definitions absolute addresses (diff)
downloadlinux-dev-35142b915bd1307fef4316848a4c5dc5b38836f4.tar.xz
linux-dev-35142b915bd1307fef4316848a4c5dc5b38836f4.zip
m68knommu: make ColdFire Park and Assignment register definitions absolute addresses
Make all definitions of the ColdFire MPARK and IRQ Assignment registers absolute addresses. Currently some are relative to the MBAR peripheral region. The various ColdFire parts use different methods to address the internal registers, some are absolute, some are relative to peripheral regions which can be mapped at different address ranges (such as the MBAR and IPSBAR registers). We don't want to deal with this in the code when we are accessing these registers, so make all register definitions the absolute address - factoring out whether it is an offset into a peripheral region. This makes them all consistently defined, and reduces the occasional bugs caused by inconsistent definition of the register addresses. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/m5407sim.h')
-rw-r--r--arch/m68k/include/asm/m5407sim.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/m5407sim.h b/arch/m68k/include/asm/m5407sim.h
index e6e48c1ee2db..cc485ba31bc8 100644
--- a/arch/m68k/include/asm/m5407sim.h
+++ b/arch/m68k/include/asm/m5407sim.h
@@ -28,9 +28,9 @@
#define MCFSIM_SWIVR (MCF_MBAR + 0x02) /* SW Watchdog intr */
#define MCFSIM_SWSR (MCF_MBAR + 0x03) /* SW Watchdog service*/
#define MCFSIM_PAR (MCF_MBAR + 0x04) /* Pin Assignment */
-#define MCFSIM_IRQPAR 0x06 /* Interrupt Assignment reg (r/w) */
-#define MCFSIM_PLLCR 0x08 /* PLL Control Reg*/
-#define MCFSIM_MPARK 0x0C /* BUS Master Control Reg*/
+#define MCFSIM_IRQPAR (MCF_MBAR + 0x06) /* Intr Assignment */
+#define MCFSIM_PLLCR (MCF_MBAR + 0x08) /* PLL Ctrl */
+#define MCFSIM_MPARK (MCF_MBAR + 0x0C) /* BUS Master Ctrl */
#define MCFSIM_IPR (MCF_MBAR + 0x40) /* Interrupt Pending */
#define MCFSIM_IMR (MCF_MBAR + 0x44) /* Interrupt Mask */
#define MCFSIM_AVR (MCF_MBAR + 0x4b) /* Autovector Ctrl */